@adventurelabs/scout-core 1.0.27 → 1.0.28

package/dist/helpers/sessions.d.ts

@@ -1,6 +1,6 @@
 import { SupabaseClient } from "@supabase/supabase-js";
 import { Database } from "../types/supabase";
-import { ISession, IConnectivity, IEvent } from "../types/db";
+import { ISession, IConnectivity, IEvent, ISessionWithCoordinates, IConnectivityWithCoordinates } from "../types/db";
 export type SessionInput = Omit<ISession, "id" | "inserted_at">;
 export type SessionUpdateInput = Partial<SessionInput> & {
     id: number;
@@ -11,19 +11,19 @@ export type ConnectivityUpdateInput = Partial<ConnectivityInput> & {
     id: number;
 };
 export type ConnectivityUpsertInput = ConnectivityInput | ConnectivityUpdateInput;
-export declare function getSessionsByHerdId(supabase: SupabaseClient<Database>, herdId: number): Promise<ISession[]>;
-export declare function getConnectivityBySessionId(supabase: SupabaseClient<Database>, sessionId: number): Promise<IConnectivity[]>;
+export declare function getSessionsByHerdId(supabase: SupabaseClient<Database>, herdId: number): Promise<ISessionWithCoordinates[]>;
+export declare function getConnectivityBySessionId(supabase: SupabaseClient<Database>, sessionId: number): Promise<IConnectivityWithCoordinates[]>;
 export declare function getEventsBySessionId(supabase: SupabaseClient<Database>, sessionId: number): Promise<IEvent[]>;
 export declare function upsertSession(supabase: SupabaseClient<Database>, sessionData: SessionUpsertInput): Promise<ISession>;
 export declare function upsertSessions(supabase: SupabaseClient<Database>, sessionsData: SessionUpsertInput[]): Promise<ISession[]>;
 export declare function upsertConnectivity(supabase: SupabaseClient<Database>, connectivityData: ConnectivityUpsertInput): Promise<IConnectivity>;
 export declare function upsertConnectivityBatch(supabase: SupabaseClient<Database>, connectivityDataArray: ConnectivityUpsertInput[]): Promise<IConnectivity[]>;
 export declare function getSessionWithConnectivityAndEvents(supabase: SupabaseClient<Database>, sessionId: number): Promise<{
-    session: ISession;
-    connectivity: IConnectivity[];
+    session: ISessionWithCoordinates | null;
+    connectivity: IConnectivityWithCoordinates[];
     events: IEvent[];
 }>;
-export declare function getSessionsByDeviceId(supabase: SupabaseClient<Database>, deviceId: number): Promise<ISession[]>;
+export declare function getSessionsByDeviceId(supabase: SupabaseClient<Database>, deviceId: number): Promise<ISessionWithCoordinates[]>;
 export declare function deleteSession(supabase: SupabaseClient<Database>, sessionId: number): Promise<void>;
 export declare function deleteSessions(supabase: SupabaseClient<Database>, sessionIds: number[]): Promise<void>;
 export declare function deleteConnectivity(supabase: SupabaseClient<Database>, connectivityId: number): Promise<void>;

package/dist/helpers/sessions.js

@@ -1,29 +1,34 @@
-// Get sessions by herd id
+// Get sessions by herd id using RPC function with coordinates
 export async function getSessionsByHerdId(supabase, herdId) {
-    const { data, error } = await supabase
-        .from("sessions")
-        .select(`
-      *,
-      devices!inner(herd_id)
-    `)
-        .eq("devices.herd_id", herdId)
-        .order("timestamp_start", { ascending: false });
+    const { data, error } = await supabase.rpc("get_sessions_with_coordinates", {
+        herd_id_caller: herdId,
+    });
     if (error) {
         throw new Error(`Failed to get sessions by herd id: ${error.message}`);
     }
-    return data || [];
+    // 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());
+    });
+    return sortedSessions;
 }
