@adventurelabs/scout-core 1.3.4 → 1.3.6

package/dist/helpers/cache.js

@@ -1,5 +1,5 @@
 const DB_NAME = "ScoutCache";
-const DB_VERSION = 4; // Increment to invalidate old cache versions
+const DB_VERSION = 5; // Increment to invalidate old cache versions
 const HERD_MODULES_STORE = "herd_modules";
 const CACHE_METADATA_STORE = "cache_metadata";
 // Default TTL: 24 hours (1 day)

package/dist/helpers/sessions.d.ts

@@ -1,36 +1,7 @@
-import { ISession, IConnectivity, IEvent, ISessionWithCoordinates, IConnectivityWithCoordinates, IEventAndTagsPrettyLocation } from "../types/db";
+import { ISessionWithCoordinates, ISessionUsageOverTime, IEventAndTagsPrettyLocation } from "../types/db";
 import { IWebResponseCompatible } from "../types/requests";
-export type SessionInput = Omit<ISession, "id" | "inserted_at">;
-export type SessionUpdateInput = Partial<SessionInput> & {
-    id: number;
-};
-export type SessionUpsertInput = SessionInput | SessionUpdateInput;
-export type ConnectivityInput = Omit<IConnectivity, "id" | "inserted_at">;
-export type ConnectivityUpdateInput = Partial<ConnectivityInput> & {
-    id: number;
-};
-export type ConnectivityUpsertInput = ConnectivityInput | ConnectivityUpdateInput;
-export declare function server_get_sessions_by_herd_id(herdId: number): Promise<IWebResponseCompatible<ISessionWithCoordinates[]>>;
-export declare function server_get_events_by_session_id(sessionId: number): Promise<IWebResponseCompatible<IEvent[]>>;
+import { SupabaseClient } from "@supabase/supabase-js";
+export declare function server_get_session_by_id(sessionId: number, client?: SupabaseClient): Promise<IWebResponseCompatible<ISessionWithCoordinates | null>>;
+export declare function server_get_session_usage_over_time_by_herd(herd_id: number, client?: SupabaseClient): Promise<IWebResponseCompatible<ISessionUsageOverTime>>;
+export declare function server_get_session_usage_over_time_by_device(device_id: number, client?: SupabaseClient): Promise<IWebResponseCompatible<ISessionUsageOverTime>>;
 export declare function server_get_events_and_tags_by_session_id(sessionId: number, limit?: number, offset?: number): Promise<IWebResponseCompatible<IEventAndTagsPrettyLocation[]>>;
-export declare function server_get_total_events_for_session(sessionId: number): Promise<IWebResponseCompatible<number>>;
-export declare function server_upsert_session(sessionData: SessionUpsertInput): Promise<IWebResponseCompatible<ISession>>;
-export declare function server_upsert_sessions(sessionsData: SessionUpsertInput[]): Promise<IWebResponseCompatible<ISession[]>>;
-export declare function server_upsert_connectivity(connectivityData: ConnectivityUpsertInput): Promise<IWebResponseCompatible<IConnectivity>>;
-export declare function server_upsert_connectivity_batch(connectivityDataArray: ConnectivityUpsertInput[]): Promise<IWebResponseCompatible<IConnectivity[]>>;
-export declare function server_get_session_with_connectivity_and_events(sessionId: number, herdId?: number): Promise<IWebResponseCompatible<{
-    session: ISessionWithCoordinates | null;
-    connectivity: IConnectivityWithCoordinates[];
-    events: IEvent[];
-}>>;
-export declare function server_get_session_with_connectivity_and_events_with_tags(sessionId: number, limit?: number, offset?: number, herdId?: number): Promise<IWebResponseCompatible<{
-    session: ISessionWithCoordinates | null;
-    connectivity: IConnectivityWithCoordinates[];
-    eventsWithTags: IEventAndTagsPrettyLocation[];
-    totalEvents: number;
-}>>;
-export declare function server_get_sessions_by_device_id(deviceId: number): Promise<IWebResponseCompatible<ISessionWithCoordinates[]>>;
-export declare function server_delete_session(sessionId: number): Promise<IWebResponseCompatible<boolean>>;
-export declare function server_delete_sessions(sessionIds: number[]): Promise<IWebResponseCompatible<boolean>>;
-export declare function server_delete_connectivity(connectivityId: number): Promise<IWebResponseCompatible<boolean>>;
-export declare function server_delete_connectivity_batch(connectivityIds: number[]): Promise<IWebResponseCompatible<boolean>>;

