@adventurelabs/scout-core 1.0.37 → 1.0.39

package/dist/hooks/useScoutDbListener.d.ts

@@ -4,7 +4,6 @@ declare enum ConnectionState {
     DISCONNECTED = "disconnected",
     CONNECTING = "connecting",
     CONNECTED = "connected",
-    RECONNECTING = "reconnecting",
     ERROR = "error"
 }
 /**
@@ -28,3 +27,39 @@ export declare function useScoutDbListener(scoutSupabase: SupabaseClient<Databas
     isConnecting: boolean;
 };
 export {};
+/**
+ * Return type for useScoutDbListener hook
+ *
+ * @example
+ * ```tsx
+ * function MyComponent() {
+ *   const {
+ *     isConnected,
+ *     isConnecting,
+ *     lastError,
+ *     retryCount,
+ *     reconnect
+ *   } = useConnectionStatus();
+ *
+ *   if (isConnecting) {
+ *     return <div>Connecting to database...</div>;
+ *   }
+ *
+ *   if (lastError) {
+ *     return (
+ *       <div>
+ *         <p>Connection error: {lastError}</p>
+ *         <p>Retry attempts: {retryCount}</p>
+ *         <button onClick={reconnect}>Reconnect</button>
+ *       </div>
+ *     );
+ *   }
+ *
+ *   if (!isConnected) {
+ *     return <div>Disconnected from database</div>;
+ *   }
+ *
+ *   return <div>Connected to database</div>;
+ * }
+ * ```
+ */

package/dist/hooks/useScoutDbListener.js

@@ -8,7 +8,6 @@ var ConnectionState;
     ConnectionState["DISCONNECTED"] = "disconnected";
     ConnectionState["CONNECTING"] = "connecting";
     ConnectionState["CONNECTED"] = "connected";
-    ConnectionState["RECONNECTING"] = "reconnecting";
     ConnectionState["ERROR"] = "error";
 })(ConnectionState || (ConnectionState = {}));
 // Reconnection configuration
@@ -107,118 +106,46 @@ export function useScoutDbListener(scoutSupabase) {
             return false;
         }
     }, []);
