@camstack/system 1.2.263 → 1.2.264

package/dist/builtins/camera-grid/index.js

@@ -3,7 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 require("../../chunk-Cek0wNdY.js");
-const require_dist = require("../../dist-6hiXbrNY.js");
+const require_dist = require("../../dist-BhYweLVr.js");
 let zod = require("zod");
 let _camstack_types_node = require("@camstack/types/node");
 let node_path = require("node:path");
@@ -197,6 +197,10 @@ var GridCameraDevice = class extends require_dist.BaseDevice {
 			getSnapshot: async ({ deviceId }) => activeRuntime().getSnapshot(deviceId),
 			invalidateCache: async () => {}
 		});
+		this.ctx.registerNativeCap(require_dist.motionCapability, {
+			getStatus: async ({ deviceId }) => activeRuntime().motionStatus(deviceId),
+			isDetected: async ({ deviceId }) => activeRuntime().motionStatus(deviceId).detected
+		});
 		this.markOnline(true);
 	}
 	catalog() {
@@ -400,6 +404,330 @@ function normalizeGridRows(raw, mintId) {
 	};
 }
 //#endregion
+//#region src/builtins/camera-grid/grid-activity-mirror.ts
+/**
+* What a grid says about ITSELF, kept from what its sources said.
+*
+* ## Why the grid answers at all
+*
+* A grid is a camera, and the viewer already knows how to light a camera: the
+* motion ring keys off `motion.on-motion-changed` filtered by `deviceId`, the
+* audio one off `pipeline.audio-inference-result`. So the grid does not need a
+* new channel, a new cap or a line of app code — it needs to answer those
+* questions about its own device id. The operator set both rules: motion is on
+* if AT LEAST ONE source has it, and the audio level is the LOUDEST of them.
+*
+* It is derived from the SOURCES' events and never from the composed picture.
+* Analysing the composite would be a second motion authority for cameras that
+* already have one, and a decode this addon does not pay today.
+*
+* ## The falling edge is the whole difficulty
+*
+* Bus events are telemetry and may be dropped (D8/D11). A lost `detected:
+* false` would leave a grid lit for ever, and the grid has no phase machine to
+* produce a falling edge of its own — a real camera's comes from the pipeline
+* runner, which a grid deliberately does not run.
+*
+* So a source's motion is remembered WITH ITS TIME and expires on its own. That
+* is D49's shape: in-memory state refreshed off the event path, never a gate
+* that re-reads something fallible in order to decide. A dropped clear costs a
+* ring that stays lit until the expiry instead of for ever, and a subject that
+* is genuinely still there keeps renewing it.
+*
+* The expiry is `MOTION_CLOSE_AFTER_MS`, imported and not re-spelled: it is the
+* system's one answer to "how long after the last push is a camera still
+* moving", and a second number here would be a second authority disagreeing
+* with the first on exactly the cameras that make up the grid.
+*/
+/**
+* How long an audio reading counts as current.
+*
+* The analyzer emits one per window per camera, so a source that has gone quiet
+* simply stops arriving — there is no "silence" event to wait for. Without a
+* window the loudest reading of the day would be the grid's level for ever.
+* Chosen to span several analysis windows so an ordinary gap does not blink the
+* level away, and to be far shorter than a person notices a stale ring.
+*/
+var AUDIO_FRESH_MS = 5e3;
+var GridActivityMirror = class {
+	motion = /* @__PURE__ */ new Map();
+	audio = /* @__PURE__ */ new Map();
+	lastDetectedAt = null;
+	/** One source's motion push. `detected: false` is as important as `true`. */
+	noteMotion(sourceDeviceId, detected, atMs) {
+		this.motion.set(sourceDeviceId, {
+			detected,
+			atMs
+		});
+		if (detected) this.lastDetectedAt = Math.max(this.lastDetectedAt ?? 0, atMs);
+	}
+	/** One source's audio window. `dbfs` is the level, on the analyzer's scale. */
+	noteAudio(sourceDeviceId, dbfs, atMs) {
+		this.audio.set(sourceDeviceId, {
+			dbfs,
+			atMs
+		});
+	}
+	/**
+	* Drop every source this grid no longer composes.
+	*
+	* A cell removed while its camera was moving would otherwise hold the grid
+	* lit until the expiry, for a picture the source is not even in.
+	*/
+	keepOnly(sourceDeviceIds) {
+		const keep = new Set(sourceDeviceIds);
+		const motionIds = Array.from(this.motion.keys());
+		const audioIds = Array.from(this.audio.keys());
+		for (const id of motionIds) if (!keep.has(id)) this.motion.delete(id);
+		for (const id of audioIds) if (!keep.has(id)) this.audio.delete(id);
+	}
+	/** At least one source moving, as of `nowMs`. */
+	motionAt(nowMs) {
+		let detected = false;
+		for (const state of this.motion.values()) {
+			if (!state.detected) continue;
+			if (nowMs - state.atMs > 15e3) continue;
+			detected = true;
+			break;
+		}
+		return {
+			detected,
+			lastDetectedAt: this.lastDetectedAt
+		};
+	}
+	/**
+	* The loudest CURRENT reading, or `null` when nothing fresh has been heard.
+	*
+	* Null and not `-Infinity`: "nobody has reported a level" is a different
+	* answer from "it is silent", and a number here would have the viewer draw a
+	* level for a grid whose sources are not being analysed at all.
+	*/
+	loudestAt(nowMs) {
+		let loudest = null;
+		for (const state of this.audio.values()) {
+			if (nowMs - state.atMs > AUDIO_FRESH_MS) continue;
+			if (loudest === null || state.dbfs > loudest) loudest = state.dbfs;
+		}
+		return loudest;
+	}
+};
+//#endregion
+//#region src/builtins/camera-grid/grid-detection-mapping.ts
+/**
+* Where this detection lands on the canvas — once per cell that shows it.
+*
+* Empty is a real answer: the subject is in a part of the source this grid does
+* not display, or the frame arrived with no size to measure against. Neither is
+* a reason to guess.
+*/
+function mapDetectionToCanvas(input) {
+	const { width: frameW, height: frameH } = input.sourceFrame;
+	if (frameW <= 0 || frameH <= 0) return [];
+	const left = input.bbox.x / frameW;
+	const top = input.bbox.y / frameH;
+	const right = (input.bbox.x + input.bbox.width) / frameW;
+	const bottom = (input.bbox.y + input.bbox.height) / frameH;
+	const out = [];
+	for (const { source, cell } of input.cells) {
+		if (source.width <= 0 || source.height <= 0) continue;
+		const l = Math.max(left, source.x);
+		const t = Math.max(top, source.y);
+		const r = Math.min(right, source.x + source.width);
+		const b = Math.min(bottom, source.y + source.height);
+		if (r <= l || b <= t) continue;
+		const cx = (l - source.x) / source.width;
+		const cy = (t - source.y) / source.height;
+		const cw = (r - l) / source.width;
+		const ch = (b - t) / source.height;
+		out.push({
+			x: (cell.x + cx * cell.width) * input.canvas.width,
+			y: (cell.y + cy * cell.height) * input.canvas.height,
+			width: cw * cell.width * input.canvas.width,
+			height: ch * cell.height * input.canvas.height
+		});
+	}
+	return out;
+}
+//#endregion
+//#region src/builtins/camera-grid/grid-activity.ts
+/**
+* The grid's own motion / audio / detection, forwarded from its sources.
+*
+* ## Why the grid speaks a camera's language instead of a new one
+*
+* The operator asked for the grid's tile to light up in the viewer exactly as a
+* camera's card does, with NO app change. The app already knows how: it filters
+* `motion.on-motion-changed` by `deviceId` for the motion ring,
+* `pipeline.audio-inference-result` for the audio one, and `detection.result`
+* for the detection one. So the grid answers those three questions about its
+* own device id, in the same shapes. Nothing new is invented, and nothing in
+* the viewer is touched.
+*
+* The rules are the operator's: motion if AT LEAST ONE source has it, and the
+* LOUDEST source's level for audio.
+*
+* ## What speaking a camera's language costs, and why it is safe here
+*
+* Those categories have other listeners, and emitting on them makes the grid a
+* motion source for the whole system. Checked, one by one, before shipping:
+* the recorder's event capture, the HomeKit and Alexa exports and the Home
+* Assistant export are all per-device and do nothing until an operator enables
+* them for this camera — and if an operator DOES export a grid to HomeKit, a
+* grid reporting motion is correct, not a surprise.
+*
+* The one listener with no gate of its own was `pipeline-analytics`, which
+* would have opened a motion EPISODE per grid, duplicating the rows its sources
+* already write. Its gate turned out to be the `pipeline-analytics` WRAPPER
+* BINDING, so the answer is the one the operator gave: a derived camera is
+* created with the analytics wrappers OFF (`grid-analytics-defaults.ts`).
+* That is a binding, not a new flag, so an operator who wants a grid analysed
+* can simply turn it back on.
+*
+* ## Detection carries boxes whether or not anyone wanted them
+*
+* `detection.result` is the same event the viewer draws BOXES from, so a grid
+* that reports detections reports boxes. Sending the source's own pixel box
+* would draw it against the composed canvas at confidently wrong coordinates,
+* so every box is carried through the cell geometry first
+* (`grid-detection-mapping.ts`) and lands where the subject actually is.
+*/
+/**
+* One mirror per grid, and the emission that follows an update.
+*
+* Deliberately NOT one mirror per source: the question is always "is THIS grid
+* lit", and a source shared by two grids answers it twice, differently, because
+* the other cells differ.
+*/
+var GridActivityForwarder = class {
+	deps;
+	mirrors = /* @__PURE__ */ new Map();
+	constructor(deps) {
+		this.deps = deps;
+	}
+	/** A source camera's motion push. */
+	onSourceMotion(sourceDeviceId, detected, atMs) {
+		for (const grid of this.deps.gridsForSource(sourceDeviceId)) {
+			const mirror = this.mirrorFor(grid);
+			const before = mirror.motionAt(atMs).detected;
+			mirror.noteMotion(sourceDeviceId, detected, atMs);
+			const after = mirror.motionAt(atMs);
+			if (after.detected === before) continue;
+			this.emitMotion(grid.deviceId, after, atMs);
+		}
+	}
+	/** A source camera's audio window. */
+	onSourceAudio(sourceDeviceId, dbfs, atMs) {
+		for (const grid of this.deps.gridsForSource(sourceDeviceId)) {
+			const mirror = this.mirrorFor(grid);
+			mirror.noteAudio(sourceDeviceId, dbfs, atMs);
+			const loudest = mirror.loudestAt(atMs);
+			if (loudest === null) continue;
+			this.emitAudio(grid.deviceId, loudest, atMs);
+		}
+	}
+	/** A source camera's detection frame, with its boxes in SOURCE pixels. */
+	onSourceDetections(frame) {
+		for (const grid of this.deps.gridsForSource(frame.deviceId)) {
+			const cells = grid.cellsForSource(frame.deviceId);
+			if (cells.length === 0) continue;
+			const detections = [];
+			for (const detection of frame.detections) for (const bbox of mapDetectionToCanvas({
+				bbox: detection.bbox,
+				sourceFrame: {
+					width: frame.width,
+					height: frame.height
+				},
+				canvas: grid.canvas,
+				cells
+			})) {
+				const { refinedBbox: _refined, mask: _mask, ...rest } = detection;
+				detections.push({
+					...rest,
+					bbox
+				});
+			}
+			if (detections.length === 0) continue;
+			this.emitDetections(grid, frame, detections);
+		}
+	}
+	/** The grid's own motion answer, for `motion.getStatus`. */
+	motionStatusFor(deviceId, nowMs) {
+		return this.mirrors.get(deviceId)?.motionAt(nowMs) ?? {
+			detected: false,
+			lastDetectedAt: null
+		};
+	}
+	/** Drop the mirror of a grid that no longer exists. */
+	forget(deviceId) {
+		this.mirrors.delete(deviceId);
+	}
+	mirrorFor(grid) {
+		let mirror = this.mirrors.get(grid.deviceId);
+		if (mirror === void 0) {
+			mirror = new GridActivityMirror();
+			this.mirrors.set(grid.deviceId, mirror);
+		}
+		mirror.keepOnly(grid.sourceDeviceIds);
+		return mirror;
+	}
+	source(deviceId) {
+		return {
+			type: "device",
+			id: deviceId,
+			addonId: this.deps.addonId,
+			deviceId
+		};
+	}
+	emitMotion(deviceId, state, atMs) {
+		const payload = {
+			deviceId,
+			detected: state.detected,
+			timestamp: atMs,
+			source: "onboard"
+		};
+		this.deps.eventBus.emit(require_dist.createEvent(require_dist.EventCategory.MotionOnMotionChanged, this.source(deviceId), payload));
+		this.deps.logger.debug("camera grid: motion forwarded", {
+			tags: { deviceId },
+			meta: { detected: state.detected }
+		});
+	}
+	emitAudio(deviceId, dbfs, atMs) {
+		const payload = {
+			deviceId,
+			frame: {
+				kind: "audio-window",
+				windowId: `grid-${String(deviceId)}-${String(atMs)}`,
+				deviceId,
+				timestamp: atMs,
+				startMs: atMs,
+				endMs: atMs,
+				level: {
+					rms: 0,
+					dbfs
+				},
+				detections: []
+			},
+			nodeId: "hub"
+		};
+		this.deps.eventBus.emit(require_dist.createEvent(require_dist.EventCategory.PipelineAudioInferenceResult, this.source(deviceId), payload));
+	}
+	emitDetections(grid, sourceFrame, detections) {
+		const payload = {
+			frame: {
+				kind: "frame",
+				frameId: `grid-${String(grid.deviceId)}-${sourceFrame.frameId}`,
+				deviceId: grid.deviceId,
+				timestamp: sourceFrame.timestamp,
+				width: grid.canvas.width,
+				height: grid.canvas.height,
+				detections
+			},
+			analysisResults: []
+		};
+		this.deps.eventBus.emit(require_dist.createEvent(require_dist.EventCategory.DetectionResult, this.source(grid.deviceId), payload));
+	}
+};
+//#endregion
 //#region src/builtins/camera-grid/grid-wire-format.ts
 /** What the relay answers with, and what the sampler must demux. */
 var GRID_WIRE_CONTENT_TYPE = "video/x-flv";
