@adventurelabs/scout-core 1.0.95 → 1.0.97

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 } from "react";
+import { useEffect, useRef, useCallback, useMemo } from "react";
 import { setActiveHerdGpsTrackersConnectivity } from "../store/scout";
 import { server_get_connectivity_by_device_id } from "../helpers/connectivity";
 import { EnumWebResponse } from "../types/requests";
@@ -12,21 +12,40 @@ export function useScoutRealtimeConnectivity(scoutSupabase) {
     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);
+    // Create stable reference for GPS device IDs to prevent unnecessary refetching
+    const gpsDeviceIds = useMemo(() => {
+        if (!activeHerdId)
+            return "";
+        const activeHerdModule = herdModules.find((hm) => hm.herd.id.toString() === activeHerdId);
+        if (!activeHerdModule)
+            return "";
+        const gpsDevices = activeHerdModule.devices.filter((device) => device.device_type &&
+            ["gps_tracker", "gps_tracker_vehicle", "gps_tracker_person"].includes(device.device_type));
+        return gpsDevices
+            .map((d) => d.id)
+            .filter(Boolean)
+            .sort()
+            .join(",");
+    }, [activeHerdId, herdModules]);
     // Handle connectivity broadcasts
     const handleConnectivityBroadcast = useCallback((payload) => {
         const { event, payload: data } = payload;
-        const connectivityData = data.new || data.old;
+        const connectivityData = data.record || data.old_record;
         // Only process GPS tracker data (no session_id)
         if (!connectivityData?.device_id || connectivityData.session_id) {
             return;
         }
         const deviceId = connectivityData.device_id;
         const updatedConnectivity = { ...connectivity };
-        switch (event) {
+        switch (data.operation) {
             case "INSERT":
                 if (!updatedConnectivity[deviceId]) {
                     updatedConnectivity[deviceId] = [];
                 }
+                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) {
@@ -38,6 +57,8 @@ export function useScoutRealtimeConnectivity(scoutSupabase) {
                 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);
                     if (index >= 0) {
                         updatedConnectivity[deviceId][index] = connectivityData;
@@ -46,6 +67,7 @@ export function useScoutRealtimeConnectivity(scoutSupabase) {
                 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) {
                         delete updatedConnectivity[deviceId];
@@ -55,50 +77,43 @@ export function useScoutRealtimeConnectivity(scoutSupabase) {
         }
         console.log("[Connectivity] updating tracker connectivity in response to broadcast");
         dispatch(setActiveHerdGpsTrackersConnectivity(updatedConnectivity));
-    }, [connectivity]);
+    }, [connectivity, dispatch]);
     // Fetch initial connectivity data
     const fetchInitialData = useCallback(async () => {
-        if (!activeHerdId)
+        if (!activeHerdId || !gpsDeviceIds)
             return;
-        const herdId = activeHerdId; // Type narrowing
-        const activeHerdModule = herdModules.find((hm) => hm.herd.id.toString() === herdId);
-        if (!activeHerdModule)
-            return;
-        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) {
+        const deviceIds = gpsDeviceIds.split(",").filter(Boolean).map(Number);
+        if (deviceIds.length === 0) {
             return;
         }
-        console.log(`[Connectivity] Loading data for ${gpsDevices.length} GPS trackers`);
+        console.log(`[Connectivity] Loading data for ${deviceIds.length} GPS trackers`);
         const timestampFilter = getDaysAgoTimestamp(1);
         const connectivityData = {};
-        await Promise.all(gpsDevices.map(async (device) => {
-            if (!device.id)
-                return;
+        await Promise.all(deviceIds.map(async (deviceId) => {
             try {
-                const response = await server_get_connectivity_by_device_id(device.id, timestampFilter);
+                const response = await server_get_connectivity_by_device_id(deviceId, timestampFilter);
                 if (response.status === EnumWebResponse.SUCCESS && response.data) {
                     const trackerData = response.data.filter((conn) => !conn.session_id);
                     if (trackerData.length > 0) {
-                        connectivityData[device.id] = trackerData
+                        connectivityData[deviceId] = trackerData
                             .sort((a, b) => new Date(b.timestamp_start || 0).getTime() -
                             new Date(a.timestamp_start || 0).getTime())
                             .slice(0, 100);
                     }
                 }
                 else {
-                    console.error(`[Connectivity] API error for device ${device.id}:`, response.msg || "Unknown error");
+                    console.warn(`[Connectivity] API error for device ${deviceId}:`, response.msg || "Unknown error");
                 }
             }
             catch (error) {
-                console.error(`[Connectivity] Failed to fetch data for device ${device.id}:`, error);
+                console.warn(`[Connectivity] Failed to fetch data for device ${deviceId}:`, error);
             }
         }));
         dispatch(setActiveHerdGpsTrackersConnectivity(connectivityData));
         console.log(`[Connectivity] Loaded data for ${Object.keys(connectivityData).length} devices`);
-    }, [activeHerdId, herdModules]);
+    }, [activeHerdId, gpsDeviceIds, dispatch]);
     useEffect(() => {
-        if (!scoutSupabase || !activeHerdId || herdModules.length == 0)
+        if (!scoutSupabase || !gpsDeviceIds)
             return;
         // Clean up existing channels
         channels.current.forEach((channel) => scoutSupabase.removeChannel(channel));
@@ -112,7 +127,7 @@ export function useScoutRealtimeConnectivity(scoutSupabase) {
                 console.log(`[Connectivity] ✅ Connected to herd ${activeHerdId}`);
             }
             else if (status === "CHANNEL_ERROR") {
-                console.error(`[Connectivity] ❌ Failed to connect to herd ${activeHerdId}`);
+                console.warn(`[Connectivity] 🟡 Failed to connect to herd ${activeHerdId}`);
             }
         });
         channels.current.push(channel);
@@ -122,5 +137,5 @@ export function useScoutRealtimeConnectivity(scoutSupabase) {
             channels.current.forEach((ch) => scoutSupabase.removeChannel(ch));
             channels.current = [];
         };
-    }, [activeHerdId, herdModules]);
+    }, [gpsDeviceIds]);
 }

package/dist/hooks/useScoutRealtimeDevices.js

@@ -9,21 +9,20 @@ export function useScoutRealtimeDevices(scoutSupabase) {
     const activeHerdId = useSelector((state) => state.scout.active_herd_id);
     // Device broadcast handler
     const handleDeviceBroadcast = useCallback((payload) => {
-        console.log("[Devices] Broadcast received:", payload.payload.event);
-        const event = payload.payload.event;
+        console.log("[Devices] Broadcast received:", payload.payload.operation);
         const data = payload.payload;
-        switch (event) {
+        switch (data.operation) {
             case "INSERT":
-                if (data.new)
-                    dispatch(addDevice(data.new));
+                if (data.record)
+                    dispatch(addDevice(data.record));
                 break;
             case "UPDATE":
-                if (data.new)
-                    dispatch(updateDevice(data.new));
+                if (data.record)
+                    dispatch(updateDevice(data.record));
                 break;
             case "DELETE":
-                if (data.old)
-                    dispatch(deleteDevice(data.old));
+                if (data.old_record)
+                    dispatch(deleteDevice(data.old_record));
                 break;
         }
     }, [dispatch]);

package/package.json

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