videoanalysis: smart motion sensor now retains the last thumbnail

koush · Dec 20, 2023 · b3a7d6b · b3a7d6b
1 parent 05751bc
commit b3a7d6b
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 14 deletions.
diff --git a/plugins/objectdetector/package-lock.json b/plugins/objectdetector/package-lock.json
diff --git a/plugins/objectdetector/package.json b/plugins/objectdetector/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/objectdetector",
-   "version": "0.1.16",
+   "version": "0.1.17",
    "description": "Scrypted Video Analysis Plugin. Installed alongside a detection service like OpenCV or TensorFlow.",
    "author": "Scrypted",
    "license": "Apache-2.0",

diff --git a/plugins/objectdetector/src/main.ts b/plugins/objectdetector/src/main.ts
@@ -162,8 +162,18 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
 
     const ret: { [key: string]: any } = {};
     for (const setting of this.settings) {
-      ret[setting.key] = (setting.multiple ? safeParseJson(this.storage.getItem(setting.key)) : this.storage.getItem(setting.key))
-        || setting.value;
+      let value: any;
+      if (setting.multiple) {
+        value = safeParseJson(this.storage.getItem(setting.key));
+        if (!value?.length)
+          value = undefined;
+      }
+      else {
+        value = this.storage.getItem(setting.key);
+      }
+      value ||= setting.value;
+
+      ret[setting.key] = value;
     }
 
     if (this.hasMotionType)
@@ -656,13 +666,22 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
     }
 
     if (this.settings) {
-      settings.push(...this.settings.map(setting =>
-        Object.assign({}, setting, {
+      settings.push(...this.settings.map(setting => {
+        let value: any;
+        if (setting.multiple) {
+          value = safeParseJson(this.storage.getItem(setting.key));
+          if (!value?.length)
+            value = undefined;
+        }
+        else {
+          value = this.storage.getItem(setting.key);
+        }
+        value ||= setting.value;
+        return Object.assign({}, setting, {
           placeholder: setting.placeholder?.toString(),
-          value: (setting.multiple ? safeParseJson(this.storage.getItem(setting.key)) : this.storage.getItem(setting.key))
-            || setting.value,
-        } as Setting))
-      );
+          value,
+        } as Setting);
+      }));
     }
 
     this.storageSettings.settings.motionSensorSupplementation.hide = !this.hasMotionType || !this.mixinDeviceInterfaces.includes(ScryptedInterface.MotionSensor);
@@ -1170,6 +1189,7 @@ export class ObjectDetectionPlugin extends AutoenableMixinProvider implements Se
       name,
       type: ScryptedDeviceType.Sensor,
       interfaces: [
+        ScryptedInterface.Camera,
         ScryptedInterface.MotionSensor,
         ScryptedInterface.Settings,
         ScryptedInterface.Readme,

diff --git a/plugins/objectdetector/src/smart-motionsensor.ts b/plugins/objectdetector/src/smart-motionsensor.ts
@@ -1,4 +1,4 @@
-import sdk, { EventListenerRegister, MotionSensor, ObjectDetector, ObjectsDetected, Readme, ScryptedDevice, ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, ScryptedNativeId, Setting, SettingValue, Settings } from "@scrypted/sdk";
+import sdk, { Camera, EventListenerRegister, MediaObject, MotionSensor, ObjectDetector, ObjectsDetected, Readme, RequestPictureOptions, ResponsePictureOptions, ScryptedDevice, ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, ScryptedNativeId, Setting, SettingValue, Settings } from "@scrypted/sdk";
 import { StorageSetting, StorageSettings } from "@scrypted/sdk/storage-settings";
 import type { ObjectDetectionPlugin } from "./main";
 
@@ -14,7 +14,7 @@ export function createObjectDetectorStorageSetting(): StorageSetting {
     };
 }
 
-export class SmartMotionSensor extends ScryptedDeviceBase implements Settings, Readme, MotionSensor {
+export class SmartMotionSensor extends ScryptedDeviceBase implements Settings, Readme, MotionSensor, Camera {
     storageSettings = new StorageSettings(this, {
         objectDetector: createObjectDetectorStorageSetting(),
         detections: {
@@ -36,10 +36,11 @@ export class SmartMotionSensor extends ScryptedDeviceBase implements Settings, R
             combobox: true,
             choices: [
             ],
-        }
+        },
     });
     listener: EventListenerRegister;
     timeout: NodeJS.Timeout;
+    lastPicture: Promise<MediaObject>;
 
     constructor(public plugin: ObjectDetectionPlugin, nativeId?: ScryptedNativeId) {
         super(nativeId);
@@ -76,6 +77,28 @@ export class SmartMotionSensor extends ScryptedDeviceBase implements Settings, R
         };
 
         this.rebind();
+
+        if (!this.providedInterfaces.includes(ScryptedInterface.Camera)) {
+            sdk.deviceManager.onDeviceDiscovered({
+                name: this.providedName,
+                nativeId: this.nativeId,
+                type: this.providedType,
+                interfaces: [
+                    ScryptedInterface.Camera,
+                    ScryptedInterface.MotionSensor,
+                    ScryptedInterface.Settings,
+                    ScryptedInterface.Readme,
+                ]
+            })
+        }
+    }
+
+    async takePicture(options?: RequestPictureOptions): Promise<MediaObject> {
+        return this.lastPicture;
+    }
+
+    async getPictureOptions(): Promise<ResponsePictureOptions[]> {
+        return;
     }
 
     resetTrigger() {
@@ -138,6 +161,8 @@ export class SmartMotionSensor extends ScryptedDeviceBase implements Settings, R
             if (match) {
                 if (!this.motionDetected)
                     console.log('Smart Motion Sensor triggered on', match);
+                if (detected.detectionId)
+                    this.lastPicture = objectDetector.getDetectionInput(detected.detectionId, details.eventId);
                 this.trigger();
             }
         });