scrypted-detection-trainer 0.1.8 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scrypted-detection-trainer",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Collect and label detections to fine-tune the Scrypted NVR object detection model.",
   "keywords": [
     "scrypted-plugin"

package/src/main.ts

@@ -10,6 +10,8 @@ import sdk, {
     ObjectsDetected,
     ObjectDetector,
 } from '@scrypted/sdk';
+import fs from 'fs';
+import path from 'path';
 
 const { systemManager, deviceManager, mediaManager } = sdk;
 
@@ -55,13 +57,16 @@ class DetectionTrainer extends ScryptedDeviceBase implements Settings, HttpReque
     private lastCapture = new Map<string, number>();
     // Map<captureId, CaptureRecord>
     private captures = new Map<string, CaptureRecord>();
-    // Map<captureId, jpegBuffer>
-    private images = new Map<string, Buffer>();
     // Active event listeners
     private listeners: (() => void)[] = [];
+    // Directory for storing images on disk
+    private imgDir: string;
 
     constructor(nativeId?: string) {
         super(nativeId);
+        // Use a stable directory inside the plugin's volume
+        this.imgDir = path.join(process.env.SCRYPTED_PLUGIN_VOLUME || '/tmp', 'detection-trainer-images');
+        try { fs.mkdirSync(this.imgDir, { recursive: true }); } catch {}
         this.loadState();
         this.registerListeners();
     }
@@ -79,26 +84,43 @@ class DetectionTrainer extends ScryptedDeviceBase implements Settings, HttpReque
         } catch (e) {
             this.console.warn('Could not load captures from storage:', e);
         }
-        // images are stored as individual items
+        // Clean up any old base64 image entries from previous versions
         for (const [id] of this.captures) {
-            const raw = this.storage.getItem(`img:${id}`);
-            if (raw) this.images.set(id, Buffer.from(raw, 'base64'));
+            try { this.storage.removeItem(`img:${id}`); } catch {}
         }
     }
 
     private saveCaptures() {
-        this.storage.setItem('captures', JSON.stringify([...this.captures.values()]));
+        try {
+            this.storage.setItem('captures', JSON.stringify([...this.captures.values()]));
+        } catch (e) {
+            this.console.warn('Could not save captures:', e);
+        }
+    }
+
+    private imgPath(id: string): string {
+        return path.join(this.imgDir, `${id}.jpg`);
     }
 
     private saveImage(id: string, buf: Buffer) {
-        this.storage.setItem(`img:${id}`, buf.toString('base64'));
+        try {
+            fs.writeFileSync(this.imgPath(id), buf);
+        } catch (e) {
+            this.console.warn(`Could not save image ${id}:`, e);
+        }
+    }
+
+    private loadImage(id: string): Buffer | undefined {
+        try {
+            const p = this.imgPath(id);
+            if (fs.existsSync(p)) return fs.readFileSync(p);
+        } catch {}
+        return undefined;
     }
 
     private deleteCapture(id: string) {
-        const old = this.storage.getItem(`img:${id}`);
-        if (old) this.storage.removeItem(`img:${id}`);
+        try { fs.unlinkSync(this.imgPath(id)); } catch {}
         this.captures.delete(id);
-        this.images.delete(id);
         this.saveCaptures();
     }
 
@@ -249,7 +271,6 @@ class DetectionTrainer extends ScryptedDeviceBase implements Settings, HttpReque
         };
 
         this.captures.set(id, record);
-        this.images.set(id, jpeg);
         this.saveImage(id, jpeg);
         this.saveCaptures();
 
@@ -264,8 +285,8 @@ class DetectionTrainer extends ScryptedDeviceBase implements Settings, HttpReque
 
         // Serve image
         if (path.startsWith('/img/')) {
-            const id = path.slice(5);
-            const img = this.images.get(id);
+            const id = path.slice(5).replace(/[^a-zA-Z0-9_\-]/g, ''); // sanitize
+            const img = this.loadImage(id);
             if (!img) return response.send('Not found', { code: 404 });
             return response.send(img, { headers: { 'Content-Type': 'image/jpeg', 'Cache-Control': 'max-age=3600' } });
         }
@@ -339,7 +360,7 @@ class DetectionTrainer extends ScryptedDeviceBase implements Settings, HttpReque
             const dataset: { filename: string; content: string; encoding: string }[] = [];
 
             for (const record of labeled) {
-                const img = this.images.get(record.id);
+                const img = this.loadImage(record.id);
                 if (!img) continue;
 
                 const fname = `${record.id}`;