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

@blueharford/scrypted-spatial-awareness 0.4.3 → 0.4.5

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.3",
+  "version": "0.4.5",
   "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

@@ -37,7 +37,7 @@ import { EDITOR_HTML } from './ui/editor-html';
 import { TRAINING_HTML } from './ui/training-html';
 import { TrainingConfig, TrainingLandmark } from './models/training';
-const { deviceManager, systemManager } = sdk;
+const { deviceManager, systemManager, mediaManager } = sdk;
 const TRACKING_ZONE_PREFIX = 'tracking-zone:';
 const GLOBAL_TRACKER_ID = 'global-tracker';
@@ -1046,24 +1046,26 @@ 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');
+  private async getFloorPlanPath(): Promise<string> {
+    // Use mediaManager.getFilesPath() for proper persistent storage
+    const filesPath = await mediaManager.getFilesPath();
+    this.console.log('Files path from mediaManager:', filesPath);
     // Ensure directory exists
-    if (!fs.existsSync(dataDir)) {
-      fs.mkdirSync(dataDir, { recursive: true });
+    if (!fs.existsSync(filesPath)) {
+      fs.mkdirSync(filesPath, { recursive: true });
     }
-    return path.join(dataDir, 'floorplan.png');
+    return path.join(filesPath, 'floorplan.jpg');
   }
-  private handleFloorPlanRequest(request: HttpRequest, response: HttpResponse): void {
+  private async handleFloorPlanRequest(request: HttpRequest, response: HttpResponse): Promise<void> {
     if (request.method === 'GET') {
       try {
-        const floorPlanPath = this.getFloorPlanPath();
+        const floorPlanPath = await this.getFloorPlanPath();
+        this.console.log('Loading floor plan from:', floorPlanPath, 'exists:', fs.existsSync(floorPlanPath));
         if (fs.existsSync(floorPlanPath)) {
           const imageBuffer = fs.readFileSync(floorPlanPath);
-          const imageData = 'data:image/png;base64,' + imageBuffer.toString('base64');
+          const imageData = 'data:image/jpeg;base64,' + imageBuffer.toString('base64');
+          this.console.log('Floor plan loaded, size:', imageBuffer.length);
           response.send(JSON.stringify({ imageData }), {
             headers: { 'Content-Type': 'application/json' },
           });
@@ -1087,7 +1089,7 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
         const base64Data = imageData.replace(/^data:image\/\w+;base64,/, '');
         const imageBuffer = Buffer.from(base64Data, 'base64');
-        const floorPlanPath = this.getFloorPlanPath();
+        const floorPlanPath = await this.getFloorPlanPath();
         fs.writeFileSync(floorPlanPath, imageBuffer);
         this.console.log('Floor plan saved to:', floorPlanPath, 'size:', imageBuffer.length);

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

@@ -986,25 +986,75 @@ export const EDITOR_HTML = `<!DOCTYPE html>
     function uploadFloorPlan() { document.getElementById('upload-modal').classList.add('active'); }
+    // Compress and resize image to avoid 413 errors
+    function compressImage(img, maxSize = 1600, quality = 0.8) {
+      return new Promise((resolve) => {
+        const canvas = document.createElement('canvas');
+        let width = img.width;
+        let height = img.height;
+        // Resize if larger than maxSize
+        if (width > maxSize || height > maxSize) {
+          if (width > height) {
+            height = Math.round(height * maxSize / width);
+            width = maxSize;
+          } else {
+            width = Math.round(width * maxSize / height);
+            height = maxSize;
+          }
+        }
+        canvas.width = width;
+        canvas.height = height;
+        const ctx = canvas.getContext('2d');
+        ctx.drawImage(img, 0, 0, width, height);
+        // Convert to JPEG for better compression
+        const compressed = canvas.toDataURL('image/jpeg', quality);
+        console.log('Compressed image from', img.width, 'x', img.height, 'to', width, 'x', height, 'size:', Math.round(compressed.length / 1024), 'KB');
+        resolve(compressed);
+      });
+    }
     async function handleFloorPlanUpload(event) {
       const file = event.target.files[0];
       if (!file) return;
       const reader = new FileReader();
       reader.onload = async (e) => {
-        const imageData = e.target.result;
-        await loadFloorPlanImage(imageData);
-        // 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();
+        const originalData = e.target.result;
+        // Load image to get dimensions
+        const img = new Image();
+        img.onload = async () => {
+          // Compress image to reduce size
+          const imageData = await compressImage(img);
+          await loadFloorPlanImage(imageData);
+          // Store floor plan separately via API
+          try {
+            setStatus('Uploading floor plan...', 'warning');
+            const response = await fetch('../api/floor-plan', {
+              method: 'POST',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify({ imageData })
+            });
+            if (response.ok) {
+              setStatus('Floor plan saved', 'success');
+            } else {
+              setStatus('Failed to save floor plan: ' + response.status, 'error');
+              console.error('Floor plan upload failed:', response.status, response.statusText);
+            }
+          } catch (err) {
+            console.error('Failed to save floor plan:', err);
+            setStatus('Failed to save floor plan', 'error');
+          }
+          // Store reference in topology (without the large imageData)
+          topology.floorPlan = { type: 'uploaded', width: floorPlanImage.width, height: floorPlanImage.height };
+          closeModal('upload-modal');
+          render();
+        };
+        img.src = originalData;
       };
       reader.readAsDataURL(file);
     }