Prevent request stacking

matrix-org · Aug 16, 2022 · 07b30c1 · t3chguy · Aug 16, 2022 · 07b30c1
1 parent aaf7bf7
commit 07b30c1
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/src/hooks/useUserOnboardingContext.ts b/src/hooks/useUserOnboardingContext.ts
@@ -85,13 +85,26 @@ export function useUserOnboardingContext(): UserOnboardingContext | null {
     );
 
     useEffect(() => {
-        cli.on(ClientEvent.AccountData, handler);
-        const handle = setInterval(handler, USER_ONBOARDING_CONTEXT_INTERVAL);
-        handler();
+        let handle;
+        let enabled = true;
+        const repeater = async () => {
+            if (handle) {
+                clearTimeout(handle);
+                handle = null;
+            }
+            await handler();
+            if (enabled) {
+                handle = setTimeout(repeater, USER_ONBOARDING_CONTEXT_INTERVAL);
+            }
+        };
+        repeater().catch(err => logger.warn("could not update user onboarding context", err));
+        cli.on(ClientEvent.AccountData, repeater);
         return () => {
-            cli.off(ClientEvent.AccountData, handler);
+            enabled = false;
+            cli.off(ClientEvent.AccountData, repeater);
             if (handle) {
-                clearInterval(handle);
+                clearTimeout(handle);
+                handle = null;
             }
         };
     }, [cli, handler]);