@blueharford/scrypted-spatial-awareness 0.6.32 → 0.6.33

package/src/main.ts

@@ -111,6 +111,13 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
       description: 'Object must be visible for this duration before triggering movement alerts',
       group: 'Tracking',
     },
+    minDetectionScore: {
+      title: 'Minimum Detection Confidence',
+      type: 'number',
+      defaultValue: 0.5,
+      description: 'Minimum detection score (0-1) to consider for tracking',
+      group: 'Tracking',
+    },
     objectAlertCooldown: {
       title: 'Per-Object Alert Cooldown (seconds)',
       type: 'number',
@@ -118,6 +125,20 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
       description: 'Minimum time between alerts for the same tracked object',
       group: 'Tracking',
     },
+    notifyOnAlertUpdates: {
+      title: 'Notify on Alert Updates',
+      type: 'boolean',
+      defaultValue: false,
+      description: 'Send notifications when an existing alert is updated (camera transitions, context changes)',
+      group: 'Tracking',
+    },
+    alertUpdateCooldown: {
+      title: 'Alert Update Cooldown (seconds)',
+      type: 'number',
+      defaultValue: 60,
+      description: 'Minimum time between update notifications for the same tracked object (0 = no limit)',
+      group: 'Tracking',
+    },
 
     // LLM Integration
     useLlmDescriptions: {
@@ -321,6 +342,8 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
       await this.initializeMqtt();
     }
 
+    this.applyAlertUpdateSettings();
+
     this.console.log('Spatial Awareness Plugin initialized');
   }
 
@@ -356,21 +379,22 @@ 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.35,
-      lostTimeout: (this.storageSettings.values.lostTimeout as number || 300) * 1000,
+      correlationWindow: this.getNumberSetting(this.storageSettings.values.correlationWindow, 30) * 1000,
+      correlationThreshold: this.getNumberSetting(this.storageSettings.values.correlationThreshold, 0.35),
+      lostTimeout: this.getNumberSetting(this.storageSettings.values.lostTimeout, 300) * 1000,
       useVisualMatching: this.storageSettings.values.useVisualMatching as boolean ?? true,
-      loiteringThreshold: (this.storageSettings.values.loiteringThreshold as number || 3) * 1000,
-      objectAlertCooldown: (this.storageSettings.values.objectAlertCooldown as number || 30) * 1000,
+      loiteringThreshold: this.getNumberSetting(this.storageSettings.values.loiteringThreshold, 3) * 1000,
+      minDetectionScore: this.getNumberSetting(this.storageSettings.values.minDetectionScore, 0.5),
+      objectAlertCooldown: this.getNumberSetting(this.storageSettings.values.objectAlertCooldown, 30) * 1000,
       useLlmDescriptions: this.storageSettings.values.useLlmDescriptions as boolean ?? true,
       llmDeviceIds: this.parseLlmProviders(),
-      llmDebounceInterval: (this.storageSettings.values.llmDebounceInterval as number || 30) * 1000,
+      llmDebounceInterval: this.getNumberSetting(this.storageSettings.values.llmDebounceInterval, 5) * 1000,
       llmFallbackEnabled: this.storageSettings.values.llmFallbackEnabled as boolean ?? true,
-      llmFallbackTimeout: (this.storageSettings.values.llmFallbackTimeout as number || 3) * 1000,
+      llmFallbackTimeout: this.getNumberSetting(this.storageSettings.values.llmFallbackTimeout, 3) * 1000,
       enableTransitTimeLearning: this.storageSettings.values.enableTransitTimeLearning as boolean ?? true,
       enableConnectionSuggestions: this.storageSettings.values.enableConnectionSuggestions as boolean ?? true,
       enableLandmarkLearning: this.storageSettings.values.enableLandmarkLearning as boolean ?? true,
-      landmarkConfidenceThreshold: this.storageSettings.values.landmarkConfidenceThreshold as number ?? 0.7,
+      landmarkConfidenceThreshold: this.getNumberSetting(this.storageSettings.values.landmarkConfidenceThreshold, 0.7),
     };
 
     this.trackingEngine = new TrackingEngine(
@@ -381,6 +405,8 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
       this.console
     );
 
