npm - @blueharford/scrypted-spatial-awareness - Versions diffs - 0.4.1 → 0.4.3 - Mend

@blueharford/scrypted-spatial-awareness 0.4.1 → 0.4.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/plugin.zip CHANGED Viewed

Binary file

package/package.json CHANGED Viewed

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

package/src/main.ts CHANGED Viewed

@@ -15,6 +15,8 @@ import sdk, {
   Readme,
 } from '@scrypted/sdk';
 import { StorageSettings } from '@scrypted/sdk/storage-settings';
+import * as fs from 'fs';
+import * as path from 'path';
 import {
   CameraTopology,
   createEmptyTopology,
@@ -1044,14 +1046,34 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
     }
   }
+  private getFloorPlanPath(): string {
+    // Use plugin's data directory for persistent storage
+    const pluginVolume = process.env.SCRYPTED_PLUGIN_VOLUME || '/server/volume/plugins/@blueharford/scrypted-spatial-awareness';
+    const dataDir = path.join(pluginVolume, 'data');
+    // Ensure directory exists
+    if (!fs.existsSync(dataDir)) {
+      fs.mkdirSync(dataDir, { recursive: true });
+    }
+    return path.join(dataDir, 'floorplan.png');
+  }
   private handleFloorPlanRequest(request: HttpRequest, response: HttpResponse): void {
     if (request.method === 'GET') {
-      const imageData = this.storage.getItem('floorPlanImage');
-      if (imageData) {
-        response.send(JSON.stringify({ imageData }), {
-          headers: { 'Content-Type': 'application/json' },
-        });
-      } else {
+      try {
+        const floorPlanPath = this.getFloorPlanPath();
+        if (fs.existsSync(floorPlanPath)) {
+          const imageBuffer = fs.readFileSync(floorPlanPath);
+          const imageData = 'data:image/png;base64,' + imageBuffer.toString('base64');
+          response.send(JSON.stringify({ imageData }), {
+            headers: { 'Content-Type': 'application/json' },
+          });
+        } else {
+          response.send(JSON.stringify({ imageData: null }), {
+            headers: { 'Content-Type': 'application/json' },
+          });
+        }
+      } catch (e) {
+        this.console.error('Failed to read floor plan:', e);
         response.send(JSON.stringify({ imageData: null }), {
           headers: { 'Content-Type': 'application/json' },
         });
@@ -1059,13 +1081,23 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
     } else if (request.method === 'POST') {
       try {
         const body = JSON.parse(request.body!);
-        this.storage.setItem('floorPlanImage', body.imageData);
+        const imageData = body.imageData as string;
+        // Extract base64 data (remove data:image/xxx;base64, prefix)
+        const base64Data = imageData.replace(/^data:image\/\w+;base64,/, '');
+        const imageBuffer = Buffer.from(base64Data, 'base64');
+        const floorPlanPath = this.getFloorPlanPath();
+        fs.writeFileSync(floorPlanPath, imageBuffer);
+        this.console.log('Floor plan saved to:', floorPlanPath, 'size:', imageBuffer.length);
         response.send(JSON.stringify({ success: true }), {
           headers: { 'Content-Type': 'application/json' },
         });
       } catch (e) {
-        response.send(JSON.stringify({ error: 'Invalid request body' }), {
-          code: 400,
+        this.console.error('Failed to save floor plan:', e);
+        response.send(JSON.stringify({ error: 'Failed to save floor plan' }), {
+          code: 500,
           headers: { 'Content-Type': 'application/json' },
         });
       }

package/src/ui/editor-html.ts CHANGED Viewed

@@ -342,10 +342,27 @@ export const EDITOR_HTML = `<!DOCTYPE html>
         if (response.ok) {
           topology = await response.json();
           if (!topology.drawings) topology.drawings = [];
+          // Load floor plan from separate storage (handles legacy imageData in topology too)
           if (topology.floorPlan?.imageData) {
+            // Legacy: imageData was stored in topology
             await loadFloorPlanImage(topology.floorPlan.imageData);
           } else if (topology.floorPlan?.type === 'blank') {
             blankCanvasMode = true;
+          } else {
+            // Always try to load from floor-plan endpoint (handles uploaded and missing cases)
+            try {
+              const fpResponse = await fetch('../api/floor-plan');
+              if (fpResponse.ok) {
+                const fpData = await fpResponse.json();
+                if (fpData.imageData) {
+                  await loadFloorPlanImage(fpData.imageData);
+                  // Update topology reference if not set
+                  if (!topology.floorPlan || topology.floorPlan.type !== 'uploaded') {
+                    topology.floorPlan = { type: 'uploaded', width: floorPlanImage.width, height: floorPlanImage.height };
+                  }
+                }
+              }
+            } catch (err) { console.error('Failed to load floor plan:', err); }
           }
         }
       } catch (e) { console.error('Failed to load topology:', e); }
@@ -976,7 +993,16 @@ export const EDITOR_HTML = `<!DOCTYPE html>
       reader.onload = async (e) => {
         const imageData = e.target.result;
         await loadFloorPlanImage(imageData);
-        topology.floorPlan = { imageData, width: floorPlanImage.width, height: floorPlanImage.height };
+        // Store floor plan separately via API (not in topology JSON to avoid size issues)
+        try {
+          await fetch('../api/floor-plan', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({ imageData })
+          });
+        } catch (err) { console.error('Failed to save floor plan:', err); }
+        // Store reference in topology (without the large imageData)
+        topology.floorPlan = { type: 'uploaded', width: floorPlanImage.width, height: floorPlanImage.height };
         closeModal('upload-modal');
         render();
       };
@@ -1138,7 +1164,7 @@ export const EDITOR_HTML = `<!DOCTYPE html>
     function updateConnectionName(id, value) { const conn = topology.connections.find(c => c.id === id); if (conn) conn.name = value; updateUI(); }
     function updateTransitTime(id, field, value) { const conn = topology.connections.find(c => c.id === id); if (conn) conn.transitTime[field] = parseInt(value) * 1000; }
     function updateConnectionBidi(id, value) { const conn = topology.connections.find(c => c.id === id); if (conn) conn.bidirectional = value; render(); }
-    function deleteCamera(id) { if (!confirm('Delete this camera?')) return; topology.cameras = topology.cameras.filter(c => c.deviceId !== id); topology.connections = topology.connections.filter(c => c.fromCameraId !== id && c.toCameraId !== id); selectedItem = null; document.getElementById('properties-panel').innerHTML = '<h3>Properties</h3><p style="color: #666;">Select a camera or connection.</p>'; updateUI(); render(); }
+    function deleteCamera(id) { if (!confirm('Delete this camera?')) return; topology.cameras = topology.cameras.filter(c => c.deviceId !== id); topology.connections = topology.connections.filter(c => c.fromCameraId !== id && c.toCameraId !== id); selectedItem = null; document.getElementById('properties-panel').innerHTML = '<h3>Properties</h3><p style="color: #666;">Select a camera or connection.</p>'; updateCameraSelects(); updateUI(); render(); }
     function deleteConnection(id) { if (!confirm('Delete this connection?')) return; topology.connections = topology.connections.filter(c => c.id !== id); selectedItem = null; document.getElementById('properties-panel').innerHTML = '<h3>Properties</h3><p style="color: #666;">Select a camera or connection.</p>'; updateUI(); render(); }
     function setTool(tool) {
       currentTool = tool;