@camera.ui/server 2.2.3 → 2.2.4

package/dist/server/src/api/websocket/nsp/worker-perf.js

@@ -0,0 +1,58 @@
+function round(value) {
+    return Math.round(value * 10) / 10;
+}
+function per(total, count) {
+    return count > 0 ? round(total / count) : 0;
+}
+function percent(part, whole) {
+    return whole > 0 ? Math.min(100, Math.round((part / whole) * 100)) : 0;
+}
+export function deriveWorkerPerf(snapshot, pluginName) {
+    const objectFrames = snapshot.objectCount;
+    const judgedFrames = snapshot.objectCount + snapshot.assistCount;
+    const fallback = {
+        motion: per(snapshot.motionMs, snapshot.motionCount),
+        object: per(snapshot.objectMs, snapshot.objectCount),
+        face: per(snapshot.faceMs, snapshot.faceCount),
+        licensePlate: per(snapshot.plateMs, snapshot.plateCount),
+        classifier: per(snapshot.classifierMs, snapshot.classifierCount),
+        clip: per(snapshot.clipMs, snapshot.clipCount),
+    };
+    const detectors = {};
+    for (const [type, info] of Object.entries(snapshot.detectors)) {
+        detectors[type] = {
+            plugin: pluginName(info.plugin) ?? info.plugin,
+            input: info.input,
+            runtime: info.runtime,
+            models: info.models,
+            inferenceMs: info.calls ? per(info.handlerMs ?? 0, info.calls) : (fallback[type] ?? 0),
+            transportMs: info.calls ? per(info.transportMs ?? 0, info.calls) : 0,
+            stamped: Boolean(info.calls),
+        };
+    }
+    const scaleMs = per(snapshot.scaleMs, objectFrames);
+    const postMs = per(snapshot.postMs, objectFrames);
+    const motionScaleMs = per(snapshot.motionScaleMs, snapshot.motionScaleCount);
+    return {
+        detectors,
+        processingMs: objectFrames > 0 ? round(scaleMs + postMs) : motionScaleMs,
+        decodeMs: per(snapshot.decodeMs, snapshot.decodedFrames),
+        mainDecodeMs: per(snapshot.mainDecodeMs, snapshot.mainDecodedFrames),
+        scaleMs,
+        postMs,
+        motionScaleMs,
+        transportMs: detectors.object?.transportMs ?? 0,
+        analysedFps: snapshot.loopMs > 0 ? round(snapshot.ticks / (snapshot.loopMs / 1000)) : 0,
+        mainFps: snapshot.mainLoopMs > 0 ? round(snapshot.mainTicks / (snapshot.mainLoopMs / 1000)) : 0,
+        mainStreamEnabled: snapshot.mainStreamEnabled,
+        frameAnalysis: snapshot.frameAnalysis,
+        activePercent: percent(snapshot.loopMs, snapshot.uptimeMs),
+        zoomPercent: percent(snapshot.zoomTicks, objectFrames),
+        zoomWindows: per(snapshot.zoomWindows, snapshot.zoomTicks),
+        objectsPerFrame: per(snapshot.objects, judgedFrames),
+        hitPercent: percent(snapshot.framesWithObjects, judgedFrames),
+        switches: snapshot.switches,
+        minutes: Math.round(snapshot.uptimeMs / 60_000),
+    };
+}
+//# sourceMappingURL=worker-perf.js.map

package/dist/server/src/api/websocket/nsp/worker-perf.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-perf.js","sourceRoot":"","sources":["../../../../../../src/api/websocket/nsp/worker-perf.ts"],"names":[],"mappings":"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"}

package/dist/server/src/api/websocket/types.d.ts