-// Get connectivity by session id
+// Get connectivity by session id using RPC function with coordinates
 export async function getConnectivityBySessionId(supabase, sessionId) {
-    const { data, error } = await supabase
-        .from("connectivity")
-        .select("*")
-        .eq("session_id", sessionId)
-        .order("timestamp_start", { ascending: true });
+    const { data, error } = await supabase.rpc("get_connectivity_with_coordinates", { session_id_caller: sessionId });
     if (error) {
         throw new Error(`Failed to get connectivity by session id: ${error.message}`);
     }
-    return data || [];
+    // Sort by timestamp_start in ascending order
+    const sortedConnectivity = (data || []).sort((a, b) => {
+        if (!a.timestamp_start || !b.timestamp_start)
+            return 0;
+        return (new Date(a.timestamp_start).getTime() -
+            new Date(b.timestamp_start).getTime());
+    });
+    return sortedConnectivity;
 }
 // Get events by session id
 export async function getEventsBySessionId(supabase, sessionId) {
@@ -165,29 +170,50 @@ export async function upsertConnectivityBatch(supabase, connectivityDataArray) {
     }
     return results;
 }
-// Get session with connectivity and events
+// Get session with connectivity and events using RPC functions
 export async function getSessionWithConnectivityAndEvents(supabase, sessionId) {
-    const [sessionResult, connectivityResult, eventsResult] = await Promise.all([
-        supabase.from("sessions").select("*").eq("id", sessionId).single(),
+    // 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) {
+        throw new Error(`Failed to get session: ${sessionError.message}`);
+    }
+    // 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) {
+        throw new Error(`Failed to get device: ${deviceError.message}`);
+    }
+    // Get sessions with coordinates for the herd and find our specific session
+    const { data: allSessionsWithCoords, error: sessionsError } = await supabase.rpc("get_sessions_with_coordinates", {
+        herd_id_caller: device.herd_id,
+    });
+    if (sessionsError) {
+        throw new Error(`Failed to get session with coordinates: ${sessionsError.message}`);
+    }
+    // Find the specific session in the results
+    const sessionWithCoords = allSessionsWithCoords?.find((s) => s.id === sessionId) || null;
+    const [connectivityResult, eventsResult] = await Promise.all([
         getConnectivityBySessionId(supabase, sessionId),
         getEventsBySessionId(supabase, sessionId),
     ]);
-    if (sessionResult.error) {
-        throw new Error(`Failed to get session: ${sessionResult.error.message}`);
-    }
     return {
-        session: sessionResult.data,
+        session: sessionWithCoords,
         connectivity: connectivityResult,
         events: eventsResult,
     };
 }
-// Get sessions for a device
+// Get sessions for a device using RPC function
 export async function getSessionsByDeviceId(supabase, deviceId) {
-    const { data, error } = await supabase
-        .from("sessions")
-        .select("*")
-        .eq("device_id", deviceId)
-        .order("timestamp_start", { ascending: false });
+    const { data, error } = await supabase.rpc("get_sessions_with_coordinates_by_device", {
+        device_id_caller: deviceId,
+    });
     if (error) {
         throw new Error(`Failed to get sessions by device id: ${error.message}`);
     }

package/dist/providers/ScoutRefreshProvider.d.ts

@@ -559,6 +559,12 @@ export declare function useSupabase(): SupabaseClient<Database, "public", {
             };
             Returns: import("../types/supabase").Json;
         };
