@camstack/addon-pipeline 1.2.19 → 1.2.28

package/dist/{model-download-service-Cp9f4dk6-WO-foD7W.mjs → model-download-service-Cp9f4dk6-CwUb5v3Y.mjs}

@@ -1,33 +1,8 @@
-import { createRequire } from "node:module";
 import * as fs from "node:fs";
 import { createReadStream, promises } from "node:fs";
 import * as path$1 from "node:path";
 import path from "node:path";
 import "node:crypto";
-//#region \0rolldown/runtime.js
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-var __require = /* @__PURE__ */ createRequire(import.meta.url);
-//#endregion
 //#region ../system/dist/model-download-service-Cp9f4dk6.mjs
 /**
 * Map a rel path to one candidate absolute path PER root, keeping only roots the
@@ -353,4 +328,4 @@ function deleteModelFromDisk(modelsDir, entry, format) {
 	return true;
 }
 //#endregion
-export { ensureModel as a, __commonJSMin as c, downloadFile as i, __require as l, createFileDataPlaneHandler as n, isModelDownloaded as o, deleteModelFromDisk as r, parseRangeHeader as s, contentTypeFor as t, __toESM as u };
+export { ensureModel as a, downloadFile as i, createFileDataPlaneHandler as n, isModelDownloaded as o, deleteModelFromDisk as r, parseRangeHeader as s, contentTypeFor as t };

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-DKqOqH5j.js");
+const require_dist = require("../dist-DUHlZcWd.js");
 let node_fs = require("node:fs");
 let node_path = require("node:path");
 //#region src/motion-wasm/wasm-motion-detector.ts

package/dist/motion-wasm/index.mjs

@@ -1,4 +1,4 @@
-import { A as motionDetectionCapability, K as hydrateSchema, T as evaluateZoneRules, V as BaseAddon, W as DeviceType } from "../dist-DZBePRjP.mjs";
+import { A as motionDetectionCapability, E as evaluateZoneRules, K as hydrateSchema, V as BaseAddon, W as DeviceType } from "../dist-CsKaXmP8.mjs";
 import { readFileSync } from "node:fs";
 import { join } from "node:path";
 //#region src/motion-wasm/wasm-motion-detector.ts

package/dist/pipeline-runner/index.js

@@ -3,11 +3,11 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 const require_chunk = require("../chunk-emK7D4bc.js");
-const require_dist = require("../dist-DKqOqH5j.js");
+const require_dist = require("../dist-DUHlZcWd.js");
 const require_remote_restream = require("../remote-restream-CO36Sr30.js");
 const require_hub_hostname = require("../hub-hostname-DAJXlOgV.js");
 const require_worker_protocol = require("../worker-protocol-DextwlTX.js");
-const require_step_definitions = require("../step-definitions-zDq8cP8M.js");
+const require_step_definitions = require("../step-definitions-Bo1hJQQw.js");
 let node_child_process = require("node:child_process");
 let node_url = require("node:url");
 let sharp = require("sharp");
@@ -575,6 +575,22 @@ var PipelineTimingSampler = class {
 //#endregion
 //#region src/pipeline-runner/runner.ts
 /**
+* Bound on one `processFrame` call. Chosen well above the slowest legitimate
+* inference seen in production (8 617 ms, GPU contention on the hub) so the
+* timeout only ever fires on a call that is genuinely never coming back.
+*/
+var DEFAULT_INFERENCE_TIMEOUT_MS = 2e4;
+/** Grace period before a permit-starved scheduler with queued work warns. */
+var DEFAULT_INFERENCE_STALL_WARN_MS = 6e4;
+/** Re-warn cadence while a stall persists, so a wedge stays visible. */
+var INFERENCE_STALL_REWARN_MS = 6e4;
+/**
+* Sentinel distinguishing "the bound expired" from a legitimate `null`
+* (`processFrame` returning no result). A unique symbol, so it can never
+* collide with a value the executor produces.
+*/
+var TIMED_OUT = Symbol("inference-timed-out");
+/**
 * Clone a {@link DetectionQueueEntry} for the queue's copy-on-retain
 * boundary: the inner frame's pixel buffer is detached via
 * {@link ownFrame}, the `FrameHandle` is carried through unchanged (it's
@@ -657,6 +673,10 @@ var PipelineRunner = class {
 	arrivalCounts = /* @__PURE__ */ new Map();
 	lastGovernorRecomputeAt = Date.now();
 	governorIntervalHandle = null;
