@adventurelabs/scout-core 1.0.97 → 1.0.99

package/dist/hooks/useScoutRealtimeConnectivity.js

@@ -40,38 +40,60 @@ export function useScoutRealtimeConnectivity(scoutSupabase) {
         switch (data.operation) {
             case "INSERT":
                 if (!updatedConnectivity[deviceId]) {
-                    updatedConnectivity[deviceId] = [];
+                    updatedConnectivity[deviceId] = {
+                        most_recent: connectivityData,
+                        history: [connectivityData],
+                    };
                 }
                 else {
-                    // Create a copy of the existing array to avoid mutating immutable state
-                    updatedConnectivity[deviceId] = [...updatedConnectivity[deviceId]];
-                }
-                updatedConnectivity[deviceId].push(connectivityData);
-                // Keep only recent 100 entries
-                if (updatedConnectivity[deviceId].length > 100) {
-                    updatedConnectivity[deviceId] = updatedConnectivity[deviceId]
+                    // Create a copy of the existing historical data
+                    const newHistory = [
+                        ...updatedConnectivity[deviceId].history,
+                        connectivityData,
+                    ];
+                    // Keep only recent 100 entries
+                    const sortedHistory = newHistory
                         .sort((a, b) => new Date(b.timestamp_start || 0).getTime() -
                         new Date(a.timestamp_start || 0).getTime())
                         .slice(0, 100);
+                    updatedConnectivity[deviceId] = {
+                        most_recent: sortedHistory[0],
+                        history: sortedHistory,
+                    };
                 }
                 break;
             case "UPDATE":
                 if (updatedConnectivity[deviceId]) {
-                    // Create a copy of the array before modifying
-                    updatedConnectivity[deviceId] = [...updatedConnectivity[deviceId]];
-                    const index = updatedConnectivity[deviceId].findIndex((c) => c.id === connectivityData.id);
+                    // Create a copy of the history array before modifying
+                    const newHistory = [...updatedConnectivity[deviceId].history];
+                    const index = newHistory.findIndex((c) => c.id === connectivityData.id);
                     if (index >= 0) {
-                        updatedConnectivity[deviceId][index] = connectivityData;
+                        newHistory[index] = connectivityData;
+                        // Update most_recent if this was the most recent item
+                        const sortedHistory = newHistory.sort((a, b) => new Date(b.timestamp_start || 0).getTime() -
+                            new Date(a.timestamp_start || 0).getTime());
+                        updatedConnectivity[deviceId] = {
+                            most_recent: sortedHistory[0],
+                            history: sortedHistory,
+                        };
                     }
                 }
                 break;
             case "DELETE":
                 if (updatedConnectivity[deviceId]) {
                     // Filter creates a new array, so this is safe
-                    updatedConnectivity[deviceId] = updatedConnectivity[deviceId].filter((c) => c.id !== connectivityData.id);
-                    if (updatedConnectivity[deviceId].length === 0) {
+                    const newHistory = updatedConnectivity[deviceId].history.filter((c) => c.id !== connectivityData.id);
+                    if (newHistory.length === 0) {
                         delete updatedConnectivity[deviceId];
                     }
+                    else {
+                        const sortedHistory = newHistory.sort((a, b) => new Date(b.timestamp_start || 0).getTime() -
+                            new Date(a.timestamp_start || 0).getTime());
+                        updatedConnectivity[deviceId] = {
+                            most_recent: sortedHistory[0],
+                            history: sortedHistory,
+                        };
+                    }
                 }
                 break;
         }
@@ -80,7 +102,7 @@ export function useScoutRealtimeConnectivity(scoutSupabase) {
     }, [connectivity, dispatch]);
     // Fetch initial connectivity data
     const fetchInitialData = useCallback(async () => {
-        if (!activeHerdId || !gpsDeviceIds)
+        if (!gpsDeviceIds)
             return;
         const deviceIds = gpsDeviceIds.split(",").filter(Boolean).map(Number);
         if (deviceIds.length === 0) {
@@ -95,10 +117,14 @@ export function useScoutRealtimeConnectivity(scoutSupabase) {
                 if (response.status === EnumWebResponse.SUCCESS && response.data) {
                     const trackerData = response.data.filter((conn) => !conn.session_id);
                     if (trackerData.length > 0) {
-                        connectivityData[deviceId] = trackerData
+                        const sortedData = trackerData
                             .sort((a, b) => new Date(b.timestamp_start || 0).getTime() -
                             new Date(a.timestamp_start || 0).getTime())
                             .slice(0, 100);
+                        connectivityData[deviceId] = {
+                            most_recent: sortedData[0],
+                            history: sortedData,
+                        };
                     }
                 }
                 else {
@@ -111,10 +137,11 @@ export function useScoutRealtimeConnectivity(scoutSupabase) {
         }));
         dispatch(setActiveHerdGpsTrackersConnectivity(connectivityData));
         console.log(`[Connectivity] Loaded data for ${Object.keys(connectivityData).length} devices`);
-    }, [activeHerdId, gpsDeviceIds, dispatch]);
+    }, [gpsDeviceIds, dispatch]);
     useEffect(() => {
-        if (!scoutSupabase || !gpsDeviceIds)
+        if (!scoutSupabase || gpsDeviceIds === "")
             return;
+        console.log(`[Connectivity Hook] Loading data for ${gpsDeviceIds}`);
         // Clean up existing channels
         channels.current.forEach((channel) => scoutSupabase.removeChannel(channel));
         channels.current = [];
@@ -137,5 +164,11 @@ export function useScoutRealtimeConnectivity(scoutSupabase) {
             channels.current.forEach((ch) => scoutSupabase.removeChannel(ch));
             channels.current = [];
         };
-    }, [gpsDeviceIds]);
+    }, [
+        scoutSupabase,
+        gpsDeviceIds,
+        activeHerdId,
+        handleConnectivityBroadcast,
+        fetchInitialData,
+    ]);
 }

