@adventurelabs/scout-core 1.4.14 → 1.4.16

package/dist/helpers/cache.js

@@ -1,5 +1,5 @@
 const DB_NAME = "ScoutCache";
-const DB_VERSION = 5; // Increment to invalidate old cache versions
+const DB_VERSION = 6;
 const HERD_MODULES_STORE = "herd_modules";
 const CACHE_METADATA_STORE = "cache_metadata";
 // Default TTL: 24 hours (1 day)
@@ -104,6 +104,8 @@ export class ScoutCache {
             const version = "2.0.0";
             // Store each herd module (contains all nested data - devices, events, zones, etc.)
             herdModules.forEach((herdModule) => {
+                if (herdModule.herd.id == null)
+                    return;
                 const cacheEntry = {
                     herdId: herdModule.herd.id.toString(),
                     data: herdModule,

package/dist/helpers/herds.d.ts

@@ -1,8 +1,10 @@
-import { IHerd } from "../types/db";
+import { Database } from "../types/supabase";
+import { IHerd, IHerdPrettyLocation } from "../types/db";
 import { IWebResponseCompatible } from "../types/requests";
 import { SupabaseClient } from "@supabase/supabase-js";
 import { IHerdModulesResponseWithStatus } from "../types/herd_module";
-export declare function get_herds(client: SupabaseClient): Promise<IWebResponseCompatible<IHerd[]>>;
+export declare function get_herds(client: SupabaseClient<Database>): Promise<IWebResponseCompatible<IHerd[]>>;
+export declare function get_herds_with_location(client: SupabaseClient<Database>): Promise<IWebResponseCompatible<IHerdPrettyLocation[]>>;
 export declare function get_herd_by_slug(slug: string): Promise<IWebResponseCompatible<IHerd>>;
 export declare function deleteHerd(herd_id: number): Promise<IWebResponseCompatible<boolean>>;
 export declare function createHerd(newHerd: any): Promise<IWebResponseCompatible<boolean>>;

package/dist/helpers/herds.js

@@ -16,6 +16,24 @@ export async function get_herds(client) {
         return response.to_compatible();
     }
 }
+export async function get_herds_with_location(client) {
+    const { data, error } = await client.rpc("get_herds_with_location");
+    if (error) {
+        return {
+            status: EnumWebResponse.ERROR,
+            msg: error.message,
+            data: null,
+        };
+    }
+    if (!data) {
+        return {
+            status: EnumWebResponse.ERROR,
+            msg: "No herds found",
+            data: null,
+        };
+    }
+    return IWebResponse.success(data).to_compatible();
+}
 export async function get_herd_by_slug(slug) {
     const supabase = await newServerClient();
     const { data: herds } = await supabase
@@ -66,28 +84,28 @@ export async function createHerd(newHerd) {
 }
 export async function server_load_herd_modules() {
     const startTime = Date.now();
-    // load herds
     const client_supabase = await newServerClient();
-    let new_herds = await get_herds(client_supabase);
-    if (new_herds.status != EnumWebResponse.SUCCESS || !new_herds.data) {
+    const herdsResult = await get_herds_with_location(client_supabase);
+    if (herdsResult.status !== EnumWebResponse.SUCCESS ||
+        !herdsResult.data ||
+        herdsResult.data.length === 0) {
         return {
             status: EnumWebResponse.ERROR,
-            msg: "No herds found",
+            msg: herdsResult.msg ?? "No herds found",
             data: null,
             time_finished: Date.now(),
             time_sent: Date.now(),
             server_processing_time_ms: Date.now() - startTime,
         };
     }
+    const herds = herdsResult.data.filter((h) => h.id != null);
     let new_herd_modules = [];
-    const herdModulePromises = new_herds.data.map((herd) => HerdModule.from_herd(herd, client_supabase));
+    const herdModulePromises = herds.map((herd) => HerdModule.from_herd(herd, client_supabase));
     new_herd_modules = await Promise.all(herdModulePromises);
-    // now serialize the herd modules
-    let serialized_herd_modules = new_herd_modules.map((herd_module) => herd_module.to_serializable());
+    const serialized_herd_modules = new_herd_modules.map((herd_module) => herd_module.to_serializable());
     const endTime = Date.now();
     const totalLoadTime = endTime - startTime;
-    console.log(`[server_load_herd_modules] Loaded ${new_herds.data.length} herds in ${totalLoadTime}ms (parallel processing)`);
-    // Record the time when we're about to send the response
+    console.log(`[server_load_herd_modules] Loaded ${herds.length} herds in ${totalLoadTime}ms (parallel processing)`);
     const timeSent = Date.now();
     return {
         status: EnumWebResponse.SUCCESS,

package/dist/hooks/useScoutRealtimeConnectivity.js

@@ -11,7 +11,7 @@ export function useScoutRealtimeConnectivity(scoutSupabase) {
     const gpsDeviceIds = useMemo(() => {
         if (!activeHerdId)
             return "";
-        const activeHerdModule = herdModules.find((hm) => hm.herd.id.toString() === activeHerdId);
+        const activeHerdModule = herdModules.find((hm) => hm.herd.id?.toString() === activeHerdId);
         if (!activeHerdModule)
             return "";
         const gpsDevices = activeHerdModule.devices.filter((device) => device.device_type &&

package/dist/index.d.ts

@@ -10,6 +10,7 @@ export * from "./types/supabase";
 export * from "./types/bounding_boxes";
 export * from "./types/events";
 export * from "./types/connectivity";
+export * from "./helpers/artifacts";
 export * from "./helpers/auth";
 export * from "./helpers/bounding_boxes";
 export * from "./helpers/chat";
@@ -60,5 +61,5 @@ export * from "./supabase/middleware";
 export * from "./supabase/server";
 export * from "./api_keys/actions";
 export type { HerdModule, IHerdModule } from "./types/herd_module";
-export type { IDevice, IEvent, IUser, IHerd, IEventWithTags, IZoneWithActions, IUserAndRole, IApiKeyScout, ILayer, IHeartbeat, IProvider, IConnectivity, ISession, ISessionWithCoordinates, IConnectivityWithCoordinates, } from "./types/db";
+export type { IDevice, IEvent, IUser, IHerd, IHerdPrettyLocation, IEventWithTags, IZoneWithActions, IUserAndRole, IApiKeyScout, ILayer, IHeartbeat, IProvider, IConnectivity, ISession, ISessionWithCoordinates, IConnectivityWithCoordinates, } from "./types/db";
 export { EnumSessionsVisibility } from "./types/events";

package/dist/index.js

@@ -13,6 +13,7 @@ export * from "./types/bounding_boxes";
 export * from "./types/events";
 export * from "./types/connectivity";
 // Helpers
+export * from "./helpers/artifacts";
 export * from "./helpers/auth";
 export * from "./helpers/bounding_boxes";
 export * from "./helpers/chat";

package/dist/providers/ScoutRefreshProvider.d.ts

@@ -449,6 +449,7 @@ export declare function useSupabase(): SupabaseClient<Database, "public", "publi
                 id: number;
                 inserted_at: string;
                 is_public: boolean;
+                location: unknown;
                 slug: string;
                 video_publisher_token: string | null;
                 video_server_url: string | null;
@@ -462,6 +463,7 @@ export declare function useSupabase(): SupabaseClient<Database, "public", "publi
                 id?: number;
                 inserted_at?: string;
                 is_public?: boolean;
+                location?: unknown;
                 slug: string;
                 video_publisher_token?: string | null;
                 video_server_url?: string | null;
@@ -475,6 +477,7 @@ export declare function useSupabase(): SupabaseClient<Database, "public", "publi
                 id?: number;
                 inserted_at?: string;
                 is_public?: boolean;
+                location?: unknown;
                 slug?: string;
                 video_publisher_token?: string | null;
                 video_server_url?: string | null;
@@ -1477,6 +1480,16 @@ export declare function useSupabase(): SupabaseClient<Database, "public", "publi
                 total_heartbeats: number;
             }[];
         };
+        get_herds_with_location: {
+            Args: never;
+            Returns: Database["public"]["CompositeTypes"]["herds_pretty_location"][];
+            SetofOptions: {
+                from: "*";
+                to: "herds_pretty_location";
+                isOneToOne: false;
+                isSetofReturn: true;
+            };
+        };
         get_pins_for_herd: {
             Args: {
                 herd_id_caller: number;
@@ -1700,6 +1713,14 @@ export declare function useSupabase(): SupabaseClient<Database, "public", "publi
             Args: never;
             Returns: undefined;
         };
+        set_herd_location: {
+            Args: {
+                p_herd_id: number;
+                p_latitude: number;
+                p_longitude: number;
+            };
+            Returns: undefined;
+        };
     };
     Enums: {
         app_permission: "herds.delete" | "events.delete";
@@ -1827,6 +1848,22 @@ export declare function useSupabase(): SupabaseClient<Database, "public", "publi
             is_public: boolean | null;
             tags: Database["public"]["Tables"]["tags"]["Row"][] | null;
         };
+        herds_pretty_location: {
+            id: number | null;
+            inserted_at: string | null;
+            slug: string | null;
+            description: string | null;
+            created_by: string | null;
+            is_public: boolean | null;
+            earthranger_domain: string | null;
+            earthranger_token: string | null;
+            video_publisher_token: string | null;
+            video_subscriber_token: string | null;
+            video_server_url: string | null;
+            location: string | null;
+            latitude: number | null;
+            longitude: number | null;
+        };
         pins_pretty_location: {
             id: number | null;
             created_at: string | null;

package/dist/store/scout.js

@@ -82,21 +82,21 @@ export const scoutSlice = createSlice({
         },
         updateSessionSummariesForHerdModule: (state, action) => {
             const { herd_id, session_summaries } = action.payload;
-            const herd_module = state.herd_modules.find((hm) => hm.herd.id.toString() === herd_id);
+            const herd_module = state.herd_modules.find((hm) => hm.herd.id?.toString() === herd_id);
             if (herd_module) {
                 herd_module.session_summaries = session_summaries;
             }
         },
         appendPlansToHerdModule: (state, action) => {
             const { herd_id, plan } = action.payload;
-            const herd_module = state.herd_modules.find((hm) => hm.herd.id.toString() === herd_id);
+            const herd_module = state.herd_modules.find((hm) => hm.herd.id?.toString() === herd_id);
             if (herd_module) {
                 herd_module.plans = [...herd_module.plans, plan];
             }
         },
         updateDeviceForHerdModule: (state, action) => {
             const { herd_id, device } = action.payload;
-            const herd_module = state.herd_modules.find((hm) => hm.herd.id.toString() === herd_id);
+            const herd_module = state.herd_modules.find((hm) => hm.herd.id?.toString() === herd_id);
             if (herd_module) {
                 herd_module.devices = herd_module.devices.map((d) => d.id === device.id ? device : d);
             }
@@ -104,7 +104,7 @@ export const scoutSlice = createSlice({
         // append device to herd module
         addNewDeviceToHerdModule: (state, action) => {
             const { herd_id, device } = action.payload;
-            const herd_module = state.herd_modules.find((hm) => hm.herd.id.toString() === herd_id);
+            const herd_module = state.herd_modules.find((hm) => hm.herd.id?.toString() === herd_id);
             if (herd_module) {
                 herd_module.devices = [...herd_module.devices, device];
             }

package/dist/types/db.d.ts

@@ -73,6 +73,7 @@ export type IEventWithTags = Database["public"]["CompositeTypes"]["event_with_ta
 export type IDevicePrettyLocation = Database["public"]["CompositeTypes"]["device_pretty_location"];
 export type IEventAndTagsPrettyLocation = Database["public"]["CompositeTypes"]["event_and_tags_pretty_location"];
 export type IZonesAndActionsPrettyLocation = Database["public"]["CompositeTypes"]["zones_and_actions_pretty_location"];
+export type IHerdPrettyLocation = Database["public"]["CompositeTypes"]["herds_pretty_location"];
 export type ISessionWithCoordinates = Database["public"]["CompositeTypes"]["session_with_coordinates"];
 export type IConnectivityWithCoordinates = Database["public"]["CompositeTypes"]["connectivity_with_coordinates"];
 export type IDeviceHeartbeatAnalysis = Database["public"]["CompositeTypes"]["device_heartbeat_analysis"];

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, ISessionUsageOverTime } from "../types/db";
+import { IDevice, IHerdPrettyLocation, IPlan, ILayer, IProvider, IUserAndRole, IZoneWithActions, ISessionSummary, ISessionUsageOverTime } from "../types/db";
 import { EnumWebResponse } from "./requests";
 export declare enum EnumHerdModulesLoadingState {
     NOT_LOADING = "NOT_LOADING",
@@ -8,7 +8,7 @@ export declare enum EnumHerdModulesLoadingState {
     UNSUCCESSFULLY_LOADED = "UNSUCCESSFULLY_LOADED"
 }
 export declare class HerdModule {
-    herd: IHerd;
+    herd: IHerdPrettyLocation;
     devices: IDevice[];
     zones: IZoneWithActions[];
     timestamp_last_refreshed: number;
@@ -19,12 +19,12 @@ export declare class HerdModule {
     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);
+    constructor(herd: IHerdPrettyLocation, 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>;
+    static from_herd(herd: IHerdPrettyLocation, client: SupabaseClient): Promise<HerdModule>;
 }
 export interface IHerdModule {
-    herd: IHerd;
+    herd: IHerdPrettyLocation;
     devices: IDevice[];
     timestamp_last_refreshed: number;
     user_roles: IUserAndRole[] | null;

package/dist/types/supabase.d.ts

@@ -467,6 +467,7 @@ export type Database = {
                     id: number;
                     inserted_at: string;
                     is_public: boolean;
+                    location: unknown;
                     slug: string;
                     video_publisher_token: string | null;
                     video_server_url: string | null;
@@ -480,6 +481,7 @@ export type Database = {
                     id?: number;
                     inserted_at?: string;
                     is_public?: boolean;
+                    location?: unknown;
                     slug: string;
                     video_publisher_token?: string | null;
                     video_server_url?: string | null;
@@ -493,6 +495,7 @@ export type Database = {
                     id?: number;
                     inserted_at?: string;
                     is_public?: boolean;
+                    location?: unknown;
                     slug?: string;
                     video_publisher_token?: string | null;
                     video_server_url?: string | null;
@@ -1533,6 +1536,16 @@ export type Database = {
                     total_heartbeats: number;
                 }[];
             };
+            get_herds_with_location: {
+                Args: never;
+                Returns: Database["public"]["CompositeTypes"]["herds_pretty_location"][];
+                SetofOptions: {
+                    from: "*";
+                    to: "herds_pretty_location";
+                    isOneToOne: false;
+                    isSetofReturn: true;
+                };
+            };
             get_pins_for_herd: {
                 Args: {
                     herd_id_caller: number;
@@ -1756,6 +1769,14 @@ export type Database = {
                 Args: never;
                 Returns: undefined;
             };
+            set_herd_location: {
+                Args: {
+                    p_herd_id: number;
+                    p_latitude: number;
+                    p_longitude: number;
+                };
+                Returns: undefined;
+            };
         };
         Enums: {
             app_permission: "herds.delete" | "events.delete";
@@ -1883,6 +1904,22 @@ export type Database = {
                 is_public: boolean | null;
                 tags: Database["public"]["Tables"]["tags"]["Row"][] | null;
             };
+            herds_pretty_location: {
+                id: number | null;
+                inserted_at: string | null;
+                slug: string | null;
+                description: string | null;
+                created_by: string | null;
+                is_public: boolean | null;
+                earthranger_domain: string | null;
+                earthranger_token: string | null;
+                video_publisher_token: string | null;
+                video_subscriber_token: string | null;
+                video_server_url: string | null;
+                location: string | null;
+                latitude: number | null;
+                longitude: number | null;
+            };
             pins_pretty_location: {
                 id: number | null;
                 created_at: string | null;

package/package.json

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