@adventurelabs/scout-core 1.0.83 → 1.0.84

package/dist/helpers/cache.d.ts

@@ -47,8 +47,6 @@ export declare class ScoutCache {
         reason: string;
     }>;
     preloadCache(loadFunction: () => Promise<IHerdModule[]>, ttlMs?: number): Promise<void>;
-    getProvidersForHerd(herdId: string): Promise<CacheResult<any[]>>;
-    setProvidersForHerd(herdId: string, providers: any[], ttlMs?: number): Promise<void>;
     getDefaultTtl(): number;
 }
 export declare const scoutCache: ScoutCache;

package/dist/helpers/cache.js

@@ -2,7 +2,6 @@ const DB_NAME = "ScoutCache";
 const DB_VERSION = 1;
 const HERD_MODULES_STORE = "herd_modules";
 const CACHE_METADATA_STORE = "cache_metadata";
-const PROVIDERS_STORE = "providers";
 // Default TTL: 24 hours (1 day)
 const DEFAULT_TTL_MS = 24 * 60 * 60 * 1000;
 export class ScoutCache {
@@ -47,15 +46,6 @@ export class ScoutCache {
                         keyPath: "key",
                     });
                 }
-                // Create providers store
-                if (!db.objectStoreNames.contains(PROVIDERS_STORE)) {
-                    const providersStore = db.createObjectStore(PROVIDERS_STORE, {
-                        keyPath: "herdId",
-                    });
-                    providersStore.createIndex("timestamp", "timestamp", {
-                        unique: false,
-                    });
-                }
                 console.log("[ScoutCache] Database schema upgraded");
             };
         });