package/dist/hooks/useScoutRealtimeDevices.js

@@ -39,7 +39,7 @@ export function useScoutRealtimeDevices(scoutSupabase) {
                 console.log(`[Devices] ✅ Connected to herd ${herdId}`);
             }
             else if (status === "CHANNEL_ERROR") {
-                console.error(`[Devices] ❌ Failed to connect to herd ${herdId}`);
+                console.warn(`[Devices] 🟡 Failed to connect to herd ${herdId}`);
             }
         });
     };

package/dist/types/connectivity.d.ts

@@ -1,4 +1,5 @@
+import { HistoricalData } from "./historical";
 import { IConnectivityWithCoordinates } from "./db";
 export type MapDeviceIdToConnectivity = {
-    [deviceId: number]: IConnectivityWithCoordinates[];
+    [deviceId: number]: HistoricalData<IConnectivityWithCoordinates>;
 };

package/dist/types/data.d.ts

@@ -0,0 +1,4 @@
+export type HistoricalData<T> = {
+    most_recent: T;
+    history: T[];
+};

package/dist/types/data.js

@@ -0,0 +1 @@
+export {};

package/dist/types/historical.d.ts

@@ -0,0 +1,4 @@
+export type HistoricalData<T> = {
+    most_recent: T;
+    history: T[];
+};

package/dist/types/historical.js

@@ -0,0 +1 @@
+export {};

package/dist/types/index.d.ts

@@ -7,3 +7,4 @@ export * from "./supabase";
 export * from "./events";
 export * from "./data_source";
 export * from "./connectivity";
+export * from "./historical";

package/dist/types/index.js

@@ -7,3 +7,4 @@ export * from "./supabase";
 export * from "./events";
 export * from "./data_source";
 export * from "./connectivity";
+export * from "./historical";

package/package.json

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