@@ -24,6 +24,7 @@ export interface WorkerPerfStats {
     mainDecodeMs: number;
     scaleMs: number;
     postMs: number;
+    motionScaleMs: number;
     transportMs: number;
     analysedFps: number;
     mainFps: number;

package/dist/server/src/assistant/search.d.ts

@@ -32,37 +32,37 @@ export declare const SEARCH_SCHEMA: zod.ZodObject<{
         license_plate: "license_plate";
     }>>;
     sensorEvents: zod.ZodArray<zod.ZodEnum<{
-        audio: "audio";
         motion: "motion";
-        siren: "siren";
-        doorbell: "doorbell";
+        audio: "audio";
         contact: "contact";
+        doorbell: "doorbell";
+        switch: "switch";
+        light: "light";
+        siren: "siren";
         security_system: "security_system";
+        "line-crossing": "line-crossing";
+        occupancy: "occupancy";
         smoke: "smoke";
+        leak: "leak";
         gas: "gas";
         carbonMonoxide: "carbonMonoxide";
         heat: "heat";
-        leak: "leak";
         cold: "cold";
         vibration: "vibration";
         tamper: "tamper";
         problem: "problem";
-        light: "light";
-        switch: "switch";
+        power: "power";
         lock: "lock";
-        occupancy: "occupancy";
         garage: "garage";
-        power: "power";
-        "line-crossing": "line-crossing";
     }>>;
     audioLabels: zod.ZodArray<zod.ZodEnum<{
+        doorbell: "doorbell";
+        siren: "siren";
         glass_break: "glass_break";
         scream: "scream";
         gunshot: "gunshot";
         alarm: "alarm";
-        siren: "siren";
         smoke_alarm: "smoke_alarm";
-        doorbell: "doorbell";
         speaking: "speaking";
         dog_bark: "dog_bark";
         baby_cry: "baby_cry";

package/dist/server/src/camera/decoder/detection-coordinator.d.ts

@@ -42,6 +42,9 @@ export declare class DetectionCoordinator {
     private readonly platesSeen;
     private readonly classifierLabels;
     private readonly feedingSensors;
+    private readonly witnessSensors;
+    private readonly witnessSeen;
+    private readonly heldMoments;
     private readonly dwell;
     private readonly privacy;
     private readonly perf;
@@ -74,6 +77,7 @@ export declare class DetectionCoordinator {
     get detectionSettings(): CameraDetectionSettings;
     getPerfSnapshot(): FrameWorkerPerfSnapshot;
     resetPerf(): void;
+    private collectDecodeStats;
     pauseForBenchmark(paused: boolean): void;
     runObjectBenchmark(iterations: number, concurrency: number): Promise<ObjectBenchmarkResult | null>;
     updateZoneConfig(zones: CameraZones): void;
@@ -105,6 +109,7 @@ export declare class DetectionCoordinator {
     private handleCascadeDeactivated;
     private handleEventEnded;
     private handleAudioLoopResult;
+    private recordWitness;
     private writeSensorProperties;
     private buildSnapshot;
     private pipelineZones;
@@ -135,6 +140,7 @@ export declare class DetectionCoordinator {
     private snapshotWillStartEvent;
     private attachTrainingFrame;
     private updateWorldSpans;
+    private holdSightingMoments;
     private captureMoments;
     private anchorMomentDetections;
     private captureExternalMoment;

package/dist/server/src/camera/decoder/detection-coordinator.js

@@ -40,6 +40,8 @@ const TRAINING_FRAME_MAX_WIDTH = 1280;
 const TRAINING_ATTRIBUTE_BONUS = 0.2;
 const TRAINING_FRAME_QUALITY = 80;
 const MOMENT_EVENTS = new Set(['objectEntered', 'objectWoke', 'objectRecovered', 'bestShotUpdated']);
+const WITNESS_WINDOW_MS = 3000;
+const HELD_MOMENT_MS = 4000;
 const MOMENT_MOVING_SPEED = 0.05;
 const MOMENT_ATTRIBUTE_MIN_AREA = 600;
 const DEFAULT_CASCADE_TIMEOUT = 10;
@@ -77,6 +79,10 @@ let DetectionCoordinator = class DetectionCoordinator {
     platesSeen = new Set();
     classifierLabels = new Map();
     feedingSensors = new Map();
+    witnessSensors = new Set();
+    // label -> when a witness last reported it, for the trace
+    witnessSeen = new Map();
+    heldMoments = new Map();
     dwell = new DwellManager();
     privacy;
     // debugging
@@ -223,6 +229,8 @@ let DetectionCoordinator = class DetectionCoordinator {
         return this.config.detectionSettings;
     }
     getPerfSnapshot() {
+        // decodes outside the loop (external reports, pictures) count as well
+        this.collectDecodeStats();
         const { timings, ...counters } = this.perf.snapshot();
         const detectors = {};
         for (const type of DETECTOR_METRIC_TYPES) {
@@ -247,8 +255,19 @@ let DetectionCoordinator = class DetectionCoordinator {
         };
     }
     resetPerf() {
+        // what was decoded before the reset must not land in the new period
+        this.frameSource.takeDecodeStats();
+        this.thumbnailer.takeHqDecodeStats();
         this.perf.reset();
     }
+    collectDecodeStats() {
+        const decode = this.frameSource.takeDecodeStats();
+        this.perf.decodeMs += decode.ms;
+        this.perf.decodedFrames += decode.frames;
+        const main = this.thumbnailer.takeHqDecodeStats();
+        this.perf.mainDecodeMs += main.ms;
+        this.perf.mainDecodedFrames += main.frames;
+    }
     pauseForBenchmark(paused) {
         this.benchmarkRunning = paused;
     }
@@ -334,6 +353,7 @@ let DetectionCoordinator = class DetectionCoordinator {
         }
     }
     async dispose() {
+        this.heldMoments.clear();
         await this.stopVideoLoop();
         await this.frameSource.stop();
         await this.audioLoop.stop();
@@ -349,6 +369,12 @@ let DetectionCoordinator = class DetectionCoordinator {
         this.currentDetectionState = {};
     }
     async onSensorAdded(sensor) {
+        if (sensor.role === 'witness') {
+            this.feedingSensors.delete(sensor.sensorId);
+            this.witnessSensors.add(sensor.sensorId);
+            return;
+        }
+        this.witnessSensors.delete(sensor.sensorId);
         if (DETECTION_SENSOR_TYPES.has(sensor.sensorType)) {
             this.feedingSensors.set(sensor.sensorId, sensor.sensorType);
         }
@@ -364,6 +390,7 @@ let DetectionCoordinator = class DetectionCoordinator {
         }
     }
     async onSensorRemoved(sensorId) {
+        this.witnessSensors.delete(sensorId);
         this.classifierLabels.delete(sensorId);
         const sensorType = this.feedingSensors.get(sensorId);
         if (sensorType === SensorType.Face)
@@ -392,7 +419,12 @@ let DetectionCoordinator = class DetectionCoordinator {
         this.ptzAutotracker.setCapabilities(sensorId, capabilities);
     }
     async reportSensorWrite(sensorId, sensorType, properties) {
-        // the registry only announces the plugin assigned for this type, everyone else reports into the void
+        if (sensorType === SensorType.Object && this.witnessSensors.has(sensorId)) {
+            this.recordWitness(properties);
+            return;
+        }
+        // the registry announces the plugin assigned for this type and the
+        // witnesses, everyone else reports into the void
         if (!this.feedingSensors.has(sensorId))
             return;
         // a detector reports its spec again once its models finished loading
@@ -677,6 +709,25 @@ let DetectionCoordinator = class DetectionCoordinator {
             ...(result.decibels !== undefined ? { decibels: result.decibels } : {}),
         });
     }
+    recordWitness(properties) {
+        if (properties.detected !== true)
+            return;
+        const detections = properties.detections ?? [];
+        const labels = new Set();
+        for (const detection of detections) {
+            const label = detection.label?.toLowerCase();
+            if (label && this.pipeline.objectLabelAllowed(label))
+                labels.add(label);
+        }
+        if (labels.size === 0)
+            return;
+        const at = Date.now();
+        for (const label of labels) {
+            this.pipeline.attest(label, at);
+            this.witnessSeen.set(label, at);
+        }
+        this.logger.trace(`[witness] ${[...labels].join(', ')}`);
+    }
     writeSensorProperties(sensorId, properties) {
         const msg = {
             sensorId,
@@ -1087,6 +1138,7 @@ let DetectionCoordinator = class DetectionCoordinator {
         let firstFrame = true;
         while (this.loopRunning) {
             const tickStart = Date.now();
+            let onMainStream = false;
             const snap = await this.frameSource.nextFrame(lastFrameId);
             if (!snap)
                 break; // source stopped
@@ -1115,6 +1167,7 @@ let DetectionCoordinator = class DetectionCoordinator {
                 // motion always reads the low stream: switching its input resolution
                 // would reset the background model on every transition
                 const analysis = await this.acquireAnalysisFrame(snap);
+                onMainStream = analysis.isMainStream;
                 // debugging
                 detectionRecord.setFrame(analysis.isMainStream ? 'main' : 'low', analysis.frame.width, analysis.frame.height, analysis.rtp, analysis.role);
                 try {
@@ -1147,9 +1200,7 @@ let DetectionCoordinator = class DetectionCoordinator {
                     // ignore
                 }
             }
-            const decode = this.frameSource.takeDecodeStats();
-            this.perf.decodeMs += decode.ms;
-            this.perf.decodedFrames += decode.frames;
+            this.collectDecodeStats();
             // activity, not stream choice: cameras without main-stream analysis still count as active
             if (this.worldSpans.size > 0 || this.eventManager.hasActiveSegment())
                 this.perf.activeTicks++;
@@ -1159,7 +1210,12 @@ let DetectionCoordinator = class DetectionCoordinator {
             const remaining = (this.mainStreamActive ? ACTIVE_TICK_MS : IDLE_TICK_MS) - (Date.now() - tickStart);
             if (remaining > 0)
                 await sleep(remaining);
-            this.perf.loopMs += Date.now() - tickStart;
+            const tickMs = Date.now() - tickStart;
+            this.perf.loopMs += tickMs;
+            if (onMainStream) {
+                this.perf.mainTicks++;
+                this.perf.mainLoopMs += tickMs;
+            }
         }
         await this.frameSource.detach();
         this.frameScaler.clearCache();
@@ -1167,12 +1223,9 @@ let DetectionCoordinator = class DetectionCoordinator {
     }
     async acquireAnalysisFrame(snap) {
         if (this.mainStreamActive) {
-            const t0 = Date.now();
             try {
                 const main = await this.thumbnailer.acquireHqFrame(0);
                 if (main) {
-                    this.perf.mainFrames++;
-                    this.perf.mainDecodeMs += Date.now() - t0;
                     return { frame: main.frame, scaler: main.scaler, isMainStream: true, rtp: main.rtp, role: this.thumbnailer.mainStreamRole };
                 }
             }
@@ -1185,12 +1238,9 @@ let DetectionCoordinator = class DetectionCoordinator {
     async acquireOpeningHqFrame() {
         if (!this.mainStreamAvailable)
             return undefined;
-        const t0 = Date.now();
         try {
             const main = await this.thumbnailer.acquireHqFrame(0);
             if (main) {
-                this.perf.mainFrames++;
-                this.perf.mainDecodeMs += Date.now() - t0;
                 return { frame: main.frame, scaler: main.scaler, isMainStream: true, rtp: main.rtp, role: this.thumbnailer.mainStreamRole };
             }
         }
@@ -1225,6 +1275,9 @@ let DetectionCoordinator = class DetectionCoordinator {
         trace.rtp = analysis.rtp;
         trace.src = analysis.role?.replace('-resolution', '');
         trace.attrs = traceAttributes(results);
+        const witness = [...this.witnessSeen].filter(([, at]) => Math.abs(trace.tMs - at) <= WITNESS_WINDOW_MS).map(([label]) => label);
+        if (witness.length > 0)
+            trace.witness = witness;
         // debugging
         detectionRecord.tick({ ...trace });
         return trace;
@@ -1259,8 +1312,10 @@ let DetectionCoordinator = class DetectionCoordinator {
             const motionDue = t0 - this.lastMotionAt >= MOTION_INTERVAL_MS - TICK_SLACK_MS;
             const motionScaleStart = Date.now();
             const motionFrame = motionDue ? await this.scaleForMotion(motionRawFrame) : undefined;
-            if (motionDue)
-                this.perf.scaleMs += Date.now() - motionScaleStart;
+            if (motionDue) {
+                this.perf.motionScaleMs += Date.now() - motionScaleStart;
+                this.perf.motionScaleCount++;
+            }
             if (!this.loopRunning)
                 return;
             if (motionFrame) {
@@ -1306,7 +1361,8 @@ let DetectionCoordinator = class DetectionCoordinator {
             if (localizeDue && this.localizerWanted) {
                 const scaleStart = Date.now();
                 const gray = await this.scaleForMotionInput(motionRawFrame);
-                this.perf.scaleMs += Date.now() - scaleStart;
+                this.perf.motionScaleMs += Date.now() - scaleStart;
+                this.perf.motionScaleCount++;
                 if (!this.loopRunning)
                     return;
                 if (gray)
@@ -1344,6 +1400,7 @@ let DetectionCoordinator = class DetectionCoordinator {
                     if (this.updateWorldSpans(pipelineResult) && !analysis.isMainStream) {
                         this.hqUpgrade = await this.acquireOpeningHqFrame();
                     }
+                    await this.holdSightingMoments(pipelineResult, this.hqUpgrade ?? analysis, t0);
                     await this.captureMoments(pipelineResult, this.hqUpgrade ?? analysis, t0);
                     // open spans and a lingering segment keep the cascade armed: the
                     // world can only observe absence or a reappearance while it still
@@ -1648,6 +1705,35 @@ let DetectionCoordinator = class DetectionCoordinator {
         }
         return opened;
     }
+    async holdSightingMoments(result, analysis, at) {
+        for (const [trackId, held] of this.heldMoments) {
+            if (at - held.capturedAt > HELD_MOMENT_MS)
+                this.heldMoments.delete(trackId);
+        }
+        for (const id of result.removed)
+            this.heldMoments.delete(id);
+        if (this.witnessSensors.size === 0)
+            return;
+        const confirmed = new Set(result.created);
+        for (const sighting of result.sightings) {
+            // confirmed in the same tick: the regular moment cuts this frame anyway
+            if (confirmed.has(sighting.trackId))
+                continue;
+            const box = { x: sighting.x, y: sighting.y, width: sighting.width, height: sighting.height };
+            const rendered = await this.renderMoment({ subject: box, base: box }, analysis);
+            if (!rendered)
+                continue;
+            const score = sighting.confidence * Math.sqrt(sighting.width * sighting.height);
+            this.heldMoments.set(sighting.trackId, {
+                strip: rendered.strip,
+                card: rendered.card,
+                capturedAt: at,
+                score,
+                rank: MOMENT_RANK_OBJECT,
+                stream: analysis.isMainStream ? 'main' : 'low',
+            });
+        }
+    }
     async captureMoments(result, analysis, at) {
         let subject;
         let bestScore = -1;
@@ -1672,6 +1758,16 @@ let DetectionCoordinator = class DetectionCoordinator {
         // one frame per tick, not one per object: they share the picture
         if (!subject)
             return;
+        // a track confirmed through a witness after its only sighting: the
+        // current frame no longer shows it, the picture held at the sighting does
+        const held = this.heldMoments.get(subject.trackId);
+        this.heldMoments.delete(subject.trackId);
+        if (held && trigger === 'objectEntered' && subject.lastSeenMs < at) {
+            if (!this.eventManager.wantsMoment(held.rank, held.score, held.stream, at))
+                return;
+            this.eventManager.offerMoment({ ...held, capturedAt: at, shownAt: held.capturedAt });
+            return;
+        }
         if (!this.eventManager.wantsMoment(MOMENT_RANK_OBJECT, bestScore, analysis.isMainStream ? 'main' : 'low', at))
             return;
         await this.captureMoment(subject, bestScore, trigger, result.tracked, analysis, at);
@@ -1921,7 +2017,9 @@ let DetectionCoordinator = class DetectionCoordinator {
             const perWindow = await Promise.all(windows.map((window) => this.detectInWindow(objectPlugin, analysis.frame, analysis.scaler, window, inputSpec)));
             this.perf.objectMs += Date.now() - inferStart;
             this.perf.objectCount++;
-            return mergeWindowDetections(perWindow.flat());
+            for (const window of perWindow)
+                this.perf.scaleMs += window.cropMs;
+            return mergeWindowDetections(perWindow.flatMap((window) => window.detections));
         }
         const scaleStart = Date.now();
         const objectFrame = await this.scaleForObject(analysis.frame, analysis.scaler);
@@ -1937,11 +2035,11 @@ let DetectionCoordinator = class DetectionCoordinator {
     async detectInWindow(plugin, frame, scaler, window, spec) {
         const scaleStart = Date.now();
         const cropped = await scaler.cropToSpec(frame, window, spec);
-        this.perf.scaleMs += Date.now() - scaleStart;
+        const cropMs = Date.now() - scaleStart;
         if (!cropped)
-            return [];
+            return { detections: [], cropMs };
         const result = await PromiseTimeout(plugin.proxy.detectObjects(scaler.toVideoFrameData(cropped.padded, 'model')), DETECT_TIMEOUT_MS, undefined, `Object detection timed out after ${DETECT_TIMEOUT_MS}ms`);
-        return FrameScaler.undoLetterbox(ensureDetectionBoxes(result.detections), cropped.geometry);
+        return { detections: FrameScaler.undoLetterbox(ensureDetectionBoxes(result.detections), cropped.geometry), cropMs };
     }
     async scaleFrameForPlugin(rawFrame, plugin, scaler = this.frameScaler) {
         const inputSpec = plugin.modelSpec?.input;
@@ -1990,7 +2088,6 @@ let DetectionCoordinator = class DetectionCoordinator {
             const found = boxed.filter((d) => reportedLabels.size === 0 || reportedLabels.has(d.label.toLowerCase()));
             if (found.length === 0)
                 return { detections: reported, assisted: false };
-            this.perf.objects += found.length;
             return { detections: found, assisted: true };
         }
         catch (error) {
@@ -2013,7 +2110,7 @@ let DetectionCoordinator = class DetectionCoordinator {
             if (windows.length > 0) {
                 detectionRecord.zoom({ kind: 'assist', anchors, windows });
                 const perWindow = await Promise.all(windows.map((window) => this.detectInWindow(assist, frame, scaler, window, inputSpec)));
-                return mergeWindowDetections(perWindow.flat());
+                return mergeWindowDetections(perWindow.flatMap((window) => window.detections));
             }
         }
         detectionRecord.tick({