@adventurelabs/scout-core 1.0.72 → 1.0.74

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, ISessionWithCoordinates, IConnectivityWithCoordinates, IEventAndTagsPrettyLocation } from "../types/db";
+import { ISession, IConnectivity, IEvent, ISessionWithCoordinates, IConnectivityWithCoordinates, IEventAndTagsPrettyLocation, ScoutDatabaseClient } from "../types/db";
 export type SessionInput = Omit<ISession, "id" | "inserted_at">;
 export type SessionUpdateInput = Partial<SessionInput> & {
     id: number;
@@ -11,28 +11,28 @@ export type ConnectivityUpdateInput = Partial<ConnectivityInput> & {
     id: number;
 };
 export type ConnectivityUpsertInput = ConnectivityInput | ConnectivityUpdateInput;
-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 getEventsAndTagsBySessionId(supabase: SupabaseClient<Database>, sessionId: number, limit?: number, offset?: number): Promise<IEventAndTagsPrettyLocation[]>;
-export declare function getTotalEventsForSession(supabase: SupabaseClient<Database>, sessionId: number): Promise<number>;
-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, herdId?: number): Promise<{
+export declare function getSessionsByHerdId(supabase: SupabaseClient<Database, "public">, herdId: number): Promise<ISessionWithCoordinates[]>;
+export declare function getConnectivityBySessionId(supabase: SupabaseClient<Database, "public">, sessionId: number): Promise<IConnectivityWithCoordinates[]>;
+export declare function getEventsBySessionId(supabase: SupabaseClient<Database, "public">, sessionId: number): Promise<IEvent[]>;
+export declare function getEventsAndTagsBySessionId(supabase: SupabaseClient<Database, "public">, sessionId: number, limit?: number, offset?: number): Promise<IEventAndTagsPrettyLocation[]>;
+export declare function getTotalEventsForSession(supabase: SupabaseClient<Database, "public">, sessionId: number): Promise<number>;
+export declare function upsertSession(supabase: SupabaseClient<Database, "public">, sessionData: SessionUpsertInput): Promise<ISession>;
+export declare function upsertSessions(supabase: SupabaseClient<Database, "public">, sessionsData: SessionUpsertInput[]): Promise<ISession[]>;
+export declare function upsertConnectivity(supabase: SupabaseClient<Database, "public">, connectivityData: ConnectivityUpsertInput): Promise<IConnectivity>;
+export declare function upsertConnectivityBatch(supabase: SupabaseClient<Database, "public">, connectivityDataArray: ConnectivityUpsertInput[]): Promise<IConnectivity[]>;
+export declare function getSessionWithConnectivityAndEvents(supabase: ScoutDatabaseClient, sessionId: number, herdId?: number): Promise<{
     session: ISessionWithCoordinates | null;
     connectivity: IConnectivityWithCoordinates[];
     events: IEvent[];
 }>;
-export declare function getSessionWithConnectivityAndEventsWithTags(supabase: SupabaseClient<Database>, sessionId: number, limit?: number, offset?: number, herdId?: number): Promise<{
+export declare function getSessionWithConnectivityAndEventsWithTags(supabase: ScoutDatabaseClient, sessionId: number, limit?: number, offset?: number, herdId?: number): Promise<{
     session: ISessionWithCoordinates | null;
     connectivity: IConnectivityWithCoordinates[];
     eventsWithTags: IEventAndTagsPrettyLocation[];
     totalEvents: number;
 }>;
-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>;
-export declare function deleteConnectivityBatch(supabase: SupabaseClient<Database>, connectivityIds: number[]): Promise<void>;
+export declare function getSessionsByDeviceId(supabase: ScoutDatabaseClient, deviceId: number): Promise<ISessionWithCoordinates[]>;
+export declare function deleteSession(supabase: ScoutDatabaseClient, sessionId: number): Promise<void>;
+export declare function deleteSessions(supabase: ScoutDatabaseClient, sessionIds: number[]): Promise<void>;
+export declare function deleteConnectivity(supabase: ScoutDatabaseClient, connectivityId: number): Promise<void>;
+export declare function deleteConnectivityBatch(supabase: ScoutDatabaseClient, connectivityIds: number[]): Promise<void>;

package/dist/helpers/tags.d.ts

@@ -1,5 +1,6 @@
 import { IEventAndTagsPrettyLocation, ITag } from "../types/db";
 import { IWebResponseCompatible } from "../types/requests";
+export declare function test_event_loading(device_id: number): Promise<boolean>;
 export declare function server_create_tags(tags: ITag[]): Promise<IWebResponseCompatible<ITag[]>>;
 export declare function server_delete_tags_by_ids(tag_ids: number[]): Promise<IWebResponseCompatible<boolean>>;
 export declare function server_update_tags(tags: ITag[]): Promise<IWebResponseCompatible<ITag[]>>;

package/dist/helpers/tags.js

@@ -1,6 +1,8 @@
 "use server";
 // add tag to db
 import { newServerClient } from "../supabase/server";
+import { EnumWebResponse, IWebResponse, } from "../types/requests";
+import { addSignedUrlsToEvents, addSignedUrlToEvent } from "./storage";
 // Helper functions to extract coordinates from location field
 function extractLatitude(location) {
     try {
@@ -52,8 +54,25 @@ function extractLongitude(location) {
     }
     return null;
 }
-import { EnumWebResponse, IWebResponse, } from "../types/requests";
-import { addSignedUrlsToEvents, addSignedUrlToEvent } from "./storage";
+// Test function to verify individual event loading works
+export async function test_event_loading(device_id) {
+    try {
+        console.log(`[Event Test] Testing individual event loading for device ${device_id}`);
+        const events_response = await server_get_events_and_tags_for_device(device_id, 1);
+        if (events_response.status === EnumWebResponse.SUCCESS) {
+            console.log(`[Event Test] Successfully loaded ${events_response.data?.length || 0} events for device ${device_id}`);
+            return true;
+        }
+        else {
+            console.error(`[Event Test] Failed to load events for device ${device_id}:`, events_response.msg);
+            return false;
+        }
+    }
+    catch (error) {
+        console.error(`[Event Test] Failed to load events for device ${device_id}:`, error);
+        return false;
+    }
+}
 export async function server_create_tags(tags) {
     const supabase = await newServerClient();
     // remove id key from tags
@@ -128,9 +147,8 @@ export async function server_update_tags(tags) {
 }
 export async function server_get_more_events_with_tags_by_herd(herd_id, offset, page_count = 10) {
     const from = offset * page_count;
-    const to = from + page_count - 1;
     const supabase = await newServerClient();
-    // make rpc call to get_events_with_tags_for_herd(herd_id, offset, limit)
+    // make rpc call to get_events_and_tags_for_herd(herd_id, offset, limit)
     const { data, error } = await supabase.rpc("get_events_and_tags_for_herd", {
         herd_id_caller: herd_id,
         offset_caller: from,
@@ -157,7 +175,7 @@ export async function server_get_more_events_with_tags_by_herd(herd_id, offset,
 }
 export async function server_get_events_and_tags_for_device(device_id, limit = 3) {
     const supabase = await newServerClient();
-    // make rpc call to get_events_with_tags_for_device(device_id, limit)
+    // make rpc call to get_events_and_tags_for_device(device_id, limit)
     const { data, error } = await supabase.rpc("get_events_and_tags_for_device", {
         device_id_caller: device_id,
         limit_caller: limit,
@@ -231,6 +249,7 @@ export async function server_get_events_and_tags_for_devices_batch(device_ids, l
             timestamp_observation: row.timestamp_observation,
             is_public: row.is_public,
             earthranger_url: row.earthranger_url,
+            herd_id: row.herd_id,
             tags: Array.isArray(row.tags) ? row.tags : [],
         };
         eventsByDevice[device_id].push(event);

package/dist/types/db.d.ts

@@ -1,5 +1,6 @@
-import { User } from "@supabase/supabase-js";
+import { SupabaseClient, User } from "@supabase/supabase-js";
 import { Database } from "./supabase";
+export type ScoutDatabaseClient = SupabaseClient<Database, "public">;
 export type Role = Database["public"]["Enums"]["role"];
 export type DeviceType = Database["public"]["Enums"]["device_type"];
 export type MediaType = Database["public"]["Enums"]["media_type"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adventurelabs/scout-core",
-  "version": "1.0.72",
+  "version": "1.0.74",
   "description": "Core utilities and helpers for Adventure Labs Scout applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -36,17 +36,14 @@
     "next": ">=15.0.0",
     "react": ">=18.0.0",
     "react-dom": ">=18.0.0",
-    "react-redux": ">=9.0.0"
+    "react-redux": ">=9.0.0",
+    "@supabase/supabase-js": "^2.57.4",
+    "@supabase/ssr": "^0.6.1",
+    "@reduxjs/toolkit": "^2.0.0"
   },
   "devDependencies": {
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "typescript": "^5.0.0"
-  },
-  "dependencies": {
-    "@reduxjs/toolkit": "^2.0.0",
-    "@supabase/ssr": "^0.6.1",
-    "@supabase/supabase-js": "^2.53.0",
-    "zustand": "^4.0.0"
   }
 }

package/helpers/README.md

@@ -1,135 +0,0 @@
-# Scout Core Helpers
-
-## Storage and Signed URLs
-
-This module provides functionality for handling file storage and signed URL generation for media files.
-
-### Key Features
-
-- **Signed URL Generation**: Generate secure, time-limited URLs for accessing media files
-- **Backward Compatibility**: Support for both new signed URLs and legacy public URLs
-- **Seamless Integration**: Signed URLs are automatically set as `media_url` for easy use
-- **Efficient Client Usage**: Accepts existing Supabase client to avoid creating multiple instances
-
-### Files
-
-- **`storage.ts`**: Server-side functions for generating signed URLs (requires "use server")
-- **`eventUtils.ts`**: Client-side utility functions for working with event media URLs
-
-### Storage Functions (Server-side)
-
-#### `generateSignedUrl(filePath, expiresIn, supabaseClient?)`
-
-Generates a signed URL for a file in Supabase storage.
-
-```typescript
-// With existing client
-const signedUrl = await generateSignedUrl(
-  "events/123/image.jpg",
-  3600,
-  supabaseClient
-);
-
-// Without existing client (creates new one)
-const signedUrl = await generateSignedUrl("events/123/image.jpg", 3600);
-```
-
-#### `addSignedUrlsToEvents(events, supabaseClient?)`
-
-Adds signed URLs to an array of events, setting them as `media_url`.
-
-```typescript
-// With existing client
-const eventsWithUrls = await addSignedUrlsToEvents(events, supabaseClient);
-
-// Without existing client (creates new one)
-const eventsWithUrls = await addSignedUrlsToEvents(events);
-```
-
-#### `addSignedUrlToEvent(event, supabaseClient?)`
-
-Adds a signed URL to a single event, setting it as `media_url`.
-
-```typescript
-// With existing client
-const eventWithUrl = await addSignedUrlToEvent(event, supabaseClient);
-
-// Without existing client (creates new one)
-const eventWithUrl = await addSignedUrlToEvent(event);
-```
-
-### Event Utility Functions (Client-side)
-
-#### `getEventMediaUrl(event)`
-
-Gets the media URL for an event (now simply returns `event.media_url`).
-
-```typescript
-const mediaUrl = getEventMediaUrl(event);
-```
-
-#### `hasEventMedia(event)`
-
-Checks if an event has any media URL available.
-
-```typescript
-const hasMedia = hasEventMedia(event);
-```
-
-### Usage in Components
-
-```typescript
-import { getEventMediaUrl, hasEventMedia } from "@adventurelabs/scout-core";
-
-function EventMedia({ event }) {
-  const mediaUrl = getEventMediaUrl(event);
-
-  if (!hasEventMedia(event)) {
-    return <div>No media available</div>;
-  }
-
-  return <img src={mediaUrl} alt="Event media" />;
-}
-```
-
-### Database Schema
-
-Events now have two URL-related fields:
-
-- `file_path`: The storage path for generating signed URLs
-- `media_url`: The URL for accessing media (signed URL when file_path exists, legacy public URL otherwise)
-
-### How It Works
-
-1. **Event Creation**: Files are uploaded and `file_path` is stored (no `media_url` initially)
-2. **Event Fetching**: When events are retrieved, signed URLs are generated and set as `media_url`
-3. **URL Access**: Components simply use `event.media_url` as before
-4. **Fallback**: If signed URL generation fails, existing `media_url` is preserved
-
-### Performance Optimization
-
-The storage functions accept an optional `supabaseClient` parameter to reuse existing client instances:
-
-```typescript
-// Efficient: Reuse existing client
-const supabase = await newServerClient();
-const events = await fetchEvents(supabase);
-const eventsWithUrls = await addSignedUrlsToEvents(events, supabase);
-
-// Less efficient: Creates new client for each operation
-const events = await fetchEvents();
-const eventsWithUrls = await addSignedUrlsToEvents(events); // Creates new client
-```
-
-### Migration Strategy
-
-1. **Phase 1**: Store `file_path` for new events (no `media_url`)
-2. **Phase 2**: Generate signed URLs on fetch and set as `media_url`
-3. **Phase 3**: All events use signed URLs seamlessly
-
-### Security Benefits
-
-- **Time-limited access**: URLs expire after a configurable time
-- **Secure access**: URLs are cryptographically signed
-- **No public exposure**: Files are not publicly accessible without signed URLs
-- **Seamless integration**: No changes needed in existing components

package/hooks/README.md

@@ -1,93 +0,0 @@
-# Scout Hooks
-
-This directory contains React hooks for the Scout application.
-
-## useScoutRefresh
-
-A hook for refreshing scout data with detailed timing measurements for performance monitoring and debugging.
-
-### Features
-
-- **Automatic refresh**: Automatically refreshes data on component mount
-- **Manual refresh**: Provides a function to manually trigger refreshes
-- **Detailed timing**: Measures the duration of each portion of the loading process
-- **Concurrent protection**: Prevents multiple simultaneous refresh operations
-- **Error handling**: Graceful error handling with state consistency
-
-### Timing Measurements
-
-The hook tracks the duration of several key operations:
-
-1. **Herd Modules API Call** (`herd_modules_api_duration_ms`): Time taken to fetch herd modules from the server
-2. **User API Call** (`user_api_duration_ms`): Time taken to fetch user data from the server
-3. **Data Processing** (`data_processing_duration_ms`): Time taken to process and dispatch data to the store
-4. **LocalStorage Operations** (`localStorage_duration_ms`): Time taken for localStorage read/write operations
-5. **Total Duration** (`herd_modules_loaded_in_ms`): Overall time from start to completion
-
-### Usage
-
-```tsx
-import { useScoutRefresh } from "../hooks";
-
-function MyComponent() {
-  const { handleRefresh, getTimingStats } = useScoutRefresh({
-    autoRefresh: true,
-    onRefreshComplete: () => {
-      console.log("Refresh completed!");
-    },
-  });
-
-  const handleManualRefresh = async () => {
-    await handleRefresh();
-
-    // Get timing statistics
-    const stats = getTimingStats();
-    console.log("Performance breakdown:");
-    console.log(`- Herd modules API: ${stats.herdModulesApi}ms`);
-    console.log(`- User API: ${stats.userApi}ms`);
-    console.log(`- Data processing: ${stats.dataProcessing}ms`);
-    console.log(`- LocalStorage: ${stats.localStorage}ms`);
-    console.log(`- Total: ${stats.totalDuration}ms`);
-  };
-
-  return (
-    <div>
-      <button onClick={handleManualRefresh}>Refresh Data</button>
-    </div>
-  );
-}
-```
-
-### Redux State
-
-The hook automatically updates the Redux store with timing information:
-
-```tsx
-// Access timing data from the store
-const timingData = useSelector((state) => ({
-  herdModulesApi: state.scout.herd_modules_api_duration_ms,
-  userApi: state.scout.user_api_duration_ms,
-  dataProcessing: state.scout.data_processing_duration_ms,
-  localStorage: state.scout.localStorage_duration_ms,
-  total: state.scout.herd_modules_loaded_in_ms,
-}));
-```
-
-### Performance Monitoring
-
-Use these timing measurements to:
-
-- Identify performance bottlenecks in the loading process
-- Monitor API response times
-- Track data processing efficiency
-- Debug localStorage performance issues
-- Set performance budgets and alerts
-
-### Error Handling
-
-The hook includes comprehensive error handling:
-
-- API response validation
-- Graceful fallbacks for localStorage failures
-- Consistent state updates even on errors
-- Detailed error logging for debugging