From cce4b989035370522dfc80dd66d7daa50682497a Mon Sep 17 00:00:00 2001
From: Garrett Stevens <stevens.garrett.j@gmail.com>
Date: Fri, 10 Oct 2025 00:31:48 +0000
Subject: [PATCH] Remove event listeners in beforeDestroy

---
 .../src/ApolloInternetAccount/model.ts        | 110 ++++++++++--------
 1 file changed, 64 insertions(+), 46 deletions(-)

diff --git a/packages/jbrowse-plugin-apollo/src/ApolloInternetAccount/model.ts b/packages/jbrowse-plugin-apollo/src/ApolloInternetAccount/model.ts
index d9bea4667..4d4e09014 100644
--- a/packages/jbrowse-plugin-apollo/src/ApolloInternetAccount/model.ts
+++ b/packages/jbrowse-plugin-apollo/src/ApolloInternetAccount/model.ts
@@ -407,56 +407,72 @@ const stateModelFactory = (configSchema: ApolloInternetAccountConfigModel) => {
       return { postUserLocation: debouncePostUserLocation(postUserLocation) }
     })
     .volatile(() => ({ roleNotificationSent: false }))
-    .actions((self) => ({
-      initialize: flow(function* initialize(role: Role) {
-        if (role === 'none') {
-          if (!self.roleNotificationSent) {
-            const { session } = getRoot<ApolloRootModel>(self)
-            ;(session as unknown as AbstractSessionModel).notify(
-              'You have registered as an Apollo user but have not been given access. Ask your administrator to enable access for your account.',
-              'warning',
-            )
-            self.roleNotificationSent = true
-          }
-          return
+    .actions((self) => {
+      function beforeUnloadListener() {
+        self.postUserLocation([])
+      }
+      function visibilityChangeListener() {
+        // fires when user switches tabs, apps, goes to homescreen, etc.
+        if (document.visibilityState === 'hidden') {
+          self.postUserLocation([])
         }
-        if (role === 'admin') {
-          const rootModel = getRoot(self)
-          if (isAbstractMenuManager(rootModel)) {
-            addTopLevelAdminMenus(rootModel)
-          }
+        // fires when app transitions from prerender, user returns to the app / tab.
+        if (document.visibilityState === 'visible') {
+          const { session } = getRoot<ApolloRootModel>(self)
+          session.broadcastLocations()
         }
-        // Get and set server last change sequence into session storage
-        yield self.updateLastChangeSequenceNumber()
-        // Open socket listeners
-        self.addSocketListeners()
-        // request user locations
-        const { baseURL } = self
-        const uri = new URL('users/locations', baseURL).href
-        const apolloFetch = self.getFetcher({
-          locationType: 'UriLocation',
-          uri,
-        })
-        yield apolloFetch(uri, {
-          method: 'GET',
-          signal: self.controller.signal,
-        })
-        window.addEventListener('beforeunload', () => {
-          self.postUserLocation([])
-        })
-        document.addEventListener('visibilitychange', () => {
-          // fires when user switches tabs, apps, goes to homescreen, etc.
-          if (document.visibilityState === 'hidden') {
-            self.postUserLocation([])
+      }
+      return {
+        initialize: flow(function* initialize(role: Role) {
+          if (role === 'none') {
+            if (!self.roleNotificationSent) {
+              const { session } = getRoot<ApolloRootModel>(self)
+              ;(session as unknown as AbstractSessionModel).notify(
+                'You have registered as an Apollo user but have not been given access. Ask your administrator to enable access for your account.',
+                'warning',
+              )
+              self.roleNotificationSent = true
+            }
+            return
           }
-          // fires when app transitions from prerender, user returns to the app / tab.
-          if (document.visibilityState === 'visible') {
-            const { session } = getRoot<ApolloRootModel>(self)
-            session.broadcastLocations()
+          if (role === 'admin') {
+            const rootModel = getRoot(self)
+            if (isAbstractMenuManager(rootModel)) {
+              addTopLevelAdminMenus(rootModel)
+            }
           }
-        })
-      }),
-    }))
+          // Get and set server last change sequence into session storage
+          yield self.updateLastChangeSequenceNumber()
+          // Open socket listeners
+          self.addSocketListeners()
+          // request user locations
+          const { baseURL } = self
+          const uri = new URL('users/locations', baseURL).href
+          const apolloFetch = self.getFetcher({
+            locationType: 'UriLocation',
+            uri,
+          })
+          yield apolloFetch(uri, {
+            method: 'GET',
+            signal: self.controller.signal,
+          })
+          window.addEventListener('beforeunload', beforeUnloadListener)
+          document.addEventListener(
+            'visibilitychange',
+            visibilityChangeListener,
+          )
+        }),
+        removeBeforeUnloadListener() {
+          window.removeEventListener('beforeunload', beforeUnloadListener)
+        },
+        removeVisibilityChangeListener() {
+          document.removeEventListener(
+            'visibilitychange',
+            visibilityChangeListener,
+          )
+        },
+      }
+    })
     .actions((self) => ({
       afterAttach() {
         self.setRole()
@@ -481,6 +497,8 @@ const stateModelFactory = (configSchema: ApolloInternetAccountConfigModel) => {
         )
       },
       beforeDestroy() {
+        self.removeBeforeUnloadListener()
+        self.removeVisibilityChangeListener()
         self.controller.abort('internet account beforeDestroy')
         self.socket.close()
       },