@adventurelabs/scout-core 1.0.29 → 1.0.31

package/dist/helpers/events.d.ts

@@ -1,6 +1,11 @@
 import { IEvent } from "../types/db";
 import { IWebResponseCompatible } from "../types/requests";
-export declare function server_get_events_by_herd(herd_id: number): Promise<IWebResponseCompatible<IEvent[]>>;
-export declare function server_get_more_events_by_herd(herd_id: number, offset: number, page_count?: number): Promise<IWebResponseCompatible<IEvent[]>>;
-export declare function server_get_total_events_by_herd(herd_id: number): Promise<IWebResponseCompatible<number>>;
+export declare enum EnumSessionsVisibility {
+    Only = 0,
+    Exclude = 1,
+    Combine = 2
+}
+export declare function server_get_events_by_herd(herd_id: number, sessions_visibility: EnumSessionsVisibility): Promise<IWebResponseCompatible<IEvent[]>>;
+export declare function server_get_more_events_by_herd(herd_id: number, offset: number, page_count: number | undefined, includeSessionEvents: boolean): Promise<IWebResponseCompatible<IEvent[]>>;
+export declare function server_get_total_events_by_herd(herd_id: number, sessions_visibility: EnumSessionsVisibility): Promise<IWebResponseCompatible<number>>;
 export declare function server_create_event(newEvent: any): Promise<IWebResponseCompatible<boolean>>;

package/dist/helpers/events.js

@@ -2,18 +2,31 @@
 import { newServerClient } from "../supabase/server";
 import { EnumWebResponse, IWebResponse, } from "../types/requests";
 import { addSignedUrlsToEvents } from "./storage";
