@adventurelabs/scout-core 1.0.93 → 1.0.95

package/dist/hooks/useScoutRealtimeConnectivity.js

@@ -1,7 +1,7 @@
 "use client";
 import { useAppDispatch } from "../store/hooks";
 import { useSelector } from "react-redux";
-import { useEffect, useRef, useCallback, useState } from "react";
+import { useEffect, useRef, useCallback } from "react";
 import { setActiveHerdGpsTrackersConnectivity } from "../store/scout";
 import { server_get_connectivity_by_device_id } from "../helpers/connectivity";
 import { EnumWebResponse } from "../types/requests";
@@ -9,7 +9,6 @@ import { getDaysAgoTimestamp } from "../helpers/time";
 export function useScoutRealtimeConnectivity(scoutSupabase) {
     const channels = useRef([]);
     const dispatch = useAppDispatch();
-    const [hasInitialized, setHasInitialized] = useState(null);
     const activeHerdId = useSelector((state) => state.scout.active_herd_id);
     const connectivity = useSelector((state) => state.scout.active_herd_gps_trackers_connectivity);
     const herdModules = useSelector((state) => state.scout.herd_modules);
@@ -54,11 +53,12 @@ export function useScoutRealtimeConnectivity(scoutSupabase) {
                 }
                 break;
         }
+        console.log("[Connectivity] updating tracker connectivity in response to broadcast");
         dispatch(setActiveHerdGpsTrackersConnectivity(updatedConnectivity));
-    }, [connectivity, dispatch]);
+    }, [connectivity]);
     // Fetch initial connectivity data
     const fetchInitialData = useCallback(async () => {
-        if (!activeHerdId || hasInitialized === activeHerdId)
+        if (!activeHerdId)
             return;
         const herdId = activeHerdId; // Type narrowing
         const activeHerdModule = herdModules.find((hm) => hm.herd.id.toString() === herdId);
@@ -67,7 +67,6 @@ export function useScoutRealtimeConnectivity(scoutSupabase) {
         const gpsDevices = activeHerdModule.devices.filter((device) => device.device_type &&
             ["gps_tracker", "gps_tracker_vehicle", "gps_tracker_person"].includes(device.device_type));
         if (gpsDevices.length === 0) {
-            setHasInitialized(herdId);
             return;
         }
         console.log(`[Connectivity] Loading data for ${gpsDevices.length} GPS trackers`);
@@ -96,17 +95,14 @@ export function useScoutRealtimeConnectivity(scoutSupabase) {
             }
         }));
         dispatch(setActiveHerdGpsTrackersConnectivity(connectivityData));
-        setHasInitialized(herdId);
         console.log(`[Connectivity] Loaded data for ${Object.keys(connectivityData).length} devices`);
-    }, [activeHerdId, herdModules, hasInitialized, dispatch]);
+    }, [activeHerdId, herdModules]);
     useEffect(() => {
-        if (!scoutSupabase || !activeHerdId)
+        if (!scoutSupabase || !activeHerdId || herdModules.length == 0)
             return;
         // Clean up existing channels
         channels.current.forEach((channel) => scoutSupabase.removeChannel(channel));
         channels.current = [];
-        // Reset initialization when herd changes
-        setHasInitialized(null);
         // Create connectivity channel
         const channel = scoutSupabase
             .channel(`${activeHerdId}-connectivity`, { config: { private: true } })
@@ -126,10 +122,5 @@ export function useScoutRealtimeConnectivity(scoutSupabase) {
             channels.current.forEach((ch) => scoutSupabase.removeChannel(ch));
             channels.current = [];
         };
-    }, [
-        scoutSupabase,
-        activeHerdId,
-        handleConnectivityBroadcast,
-        fetchInitialData,
-    ]);
+    }, [activeHerdId, herdModules]);
 }

package/dist/hooks/useScoutRefresh.js

@@ -1,6 +1,6 @@
 import { useEffect, useCallback, useRef } from "react";
 import { useAppDispatch } from "../store/hooks";