+    this.applyAlertUpdateSettings();
+
     // Set up callback to save topology changes (e.g., from accepted landmark suggestions)
     this.trackingEngine.setTopologyChangeCallback((updatedTopology) => {
       this.storage.setItem('topology', JSON.stringify(updatedTopology));
@@ -396,10 +422,10 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
 
   private async initializeDiscoveryEngine(topology: CameraTopology): Promise<void> {
     const discoveryConfig: DiscoveryConfig = {
-      discoveryIntervalHours: this.storageSettings.values.discoveryIntervalHours as number ?? 0,
-      autoAcceptThreshold: this.storageSettings.values.autoAcceptThreshold as number ?? 0.85,
-      minLandmarkConfidence: this.storageSettings.values.minLandmarkConfidence as number ?? 0.6,
-      minConnectionConfidence: this.storageSettings.values.minConnectionConfidence as number ?? 0.5,
+      discoveryIntervalHours: this.getNumberSetting(this.storageSettings.values.discoveryIntervalHours, 0),
+      autoAcceptThreshold: this.getNumberSetting(this.storageSettings.values.autoAcceptThreshold, 0.85),
+      minLandmarkConfidence: this.getNumberSetting(this.storageSettings.values.minLandmarkConfidence, 0.6),
+      minConnectionConfidence: this.getNumberSetting(this.storageSettings.values.minConnectionConfidence, 0.5),
     };
 
     if (this.discoveryEngine) {
@@ -448,6 +474,12 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
     return undefined;
   }
 
+  private getNumberSetting(value: unknown, fallback: number): number {
+    if (value === undefined || value === null) return fallback;
+    const num = typeof value === 'string' ? Number(value) : (value as number);
+    return Number.isFinite(num) ? num : fallback;
+  }
+
   // ==================== DeviceProvider Implementation ====================
 
   async getDevice(nativeId: string): Promise<any> {
@@ -771,6 +803,10 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
       }
     }
 
+    if (key === 'notifyOnAlertUpdates' || key === 'alertUpdateCooldown') {
+      this.applyAlertUpdateSettings();
+    }
+
     // Handle MQTT setting changes
     if (key === 'enableMqtt' || key === 'mqttBroker' || key === 'mqttUsername' ||
         key === 'mqttPassword' || key === 'mqttBaseTopic') {
@@ -784,6 +820,12 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
     }
   }
 
+  private applyAlertUpdateSettings(): void {
+    const enabled = this.storageSettings.values.notifyOnAlertUpdates as boolean ?? false;
+    const cooldownSeconds = this.getNumberSetting(this.storageSettings.values.alertUpdateCooldown, 60);
+    this.alertManager.setUpdateNotificationOptions(enabled, cooldownSeconds * 1000);
+  }
+
   // ==================== HttpRequestHandler Implementation ====================
 
   async onRequest(request: HttpRequest, response: HttpResponse): Promise<void> {

package/src/models/tracked-object.ts

@@ -3,7 +3,7 @@
  * Defines objects being tracked across multiple cameras
  */
 
-import { ObjectDetectionResult } from '@scrypted/sdk';
+import type { ObjectDetectionResult } from '@scrypted/sdk';
 
 /** Unique identifier for a globally tracked object */
 export type GlobalTrackingId = string;

package/src/state/tracking-state.ts

@@ -21,6 +21,8 @@ export class TrackingState {
   private changeCallbacks: StateChangeCallback[] = [];
   private storage: Storage;
   private console: Console;
+  private persistTimer: NodeJS.Timeout | null = null;
+  private readonly persistDebounceMs: number = 2000;
 
   constructor(storage: Storage, console: Console) {
     this.storage = storage;
@@ -60,7 +62,7 @@ export class TrackingState {
 
     this.objects.set(object.globalId, object);
     this.notifyChange();
-    this.persistState();
+    this.schedulePersist();
   }
 
   /** Add a new sighting to an existing tracked object */
@@ -77,7 +79,7 @@ export class TrackingState {
     this.objectsByCamera.get(sighting.cameraId)!.add(globalId);
 
     this.notifyChange();
-    this.persistState();
+    this.schedulePersist();
     return true;
   }
 
@@ -96,7 +98,7 @@ export class TrackingState {
     this.objectsByCamera.get(segment.toCameraId)!.add(globalId);
 
     this.notifyChange();
-    this.persistState();
+    this.schedulePersist();
     return true;
   }
 
@@ -150,7 +152,7 @@ export class TrackingState {
       }
 
       this.notifyChange();
-      this.persistState();
+      this.schedulePersist();
     }
   }
 
@@ -167,7 +169,7 @@ export class TrackingState {
       }
 
       this.notifyChange();
-      this.persistState();
+      this.schedulePersist();
     }
   }
 
@@ -229,6 +231,17 @@ export class TrackingState {
     }
   }
 
+  private schedulePersist(): void {
+    if (this.persistTimer) {
+      clearTimeout(this.persistTimer);
+    }
+
+    this.persistTimer = setTimeout(() => {
+      this.persistTimer = null;
+      this.persistState();
+    }, this.persistDebounceMs);
+  }
+
   private loadPersistedState(): void {
     try {
       const json = this.storage.getItem('tracked-objects');

package/tests/run-tests.ts

@@ -0,0 +1,50 @@
+import assert from 'assert/strict';
+import {
+  getActiveAlertKey,
+  hasMeaningfulAlertChange,
+  shouldSendUpdateNotification,
+} from '../src/alerts/alert-utils';
+
+async function testAlertUpdateHelpers(): Promise<void> {
+  const prev = {
+    cameraId: 'cam-1',
+    objectLabel: 'Person at front',
+    involvedLandmarks: ['Front Door'],
+  };
+
+  const same = {
+    cameraId: 'cam-1',
+    objectLabel: 'Person at front',
+    involvedLandmarks: ['Front Door'],
+  };
+
+  const changed = {
+    cameraId: 'cam-2',
+    objectLabel: 'Person moving to driveway',
+    involvedLandmarks: ['Driveway'],
+  };
+
+  assert.equal(hasMeaningfulAlertChange(prev, same), false);
+  assert.equal(hasMeaningfulAlertChange(prev, changed), true);
+
+  const key = getActiveAlertKey('movement', 'movement', 'obj-1');
+  assert.equal(key, 'movement:movement:obj-1');
+
+  const now = Date.now();
+  assert.equal(shouldSendUpdateNotification(false, now - 100000, now, 60000), false);
+  assert.equal(shouldSendUpdateNotification(true, now - 100000, now, 60000), true);
+  assert.equal(shouldSendUpdateNotification(true, now - 1000, now, 60000), false);
+  assert.equal(shouldSendUpdateNotification(true, now - 1000, now, 0), true);
+}
+
+async function run(): Promise<void> {
+  await testAlertUpdateHelpers();
+  // eslint-disable-next-line no-console
+  console.log('All tests passed');
+}
+
+run().catch(err => {
+  // eslint-disable-next-line no-console
+  console.error(err);
+  process.exit(1);
+});