@blueharford/scrypted-spatial-awareness 0.4.5 → 0.4.7

package/package.json

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

package/src/alerts/alert-manager.ts

@@ -159,25 +159,32 @@ export class AlertManager {
     const prefix = alert.severity === 'critical' ? '🚨 ' :
                    alert.severity === 'warning' ? '⚠️ ' : '';
 
+    // Use object class in title
+    const objectType = alert.details.objectClass
+      ? alert.details.objectClass.charAt(0).toUpperCase() + alert.details.objectClass.slice(1)
+      : 'Object';
+
     switch (alert.type) {
       case 'property_entry':
-        return `${prefix}🚶 Entry Detected`;
+        return `${prefix}${objectType} Arrived`;
       case 'property_exit':
-        return `${prefix}🚶 Exit Detected`;
+        return `${prefix}${objectType} Left`;
       case 'movement':
-        return `${prefix}🚶 Movement Detected`;
+        // Include destination in title
+        const dest = alert.details.toCameraName || 'area';
+        return `${prefix}${objectType} → ${dest}`;
       case 'unusual_path':
-        return `${prefix}Unusual Path`;
+        return `${prefix}Unusual Route`;
       case 'dwell_time':
-        return `${prefix}⏱️ Extended Presence`;
+        return `${prefix}${objectType} Lingering`;
       case 'restricted_zone':
-        return `${prefix}Restricted Zone Alert`;
+        return `${prefix}Restricted Zone!`;
       case 'lost_tracking':
-        return `${prefix}Lost Tracking`;
+        return `${prefix}${objectType} Lost`;
       case 'reappearance':
-        return `${prefix}Object Reappeared`;
+        return `${prefix}${objectType} Reappeared`;
       default:
-        return `${prefix}Spatial Awareness Alert`;
+        return `${prefix}Spatial Alert`;
     }
   }
 

package/src/core/object-correlator.ts

@@ -125,6 +125,9 @@ export class ObjectCorrelator {
       return 1.0;
     }
 
+    // Calculate transit time first
+    const transitTime = sighting.timestamp - lastSighting.timestamp;
+
     // Find connection between cameras
     const connection = findConnection(
       this.topology,
@@ -133,12 +136,17 @@ export class ObjectCorrelator {
     );
 
     if (!connection) {
-      // No defined connection - low score but not zero
-      // (allows for uncharted paths)
+      // No defined connection - still allow correlation based on reasonable timing
+      // Allow up to 2 minutes transit between any cameras
+      const MAX_UNCHARTED_TRANSIT = 120000; // 2 minutes
+      if (transitTime > 0 && transitTime < MAX_UNCHARTED_TRANSIT) {
+        // Score based on how reasonable the timing is
+        // Shorter transits are more likely to be the same object
+        const timingScore = Math.max(0.3, 1 - (transitTime / MAX_UNCHARTED_TRANSIT));
+        return timingScore;
+      }
       return 0.2;
     }
-
-    const transitTime = sighting.timestamp - lastSighting.timestamp;
     const { min, typical, max } = connection.transitTime;
 
     // Way outside range
@@ -217,7 +225,8 @@ export class ObjectCorrelator {
     );
 
     if (!connection) {
-      return 0.3; // No connection defined
+      // No connection defined - give neutral score (don't penalize)
+      return 0.5;
     }
 
     let score = 0;

package/src/main.ts

@@ -78,8 +78,8 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
     correlationThreshold: {
       title: 'Correlation Confidence Threshold',
       type: 'number',
-      defaultValue: 0.6,
-      description: 'Minimum confidence (0-1) for automatic object correlation',
+      defaultValue: 0.35,
+      description: 'Minimum confidence (0-1) for automatic object correlation. Lower values allow more matches.',
       group: 'Tracking',
     },
     lostTimeout: {
@@ -324,7 +324,7 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
 
     const config: TrackingEngineConfig = {
       correlationWindow: (this.storageSettings.values.correlationWindow as number || 30) * 1000,
-      correlationThreshold: this.storageSettings.values.correlationThreshold as number || 0.6,
+      correlationThreshold: this.storageSettings.values.correlationThreshold as number || 0.35,
       lostTimeout: (this.storageSettings.values.lostTimeout as number || 300) * 1000,
       useVisualMatching: this.storageSettings.values.useVisualMatching as boolean ?? true,
       loiteringThreshold: (this.storageSettings.values.loiteringThreshold as number || 3) * 1000,

package/src/models/alert.ts

@@ -214,9 +214,9 @@ export function generateAlertMessage(
 
   switch (type) {
     case 'property_entry':
-      return `${objectDesc} entered property via ${details.cameraName || 'unknown camera'}`;
+      return `${objectDesc} arrived at ${details.cameraName || 'property'}`;
     case 'property_exit':
-      return `${objectDesc} exited property via ${details.cameraName || 'unknown camera'}`;
+      return `${objectDesc} left from ${details.cameraName || 'property'}`;
     case 'movement':
       // If we have a rich description from LLM/RAG, use it
       if (details.objectLabel && details.usedLlm) {

package/src/ui/editor-html.ts

@@ -986,14 +986,14 @@ 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) {
+    // Compress and resize image to avoid 413 errors (Scrypted has ~50KB limit)
+    function compressImage(img, maxSize = 800, quality = 0.5) {
       return new Promise((resolve) => {
         const canvas = document.createElement('canvas');
         let width = img.width;
         let height = img.height;
 
-        // Resize if larger than maxSize
+        // Always resize to fit within maxSize
         if (width > maxSize || height > maxSize) {
           if (width > height) {
             height = Math.round(height * maxSize / width);
@@ -1009,9 +1009,18 @@ export const EDITOR_HTML = `<!DOCTYPE html>
         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);
+        // Convert to JPEG with aggressive compression
+        let 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');
+
+        // If still too large, compress more
+        let q = quality;
+        while (compressed.length > 50000 && q > 0.1) {
+          q -= 0.1;
+          compressed = canvas.toDataURL('image/jpeg', q);
+          console.log('Re-compressed at quality', q.toFixed(1), 'size:', Math.round(compressed.length / 1024), 'KB');
+        }
+
         resolve(compressed);
       });
     }