@adventurelabs/scout-core 2.0.16 → 2.0.18

package/dist/client/index.d.ts

@@ -3,6 +3,7 @@ export * from "../types";
 export * from "../helpers/artifactMedia";
 export * from "../helpers/bounding_boxes";
 export * from "../helpers/email";
+export * from "../helpers/eventMedia";
 export * from "../helpers/eventUtils";
 export { default as get_gps_center } from "../helpers/gps";
 export * from "../helpers/herd_modules_equal";

package/dist/client/index.js

@@ -6,6 +6,7 @@ export * from "../types";
 export * from "../helpers/artifactMedia";
 export * from "../helpers/bounding_boxes";
 export * from "../helpers/email";
+export * from "../helpers/eventMedia";
 export * from "../helpers/eventUtils";
 export { default as get_gps_center } from "../helpers/gps";
 export * from "../helpers/herd_modules_equal";

package/dist/helpers/artifactMedia.js

@@ -1,4 +1,4 @@
-import { isNonEmptyStorageFilePath } from "./storagePath";
+import { isNonEmptyStorageFilePath, signedUrlForPath } from "./storagePath";
 /** Collect unique non-empty storage paths used for artifact media signing. */
 export function collectArtifactStoragePaths(artifacts) {
     const seen = new Set();
@@ -17,9 +17,6 @@ export function collectArtifactStoragePaths(artifacts) {
     }
     return paths;
 }
