Unsubscribe and GC listeners in a loop.

electric-sql · Nov 29, 2023 · 89029ad · 89029ad
1 parent 2a5e7a5
commit 89029ad
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/clients/typescript/src/satellite/process.ts b/clients/typescript/src/satellite/process.ts
@@ -352,20 +352,20 @@ export class SatelliteProcess implements Satellite {
       this._pollingInterval = undefined
     }
 
-    if (this._unsubscribeFromAuthState !== undefined) {
-      this._unsubscribeFromAuthState()
-      this._unsubscribeFromAuthState = undefined
-    }
-
-    if (this._unsubscribeFromConnectivityChanges !== undefined) {
-      this._unsubscribeFromConnectivityChanges()
-      this._unsubscribeFromConnectivityChanges = undefined
-    }
-
-    if (this._unsubscribeFromPotentialDataChanges !== undefined) {
-      this._unsubscribeFromPotentialDataChanges()
-      this._unsubscribeFromPotentialDataChanges = undefined
-    }
+    // Unsubscribe all listeners and remove them
+    const unsubscribers = [
+      '_unsubscribeFromAuthState',
+      '_unsubscribeFromConnectivityChanges',
+      '_unsubscribeFromPotentialDataChanges',
+    ] as const
+
+    unsubscribers.forEach((unsubscriber) => {
+      const unsub = this[unsubscriber]
+      if (unsub !== undefined) {
+        unsub!()
+        this[unsubscriber] = undefined
+      }
+    })
 
     this._disconnect()