@blueharford/scrypted-spatial-awareness 0.5.7 → 0.5.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueharford/scrypted-spatial-awareness",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "description": "Cross-camera object tracking for Scrypted NVR with spatial awareness",
   "author": "Joshua Seidel <blueharford>",
   "license": "Apache-2.0",

package/src/core/spatial-reasoning.ts

@@ -84,41 +84,50 @@ export interface ImageData {
  */
 export async function mediaObjectToBase64(mediaObject: MediaObject): Promise<ImageData | null> {
   try {
-    console.log(`[Image] Converting MediaObject, mimeType=${mediaObject?.mimeType}`);
+    const mimeType = mediaObject?.mimeType || 'image/jpeg';
+    console.log(`[Image] Converting MediaObject, mimeType=${mimeType}`);
 
-    // First convert to JPEG to ensure consistent format
-    const jpegMediaObject = await mediaManager.convertMediaObject(mediaObject, 'image/jpeg') as MediaObject;
-    console.log(`[Image] Converted to JPEG MediaObject`);
+    // Use createMediaObject to ensure we have a proper MediaObject with mimeType
+    // Then convert to buffer - this should handle the conversion internally
+    let buffer: Buffer;
 
-    // Get the buffer from the converted media object
-    const buffer = await mediaManager.convertMediaObjectToBuffer(jpegMediaObject, 'image/jpeg');
-
-    // Check if we got an actual Buffer (not a proxy)
-    const isRealBuffer = Buffer.isBuffer(buffer);
-    const bufferLength = isRealBuffer ? buffer.length : 0;
-
-    console.log(`[Image] Buffer: isBuffer=${isRealBuffer}, length=${bufferLength}`);
-
-    if (!isRealBuffer || bufferLength === 0) {
-      console.warn('[Image] Did not receive a valid Buffer');
+    try {
+      // Try direct conversion with the source mime type
+      buffer = await mediaManager.convertMediaObjectToBuffer(mediaObject, mimeType);
+    } catch (convErr) {
+      console.warn(`[Image] Direct conversion failed, trying with explicit JPEG:`, convErr);
 
-      // Try alternate approach: get raw data using any type
+      // Try creating a new MediaObject with explicit mimeType
       try {
+        // Get raw data if available
         const anyMedia = mediaObject as any;
         if (typeof anyMedia.getData === 'function') {
-          const data = await anyMedia.getData();
-          if (data && Buffer.isBuffer(data)) {
-            console.log(`[Image] Got data from getData(): ${data.length} bytes`);
-            if (data.length > 1000) {
-              const base64 = data.toString('base64');
-              return { base64, mediaType: 'image/jpeg' };
-            }
+          const rawData = await anyMedia.getData();
+          if (rawData && Buffer.isBuffer(rawData) && rawData.length > 1000) {
+            console.log(`[Image] Got raw data: ${rawData.length} bytes`);
+            buffer = rawData;
+          } else {
+            console.warn(`[Image] getData returned invalid data`);
+            return null;
           }
+        } else {
+          console.warn('[Image] No getData method available');
+          return null;
         }
       } catch (dataErr) {
-        console.warn('[Image] getData() failed:', dataErr);
+        console.warn('[Image] Alternate data fetch failed:', dataErr);
+        return null;
       }
+    }
+
+    // Check if we got an actual Buffer (not a proxy)
+    const isRealBuffer = Buffer.isBuffer(buffer);
+    const bufferLength = isRealBuffer ? buffer.length : 0;
+
+    console.log(`[Image] Buffer: isBuffer=${isRealBuffer}, length=${bufferLength}`);
 
+    if (!isRealBuffer || bufferLength === 0) {
+      console.warn('[Image] Did not receive a valid Buffer');
       return null;
     }