@@ -65,16 +55,15 @@ export class ScoutCache {
         await this.init();
         if (!this.db)
             throw new Error("Database not initialized");
-        const transaction = this.db.transaction([HERD_MODULES_STORE, CACHE_METADATA_STORE, PROVIDERS_STORE], "readwrite");
+        const transaction = this.db.transaction([HERD_MODULES_STORE, CACHE_METADATA_STORE], "readwrite");
         return new Promise((resolve, reject) => {
             transaction.onerror = () => reject(transaction.error);
             transaction.oncomplete = () => resolve();
             const herdModulesStore = transaction.objectStore(HERD_MODULES_STORE);
             const metadataStore = transaction.objectStore(CACHE_METADATA_STORE);
-            const providersStore = transaction.objectStore(PROVIDERS_STORE);
             const timestamp = Date.now();
             const version = "1.0.0";
-            // Store each herd module and its providers
+            // Store each herd module
             herdModules.forEach((herdModule) => {
                 const cacheEntry = {
                     herdId: herdModule.herd.id.toString(),
@@ -82,15 +71,6 @@ export class ScoutCache {
                     timestamp,
                 };
                 herdModulesStore.put(cacheEntry);
-                // Store providers separately for easier querying
-                if (herdModule.providers && herdModule.providers.length > 0) {
-                    const providersCacheEntry = {
-                        herdId: herdModule.herd.id.toString(),
-                        data: herdModule.providers,
-                        timestamp,
-                    };
-                    providersStore.put(providersCacheEntry);
-                }
             });
             // Store cache metadata
             const metadata = {
@@ -102,16 +82,6 @@ export class ScoutCache {
                 lastModified: timestamp,
             };
             metadataStore.put(metadata);
-            // Store providers metadata
-            const providersMetadata = {
-                key: "providers",
-                timestamp,
-                ttl: ttlMs,
-                version,
-                etag,
-                lastModified: timestamp,
-            };
-            metadataStore.put(providersMetadata);
         });
     }
     async getHerdModules() {
@@ -164,17 +134,14 @@ export class ScoutCache {
         await this.init();
         if (!this.db)
             throw new Error("Database not initialized");
-        const transaction = this.db.transaction([HERD_MODULES_STORE, CACHE_METADATA_STORE, PROVIDERS_STORE], "readwrite");
+        const transaction = this.db.transaction([HERD_MODULES_STORE, CACHE_METADATA_STORE], "readwrite");
         return new Promise((resolve, reject) => {
             transaction.onerror = () => reject(transaction.error);
             transaction.oncomplete = () => resolve();
             const herdModulesStore = transaction.objectStore(HERD_MODULES_STORE);
             const metadataStore = transaction.objectStore(CACHE_METADATA_STORE);
-            const providersStore = transaction.objectStore(PROVIDERS_STORE);
             herdModulesStore.clear();
-            providersStore.clear();
             metadataStore.delete("herd_modules");
-            metadataStore.delete("providers");
         });
     }
     async invalidateHerdModules() {
@@ -187,7 +154,6 @@ export class ScoutCache {
             transaction.oncomplete = () => resolve();
             const metadataStore = transaction.objectStore(CACHE_METADATA_STORE);
             metadataStore.delete("herd_modules");
-            metadataStore.delete("providers");
         });
     }
     async getCacheStats() {
@@ -248,81 +214,6 @@ export class ScoutCache {
             console.warn("[ScoutCache] Background preload failed:", error);
         }
     }
-    // Method to get providers for a specific herd from cache
-    async getProvidersForHerd(herdId) {
-        await this.init();
-        if (!this.db)
-            throw new Error("Database not initialized");
-        const transaction = this.db.transaction([PROVIDERS_STORE, CACHE_METADATA_STORE], "readonly");
-        return new Promise((resolve, reject) => {
-            transaction.onerror = () => reject(transaction.error);
-            const providersStore = transaction.objectStore(PROVIDERS_STORE);
-            const metadataStore = transaction.objectStore(CACHE_METADATA_STORE);
-            // Get metadata first
-            const metadataRequest = metadataStore.get("providers");
-            metadataRequest.onsuccess = () => {
-                const metadata = metadataRequest.result;
-                const now = Date.now();
-                if (!metadata) {
-                    this.stats.misses++;
-                    resolve({ data: null, isStale: true, age: 0, metadata: null });
-                    return;
-                }
-                const age = now - metadata.timestamp;
-                const isStale = age > metadata.ttl;
-                // Get providers for specific herd
-                const getRequest = providersStore.get(herdId);
-                getRequest.onsuccess = () => {
-                    const cacheEntry = getRequest.result;
-                    const providers = cacheEntry?.data || [];
-                    // Update stats
-                    if (providers.length > 0) {
-                        this.stats.hits++;
-                    }
-                    else {
-                        this.stats.misses++;
-                    }
-                    resolve({
-                        data: providers,
-                        isStale,
-                        age,
-                        metadata,
-                    });
-                };
-            };
-        });
-    }
-    // Method to set providers for a specific herd
-    async setProvidersForHerd(herdId, providers, ttlMs = DEFAULT_TTL_MS) {
-        await this.init();
-        if (!this.db)
-            throw new Error("Database not initialized");
-        const transaction = this.db.transaction([PROVIDERS_STORE, CACHE_METADATA_STORE], "readwrite");
-        return new Promise((resolve, reject) => {
-            transaction.onerror = () => reject(transaction.error);
-            transaction.oncomplete = () => resolve();
-            const providersStore = transaction.objectStore(PROVIDERS_STORE);
-            const metadataStore = transaction.objectStore(CACHE_METADATA_STORE);
-            const timestamp = Date.now();
-            const version = "1.0.0";
-            // Store providers
-            const providersCacheEntry = {
-                herdId,
-                data: providers,
-                timestamp,
-            };
-            providersStore.put(providersCacheEntry);
-            // Update providers metadata
-            const metadata = {
-                key: "providers",
-                timestamp,
-                ttl: ttlMs,
-                version,
-                lastModified: timestamp,
-            };
-            metadataStore.put(metadata);
-        });
-    }
     // Get the default TTL value
     getDefaultTtl() {
         return DEFAULT_TTL_MS;

package/dist/helpers/heartbeats.d.ts

@@ -0,0 +1,9 @@
+import { IWebResponseCompatible } from "../types/requests";
+import { IHeartbeat } from "../types/db";
+export declare function server_get_last_heartbeat_by_device(device_id: number): Promise<IWebResponseCompatible<IHeartbeat | null>>;
+export declare function server_get_heartbeats_by_device(device_id: number, limit?: number): Promise<IWebResponseCompatible<IHeartbeat[]>>;
+export declare function server_check_device_online_status(device_id: number, offline_threshold_minutes?: number): Promise<IWebResponseCompatible<{
+    is_online: boolean;
+    last_heartbeat: IHeartbeat | null;
+    minutes_since_last_heartbeat: number | null;
+}>>;

package/dist/helpers/heartbeats.js

@@ -0,0 +1,90 @@
+"use server";
+import { newServerClient } from "../supabase/server";
+import { EnumWebResponse, IWebResponse, } from "../types/requests";
+// Function to get the last heartbeat for a device
+export async function server_get_last_heartbeat_by_device(device_id) {
+    const supabase = await newServerClient();
+    const { data, error } = await supabase
+        .from("heartbeats")
+        .select("*")
+        .eq("device_id", device_id)
+        .order("timestamp", { ascending: false })
+        .limit(1)
+        .single();
+    if (error) {
+        // If no heartbeats found, return null data instead of error
+        if (error.code === "PGRST116") {
+            return {
+                status: EnumWebResponse.SUCCESS,
+                msg: null,
+                data: null,
+            };
+        }
+        return {
+            status: EnumWebResponse.ERROR,
+            msg: error.message,
+            data: null,
+        };
+    }
+    else {
+        return IWebResponse.success(data).to_compatible();
+    }
+}
+// Function to get all heartbeats for a device
+export async function server_get_heartbeats_by_device(device_id, limit) {
+    const supabase = await newServerClient();
+    let query = supabase
+        .from("heartbeats")
+        .select("*")
+        .eq("device_id", device_id)
+        .order("timestamp", { ascending: false });
+    if (limit) {
+        query = query.limit(limit);
+    }
+    const { data, error } = await query;
+    if (error) {
+        return {
+            status: EnumWebResponse.ERROR,
+            msg: error.message,
+            data: [],
+        };
+    }
+    else {
+        return IWebResponse.success(data || []).to_compatible();
+    }
+}
+// Function to check if a device is online based on heartbeat recency
+export async function server_check_device_online_status(device_id, offline_threshold_minutes = 5) {
+    const supabase = await newServerClient();
+    const { data, error } = await supabase
+        .from("heartbeats")
+        .select("*")
+        .eq("device_id", device_id)
+        .order("timestamp", { ascending: false })
+        .limit(1)
+        .single();
+    if (error) {
+        // If no heartbeats found
+        if (error.code === "PGRST116") {
+            return IWebResponse.success({
+                is_online: false,
+                last_heartbeat: null,
+                minutes_since_last_heartbeat: null,
+            }).to_compatible();
+        }
+        return {
+            status: EnumWebResponse.ERROR,
+            msg: error.message,
+            data: null,
+        };
+    }
+    const now = new Date();
+    const heartbeatTime = new Date(data.timestamp);
+    const minutesSinceLastHeartbeat = Math.floor((now.getTime() - heartbeatTime.getTime()) / (1000 * 60));
+    const isOnline = minutesSinceLastHeartbeat <= offline_threshold_minutes;
+    return IWebResponse.success({
+        is_online: isOnline,
+        last_heartbeat: data,
+        minutes_since_last_heartbeat: minutesSinceLastHeartbeat,
+    }).to_compatible();
+}

package/dist/helpers/index.d.ts

@@ -6,6 +6,7 @@ export * from "./devices";
 export * from "./email";
 export * from "./events";
 export * from "./gps";
+export * from "./heartbeats";
 export * from "./herds";
 export * from "./location";
 export * from "./plans";

package/dist/helpers/index.js

@@ -6,6 +6,7 @@ export * from "./devices";
 export * from "./email";
 export * from "./events";
 export * from "./gps";
+export * from "./heartbeats";
 export * from "./herds";
 export * from "./location";
 export * from "./plans";

package/dist/providers/ScoutRefreshProvider.d.ts

@@ -289,6 +289,33 @@ export declare function useSupabase(): SupabaseClient<Database, "public", "publi
                 referencedColumns: ["id"];
             }];
         };
