@blueharford/scrypted-spatial-awareness 0.5.5 → 0.5.7

package/out/main.nodejs.js

@@ -35058,45 +35058,15 @@ exports.ObjectCorrelator = ObjectCorrelator;
  * Uses RAG (Retrieval Augmented Generation) to provide rich contextual understanding
  * of movement across the property topology
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SpatialReasoningEngine = void 0;
 exports.mediaObjectToBase64 = mediaObjectToBase64;
 exports.buildImageContent = buildImageContent;
 exports.isVisionFormatError = isVisionFormatError;
-const sdk_1 = __importStar(__webpack_require__(/*! @scrypted/sdk */ "./node_modules/@scrypted/sdk/dist/src/index.js"));
+const sdk_1 = __importDefault(__webpack_require__(/*! @scrypted/sdk */ "./node_modules/@scrypted/sdk/dist/src/index.js"));
 const topology_1 = __webpack_require__(/*! ../models/topology */ "./src/models/topology.ts");
 const { systemManager, mediaManager } = sdk_1.default;
 /**
@@ -35106,26 +35076,49 @@ const { systemManager, mediaManager } = sdk_1.default;
  */
 async function mediaObjectToBase64(mediaObject) {
     try {
-        // Convert MediaObject to Buffer using mediaManager
-        const buffer = await mediaManager.convertMediaObjectToBuffer(mediaObject, sdk_1.ScryptedMimeTypes.Image);
-        if (!buffer || buffer.length === 0) {
-            console.warn('Failed to convert MediaObject: empty buffer');
+        console.log(`[Image] Converting MediaObject, mimeType=${mediaObject?.mimeType}`);
+        // First convert to JPEG to ensure consistent format
+        const jpegMediaObject = await mediaManager.convertMediaObject(mediaObject, 'image/jpeg');
+        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;
+                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);
+            }
             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';
-        console.log(`[Image] Converted to base64: ${base64.length} chars, type=${mediaType}`);
-        return { base64, mediaType };
+        // Convert buffer to base64 (raw, no data URL prefix)
+        const base64 = buffer.toString('base64');
+        console.log(`[Image] Converted to base64: ${base64.length} chars`);
+        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;
     }
 }
@@ -36189,10 +36182,21 @@ class TopologyDiscoveryEngine {
         try {
             const camera = systemManager.getDeviceById(cameraId);
             if (!camera?.interfaces?.includes(sdk_1.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 (0, spatial_reasoning_1.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 (0, spatial_reasoning_1.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);