package/dist/helpers/sessions.js

@@ -1,47 +1,57 @@
 "use server";
 import { newServerClient } from "../supabase/server";
 import { EnumWebResponse, IWebResponse, } from "../types/requests";
-import { server_get_connectivity_by_session_id } from "./connectivity";
-// Get sessions by herd id using RPC function with coordinates
-export async function server_get_sessions_by_herd_id(herdId) {
-    const supabase = await newServerClient();
-    const { data, error } = await supabase.rpc("get_sessions_with_coordinates", {
-        herd_id_caller: herdId,
+// Get session by ID with coordinates
+export async function server_get_session_by_id(sessionId, client) {
+    const supabase = client || (await newServerClient());
+    const { data, error } = await supabase.rpc("get_session_by_id", {
+        session_id_caller: sessionId,
     });
     if (error) {
-        console.warn("Error fetching sessions by herd id:", error.message);
+        console.warn("Error fetching session by id:", error.message);
         return {
             status: EnumWebResponse.ERROR,
             msg: error.message,
-            data: [],
+            data: null,
         };
     }
-    // Sort by timestamp_start in descending order
-    const sortedSessions = (data || []).sort((a, b) => {
-        if (!a.timestamp_start || !b.timestamp_start)
-            return 0;
-        return (new Date(b.timestamp_start).getTime() -
-            new Date(a.timestamp_start).getTime());
+    // The RPC returns an array, but we want a single session or null
+    const session = data && data.length > 0 ? data[0] : null;
+    return IWebResponse.success(session).to_compatible();
+}
+// Get session usage over time by herd
+export async function server_get_session_usage_over_time_by_herd(herd_id, client) {
+    const supabase = client || (await newServerClient());
+    const { data, error } = await supabase.rpc("get_session_usage_over_time", {
+        start_date_caller: undefined,
+        end_date_caller: undefined,
+        device_id_caller: undefined,
+        herd_id_caller: herd_id,
     });
-    return IWebResponse.success(sortedSessions).to_compatible();
+    if (error) {
+        return IWebResponse.error(error.message).to_compatible();
+    }
+    if (!data) {
+        return IWebResponse.error("No session usage data returned").to_compatible();
+    }
+    return IWebResponse.success(data).to_compatible();
 }
-// Get events by session id
-export async function server_get_events_by_session_id(sessionId) {
-    const supabase = await newServerClient();
-    const { data, error } = await supabase
-        .from("events")
-        .select("*")
-        .eq("session_id", sessionId)
-        .order("timestamp_observation", { ascending: true });
+// Get session usage over time by device
+export async function server_get_session_usage_over_time_by_device(device_id, client) {
+    const supabase = client || (await newServerClient());
+    const { data, error } = await supabase.rpc("get_session_usage_over_time", {
+        start_date_caller: undefined,
+        end_date_caller: undefined,
+        device_id_caller: device_id,
+        herd_id_caller: undefined,
+    });
     if (error) {
-        console.warn("Error fetching events by session id:", error.message);
-        return {
-            status: EnumWebResponse.ERROR,
-            msg: error.message,
-            data: [],
-        };
+        return IWebResponse.error(error.message).to_compatible();
     }
-    return IWebResponse.success(data || []).to_compatible();
+    if (!data) {
+        return IWebResponse.error("No session usage data returned").to_compatible();
+    }
+    return IWebResponse.success(data).to_compatible();
 }
 // Get events with tags by session id using RPC function
 export async function server_get_events_and_tags_by_session_id(sessionId, limit = 50, offset = 0) {
@@ -61,429 +71,3 @@ export async function server_get_events_and_tags_by_session_id(sessionId, limit
     }
     return IWebResponse.success(data || []).to_compatible();
 }
-// Get total count of events for a session
-export async function server_get_total_events_for_session(sessionId) {
-    const supabase = await newServerClient();
-    const { data, error } = await supabase.rpc("get_total_events_for_session", {
-        session_id_caller: sessionId,
-    });
-    if (error) {
-        console.warn("Error fetching total events for session:", error.message);
-        return {
-            status: EnumWebResponse.ERROR,
-            msg: error.message,
-            data: 0,
-        };
-    }
-    return IWebResponse.success(data || 0).to_compatible();
-}
-// Create or update session
-export async function server_upsert_session(sessionData) {
-    const supabase = await newServerClient();
-    const isUpdate = "id" in sessionData;
-    if (isUpdate) {
-        // Update existing session
-        const { id, ...updateData } = sessionData;
-        const { data, error } = await supabase
-            .from("sessions")
-            .update(updateData)
-            .eq("id", id)
-            .select()
-            .single();
-        if (error) {
-            console.warn("Error updating session:", error.message);
-            return {
-                status: EnumWebResponse.ERROR,
-                msg: error.message,
-                data: null,
-            };
-        }
-        return IWebResponse.success(data).to_compatible();
-    }
-    else {
-        // Create new session
-        const { data, error } = await supabase
-            .from("sessions")
-            .insert(sessionData)
-            .select()
-            .single();
-        if (error) {
-            console.warn("Error creating session:", error.message);
-            return {
-                status: EnumWebResponse.ERROR,
-                msg: error.message,
-                data: null,
-            };
-        }
-        return IWebResponse.success(data).to_compatible();
-    }
-}
-// Batch upsert sessions
-export async function server_upsert_sessions(sessionsData) {
-    const supabase = await newServerClient();
-    if (sessionsData.length === 0) {
-        return IWebResponse.success([]).to_compatible();
-    }
-    // Separate updates and inserts
-    const updates = sessionsData.filter((s) => "id" in s);
-    const inserts = sessionsData.filter((s) => !("id" in s));
-    const results = [];
-    // Handle updates
-    if (updates.length > 0) {
-        for (const sessionData of updates) {
-            const updateResult = await server_upsert_session(sessionData);
-            if (updateResult.status === EnumWebResponse.SUCCESS &&
-                updateResult.data) {
-                results.push(updateResult.data);
-            }
-            else {
-                console.warn(`Failed to update session ${sessionData.id}:`, updateResult.msg);
-            }
-        }
-    }
-    // Handle inserts
-    if (inserts.length > 0) {
-        const { data, error } = await supabase
-            .from("sessions")
-            .insert(inserts)
-            .select();
-        if (error) {
-            console.warn("Error creating sessions:", error.message);
-            return {
-                status: EnumWebResponse.ERROR,
-                msg: error.message,
-                data: results,
-            };
-        }
-        results.push(...(data || []));
-    }
-    return IWebResponse.success(results).to_compatible();
-}
-// Create or update connectivity
-export async function server_upsert_connectivity(connectivityData) {
-    const supabase = await newServerClient();
-    const isUpdate = "id" in connectivityData;
-    if (isUpdate) {
-        // Update existing connectivity
-        const { id, ...updateData } = connectivityData;
-        const { data, error } = await supabase
-            .from("connectivity")
-            .update(updateData)
-            .eq("id", id)
-            .select()
-            .single();
-        if (error) {
-            console.warn("Error updating connectivity:", error.message);
-            return {
-                status: EnumWebResponse.ERROR,
-                msg: error.message,
-                data: null,
-            };
-        }
-        return IWebResponse.success(data).to_compatible();
-    }
-    else {
-        // Create new connectivity
-        const { data, error } = await supabase
-            .from("connectivity")
-            .insert(connectivityData)
-            .select()
-            .single();
-        if (error) {
-            console.warn("Error creating connectivity:", error.message);
-            return {
-                status: EnumWebResponse.ERROR,
-                msg: error.message,
-                data: null,
-            };
-        }
-        return IWebResponse.success(data).to_compatible();
-    }
-}
-// Batch upsert connectivity
-export async function server_upsert_connectivity_batch(connectivityDataArray) {
-    const supabase = await newServerClient();
-    if (connectivityDataArray.length === 0) {
-        return IWebResponse.success([]).to_compatible();
-    }
-    // Separate updates and inserts
-    const updates = connectivityDataArray.filter((c) => "id" in c);
-    const inserts = connectivityDataArray.filter((c) => !("id" in c));
-    const results = [];
-    // Handle updates
-    if (updates.length > 0) {
-        for (const connectivityData of updates) {
-            const updateResult = await server_upsert_connectivity(connectivityData);
-            if (updateResult.status === EnumWebResponse.SUCCESS &&
-                updateResult.data) {
-                results.push(updateResult.data);
-            }
-            else {
-                console.warn(`Failed to update connectivity ${connectivityData.id}:`, updateResult.msg);
-            }
-        }
-    }
-    // Handle inserts
-    if (inserts.length > 0) {
-        const { data, error } = await supabase
-            .from("connectivity")
-            .insert(inserts)
-            .select();
-        if (error) {
-            console.warn("Error creating connectivity entries:", error.message);
-            return {
-                status: EnumWebResponse.ERROR,
-                msg: error.message,
-                data: results,
-            };
-        }
-        results.push(...(data || []));
-    }
-    return IWebResponse.success(results).to_compatible();
-}
-// Get session with connectivity and events using RPC functions
-export async function server_get_session_with_connectivity_and_events(sessionId, herdId) {
-    const supabase = await newServerClient();
-    let sessionWithCoords = null;
-    if (herdId) {
-        // Use provided herd ID directly
-        const sessionsResult = await server_get_sessions_by_herd_id(herdId);
-        if (sessionsResult.status === EnumWebResponse.SUCCESS &&
-            sessionsResult.data) {
-            sessionWithCoords =
-                sessionsResult.data.find((s) => s.id === sessionId) || null;
-        }
-    }
-    else {
-        // Get the session from the sessions table first to get the device_id
-        const { data: sessionData, error: sessionError } = await supabase
-            .from("sessions")
-            .select("*")
-            .eq("id", sessionId)
-            .single();
-        if (sessionError) {
-            console.warn("Error getting session:", sessionError.message);
-            return {
-                status: EnumWebResponse.ERROR,
-                msg: sessionError.message,
-                data: {
-                    session: null,
-                    connectivity: [],
-                    events: [],
-                },
-            };
-        }
-        // Get the device to find its herd_id
-        const { data: device, error: deviceError } = await supabase
-            .from("devices")
-            .select("herd_id")
-            .eq("id", sessionData.device_id)
-            .single();
-        if (deviceError) {
-            console.warn("Error getting device:", deviceError.message);
-            return {
-                status: EnumWebResponse.ERROR,
-                msg: deviceError.message,
-                data: {
-                    session: null,
-                    connectivity: [],
-                    events: [],
-                },
-            };
-        }
-        const sessionsResult = await server_get_sessions_by_herd_id(device.herd_id);
-        if (sessionsResult.status === EnumWebResponse.SUCCESS &&
-            sessionsResult.data) {
-            sessionWithCoords =
-                sessionsResult.data.find((s) => s.id === sessionId) || null;
-        }
-    }
-    const [connectivityResult, eventsResult] = await Promise.all([
-        server_get_connectivity_by_session_id(sessionId),
-        server_get_events_by_session_id(sessionId),
-    ]);
-    const connectivity = connectivityResult.status === EnumWebResponse.SUCCESS
-        ? connectivityResult.data || []
-        : [];
-    const events = eventsResult.status === EnumWebResponse.SUCCESS
-        ? eventsResult.data || []
-        : [];
-    return IWebResponse.success({
-        session: sessionWithCoords,
-        connectivity,
-        events,
-    }).to_compatible();
-}
-// Get session with connectivity and events with tags using RPC functions
-export async function server_get_session_with_connectivity_and_events_with_tags(sessionId, limit = 50, offset = 0, herdId) {
-    const supabase = await newServerClient();
-    let sessionWithCoords = null;
-    let actualHerdId;
-    if (herdId) {
-        // Use provided herd ID directly
-        actualHerdId = herdId;
-        const sessionsResult = await server_get_sessions_by_herd_id(herdId);
-        if (sessionsResult.status === EnumWebResponse.SUCCESS &&
-            sessionsResult.data) {
-            sessionWithCoords =
-                sessionsResult.data.find((s) => s.id === sessionId) || null;
-        }
-    }
-    else {
-        // Get the session from the sessions table first to get the device_id
-        const { data: sessionData, error: sessionError } = await supabase
-            .from("sessions")
-            .select("*")
-            .eq("id", sessionId)
-            .single();
-        if (sessionError) {
-            console.warn("Error getting session:", sessionError.message);
-            return {
-                status: EnumWebResponse.ERROR,
-                msg: sessionError.message,
-                data: {
-                    session: null,
-                    connectivity: [],
-                    eventsWithTags: [],
-                    totalEvents: 0,
-                },
-            };
-        }
-        // Get the device to find its herd_id
-        const { data: device, error: deviceError } = await supabase
-            .from("devices")
-            .select("herd_id")
-            .eq("id", sessionData.device_id)
-            .single();
-        if (deviceError) {
-            console.warn("Error getting device:", deviceError.message);
-            return {
-                status: EnumWebResponse.ERROR,
-                msg: deviceError.message,
-                data: {
-                    session: null,
-                    connectivity: [],
-                    eventsWithTags: [],
-                    totalEvents: 0,
-                },
-            };
-        }
-        actualHerdId = device.herd_id;
-        const sessionsResult = await server_get_sessions_by_herd_id(device.herd_id);
-        if (sessionsResult.status === EnumWebResponse.SUCCESS &&
-            sessionsResult.data) {
-            sessionWithCoords =
-                sessionsResult.data.find((s) => s.id === sessionId) || null;
-        }
-    }
-    const [connectivityResult, eventsWithTagsResult, totalEventsResult] = await Promise.all([
-        server_get_connectivity_by_session_id(sessionId),
-        server_get_events_and_tags_by_session_id(sessionId, limit, offset),
-        server_get_total_events_for_session(sessionId),
-    ]);
-    const connectivity = connectivityResult.status === EnumWebResponse.SUCCESS
-        ? connectivityResult.data || []
-        : [];
-    const eventsWithTags = eventsWithTagsResult.status === EnumWebResponse.SUCCESS
-        ? eventsWithTagsResult.data || []
-        : [];
-    const totalEvents = totalEventsResult.status === EnumWebResponse.SUCCESS
-        ? totalEventsResult.data || 0
-        : 0;
-    return IWebResponse.success({
-        session: sessionWithCoords,
-        connectivity,
-        eventsWithTags,
-        totalEvents,
-    }).to_compatible();
-}
-// Get sessions for a device using RPC function
-export async function server_get_sessions_by_device_id(deviceId) {
-    const supabase = await newServerClient();
-    const { data, error } = await supabase.rpc("get_sessions_with_coordinates_by_device", {
-        device_id_caller: deviceId,
-    });
-    if (error) {
-        console.warn("Error fetching sessions by device id:", error.message);
-        return {
-            status: EnumWebResponse.ERROR,
-            msg: error.message,
-            data: [],
-        };
-    }
-    return IWebResponse.success(data || []).to_compatible();
-}
-// Delete session and all related data
-export async function server_delete_session(sessionId) {
-    const supabase = await newServerClient();
-    const { error } = await supabase
-        .from("sessions")
-        .delete()
-        .eq("id", sessionId);
-    if (error) {
-        console.warn("Error deleting session:", error.message);
-        return {
-            status: EnumWebResponse.ERROR,
-            msg: error.message,
-            data: false,
-        };
-    }
-    return IWebResponse.success(true).to_compatible();
-}
-// Batch delete sessions
-export async function server_delete_sessions(sessionIds) {
-    const supabase = await newServerClient();
-    if (sessionIds.length === 0) {
-        return IWebResponse.success(true).to_compatible();
-    }
-    const { error } = await supabase
-        .from("sessions")
-        .delete()
-        .in("id", sessionIds);
-    if (error) {
-        console.warn("Error deleting sessions:", error.message);
-        return {
-            status: EnumWebResponse.ERROR,
-            msg: error.message,
-            data: false,
-        };
-    }
-    return IWebResponse.success(true).to_compatible();
-}
-// Delete connectivity entry
-export async function server_delete_connectivity(connectivityId) {
-    const supabase = await newServerClient();
-    const { error } = await supabase
-        .from("connectivity")
-        .delete()
-        .eq("id", connectivityId);
-    if (error) {
-        console.warn("Error deleting connectivity:", error.message);
-        return {
-            status: EnumWebResponse.ERROR,
-            msg: error.message,
-            data: false,
-        };
-    }
-    return IWebResponse.success(true).to_compatible();
-}
-// Batch delete connectivity entries
-export async function server_delete_connectivity_batch(connectivityIds) {
-    const supabase = await newServerClient();
-    if (connectivityIds.length === 0) {
-        return IWebResponse.success(true).to_compatible();
-    }
-    const { error } = await supabase
-        .from("connectivity")
-        .delete()
-        .in("id", connectivityIds);
-    if (error) {
-        console.warn("Error deleting connectivity entries:", error.message);
-        return {
-            status: EnumWebResponse.ERROR,
-            msg: error.message,
-            data: false,
-        };
-    }
-    return IWebResponse.success(true).to_compatible();
-}

package/dist/providers/ScoutRefreshProvider.d.ts

@@ -1405,6 +1405,18 @@ export declare function useSupabase(): SupabaseClient<Database, "public", "publi
                 isSetofReturn: true;
             };
         };
+        get_session_by_id: {
+            Args: {
+                session_id_caller: number;
+            };
+            Returns: Database["public"]["CompositeTypes"]["session_with_coordinates"][];
+            SetofOptions: {
+                from: "*";
+                to: "session_with_coordinates";
+                isOneToOne: false;
+                isSetofReturn: true;
+            };
+        };
         get_session_summaries: {
             Args: {
                 device_id_caller?: number;
@@ -1414,6 +1426,15 @@ export declare function useSupabase(): SupabaseClient<Database, "public", "publi
             };
             Returns: import("../types/supabase").Json;
         };
+        get_session_usage_over_time: {
+            Args: {
+                device_id_caller?: number;
+                end_date_caller?: string;
+                herd_id_caller?: number;
+                start_date_caller?: string;
+            };
+            Returns: import("../types/supabase").Json;
+        };
         get_sessions_infinite_by_device: {
             Args: {
                 cursor_id?: number;

package/dist/types/db.d.ts

@@ -48,6 +48,7 @@ export interface ISessionSummary {
         herd_id: number | null;
     };
 }
+export type ISessionUsageOverTime = Database["public"]["Functions"]["get_session_usage_over_time"]["Returns"];
 export type ComponentInsert = Database["public"]["Tables"]["components"]["Insert"];
 export type VersionsSoftwareInsert = Database["public"]["Tables"]["versions_software"]["Insert"];
 export type ArtifactInsert = Database["public"]["Tables"]["artifacts"]["Insert"];

package/dist/types/herd_module.d.ts

@@ -1,5 +1,5 @@
 import { SupabaseClient } from "@supabase/supabase-js";
-import { IDevice, IHerd, IPlan, ILayer, IProvider, IUserAndRole, IZoneWithActions, ISessionSummary } from "../types/db";
+import { IDevice, IHerd, IPlan, ILayer, IProvider, IUserAndRole, IZoneWithActions, ISessionSummary, ISessionUsageOverTime } from "../types/db";
 import { EnumWebResponse } from "./requests";
 export declare enum EnumHerdModulesLoadingState {
     NOT_LOADING = "NOT_LOADING",
@@ -18,7 +18,8 @@ export declare class HerdModule {
     layers: ILayer[];
     providers: IProvider[];
     session_summaries: ISessionSummary | null;
-    constructor(herd: IHerd, devices: IDevice[], timestamp_last_refreshed: number, user_roles?: IUserAndRole[] | null, labels?: string[], plans?: IPlan[], zones?: IZoneWithActions[], layers?: ILayer[], providers?: IProvider[], session_summaries?: ISessionSummary | null);
+    session_usage: ISessionUsageOverTime | null;
+    constructor(herd: IHerd, devices: IDevice[], timestamp_last_refreshed: number, user_roles?: IUserAndRole[] | null, labels?: string[], plans?: IPlan[], zones?: IZoneWithActions[], layers?: ILayer[], providers?: IProvider[], session_summaries?: ISessionSummary | null, session_usage?: ISessionUsageOverTime | null);
     to_serializable(): IHerdModule;
     static from_herd(herd: IHerd, client: SupabaseClient): Promise<HerdModule>;
 }
@@ -33,6 +34,7 @@ export interface IHerdModule {
     layers: ILayer[];
     providers: IProvider[];
     session_summaries: ISessionSummary | null;
+    session_usage: ISessionUsageOverTime | null;
 }
 export interface IHerdModulesResponse {
     data: IHerdModule[];

package/dist/types/herd_module.js

@@ -1,7 +1,5 @@
 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 } from "./events";
 import { server_get_plans_by_herd } from "../helpers/plans";
 import { server_get_layers_by_herd } from "../helpers/layers";
 import { server_get_providers_by_herd } from "../helpers/providers";
@@ -9,9 +7,8 @@ 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_batch } from "../api_keys/actions";
-import { server_get_sessions_by_herd_id } from "../helpers/sessions";
-import { server_get_artifacts_by_herd, server_get_total_artifacts_by_herd, } from "../helpers/artifacts";
 import { server_get_session_summaries_by_herd } from "../helpers/session_summaries";
+import { server_get_session_usage_over_time_by_herd } from "../helpers/sessions";
 export var EnumHerdModulesLoadingState;
 (function (EnumHerdModulesLoadingState) {
     EnumHerdModulesLoadingState["NOT_LOADING"] = "NOT_LOADING";
@@ -20,13 +17,14 @@ export var EnumHerdModulesLoadingState;
     EnumHerdModulesLoadingState["UNSUCCESSFULLY_LOADED"] = "UNSUCCESSFULLY_LOADED";
 })(EnumHerdModulesLoadingState || (EnumHerdModulesLoadingState = {}));
 export class HerdModule {
-    constructor(herd, devices, timestamp_last_refreshed, user_roles = null, labels = [], plans = [], zones = [], layers = [], providers = [], session_summaries = null) {
+    constructor(herd, devices, timestamp_last_refreshed, user_roles = null, labels = [], plans = [], zones = [], layers = [], providers = [], session_summaries = null, session_usage = null) {
         this.user_roles = null;
         this.labels = [];
         this.plans = [];
         this.layers = [];
         this.providers = [];
         this.session_summaries = null;
+        this.session_usage = null;
         this.herd = herd;
         this.devices = devices;
         this.timestamp_last_refreshed = timestamp_last_refreshed;
@@ -37,6 +35,7 @@ export class HerdModule {
         this.layers = layers;
         this.providers = providers;
         this.session_summaries = session_summaries;
+        this.session_usage = session_usage;
     }
     to_serializable() {
         return {
@@ -50,6 +49,7 @@ export class HerdModule {
             layers: this.layers,
             providers: this.providers,
             session_summaries: this.session_summaries,
+            session_usage: this.session_usage,
         };
     }
     static async from_herd(herd, client) {
@@ -65,22 +65,10 @@ export class HerdModule {
                     console.warn(`[HerdModule] 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(`[HerdModule] Failed to get total events count:`, error);
-                    return { status: EnumWebResponse.ERROR, data: null };
-                }),
                 server_get_plans_by_herd(herd.id).catch((error) => {
                     console.warn(`[HerdModule] Failed to get plans:`, error);
                     return { status: EnumWebResponse.ERROR, data: null };
                 }),
-                server_get_sessions_by_herd_id(herd.id).catch((error) => {
-                    console.warn(`[HerdModule] Failed to get sessions:`, error);
-                    return {
-                        status: EnumWebResponse.ERROR,
-                        data: [],
-                        msg: error.message,
-                    };
-                }),
                 server_get_layers_by_herd(herd.id).catch((error) => {
                     console.warn(`[HerdModule] Failed to get layers:`, error);
                     return { status: EnumWebResponse.ERROR, data: null };
@@ -89,18 +77,14 @@ export class HerdModule {
                     console.warn(`[HerdModule] Failed to get providers:`, error);
                     return { status: EnumWebResponse.ERROR, data: null };
                 }),
-                server_get_artifacts_by_herd(herd.id, 50, 0).catch((error) => {
-                    console.warn(`[HerdModule] Failed to get artifacts:`, error);
-                    return { status: EnumWebResponse.ERROR, data: null };
-                }),
-                server_get_total_artifacts_by_herd(herd.id).catch((error) => {
-                    console.warn(`[HerdModule] Failed to get total artifacts count:`, error);
-                    return { status: EnumWebResponse.ERROR, data: null };
-                }),
                 server_get_session_summaries_by_herd(herd.id, client).catch((error) => {
                     console.warn(`[HerdModule] Failed to get session summaries:`, error);
                     return { status: EnumWebResponse.ERROR, data: null };
                 }),
+                server_get_session_usage_over_time_by_herd(herd.id, client).catch((error) => {
+                    console.warn(`[HerdModule] Failed to get session usage:`, error);
+                    return { status: EnumWebResponse.ERROR, data: null };
+                }),
             ]);
             // Load devices
             const devicesPromise = get_devices_by_herd(herd.id, client);
@@ -133,53 +117,43 @@ export class HerdModule {
                 }
             }
             // Extract herd-level data with safe fallbacks
-            const [res_zones, res_user_roles, total_event_count, res_plans, res_sessions, res_layers, res_providers, res_artifacts, total_artifact_count, session_summaries_result,] = herdLevelResults;
+            const [res_zones, res_user_roles, res_plans, res_layers, res_providers, session_summaries_result, session_usage_result,] = herdLevelResults;
             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?.data
-                ? res_sessions.value.data
-                : [];
             const layers = res_layers.status === "fulfilled" && res_layers.value?.data
                 ? res_layers.value.data
                 : [];
             const providers = res_providers.status === "fulfilled" && res_providers.value?.data
                 ? res_providers.value.data
                 : [];
-            const artifacts = res_artifacts.status === "fulfilled" && res_artifacts.value?.data
-                ? res_artifacts.value.data
-                : [];
-            const total_artifacts = total_artifact_count.status === "fulfilled" &&
-                total_artifact_count.value?.data
-                ? total_artifact_count.value.data
-                : 0;
             const session_summaries = session_summaries_result.status === "fulfilled" &&
                 session_summaries_result.value?.data
                 ? session_summaries_result.value.data
                 : null;
+            const session_usage = session_usage_result.status === "fulfilled" &&
+                session_usage_result.value?.data
+                ? session_usage_result.value.data
+                : null;
             // TODO: store in DB and retrieve on load?
             const newLabels = LABELS;
             const endTime = Date.now();
             const loadTime = endTime - startTime;
             console.log(`[HerdModule] Loaded herd ${herd.slug} in ${loadTime}ms (${new_devices.length} devices)`);
-            return new HerdModule(herd, new_devices, Date.now(), user_roles, newLabels, plans, zones, layers, providers, session_summaries);
+            return new HerdModule(herd, new_devices, Date.now(), user_roles, newLabels, plans, zones, layers, providers, session_summaries, session_usage);
         }
         catch (error) {
             const endTime = Date.now();
             const loadTime = endTime - startTime;
             console.error(`[HerdModule] Critical error in HerdModule.from_herd (${loadTime}ms):`, error);
             // Return a minimal but valid HerdModule instance to prevent complete failure
-            return new HerdModule(herd, [], Date.now(), null, [], [], [], [], [], null);
+            return new HerdModule(herd, [], Date.now(), null, [], [], [], [], [], null, null);
         }
     }
 }

package/dist/types/supabase.d.ts

@@ -1460,6 +1460,18 @@ export type Database = {
                     isSetofReturn: true;
                 };
             };
+            get_session_by_id: {
+                Args: {
+                    session_id_caller: number;
+                };
+                Returns: Database["public"]["CompositeTypes"]["session_with_coordinates"][];
+                SetofOptions: {
+                    from: "*";
+                    to: "session_with_coordinates";
+                    isOneToOne: false;
+                    isSetofReturn: true;
+                };
+            };
             get_session_summaries: {
                 Args: {
                     device_id_caller?: number;
@@ -1469,6 +1481,15 @@ export type Database = {
                 };
                 Returns: Json;
             };
+            get_session_usage_over_time: {
+                Args: {
+                    device_id_caller?: number;
+                    end_date_caller?: string;
+                    herd_id_caller?: number;
+                    start_date_caller?: string;
+                };
+                Returns: Json;
+            };
             get_sessions_infinite_by_device: {
                 Args: {
                     cursor_id?: number;

package/package.json

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