@@ -1402,11 +1730,14 @@ var GridStreamSession = class {
 * for a grid must win, and a reconcile that re-asserted every pass would silently
 * overrule them once a minute.
 */
-var GRID_SILENCED_CAP_NAMES = [
-	"motion-detection",
-	require_dist.DETECTION_PIPELINE_CAP_NAME,
-	require_dist.AUDIO_ANALYSIS_CAP_NAME
-];
+/**
+* The list lives in `@camstack/types` now, and this is an alias rather than a
+* second copy. There WERE two — this one and the Terminal addon's — and they
+* had drifted: neither named `pipeline-analytics`, the one cap with no gate of
+* its own, which is what a grid forwarding its sources' motion would have used
+* to write a duplicate motion episode per event.
+*/
+var GRID_SILENCED_CAP_NAMES = require_dist.DERIVED_CAMERA_SILENCED_CAP_NAMES;
 /**
 * Resolve the addon currently providing `capName` for this device, from the
 * device's OWN bindings. `listBindableCapsForDeviceType` answers for the device
@@ -1783,6 +2114,7 @@ var CameraGridAddon = class extends require_dist.BaseAddon {
 	* — that only changes when an operator changes it.
 	*/
 	planByInstanceId = /* @__PURE__ */ new Map();
+	activity = null;
 	snapshots = null;
 	frameSampler = null;
 	ffmpegBinaryPath = "ffmpeg";
@@ -1811,11 +2143,29 @@ var CameraGridAddon = class extends require_dist.BaseAddon {
 				sampleFrame: async (session) => this.sampleFrame(session),
 				store: new GridLastFrameFileStore({ dataDir: this.ctx.dataDir })
 			});
