@adventurelabs/scout-core 2.0.9 → 2.0.10

package/dist/hooks/useScoutRefresh.js

@@ -60,6 +60,7 @@ export function useScoutRefresh(options = {}, identityOptions = {}) {
     const { validatedUserId, onUserValidated } = identityOptions;
     const dispatch = useAppDispatch();
     const refreshIdRef = useRef(0);
+    const refreshInProgressIdRef = useRef(null);
     const activeUserIdRef = useRef(null);
     const validatedUserIdRef = useRef(null);
     const providedValidatedUserIdRef = useRef(validatedUserId);
@@ -91,7 +92,10 @@ export function useScoutRefresh(options = {}, identityOptions = {}) {
     }, [dispatch]);
     const cacheIdentityRef = useRef({ supabase, offlineUserId });
     const handleRefresh = useCallback(async ({ force = true } = {}) => {
+        if (refreshInProgressIdRef.current !== null && !force)
+            return;
         const refreshId = ++refreshIdRef.current;
+        refreshInProgressIdRef.current = refreshId;
         const isCurrent = () => refreshIdRef.current === refreshId;
         const startTime = Date.now();
         const isOffline = typeof navigator === "undefined" || !navigator.onLine;
@@ -268,6 +272,9 @@ export function useScoutRefresh(options = {}, identityOptions = {}) {
             }
         }
         finally {
+            if (refreshInProgressIdRef.current === refreshId) {
+                refreshInProgressIdRef.current = null;
+            }
             if (isCurrent()) {
                 lastQueryAtRef.current = Date.now();
             }

package/dist/providers/ScoutRefreshProvider.js

@@ -84,6 +84,7 @@ function useJwtMintLifecycle({ enabled, supabase, identity, cacheKey, ttlSec, re
     const [error, setError] = useState(null);
     const [offline, setOffline] = useState(isBrowserOffline);
     const refreshIdRef = useRef(0);
+    const refreshInProgressRef = useRef(false);
     const authUserIdRef = useRef(null);
     const cacheHydrationIdRef = useRef(0);
     const signedOutRef = useRef(false);
@@ -106,11 +107,12 @@ function useJwtMintLifecycle({ enabled, supabase, identity, cacheKey, ttlSec, re
     const refreshMint = useCallback(async (force = true) => {
         if (!enabled || isBrowserOffline())
             return;
+        if (refreshInProgressRef.current && !force)
+            return;
+        refreshInProgressRef.current = true;
         cacheHydrationIdRef.current++;
         const refreshId = ++refreshIdRef.current;
         const isCurrent = () => refreshIdRef.current === refreshId;
-        setInFlight(true);
-        setError(null);
         try {
             const { data, error: authError } = await supabase.auth.getUser();
             if (authError) {
@@ -143,6 +145,8 @@ function useJwtMintLifecycle({ enabled, supabase, identity, cacheKey, ttlSec, re
                 !shouldRefreshMint(currentMint, ttlSec, refreshBeforeExpirySec)) {
                 return;
             }
+            setInFlight(true);
+            setError(null);
             const mintResponse = await mintToken(supabase);
             if (!isCurrent() || authUserIdRef.current !== userId)
                 return;
@@ -177,6 +181,7 @@ function useJwtMintLifecycle({ enabled, supabase, identity, cacheKey, ttlSec, re
         }
         finally {
             if (isCurrent()) {
+                refreshInProgressRef.current = false;
                 setInFlight(false);
             }
         }
@@ -202,10 +207,12 @@ function useJwtMintLifecycle({ enabled, supabase, identity, cacheKey, ttlSec, re
             authUserIdRef.current = null;
             cacheHydrationIdRef.current++;
             refreshIdRef.current++;
+            refreshInProgressRef.current = false;
             updateMint(null);
             setInFlight(false);
         }
         if (!enabled) {
+            refreshInProgressRef.current = false;
             updateMint(null);
             setError(null);
             setInFlight(false);
@@ -220,6 +227,7 @@ function useJwtMintLifecycle({ enabled, supabase, identity, cacheKey, ttlSec, re
             authUserIdRef.current = null;
             cacheHydrationIdRef.current++;
             refreshIdRef.current++;
+            refreshInProgressRef.current = false;
             updateMint(null);
             setError(null);
             setInFlight(false);
@@ -288,27 +296,47 @@ function useJwtMintLifecycle({ enabled, supabase, identity, cacheKey, ttlSec, re
             }
         };
         void initializeMint();
+        const refreshCurrentMintIfDue = () => {
+            const currentMint = mintRef.current;
+            if (!currentMint ||
+                shouldRefreshMint(currentMint, ttlSec, refreshBeforeExpirySec)) {
+                void refreshMint(false);
+            }
+        };
         const unsubscribeAuth = subscribeToSupabaseAuth(supabase, (event, session) => {
             if (event === "SIGNED_OUT") {
                 signedOutRef.current = true;
                 authUserIdRef.current = null;
                 cacheHydrationIdRef.current++;
                 refreshIdRef.current++;
+                refreshInProgressRef.current = false;
                 updateMint(null);
                 setError(null);
                 setInFlight(false);
                 return;
             }
             if (event === "SIGNED_IN" || event === "TOKEN_REFRESHED") {
+                const wasSignedOut = signedOutRef.current;
                 signedOutRef.current = false;
-                refreshIdRef.current++;
-                setInFlight(false);
                 const userId = session?.user?.id;
-                if (userId) {
+                if (!userId) {
+                    refreshCurrentMintIfDue();
+                    return;
+                }
+                const knownUserId = authUserIdRef.current;
+                const userChanged = wasSignedOut ||
+                    (knownUserId !== null && knownUserId !== userId);
+                if (userChanged) {
+                    cacheHydrationIdRef.current++;
+                    refreshIdRef.current++;
+                    refreshInProgressRef.current = false;
                     void initializeMint(userId, true);
                 }
+                else if (knownUserId === null || !mintRef.current) {
+                    void initializeMint(userId);
+                }
                 else {
-                    void refreshMint();
+                    refreshCurrentMintIfDue();
                 }
             }
         });
@@ -326,11 +354,7 @@ function useJwtMintLifecycle({ enabled, supabase, identity, cacheKey, ttlSec, re
             setOffline(currentlyOffline);
             if (currentlyOffline)
                 return;
-            const currentMint = mintRef.current;
-            if (!currentMint ||
-                shouldRefreshMint(currentMint, ttlSec, refreshBeforeExpirySec)) {
-                void refreshMint(false);
-            }
+            refreshCurrentMintIfDue();
         };
         window.addEventListener("online", handleOnline);
         window.addEventListener("offline", handleOffline);
@@ -339,6 +363,7 @@ function useJwtMintLifecycle({ enabled, supabase, identity, cacheKey, ttlSec, re
             cancelled = true;
             cacheHydrationIdRef.current++;
             refreshIdRef.current++;
+            refreshInProgressRef.current = false;
             unsubscribeAuth();
             window.removeEventListener("online", handleOnline);
             window.removeEventListener("offline", handleOffline);
@@ -364,7 +389,7 @@ function useJwtMintLifecycle({ enabled, supabase, identity, cacheKey, ttlSec, re
         const refreshAtSec = Math.max(expSec - refreshBeforeExpirySec, mint.iat + 1);
         const delayMs = Math.max((refreshAtSec - nowSec) * 1000, 1000);
         const timer = setTimeout(() => {
-            void refreshMint();
+            void refreshMint(false);
         }, delayMs);
         return () => clearTimeout(timer);
     }, [enabled, mint, ttlSec, refreshBeforeExpirySec, refreshMint]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adventurelabs/scout-core",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "Core utilities and helpers for Adventure Labs Scout applications",
   "exports": {
     "./client": {