npm - @blueharford/scrypted-spatial-awareness - Versions diffs - 0.6.19 → 0.6.21 - Mend

@blueharford/scrypted-spatial-awareness 0.6.19 → 0.6.21

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 (9) hide show

package/out/plugin.zip CHANGED Viewed

Binary file

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@blueharford/scrypted-spatial-awareness",
-  "version": "0.6.19",
+  "version": "0.6.21",
   "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

@@ -1062,18 +1062,24 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
     if (request.method === 'GET') {
       const topologyJson = this.storage.getItem('topology');
       const topology = topologyJson ? JSON.parse(topologyJson) : createEmptyTopology();
+      this.console.log(`[Topology API] GET - drawnZones: ${topology.drawnZones?.length || 0}`);
       response.send(JSON.stringify(topology), {
         headers: { 'Content-Type': 'application/json' },
       });
     } else if (request.method === 'PUT' || request.method === 'POST') {
       try {
         const topology = JSON.parse(request.body!) as CameraTopology;
+        this.console.log(`[Topology API] PUT received - drawnZones: ${topology.drawnZones?.length || 0}`);
+        if (topology.drawnZones?.length) {
+          this.console.log(`[Topology API] Zone names: ${topology.drawnZones.map(z => z.name).join(', ')}`);
+        }
         this.storage.setItem('topology', JSON.stringify(topology));
         await this.startTrackingEngine(topology);
         response.send(JSON.stringify({ success: true }), {
           headers: { 'Content-Type': 'application/json' },
         });
       } catch (e) {
+        this.console.error(`[Topology API] PUT error:`, e);
         response.send(JSON.stringify({ error: 'Invalid topology JSON' }), {
           code: 400,
           headers: { 'Content-Type': 'application/json' },

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

@@ -167,6 +167,8 @@ export const EDITOR_HTML = `<!DOCTYPE html>
           <button class="btn" id="tool-wall" onclick="setTool('wall')">Draw Wall</button>
           <button class="btn" id="tool-room" onclick="setTool('room')">Draw Room</button>
           <button class="btn" id="tool-zone" onclick="setTool('zone')" style="background: #2e7d32;">Draw Zone</button>
+          <button class="btn" id="finish-zone-btn" onclick="finishZoneDrawing()" style="background: #1976d2; display: none;">Finish Zone</button>
+          <button class="btn" id="cancel-zone-btn" onclick="cancelZoneDrawing()" style="background: #dc2626; display: none;">Cancel Zone</button>
           <button class="btn" id="tool-camera" onclick="setTool('camera')">Place Camera</button>
           <button class="btn" id="tool-landmark" onclick="setTool('landmark')">Place Landmark</button>
           <button class="btn" id="tool-connect" onclick="setTool('connect')">Connect</button>
@@ -404,6 +406,8 @@ export const EDITOR_HTML = `<!DOCTYPE html>
     let zoneDrawingMode = false;
     let currentZonePoints = [];
     let pendingZoneConfig = null;
+    let lastClickTime = 0;
+    const DOUBLE_CLICK_THRESHOLD = 400; // ms
     // Zone colors by type
     const ZONE_COLORS = {
@@ -1609,9 +1613,11 @@ export const EDITOR_HTML = `<!DOCTYPE html>
       // Zone list
       const zoneList = document.getElementById('zone-list');
       const zones = topology.drawnZones || [];
+      console.log('[updateUI] Zone list update - topology.drawnZones:', zones.length, 'zones');
       if (zones.length === 0) {
         zoneList.innerHTML = '<div class="zone-item" style="color: #666; text-align: center; cursor: default; padding: 8px;">No zones drawn</div>';
       } else {
+        console.log('[updateUI] Rendering', zones.length, 'zones:', zones.map(z => z.name).join(', '));
         zoneList.innerHTML = zones.map(z => {
           const color = ZONE_STROKE_COLORS[z.type] || ZONE_STROKE_COLORS.custom;
           return '<div class="camera-item ' + (selectedItem?.type === 'zone' && selectedItem?.id === z.id ? 'selected' : '') + '" onclick="selectZone(\\'' + z.id + '\\')" style="border-left: 3px solid ' + color + ';"><div class="camera-name">' + z.name + '</div><div class="camera-info">' + z.type + ' | ' + z.polygon.length + ' points</div></div>';
@@ -1754,9 +1760,14 @@ export const EDITOR_HTML = `<!DOCTYPE html>
       pendingZoneConfig = { name, type, description };
       zoneDrawingMode = true;
       currentZonePoints = [];
+      lastClickTime = 0;
       closeModal('add-zone-modal');
-      setStatus('Zone drawing mode - click to add points, double-click to finish', 'warning');
+      setStatus('Zone drawing mode - click to add points, click Finish Zone when done', 'warning');
+      // Show zone drawing buttons
+      document.getElementById('finish-zone-btn').style.display = 'inline-block';
+      document.getElementById('cancel-zone-btn').style.display = 'inline-block';
       render();
+      console.log('[Zone] Drawing mode started for:', name);
     }
     function cancelZoneDrawing() {
@@ -1764,9 +1775,13 @@ export const EDITOR_HTML = `<!DOCTYPE html>
       currentZonePoints = [];
       pendingZoneConfig = null;
       closeModal('add-zone-modal');
+      // Hide zone drawing buttons
+      document.getElementById('finish-zone-btn').style.display = 'none';
+      document.getElementById('cancel-zone-btn').style.display = 'none';
       setTool('select');
       setStatus('Zone drawing cancelled', 'success');
       render();
+      console.log('[Zone] Drawing mode cancelled');
     }
     function finishZoneDrawing() {
@@ -1801,6 +1816,10 @@ export const EDITOR_HTML = `<!DOCTYPE html>
       currentZonePoints = [];
       pendingZoneConfig = null;
+      // Hide zone drawing buttons
+      document.getElementById('finish-zone-btn').style.display = 'none';
+      document.getElementById('cancel-zone-btn').style.display = 'none';
       setTool('select');
       updateUI();
       render();
@@ -1902,9 +1921,21 @@ export const EDITOR_HTML = `<!DOCTYPE html>
       // Handle zone drawing mode separately
       if (zoneDrawingMode) {
+        const now = Date.now();
+        const timeSinceLastClick = now - lastClickTime;
+        lastClickTime = now;
+        // If this is the second click of a double-click, don't add a point
+        // The dblclick event will handle finishing the zone
+        if (timeSinceLastClick < DOUBLE_CLICK_THRESHOLD && currentZonePoints.length >= 3) {
+          console.log('[Zone] Double-click detected, skipping point addition');
+          return;
+        }
         currentZonePoints.push({ x, y });
+        console.log('[Zone] Added point', currentZonePoints.length, 'at', x, y);
         render();
-        setStatus('Point ' + currentZonePoints.length + ' added. ' + (currentZonePoints.length < 3 ? 'Need at least 3 points.' : 'Double-click or Enter to finish.'), 'warning');
+        setStatus('Point ' + currentZonePoints.length + ' added. ' + (currentZonePoints.length < 3 ? 'Need at least 3 points.' : 'Click Finish Zone to complete.'), 'warning');
         return;
       }
@@ -1962,7 +1993,9 @@ export const EDITOR_HTML = `<!DOCTYPE html>
     // Double-click to finish zone drawing
     canvas.addEventListener('dblclick', (e) => {
+      console.log('[Zone] dblclick event, zoneDrawingMode:', zoneDrawingMode, 'points:', currentZonePoints.length);
       if (zoneDrawingMode && currentZonePoints.length >= 3) {
+        console.log('[Zone] Calling finishZoneDrawing from dblclick');
         finishZoneDrawing();
       }
     });