+        heartbeats: {
+            Row: {
+                created_at: string;
+                device_id: number;
+                id: number;
+                timestamp: string;
+            };
+            Insert: {
+                created_at?: string;
+                device_id: number;
+                id?: number;
+                timestamp: string;
+            };
+            Update: {
+                created_at?: string;
+                device_id?: number;
+                id?: number;
+                timestamp?: string;
+            };
+            Relationships: [{
+                foreignKeyName: "heartbeats_device_id_fkey";
+                columns: ["device_id"];
+                isOneToOne: false;
+                referencedRelation: "devices";
+                referencedColumns: ["id"];
+            }];
+        };
         herds: {
             Row: {
                 created_by: string;

package/dist/types/db.d.ts

@@ -21,7 +21,7 @@ export type IUserRolePerHerd = Database["public"]["Tables"]["users_roles_per_her
 export type IHerd = Database["public"]["Tables"]["herds"]["Row"];
 export type ISession = Database["public"]["Tables"]["sessions"]["Row"];
 export type IConnectivity = Database["public"]["Tables"]["connectivity"]["Row"];
-export type IProvider = Database["public"]["Tables"]["providers"]["Row"];
+export type IHeartbeat = Database["public"]["Tables"]["heartbeats"]["Row"];
 export type IEventWithTags = Database["public"]["CompositeTypes"]["event_with_tags"] & {
     earthranger_url: string | null;
     file_path: string | null;

package/dist/types/herd_module.d.ts

@@ -1,5 +1,5 @@
 import { SupabaseClient } from "@supabase/supabase-js";
-import { IDevice, IEventWithTags, IHerd, IPlan, ILayer, IProvider, IUserAndRole, IZoneWithActions, ISessionWithCoordinates } from "../types/db";
+import { IDevice, IEventWithTags, IHerd, IPlan, ILayer, IUserAndRole, IZoneWithActions, ISessionWithCoordinates } from "../types/db";
 import { EnumWebResponse } from "./requests";
 export declare enum EnumHerdModulesLoadingState {
     NOT_LOADING = "NOT_LOADING",
@@ -21,8 +21,7 @@ export declare class HerdModule {
     labels: string[];
     plans: IPlan[];
     layers: ILayer[];
-    providers: IProvider[];
-    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[], layers?: ILayer[], providers?: IProvider[]);
+    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[], layers?: ILayer[]);
     to_serializable(): IHerdModule;
     static from_herd(herd: IHerd, client: SupabaseClient): Promise<HerdModule>;
 }
@@ -40,7 +39,6 @@ export interface IHerdModule {
     zones: IZoneWithActions[];
     sessions: ISessionWithCoordinates[];
     layers: ILayer[];
-    providers: IProvider[];
 }
 export interface IHerdModulesResponse {
     data: IHerdModule[];

package/dist/types/herd_module.js

@@ -4,7 +4,6 @@ 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";
 import { server_get_events_and_tags_for_devices_batch } from "../helpers/tags";
 import { server_get_users_with_herd_access } from "../helpers/users";
 import { EnumWebResponse } from "./requests";
@@ -19,7 +18,7 @@ export var EnumHerdModulesLoadingState;
     EnumHerdModulesLoadingState["UNSUCCESSFULLY_LOADED"] = "UNSUCCESSFULLY_LOADED";
 })(EnumHerdModulesLoadingState || (EnumHerdModulesLoadingState = {}));
 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 = [], sessions = [], layers = [], providers = []) {
+    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 = [], layers = []) {
         this.user_roles = null;
         this.events_page_index = 0;
         this.total_events = 0;
@@ -27,7 +26,6 @@ export class HerdModule {
         this.labels = [];
         this.plans = [];
         this.layers = [];
-        this.providers = [];
         this.herd = herd;
         this.devices = devices;
         this.events = events;
@@ -41,7 +39,6 @@ export class HerdModule {
         this.zones = zones;
         this.sessions = sessions;
         this.layers = layers;
-        this.providers = providers;
     }
     to_serializable() {
         return {
@@ -58,7 +55,6 @@ export class HerdModule {
             zones: this.zones,
             sessions: this.sessions,
             layers: this.layers,
-            providers: this.providers,
         };
     }
     static async from_herd(herd, client) {
@@ -99,7 +95,7 @@ export class HerdModule {
                 }
             }
             // Run all remaining requests in parallel with individual error handling
-            const [res_zones, res_user_roles, total_event_count, res_plans, res_sessions, res_layers, res_providers,] = await Promise.allSettled([
+            const [res_zones, res_user_roles, total_event_count, res_plans, res_sessions, res_layers,] = await Promise.allSettled([
                 server_get_more_zones_and_actions_for_herd(herd.id, 0, 10).catch((error) => {
                     console.warn(`[HerdModule] Failed to get zones and actions:`, error);
                     return { status: EnumWebResponse.ERROR, data: null };
@@ -118,20 +114,12 @@ export class HerdModule {
                 }),
                 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,
-                    };
+                    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 };
                 }),
-                server_get_providers_by_herd(herd.id).catch((error) => {
-                    console.warn(`[HerdModule] Failed to get providers:`, error);
-                    return { status: EnumWebResponse.ERROR, data: null };
-                }),
             ]);
             // Assign recent events to devices from batch results
             for (let i = 0; i < new_devices.length; i++) {
@@ -160,28 +148,23 @@ export class HerdModule {
             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 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
-                : [];
             // 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, 0, total_events, total_events, newLabels, plans, zones, sessions, layers, providers);
+            return new HerdModule(herd, new_devices, [], Date.now(), user_roles, 0, total_events, total_events, newLabels, plans, zones, sessions, layers);
         }
         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, 0, 0, 0, [], [], [], [], [], []);
+            return new HerdModule(herd, [], [], Date.now(), null, 0, 0, 0, [], [], [], [], []);
         }
     }
 }

package/dist/types/supabase.d.ts

@@ -302,6 +302,35 @@ export type Database = {
                     }
                 ];
             };
+            heartbeats: {
+                Row: {
+                    created_at: string;
+                    device_id: number;
+                    id: number;
+                    timestamp: string;
+                };
+                Insert: {
+                    created_at?: string;
+                    device_id: number;
+                    id?: number;
+                    timestamp: string;
+                };
+                Update: {
+                    created_at?: string;
+                    device_id?: number;
+                    id?: number;
+                    timestamp?: string;
+                };
+                Relationships: [
+                    {
+                        foreignKeyName: "heartbeats_device_id_fkey";
+                        columns: ["device_id"];
+                        isOneToOne: false;
+                        referencedRelation: "devices";
+                        referencedColumns: ["id"];
+                    }
+                ];
+            };
             herds: {
                 Row: {
                     created_by: string;

package/package.json

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