-import { EnumScoutStateStatus, setActiveHerdId, setHerdModules, setStatus, setHerdModulesLoadingState, setHerdModulesLoadedInMs, setHerdModulesApiDuration, setUserApiDuration, setDataProcessingDuration, setLocalStorageDuration, setUser, setDataSource, setDataSourceInfo, } from "../store/scout";
+import { EnumScoutStateStatus, setHerdModules, setStatus, setHerdModulesLoadingState, setHerdModulesLoadedInMs, setHerdModulesApiDuration, setUserApiDuration, setDataProcessingDuration, setLocalStorageDuration, setUser, setDataSource, setDataSourceInfo, } from "../store/scout";
 import { EnumHerdModulesLoadingState } from "../types/herd_module";
 import { server_load_herd_modules } from "../helpers/herds";
 import { server_get_user } from "../helpers/users";
@@ -275,32 +275,38 @@ export function useScoutRefresh(options = {}) {
             const dataProcessingDuration = Date.now() - dataProcessingStartTime;
             timingRefs.current.dataProcessingDuration = dataProcessingDuration;
             dispatch(setDataProcessingDuration(dataProcessingDuration));
-            // Step 5: Handle localStorage operations
+            // // Step 5: Handle localStorage operations
             const localStorageStartTime = Date.now();
-            try {
-                // Check local storage for a last selected herd
-                const lastSelectedHerd = localStorage.getItem("last_selected_herd");
-                if (lastSelectedHerd) {
-                    const found_herd = compatible_new_herd_modules.find((hm) => hm.herd.id.toString() === lastSelectedHerd)?.herd;
-                    // If herd is found then set it
-                    if (found_herd) {
-                        dispatch(setActiveHerdId(found_herd.id.toString()));
-                    }
-                }
-                // If there is no last selected herd then select the first one
-                else if (compatible_new_herd_modules.length > 0) {
-                    const firstHerdId = compatible_new_herd_modules[0].herd.id.toString();
-                    localStorage.setItem("last_selected_herd", firstHerdId);
-                    dispatch(setActiveHerdId(firstHerdId));
-                }
-            }
-            catch (localStorageError) {
-                console.warn("[useScoutRefresh] localStorage not available:", localStorageError);
-                // Fallback: select first herd without localStorage
-                if (compatible_new_herd_modules.length > 0) {
-                    dispatch(setActiveHerdId(compatible_new_herd_modules[0].herd.id.toString()));
-                }
-            }
+            // try {
+            //   // Check local storage for a last selected herd
+            //   const lastSelectedHerd = localStorage.getItem("last_selected_herd");
+            //   if (lastSelectedHerd) {
+            //     const found_herd = compatible_new_herd_modules.find(
+            //       (hm) => hm.herd.id.toString() === lastSelectedHerd,
+            //     )?.herd;
+            //     // If herd is found then set it
+            //     if (found_herd) {
+            //       dispatch(setActiveHerdId(found_herd.id.toString()));
+            //     }
+            //   }
+            //   // If there is no last selected herd then select the first one
+            //   else if (compatible_new_herd_modules.length > 0) {
+            //     const firstHerdId = compatible_new_herd_modules[0].herd.id.toString();
+            //     localStorage.setItem("last_selected_herd", firstHerdId);
+            //     dispatch(setActiveHerdId(firstHerdId));
+            //   }
+            // } catch (localStorageError) {
+            //   console.warn(
+            //     "[useScoutRefresh] localStorage not available:",
+            //     localStorageError,
+            //   );
+            //   // Fallback: select first herd without localStorage
+            //   if (compatible_new_herd_modules.length > 0) {
+            //     dispatch(
+            //       setActiveHerdId(compatible_new_herd_modules[0].herd.id.toString()),
+            //     );
+            //   }
+            // }
             const localStorageDuration = Date.now() - localStorageStartTime;
             timingRefs.current.localStorageDuration = localStorageDuration;
             dispatch(setLocalStorageDuration(localStorageDuration));

package/package.json

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