@camstack/addon-pipeline 1.2.27 → 1.2.28

package/dist/pipeline-runner/index.js

@@ -1336,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
@@ -1348,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();
 	};

package/dist/pipeline-runner/index.mjs

@@ -1330,7 +1330,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
@@ -1342,29 +1359,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: 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: errMsg(err) } });
 	});
 	return () => {
 		aborted = true;
+		if (retryTimer !== null) {
+			clearTimeout(retryTimer);
+			retryTimer = null;
+		}
 		stopPump?.();
 		if (release) release();
 	};

package/package.json

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