+			this.activity = new GridActivityForwarder({
+				eventBus: this.ctx.eventBus,
+				logger: this.ctx.logger.child("activity"),
+				addonId: this.ctx.id,
+				gridsForSource: (sourceDeviceId) => this.gridsForSource(sourceDeviceId),
+				now: () => Date.now()
+			});
+			this.subscribeSourceActivity();
 			installGridCameraRuntime({
 				descriptorsFor: (instanceId) => this.descriptorsFor(instanceId),
 				getLayout: (deviceId) => this.gridViewFor(deviceId),
 				saveLayout: async (patch) => this.saveGridLayout(patch),
-				getSnapshot: async (deviceId) => this.getSnapshot(deviceId)
+				getSnapshot: async (deviceId) => this.getSnapshot(deviceId),
+				motionStatus: (deviceId) => {
+					const state = this.activity?.motionStatusFor(deviceId, Date.now()) ?? {
+						detected: false,
+						lastDetectedAt: null
+					};
+					return {
+						...state,
+						autoClearAfterMs: state.detected ? require_dist.MOTION_CLOSE_AFTER_MS : null
+					};
+				}
 			});
 			await this.reconcile().catch((error) => {
 				this.ctx.logger.warn("camera grid: initial reconciliation failed — will retry", { meta: { error: require_dist.errMsg(error) } });
@@ -1952,6 +2302,64 @@ var CameraGridAddon = class extends require_dist.BaseAddon {
 		}
 	}
 	/**
+	* Listen to the SOURCES, so the grid can say the same things about itself.
+	*
+	* Filtered by source id inside the handler rather than by subscribing per
+	* camera: the bus filter is per category, the set of sources changes whenever
+	* an operator drags a cell, and a per-camera subscription would have to be
+	* torn down and rebuilt on every layout save.
+	*
+	* Every handler is TOTAL — a malformed payload is ignored, never thrown out
+	* of. These are telemetry events on a shared bus (D8/D11), and a throw here
+	* would take the grid's forwarding down for every grid because one camera
+	* emitted something unexpected.
+	*/
+	subscribeSourceActivity() {
+		this.subscribe({ category: require_dist.EventCategory.MotionOnMotionChanged }, (event) => {
+			const data = event.data;
+			if (typeof data.deviceId !== "number" || typeof data.detected !== "boolean") return;
+			const at = typeof data.timestamp === "number" ? data.timestamp : Date.now();
+			this.activity?.onSourceMotion(data.deviceId, data.detected, at);
+		});
+		this.subscribe({ category: require_dist.EventCategory.PipelineAudioInferenceResult }, (event) => {
+			const data = event.data;
+			const dbfs = data.frame?.level?.dbfs;
+			if (typeof data.deviceId !== "number" || typeof dbfs !== "number") return;
+			this.activity?.onSourceAudio(data.deviceId, dbfs, Date.now());
+		});
+		this.subscribe({ category: require_dist.EventCategory.DetectionResult }, (event) => {
+			const frame = event.data.frame;
+			if (frame === void 0 || frame.kind !== "frame") return;
+			this.activity?.onSourceDetections(frame);
+		});
+	}
+	/**
+	* Which grids show this camera. Empty for the overwhelming majority of
+	* events, which is why it is the FIRST thing every handler asks.
+	*/
+	gridsForSource(sourceDeviceId) {
+		const targets = [];
+		for (const [instanceId, deviceId] of this.deviceIdByInstanceId) {
+			const instance = this.instanceById(instanceId);
+			if (!instance || !instance.enabled) continue;
+			if (sourceDeviceId === deviceId) continue;
+			if (instance.cells.filter((cell) => cell.deviceId === sourceDeviceId).length === 0) continue;
+			targets.push({
+				deviceId,
+				canvas: {
+					width: instance.width,
+					height: instance.height
+				},
+				cellsForSource: (id) => instance.cells.filter((cell) => cell.deviceId === id).map((cell) => ({
+					source: cell.source,
+					cell: cell.cell
+				})),
+				sourceDeviceIds: [...new Set(instance.cells.map((cell) => cell.deviceId))]
+			});
+		}
+		return targets;
+	}
+	/**
 	* Which stream each grid reads each of its sources at, asked of the BROKER.
 	*
 	* `listAllProfileSlots` is the one authority on "does 615 have a low
@@ -2135,6 +2543,7 @@ var CameraGridAddon = class extends require_dist.BaseAddon {
 		}
 		for (const instanceId of [...this.deviceIdByInstanceId.keys()]) {
 			if (live.has(instanceId)) continue;
+			this.activity?.forget(this.deviceIdByInstanceId.get(instanceId) ?? 0);
 			this.deviceIdByInstanceId.delete(instanceId);
 			this.planByInstanceId.delete(instanceId);
 		}