@adventurelabs/scout-core 1.0.47 → 1.0.48

package/dist/api_keys/actions.js

@@ -32,19 +32,56 @@ export async function server_list_api_keys(device_id) {
 }
 export async function server_list_api_keys_batch(device_ids) {
     const startTime = Date.now();
-    // CRITICAL: Check for UUIDs being passed instead of device IDs
-    const invalidIds = device_ids.filter((id) => !/^\d+$/.test(id));
-    if (invalidIds.length > 0) {
-        console.error(`[CRITICAL] UUIDs detected instead of device IDs:`, invalidIds);
-        console.error(`[CRITICAL] Valid device IDs should be:`, device_ids.filter((id) => /^\d+$/.test(id)));
-        return {};
-    }
     const supabase = await newServerClient();
-    const { data, error } = await supabase.rpc("load_api_keys_batch", {
-        device_ids: device_ids,
-    });
-    if (error) {
-        console.error(`[API Keys Batch] Database error:`, error.message);
+    // Check if the batch function exists by trying a simple call
+    try {
+        const { data, error } = await supabase.rpc("load_api_keys_batch", {
+            device_ids: device_ids,
+        });
+        if (error) {
+            // Check if it's a "function does not exist" error
+            if (error.message.includes("function") &&
+                error.message.includes("does not exist")) {
+                console.log(`[API Keys Batch] Batch function not deployed, using individual calls...`);
+            }
+            else {
+                console.error(`[API Keys Batch] Database error:`, error.message);
+            }
+            console.log(`[API Keys Batch] Falling back to individual calls...`);
+            // Fallback to individual API key loading
+            const result = {};
+            const promises = device_ids.map(async (device_id) => {
+                try {
+                    const api_keys = await server_list_api_keys(device_id);
+                    result[parseInt(device_id)] = api_keys;
+                }
+                catch (err) {
+                    console.warn(`[API Keys Batch] Failed for device ${device_id}:`, err);
+                    result[parseInt(device_id)] = [];
+                }
+            });
+            await Promise.all(promises);
+            return result;
+        }
+        if (!data) {
+            return {};
+        }
+        const result = {};
+        // Group API keys by device_id
+        data.forEach((item) => {
+            const device_id = item.device_id;
+            if (!result[device_id]) {
+                result[device_id] = [];
+            }
+            result[device_id].push({
+                id: item.api_key_id.toString(),
+                key: item.api_key_key,
+            });
+        });
+        return result;
+    }
+    catch (err) {
+        console.error(`[API Keys Batch] Unexpected error:`, err);
         console.log(`[API Keys Batch] Falling back to individual calls...`);
         // Fallback to individual API key loading
         const result = {};
@@ -61,20 +98,4 @@ export async function server_list_api_keys_batch(device_ids) {
         await Promise.all(promises);
         return result;
     }
-    if (!data) {
-        return {};
-    }
-    const result = {};
-    // Group API keys by device_id
-    data.forEach((item) => {
-        const device_id = item.device_id;
-        if (!result[device_id]) {
-            result[device_id] = [];
-        }
-        result[device_id].push({
-            id: item.api_key_id.toString(),
-            key: item.api_key_key,
-        });
-    });
-    return result;
 }

package/dist/helpers/tags.js

@@ -167,13 +167,6 @@ export async function server_get_events_and_tags_for_device(device_id, limit = 3
 }
 export async function server_get_events_and_tags_for_devices_batch(device_ids, limit = 1) {
     const startTime = Date.now();
-    // CRITICAL: Check for UUIDs being passed instead of device IDs
-    const invalidIds = device_ids.filter((id) => !/^\d+$/.test(id));
-    if (invalidIds.length > 0) {
-        console.error(`[CRITICAL] UUIDs detected instead of device IDs:`, invalidIds);
-        console.error(`[CRITICAL] Valid device IDs should be:`, device_ids.filter((id) => /^\d+$/.test(id)));
-        return IWebResponse.success({}).to_compatible();
-    }
     const supabase = await newServerClient();
     // Use single RPC call for all devices
     const { data, error } = await supabase.rpc("get_events_and_tags_for_devices_batch", {
@@ -187,14 +180,13 @@ export async function server_get_events_and_tags_for_devices_batch(device_ids, l
         const result = {};
         const promises = device_ids.map(async (device_id) => {
             try {
-                const device_id_num = parseInt(device_id);
-                const events_response = await server_get_events_and_tags_for_device(device_id_num, limit);
+                const events_response = await server_get_events_and_tags_for_device(parseInt(device_id), limit);
                 if (events_response.status === EnumWebResponse.SUCCESS &&
                     events_response.data) {
-                    result[device_id_num] = events_response.data;
+                    result[parseInt(device_id)] = events_response.data;
                 }
                 else {
-                    result[device_id_num] = [];
+                    result[parseInt(device_id)] = [];
                 }
             }
             catch (err) {

package/dist/types/herd_module.js

@@ -62,16 +62,6 @@ export class HerdModule {
                 const batchStartTime = Date.now();
                 try {
                     const device_ids = new_devices.map((device) => (device.id ?? 0).toString());
-                    // CRITICAL: Check for UUIDs being passed instead of device IDs
-                    const invalidDeviceIds = device_ids.filter((id) => !/^\d+$/.test(id));
-                    if (invalidDeviceIds.length > 0) {
-                        console.error(`[CRITICAL] UUIDs detected in HerdModule:`, invalidDeviceIds);
-                        console.error(`[CRITICAL] Device objects:`, new_devices.map((d) => ({ id: d.id, created_by: d.created_by })));
-                        // Filter out invalid IDs
-                        const validDeviceIds = device_ids.filter((id) => /^\d+$/.test(id));
-                        device_ids.length = 0;
-                        device_ids.push(...validDeviceIds);
-                    }
                     // Load API keys and events in parallel
                     const [api_keys_batch, events_response] = await Promise.all([
                         server_list_api_keys_batch(device_ids),

package/package.json

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