@adventurelabs/scout-core 1.0.40 → 1.0.42

package/dist/api_keys/actions.js

@@ -18,18 +18,23 @@ export async function server_list_api_keys(device_id) {
     return data_to_return;
 }
 export async function server_list_api_keys_batch(device_ids) {
-    console.log(`[API Keys Batch] Starting batch load for ${device_ids.length} devices`);
+    const startTime = Date.now();
+    console.log(`[API Keys Batch] Starting batch load for ${device_ids.length} devices at ${new Date().toISOString()}`);
     const supabase = await newServerClient();
+    console.log(`[API Keys Batch] Making RPC call to load_api_keys_batch...`);
     const { data, error } = await supabase.rpc("load_api_keys_batch", {
         device_ids: device_ids,
     });
+    const duration = Date.now() - startTime;
     if (error) {
-        console.error("Error listing API keys in batch:", error.message);
+        console.error(`[API Keys Batch] ERROR after ${duration}ms:`, error.message);
         return {};
     }
-    if (!data)
+    if (!data) {
+        console.log(`[API Keys Batch] No data returned after ${duration}ms`);
         return {};
-    console.log(`[API Keys Batch] Received ${data.length} API key records`);
+    }
+    console.log(`[API Keys Batch] RPC completed in ${duration}ms, received ${data.length} API key records`);
     const result = {};
     // Group API keys by device_id
     data.forEach((item) => {
@@ -42,6 +47,7 @@ export async function server_list_api_keys_batch(device_ids) {
             key: item.api_key_key,
         });
     });
-    console.log(`[API Keys Batch] Returning API keys for ${Object.keys(result).length} devices`);
+    const totalDuration = Date.now() - startTime;
+    console.log(`[API Keys Batch] COMPLETED in ${totalDuration}ms - returning API keys for ${Object.keys(result).length} devices`);
     return result;
 }

package/dist/helpers/tags.js

