@blueharford/scrypted-spatial-awareness 0.1.11 → 0.1.15

package/package.json

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

@@ -3,7 +3,7 @@
  * Generates and dispatches alerts based on tracking events
  */
 
-import sdk, { Notifier } from '@scrypted/sdk';
+import sdk, { Notifier, Camera, ScryptedInterface, MediaObject } from '@scrypted/sdk';
 import {
   Alert,
   AlertRule,
@@ -15,7 +15,7 @@ import {
 } from '../models/alert';
 import { TrackedObject, GlobalTrackingId } from '../models/tracked-object';
 
-const { systemManager } = sdk;
+const { systemManager, mediaManager } = sdk;
 
 export class AlertManager {
   private rules: AlertRule[] = [];
@@ -109,6 +109,20 @@ export class AlertManager {
       ? rule.notifiers
       : this.getDefaultNotifiers();
 
+    // Try to get a thumbnail from the camera
+    let mediaObject: MediaObject | undefined;
+    const cameraId = alert.details.toCameraId || alert.details.cameraId;
+    if (cameraId) {
+      try {
+        const camera = systemManager.getDeviceById<Camera>(cameraId);
+        if (camera && camera.interfaces?.includes(ScryptedInterface.Camera)) {
+          mediaObject = await camera.takePicture();
+        }
+      } catch (e) {
+        this.console.warn(`Failed to get thumbnail from camera ${cameraId}:`, e);
+      }
+    }
+
     for (const notifierId of notifierIds) {
       try {
         const notifier = systemManager.getDeviceById<Notifier>(notifierId);
@@ -127,10 +141,11 @@ export class AlertManager {
               trackedObjectId: alert.trackedObjectId,
               timestamp: alert.timestamp,
             },
-          }
+          },
+          mediaObject
         );
 
-        this.console.log(`Notification sent to ${notifierId}`);
+        this.console.log(`Notification sent to ${notifierId}${mediaObject ? ' with thumbnail' : ''}`);
       } catch (e) {
         this.console.error(`Failed to send notification to ${notifierId}:`, e);
       }
@@ -142,17 +157,19 @@ export class AlertManager {
    */
   private getNotificationTitle(alert: Alert): string {
     const prefix = alert.severity === 'critical' ? '🚨 ' :
-                   alert.severity === 'warning' ? '⚠️ ' : 'ℹ️ ';
+                   alert.severity === 'warning' ? '⚠️ ' : '';
 
     switch (alert.type) {
       case 'property_entry':
-        return `${prefix}Entry Detected`;
+        return `${prefix}🚶 Entry Detected`;
       case 'property_exit':
-        return `${prefix}Exit Detected`;
+        return `${prefix}🚶 Exit Detected`;
+      case 'movement':
+        return `${prefix}🚶 Movement Detected`;
       case 'unusual_path':
         return `${prefix}Unusual Path`;
       case 'dwell_time':
-        return `${prefix}Extended Presence`;
+        return `${prefix}⏱️ Extended Presence`;
       case 'restricted_zone':
         return `${prefix}Restricted Zone Alert`;
       case 'lost_tracking':
@@ -169,6 +186,24 @@ export class AlertManager {
    */
   private getDefaultNotifiers(): string[] {
     try {
+      // Try new multiple notifiers setting first
+      const notifiers = this.storage.getItem('defaultNotifiers');
+      if (notifiers) {
+        // Could be JSON array or comma-separated string
+        try {
+          const parsed = JSON.parse(notifiers);
+          if (Array.isArray(parsed)) {
+            return parsed;
+          }
+        } catch {
+          // Not JSON, might be comma-separated or single value
+          if (notifiers.includes(',')) {
+            return notifiers.split(',').map(s => s.trim()).filter(Boolean);
+          }
+          return [notifiers];
+        }
+      }
+      // Fallback to old single notifier setting
       const defaultNotifier = this.storage.getItem('defaultNotifier');
       return defaultNotifier ? [defaultNotifier] : [];
     } catch {

package/src/core/tracking-engine.ts

@@ -192,6 +192,8 @@ export class TrackingEngine {
       // Check if this is a cross-camera transition
       const lastSighting = getLastSighting(tracked);
       if (lastSighting && lastSighting.cameraId !== sighting.cameraId) {
+        const transitDuration = sighting.timestamp - lastSighting.timestamp;
+
         // Add journey segment
         this.state.addJourney(tracked.globalId, {
           fromCameraId: lastSighting.cameraId,
@@ -200,7 +202,7 @@ export class TrackingEngine {
           toCameraName: sighting.cameraName,
           exitTime: lastSighting.timestamp,
           entryTime: sighting.timestamp,
-          transitDuration: sighting.timestamp - lastSighting.timestamp,
+          transitDuration,
           correlationConfidence: correlation.confidence,
         });
 
@@ -209,6 +211,18 @@ export class TrackingEngine {
           `${lastSighting.cameraName} → ${sighting.cameraName} ` +
           `(confidence: ${(correlation.confidence * 100).toFixed(0)}%)`
         );
+
+        // Generate movement alert for cross-camera transition
+        await this.alertManager.checkAndAlert('movement', tracked, {
+          fromCameraId: lastSighting.cameraId,
+          fromCameraName: lastSighting.cameraName,
+          toCameraId: sighting.cameraId,
+          toCameraName: sighting.cameraName,
+          transitTime: transitDuration,
+          objectClass: sighting.detection.className,
+          objectLabel: sighting.detection.label,
+          detectionId: sighting.detectionId,
+        });
       }
 
       // Add sighting to tracked object

package/src/main.ts

@@ -123,10 +123,12 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
       defaultValue: true,
       group: 'Alerts',
     },
-    defaultNotifier: {
-      title: 'Default Notifier',
+    defaultNotifiers: {
+      title: 'Notifiers',
       type: 'device',
+      multiple: true,
       deviceFilter: `interfaces.includes('${ScryptedInterface.Notifier}')`,
+      description: 'Select one or more notifiers to receive alerts',
       group: 'Alerts',
     },
 
@@ -386,14 +388,33 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
 
     // Add status display
     const activeCount = this.trackingState.getActiveCount();
+    const topologyJson = this.storage.getItem('topology');
+    let statusText = 'Not configured - add cameras and configure topology';
+
+    if (this.trackingEngine) {
+      statusText = `Active: Tracking ${activeCount} object${activeCount !== 1 ? 's' : ''}`;
+    } else if (topologyJson) {
+      try {
+        const topology = JSON.parse(topologyJson) as CameraTopology;
+        if (topology.cameras && topology.cameras.length > 0) {
+          // Topology exists but engine not running - try to start it
+          statusText = `Configured (${topology.cameras.length} cameras) - Starting...`;
+          // Restart the tracking engine asynchronously
+          this.startTrackingEngine(topology).catch(e => {
+            this.console.error('Failed to restart tracking engine:', e);
+          });
+        }
+      } catch (e) {
+        statusText = 'Error loading topology';
+      }
+    }
+
     settings.push({
       key: 'status',
       title: 'Tracking Status',
       type: 'string',
       readonly: true,
-      value: this.trackingEngine
-        ? `Active: Tracking ${activeCount} object${activeCount !== 1 ? 's' : ''}`
-        : 'Not configured - add cameras and configure topology',
+      value: statusText,
       group: 'Status',
     });
 
@@ -410,9 +431,83 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
       });
     }
 
+    // Add alert rules configuration UI
+    const alertRules = this.alertManager.getRules();
+    const rulesHtml = this.generateAlertRulesHtml(alertRules);
+    settings.push({
+      key: 'alertRulesEditor',
+      title: 'Alert Rules',
+      type: 'html' as any,
+      value: rulesHtml,
+      group: 'Alerts',
+    });
+
     return settings;
   }
 
+  private generateAlertRulesHtml(rules: any[]): string {
+    const ruleRows = rules.map(rule => `
+      <tr data-rule-id="${rule.id}">
+        <td style="padding:8px;border-bottom:1px solid #333;">
+          <input type="checkbox" ${rule.enabled ? 'checked' : ''}
+                 onchange="(function(el){var rules=JSON.parse(localStorage.getItem('sa-temp-rules')||'[]');var r=rules.find(x=>x.id==='${rule.id}');if(r)r.enabled=el.checked;localStorage.setItem('sa-temp-rules',JSON.stringify(rules));})(this)" />
+        </td>
+        <td style="padding:8px;border-bottom:1px solid #333;color:#fff;">${rule.name}</td>
+        <td style="padding:8px;border-bottom:1px solid #333;color:#888;">${rule.type}</td>
+        <td style="padding:8px;border-bottom:1px solid #333;">
+          <span style="padding:2px 8px;border-radius:4px;font-size:12px;background:${
+            rule.severity === 'critical' ? '#e94560' :
+            rule.severity === 'warning' ? '#f39c12' : '#3498db'
+          };color:white;">${rule.severity}</span>
+        </td>
+        <td style="padding:8px;border-bottom:1px solid #333;color:#888;">${Math.round(rule.cooldown / 1000)}s</td>
+      </tr>
+    `).join('');
+
+    const initCode = `localStorage.setItem('sa-temp-rules',JSON.stringify(${JSON.stringify(rules)}))`;
+    const saveCode = `(function(){var rules=JSON.parse(localStorage.getItem('sa-temp-rules')||'[]');fetch('/endpoint/@blueharford/scrypted-spatial-awareness/api/alert-rules',{method:'PUT',headers:{'Content-Type':'application/json'},body:JSON.stringify(rules)}).then(r=>r.json()).then(d=>{if(d.success)alert('Alert rules saved!');else alert('Error: '+d.error);}).catch(e=>alert('Error: '+e));})()`;
+
+    return `
+      <style>
+        .sa-rules-table { width:100%; border-collapse:collapse; margin-top:10px; }
+        .sa-rules-table th { text-align:left; padding:10px 8px; border-bottom:2px solid #e94560; color:#e94560; font-size:13px; }
+        .sa-save-rules-btn {
+          background: linear-gradient(135deg, #27ae60 0%, #2ecc71 100%);
+          color: white;
+          border: none;
+          padding: 10px 20px;
+          border-radius: 6px;
+          font-size: 14px;
+          font-weight: 600;
+          cursor: pointer;
+          margin-top: 15px;
+        }
+        .sa-save-rules-btn:hover { opacity: 0.9; }
+        .sa-rules-container { background:#16213e; border-radius:8px; padding:15px; }
+        .sa-rules-desc { color:#888; font-size:13px; margin-bottom:10px; }
+      </style>
+      <div class="sa-rules-container">
+        <p class="sa-rules-desc">Enable or disable alert types. Movement alerts notify you when someone moves between cameras.</p>
+        <table class="sa-rules-table">
+          <thead>
+            <tr>
+              <th style="width:40px;">On</th>
+              <th>Alert Type</th>
+              <th>Event</th>
+              <th>Severity</th>
+              <th>Cooldown</th>
+            </tr>
+          </thead>
+          <tbody>
+            ${ruleRows}
+          </tbody>
+        </table>
+        <button class="sa-save-rules-btn" onclick="${saveCode}">Save Alert Rules</button>
+        <script>(function(){${initCode}})();</script>
+      </div>
+    `;
+  }
+
   async putSetting(key: string, value: SettingValue): Promise<void> {
     await this.storageSettings.putSetting(key, value);
 
@@ -466,13 +561,17 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
       }
 
       if (path.endsWith('/api/topology')) {
-        return this.handleTopologyRequest(request, response);
+        return await this.handleTopologyRequest(request, response);
       }
 
       if (path.endsWith('/api/alerts')) {
         return this.handleAlertsRequest(request, response);
       }
 
+      if (path.endsWith('/api/alert-rules')) {
+        return this.handleAlertRulesRequest(request, response);
+      }
+
       if (path.endsWith('/api/cameras')) {
         return this.handleCamerasRequest(response);
       }
@@ -552,7 +651,7 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
     }
   }
 
-  private handleTopologyRequest(request: HttpRequest, response: HttpResponse): void {
+  private async handleTopologyRequest(request: HttpRequest, response: HttpResponse): Promise<void> {
     if (request.method === 'GET') {
       const topologyJson = this.storage.getItem('topology');
       const topology = topologyJson ? JSON.parse(topologyJson) : createEmptyTopology();
@@ -563,7 +662,7 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
       try {
         const topology = JSON.parse(request.body!) as CameraTopology;
         this.storage.setItem('topology', JSON.stringify(topology));
-        this.startTrackingEngine(topology);
+        await this.startTrackingEngine(topology);
         response.send(JSON.stringify({ success: true }), {
           headers: { 'Content-Type': 'application/json' },
         });
@@ -583,6 +682,28 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
     });
   }
 
+  private handleAlertRulesRequest(request: HttpRequest, response: HttpResponse): void {
+    if (request.method === 'GET') {
+      const rules = this.alertManager.getRules();
+      response.send(JSON.stringify(rules), {
+        headers: { 'Content-Type': 'application/json' },
+      });
+    } else if (request.method === 'PUT' || request.method === 'POST') {
+      try {
+        const rules = JSON.parse(request.body!);
+        this.alertManager.setRules(rules);
+        response.send(JSON.stringify({ success: true }), {
+          headers: { 'Content-Type': 'application/json' },
+        });
+      } catch (e) {
+        response.send(JSON.stringify({ error: 'Invalid rules JSON' }), {
+          code: 400,
+          headers: { 'Content-Type': 'application/json' },
+        });
+      }
+    }
+  }
+
   private handleCamerasRequest(response: HttpResponse): void {
     try {
       // Get all devices with ObjectDetector interface

package/src/models/alert.ts

@@ -12,6 +12,7 @@ export type AlertSeverity = 'info' | 'warning' | 'critical';
 export type AlertType =
   | 'property_entry'
   | 'property_exit'
+  | 'movement'
   | 'unusual_path'
   | 'dwell_time'
   | 'restricted_zone'
@@ -51,10 +52,20 @@ export interface AlertDetails {
   cameraId?: string;
   /** Camera display name */
   cameraName?: string;
+  /** Source camera for movement alerts */
+  fromCameraId?: string;
+  /** Source camera name for movement alerts */
+  fromCameraName?: string;
+  /** Destination camera for movement alerts */
+  toCameraId?: string;
+  /** Destination camera name for movement alerts */
+  toCameraName?: string;
   /** Zone name (for zone-related alerts) */
   zoneName?: string;
   /** Dwell time in milliseconds (for dwell alerts) */
   dwellTime?: number;
+  /** Transit time in milliseconds (for movement alerts) */
+  transitTime?: number;
   /** Expected path (for unusual path alerts) */
   expectedPath?: string;
   /** Actual path taken */
@@ -116,7 +127,7 @@ export function createDefaultRules(): AlertRule[] {
       conditions: [],
       severity: 'info',
       notifiers: [],
-      cooldown: 300000, // 5 minutes
+      cooldown: 60000, // 1 minute
     },
     {
       id: 'property-exit',
@@ -126,7 +137,17 @@ export function createDefaultRules(): AlertRule[] {
       conditions: [],
       severity: 'info',
       notifiers: [],
-      cooldown: 300000,
+      cooldown: 60000,
+    },
+    {
+      id: 'movement',
+      name: 'Movement Between Cameras',
+      enabled: true,
+      type: 'movement',
+      conditions: [],
+      severity: 'info',
+      notifiers: [],
+      cooldown: 10000, // 10 seconds - we want frequent movement updates
     },
     {
       id: 'unusual-path',
@@ -178,15 +199,21 @@ export function generateAlertMessage(
   type: AlertType,
   details: AlertDetails
 ): string {
+  // Capitalize the object class for display (person -> Person, car -> Car, dog -> Dog)
+  const capitalize = (s: string) => s ? s.charAt(0).toUpperCase() + s.slice(1) : 'Object';
   const objectDesc = details.objectLabel
-    ? `${details.objectClass} (${details.objectLabel})`
-    : details.objectClass || 'Object';
+    ? `${capitalize(details.objectClass || '')} (${details.objectLabel})`
+    : capitalize(details.objectClass || '');
 
   switch (type) {
     case 'property_entry':
       return `${objectDesc} entered property via ${details.cameraName || 'unknown camera'}`;
     case 'property_exit':
       return `${objectDesc} exited property via ${details.cameraName || 'unknown camera'}`;
+    case 'movement':
+      const transitSecs = details.transitTime ? Math.round(details.transitTime / 1000) : 0;
+      const transitStr = transitSecs > 0 ? ` (${transitSecs}s transit)` : '';
+      return `${objectDesc} moving from ${details.fromCameraName || 'unknown'} towards ${details.toCameraName || 'unknown'}${transitStr}`;
     case 'unusual_path':
       return `${objectDesc} took unusual path: ${details.actualPath || 'unknown'}`;
     case 'dwell_time':