@adventurelabs/scout-core 1.4.59 → 1.4.60

package/dist/hooks/useScoutRealtimeDevices.js

@@ -6,26 +6,26 @@ export function useScoutRealtimeDevices(scoutSupabase) {
     const channels = useRef([]);
     const [latestDeviceUpdate, setLatestDeviceUpdate] = useState(null);
     const activeHerdId = useSelector((state) => state.scout.active_herd_id);
-    // Device broadcast handler - just pass data, don't mutate state
-    const handleDeviceBroadcast = useCallback((payload) => {
-        console.log("[Devices] Broadcast received:", payload.payload.operation);
-        const data = payload.payload;
-        const deviceData = data.record || data.old_record;
+    const handleDeviceBroadcast = useCallback((message) => {
+        const { payload: data } = message;
+        if (data.table !== "devices" || data.schema !== "public") {
+            return;
+        }
+        const deviceData = data.operation === "DELETE"
+            ? data.old_record
+            : data.record ?? data.old_record;
         if (!deviceData)
             return;
         let operation;
         switch (data.operation) {
             case "INSERT":
                 operation = EnumRealtimeOperation.INSERT;
-                console.log("[Devices] New device received:", data.record);
                 break;
             case "UPDATE":
                 operation = EnumRealtimeOperation.UPDATE;
-                console.log("[Devices] Device updated:", data.record);
                 break;
             case "DELETE":
                 operation = EnumRealtimeOperation.DELETE;
-                console.log("[Devices] Device deleted:", data.old_record);
                 break;
             default:
                 return;
@@ -34,40 +34,35 @@ export function useScoutRealtimeDevices(scoutSupabase) {
             data: deviceData,
             operation,
         };
-        console.log(`[scout-core realtime] DEVICE ${data.operation} received:`, JSON.stringify(realtimeData));
         setLatestDeviceUpdate(realtimeData);
     }, []);
-    // Clear latest update
     const clearLatestUpdate = useCallback(() => {
         setLatestDeviceUpdate(null);
     }, []);
-    const cleanupChannels = () => {
+    useEffect(() => {
+        if (!scoutSupabase)
+            return;
         channels.current.forEach((channel) => scoutSupabase.removeChannel(channel));
         channels.current = [];
-    };
-    const createDevicesChannel = (herdId) => {
-        return scoutSupabase
-            .channel(`${herdId}-devices`, { config: { private: true } })
-            .on("broadcast", { event: "*" }, handleDeviceBroadcast)
-            .subscribe((status) => {
-            if (status === "SUBSCRIBED") {
-                console.log(`[Devices] ✅ Connected to herd ${herdId}`);
-            }
-            else if (status === "CHANNEL_ERROR") {
-                console.warn(`[Devices] 🟡 Failed to connect to herd ${herdId}`);
-            }
-        });
-    };
-    useEffect(() => {
-        cleanupChannels();
-        // Clear previous update when switching herds
         clearLatestUpdate();
-        // Create devices channel for active herd
         if (activeHerdId) {
-            const channel = createDevicesChannel(activeHerdId);
+            const channel = scoutSupabase
+                .channel(`${activeHerdId}-devices`, { config: { private: true } })
+                .on("broadcast", { event: "*" }, handleDeviceBroadcast)
+                .subscribe((status) => {
+                if (status === "SUBSCRIBED") {
+                    console.log(`[Devices] ✅ Connected to herd ${activeHerdId}`);
+                }
+                else if (status === "CHANNEL_ERROR") {
+                    console.warn(`[Devices] 🟡 Failed to connect to herd ${activeHerdId}`);
+                }
+            });
             channels.current.push(channel);
         }
-        return cleanupChannels;
-    }, [activeHerdId, clearLatestUpdate]);
+        return () => {
+            channels.current.forEach((ch) => scoutSupabase.removeChannel(ch));
+            channels.current = [];
+        };
+    }, [scoutSupabase, activeHerdId, handleDeviceBroadcast, clearLatestUpdate]);
     return [latestDeviceUpdate, clearLatestUpdate];
 }

package/dist/store/scout.js

@@ -96,9 +96,26 @@ export const scoutSlice = createSlice({
         },
         updateDeviceForHerdModule: (state, action) => {
             const { herd_id, device } = action.payload;
-            const herd_module = state.herd_modules.find((hm) => hm.herd.id?.toString() === herd_id);
-            if (herd_module) {
-                herd_module.devices = herd_module.devices.map((d) => d.id === device.id ? device : d);
+            const targetHerdKey = device.herd_id != null
+                ? String(device.herd_id)
+                : herd_id;
+            if (device.herd_id != null) {
+                for (const hm of state.herd_modules) {
+                    if (hm.herd.id?.toString() !== targetHerdKey) {
+                        hm.devices = hm.devices.filter((d) => d.id !== device.id);
+                    }
+                }
+            }
+            const herd_module = state.herd_modules.find((hm) => hm.herd.id?.toString() === targetHerdKey);
+            if (!herd_module) {
+                return;
+            }
+            const i = herd_module.devices.findIndex((d) => d.id === device.id);
+            if (i >= 0) {
+                herd_module.devices[i] = device;
+            }
+            else {
+                herd_module.devices.push(device);
             }
         },
         // append device to herd module

package/package.json

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