@@ -147,24 +147,29 @@ export async function server_get_events_and_tags_for_device(device_id, limit = 3
     return IWebResponse.success(eventsWithSignedUrls).to_compatible();
 }
 export async function server_get_events_and_tags_for_devices_batch(device_ids, limit = 1) {
-    console.log(`[Events Batch] Starting batch load for ${device_ids.length} devices (limit: ${limit})`);
+    const startTime = Date.now();
+    console.log(`[Events Batch] Starting batch load for ${device_ids.length} devices (limit: ${limit}) at ${new Date().toISOString()}`);
     const supabase = await newServerClient();
+    console.log(`[Events Batch] Making RPC call to get_events_and_tags_for_devices_batch...`);
     // Use single RPC call for all devices
     const { data, error } = await supabase.rpc("get_events_and_tags_for_devices_batch", {
         device_ids: device_ids,
         limit_per_device: limit,
     });
+    const duration = Date.now() - startTime;
     if (error) {
-        console.error("Error fetching events for devices in batch:", error.message);
+        console.error(`[Events Batch] ERROR after ${duration}ms:`, error.message);
         return {
             status: EnumWebResponse.ERROR,
             msg: error.message,
             data: {},
         };
     }
-    if (!data)
+    if (!data) {
+        console.log(`[Events Batch] No data returned after ${duration}ms`);
         return IWebResponse.success({}).to_compatible();
-    console.log(`[Events Batch] Received ${data.length} event records`);
+    }
+    console.log(`[Events Batch] RPC completed in ${duration}ms, received ${data.length} event records`);
     // Group events by device_id
     const eventsByDevice = {};
     data.forEach((row) => {
@@ -172,47 +177,25 @@ export async function server_get_events_and_tags_for_devices_batch(device_ids, l
         if (!eventsByDevice[device_id]) {
             eventsByDevice[device_id] = [];
         }
-        // Find existing event or create new one
-        let event = eventsByDevice[device_id].find((e) => e.id === row.event_id);
-        if (!event) {
-            event = {
-                id: row.event_id,
-                inserted_at: row.event_inserted_at,
-                message: row.event_message,
-                media_url: row.event_media_url,
-                file_path: row.event_file_path,
-                latitude: row.event_location
-                    ? JSON.parse(row.event_location).coordinates[1]
-                    : null,
-                longitude: row.event_location
-                    ? JSON.parse(row.event_location).coordinates[0]
-                    : null,
-                altitude: row.event_altitude,
-                heading: row.event_heading,
-                media_type: row.event_media_type,
-                device_id: device_id,
-                timestamp_observation: row.event_timestamp_observation,
-                is_public: row.event_is_public,
-                earthranger_url: row.event_earthranger_url,
-                tags: [],
-            };
-            eventsByDevice[device_id].push(event);
-        }
-        // Add tag if it exists
-        if (row.tag_id) {
-            event.tags.push({
-                id: row.tag_id,
-                x: row.tag_x || 0,
-                y: row.tag_y || 0,
-                width: row.tag_width || 0,
-                height: row.tag_height || 0,
-                class_name: row.tag_class_name || "",
-                conf: row.tag_conf || 0,
-                observation_type: row.tag_observation_type || "manual",
-                event_id: row.event_id,
-                inserted_at: row.tag_inserted_at || row.event_inserted_at,
-            });
-        }
+        // Create event object from the new structure
+        const event = {
+            id: row.event_id,
+            inserted_at: row.inserted_at,
+            message: row.message,
+            media_url: row.media_url,
+            file_path: row.file_path,
+            latitude: row.latitude,
+            longitude: row.longitude,
+            altitude: row.altitude,
+            heading: row.heading,
+            media_type: row.media_type,
+            device_id: device_id,
+            timestamp_observation: row.timestamp_observation,
+            is_public: row.is_public,
+            earthranger_url: row.earthranger_url,
+            tags: Array.isArray(row.tags) ? row.tags : [],
+        };
+        eventsByDevice[device_id].push(event);
     });
     // Add signed URLs to all events
     const result = {};
@@ -221,7 +204,8 @@ export async function server_get_events_and_tags_for_devices_batch(device_ids, l
         const eventsWithSignedUrls = await addSignedUrlsToEvents(events, supabase);
         result[parseInt(device_id)] = eventsWithSignedUrls;
     }
-    console.log(`[Events Batch] Returning events for ${Object.keys(result).length} devices`);
+    const totalDuration = Date.now() - startTime;
+    console.log(`[Events Batch] COMPLETED in ${totalDuration}ms - returning events for ${Object.keys(result).length} devices`);
     return IWebResponse.success(result).to_compatible();
 }
 export async function get_event_and_tags_by_event_id(event_id) {

package/dist/providers/ScoutRefreshProvider.d.ts

@@ -760,29 +760,22 @@ export declare function useSupabase(): SupabaseClient<Database, "public", {
                 limit_per_device: number;
             };
             Returns: {
-                device_id: number;
                 event_id: number;
-                event_message: string | null;
-                event_media_url: string | null;
-                event_file_path: string | null;
-                event_location: string | null;
-                event_altitude: number;
-                event_heading: number;
-                event_media_type: string;
-                event_timestamp_observation: string;
-                event_is_public: boolean;
-                event_earthranger_url: string | null;
-                event_session_id: number | null;
-                event_inserted_at: string;
-                tag_id: number | null;
-                tag_x: number | null;
-                tag_y: number | null;
-                tag_width: number | null;
-                tag_height: number | null;
-                tag_class_name: string | null;
-                tag_conf: number | null;
-                tag_observation_type: string | null;
-                tag_inserted_at: string | null;
+                inserted_at: string;
+                message: string | null;
+                media_url: string | null;
+                file_path: string | null;
+                latitude: number | null;
+                longitude: number | null;
+                earthranger_url: string | null;
+                altitude: number;
+                heading: number;
+                media_type: string;
+                device_id: number;
+                timestamp_observation: string;
+                is_public: boolean;
+                tags: import("../types/supabase").Json;
+                herd_id: number | null;
             }[];
         };
     };

package/dist/supabase/server.d.ts

