@adventurelabs/scout-core 1.0.124 → 1.0.126

package/dist/helpers/devices.js

@@ -2,8 +2,8 @@
 import { newServerClient } from "../supabase/server";
 import { IWebResponse } from "../types/requests";
 export async function get_devices_by_herd(herd_id, client) {
-    // call get_devices_with_components_for_herd with rpc
-    const { data, error } = await client.rpc("get_devices_with_components_for_herd", {
+    // call get_devices_for_herd with rpc
+    const { data, error } = await client.rpc("get_devices_for_herd", {
         herd_id_caller: herd_id,
     });
     if (!data) {

package/dist/helpers/storage.js

@@ -1,6 +1,20 @@
 "use server";
 import { newServerClient } from "../supabase/server";
 import { BUCKET_NAME_SCOUT, SIGNED_URL_EXPIRATION_SECONDS, } from "../constants/db";
+/**
+ * Splits file path into bucket name and path. Must be at leaast one slash in your file path
+ * @param filePath
+ * @returns IFilePathParts | null - null if invalid file path
+ */
+function getPartsFromFilePath(filePath) {
+    const parts = filePath.split("/");
+    if (parts.length < 2) {
+        return null;
+    }
+    const bucket_name = parts[0];
+    const path = parts.slice(1).join("/");
+    return { bucket_name, path };
+}
 /**
  * Generates a signed URL for a file in Supabase storage
  * @param filePath - The path to the file in storage (e.g., "events/123/image.jpg")
@@ -11,9 +25,14 @@ import { BUCKET_NAME_SCOUT, SIGNED_URL_EXPIRATION_SECONDS, } from "../constants/
 export async function generateSignedUrl(filePath, expiresIn = SIGNED_URL_EXPIRATION_SECONDS, supabaseClient) {
     try {
         const supabase = supabaseClient || (await newServerClient());
+        const parts = getPartsFromFilePath(filePath);
+        if (!parts) {
+            console.error("Invalid file path:", filePath);
+            return null;
+        }
         const { data, error } = await supabase.storage
-            .from(BUCKET_NAME_SCOUT)
-            .createSignedUrl(filePath, expiresIn);
+            .from(parts.bucket_name)
+            .createSignedUrl(parts.path, expiresIn);
         if (error) {
             console.error("Error generating signed URL:", error.message);
             return null;
@@ -40,7 +59,7 @@ export async function generateSignedUrlsBatch(filePaths, expiresIn = SIGNED_URL_
                 return data.signedUrl;
             }
             catch (error) {
-                console.error(`Exception generating signed URL for ${filePath}:`, error);
+                console.warn(`Exception generating signed URL for ${filePath}:`, error);
                 return null;
             }
         });

package/dist/types/db.d.ts

@@ -6,9 +6,8 @@ export type DeviceType = Database["public"]["Enums"]["device_type"];
 export type MediaType = Database["public"]["Enums"]["media_type"];
 export type TagObservationType = Database["public"]["Enums"]["tag_observation_type"];
 export type IUser = User;
-export type IDevice = Database["public"]["CompositeTypes"]["device_with_components"] & {
+export type IDevice = Database["public"]["CompositeTypes"]["device_pretty_location"] & {
     api_keys_scout?: IApiKeyScout[];
-    recent_events?: IEventAndTagsPrettyLocation[];
 };
 export type IEvent = Database["public"]["Tables"]["events"]["Row"];
 export type ITag = Database["public"]["Tables"]["tags"]["Row"];
@@ -30,31 +29,6 @@ export type IArtifact = Database["public"]["Tables"]["artifacts"]["Row"];
 export type IArtifactWithMediaUrl = IArtifact & {
     media_url?: string | null;
 };
-export type IComponentInfo = {
-    id: number;
-    serial_number: string;
-    product_number: string | null;
-    certificate_id: number | null;
-    status: Database["public"]["Enums"]["component_status"];
-    created_at: string;
-    updated_at: string | null;
-};
-export type IDeviceWithComponents = {
-    id: number;
-    inserted_at: string;
-    created_by: string | null;
-    herd_id: number;
-    device_type: Database["public"]["Enums"]["device_type"];
-    domain_name: string | null;
-    location: string | null;
-    altitude: number | null;
-    heading: number | null;
-    name: string | null;
-    description: string | null;
-    latitude: number | null;
-    longitude: number | null;
-    components: IComponentInfo[];
-};
 export type ComponentInsert = Database["public"]["Tables"]["components"]["Insert"];
 export type VersionsSoftwareInsert = Database["public"]["Tables"]["versions_software"]["Insert"];
 export type ArtifactInsert = Database["public"]["Tables"]["artifacts"]["Insert"];

package/package.json

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