-function signedUrlForPath(path, urlMap) {
-    return isNonEmptyStorageFilePath(path) ? urlMap.get(path) ?? null : null;
-}
 /** Attach signed URLs for original, thumbnail, and proxy storage paths. */
 export function withArtifactMediaUrls(artifact, urlMap) {
     return {

package/dist/helpers/eventMedia.d.ts

@@ -0,0 +1,12 @@
+import { ISignedMediaUrls } from "../types/db";
+/** Events arrive as table rows and as the event_and_tags composite, so match on shape. */
+export type IEventMediaPaths = {
+    file_path?: string | null;
+    thumbnail_file_path?: string | null;
+    proxy_file_path?: string | null;
+    media_url?: string | null;
+};
+/** Collect unique non-empty storage paths used for event media signing. */
+export declare function collectEventStoragePaths(events: Iterable<IEventMediaPaths | null | undefined>): string[];
+/** Attach signed URLs for original, thumbnail, and proxy storage paths. */
+export declare function withEventMediaUrls<T extends IEventMediaPaths>(event: T, urlMap: Map<string, string | null | undefined>): T & ISignedMediaUrls;

package/dist/helpers/eventMedia.js

@@ -0,0 +1,29 @@
+import { isNonEmptyStorageFilePath, signedUrlForPath } from "./storagePath";
+/** Collect unique non-empty storage paths used for event media signing. */
+export function collectEventStoragePaths(events) {
+    const seen = new Set();
+    const paths = [];
+    for (const event of events) {
+        for (const path of [
+            event?.file_path,
+            event?.thumbnail_file_path,
+            event?.proxy_file_path,
+        ]) {
+            if (isNonEmptyStorageFilePath(path) && !seen.has(path)) {
+                seen.add(path);
+                paths.push(path);
+            }
+        }
+    }
+    return paths;
+}
+/** Attach signed URLs for original, thumbnail, and proxy storage paths. */
+export function withEventMediaUrls(event, urlMap) {
+    return {
+        ...event,
+        // Events predating file_path carry an absolute media_url with nothing to sign.
+        media_url: signedUrlForPath(event.file_path, urlMap) ?? event.media_url ?? null,
+        thumbnail_url: signedUrlForPath(event.thumbnail_file_path, urlMap),
+        proxy_url: signedUrlForPath(event.proxy_file_path, urlMap),
+    };
+}

package/dist/helpers/lifecycle_server.d.ts

@@ -103,14 +103,19 @@ export declare function server_update_event_lifecycle(event_id: number, lifecycl
     origin_roll: number | null;
     processing_blocked_at: string | null;
     processing_blocked_reason: string | null;
+    proxy_file_path: string | null;
+    proxy_generated_at: string | null;
     segmented_at: string | null;
     sensor_pitch: number | null;
     sensor_roll: number | null;
     sensor_yaw: number | null;
     session_id: number | null;
     tagged_at: string | null;
+    thumbnail_file_path: string | null;
+    thumbnail_generated_at: string | null;
     timestamp_observation: string;
     tracked_at: string | null;
+    updated_at: string;
 } | null>>;
 export declare function server_update_artifact_lifecycle(artifact_id: number, lifecycle: EntityLifecycle, options?: LifecycleUpdateOptions): Promise<import("../types").IWebResponseCompatible<{
     created_at: string;
@@ -136,7 +141,7 @@ export declare function server_update_artifact_lifecycle(artifact_id: number, li
     timestamp_observation: string | null;
     timestamp_observation_end: string;
     tracked_at: string | null;
-    updated_at: string | null;
+    updated_at: string;
 } | null>>;
 export declare function server_update_user_role_per_herd_lifecycle(membership_id: number, lifecycle: EntityLifecycle, options?: LifecycleUpdateOptions): Promise<import("../types").IWebResponseCompatible<{
     herd_id: number;

package/dist/helpers/media_urls.d.ts

@@ -1,13 +1,7 @@
 import type { SupabaseClient } from "@supabase/supabase-js";
-import type { IArtifact, IArtifactWithMediaUrl } from "../types/db";
+import type { IArtifact, IArtifactWithMediaUrl, ISignedMediaUrls } from "../types/db";
 import type { Database } from "../types/supabase";
-type EventWithStoragePath = {
-    file_path?: string | null;
-    media_url?: string | null;
-};
+import { type IEventMediaPaths } from "./eventMedia";
 export declare function createSignedUrlMap(client: SupabaseClient<Database>, paths: Iterable<string | null | undefined>): Promise<Map<string, string | null>>;
-export declare function addEventMediaUrls<T extends EventWithStoragePath>(client: SupabaseClient<Database>, events: T[]): Promise<Array<T & {
-    media_url: string | null;
-}>>;
+export declare function addEventMediaUrls<T extends IEventMediaPaths>(client: SupabaseClient<Database>, events: T[]): Promise<Array<T & ISignedMediaUrls>>;
 export declare function addArtifactMediaUrls(client: SupabaseClient<Database>, artifacts: IArtifact[]): Promise<IArtifactWithMediaUrl[]>;
-export {};

package/dist/helpers/media_urls.js

@@ -1,4 +1,5 @@
 import { collectArtifactStoragePaths, withArtifactMediaUrls, } from "./artifactMedia";
+import { collectEventStoragePaths, withEventMediaUrls, } from "./eventMedia";
 import { generateSignedUrlsBatchWithClient } from "./storage_internal";
 import { isNonEmptyStorageFilePath } from "./storagePath";
 export async function createSignedUrlMap(client, paths) {
@@ -7,13 +8,8 @@ export async function createSignedUrlMap(client, paths) {
     return new Map(uniquePaths.map((path, index) => [path, urls[index]]));
 }
 export async function addEventMediaUrls(client, events) {
-    const urlMap = await createSignedUrlMap(client, events.map((event) => event.file_path));
-    return events.map((event) => ({
-        ...event,
-        media_url: isNonEmptyStorageFilePath(event.file_path)
-            ? urlMap.get(event.file_path) ?? event.media_url ?? null
-            : event.media_url ?? null,
-    }));
+    const urlMap = await createSignedUrlMap(client, collectEventStoragePaths(events));
+    return events.map((event) => withEventMediaUrls(event, urlMap));
 }
 export async function addArtifactMediaUrls(client, artifacts) {
     const urlMap = await createSignedUrlMap(client, collectArtifactStoragePaths(artifacts));

package/dist/helpers/storagePath.d.ts

@@ -1,5 +1,7 @@
 /** True when we can sign storage: non-null and not blank after trim. */
 export declare function isNonEmptyStorageFilePath(path: string | null | undefined): path is string;
+/** Signed URL for a storage path, or null when the path is blank or went unsigned. */
+export declare function signedUrlForPath(path: string | null | undefined, urlMap: Map<string, string | null | undefined>): string | null;
 /** Assumes DB `file_path` is always `bucket/object/...` */
 export declare function parseStorageFilePath(filePath: string): {
     bucket: string;

package/dist/helpers/storagePath.js

@@ -2,6 +2,10 @@
 export function isNonEmptyStorageFilePath(path) {
     return path != null && path.trim() !== "";
 }
+/** Signed URL for a storage path, or null when the path is blank or went unsigned. */
+export function signedUrlForPath(path, urlMap) {
+    return isNonEmptyStorageFilePath(path) ? urlMap.get(path) ?? null : null;
+}
 /** Assumes DB `file_path` is always `bucket/object/...` */
 export function parseStorageFilePath(filePath) {
     const cleaned = filePath.trim().replace(/^\/+|\/+$/g, "");

package/dist/helpers/tags.queries.js

@@ -340,6 +340,10 @@ export async function get_event_and_tags_by_event_id_query(client, event_id) {
         embedded_at: data[0].embedded_at ?? null,
         segmented_at: data[0].segmented_at ?? null,
         tagged_at: data[0].tagged_at ?? null,
+        thumbnail_file_path: data[0].thumbnail_file_path ?? null,
+        thumbnail_generated_at: data[0].thumbnail_generated_at ?? null,
+        proxy_file_path: data[0].proxy_file_path ?? null,
+        proxy_generated_at: data[0].proxy_generated_at ?? null,
     };
     const [eventWithUrl] = await addEventMediaUrls(client, [transformedData]);
     return IWebResponse.success(eventWithUrl).to_compatible();

package/dist/server/index.d.ts

@@ -4,6 +4,7 @@ export * from "../types";
 export * from "../helpers/artifactMedia";
 export * from "../helpers/bounding_boxes";
 export * from "../helpers/email";
+export * from "../helpers/eventMedia";
 export * from "../helpers/eventUtils";
 export { default as get_gps_center } from "../helpers/gps";
 export * from "../helpers/herd_modules_equal";

package/dist/server/index.js

@@ -6,6 +6,7 @@ export * from "../types";
 export * from "../helpers/artifactMedia";
 export * from "../helpers/bounding_boxes";
 export * from "../helpers/email";
+export * from "../helpers/eventMedia";
 export * from "../helpers/eventUtils";
 export { default as get_gps_center } from "../helpers/gps";
 export * from "../helpers/herd_modules_equal";

package/dist/store/api.js

@@ -2,10 +2,10 @@
 import { createApi, fakeBaseQuery } from "@reduxjs/toolkit/query/react";
 import { addArtifactMediaUrls, addEventMediaUrls, createSignedUrlMap, } from "../helpers/media_urls";
 import { collectArtifactStoragePaths, withArtifactMediaUrls, } from "../helpers/artifactMedia";
-import { isNonEmptyStorageFilePath } from "../helpers/storagePath";
+import { collectEventStoragePaths, withEventMediaUrls, } from "../helpers/eventMedia";
 async function signedUrlMapForFeedRows(supabase, rows) {
     return createSignedUrlMap(supabase, rows.flatMap((row) => [
-        row.event_data?.file_path,
+        ...collectEventStoragePaths([row.event_data]),
         ...(row.artifact_data
             ? collectArtifactStoragePaths([row.artifact_data])
             : []),
@@ -434,12 +434,7 @@ export const scoutApi = createApi({
                     const items = resultRows.map((row) => ({
                         ...row,
                         event_data: row.event_data
-                            ? {
-                                ...row.event_data,
-                                media_url: isNonEmptyStorageFilePath(row.event_data.file_path)
-                                    ? urlMap.get(row.event_data.file_path) ?? null
-                                    : null,
-                            }
+                            ? withEventMediaUrls(row.event_data, urlMap)
                             : null,
                         artifact_data: row.artifact_data
                             ? withArtifactMediaUrls(row.artifact_data, urlMap)
@@ -504,12 +499,7 @@ export const scoutApi = createApi({
                     const items = resultRows.map((row) => ({
                         ...row,
                         event_data: row.event_data
-                            ? {
-                                ...row.event_data,
-                                media_url: isNonEmptyStorageFilePath(row.event_data.file_path)
-                                    ? urlMap.get(row.event_data.file_path) ?? null
-                                    : null,
-                            }
+                            ? withEventMediaUrls(row.event_data, urlMap)
                             : null,
                         artifact_data: row.artifact_data
                             ? withArtifactMediaUrls(row.artifact_data, urlMap)

package/dist/types/db.d.ts

@@ -217,14 +217,13 @@ export type BatteryCycleCountUpdate = Database["public"]["Tables"]["battery_cycl
 export type IMinimalSubjectForArtifact = Database["public"]["Functions"]["get_minimal_subjects_for_artifact"]["Returns"][number];
 export type IAnalysisJob = Database["public"]["Tables"]["analysis_jobs"]["Row"];
 export type IAnalysisTask = Database["public"]["Tables"]["analysis_tasks"]["Row"];
-export type IArtifactWithMediaUrl = IArtifact & {
+export type ISignedMediaUrls = {
     media_url?: string | null;
     thumbnail_url?: string | null;
     proxy_url?: string | null;
 };
-export type IEventWithMediaUrl = IEvent & {
-    media_url?: string | null;
-};
+export type IArtifactWithMediaUrl = IArtifact & ISignedMediaUrls;
+export type IEventWithMediaUrl = IEvent & ISignedMediaUrls;
 export type IVersionsSoftwareWithBuildUrl = IVersionsSoftware & {
     build_artifact_url?: string | null;
 };
@@ -368,9 +367,7 @@ export type IFeedItem = {
     feed_type: string | null;
     sort_ts: string | null;
     sort_id: number | null;
-    event_data: (IEventAndTagsPrettyLocation & {
-        media_url?: string | null;
-    }) | null;
+    event_data: (IEventAndTagsPrettyLocation & ISignedMediaUrls) | null;
     artifact_data: IArtifactWithMediaUrl | null;
 };
 export type ISessionWithCoordinates = Database["public"]["CompositeTypes"]["session_with_coordinates"];

package/dist/types/supabase.d.ts

@@ -269,7 +269,7 @@ export type Database = {
                     timestamp_observation: string | null;
                     timestamp_observation_end: string;
                     tracked_at: string | null;
-                    updated_at: string | null;
+                    updated_at: string;
                 };
                 Insert: {
                     created_at?: string;
@@ -295,7 +295,7 @@ export type Database = {
                     timestamp_observation?: string | null;
                     timestamp_observation_end?: string;
                     tracked_at?: string | null;
-                    updated_at?: string | null;
+                    updated_at?: string;
                 };
                 Update: {
                     created_at?: string;
@@ -321,7 +321,7 @@ export type Database = {
                     timestamp_observation?: string | null;
                     timestamp_observation_end?: string;
                     tracked_at?: string | null;
-                    updated_at?: string | null;
+                    updated_at?: string;
                 };
                 Relationships: [
                     {
@@ -1504,14 +1504,19 @@ export type Database = {
                     origin_roll: number | null;
                     processing_blocked_at: string | null;
                     processing_blocked_reason: string | null;
+                    proxy_file_path: string | null;
+                    proxy_generated_at: string | null;
                     segmented_at: string | null;
                     sensor_pitch: number | null;
                     sensor_roll: number | null;
                     sensor_yaw: number | null;
                     session_id: number | null;
                     tagged_at: string | null;
+                    thumbnail_file_path: string | null;
+                    thumbnail_generated_at: string | null;
                     timestamp_observation: string;
                     tracked_at: string | null;
+                    updated_at: string;
                 };
                 Insert: {
                     altitude?: number;
@@ -1538,14 +1543,19 @@ export type Database = {
                     origin_roll?: number | null;
                     processing_blocked_at?: string | null;
                     processing_blocked_reason?: string | null;
+                    proxy_file_path?: string | null;
+                    proxy_generated_at?: string | null;
                     segmented_at?: string | null;
                     sensor_pitch?: number | null;
                     sensor_roll?: number | null;
                     sensor_yaw?: number | null;
                     session_id?: number | null;
                     tagged_at?: string | null;
+                    thumbnail_file_path?: string | null;
+                    thumbnail_generated_at?: string | null;
                     timestamp_observation?: string;
                     tracked_at?: string | null;
+                    updated_at?: string;
                 };
                 Update: {
                     altitude?: number;
@@ -1572,14 +1582,19 @@ export type Database = {
                     origin_roll?: number | null;
                     processing_blocked_at?: string | null;
                     processing_blocked_reason?: string | null;
+                    proxy_file_path?: string | null;
+                    proxy_generated_at?: string | null;
                     segmented_at?: string | null;
                     sensor_pitch?: number | null;
                     sensor_roll?: number | null;
                     sensor_yaw?: number | null;
                     session_id?: number | null;
                     tagged_at?: string | null;
+                    thumbnail_file_path?: string | null;
+                    thumbnail_generated_at?: string | null;
                     timestamp_observation?: string;
                     tracked_at?: string | null;
+                    updated_at?: string;
                 };
                 Relationships: [
                     {
@@ -5405,7 +5420,7 @@ export type Database = {
                     timestamp_observation: string | null;
                     timestamp_observation_end: string;
                     tracked_at: string | null;
-                    updated_at: string | null;
+                    updated_at: string;
                 }[];
                 SetofOptions: {
                     from: "*";
@@ -5443,7 +5458,7 @@ export type Database = {
                     timestamp_observation: string | null;
                     timestamp_observation_end: string;
                     tracked_at: string | null;
-                    updated_at: string | null;
+                    updated_at: string;
                 }[];
                 SetofOptions: {
                     from: "*";
@@ -5482,7 +5497,7 @@ export type Database = {
                     timestamp_observation: string | null;
                     timestamp_observation_end: string;
                     tracked_at: string | null;
-                    updated_at: string | null;
+                    updated_at: string;
                 }[];
                 SetofOptions: {
                     from: "*";
@@ -5521,7 +5536,7 @@ export type Database = {
                     timestamp_observation: string | null;
                     timestamp_observation_end: string;
                     tracked_at: string | null;
-                    updated_at: string | null;
+                    updated_at: string;
                 }[];
                 SetofOptions: {
                     from: "*";
@@ -5561,7 +5576,7 @@ export type Database = {
                     timestamp_observation: string | null;
                     timestamp_observation_end: string;
                     tracked_at: string | null;
-                    updated_at: string | null;
+                    updated_at: string;
                 }[];
                 SetofOptions: {
                     from: "*";
@@ -5601,7 +5616,7 @@ export type Database = {
                     timestamp_observation: string | null;
                     timestamp_observation_end: string;
                     tracked_at: string | null;
-                    updated_at: string | null;
+                    updated_at: string;
                 }[];
                 SetofOptions: {
                     from: "*";
@@ -5642,7 +5657,7 @@ export type Database = {
                     timestamp_observation: string | null;
                     timestamp_observation_end: string;
                     tracked_at: string | null;
-                    updated_at: string | null;
+                    updated_at: string;
                 }[];
                 SetofOptions: {
                     from: "*";
@@ -5682,7 +5697,7 @@ export type Database = {
                     timestamp_observation: string | null;
                     timestamp_observation_end: string;
                     tracked_at: string | null;
-                    updated_at: string | null;
+                    updated_at: string;
                 }[];
                 SetofOptions: {
                     from: "*";
@@ -5723,7 +5738,7 @@ export type Database = {
                     timestamp_observation: string | null;
                     timestamp_observation_end: string;
                     tracked_at: string | null;
-                    updated_at: string | null;
+                    updated_at: string;
                 }[];
                 SetofOptions: {
                     from: "*";
@@ -7015,6 +7030,10 @@ export type Database = {
                 embedded_at: string | null;
                 segmented_at: string | null;
                 tagged_at: string | null;
+                thumbnail_file_path: string | null;
+                thumbnail_generated_at: string | null;
+                proxy_file_path: string | null;
+                proxy_generated_at: string | null;
             };
             event_plus_tags: {
                 id: number | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adventurelabs/scout-core",
-  "version": "2.0.16",
+  "version": "2.0.18",
   "description": "Core utilities and helpers for Adventure Labs Scout applications",
   "exports": {
     "./client": {