@blueharford/scrypted-spatial-awareness 0.5.5 → 0.5.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueharford/scrypted-spatial-awareness",
-  "version": "0.5.5",
+  "version": "0.5.7",
   "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,31 +84,58 @@ export interface ImageData {
  */
 export async function mediaObjectToBase64(mediaObject: MediaObject): Promise<ImageData | null> {
   try {
-    // Convert MediaObject to Buffer using mediaManager
-    const buffer = await mediaManager.convertMediaObjectToBuffer(mediaObject, ScryptedMimeTypes.Image);
+    console.log(`[Image] Converting MediaObject, mimeType=${mediaObject?.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`);
+
+    // 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 alternate approach: get raw data using any type
+      try {
+        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' };
+            }
+          }
+        }
+      } catch (dataErr) {
+        console.warn('[Image] getData() failed:', dataErr);
+      }
 
-    if (!buffer || buffer.length === 0) {
-      console.warn('Failed to convert MediaObject: empty buffer');
       return null;
     }
 
-    // Convert buffer to base64 (raw, no data URL prefix)
-    const base64 = buffer.toString('base64');
-
-    // Validate base64 - check it's not empty and looks valid
-    if (!base64 || base64.length < 100) {
-      console.warn(`Invalid base64: length=${base64?.length || 0}`);
+    // Check if buffer is too small to be a valid image (< 1KB is suspicious)
+    if (bufferLength < 1000) {
+      console.warn(`[Image] Buffer too small: ${bufferLength} bytes`);
       return null;
     }
 
-    // Determine MIME type - default to JPEG for camera images
-    const mediaType = mediaObject.mimeType?.split(';')[0] || 'image/jpeg';
+    // Convert buffer to base64 (raw, no data URL prefix)
+    const base64 = buffer.toString('base64');
 
-    console.log(`[Image] Converted to base64: ${base64.length} chars, type=${mediaType}`);
+    console.log(`[Image] Converted to base64: ${base64.length} chars`);
 
-    return { base64, mediaType };
+    return { base64, mediaType: 'image/jpeg' };
   } catch (e) {
-    console.warn('Failed to convert MediaObject to base64:', e);
+    console.warn('[Image] Failed to convert MediaObject to base64:', e);
     return null;
   }
 }

package/src/core/topology-discovery.ts

@@ -213,11 +213,27 @@ export class TopologyDiscoveryEngine {
     try {
       const camera = systemManager.getDeviceById<Camera>(cameraId);
       if (!camera?.interfaces?.includes(ScryptedInterface.Camera)) {
+        this.console.warn(`[Discovery] Camera ${cameraId} doesn't have Camera interface`);
         return null;
       }
 
+      this.console.log(`[Discovery] Taking snapshot from camera: ${camera.name || cameraId}`);
       const mediaObject = await camera.takePicture();
-      return mediaObjectToBase64(mediaObject);
+
+      if (!mediaObject) {
+        this.console.warn(`[Discovery] takePicture() returned null for ${camera.name}`);
+        return null;
+      }
+
+      this.console.log(`[Discovery] MediaObject received: mimeType=${mediaObject.mimeType}`);
+
+      const imageData = await mediaObjectToBase64(mediaObject);
+
+      if (!imageData) {
+        this.console.warn(`[Discovery] Failed to convert MediaObject to base64 for ${camera.name}`);
+      }
+
+      return imageData;
     } catch (e) {
       this.console.warn(`[Discovery] Failed to get snapshot from camera ${cameraId}:`, e);
       return null;