-    // Event handlers
-    const handleTagInserts = useCallback((payload) => {
-        console.log("[DB Listener] Tag INSERT received:", payload);
-        if (!payload.new) {
-            console.error("[DB Listener] Tag INSERT - Invalid payload, missing new data");
-            return;
-        }
-        dispatch(addTag(payload.new));
-    }, [dispatch]);
-    const handleTagDeletes = useCallback((payload) => {
-        console.log("[DB Listener] Tag DELETE received:", payload);
-        if (!payload.old || !payload.old.id) {
-            console.error("[DB Listener] Tag DELETE - Invalid payload, missing tag data");
-            return;
-        }
-        dispatch(deleteTag(payload.old));
-    }, [dispatch]);
-    const handleTagUpdates = useCallback((payload) => {
-        console.log("[DB Listener] Tag UPDATE received:", payload);
-        if (!payload.new) {
-            console.error("[DB Listener] Tag UPDATE - Invalid payload, missing new data");
-            return;
-        }
-        dispatch(updateTag(payload.new));
-    }, [dispatch]);
-    const handleDeviceInserts = useCallback((payload) => {
-        console.log("[DB Listener] Device INSERT received:", payload);
-        if (!payload.new) {
-            console.error("[DB Listener] Device INSERT - Invalid payload, missing new data");
-            return;
-        }
-        dispatch(addDevice(payload.new));
-    }, [dispatch]);
-    const handleDeviceDeletes = useCallback((payload) => {
-        console.log("[DB Listener] Device DELETE received:", payload);
-        if (!payload.old) {
-            console.error("[DB Listener] Device DELETE - Invalid payload, missing old data");
-            return;
-        }
-        dispatch(deleteDevice(payload.old));
-    }, [dispatch]);
-    const handleDeviceUpdates = useCallback((payload) => {
-        console.log("[DB Listener] Device UPDATE received:", payload);
-        if (!payload.new) {
-            console.error("[DB Listener] Device UPDATE - Invalid payload, missing new data");
-            return;
-        }
-        dispatch(updateDevice(payload.new));
-    }, [dispatch]);
-    const handlePlanInserts = useCallback((payload) => {
-        console.log("[DB Listener] Plan INSERT received:", payload);
-        if (!payload.new) {
-            console.error("[DB Listener] Plan INSERT - Invalid payload, missing new data");
-            return;
-        }
-        dispatch(addPlan(payload.new));
-    }, [dispatch]);
-    const handlePlanDeletes = useCallback((payload) => {
-        console.log("[DB Listener] Plan DELETE received:", payload);
-        if (!payload.old) {
-            console.error("[DB Listener] Plan DELETE - Invalid payload, missing old data");
-            return;
-        }
-        dispatch(deletePlan(payload.old));
-    }, [dispatch]);
-    const handlePlanUpdates = useCallback((payload) => {
-        console.log("[DB Listener] Plan UPDATE received:", payload);
-        if (!payload.new) {
-            console.error("[DB Listener] Plan UPDATE - Invalid payload, missing new data");
-            return;
-        }
-        dispatch(updatePlan(payload.new));
-    }, [dispatch]);
-    const handleSessionInserts = useCallback((payload) => {
-        console.log("[DB Listener] Session INSERT received:", payload);
-        if (!payload.new) {
-            console.error("[DB Listener] Session INSERT - Invalid payload, missing new data");
-            return;
-        }
-        dispatch(addSessionToStore(payload.new));
-    }, [dispatch]);
-    const handleSessionDeletes = useCallback((payload) => {
-        console.log("[DB Listener] Session DELETE received:", payload);
-        if (!payload.old) {
-            console.error("[DB Listener] Session DELETE - Invalid payload, missing old data");
-            return;
-        }
-        dispatch(deleteSessionFromStore(payload.old));
-    }, [dispatch]);
-    const handleSessionUpdates = useCallback((payload) => {
-        console.log("[DB Listener] Session UPDATE received:", payload);
-        if (!payload.new) {
-            console.error("[DB Listener] Session UPDATE - Invalid payload, missing new data");
-            return;
-        }
-        dispatch(updateSessionInStore(payload.new));
-    }, [dispatch]);
-    const handleConnectivityInserts = useCallback((payload) => {
-        console.log("[DB Listener] Connectivity INSERT received:", payload);
-        // For now, we'll just log connectivity changes since they're related to sessions
-        // In the future, we might want to update session connectivity data
-    }, []);
-    const handleConnectivityDeletes = useCallback((payload) => {
-        console.log("[DB Listener] Connectivity DELETE received:", payload);
-        // For now, we'll just log connectivity changes since they're related to sessions
-        // In the future, we might want to update session connectivity data
-    }, []);
-    const handleConnectivityUpdates = useCallback((payload) => {
-        console.log("[DB Listener] Connectivity UPDATE received:", payload);
-        // For now, we'll just log connectivity changes since they're related to sessions
-        // In the future, we might want to update session connectivity data
+    // Generic event handler factory
+    const createEventHandler = useCallback((action, dataKey, entityName) => {
+        return (payload) => {
+            console.log(`[DB Listener] ${entityName} ${payload.event} received:`, payload);
+            const data = payload[dataKey];
+            if (!data) {
+                console.error(`[DB Listener] ${entityName} ${payload.event} - Invalid payload, missing ${dataKey} data`);
+                return;
+            }
+            action(data);
+        };
     }, []);
+    // Create event handlers using the factory
+    const handlers = useCallback(() => ({
+        tags: {
+            INSERT: createEventHandler(dispatch.bind(null, addTag), "new", "Tag"),
+            UPDATE: createEventHandler(dispatch.bind(null, updateTag), "new", "Tag"),
+            DELETE: createEventHandler(dispatch.bind(null, deleteTag), "old", "Tag"),
+        },
+        devices: {
+            INSERT: createEventHandler(dispatch.bind(null, addDevice), "new", "Device"),
+            UPDATE: createEventHandler(dispatch.bind(null, updateDevice), "new", "Device"),
+            DELETE: createEventHandler(dispatch.bind(null, deleteDevice), "old", "Device"),
+        },
+        plans: {
+            INSERT: createEventHandler(dispatch.bind(null, addPlan), "new", "Plan"),
+            UPDATE: createEventHandler(dispatch.bind(null, updatePlan), "new", "Plan"),
+            DELETE: createEventHandler(dispatch.bind(null, deletePlan), "old", "Plan"),
+        },
+        sessions: {
+            INSERT: createEventHandler(dispatch.bind(null, addSessionToStore), "new", "Session"),
+            UPDATE: createEventHandler(dispatch.bind(null, updateSessionInStore), "new", "Session"),
+            DELETE: createEventHandler(dispatch.bind(null, deleteSessionFromStore), "old", "Session"),
+        },
+        connectivity: {
+            INSERT: (payload) => console.log("[DB Listener] Connectivity INSERT received:", payload),
+            UPDATE: (payload) => console.log("[DB Listener] Connectivity UPDATE received:", payload),
+            DELETE: (payload) => console.log("[DB Listener] Connectivity DELETE received:", payload),
+        },
+    }), [createEventHandler, dispatch]);
     // Create a channel with proper error handling
     const createChannel = useCallback((tableName) => {
         if (!supabase.current)
@@ -233,11 +160,8 @@ export function useScoutDbListener(scoutSupabase) {
             channel
                 .on("system", { event: "disconnect" }, () => {
                 console.log(`[DB Listener] 🔌 ${tableName} channel disconnected`);
-                if (connectionState === ConnectionState.CONNECTED) {
-                    setConnectionState(ConnectionState.DISCONNECTED);
-                    setLastError("Channel disconnected");
-                    scheduleReconnection();
-                }
+                setConnectionState(ConnectionState.DISCONNECTED);
+                setLastError("Channel disconnected");
             })
                 .on("system", { event: "reconnect" }, () => {
                 console.log(`[DB Listener] 🔗 ${tableName} channel reconnected`);
@@ -252,68 +176,29 @@ export function useScoutDbListener(scoutSupabase) {
             console.error(`[DB Listener] Failed to create ${tableName} channel:`, error);
             return null;
         }
-    }, [connectionState]);
+    }, []);
     // Set up all channels
     const setupChannels = useCallback(async () => {
         if (!supabase.current)
             return false;
         cleanupChannels();
-        const channelConfigs = [
-            {
-                name: "plans",
-                handlers: {
-                    INSERT: handlePlanInserts,
-                    UPDATE: handlePlanUpdates,
-                    DELETE: handlePlanDeletes,
-                },
-            },
-            {
-                name: "devices",
-                handlers: {
-                    INSERT: handleDeviceInserts,
-                    UPDATE: handleDeviceUpdates,
-                    DELETE: handleDeviceDeletes,
-                },
-            },
-            {
-                name: "tags",
-                handlers: {
-                    INSERT: handleTagInserts,
-                    UPDATE: handleTagUpdates,
-                    DELETE: handleTagDeletes,
-                },
-            },
-            {
-                name: "sessions",
-                handlers: {
-                    INSERT: handleSessionInserts,
-                    UPDATE: handleSessionUpdates,
-                    DELETE: handleSessionDeletes,
-                },
-            },
-            {
-                name: "connectivity",
-                handlers: {
-                    INSERT: handleConnectivityInserts,
-                    UPDATE: handleConnectivityUpdates,
-                    DELETE: handleConnectivityDeletes,
-                },
-            },
-        ];
+        const tableHandlers = handlers();
+        const tables = Object.keys(tableHandlers);
         let successCount = 0;
-        const totalChannels = channelConfigs.length;
-        for (const config of channelConfigs) {
-            const channel = createChannel(config.name);
+        const totalChannels = tables.length;
+        for (const tableName of tables) {
+            const channel = createChannel(tableName);
             if (!channel)
                 continue;
             try {
                 // Set up event handlers
-                Object.entries(config.handlers).forEach(([event, handler]) => {
+                const tableHandler = tableHandlers[tableName];
+                Object.entries(tableHandler).forEach(([event, handler]) => {
                     channel.on("broadcast", { event }, handler);
                 });
                 // Subscribe to the channel
-                const _subscription = channel.subscribe((status) => {
-                    console.log(`[DB Listener] ${config.name} channel status:`, status);
+                channel.subscribe((status) => {
+                    console.log(`[DB Listener] ${tableName} channel status:`, status);
                     if (status === "SUBSCRIBED") {
                         successCount++;
                         if (successCount === totalChannels) {
@@ -324,36 +209,18 @@ export function useScoutDbListener(scoutSupabase) {
                         }
                     }
                     else if (status === "CHANNEL_ERROR" || status === "TIMED_OUT") {
-                        console.error(`[DB Listener] ${config.name} channel failed to subscribe:`, status);
+                        console.error(`[DB Listener] ${tableName} channel failed to subscribe:`, status);
                         setLastError(`Channel subscription failed: ${status}`);
                     }
                 });
                 channels.current.push(channel);
             }
             catch (error) {
-                console.error(`[DB Listener] Failed to set up ${config.name} channel:`, error);
+                console.error(`[DB Listener] Failed to set up ${tableName} channel:`, error);
             }
         }
         return successCount > 0;
-    }, [
-        cleanupChannels,
-        createChannel,
-        handlePlanInserts,
-        handlePlanUpdates,
-        handlePlanDeletes,
-        handleDeviceInserts,
-        handleDeviceUpdates,
-        handleDeviceDeletes,
-        handleTagInserts,
-        handleTagUpdates,
-        handleTagDeletes,
-        handleSessionInserts,
-        handleSessionUpdates,
-        handleSessionDeletes,
-        handleConnectivityInserts,
-        handleConnectivityUpdates,
-        handleConnectivityDeletes,
-    ]);
+    }, [cleanupChannels, createChannel, handlers]);
     // Schedule reconnection with exponential backoff
     const scheduleReconnection = useCallback(() => {
         if (isDestroyedRef.current ||
@@ -455,7 +322,6 @@ export function useScoutDbListener(scoutSupabase) {
         retryCount,
         reconnect,
         isConnected: connectionState === ConnectionState.CONNECTED,
-        isConnecting: connectionState === ConnectionState.CONNECTING ||
-            connectionState === ConnectionState.RECONNECTING,
+        isConnecting: connectionState === ConnectionState.CONNECTING,
     };
 }

package/dist/providers/ScoutRefreshProvider.d.ts

@@ -630,25 +630,11 @@ export declare function useSupabase(): SupabaseClient<Database, "public", {
             };
             Returns: Database["public"]["CompositeTypes"]["device_pretty_location"];
         };
-        get_device_from_api_key: {
+        get_device_by_api_key: {
             Args: {
                 device_api_key: string;
             };
-            Returns: {
-                altitude: number | null;
-                created_by: string;
-                description: string;
-                device_type: Database["public"]["Enums"]["device_type"];
-                domain_name: string | null;
-                heading: number | null;
-                herd_id: number;
-                id: number;
-                inserted_at: string;
-                location: unknown | null;
-                name: string;
-                video_publisher_token: string | null;
-                video_subscriber_token: string | null;
-            };
+            Returns: Database["public"]["CompositeTypes"]["device_pretty_location"];
         };
         get_device_id_from_key: {
             Args: {

package/dist/providers/ScoutRefreshProvider.js

@@ -33,14 +33,17 @@ export function ScoutRefreshProvider({ children }) {
         console.log("[ScoutRefreshProvider] Created Supabase client");
     }
     // Use the enhanced DB listener with connection status
-    const connectionStatus = useScoutDbListener(supabaseRef.current);
+    useScoutDbListener(supabaseRef.current);
     useScoutRefresh();
-    // Log connection status changes for debugging
-    if (connectionStatus.lastError) {
-        console.warn("[ScoutRefreshProvider] DB Listener error:", connectionStatus.lastError);
-    }
-    if (connectionStatus.isConnected) {
-        console.log("[ScoutRefreshProvider] ✅ DB Listener connected");
-    }
-    return (_jsx(SupabaseContext.Provider, { value: supabaseRef.current, children: _jsx(ConnectionStatusContext.Provider, { value: connectionStatus, children: children }) }));
+    // // Log connection status changes for debugging
+    // if (connectionStatus.lastError) {
+    //   console.warn(
+    //     "[ScoutRefreshProvider] DB Listener error:",
+    //     connectionStatus.lastError
+    //   );
+    // }
+    // if (connectionStatus.isConnected) {
+    //   console.log("[ScoutRefreshProvider] ✅ DB Listener connected");
+    // }
+    return (_jsx(SupabaseContext.Provider, { value: supabaseRef.current, children: children }));
 }

package/dist/store/scout.js

@@ -68,7 +68,10 @@ export const scoutSlice = createSlice({
         addTag(state, action) {
             for (const herd_module of state.herd_modules) {
                 for (const event of herd_module.events) {
-                    if (event.id === action.payload.event_id && event.tags) {
+                    if (event.id === action.payload.event_id) {
+                        if (event.tags == undefined || event.tags == null) {
+                            event.tags = [];
+                        }
                         event.tags.push(action.payload);
                         return;
                     }

package/dist/supabase/server.d.ts

@@ -621,25 +621,11 @@ export declare function newServerClient(): Promise<import("@supabase/supabase-js
             };
             Returns: Database["public"]["CompositeTypes"]["device_pretty_location"];
         };
-        get_device_from_api_key: {
+        get_device_by_api_key: {
             Args: {
                 device_api_key: string;
             };
-            Returns: {
-                altitude: number | null;
-                created_by: string;
-                description: string;
-                device_type: Database["public"]["Enums"]["device_type"];
-                domain_name: string | null;
-                heading: number | null;
-                herd_id: number;
-                id: number;
-                inserted_at: string;
-                location: unknown | null;
-                name: string;
-                video_publisher_token: string | null;
-                video_subscriber_token: string | null;
-            };
+            Returns: Database["public"]["CompositeTypes"]["device_pretty_location"];
         };
         get_device_id_from_key: {
             Args: {

package/dist/types/supabase.d.ts

@@ -688,25 +688,11 @@ export type Database = {
                 };
                 Returns: Database["public"]["CompositeTypes"]["device_pretty_location"];
             };
-            get_device_from_api_key: {
+            get_device_by_api_key: {
                 Args: {
                     device_api_key: string;
                 };
-                Returns: {
-                    altitude: number | null;
-                    created_by: string;
-                    description: string;
-                    device_type: Database["public"]["Enums"]["device_type"];
-                    domain_name: string | null;
-                    heading: number | null;
-                    herd_id: number;
-                    id: number;
-                    inserted_at: string;
-                    location: unknown | null;
-                    name: string;
-                    video_publisher_token: string | null;
-                    video_subscriber_token: string | null;
-                };
+                Returns: Database["public"]["CompositeTypes"]["device_pretty_location"];
             };
             get_device_id_from_key: {
                 Args: {

package/package.json

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