@@ -751,29 +751,22 @@ export declare function newServerClient(): Promise<import("@supabase/supabase-js
                 limit_per_device: number;
             };
             Returns: {
-                device_id: number;
                 event_id: number;
-                event_message: string | null;
-                event_media_url: string | null;
-                event_file_path: string | null;
-                event_location: string | null;
-                event_altitude: number;
-                event_heading: number;
-                event_media_type: string;
-                event_timestamp_observation: string;
-                event_is_public: boolean;
-                event_earthranger_url: string | null;
-                event_session_id: number | null;
-                event_inserted_at: string;
-                tag_id: number | null;
-                tag_x: number | null;
-                tag_y: number | null;
-                tag_width: number | null;
-                tag_height: number | null;
-                tag_class_name: string | null;
-                tag_conf: number | null;
-                tag_observation_type: string | null;
-                tag_inserted_at: string | null;
+                inserted_at: string;
+                message: string | null;
+                media_url: string | null;
+                file_path: string | null;
+                latitude: number | null;
+                longitude: number | null;
+                earthranger_url: string | null;
+                altitude: number;
+                heading: number;
+                media_type: string;
+                device_id: number;
+                timestamp_observation: string;
+                is_public: boolean;
+                tags: import("../types/supabase").Json;
+                herd_id: number | null;
             }[];
         };
     };

package/dist/types/herd_module.js

@@ -59,14 +59,18 @@ export class HerdModule {
             // get api keys and events for all devices in batch
             let recent_events_batch = {};
             if (new_devices.length > 0) {
+                const batchStartTime = Date.now();
                 try {
                     const device_ids = new_devices.map((device) => device.id ?? 0);
-                    console.log(`[HerdModule] Loading batch data for ${device_ids.length} devices:`, device_ids);
+                    console.log(`[HerdModule] Starting parallel batch load for ${device_ids.length} devices at ${new Date().toISOString()}:`, device_ids);
                     // Load API keys and events in parallel
+                    console.log(`[HerdModule] Initiating Promise.all for API keys and events...`);
                     const [api_keys_batch, events_response] = await Promise.all([
                         server_list_api_keys_batch(device_ids),
                         server_get_events_and_tags_for_devices_batch(device_ids, 1),
                     ]);
+                    const batchDuration = Date.now() - batchStartTime;
+                    console.log(`[HerdModule] Parallel batch load completed in ${batchDuration}ms`);
                     // Assign API keys to devices
                     for (let i = 0; i < new_devices.length; i++) {
                         const device_id = new_devices[i].id ?? 0;
@@ -81,7 +85,7 @@ export class HerdModule {
                     }
                 }
                 catch (error) {
-                    console.warn("Failed to load API keys or events for devices:", error);
+                    console.error(`[HerdModule] CRITICAL ERROR in batch load after ${Date.now() - batchStartTime}ms:`, error);
                     // Continue without API keys and events
                 }
             }

package/dist/types/supabase.d.ts

@@ -818,29 +818,22 @@ export type Database = {
                     limit_per_device: number;
                 };
                 Returns: {
-                    device_id: number;
                     event_id: number;
-                    event_message: string | null;
-                    event_media_url: string | null;
-                    event_file_path: string | null;
-                    event_location: string | null;
-                    event_altitude: number;
-                    event_heading: number;
-                    event_media_type: string;
-                    event_timestamp_observation: string;
-                    event_is_public: boolean;
-                    event_earthranger_url: string | null;
-                    event_session_id: number | null;
-                    event_inserted_at: string;
-                    tag_id: number | null;
-                    tag_x: number | null;
-                    tag_y: number | null;
-                    tag_width: number | null;
-                    tag_height: number | null;
-                    tag_class_name: string | null;
-                    tag_conf: number | null;
-                    tag_observation_type: string | null;
-                    tag_inserted_at: string | null;
+                    inserted_at: string;
+                    message: string | null;
+                    media_url: string | null;
+                    file_path: string | null;
+                    latitude: number | null;
+                    longitude: number | null;
+                    earthranger_url: string | null;
+                    altitude: number;
+                    heading: number;
+                    media_type: string;
+                    device_id: number;
+                    timestamp_observation: string;
+                    is_public: boolean;
+                    tags: Json;
+                    herd_id: number | null;
                 }[];
             };
         };

package/package.json

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