@adventurelabs/scout-core 1.0.108 → 1.0.109

package/dist/hooks/useScoutRefresh.js

@@ -1,5 +1,6 @@
 import { useEffect, useCallback, useRef } from "react";
-import { useAppDispatch, useHerdModules, useUser } from "../store/hooks";
+import { useAppDispatch } from "../store/hooks";
+import { useStore } from "react-redux";
 import { EnumScoutStateStatus, setHerdModules, setStatus, setHerdModulesLoadingState, setHerdModulesLoadedInMs, setHerdModulesApiDuration, setUserApiDuration, setDataProcessingDuration, setUser, setDataSource, setDataSourceInfo, } from "../store/scout";
 import { EnumHerdModulesLoadingState } from "../types/herd_module";
 import { server_load_herd_modules } from "../helpers/herds";
@@ -33,8 +34,7 @@ export function useScoutRefresh(options = {}) {
     const { autoRefresh = true, onRefreshComplete, cacheFirst = true, cacheTtlMs = 24 * 60 * 60 * 1000, // 24 hours default (1 day)
      } = options;
     const dispatch = useAppDispatch();
-    const currentHerdModules = useHerdModules();
-    const currentUser = useUser();
+    const store = useStore();
     const refreshInProgressRef = useRef(false);
     // Refs to store timing measurements
     const timingRefs = useRef({
@@ -46,7 +46,7 @@ export function useScoutRefresh(options = {}) {
         cacheSaveDuration: 0,
     });
     // Helper function for deep comparison of objects
-    const deepEqual = useCallback((obj1, obj2) => {
+    const deepEqual = useCallback((obj1, obj2, visited = new WeakMap()) => {
         if (obj1 === obj2)
             return true;
         if (obj1 == null || obj2 == null)
@@ -55,13 +55,22 @@ export function useScoutRefresh(options = {}) {
             return false;
         if (typeof obj1 !== "object")
             return obj1 === obj2;
+        // Handle circular references
+        if (visited.has(obj1)) {
+            return visited.get(obj1) === obj2;
+        }
+        visited.set(obj1, obj2);
+        // Handle Date objects
+        if (obj1 instanceof Date && obj2 instanceof Date) {
+            return obj1.getTime() === obj2.getTime();
+        }
         if (Array.isArray(obj1) !== Array.isArray(obj2))
             return false;
         if (Array.isArray(obj1)) {
             if (obj1.length !== obj2.length)
                 return false;
             for (let i = 0; i < obj1.length; i++) {
-                if (!deepEqual(obj1[i], obj2[i]))
+                if (!deepEqual(obj1[i], obj2[i], visited))
                     return false;
             }
             return true;
@@ -73,7 +82,7 @@ export function useScoutRefresh(options = {}) {
         for (const key of keys1) {
             if (!keys2.includes(key))
                 return false;
-            if (!deepEqual(obj1[key], obj2[key]))
+            if (!deepEqual(obj1[key], obj2[key], visited))
                 return false;
         }
         return true;
@@ -90,8 +99,8 @@ export function useScoutRefresh(options = {}) {
             return false;
         }
     }, [dispatch, deepEqual]);
-    // Helper function to handle IndexedDB errors
-    const handleIndexedDbError = async (error, operation, retryFn) => {
+    // Helper function to handle IndexedDB errors - memoized for stability
+    const handleIndexedDbError = useCallback(async (error, operation, retryFn) => {
         if (error instanceof Error &&
             (error.message.includes("object store") ||
                 error.message.includes("NotFoundError"))) {
@@ -108,7 +117,7 @@ export function useScoutRefresh(options = {}) {
                 console.error(`[useScoutRefresh] Database reset and retry failed:`, resetError);
             }
         }
-    };
+    }, []);
     const handleRefresh = useCallback(async () => {
         // Prevent concurrent refresh calls
         if (refreshInProgressRef.current) {
@@ -143,6 +152,8 @@ export function useScoutRefresh(options = {}) {
                             isStale: cacheResult.isStale,
                         }));
                         // Conditionally update the store with cached data if different
+                        // Get current state at execution time to avoid dependency issues
+                        const currentHerdModules = store.getState().scout.herd_modules;
                         const herdModulesChanged = conditionalDispatch(cachedHerdModules, currentHerdModules, setHerdModules, "Herd modules (cache)");
                         if (herdModulesChanged) {
                             dispatch(setHerdModulesLoadingState(EnumHerdModulesLoadingState.SUCCESSFULLY_LOADED));
@@ -154,6 +165,7 @@ export function useScoutRefresh(options = {}) {
                         timingRefs.current.userApiDuration = userApiDuration;
                         dispatch(setUserApiDuration(userApiDuration));
                         if (res_new_user && res_new_user.data) {
+                            const currentUser = store.getState().scout.user;
                             conditionalDispatch(res_new_user.data, currentUser, setUser, "User (initial)");
                         }
                         // If cache is fresh, we still background fetch but don't wait
@@ -189,6 +201,8 @@ export function useScoutRefresh(options = {}) {
                                             });
                                         }
                                         // Conditionally update store with fresh background data
+                                        const currentHerdModules = store.getState().scout.herd_modules;
+                                        const currentUser = store.getState().scout.user;
                                         conditionalDispatch(backgroundHerdModulesResult.data, currentHerdModules, setHerdModules, "Herd modules (background)");
                                         conditionalDispatch(backgroundUserResult.data, currentUser, setUser, "User (background)");
                                         // Update data source to DATABASE
@@ -294,6 +308,8 @@ export function useScoutRefresh(options = {}) {
             }
             // Step 4: Conditionally update store with fresh data if different
             const dataProcessingStartTime = Date.now();
+            const currentHerdModules = store.getState().scout.herd_modules;
+            const currentUser = store.getState().scout.user;
             const herdModulesChanged = conditionalDispatch(compatible_new_herd_modules, currentHerdModules, setHerdModules, "Herd modules (fresh API)");
             const userChanged = conditionalDispatch(res_new_user.data, currentUser, setUser, "User (fresh API)");
             if (herdModulesChanged) {
@@ -334,19 +350,20 @@ export function useScoutRefresh(options = {}) {
             console.log(`  - Total duration: ${loadingDuration}ms`);
             console.log(`  - Herd modules: ${timingRefs.current.herdModulesDuration}ms`);
             console.log(`  - User API: ${timingRefs.current.userApiDuration}ms`);
+            // Call completion callback even on error for consistency
+            onRefreshComplete?.();
         }
         finally {
             refreshInProgressRef.current = false;
         }
     }, [
         dispatch,
+        store,
         onRefreshComplete,
         cacheFirst,
         cacheTtlMs,
-        handleIndexedDbError,
-        currentHerdModules,
-        currentUser,
         conditionalDispatch,
+        handleIndexedDbError,
     ]);
     useEffect(() => {
         if (autoRefresh) {

package/dist/store/hooks.d.ts

@@ -1,6 +1,4 @@
 export declare const useAppDispatch: import("react-redux").UseDispatch<import("redux").Dispatch<import("redux").UnknownAction>>;
-export declare const useHerdModules: () => import("../types/herd_module").IHerdModule[];
-export declare const useUser: () => import("@supabase/auth-js").User | null;
 export declare const useHerdModulesLoadingState: () => any;
 export declare const useIsHerdModulesLoading: () => boolean;
 export declare const useIsHerdModulesLoaded: () => boolean;

package/dist/store/hooks.js

@@ -2,14 +2,6 @@ import { useDispatch, useSelector } from "react-redux";
 import { EnumHerdModulesLoadingState } from "../types/herd_module";
 // Simple wrapper for useDispatch to maintain compatibility
 export const useAppDispatch = useDispatch;
-// Selector hook for current herd modules
-export const useHerdModules = () => {
-    return useSelector((state) => state.scout.herd_modules);
-};
-// Selector hook for current user
-export const useUser = () => {
-    return useSelector((state) => state.scout.user);
-};
 // Selector hook for herd modules loading state
 export const useHerdModulesLoadingState = () => {
     return useSelector((state) => state.scout.herd_modules_loading_state);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adventurelabs/scout-core",
-  "version": "1.0.108",
+  "version": "1.0.109",
   "description": "Core utilities and helpers for Adventure Labs Scout applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",