+	/** When the scheduler first found itself with zero permits; null when healthy. */
+	inferenceStallSince = null;
+	/** Last stall warning, so a persistent wedge re-warns instead of going quiet. */
+	inferenceStallWarnedAt = null;
 	constructor(config) {
 		this.config = config;
 		this.logger = config.logger;
@@ -1047,7 +1067,12 @@ var PipelineRunner = class {
 	}
 	tick() {
 		this.drainMotionQueues();
-		if (this.semaphore.available <= 0) return;
+		if (this.semaphore.available <= 0) {
+			this.noteInferenceStall();
+			return;
+		}
+		this.inferenceStallSince = null;
+		this.inferenceStallWarnedAt = null;
 		const picked = this.pickNextDetectionFrame();
 		if (!picked) return;
 		const { deviceId, entry, state } = picked;
@@ -1070,11 +1095,18 @@ var PipelineRunner = class {
 		const pickedAt = Date.now();
 		const { frame, handle } = entry;
 		const enqueuedAt = frame._enqueuedAt ?? pickedAt;
-		const release = await this.semaphore.acquire();
+		const rawRelease = await this.semaphore.acquire();
+		let released = false;
+		const release = () => {
+			if (released) return;
+			released = true;
+			rawRelease();
+		};
 		const semAcquiredAt = Date.now();
 		const executorHandle = state.detectionQueue.size <= HANDLE_PASSTHROUGH_MAX_QUEUE_DEPTH && this.semaphore.available > 0 ? handle : void 0;
 		try {
-			const result = await this.config.processFrame(deviceId, frameInput, executorHandle);
+			const result = await this.awaitInferenceBounded(deviceId, frameInput, executorHandle, release);
+			if (result === TIMED_OUT) return;
 			const inferDoneAt = Date.now();
 			const inferenceMs = inferDoneAt - semAcquiredAt;
 			state.inferenceTimes.push(inferenceMs);
@@ -1098,6 +1130,73 @@ var PipelineRunner = class {
 			release();
 		}
 	}
+	/**
+	* Await `processFrame` with a hard bound. On expiry the permit is released
+	* immediately (via the caller's release-once closure) and {@link TIMED_OUT}
+	* is returned; the underlying call is left to settle into the void, since
+	* the executor contract offers no cancellation.
+	*/
+	async awaitInferenceBounded(deviceId, frameInput, executorHandle, release) {
+		const timeoutMs = this.config.inferenceTimeoutMs ?? DEFAULT_INFERENCE_TIMEOUT_MS;
+		let timer = null;
+		const expiry = new Promise((resolve) => {
+			timer = setTimeout(() => resolve(TIMED_OUT), timeoutMs);
+			timer.unref?.();
+		});
+		try {
+			const outcome = await Promise.race([this.config.processFrame(deviceId, frameInput, executorHandle), expiry]);
+			if (outcome === TIMED_OUT) {
+				release();
+				this.logger?.warn("inference timed out — permit released, result discarded", {
+					tags: { deviceId },
+					meta: {
+						timeoutMs,
+						availablePermits: this.semaphore.available
+					}
+				});
+			}
+			return outcome;
+		} finally {
+			if (timer !== null) clearTimeout(timer);
+		}
+	}
+	/**
+	* Called on every tick that finds zero available permits. Warns once the
+	* starvation outlives `inferenceStallWarnMs` WITH queued work — queued work
+	* is the discriminator: a runner with no permits and no backlog is simply
+	* busy, while one with a backlog it cannot touch is wedged.
+	*/
+	noteInferenceStall() {
+		let queuedFrames = 0;
+		for (const state of this.cameras.values()) queuedFrames += state.detectionQueue.size;
+		if (queuedFrames === 0) {
+			this.inferenceStallSince = null;
+			this.inferenceStallWarnedAt = null;
+			return;
+		}
+		const now = Date.now();
+		if (this.inferenceStallSince === null) {
+			this.inferenceStallSince = now;
+			return;
+		}
+		const stalledMs = now - this.inferenceStallSince;
+		if (stalledMs < (this.config.inferenceStallWarnMs ?? DEFAULT_INFERENCE_STALL_WARN_MS)) return;
+		if (this.inferenceStallWarnedAt !== null && now - this.inferenceStallWarnedAt < INFERENCE_STALL_REWARN_MS) return;
+		this.inferenceStallWarnedAt = now;
+		for (const [deviceId, state] of this.cameras) {
+			if (state.detectionQueue.size === 0) continue;
+			this.logger?.warn("no inference permit available while frames are queued", {
+				tags: { deviceId },
+				meta: {
+					stalledMs,
+					queuedFrames: state.detectionQueue.size,
+					droppedFrames: state.detectionQueue.droppedFrames,
+					phase: state.phase,
+					concurrency: this.semaphore.concurrency
+				}
+			});
+		}
+	}
 	async notifyCallbacks(deviceId, frame, result, streamType, handle) {
 		for (const callback of this.resultCallbacks) try {
 			await callback(deviceId, frame, result, streamType, handle);
@@ -1237,7 +1336,24 @@ function forkDecodeWorker(_source) {
 //#endregion
 //#region src/session-decode/guarded-session-decode.ts
 /**
-* Guards the in-flight restream-acquire against a detach/unsubscribe race.
+* 2s → 5s → 15s → 30s, then 30s forever.
+*
+* Indefinite is deliberate. The failure this recovers from is "the broker has
+* no profile bound yet" or "the broker call failed right now" — both of which
+* clear on their own, often minutes later (a source re-dialing, a runner
+* restarting). A bounded retry would turn a slow recovery back into the
+* permanent outage this exists to prevent, and teardown already stops it: a
+* detach aborts the loop, so nothing retries for a camera nobody wants.
+*/
+var DEFAULT_ACQUIRE_RETRY_DELAYS_MS = [
+	2e3,
+	5e3,
+	15e3,
+	3e4
+];
+/**
+* Guards the in-flight restream-acquire against a detach/unsubscribe race,
+* and retries an acquire that fails.
 *
 * `acquireSessionDecodeRestream` + forking the decode worker both take real
 * time (a broker round-trip, then a process fork). If the caller's teardown
@@ -1249,29 +1365,71 @@ function forkDecodeWorker(_source) {
 *
 * This helper returns the teardown SYNCHRONOUSLY. The acquire + pump-start
 * run in the background; an `aborted` flag recorded by the (possibly
-* already-called) teardown is checked right after the acquire resolves —
-* if set, the restream is released immediately and the pump is NEVER
+* already-called) teardown is checked right after each acquire resolves —
+* if set, any restream is released immediately and the pump is NEVER
 * started (no orphan worker). Otherwise the pump starts and the teardown,
 * once called, stops the pump then releases the restream.
+*
+* **A failed acquire is retried, not swallowed.** The teardown handed back
+* here is stored by the caller (as `attachment.detectionUnsubscribe`) the
+* instant this returns, so a `return` on failure left that handle permanently
+* non-null with no pump behind it: `onEnded` could never fire because nothing
+* had ever started, the camera's phase stayed `active`, and not one frame
+* arrived again. The motion path was hardened against this shape by a frame
+* freshness window (`MOTION_FRESHNESS_WINDOW_MS`); this is the detection
+* path's half.
 */
 function startGuardedSessionDecode(deps) {
 	let aborted = false;
 	let stopPump = null;
 	let release = null;
+	let retryTimer = null;
+	const delays = deps.acquireRetryDelaysMs && deps.acquireRetryDelaysMs.length > 0 ? deps.acquireRetryDelaysMs : DEFAULT_ACQUIRE_RETRY_DELAYS_MS;
+	/** Resolves after the backoff for `attempt`, or immediately once aborted. */
+	const waitBackoff = (attempt) => new Promise((resolve) => {
+		const ms = delays[Math.min(attempt, delays.length - 1)] ?? delays[delays.length - 1] ?? 2e3;
+		retryTimer = setTimeout(() => {
+			retryTimer = null;
+			resolve();
+		}, ms);
+		retryTimer.unref?.();
+	});
 	(async () => {
-		const acquired = await deps.acquire();
-		if (!acquired) return;
-		if (aborted) {
-			acquired.release();
+		for (let attempt = 0; !aborted; attempt++) {
+			let acquired = null;
+			try {
+				acquired = await deps.acquire();
+			} catch (err) {
+				(attempt === 0 ? deps.logger.warn : deps.logger.debug).call(deps.logger, "session-decode: acquire failed — retrying", { meta: {
+					attempt: attempt + 1,
+					error: require_dist.errMsg(err)
+				} });
+				await waitBackoff(attempt);
+				continue;
+			}
+			if (aborted) {
+				if (acquired) acquired.release();
+				return;
+			}
+			if (!acquired) {
+				(attempt === 0 ? deps.logger.warn : deps.logger.debug).call(deps.logger, "session-decode: no broker profile bound yet — retrying", { meta: { attempt: attempt + 1 } });
+				await waitBackoff(attempt);
+				continue;
+			}
+			if (attempt > 0) deps.logger.info("session-decode: acquire succeeded after retry", { meta: { attempts: attempt + 1 } });
+			release = acquired.release;
+			stopPump = deps.startPump(acquired.source);
 			return;
 		}
-		release = acquired.release;
-		stopPump = deps.startPump(acquired.source);
 	})().catch((err) => {
 		deps.logger.warn("session-decode: guarded start failed", { meta: { error: require_dist.errMsg(err) } });
 	});
 	return () => {
 		aborted = true;
+		if (retryTimer !== null) {
+			clearTimeout(retryTimer);
+			retryTimer = null;
+		}
 		stopPump?.();
 		if (release) release();
 	};
@@ -2063,10 +2221,14 @@ var NativeCropRegistry = class {
 	* Bind `request` to `handle`; evicts the oldest entry past the cap, releasing
 	* its worker-side RAM lease so a lease never outlives its registry entry.
 	*/
-	register(handle, request) {
+	register(handle, request, deviceId) {
 		const k = this.key(handle);
 		this.entries.delete(k);
-		this.entries.set(k, request);
+		this.entries.set(k, {
+			request,
+			deviceId,
+			registeredAt: Date.now()
+		});
 		while (this.entries.size > this.capacity) {
 			const oldest = this.entries.keys().next().value;
 			if (oldest === void 0) break;
@@ -2075,7 +2237,22 @@ var NativeCropRegistry = class {
 	}
 	/** The requester for `handle`, or `null` if never registered / already evicted. */
 	get(handle) {
-		return this.entries.get(this.key(handle)) ?? null;
+		const entry = this.entries.get(this.key(handle));
+		if (entry === void 0) return null;
+		return {
+			request: entry.request,
+			deviceId: entry.deviceId,
+			ageMs: Date.now() - entry.registeredAt
+		};
+	}
+	/**
+	* The deviceId a handle was registered under, even AFTER its entry was
+	* evicted — kept in a small parallel ring so a `no-registry-entry` miss can
+	* still be attributed to a camera (a miss line without `deviceId` cannot
+	* answer "why is 617 worse than 615?").
+	*/
+	deviceIdFor(handle) {
+		return this.evictedDeviceIds.get(this.key(handle)) ?? this.entries.get(this.key(handle))?.deviceId ?? null;
 	}
 	/**
 	* Release the worker-side RAM native lease for `handle` and drop its entry —
@@ -2087,15 +2264,27 @@ var NativeCropRegistry = class {
 	}
 	/** Drop every entry, releasing each frame's worker-side lease (node/addon shutdown). */
 	clear() {
-		for (const request of this.entries.values()) safeRelease(request);
+		for (const entry of this.entries.values()) safeRelease(entry.request);
 		this.entries.clear();
+		this.evictedDeviceIds.clear();
 	}
-	/** Release + drop one entry by its map key. */
+	/** Release + drop one entry by its map key, remembering its camera. */
 	releaseEntry(key) {
-		const request = this.entries.get(key);
-		if (!request) return;
+		const entry = this.entries.get(key);
+		if (!entry) return;
 		this.entries.delete(key);
-		safeRelease(request);
+		this.rememberEvicted(key, entry.deviceId);
+		safeRelease(entry.request);
+	}
+	/** Bounded memory of evicted handles → deviceId, for miss attribution. */
+	evictedDeviceIds = /* @__PURE__ */ new Map();
+	rememberEvicted(key, deviceId) {
+		this.evictedDeviceIds.set(key, deviceId);
+		while (this.evictedDeviceIds.size > this.capacity) {
+			const oldest = this.evictedDeviceIds.keys().next().value;
+			if (oldest === void 0) break;
+			this.evictedDeviceIds.delete(oldest);
+		}
 	}
 };
 //#endregion
@@ -3301,16 +3490,29 @@ var PipelineRunnerAddon = class extends require_dist.BaseAddon {
 		const isFullFrame = b.x <= .001 && b.y <= .001 && b.w >= .999 && b.h >= .999;
 		const isUnboundedFullFrame = isFullFrame && input.maxWidth === void 0;
 		let nativeResult = null;
+		let missReason = null;
 		if (!isUnboundedFullFrame) {
-			const requester = this.nativeCropRegistry.get(input.handle);
-			if (requester) {
-				const result = await requester(input.bbox, input.maxWidth);
+			const found = this.nativeCropRegistry.get(input.handle);
+			if (found) {
+				const result = await found.request(input.bbox, input.maxWidth);
 				if (result) nativeResult = {
 					bytes: result.bytes,
 					width: result.width,
 					height: result.height
 				};
-			}
+				else missReason = "worker-lease-gone";
+			} else missReason = "no-registry-entry";
+			if (missReason !== null) this.ctx.logger.debug("native crop miss", {
+				tags: { deviceId: found?.deviceId ?? this.nativeCropRegistry.deviceIdFor(input.handle) ?? -1 },
+				meta: {
+					reason: missReason,
+					handle: `${input.handle.shmId}#${input.handle.slot}#${input.handle.seq}`,
+					handleNodeId: input.handle.nodeId,
+					handleAgeMs: found?.ageMs ?? null,
+					registrySize: this.nativeCropRegistry.size,
+					registryCap: DEFAULT_NATIVE_CROP_REGISTRY_CAP
+				}
+			});
 		}
 		const tier = resolveNativeCropSource(isFullFrame, nativeResult !== null);
 		if (tier === "native" && nativeResult) return this.encodeNativeCropResult(nativeResult, tier, input.encodeJpeg);
@@ -3791,7 +3993,7 @@ var PipelineRunnerAddon = class extends require_dist.BaseAddon {
 					onEnded: () => this.handleDetectionDecodeEnded(config.deviceId),
 					onDecodedFrame: (frame, nativeCrop) => {
 						const handle = retainedFrames?.write(config.deviceId, frame) ?? void 0;
-						if (handle && nativeCrop) this.nativeCropRegistry.register(handle, nativeCrop);
+						if (handle && nativeCrop) this.nativeCropRegistry.register(handle, nativeCrop, config.deviceId);
 						this.enqueueSharedDetectionFrame(config.deviceId, frame, handle);
 					}
 				});
@@ -4304,7 +4506,7 @@ var PipelineRunnerAddon = class extends require_dist.BaseAddon {
 				onDecodedFrame: (frame, nativeCrop) => {
 					if (settled) return;
 					const handle = retainedFrames?.write(config.deviceId, frame) ?? void 0;
-					if (handle && nativeCrop) this.nativeCropRegistry.register(handle, nativeCrop);
+					if (handle && nativeCrop) this.nativeCropRegistry.register(handle, nativeCrop, config.deviceId);
 					runner.enqueueOccupancyFrame(deviceId, frame, handle);
 					count++;
 					if (count >= frames) {