@camstack/addon-pipeline 1.2.229 → 1.2.231

package/dist/stream-broker/index.js

@@ -670,6 +670,45 @@ function prestreamEligible(input) {
 	};
 	return { eligible: true };
 }
+//#endregion
+//#region src/stream-broker/stream-broker/prestream-signal-selection.ts
+function nextEnabledSignals(input) {
+	const base = input.stored ?? input.declared;
+	const set = new Set(base);
+	if (input.enabled) set.add(input.code);
+	else set.delete(input.code);
+	const known = input.declared.filter((c) => set.has(c));
+	const extra = [...set].filter((c) => !input.declared.includes(c));
+	return [...known, ...extra];
+}
+//#endregion
+//#region src/stream-broker/stream-broker/wake-hold.ts
+/**
+* The HOLD a camera's own signal buys, and what it may not buy.
+*
+* A stream a consumer merely watches is not a reason to wake a battery camera —
+* a Frigate-style puller holds a session open for ever, and treating that as
+* demand keeps the camera awake for ever, which is the whole point of the
+* battery (D173). So a prestream consumer is FED without being INTENT, and the
+* only thing that dials is a signal the camera reported about itself.
+*
+* This module is the timing half of that, and it is pure so the arithmetic can
+* be argued with. Three rules:
+*
+*  - **A hold EXTENDS, it never stacks.** Continuous motion keeps a camera up
+*    and it sleeps `holdMs` after the LAST signal, not after the sum of them.
+*    A counter or a queue would turn a busy afternoon into an hour of wake.
+*  - **A run is bounded ABSOLUTELY, from its first signal.** A stuck PIR
+*    reporting every second would otherwise extend the hold indefinitely and
+*    drain the battery — the one failure this whole design exists to prevent.
+*    The same re-arm-under-a-ceiling shape D371 gives `recording-signal`.
+*  - **A deadline, not a chain of timers.** The state is one number; the timer
+*    only decides when to LOOK at it. A chain would drift and would have to be
+*    cancelled correctly on every path.
+*/
+/** How long a camera stays awake after the LAST signal. The operator's, per
+*  camera; this is the default the broker ships. */
+var DEFAULT_WAKE_HOLD_MS = 15e3;
 /**
 * Ceiling on ONE run, measured from its first signal.
 *
@@ -19307,6 +19346,20 @@ var StreamBrokerManager = class StreamBrokerManager {
 	* nothing, and `[]` when it does not declare the cap at all — both mean no
 	* signal of that name is acceptable, which is the same refusal.
 	*/