-export async function server_get_events_by_herd(herd_id) {
+export var EnumSessionsVisibility;
+(function (EnumSessionsVisibility) {
+    EnumSessionsVisibility[EnumSessionsVisibility["Only"] = 0] = "Only";
+    EnumSessionsVisibility[EnumSessionsVisibility["Exclude"] = 1] = "Exclude";
+    EnumSessionsVisibility[EnumSessionsVisibility["Combine"] = 2] = "Combine";
+})(EnumSessionsVisibility || (EnumSessionsVisibility = {}));
+export async function server_get_events_by_herd(herd_id, sessions_visibility) {
     const supabase = await newServerClient();
     // fetch events and include devices
     // sort by timestamp
-    const { data } = await supabase
+    let query = supabase
         .from("events")
         .select(`
       *,
       devices: devices!inner(*)
       `)
-        .eq("devices.herd_id", herd_id)
-        .order("timestamp_observation", { ascending: false });
+        .eq("devices.herd_id", herd_id);
+    // Apply session filter based on sessions_visibility
+    if (sessions_visibility === EnumSessionsVisibility.Only) {
+        query = query.not("session_id", "is", null);
+    }
+    else if (sessions_visibility === EnumSessionsVisibility.Exclude) {
+        query = query.is("session_id", null);
+    }
+    const { data } = await query.order("timestamp_observation", { ascending: false });
     // Add signed URLs to events using the same client
     const eventsWithSignedUrls = data
         ? await addSignedUrlsToEvents(data, supabase)
@@ -22,21 +35,29 @@ export async function server_get_events_by_herd(herd_id) {
     let response = IWebResponse.success(eventsWithSignedUrls);
     return response.to_compatible();
 }
-export async function server_get_more_events_by_herd(herd_id, offset, page_count = 10) {
+export async function server_get_more_events_by_herd(herd_id, offset, page_count = 10, includeSessionEvents) {
     const from = offset * page_count;
     const to = from + page_count - 1;
     const supabase = await newServerClient();
     // fetch events and include devices
     // sort by timestamp
-    const { data } = await supabase
+    let query = supabase
         .from("events")
         .select(`
       *,
       devices: devices!inner(*)
       `)
         .eq("devices.herd_id", herd_id)
-        .range(from, to)
-        .order("timestamp_observation", { ascending: false });
+        .range(from, to);
+    if (includeSessionEvents) {
+        // Include only events that have a session_id
+        query = query.not("session_id", "is", null);
+    }
+    else {
+        // Include only events that don't have a session_id
+        query = query.is("session_id", null);
+    }
+    const { data } = await query.order("timestamp_observation", { ascending: false });
     // Add signed URLs to events using the same client
     const eventsWithSignedUrls = data
         ? await addSignedUrlsToEvents(data, supabase)
@@ -46,12 +67,19 @@ export async function server_get_more_events_by_herd(herd_id, offset, page_count
     return response.to_compatible();
 }
 // function to get total number of events for a herd
-export async function server_get_total_events_by_herd(herd_id) {
+export async function server_get_total_events_by_herd(herd_id, sessions_visibility) {
     const supabase = await newServerClient();
-    // call public.get_total_events_for_herd(herd_id)
-    const { data, error } = await supabase.rpc("get_total_events_for_herd", {
-        herd_id_caller: herd_id,
-    });
+    let query = supabase
+        .from("events")
+        .select("id", { count: "exact", head: true })
+        .eq("devices.herd_id", herd_id);
+    if (sessions_visibility === EnumSessionsVisibility.Only) {
+        query = query.not("session_id", "is", null);
+    }
+    else if (sessions_visibility === EnumSessionsVisibility.Exclude) {
+        query = query.is("session_id", null);
+    }
+    const { count, error } = await query;
     if (error) {
         return {
             status: EnumWebResponse.ERROR,
@@ -60,7 +88,7 @@ export async function server_get_total_events_by_herd(herd_id) {
         };
     }
     else {
-        return IWebResponse.success(data).to_compatible();
+        return IWebResponse.success(count || 0).to_compatible();
     }
 }
 export async function server_create_event(newEvent) {

package/dist/hooks/useScoutDbListener.js

@@ -1,7 +1,7 @@
 "use client";
 import { useAppDispatch } from "../store/hooks";
 import { useEffect, useRef } from "react";
-import { addDevice, addPlan, addTag, deleteDevice, deletePlan, deleteTag, updateDevice, updatePlan, updateTag, } from "../store/scout";
+import { addDevice, addPlan, addTag, addSessionToStore, deleteDevice, deletePlan, deleteSessionFromStore, deleteTag, updateDevice, updatePlan, updateSessionInStore, updateTag, } from "../store/scout";
 export function useScoutDbListener(scoutSupabase) {
     const supabase = useRef(null);
     const channels = useRef([]);
@@ -56,6 +56,33 @@ export function useScoutDbListener(scoutSupabase) {
         console.log("[DB Listener] Plan UPDATE received:", payload.new);
         dispatch(updatePlan(payload.new));
     }
+    function handleSessionInserts(payload) {
+        console.log("[DB Listener] Session INSERT received:", payload.new);
+        dispatch(addSessionToStore(payload.new));
+    }
+    function handleSessionDeletes(payload) {
+        console.log("[DB Listener] Session DELETE received:", payload.old);
+        dispatch(deleteSessionFromStore(payload.old));
+    }
+    function handleSessionUpdates(payload) {
+        console.log("[DB Listener] Session UPDATE received:", payload.new);
+        dispatch(updateSessionInStore(payload.new));
+    }
+    function handleConnectivityInserts(payload) {
+        console.log("[DB Listener] Connectivity INSERT received:", payload.new);
+        // 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
+    }
+    function handleConnectivityDeletes(payload) {
+        console.log("[DB Listener] Connectivity DELETE received:", payload.old);
+        // 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
+    }
+    function handleConnectivityUpdates(payload) {
+        console.log("[DB Listener] Connectivity UPDATE received:", payload.new);
+        // 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
+    }
     useEffect(() => {
         console.log("=== SCOUT DB LISTENER DEBUG ===");
         console.log("[DB Listener] Using shared Supabase client from ScoutRefreshProvider context");
@@ -91,12 +118,12 @@ export function useScoutDbListener(scoutSupabase) {
             .on("postgres_changes", { event: "INSERT", schema: "public", table: "tags" }, handleTagInserts)
             .on("postgres_changes", { event: "DELETE", schema: "public", table: "tags" }, handleTagDeletes)
             .on("postgres_changes", { event: "UPDATE", schema: "public", table: "tags" }, handleTagUpdates)
-            .on("postgres_changes", { event: "INSERT", schema: "public", table: "connectivity" }, handleTagUpdates)
-            .on("postgres_changes", { event: "DELETE", schema: "public", table: "connectivity" }, handleTagUpdates)
-            .on("postgres_changes", { event: "UPDATE", schema: "public", table: "connectivity" }, handleTagUpdates)
-            .on("postgres_changes", { event: "INSERT", schema: "public", table: "sessions" }, handleTagUpdates)
-            .on("postgres_changes", { event: "DELETE", schema: "public", table: "sessions" }, handleTagUpdates)
-            .on("postgres_changes", { event: "UPDATE", schema: "public", table: "sessions" }, handleTagUpdates)
+            .on("postgres_changes", { event: "INSERT", schema: "public", table: "connectivity" }, handleConnectivityInserts)
+            .on("postgres_changes", { event: "DELETE", schema: "public", table: "connectivity" }, handleConnectivityDeletes)
+            .on("postgres_changes", { event: "UPDATE", schema: "public", table: "connectivity" }, handleConnectivityUpdates)
+            .on("postgres_changes", { event: "INSERT", schema: "public", table: "sessions" }, handleSessionInserts)
+            .on("postgres_changes", { event: "DELETE", schema: "public", table: "sessions" }, handleSessionDeletes)
+            .on("postgres_changes", { event: "UPDATE", schema: "public", table: "sessions" }, handleSessionUpdates)
             .subscribe((status) => {
             console.log("[DB Listener] Subscription status:", status);
             if (status === "SUBSCRIBED") {

package/dist/store/scout.d.ts

@@ -93,11 +93,23 @@ export declare const scoutSlice: import("@reduxjs/toolkit").Slice<ScoutState, {
         payload: any;
         type: string;
     }) => void;
+    addSessionToStore: (state: import("immer").WritableDraft<ScoutState>, action: {
+        payload: any;
+        type: string;
+    }) => void;
+    deleteSessionFromStore: (state: import("immer").WritableDraft<ScoutState>, action: {
+        payload: any;
+        type: string;
+    }) => void;
+    updateSessionInStore: (state: import("immer").WritableDraft<ScoutState>, action: {
+        payload: any;
+        type: string;
+    }) => void;
     setUser: (state: import("immer").WritableDraft<ScoutState>, action: {
         payload: any;
         type: string;
     }) => void;
 }, "scout", "scout", import("@reduxjs/toolkit").SliceSelectors<ScoutState>>;
-export declare const setHerdModules: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/setHerdModules">, setStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/setStatus">, setActiveHerdId: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/setActiveHerdId">, setActiveDeviceId: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/setActiveDeviceId">, appendEventsToHerdModule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/appendEventsToHerdModule">, replaceEventsForHerdModule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/replaceEventsForHerdModule">, updateEventValuesForHerdModule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/updateEventValuesForHerdModule">, updatePageIndexForHerdModule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/updatePageIndexForHerdModule">, appendPlansToHerdModule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/appendPlansToHerdModule">, setUser: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/setUser">, addTag: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/addTag">, deleteTag: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/deleteTag">, updateTag: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/updateTag">, addNewDeviceToHerdModule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/addNewDeviceToHerdModule">, updateDeviceForHerdModule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/updateDeviceForHerdModule">, addDevice: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/addDevice">, deleteDevice: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/deleteDevice">, updateDevice: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/updateDevice">, addPlan: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/addPlan">, deletePlan: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/deletePlan">, updatePlan: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/updatePlan">;
+export declare const setHerdModules: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/setHerdModules">, setStatus: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/setStatus">, setActiveHerdId: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/setActiveHerdId">, setActiveDeviceId: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/setActiveDeviceId">, appendEventsToHerdModule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/appendEventsToHerdModule">, replaceEventsForHerdModule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/replaceEventsForHerdModule">, updateEventValuesForHerdModule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/updateEventValuesForHerdModule">, updatePageIndexForHerdModule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/updatePageIndexForHerdModule">, appendPlansToHerdModule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/appendPlansToHerdModule">, setUser: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/setUser">, addTag: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/addTag">, deleteTag: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/deleteTag">, updateTag: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/updateTag">, addNewDeviceToHerdModule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/addNewDeviceToHerdModule">, updateDeviceForHerdModule: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/updateDeviceForHerdModule">, addDevice: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/addDevice">, deleteDevice: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/deleteDevice">, updateDevice: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/updateDevice">, addPlan: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/addPlan">, deletePlan: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/deletePlan">, updatePlan: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/updatePlan">, addSessionToStore: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/addSessionToStore">, deleteSessionFromStore: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/deleteSessionFromStore">, updateSessionInStore: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, "scout/updateSessionInStore">;
 declare const _default: import("redux").Reducer<ScoutState>;
 export default _default;

package/dist/store/scout.js

@@ -192,11 +192,38 @@ export const scoutSlice = createSlice({
                 herd_module.events_page_index = new_page_index;
             }
         },
+        addSessionToStore: (state, action) => {
+            const session = action.payload;
+            // Find the herd module that contains the device for this session
+            for (const herd_module of state.herd_modules) {
+                const device = herd_module.devices.find((d) => d.id === session.device_id);
+                if (device) {
+                    herd_module.sessions = [session, ...herd_module.sessions];
+                    return;
+                }
+            }
+        },
+        deleteSessionFromStore: (state, action) => {
+            const sessionId = action.payload.id;
+            for (const herd_module of state.herd_modules) {
+                herd_module.sessions = herd_module.sessions.filter((session) => session.id !== sessionId);
+            }
+        },
+        updateSessionInStore: (state, action) => {
+            const updatedSession = action.payload;
+            for (const herd_module of state.herd_modules) {
+                const sessionIndex = herd_module.sessions.findIndex((session) => session.id === updatedSession.id);
+                if (sessionIndex !== -1) {
+                    herd_module.sessions[sessionIndex] = updatedSession;
+                    return;
+                }
+            }
+        },
         setUser: (state, action) => {
             state.user = action.payload;
         },
     },
 });
 // Action creators are generated for each case reducer function
-export const { setHerdModules, setStatus, setActiveHerdId, setActiveDeviceId, appendEventsToHerdModule, replaceEventsForHerdModule, updateEventValuesForHerdModule, updatePageIndexForHerdModule, appendPlansToHerdModule, setUser, addTag, deleteTag, updateTag, addNewDeviceToHerdModule, updateDeviceForHerdModule, addDevice, deleteDevice, updateDevice, addPlan, deletePlan, updatePlan, } = scoutSlice.actions;
+export const { setHerdModules, setStatus, setActiveHerdId, setActiveDeviceId, appendEventsToHerdModule, replaceEventsForHerdModule, updateEventValuesForHerdModule, updatePageIndexForHerdModule, appendPlansToHerdModule, setUser, addTag, deleteTag, updateTag, addNewDeviceToHerdModule, updateDeviceForHerdModule, addDevice, deleteDevice, updateDevice, addPlan, deletePlan, updatePlan, addSessionToStore, deleteSessionFromStore, updateSessionInStore, } = scoutSlice.actions;
 export default scoutSlice.reducer;

package/dist/types/herd_module.d.ts

@@ -1,10 +1,11 @@
 import { SupabaseClient } from "@supabase/supabase-js";
-import { IDevice, IEventWithTags, IHerd, IPlan, IUserAndRole, IZoneWithActions } from "../types/db";
+import { IDevice, IEventWithTags, IHerd, IPlan, IUserAndRole, IZoneWithActions, ISessionWithCoordinates } from "../types/db";
 export declare class HerdModule {
     herd: IHerd;
     devices: IDevice[];
     events: IEventWithTags[];
     zones: IZoneWithActions[];
+    sessions: ISessionWithCoordinates[];
     timestamp_last_refreshed: number;
     user_roles: IUserAndRole[] | null;
     events_page_index: number;
@@ -12,7 +13,7 @@ export declare class HerdModule {
     total_events_with_filters: number;
     labels: string[];
     plans: IPlan[];
-    constructor(herd: IHerd, devices: IDevice[], events: IEventWithTags[], timestamp_last_refreshed: number, user_roles?: IUserAndRole[] | null, events_page_index?: number, total_events?: number, total_events_with_filters?: number, labels?: string[], plans?: IPlan[], zones?: IZoneWithActions[]);
+    constructor(herd: IHerd, devices: IDevice[], events: IEventWithTags[], timestamp_last_refreshed: number, user_roles?: IUserAndRole[] | null, events_page_index?: number, total_events?: number, total_events_with_filters?: number, labels?: string[], plans?: IPlan[], zones?: IZoneWithActions[], sessions?: ISessionWithCoordinates[]);
     to_serializable(): IHerdModule;
     static from_herd(herd: IHerd, client: SupabaseClient): Promise<HerdModule>;
 }
@@ -28,4 +29,5 @@ export interface IHerdModule {
     labels: string[];
     plans: IPlan[];
     zones: IZoneWithActions[];
+    sessions: ISessionWithCoordinates[];
 }

package/dist/types/herd_module.js

@@ -1,14 +1,15 @@
 import { LABELS } from "../constants/annotator";
 import { get_devices_by_herd } from "../helpers/devices";
-import { server_get_total_events_by_herd } from "../helpers/events";
+import { EnumSessionsVisibility, server_get_total_events_by_herd, } from "../helpers/events";
 import { server_get_plans_by_herd } from "../helpers/plans";
 import { server_get_events_and_tags_for_device } from "../helpers/tags";
 import { server_get_users_with_herd_access } from "../helpers/users";
 import { EnumWebResponse } from "./requests";
 import { server_get_more_zones_and_actions_for_herd } from "../helpers/zones";
 import { server_list_api_keys } from "../api_keys/actions";
+import { getSessionsByHerdId } from "../helpers/sessions";
 export class HerdModule {
-    constructor(herd, devices, events, timestamp_last_refreshed, user_roles = null, events_page_index = 0, total_events = 0, total_events_with_filters = 0, labels = [], plans = [], zones = []) {
+    constructor(herd, devices, events, timestamp_last_refreshed, user_roles = null, events_page_index = 0, total_events = 0, total_events_with_filters = 0, labels = [], plans = [], zones = [], sessions = []) {
         this.user_roles = null;
         this.events_page_index = 0;
         this.total_events = 0;
@@ -26,6 +27,7 @@ export class HerdModule {
         this.labels = labels;
         this.plans = plans;
         this.zones = zones;
+        this.sessions = sessions;
     }
     to_serializable() {
         return {
@@ -40,43 +42,103 @@ export class HerdModule {
             labels: this.labels,
             plans: this.plans,
             zones: this.zones,
+            sessions: this.sessions,
         };
     }
     static async from_herd(herd, client) {
-        // load devices
-        let response_new_devices = await get_devices_by_herd(herd.id, client);
-        if (response_new_devices.status == EnumWebResponse.ERROR ||
-            !response_new_devices.data) {
-            console.warn("No devices found for herd");
-            return new HerdModule(herd, [], [], Date.now());
-        }
-        const new_devices = response_new_devices.data;
-        // get api keys for each device... run requests in parallel
-        if (new_devices.length > 0) {
-            let api_keys_promises = new_devices.map((device) => server_list_api_keys(device.id?.toString() ?? ""));
-            let api_keys = await Promise.all(api_keys_promises);
-            for (let i = 0; i < new_devices.length; i++) {
-                new_devices[i].api_keys_scout = api_keys[i];
+        try {
+            // load devices
+            let response_new_devices = await get_devices_by_herd(herd.id, client);
+            if (response_new_devices.status == EnumWebResponse.ERROR ||
+                !response_new_devices.data) {
+                console.warn("No devices found for herd");
+                return new HerdModule(herd, [], [], Date.now());
             }
-        }
-        // get recent events for each device... run requests in parallel
-        let recent_events_promises = new_devices.map((device) => server_get_events_and_tags_for_device(device.id ?? 0));
-        // Run all requests in parallel
-        const [recent_events, res_zones, res_user_roles, total_event_count, res_plans,] = await Promise.all([
-            Promise.all(recent_events_promises),
-            server_get_more_zones_and_actions_for_herd(herd.id, 0, 10),
-            server_get_users_with_herd_access(herd.id),
-            server_get_total_events_by_herd(herd.id),
-            server_get_plans_by_herd(herd.id),
-        ]);
-        for (let i = 0; i < new_devices.length; i++) {
-            let x = recent_events[i].data;
-            if (recent_events[i].status == EnumWebResponse.SUCCESS && x) {
-                new_devices[i].recent_events = x;
+            const new_devices = response_new_devices.data;
+            // get api keys for each device... run requests in parallel
+            if (new_devices.length > 0) {
+                try {
+                    let api_keys_promises = new_devices.map((device) => server_list_api_keys(device.id?.toString() ?? "").catch((error) => {
+                        console.warn(`Failed to get API keys for device ${device.id}:`, error);
+                        return undefined;
+                    }));
+                    let api_keys = await Promise.all(api_keys_promises);
+                    for (let i = 0; i < new_devices.length; i++) {
+                        new_devices[i].api_keys_scout = api_keys[i];
+                    }
+                }
+                catch (error) {
+                    console.warn("Failed to load API keys for devices:", error);
+                    // Continue without API keys
+                }
             }
+            // get recent events for each device... run requests in parallel
+            let recent_events_promises = new_devices.map((device) => server_get_events_and_tags_for_device(device.id ?? 0).catch((error) => {
+                console.warn(`Failed to get events for device ${device.id}:`, error);
+                return { status: EnumWebResponse.ERROR, data: null };
+            }));
+            // Run all requests in parallel with individual error handling
+            const [recent_events, res_zones, res_user_roles, total_event_count, res_plans, res_sessions,] = await Promise.allSettled([
+                Promise.all(recent_events_promises),
+                server_get_more_zones_and_actions_for_herd(herd.id, 0, 10).catch((error) => {
+                    console.warn("Failed to get zones and actions:", error);
+                    return { status: EnumWebResponse.ERROR, data: null };
+                }),
+                server_get_users_with_herd_access(herd.id).catch((error) => {
+                    console.warn("Failed to get user roles:", error);
+                    return { status: EnumWebResponse.ERROR, data: null };
+                }),
+                server_get_total_events_by_herd(herd.id, EnumSessionsVisibility.Exclude).catch((error) => {
+                    console.warn("Failed to get total events count:", error);
+                    return { status: EnumWebResponse.ERROR, data: null };
+                }),
+                server_get_plans_by_herd(herd.id).catch((error) => {
+                    console.warn("Failed to get plans:", error);
+                    return { status: EnumWebResponse.ERROR, data: null };
+                }),
+                getSessionsByHerdId(client, herd.id).catch((error) => {
+                    console.warn("Failed to get sessions:", error);
+                    return [];
+                }),
+            ]);
+            // Process recent events with error handling
+            if (recent_events.status === "fulfilled") {
+                for (let i = 0; i < new_devices.length; i++) {
+                    try {
+                        let x = recent_events.value[i]?.data;
+                        if (recent_events.value[i]?.status == EnumWebResponse.SUCCESS &&
+                            x) {
+                            new_devices[i].recent_events = x;
+                        }
+                    }
+                    catch (error) {
+                        console.warn(`Failed to process events for device ${new_devices[i].id}:`, error);
+                    }
+                }
+            }
+            // Extract data with safe fallbacks
+            const zones = res_zones.status === "fulfilled" && res_zones.value?.data
+                ? res_zones.value.data
+                : [];
+            const user_roles = res_user_roles.status === "fulfilled" && res_user_roles.value?.data
+                ? res_user_roles.value.data
+                : null;
+            const total_events = total_event_count.status === "fulfilled" &&
+                total_event_count.value?.data
+                ? total_event_count.value.data
+                : 0;
+            const plans = res_plans.status === "fulfilled" && res_plans.value?.data
+                ? res_plans.value.data
+                : [];
+            const sessions = res_sessions.status === "fulfilled" ? res_sessions.value : [];
+            // TODO: store in DB and retrieve on load?
+            const newLabels = LABELS;
+            return new HerdModule(herd, new_devices, [], Date.now(), user_roles, 0, total_events, total_events, newLabels, plans, zones, sessions);
+        }
+        catch (error) {
+            console.error("Critical error in HerdModule.from_herd:", error);
+            // Return a minimal but valid HerdModule instance to prevent complete failure
+            return new HerdModule(herd, [], [], Date.now());
         }
-        // TODO: store in DB and retrieve on load?
-        const newLabels = LABELS;
-        return new HerdModule(herd, new_devices, [], Date.now(), res_user_roles.data, 0, total_event_count.data ? total_event_count.data : 0, total_event_count.data ? total_event_count.data : 0, newLabels, res_plans.data ? res_plans.data : [], res_zones.data ? res_zones.data : []);
     }
 }

package/package.json

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