+        get_connectivity_with_coordinates: {
+            Args: {
+                session_id_caller: number;
+            };
+            Returns: Database["public"]["CompositeTypes"]["connectivity_with_coordinates"][];
+        };
         get_device_by_id: {
             Args: {
                 device_id_caller: number;
@@ -647,6 +653,18 @@ export declare function useSupabase(): SupabaseClient<Database, "public", {
             };
             Returns: Database["public"]["CompositeTypes"]["event_with_tags"][];
         };
+        get_sessions_with_coordinates: {
+            Args: {
+                herd_id_caller: number;
+            };
+            Returns: Database["public"]["CompositeTypes"]["session_with_coordinates"][];
+        };
+        get_sessions_with_coordinates_by_device: {
+            Args: {
+                device_id_caller: number;
+            };
+            Returns: Database["public"]["CompositeTypes"]["session_with_coordinates"][];
+        };
         get_total_events_for_herd: {
             Args: {
                 herd_id_caller: number;
@@ -677,6 +695,22 @@ export declare function useSupabase(): SupabaseClient<Database, "public", {
         user_status: "ONLINE" | "OFFLINE";
     };
     CompositeTypes: {
+        connectivity_with_coordinates: {
+            id: number | null;
+            session_id: number | null;
+            inserted_at: string | null;
+            timestamp_start: string | null;
+            signal: number | null;
+            noise: number | null;
+            altitude: number | null;
+            heading: number | null;
+            latitude: number | null;
+            longitude: number | null;
+            h14_index: number | null;
+            h13_index: number | null;
+            h12_index: number | null;
+            h11_index: number | null;
+        };
         device_pretty_location: {
             id: number | null;
             inserted_at: string | null;
@@ -757,6 +791,23 @@ export declare function useSupabase(): SupabaseClient<Database, "public", {
             is_public: boolean | null;
             tags: Database["public"]["Tables"]["tags"]["Row"][] | null;
         };
+        session_with_coordinates: {
+            id: number | null;
+            device_id: number | null;
+            timestamp_start: string | null;
+            timestamp_end: string | null;
+            inserted_at: string | null;
+            software_version: string | null;
+            locations_geojson: import("../types/supabase").Json | null;
+            altitude_max: number | null;
+            altitude_min: number | null;
+            altitude_average: number | null;
+            velocity_max: number | null;
+            velocity_min: number | null;
+            velocity_average: number | null;
+            distance_total: number | null;
+            distance_max_from_start: number | null;
+        };
         zones_and_actions_pretty_location: {
             id: number | null;
             inserted_at: string | null;

package/dist/supabase/server.d.ts

@@ -557,6 +557,12 @@ export declare function newServerClient(): Promise<import("@supabase/supabase-js
             };
             Returns: import("../types/supabase").Json;
         };
+        get_connectivity_with_coordinates: {
+            Args: {
+                session_id_caller: number;
+            };
+            Returns: Database["public"]["CompositeTypes"]["connectivity_with_coordinates"][];
+        };
         get_device_by_id: {
             Args: {
                 device_id_caller: number;
@@ -645,6 +651,18 @@ export declare function newServerClient(): Promise<import("@supabase/supabase-js
             };
             Returns: Database["public"]["CompositeTypes"]["event_with_tags"][];
         };
+        get_sessions_with_coordinates: {
+            Args: {
+                herd_id_caller: number;
+            };
+            Returns: Database["public"]["CompositeTypes"]["session_with_coordinates"][];
+        };
+        get_sessions_with_coordinates_by_device: {
+            Args: {
+                device_id_caller: number;
+            };
+            Returns: Database["public"]["CompositeTypes"]["session_with_coordinates"][];
+        };
         get_total_events_for_herd: {
             Args: {
                 herd_id_caller: number;
@@ -675,6 +693,22 @@ export declare function newServerClient(): Promise<import("@supabase/supabase-js
         user_status: "ONLINE" | "OFFLINE";
     };
     CompositeTypes: {
+        connectivity_with_coordinates: {
+            id: number | null;
+            session_id: number | null;
+            inserted_at: string | null;
+            timestamp_start: string | null;
+            signal: number | null;
+            noise: number | null;
+            altitude: number | null;
+            heading: number | null;
+            latitude: number | null;
+            longitude: number | null;
+            h14_index: number | null;
+            h13_index: number | null;
+            h12_index: number | null;
+            h11_index: number | null;
+        };
         device_pretty_location: {
             id: number | null;
             inserted_at: string | null;
@@ -755,6 +789,23 @@ export declare function newServerClient(): Promise<import("@supabase/supabase-js
             is_public: boolean | null;
             tags: Database["public"]["Tables"]["tags"]["Row"][] | null;
         };
+        session_with_coordinates: {
+            id: number | null;
+            device_id: number | null;
+            timestamp_start: string | null;
+            timestamp_end: string | null;
+            inserted_at: string | null;
+            software_version: string | null;
+            locations_geojson: import("../types/supabase").Json | null;
+            altitude_max: number | null;
+            altitude_min: number | null;
+            altitude_average: number | null;
+            velocity_max: number | null;
+            velocity_min: number | null;
+            velocity_average: number | null;
+            distance_total: number | null;
+            distance_max_from_start: number | null;
+        };
         zones_and_actions_pretty_location: {
             id: number | null;
             inserted_at: string | null;

package/dist/types/db.d.ts

@@ -25,6 +25,8 @@ 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 ISessionWithCoordinates = Database["public"]["CompositeTypes"]["session_with_coordinates"];
+export type IConnectivityWithCoordinates = Database["public"]["CompositeTypes"]["connectivity_with_coordinates"];
 export interface IZoneWithActions extends IZone {
     actions: IAction[];
 }

package/dist/types/supabase.d.ts

@@ -2,6 +2,9 @@ export type Json = string | number | boolean | null | {
     [key: string]: Json | undefined;
 } | Json[];
 export type Database = {
+    __InternalSupabase: {
+        PostgrestVersion: "12.2.3 (519615d)";
+    };
     graphql_public: {
         Tables: {
             [_ in never]: never;
@@ -615,6 +618,12 @@ export type Database = {
                 };
                 Returns: Json;
             };
+            get_connectivity_with_coordinates: {
+                Args: {
+                    session_id_caller: number;
+                };
+                Returns: Database["public"]["CompositeTypes"]["connectivity_with_coordinates"][];
+            };
             get_device_by_id: {
                 Args: {
                     device_id_caller: number;
@@ -703,6 +712,18 @@ export type Database = {
                 };
                 Returns: Database["public"]["CompositeTypes"]["event_with_tags"][];
             };
+            get_sessions_with_coordinates: {
+                Args: {
+                    herd_id_caller: number;
+                };
+                Returns: Database["public"]["CompositeTypes"]["session_with_coordinates"][];
+            };
+            get_sessions_with_coordinates_by_device: {
+                Args: {
+                    device_id_caller: number;
+                };
+                Returns: Database["public"]["CompositeTypes"]["session_with_coordinates"][];
+            };
             get_total_events_for_herd: {
                 Args: {
                     herd_id_caller: number;
@@ -733,6 +754,22 @@ export type Database = {
             user_status: "ONLINE" | "OFFLINE";
         };
         CompositeTypes: {
+            connectivity_with_coordinates: {
+                id: number | null;
+                session_id: number | null;
+                inserted_at: string | null;
+                timestamp_start: string | null;
+                signal: number | null;
+                noise: number | null;
+                altitude: number | null;
+                heading: number | null;
+                latitude: number | null;
+                longitude: number | null;
+                h14_index: number | null;
+                h13_index: number | null;
+                h12_index: number | null;
+                h11_index: number | null;
+            };
             device_pretty_location: {
                 id: number | null;
                 inserted_at: string | null;
@@ -813,6 +850,23 @@ export type Database = {
                 is_public: boolean | null;
                 tags: Database["public"]["Tables"]["tags"]["Row"][] | null;
             };
+            session_with_coordinates: {
+                id: number | null;
+                device_id: number | null;
+                timestamp_start: string | null;
+                timestamp_end: string | null;
+                inserted_at: string | null;
+                software_version: string | null;
+                locations_geojson: Json | null;
+                altitude_max: number | null;
+                altitude_min: number | null;
+                altitude_average: number | null;
+                velocity_max: number | null;
+                velocity_min: number | null;
+                velocity_average: number | null;
+                distance_total: number | null;
+                distance_max_from_start: number | null;
+            };
             zones_and_actions_pretty_location: {
                 id: number | null;
                 inserted_at: string | null;
@@ -823,54 +877,55 @@ export type Database = {
         };
     };
 };
-type DefaultSchema = Database[Extract<keyof Database, "public">];
+type DatabaseWithoutInternals = Omit<Database, "__InternalSupabase">;
+type DefaultSchema = DatabaseWithoutInternals[Extract<keyof Database, "public">];
 export type Tables<DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] & DefaultSchema["Views"]) | {
-    schema: keyof Database;
+    schema: keyof DatabaseWithoutInternals;
 }, TableName extends DefaultSchemaTableNameOrOptions extends {
-    schema: keyof Database;
-} ? keyof (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] & Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"]) : never = never> = DefaultSchemaTableNameOrOptions extends {
-    schema: keyof Database;
-} ? (Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] & Database[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
+    schema: keyof DatabaseWithoutInternals;
+} ? keyof (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] & DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"]) : never = never> = DefaultSchemaTableNameOrOptions extends {
+    schema: keyof DatabaseWithoutInternals;
+} ? (DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] & DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Views"])[TableName] extends {
     Row: infer R;
 } ? R : never : DefaultSchemaTableNameOrOptions extends keyof (DefaultSchema["Tables"] & DefaultSchema["Views"]) ? (DefaultSchema["Tables"] & DefaultSchema["Views"])[DefaultSchemaTableNameOrOptions] extends {
     Row: infer R;
 } ? R : never : never;
 export type TablesInsert<DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"] | {
-    schema: keyof Database;
+    schema: keyof DatabaseWithoutInternals;
 }, TableName extends DefaultSchemaTableNameOrOptions extends {
-    schema: keyof Database;
-} ? keyof Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] : never = never> = DefaultSchemaTableNameOrOptions extends {
-    schema: keyof Database;
-} ? Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+    schema: keyof DatabaseWithoutInternals;
+} ? keyof DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] : never = never> = DefaultSchemaTableNameOrOptions extends {
+    schema: keyof DatabaseWithoutInternals;
+} ? DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
     Insert: infer I;
 } ? I : never : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"] ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
     Insert: infer I;
 } ? I : never : never;
 export type TablesUpdate<DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"] | {
-    schema: keyof Database;
+    schema: keyof DatabaseWithoutInternals;
 }, TableName extends DefaultSchemaTableNameOrOptions extends {
-    schema: keyof Database;
-} ? keyof Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] : never = never> = DefaultSchemaTableNameOrOptions extends {
-    schema: keyof Database;
-} ? Database[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
+    schema: keyof DatabaseWithoutInternals;
+} ? keyof DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"] : never = never> = DefaultSchemaTableNameOrOptions extends {
+    schema: keyof DatabaseWithoutInternals;
+} ? DatabaseWithoutInternals[DefaultSchemaTableNameOrOptions["schema"]]["Tables"][TableName] extends {
     Update: infer U;
 } ? U : never : DefaultSchemaTableNameOrOptions extends keyof DefaultSchema["Tables"] ? DefaultSchema["Tables"][DefaultSchemaTableNameOrOptions] extends {
     Update: infer U;
 } ? U : never : never;
 export type Enums<DefaultSchemaEnumNameOrOptions extends keyof DefaultSchema["Enums"] | {
-    schema: keyof Database;
+    schema: keyof DatabaseWithoutInternals;
 }, EnumName extends DefaultSchemaEnumNameOrOptions extends {
-    schema: keyof Database;
-} ? keyof Database[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"] : never = never> = DefaultSchemaEnumNameOrOptions extends {
-    schema: keyof Database;
-} ? Database[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"][EnumName] : DefaultSchemaEnumNameOrOptions extends keyof DefaultSchema["Enums"] ? DefaultSchema["Enums"][DefaultSchemaEnumNameOrOptions] : never;
+    schema: keyof DatabaseWithoutInternals;
+} ? keyof DatabaseWithoutInternals[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"] : never = never> = DefaultSchemaEnumNameOrOptions extends {
+    schema: keyof DatabaseWithoutInternals;
+} ? DatabaseWithoutInternals[DefaultSchemaEnumNameOrOptions["schema"]]["Enums"][EnumName] : DefaultSchemaEnumNameOrOptions extends keyof DefaultSchema["Enums"] ? DefaultSchema["Enums"][DefaultSchemaEnumNameOrOptions] : never;
 export type CompositeTypes<PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"] | {
-    schema: keyof Database;
+    schema: keyof DatabaseWithoutInternals;
 }, CompositeTypeName extends PublicCompositeTypeNameOrOptions extends {
-    schema: keyof Database;
-} ? keyof Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"] : never = never> = PublicCompositeTypeNameOrOptions extends {
-    schema: keyof Database;
-} ? Database[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName] : PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"] ? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions] : never;
+    schema: keyof DatabaseWithoutInternals;
+} ? keyof DatabaseWithoutInternals[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"] : never = never> = PublicCompositeTypeNameOrOptions extends {
+    schema: keyof DatabaseWithoutInternals;
+} ? DatabaseWithoutInternals[PublicCompositeTypeNameOrOptions["schema"]]["CompositeTypes"][CompositeTypeName] : PublicCompositeTypeNameOrOptions extends keyof DefaultSchema["CompositeTypes"] ? DefaultSchema["CompositeTypes"][PublicCompositeTypeNameOrOptions] : never;
 export declare const Constants: {
     readonly graphql_public: {
         readonly Enums: {};

package/package.json

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