[Notify] Fixing bug where disconnecting was not precisely disconnecting the correct thing

Author: weaverryan

src/Notify/assets/dist/controller.d.ts

@@ -9,6 +9,7 @@ export default class extends Controller {
     readonly hasHubValue: boolean;
     readonly hasTopicsValue: boolean;
     eventSources: Array<EventSource>;
+    listeners: WeakMap<EventSource, (event: MessageEvent) => void>;
     initialize(): void;
     connect(): void;
     disconnect(): void;

src/Notify/assets/dist/controller.js

@@ -4,6 +4,7 @@ class default_1 extends Controller {
     constructor() {
         super(...arguments);
         this.eventSources = [];
+        this.listeners = new WeakMap();
     }
     initialize() {
         const errorMessages = [];
@@ -25,13 +26,18 @@ class default_1 extends Controller {
             return;
         }
         this.eventSources.forEach((eventSource) => {
-            eventSource.addEventListener('message', (event) => this._notify(JSON.parse(event.data).summary));
+            const listener = (event) => this._notify(JSON.parse(event.data).summary);
+            eventSource.addEventListener('message', listener);
+            this.listeners.set(eventSource, listener);
         });
         this.dispatchEvent('connect', { eventSources: this.eventSources });
     }
     disconnect() {
         this.eventSources.forEach((eventSource) => {
-            eventSource.removeEventListener('message', this._notify);
+            const listener = this.listeners.get(eventSource);
+            if (listener) {
+                eventSource.removeEventListener('message', listener);
+            }
             eventSource.close();
         });
         this.eventSources = [];

src/Notify/assets/src/controller.ts

@@ -25,6 +25,7 @@ export default class extends Controller {
     declare readonly hasTopicsValue: boolean;
 
     eventSources: Array<EventSource> = [];
+    listeners: WeakMap<EventSource, (event: MessageEvent) => void> = new WeakMap();
 
     initialize() {
         const errorMessages: Array<string> = [];
@@ -50,15 +51,21 @@ export default class extends Controller {
         }
 
         this.eventSources.forEach((eventSource) => {
-            eventSource.addEventListener('message', (event) => this._notify(JSON.parse(event.data).summary));
+            const listener = (event: MessageEvent) => this._notify(JSON.parse(event.data).summary);
+            eventSource.addEventListener('message', listener);
+            this.listeners.set(eventSource, listener);
         });
 
         this.dispatchEvent('connect', { eventSources: this.eventSources });
     }
 
     disconnect() {
         this.eventSources.forEach((eventSource) => {
-            eventSource.removeEventListener('message', this._notify);
+            const listener = this.listeners.get(eventSource);
+            if (listener) {
+                eventSource.removeEventListener('message', listener);
+            }
+
             eventSource.close();
         });