@camstack/addon-pipeline 1.1.32 → 1.1.34

package/dist/{frame-ring-sink-sY-8XUsH.mjs → frame-ring-sink-1aLGcNNf.mjs}

@@ -1,8 +1,11 @@
-import { d as HWACCEL_OPTIONS, p as RingBuffer } from "./dist-DjuGmyG9.mjs";
+import { d as HWACCEL_OPTIONS, p as RingBuffer } from "./dist-CfSORkv2.mjs";
 import { FrameRingWriter, MIN_RING_SLOTS, computeSegmentSize, computeSlotByteLength, createSegment, deriveSlotCount } from "@camstack/shm-ring";
 //#region src/shared/decoder-backend-keys.ts
-/** Built-in default when a node has no selection — the subprocess decoder. */
-var DEFAULT_DECODER_BACKEND = "ffmpeg";
+/** Built-in default when a node has no selection — the in-process node-av
+* decoder. node-av is the standing default everywhere; the ffmpeg subprocess
+* decoder is an explicit opt-in fallback only. A stale/failed settings read at
+* boot therefore resolves to node-av (never leaves the node with no decoder). */
+var DEFAULT_DECODER_BACKEND = "nodeav";
 /** Narrow an unknown settings value to a {@link DecoderBackend}, else `null`. */
 function parseDecoderBackend(value) {
 	return value === "ffmpeg" || value === "nodeav" ? value : null;
@@ -65,9 +68,13 @@ function normalizeDecoderNodeId(rawNodeId) {
 * original bug), the raw settings-store cap, or any custom side channel.
 *
 * Resolution: the node's scoped value → the built-in default
-* {@link DEFAULT_DECODER_BACKEND} (`'ffmpeg'`). There is deliberately NO
+* {@link DEFAULT_DECODER_BACKEND} (`'nodeav'` — node-av is primary everywhere;
+* ffmpeg is an explicit opt-in fallback only). There is deliberately NO
 * bare-key fallback (see `decoder-backend-keys.ts`), and any read failure
-* resolves to the default so the safe backend still comes up.
+* resolves to the default so a decoder still comes up — and, because the
+* default IS the primary backend, a stale/failed read can never leave the node
+* with NO decoder (the old `'ffmpeg'` default made node-av stand down on a
+* missed read → both addons down).
 *
 * ## Switching backends
 *
@@ -100,44 +107,87 @@ function pickDecoderBackendFromSettings(view) {
 	if (view === null) return DEFAULT_DECODER_BACKEND;
 	for (const section of view.sections) for (const entry of section.fields) {
 		if (!isHydratedField(entry) || entry.key !== "backend") continue;
-		return parseDecoderBackend(entry.value) ?? "ffmpeg";
+		return parseDecoderBackend(entry.value) ?? "nodeav";
 	}
 	return DEFAULT_DECODER_BACKEND;
 }
 /**
-* Resolve the decoder backend this node should run. Called by BOTH decoder
-* addons at the start of `onInitialize`; the addon whose backend is NOT
-* selected registers nothing.
+* Resolve the OWNER addon's (`decoder-ffmpeg`) own per-node backend from its
+* ALREADY-PROJECTED global store — the store `BaseAddon.resolveGlobalStore`
+* returns, where the `perNode` `backend` field carries THIS node's value on
+* its bare key. The owner MUST use this instead of {@link resolveDecoderBackend}:
+* routing `addonSettings.getGlobalSettings({addonId:'decoder-ffmpeg'})` back to
+* itself during its OWN `onInitialize` DEADLOCKS (the addon is not "loaded" on
+* the node until init completes, but init is blocked on the read) → the read
+* throws `transport-failed (addon not loaded)` → it silently defaults to the
+* built-in default and mis-decides its own registration (e.g. an explicitly
+* selected `ffmpeg` fallback would never come up). Reading its own store is
+* local, race-free, and has no deadlock.
+*/
+function resolveOwnDecoderBackend(projectedGlobalStore) {
+	return parseDecoderBackend(projectedGlobalStore["backend"]) ?? "nodeav";
+}
+/** Transient transport/settings-store fingerprints worth retrying on. */
+function isTransientSettingsError(message) {
+	return /not routable/i.test(message) || /not loaded/i.test(message) || /transport-failed/i.test(message) || /not connected/i.test(message) || /provider not available/i.test(message) || /SqliteSettingsBackend not initialized/i.test(message);
+}
+/**
+* Resolve the decoder backend a NON-OWNER addon (`decoder-nodeav`) should run,
+* by reading the OWNER's (`decoder-ffmpeg`) hub-central per-node `backend`.
 *
-* Fails safe: no api surface, a read error, or a null payload (owner not
-* answering yet) resolves to {@link DEFAULT_DECODER_BACKEND} — the default
-* backend still registers, and the non-default one stands down (never both).
+* The read routes to the owner addon's child runner; during a simultaneous
+* (re)start the owner may not be up yet → a transient `transport-failed (addon
+* not loaded)`. Immediately defaulting here would ignore an explicit `ffmpeg`
+* selection (the node would silently run the node-av default instead). So retry
+* on the transient fingerprints with a bounded budget (mirrors
+* `BaseAddon.readAddonStoreWithRetry`) until the owner answers; only a
+* persistent failure falls back to {@link DEFAULT_DECODER_BACKEND}.
+*
+* The OWNER addon must NOT call this (it would self-route + deadlock) — it uses
+* {@link resolveOwnDecoderBackend} against its own store instead.
 */
 async function resolveDecoderBackend(api, nodeId, logger) {
 	if (!api) {
 		logger.warn("decoder-backend: no api surface — using default backend", { meta: { default: DEFAULT_DECODER_BACKEND } });
 		return DEFAULT_DECODER_BACKEND;
 	}
-	try {
-		const view = await api.addonSettings.getGlobalSettings.query({
-			addonId: DECODER_OWNER_ADDON_ID,
-			nodeId: normalizeDecoderNodeId(nodeId)
-		});
-		if (view === null) {
-			logger.warn("decoder-backend: owner settings unavailable — using default backend", { meta: {
-				default: DEFAULT_DECODER_BACKEND,
-				owner: DECODER_OWNER_ADDON_ID
-			} });
-			return DEFAULT_DECODER_BACKEND;
+	const normalized = normalizeDecoderNodeId(nodeId);
+	const delaysMs = [
+		150,
+		350,
+		600,
+		900,
+		1200
+	];
+	let lastErr;
+	for (let attempt = 0; attempt <= delaysMs.length; attempt++) {
+		try {
+			const view = await api.addonSettings.getGlobalSettings.query({
+				addonId: DECODER_OWNER_ADDON_ID,
+				nodeId: normalized
+			});
+			if (view !== null) return pickDecoderBackendFromSettings(view);
+			lastErr = /* @__PURE__ */ new Error("owner settings unavailable (null)");
+		} catch (err) {
+			lastErr = err;
+			const msg = err instanceof Error ? err.message : String(err);
+			if (!isTransientSettingsError(msg)) {
+				logger.warn("decoder-backend: settings read failed — using default backend", { meta: {
+					default: DEFAULT_DECODER_BACKEND,
+					error: msg
+				} });
+				return DEFAULT_DECODER_BACKEND;
+			}
 		}
-		return pickDecoderBackendFromSettings(view);
-	} catch (err) {
-		logger.warn("decoder-backend: settings read failed — using default backend", { meta: {
-			default: DEFAULT_DECODER_BACKEND,
-			error: err instanceof Error ? err.message : String(err)
-		} });
-		return DEFAULT_DECODER_BACKEND;
+		if (attempt === delaysMs.length) break;
+		await new Promise((resolve) => setTimeout(resolve, delaysMs[attempt]));
 	}
+	logger.warn("decoder-backend: owner settings unavailable after retries — using default backend", { meta: {
+		default: DEFAULT_DECODER_BACKEND,
+		owner: DECODER_OWNER_ADDON_ID,
+		error: lastErr instanceof Error ? lastErr.message : String(lastErr)
+	} });
+	return DEFAULT_DECODER_BACKEND;
 }
 /**
 * Pure selection of the owner's `hwaccel` field from an already-read hydrated
@@ -504,4 +554,4 @@ var DecoderFrameRingSink = class {
 	}
 };
 //#endregion
-export { resolveDecoderBackend as a, NotifyingRingBuffer as i, RING_BUDGET_MB as n, resolveDecoderHwAccel as o, makeSegmentName as r, DEFAULT_DECODER_BACKEND as s, DecoderFrameRingSink as t };
+export { resolveDecoderBackend as a, DEFAULT_DECODER_BACKEND as c, NotifyingRingBuffer as i, RING_BUDGET_MB as n, resolveDecoderHwAccel as o, makeSegmentName as r, resolveOwnDecoderBackend as s, DecoderFrameRingSink as t };

package/dist/{frame-ring-sink-DvdhCFr3.js → frame-ring-sink-CvlcAUOu.js}

@@ -1,8 +1,11 @@
-const require_dist = require("./dist-Cwc0TUQr.js");
+const require_dist = require("./dist-BrIE85BG.js");
 let _camstack_shm_ring = require("@camstack/shm-ring");
 //#region src/shared/decoder-backend-keys.ts
-/** Built-in default when a node has no selection — the subprocess decoder. */
-var DEFAULT_DECODER_BACKEND = "ffmpeg";
+/** Built-in default when a node has no selection — the in-process node-av
+* decoder. node-av is the standing default everywhere; the ffmpeg subprocess
+* decoder is an explicit opt-in fallback only. A stale/failed settings read at
+* boot therefore resolves to node-av (never leaves the node with no decoder). */
+var DEFAULT_DECODER_BACKEND = "nodeav";
 /** Narrow an unknown settings value to a {@link DecoderBackend}, else `null`. */
 function parseDecoderBackend(value) {
 	return value === "ffmpeg" || value === "nodeav" ? value : null;
@@ -65,9 +68,13 @@ function normalizeDecoderNodeId(rawNodeId) {
 * original bug), the raw settings-store cap, or any custom side channel.
 *
 * Resolution: the node's scoped value → the built-in default
-* {@link DEFAULT_DECODER_BACKEND} (`'ffmpeg'`). There is deliberately NO
+* {@link DEFAULT_DECODER_BACKEND} (`'nodeav'` — node-av is primary everywhere;
+* ffmpeg is an explicit opt-in fallback only). There is deliberately NO
 * bare-key fallback (see `decoder-backend-keys.ts`), and any read failure
-* resolves to the default so the safe backend still comes up.
+* resolves to the default so a decoder still comes up — and, because the
+* default IS the primary backend, a stale/failed read can never leave the node
+* with NO decoder (the old `'ffmpeg'` default made node-av stand down on a
+* missed read → both addons down).
 *
 * ## Switching backends
 *
@@ -100,44 +107,87 @@ function pickDecoderBackendFromSettings(view) {
 	if (view === null) return DEFAULT_DECODER_BACKEND;
 	for (const section of view.sections) for (const entry of section.fields) {
 		if (!isHydratedField(entry) || entry.key !== "backend") continue;
-		return parseDecoderBackend(entry.value) ?? "ffmpeg";
+		return parseDecoderBackend(entry.value) ?? "nodeav";
 	}
 	return DEFAULT_DECODER_BACKEND;
 }
 /**
-* Resolve the decoder backend this node should run. Called by BOTH decoder
-* addons at the start of `onInitialize`; the addon whose backend is NOT
-* selected registers nothing.
+* Resolve the OWNER addon's (`decoder-ffmpeg`) own per-node backend from its
+* ALREADY-PROJECTED global store — the store `BaseAddon.resolveGlobalStore`
+* returns, where the `perNode` `backend` field carries THIS node's value on
+* its bare key. The owner MUST use this instead of {@link resolveDecoderBackend}:
+* routing `addonSettings.getGlobalSettings({addonId:'decoder-ffmpeg'})` back to
+* itself during its OWN `onInitialize` DEADLOCKS (the addon is not "loaded" on
+* the node until init completes, but init is blocked on the read) → the read
+* throws `transport-failed (addon not loaded)` → it silently defaults to the
+* built-in default and mis-decides its own registration (e.g. an explicitly
+* selected `ffmpeg` fallback would never come up). Reading its own store is
+* local, race-free, and has no deadlock.
+*/
+function resolveOwnDecoderBackend(projectedGlobalStore) {
+	return parseDecoderBackend(projectedGlobalStore["backend"]) ?? "nodeav";
+}
+/** Transient transport/settings-store fingerprints worth retrying on. */
+function isTransientSettingsError(message) {
+	return /not routable/i.test(message) || /not loaded/i.test(message) || /transport-failed/i.test(message) || /not connected/i.test(message) || /provider not available/i.test(message) || /SqliteSettingsBackend not initialized/i.test(message);
+}
+/**
+* Resolve the decoder backend a NON-OWNER addon (`decoder-nodeav`) should run,
+* by reading the OWNER's (`decoder-ffmpeg`) hub-central per-node `backend`.
+*
+* The read routes to the owner addon's child runner; during a simultaneous
+* (re)start the owner may not be up yet → a transient `transport-failed (addon
+* not loaded)`. Immediately defaulting here would ignore an explicit `ffmpeg`
+* selection (the node would silently run the node-av default instead). So retry
+* on the transient fingerprints with a bounded budget (mirrors
+* `BaseAddon.readAddonStoreWithRetry`) until the owner answers; only a
+* persistent failure falls back to {@link DEFAULT_DECODER_BACKEND}.
 *
-* Fails safe: no api surface, a read error, or a null payload (owner not
-* answering yet) resolves to {@link DEFAULT_DECODER_BACKEND} — the default
-* backend still registers, and the non-default one stands down (never both).
+* The OWNER addon must NOT call this (it would self-route + deadlock) — it uses
+* {@link resolveOwnDecoderBackend} against its own store instead.
 */
 async function resolveDecoderBackend(api, nodeId, logger) {
 	if (!api) {
 		logger.warn("decoder-backend: no api surface — using default backend", { meta: { default: DEFAULT_DECODER_BACKEND } });
 		return DEFAULT_DECODER_BACKEND;
 	}
-	try {
-		const view = await api.addonSettings.getGlobalSettings.query({
-			addonId: DECODER_OWNER_ADDON_ID,
-			nodeId: normalizeDecoderNodeId(nodeId)
-		});
-		if (view === null) {
-			logger.warn("decoder-backend: owner settings unavailable — using default backend", { meta: {
-				default: DEFAULT_DECODER_BACKEND,
-				owner: DECODER_OWNER_ADDON_ID
-			} });
-			return DEFAULT_DECODER_BACKEND;
+	const normalized = normalizeDecoderNodeId(nodeId);
+	const delaysMs = [
+		150,
+		350,
+		600,
+		900,
+		1200
+	];
+	let lastErr;
+	for (let attempt = 0; attempt <= delaysMs.length; attempt++) {
+		try {
+			const view = await api.addonSettings.getGlobalSettings.query({
+				addonId: DECODER_OWNER_ADDON_ID,
+				nodeId: normalized
+			});
+			if (view !== null) return pickDecoderBackendFromSettings(view);
+			lastErr = /* @__PURE__ */ new Error("owner settings unavailable (null)");
+		} catch (err) {
+			lastErr = err;
+			const msg = err instanceof Error ? err.message : String(err);
+			if (!isTransientSettingsError(msg)) {
+				logger.warn("decoder-backend: settings read failed — using default backend", { meta: {
+					default: DEFAULT_DECODER_BACKEND,
+					error: msg
+				} });
+				return DEFAULT_DECODER_BACKEND;
+			}
 		}
-		return pickDecoderBackendFromSettings(view);
-	} catch (err) {
-		logger.warn("decoder-backend: settings read failed — using default backend", { meta: {
-			default: DEFAULT_DECODER_BACKEND,
-			error: err instanceof Error ? err.message : String(err)
-		} });
-		return DEFAULT_DECODER_BACKEND;
+		if (attempt === delaysMs.length) break;
+		await new Promise((resolve) => setTimeout(resolve, delaysMs[attempt]));
 	}
+	logger.warn("decoder-backend: owner settings unavailable after retries — using default backend", { meta: {
+		default: DEFAULT_DECODER_BACKEND,
+		owner: DECODER_OWNER_ADDON_ID,
+		error: lastErr instanceof Error ? lastErr.message : String(lastErr)
+	} });
+	return DEFAULT_DECODER_BACKEND;
 }
 /**
 * Pure selection of the owner's `hwaccel` field from an already-read hydrated
@@ -546,3 +596,9 @@ Object.defineProperty(exports, "resolveDecoderHwAccel", {
 		return resolveDecoderHwAccel;
 	}
 });
+Object.defineProperty(exports, "resolveOwnDecoderBackend", {
+	enumerable: true,
+	get: function() {
+		return resolveOwnDecoderBackend;
+	}
+});

package/dist/motion-wasm/index.js

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_dist = require("../dist-Cwc0TUQr.js");
+const require_dist = require("../dist-BrIE85BG.js");
 let _camstack_shm_ring = require("@camstack/shm-ring");
 let node_fs = require("node:fs");
 let node_path = require("node:path");

package/dist/motion-wasm/index.mjs

@@ -1,4 +1,4 @@
-import { A as motionDetectionCapability, T as evaluateZoneRules, V as BaseAddon, W as DeviceType, q as hydrateSchema } from "../dist-DjuGmyG9.mjs";
+import { A as motionDetectionCapability, T as evaluateZoneRules, V as BaseAddon, W as DeviceType, q as hydrateSchema } from "../dist-CfSORkv2.mjs";
 import { FrameRingReaderCache } from "@camstack/shm-ring";
 import { readFileSync } from "node:fs";
 import { join } from "node:path";

package/dist/pipeline-runner/index.js

@@ -2,8 +2,8 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_dist = require("../dist-Cwc0TUQr.js");
-const require_frame_handle_plane = require("../frame-handle-plane-DQNCTrpC.js");
+const require_dist = require("../dist-BrIE85BG.js");
+const require_frame_handle_plane = require("../frame-handle-plane-zMju9vmk.js");
 const require_hub_hostname = require("../hub-hostname-DAJXlOgV.js");
 let _camstack_shm_ring = require("@camstack/shm-ring");
 //#region src/pipeline-runner/bench-actions.ts
@@ -1409,6 +1409,55 @@ function toFrameInput(frame) {
 	};
 }
 /**
+* Convert a packed RGB24 `DecodedFrame` into a packed GRAY8 one using the
+* BT.601 luma weighting (Y = 0.299R + 0.587G + 0.114B, integer-approximated as
+* 77/150/29 over 256).
+*
+* This is what lets **sensor-triggered (onboard) motion share the detection
+* decode**: the gray the motion analyzer needs is just the luma of the
+* already-decoded detection `rgb` frame, so no second decoder is spun up. Far
+* cheaper than a full second decode (a per-pixel weighted sum vs. an entire
+* H.264/H.265 decode). Persistent (analyzer-only) motion keeps its own gray
+* decode on the sub stream and never hits this path.
+*/
+function rgbFrameToGrayFrame(frame) {
+	const rgb = frame.data;
+	const pixels = frame.width * frame.height;
+	const gray = Buffer.allocUnsafe(pixels);
+	for (let i = 0, j = 0; i < pixels; i++, j += 3) gray[i] = rgb[j] * 77 + rgb[j + 1] * 150 + rgb[j + 2] * 29 >> 8;
+	return {
+		data: gray,
+		width: frame.width,
+		height: frame.height,
+		format: "gray",
+		timestamp: frame.timestamp,
+		...frame.capturedAt !== void 0 ? { capturedAt: frame.capturedAt } : {}
+	};
+}
+/**
+* Decide where the motion analyzer reads frames from.
+*
+* - `sharedWithDetection` (onboard/sensor-triggered) AND detection actually
+*   runs (`detectionMode !== 'disabled'`) → ride the detection decode:
+*   `rgb` on the MAIN (`detectionStreamId`) stream, converted to gray. No
+*   second decoder — the `FrameHandlePlane` coalesces it onto detection's session.
+* - Otherwise (persistent analyzer, or detection disabled) → a dedicated
+*   `gray` decode on the SUB (`motionStreamId`) stream, exactly as before.
+*
+* Pure so the decision is unit-testable without the addon/broker.
+*/
+function resolveMotionFrameSource(config, sharedWithDetection) {
+	return sharedWithDetection && config.detectionMode !== "disabled" ? {
+		streamId: config.detectionStreamId,
+		format: "rgb",
+		shared: true
+	} : {
+		streamId: config.motionStreamId,
+		format: "gray",
+		shared: false
+	};
+}
+/**
 * Interval for periodic metric snapshot emission. ~1 Hz strikes the
 * balance between UI freshness (overlay phase / fps numbers feel live)
 * and bus traffic (one snapshot per attached camera + one per node
@@ -1911,6 +1960,12 @@ var PipelineRunnerAddon = class extends require_dist.BaseAddon {
 			}
 		});
 		if (this.attached.has(config.deviceId)) this.detachInternal(config.deviceId);
+		const attachment = {
+			config,
+			motionUnsubscribe: null,
+			detectionUnsubscribe: null
+		};
+		this.attached.set(config.deviceId, attachment);
 		runner.registerCamera(config.deviceId, {
 			detectionMode: config.detectionMode,
 			fps: config.detectionFps,
@@ -1918,12 +1973,6 @@ var PipelineRunnerAddon = class extends require_dist.BaseAddon {
 			occupancyRecheckSec: config.occupancyRecheckSec,
 			occupancyRecheckFrames: config.occupancyRecheckFrames
 		});
-		const attachment = {
-			config,
-			motionUnsubscribe: null,
-			detectionUnsubscribe: null
-		};
-		this.attached.set(config.deviceId, attachment);
 		if (config.motionSources.includes("analyzer")) attachment.motionUnsubscribe = await this.subscribeMotionFrames(config);
 		const stepsCount = config.steps?.length ?? 0;
 		const dispatch = stepsCount > 0 ? `runPipeline(${stepsCount}step${stepsCount === 1 ? "" : "s"})` : config.steps !== void 0 ? "skip(0steps)" : "runFrame(legacy)";
@@ -2013,10 +2062,10 @@ var PipelineRunnerAddon = class extends require_dist.BaseAddon {
 		if (!shouldStartOnboardAnalyzer(config)) return;
 		const log = this.ctx.logger.withTags({ deviceId });
 		if (detected && !this.onboardAnalyzerSubs.has(deviceId)) {
-			const unsub = await this.subscribeMotionFrames(config);
+			const unsub = await this.subscribeMotionFrames(config, { sharedWithDetection: true });
 			if (unsub) {
 				this.onboardAnalyzerSubs.set(deviceId, unsub);
-				log.debug("onboard-analyzer: opened motion-frame subscription");
+				log.debug("onboard-analyzer: opened motion-frame subscription (shared detection decode)");
 			}
 		}
 		const existing = this.onboardAnalyzerTeardownTimers.get(deviceId);
@@ -2140,7 +2189,21 @@ var PipelineRunnerAddon = class extends require_dist.BaseAddon {
 		this.remotePlanes.set(config.deviceId, plane);
 		return plane;
 	}
-	async subscribeMotionFrames(config) {
+	/**
+	* Subscribe the motion analyzer to decoded frames.
+	*
+	* Two modes:
+	* - **Persistent (default)** — a dedicated `gray` decode of the camera's
+	*   `motionStreamId` (the sub stream). Cheap, always-on; used when the SW
+	*   analyzer is the motion source (`motionSources` includes `'analyzer'`).
+	* - **Shared with detection** (`opts.sharedWithDetection`) — subscribes
+	*   `rgb` on `detectionStreamId` (the MAIN stream) so it rides the SAME
+	*   decoder session detection already uses (the `FrameHandlePlane` coalesces
+	*   same-format subscribers on a stream into ONE decode), then derives the
+	*   analyzer's `gray` from that rgb frame's luma. No second decoder. Used for
+	*   onboard/sensor-triggered motion, where a decode is already active.
+	*/
+	async subscribeMotionFrames(config, opts) {
 		const ctx = this.ctx;
 		const runner = this.runner;
 		if (!ctx || !runner) return null;
@@ -2150,18 +2213,23 @@ var PipelineRunnerAddon = class extends require_dist.BaseAddon {
 			log.warn("subscribeMotionFrames: this.ctx.api not available");
 			return null;
 		}
+		const src = resolveMotionFrameSource(config, opts?.sharedWithDetection === true);
+		const shared = src.shared;
+		const streamId = src.streamId;
 		const remote = this.remoteSourceFor(config);
 		return startFrameHandlePoller({
 			api,
-			brokerId: require_dist.makeSourceBrokerId(config.deviceId, config.motionStreamId),
-			format: "gray",
+			brokerId: require_dist.makeSourceBrokerId(config.deviceId, streamId),
+			format: src.format,
 			maxFps: config.motionFps,
-			tag: "motion",
+			tag: shared ? "motion-shared" : "motion",
 			logger: log,
 			ownNodeId: this.nodeId,
 			getRemoteFrame: (handle) => this.getRemoteFrame(handle),
-			...remote ? { source: remote.makeSource(config.motionStreamId) } : {},
-			onFrame: (frame, handle) => {
+			...remote ? { source: remote.makeSource(streamId) } : {},
+			onFrame: shared ? (frame) => {
+				runner.enqueueMotionFrame(config.deviceId, rgbFrameToGrayFrame(frame), void 0);
+			} : (frame, handle) => {
 				runner.enqueueMotionFrame(config.deviceId, frame, handle);
 			}
 		});
@@ -2588,4 +2656,6 @@ exports.PipelineTimingSampler = PipelineTimingSampler;
 exports.Semaphore = Semaphore;
 exports.customActions = pipelineRunnerBenchActions;
 exports.default = PipelineRunnerAddon;
+exports.resolveMotionFrameSource = resolveMotionFrameSource;
+exports.rgbFrameToGrayFrame = rgbFrameToGrayFrame;
 exports.shouldStartOnboardAnalyzer = shouldStartOnboardAnalyzer;

package/dist/pipeline-runner/index.mjs

@@ -1,5 +1,5 @@
-import { B as errMsg, C as defineCustomActions, G as EventCategory, K as createEvent, N as pipelineRunnerCapability, V as BaseAddon, Y as makeSourceBrokerId, b as customAction, et as _enum, it as lazy, j as nodePin, lt as string, nt as boolean, ot as number, st as object, tt as array } from "../dist-DjuGmyG9.mjs";
-import { t as FrameHandlePlane } from "../frame-handle-plane-Bkxz-TTD.mjs";
+import { B as errMsg, C as defineCustomActions, G as EventCategory, K as createEvent, N as pipelineRunnerCapability, V as BaseAddon, Y as makeSourceBrokerId, b as customAction, et as _enum, it as lazy, j as nodePin, lt as string, nt as boolean, ot as number, st as object, tt as array } from "../dist-CfSORkv2.mjs";
+import { t as FrameHandlePlane } from "../frame-handle-plane-C05rq9Zs.mjs";
 import { t as resolveHubHostname } from "../hub-hostname-cCknRYKj.mjs";
 import { FrameRingReaderCache } from "@camstack/shm-ring";
 //#region src/pipeline-runner/bench-actions.ts
@@ -1405,6 +1405,55 @@ function toFrameInput(frame) {
 	};
 }
 /**
+* Convert a packed RGB24 `DecodedFrame` into a packed GRAY8 one using the
+* BT.601 luma weighting (Y = 0.299R + 0.587G + 0.114B, integer-approximated as
+* 77/150/29 over 256).
+*
+* This is what lets **sensor-triggered (onboard) motion share the detection
+* decode**: the gray the motion analyzer needs is just the luma of the
+* already-decoded detection `rgb` frame, so no second decoder is spun up. Far
+* cheaper than a full second decode (a per-pixel weighted sum vs. an entire
+* H.264/H.265 decode). Persistent (analyzer-only) motion keeps its own gray
+* decode on the sub stream and never hits this path.
+*/
+function rgbFrameToGrayFrame(frame) {
+	const rgb = frame.data;
+	const pixels = frame.width * frame.height;
+	const gray = Buffer.allocUnsafe(pixels);
+	for (let i = 0, j = 0; i < pixels; i++, j += 3) gray[i] = rgb[j] * 77 + rgb[j + 1] * 150 + rgb[j + 2] * 29 >> 8;
+	return {
+		data: gray,
+		width: frame.width,
+		height: frame.height,
+		format: "gray",
+		timestamp: frame.timestamp,
+		...frame.capturedAt !== void 0 ? { capturedAt: frame.capturedAt } : {}
+	};
+}
+/**
+* Decide where the motion analyzer reads frames from.
+*
+* - `sharedWithDetection` (onboard/sensor-triggered) AND detection actually
+*   runs (`detectionMode !== 'disabled'`) → ride the detection decode:
+*   `rgb` on the MAIN (`detectionStreamId`) stream, converted to gray. No
+*   second decoder — the `FrameHandlePlane` coalesces it onto detection's session.
+* - Otherwise (persistent analyzer, or detection disabled) → a dedicated
+*   `gray` decode on the SUB (`motionStreamId`) stream, exactly as before.
+*
+* Pure so the decision is unit-testable without the addon/broker.
+*/
+function resolveMotionFrameSource(config, sharedWithDetection) {
+	return sharedWithDetection && config.detectionMode !== "disabled" ? {
+		streamId: config.detectionStreamId,
+		format: "rgb",
+		shared: true
+	} : {
+		streamId: config.motionStreamId,
+		format: "gray",
+		shared: false
+	};
+}
+/**
 * Interval for periodic metric snapshot emission. ~1 Hz strikes the
 * balance between UI freshness (overlay phase / fps numbers feel live)
 * and bus traffic (one snapshot per attached camera + one per node
@@ -1907,6 +1956,12 @@ var PipelineRunnerAddon = class extends BaseAddon {
 			}
 		});
 		if (this.attached.has(config.deviceId)) this.detachInternal(config.deviceId);
+		const attachment = {
+			config,
+			motionUnsubscribe: null,
+			detectionUnsubscribe: null
+		};
+		this.attached.set(config.deviceId, attachment);
 		runner.registerCamera(config.deviceId, {
 			detectionMode: config.detectionMode,
 			fps: config.detectionFps,
@@ -1914,12 +1969,6 @@ var PipelineRunnerAddon = class extends BaseAddon {
 			occupancyRecheckSec: config.occupancyRecheckSec,
 			occupancyRecheckFrames: config.occupancyRecheckFrames
 		});
-		const attachment = {
-			config,
-			motionUnsubscribe: null,
-			detectionUnsubscribe: null
-		};
-		this.attached.set(config.deviceId, attachment);
 		if (config.motionSources.includes("analyzer")) attachment.motionUnsubscribe = await this.subscribeMotionFrames(config);
 		const stepsCount = config.steps?.length ?? 0;
 		const dispatch = stepsCount > 0 ? `runPipeline(${stepsCount}step${stepsCount === 1 ? "" : "s"})` : config.steps !== void 0 ? "skip(0steps)" : "runFrame(legacy)";
@@ -2009,10 +2058,10 @@ var PipelineRunnerAddon = class extends BaseAddon {
 		if (!shouldStartOnboardAnalyzer(config)) return;
 		const log = this.ctx.logger.withTags({ deviceId });
 		if (detected && !this.onboardAnalyzerSubs.has(deviceId)) {
-			const unsub = await this.subscribeMotionFrames(config);
+			const unsub = await this.subscribeMotionFrames(config, { sharedWithDetection: true });
 			if (unsub) {
 				this.onboardAnalyzerSubs.set(deviceId, unsub);
-				log.debug("onboard-analyzer: opened motion-frame subscription");
+				log.debug("onboard-analyzer: opened motion-frame subscription (shared detection decode)");
 			}
 		}
 		const existing = this.onboardAnalyzerTeardownTimers.get(deviceId);
@@ -2136,7 +2185,21 @@ var PipelineRunnerAddon = class extends BaseAddon {
 		this.remotePlanes.set(config.deviceId, plane);
 		return plane;
 	}
-	async subscribeMotionFrames(config) {
+	/**
+	* Subscribe the motion analyzer to decoded frames.
+	*
+	* Two modes:
+	* - **Persistent (default)** — a dedicated `gray` decode of the camera's
+	*   `motionStreamId` (the sub stream). Cheap, always-on; used when the SW
+	*   analyzer is the motion source (`motionSources` includes `'analyzer'`).
+	* - **Shared with detection** (`opts.sharedWithDetection`) — subscribes
+	*   `rgb` on `detectionStreamId` (the MAIN stream) so it rides the SAME
+	*   decoder session detection already uses (the `FrameHandlePlane` coalesces
+	*   same-format subscribers on a stream into ONE decode), then derives the
+	*   analyzer's `gray` from that rgb frame's luma. No second decoder. Used for
+	*   onboard/sensor-triggered motion, where a decode is already active.
+	*/
+	async subscribeMotionFrames(config, opts) {
 		const ctx = this.ctx;
 		const runner = this.runner;
 		if (!ctx || !runner) return null;
@@ -2146,18 +2209,23 @@ var PipelineRunnerAddon = class extends BaseAddon {
 			log.warn("subscribeMotionFrames: this.ctx.api not available");
 			return null;
 		}
+		const src = resolveMotionFrameSource(config, opts?.sharedWithDetection === true);
+		const shared = src.shared;
+		const streamId = src.streamId;
 		const remote = this.remoteSourceFor(config);
 		return startFrameHandlePoller({
 			api,
-			brokerId: makeSourceBrokerId(config.deviceId, config.motionStreamId),
-			format: "gray",
+			brokerId: makeSourceBrokerId(config.deviceId, streamId),
+			format: src.format,
 			maxFps: config.motionFps,
-			tag: "motion",
+			tag: shared ? "motion-shared" : "motion",
 			logger: log,
 			ownNodeId: this.nodeId,
 			getRemoteFrame: (handle) => this.getRemoteFrame(handle),
-			...remote ? { source: remote.makeSource(config.motionStreamId) } : {},
-			onFrame: (frame, handle) => {
+			...remote ? { source: remote.makeSource(streamId) } : {},
+			onFrame: shared ? (frame) => {
+				runner.enqueueMotionFrame(config.deviceId, rgbFrameToGrayFrame(frame), void 0);
+			} : (frame, handle) => {
 				runner.enqueueMotionFrame(config.deviceId, frame, handle);
 			}
 		});
@@ -2578,4 +2646,4 @@ var PipelineRunnerAddon = class extends BaseAddon {
 	}
 };
 //#endregion
-export { FrameQueue, PipelineRunner, PipelineTimingSampler, Semaphore, pipelineRunnerBenchActions as customActions, PipelineRunnerAddon as default, shouldStartOnboardAnalyzer };
+export { FrameQueue, PipelineRunner, PipelineTimingSampler, Semaphore, pipelineRunnerBenchActions as customActions, PipelineRunnerAddon as default, resolveMotionFrameSource, rgbFrameToGrayFrame, shouldStartOnboardAnalyzer };

package/dist/recorder/index.js

@@ -1,5 +1,5 @@
 const require_model_download_service_C_IHWnXx = require("../model-download-service-C-IHWnXx-DxM2DSns.js");
-const require_dist = require("../dist-Cwc0TUQr.js");
+const require_dist = require("../dist-BrIE85BG.js");
 const require_hub_hostname = require("../hub-hostname-DAJXlOgV.js");
 let node_fs = require("node:fs");
 let node_path = require("node:path");

package/dist/recorder/index.mjs

@@ -1,4 +1,4 @@
-import { B as errMsg, G as EventCategory, I as storageEvictableCapability, P as recordingCapability, Q as selectAssignedProfileSlots, V as BaseAddon, W as DeviceType, c as EVENT_PAD_MS, ct as record, f as RecordingConfigSchema, k as migrateConfigToBands, lt as string, q as hydrateSchema } from "../dist-DjuGmyG9.mjs";
+import { B as errMsg, G as EventCategory, I as storageEvictableCapability, P as recordingCapability, Q as selectAssignedProfileSlots, V as BaseAddon, W as DeviceType, c as EVENT_PAD_MS, ct as record, f as RecordingConfigSchema, k as migrateConfigToBands, lt as string, q as hydrateSchema } from "../dist-CfSORkv2.mjs";
 import { t as resolveHubHostname } from "../hub-hostname-cCknRYKj.mjs";
 import { t as createFileDataPlaneHandler } from "../model-download-service-C-IHWnXx-BPy6aoAx.mjs";
 import { promises } from "node:fs";