+	/**
+	* The signals a camera declares, with their labels — what the form renders.
+	* `[]` on any failure, which the caller reads as "not eligible": a form built
+	* from a list we could not read would offer wakes nobody confirmed.
+	*/
+	async declaredSignalList(deviceId) {
+		const read = this.deviceSignalDetailReader;
+		if (read === null) return [];
+		try {
+			return await read(deviceId);
+		} catch {
+			return [];
+		}
+	}
 	async declaredSignalCodes(deviceId) {
 		const read = this.deviceSignalReader;
 		if (read === null) return [];
@@ -19324,6 +19377,12 @@ var StreamBrokerManager = class StreamBrokerManager {
 	setDeviceSignalReader(read) {
 		this.deviceSignalReader = read;
 	}
+	/** The same read, with labels — the form needs them, the wake decision does
+	*  not. Injected by the host addon for the same reason. */
+	deviceSignalDetailReader = null;
+	setDeviceSignalDetailReader(read) {
+		this.deviceSignalDetailReader = read;
+	}
 	/**
 	* Whether this device runs on a battery.
 	*
@@ -19445,6 +19504,12 @@ var StreamBrokerManager = class StreamBrokerManager {
 			value: setting,
 			label: hwAccelOptionLabel(setting)
 		}));
+		const declaredSignals = await this.declaredSignalList(deviceId);
+		const prestreamGate = prestreamEligible({
+			batteryOperated: await this.isBatteryOperated(deviceId),
+			declaresSignals: declaredSignals.length > 0
+		});
+		const prestreamOffered = prestreamGate.eligible;
 		const streamTabs = streams.filter((s) => !s.camStreamId.startsWith("derived:")).map((stream) => {
 			const camStreamId = stream.camStreamId;
 			const brokerId = brokerIdFor(deviceId, camStreamId);
@@ -19544,6 +19609,20 @@ var StreamBrokerManager = class StreamBrokerManager {
 						tooltip: "Copy muted URL to clipboard"
 					}]
 				},
+				...prestreamOffered ? [{
+					type: "text",
+					key: `rtspPrestreamUrl:${camStreamId}`,
+					label: "RTSP URL (prestream)",
+					description: "Video-only. Shows this camera’s last picture while it sleeps and cuts to live video when one of its wake signals fires — without a consumer on this URL ever keeping the camera awake.",
+					readonlyField: true,
+					span: 2,
+					value: rtspEntry?.url ? `${rtspEntry.url}/prestream` : "inactive",
+					actions: [{
+						action: "copy-value",
+						icon: "copy",
+						tooltip: "Copy prestream URL to clipboard"
+					}]
+				}] : [],
 				{
 					type: "boolean",
 					style: "switch",
@@ -19711,7 +19790,7 @@ var StreamBrokerManager = class StreamBrokerManager {
 				}
 			]
 		}));
-		return { sections: [{
+		const streamBrokerSection = {
 			id: "stream-broker-streams",
 			title: "",
 			tab: "stream-broker",
@@ -19728,7 +19807,37 @@ var StreamBrokerManager = class StreamBrokerManager {
 					...derivedTabs
 				]
 			}]
-		}, {
+		};
+		const prestreamCfg = override?.prestream;
+		const prestreamSections = prestreamGate.eligible ? [{
+			id: "stream-broker-prestream",
+			title: "Wake signals",
+			tab: "stream-broker",
+			location: "top-tab",
+			order: 50,
+			description: "A consumer can dial this camera’s prestream URL (the profile URL with /prestream) and be shown the last picture while the camera sleeps. It is fed without keeping the camera awake: only the signals below wake it, and it goes back to sleep once they stop.",
+			fields: [...declaredSignals.map((signal) => ({
+				type: "boolean",
+				style: "switch",
+				key: `prestreamSignal:${signal.code}`,
+				label: signal.label,
+				description: signal.recommended ? "Recommended by this camera’s driver." : "Offered by this camera’s driver.",
+				default: signal.recommended,
+				value: prestreamCfg?.enabledSignals === void 0 ? true : prestreamCfg.enabledSignals.includes(signal.code)
+			})), {
+				type: "number",
+				key: "prestreamHoldMs",
+				label: "Stay awake after the last signal",
+				description: "How long the camera keeps streaming once its signals stop. Extended by each new signal, never stacked — continuous motion keeps it up and it sleeps this long after the last one. One run is capped at five minutes whatever this says, and a camera whose sensor never stops is left alone for ten minutes after that.",
+				min: 1e3,
+				max: 3e5,
+				step: 1e3,
+				unit: "ms",
+				default: DEFAULT_WAKE_HOLD_MS,
+				value: prestreamCfg?.holdMs ?? 15e3
+			}]
+		}] : [];
+		const diagnosticsSection = {
 			id: "stream-broker-diagnostics",
 			title: "Diagnostics",
 			tab: "stream-broker",
@@ -19751,7 +19860,12 @@ var StreamBrokerManager = class StreamBrokerManager {
 				default: false,
 				value: override?.webrtcDebug === true
 			}]
-		}] };
+		};
+		return { sections: [
+			streamBrokerSection,
+			...prestreamSections,
+			diagnosticsSection
+		] };
 	}
 	async getDeviceLiveContribution(_input) {
 		return null;
@@ -19863,6 +19977,31 @@ var StreamBrokerManager = class StreamBrokerManager {
 				nextOverride.sourceParserArgs = spa;
 				continue;
 			}
+			if (fieldKey.startsWith("prestreamSignal:")) {
+				overrideDirty = true;
+				const next = nextEnabledSignals({
+					declared: await this.declaredSignalCodes(deviceId),
+					stored: nextOverride.prestream?.enabledSignals,
+					code: fieldKey.slice(16),
+					enabled: value === null || value === void 0 ? true : Boolean(value)
+				});
+				nextOverride.prestream = {
+					...nextOverride.prestream,
+					enabledSignals: [...next]
+				};
+				continue;
+			}
+			if (fieldKey === "prestreamHoldMs") {
+				overrideDirty = true;
+				const raw = typeof value === "number" ? value : Number(value);
+				if (!Number.isFinite(raw)) continue;
+				const clamped = Math.min(3e5, Math.max(1e3, Math.round(raw)));
+				nextOverride.prestream = {
+					...nextOverride.prestream,
+					holdMs: clamped
+				};
+				continue;
+			}
 			if (fieldKey === "streamingDebug") {
 				overrideDirty = true;
 				const next = value === null || value === void 0 ? void 0 : Boolean(value);
@@ -31266,9 +31405,11 @@ var StreamBrokerAddon = class extends require_dist.BaseAddon {
 		const localNode = this.ctx.kernel.localNodeId;
 		const localNodeId = localNode ? localNode.includes("/") ? localNode.split("/")[0] : localNode : void 0;
 		this.brokerManager.setApiAccess(this.ctx.api, localNodeId, this.ctx.kernel.hwaccel);
-		this.brokerManager.setDeviceSignalReader(async (deviceId) => {
-			return (await (await this.ctx.fetchDevice(deviceId)).streamSignals?.listSignals({}) ?? []).map((s) => s.code);
-		});
+		const readSignals = async (deviceId) => {
+			return await (await this.ctx.fetchDevice(deviceId)).streamSignals?.listSignals({}) ?? [];
+		};
+		this.brokerManager.setDeviceSignalReader(async (deviceId) => (await readSignals(deviceId)).map((s) => s.code));
+		this.brokerManager.setDeviceSignalDetailReader(readSignals);
 		await this.loadFfmpegConfig();
 		await this.declareRowCollections();
 		await this.purgeFlattenedSettingsKeys();

package/dist/stream-broker/index.mjs

@@ -666,6 +666,45 @@ function prestreamEligible(input) {
 	};
 	return { eligible: true };
 }
+//#endregion
+//#region src/stream-broker/stream-broker/prestream-signal-selection.ts
+function nextEnabledSignals(input) {
+	const base = input.stored ?? input.declared;
+	const set = new Set(base);
+	if (input.enabled) set.add(input.code);
+	else set.delete(input.code);
+	const known = input.declared.filter((c) => set.has(c));
+	const extra = [...set].filter((c) => !input.declared.includes(c));
+	return [...known, ...extra];
+}
+//#endregion
+//#region src/stream-broker/stream-broker/wake-hold.ts
+/**
+* The HOLD a camera's own signal buys, and what it may not buy.
+*
+* A stream a consumer merely watches is not a reason to wake a battery camera —
+* a Frigate-style puller holds a session open for ever, and treating that as
+* demand keeps the camera awake for ever, which is the whole point of the
+* battery (D173). So a prestream consumer is FED without being INTENT, and the
+* only thing that dials is a signal the camera reported about itself.
+*
+* This module is the timing half of that, and it is pure so the arithmetic can
+* be argued with. Three rules:
+*
+*  - **A hold EXTENDS, it never stacks.** Continuous motion keeps a camera up
+*    and it sleeps `holdMs` after the LAST signal, not after the sum of them.
+*    A counter or a queue would turn a busy afternoon into an hour of wake.
+*  - **A run is bounded ABSOLUTELY, from its first signal.** A stuck PIR
+*    reporting every second would otherwise extend the hold indefinitely and
+*    drain the battery — the one failure this whole design exists to prevent.
+*    The same re-arm-under-a-ceiling shape D371 gives `recording-signal`.
+*  - **A deadline, not a chain of timers.** The state is one number; the timer
+*    only decides when to LOOK at it. A chain would drift and would have to be
+*    cancelled correctly on every path.
+*/
+/** How long a camera stays awake after the LAST signal. The operator's, per
+*  camera; this is the default the broker ships. */
+var DEFAULT_WAKE_HOLD_MS = 15e3;
 /**
 * Ceiling on ONE run, measured from its first signal.
 *
@@ -19303,6 +19342,20 @@ var StreamBrokerManager = class StreamBrokerManager {
 	* nothing, and `[]` when it does not declare the cap at all — both mean no
 	* signal of that name is acceptable, which is the same refusal.
 	*/
+	/**
+	* The signals a camera declares, with their labels — what the form renders.
+	* `[]` on any failure, which the caller reads as "not eligible": a form built
+	* from a list we could not read would offer wakes nobody confirmed.
+	*/
+	async declaredSignalList(deviceId) {
+		const read = this.deviceSignalDetailReader;
+		if (read === null) return [];
+		try {
+			return await read(deviceId);
+		} catch {
+			return [];
+		}
+	}
 	async declaredSignalCodes(deviceId) {
 		const read = this.deviceSignalReader;
 		if (read === null) return [];
@@ -19320,6 +19373,12 @@ var StreamBrokerManager = class StreamBrokerManager {
 	setDeviceSignalReader(read) {
 		this.deviceSignalReader = read;
 	}
+	/** The same read, with labels — the form needs them, the wake decision does
+	*  not. Injected by the host addon for the same reason. */
+	deviceSignalDetailReader = null;
+	setDeviceSignalDetailReader(read) {
+		this.deviceSignalDetailReader = read;
+	}
 	/**
 	* Whether this device runs on a battery.
 	*
@@ -19441,6 +19500,12 @@ var StreamBrokerManager = class StreamBrokerManager {
 			value: setting,
 			label: hwAccelOptionLabel(setting)
 		}));
+		const declaredSignals = await this.declaredSignalList(deviceId);
+		const prestreamGate = prestreamEligible({
+			batteryOperated: await this.isBatteryOperated(deviceId),
+			declaresSignals: declaredSignals.length > 0
+		});
+		const prestreamOffered = prestreamGate.eligible;
 		const streamTabs = streams.filter((s) => !s.camStreamId.startsWith("derived:")).map((stream) => {
 			const camStreamId = stream.camStreamId;
 			const brokerId = brokerIdFor(deviceId, camStreamId);
@@ -19540,6 +19605,20 @@ var StreamBrokerManager = class StreamBrokerManager {
 						tooltip: "Copy muted URL to clipboard"
 					}]
 				},
+				...prestreamOffered ? [{
+					type: "text",
+					key: `rtspPrestreamUrl:${camStreamId}`,
+					label: "RTSP URL (prestream)",
+					description: "Video-only. Shows this camera’s last picture while it sleeps and cuts to live video when one of its wake signals fires — without a consumer on this URL ever keeping the camera awake.",
+					readonlyField: true,
+					span: 2,
+					value: rtspEntry?.url ? `${rtspEntry.url}/prestream` : "inactive",
+					actions: [{
+						action: "copy-value",
+						icon: "copy",
+						tooltip: "Copy prestream URL to clipboard"
+					}]
+				}] : [],
 				{
 					type: "boolean",
 					style: "switch",
@@ -19707,7 +19786,7 @@ var StreamBrokerManager = class StreamBrokerManager {
 				}
 			]
 		}));
-		return { sections: [{
+		const streamBrokerSection = {
 			id: "stream-broker-streams",
 			title: "",
 			tab: "stream-broker",
@@ -19724,7 +19803,37 @@ var StreamBrokerManager = class StreamBrokerManager {
 					...derivedTabs
 				]
 			}]
-		}, {
+		};
+		const prestreamCfg = override?.prestream;
+		const prestreamSections = prestreamGate.eligible ? [{
+			id: "stream-broker-prestream",
+			title: "Wake signals",
+			tab: "stream-broker",
+			location: "top-tab",
+			order: 50,
+			description: "A consumer can dial this camera’s prestream URL (the profile URL with /prestream) and be shown the last picture while the camera sleeps. It is fed without keeping the camera awake: only the signals below wake it, and it goes back to sleep once they stop.",
+			fields: [...declaredSignals.map((signal) => ({
+				type: "boolean",
+				style: "switch",
+				key: `prestreamSignal:${signal.code}`,
+				label: signal.label,
+				description: signal.recommended ? "Recommended by this camera’s driver." : "Offered by this camera’s driver.",
+				default: signal.recommended,
+				value: prestreamCfg?.enabledSignals === void 0 ? true : prestreamCfg.enabledSignals.includes(signal.code)
+			})), {
+				type: "number",
+				key: "prestreamHoldMs",
+				label: "Stay awake after the last signal",
+				description: "How long the camera keeps streaming once its signals stop. Extended by each new signal, never stacked — continuous motion keeps it up and it sleeps this long after the last one. One run is capped at five minutes whatever this says, and a camera whose sensor never stops is left alone for ten minutes after that.",
+				min: 1e3,
+				max: 3e5,
+				step: 1e3,
+				unit: "ms",
+				default: DEFAULT_WAKE_HOLD_MS,
+				value: prestreamCfg?.holdMs ?? 15e3
+			}]
+		}] : [];
+		const diagnosticsSection = {
 			id: "stream-broker-diagnostics",
 			title: "Diagnostics",
 			tab: "stream-broker",
@@ -19747,7 +19856,12 @@ var StreamBrokerManager = class StreamBrokerManager {
 				default: false,
 				value: override?.webrtcDebug === true
 			}]
-		}] };
+		};
+		return { sections: [
+			streamBrokerSection,
+			...prestreamSections,
+			diagnosticsSection
+		] };
 	}
 	async getDeviceLiveContribution(_input) {
 		return null;
@@ -19859,6 +19973,31 @@ var StreamBrokerManager = class StreamBrokerManager {
 				nextOverride.sourceParserArgs = spa;
 				continue;
 			}
+			if (fieldKey.startsWith("prestreamSignal:")) {
+				overrideDirty = true;
+				const next = nextEnabledSignals({
+					declared: await this.declaredSignalCodes(deviceId),
+					stored: nextOverride.prestream?.enabledSignals,
+					code: fieldKey.slice(16),
+					enabled: value === null || value === void 0 ? true : Boolean(value)
+				});
+				nextOverride.prestream = {
+					...nextOverride.prestream,
+					enabledSignals: [...next]
+				};
+				continue;
+			}
+			if (fieldKey === "prestreamHoldMs") {
+				overrideDirty = true;
+				const raw = typeof value === "number" ? value : Number(value);
+				if (!Number.isFinite(raw)) continue;
+				const clamped = Math.min(3e5, Math.max(1e3, Math.round(raw)));
+				nextOverride.prestream = {
+					...nextOverride.prestream,
+					holdMs: clamped
+				};
+				continue;
+			}
 			if (fieldKey === "streamingDebug") {
 				overrideDirty = true;
 				const next = value === null || value === void 0 ? void 0 : Boolean(value);
@@ -31262,9 +31401,11 @@ var StreamBrokerAddon = class extends BaseAddon {
 		const localNode = this.ctx.kernel.localNodeId;
 		const localNodeId = localNode ? localNode.includes("/") ? localNode.split("/")[0] : localNode : void 0;
 		this.brokerManager.setApiAccess(this.ctx.api, localNodeId, this.ctx.kernel.hwaccel);
-		this.brokerManager.setDeviceSignalReader(async (deviceId) => {
-			return (await (await this.ctx.fetchDevice(deviceId)).streamSignals?.listSignals({}) ?? []).map((s) => s.code);
-		});
+		const readSignals = async (deviceId) => {
+			return await (await this.ctx.fetchDevice(deviceId)).streamSignals?.listSignals({}) ?? [];
+		};
+		this.brokerManager.setDeviceSignalReader(async (deviceId) => (await readSignals(deviceId)).map((s) => s.code));
+		this.brokerManager.setDeviceSignalDetailReader(readSignals);
 		await this.loadFfmpegConfig();
 		await this.declareRowCollections();
 		await this.purgeFlattenedSettingsKeys();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-pipeline",
-  "version": "1.2.229",
+  "version": "1.2.231",
   "description": "Pipeline bundle — runner, detection, motion, audio + stream broker. Multi-entry npm package shipping pipeline addons under a single bundle.",
   "keywords": [
     "camstack",