@camstack/addon-pipeline 1.2.6 → 1.2.8

package/dist/pipeline-runner/index.mjs

@@ -1,8 +1,8 @@
-import { H as errMsg, N as pipelineRunnerCapability, S as defineCustomActions, U as BaseAddon, b as customAction, ct as number, dt as string, it as boolean, j as nodePin, lt as object, nt as _enum, ot as lazy, pt as EventCategory, q as createEvent, rt as array, s as DEVICE_BACKEND_TO_FORMAT } from "../dist-Bw_V5L0r.mjs";
+import { H as BaseAddon, K as createEvent, N as pipelineRunnerCapability, S as defineCustomActions, V as errMsg, at as lazy, b as customAction, ct as object, ft as EventCategory, j as nodePin, nt as array, rt as boolean, s as DEVICE_BACKEND_TO_FORMAT, st as number, tt as _enum, ut as string } from "../dist-owmpaeIY.mjs";
 import { n as profileForStreamId, t as isRemoteRestream } from "../remote-restream-BeHi78PZ.mjs";
-import { r as resolveHubHostname } from "../sheet-geometry-DcpuGTCm.mjs";
+import { t as resolveHubHostname } from "../hub-hostname-cCknRYKj.mjs";
 import { t as isWorkerReply } from "../worker-protocol-D7RzZIla.mjs";
-import { a as getStepDefinition } from "../step-definitions-aY4D9Loy.mjs";
+import { a as getStepDefinition } from "../step-definitions-CkvctwuS.mjs";
 import { fork } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import sharp from "sharp";
@@ -1273,20 +1273,43 @@ function startGuardedSessionDecode(deps) {
 /** {@link RETAINED_FRAME_BUDGET_MB} in bytes. */
 var RETAINED_FRAME_BUDGET_BYTES = (() => {
 	const raw = Number(process.env["CAMSTACK_SESSION_RETAIN_MB"]);
-	return Number.isFinite(raw) && raw > 0 ? Math.floor(raw) : 96;
+	return Number.isFinite(raw) && raw > 0 ? Math.floor(raw) : 160;
 })() * 1024 * 1024;
 /**
 * How many of each device's MOST RECENT frames are protected from a busy
 * neighbour's budget eviction. Sized to cover the late two-plane / cross-process
-* enrichment horizon (~150-500 ms): 6 frames ≈ 0.6 s @10 fps of guaranteed
-* survival for every active camera. Read ONCE from
-* `CAMSTACK_SESSION_RETAIN_FLOOR`; `0` disables the floor (pure global FIFO — the
-* pre-2026-07-19 behaviour). The hard byte ceiling always overrides the floor,
-* so this can never push retention past {@link RETAINED_FRAME_BUDGET_BYTES}.
+* enrichment horizon (~150-500 ms) at the REAL delivered rate: the store writes
+* every DELIVERED rgb frame, and a high-fps camera delivers ~25 fps (observed on
+* the 4K outdoor cams), so the old floor of 6 protected only ~240 ms there and
+* its late captures hit "frame recycled before resolve" (2026-07-22 triage —
+* missing thumbnails/firstFrames concentrated on exactly those cameras).
+* 16 frames ≈ 0.64 s @25 fps (1.6 s @10 fps). Only ACTIVE cameras hold frames,
+* so the worst-case protected footprint stays well inside the byte budget for
+* realistic concurrency (4 active cams ≈ 44 MB of 96); the hard ceiling always
+* overrides the floor regardless. Read ONCE from `CAMSTACK_SESSION_RETAIN_FLOOR`;
+* `0` disables the floor (pure global FIFO — the pre-2026-07-19 behaviour).
 */
 var RETAINED_FRAME_PER_DEVICE_FLOOR = (() => {
 	const raw = Number(process.env["CAMSTACK_SESSION_RETAIN_FLOOR"]);
-	return Number.isFinite(raw) && raw >= 0 ? Math.floor(raw) : 6;
+	return Number.isFinite(raw) && raw >= 0 ? Math.floor(raw) : 16;
+})();
+/**
+* TIME-based per-device protection (2026-07-23 cold-window fix): a frame
+* YOUNGER than this survives budget eviction regardless of how many frames
+* its device holds. The COUNT floor above protects a fixed number of frames —
+* but the wall-clock window that buys depends on the delivered fps (16 frames
+* = 1.6 s @10 fps but only 0.64 s @25 fps, and the 4K street cams deliver
+* ~25). The late-capture horizon is TIME (session attach + enrichment +
+* round-trip ≈ 0.5–1.5 s, worst on cold on-motion dials), so the guarantee
+* must be time-denominated: 12/13 of the zero-media/missing-firstFrame tracks
+* in the 2026-07-23 audit were ≤6 s cold-session subjects whose handles were
+* recycled before their first captures ran. Bounded by the hard byte ceiling
+* (pass 2) exactly like the count floor — worst case ~26 MB per ACTIVE camera
+* @25 fps. `CAMSTACK_SESSION_RETAIN_FLOOR_MS`; `0` disables (count floor only).
+*/
+var RETAINED_FRAME_TIME_FLOOR_MS = (() => {
+	const raw = Number(process.env["CAMSTACK_SESSION_RETAIN_FLOOR_MS"]);
+	return Number.isFinite(raw) && raw >= 0 ? Math.floor(raw) : 3e3;
 })();
 /** Opaque RAM-key prefix stamped into a retained frame's `FrameHandle.shmId`. */
 var RETAINED_FRAME_KEY_PREFIX = "ram:";
@@ -1298,6 +1321,8 @@ var RetainedFrameStore = class RetainedFrameStore {
 	nodeId;
 	budgetBytes;
 	perDeviceFloor;
+	timeFloorMs;
+	now;
 	/** Insertion-ordered (Map) → globally oldest is `keys().next()`. */
 	entries = /* @__PURE__ */ new Map();
 	/**
@@ -1314,6 +1339,8 @@ var RetainedFrameStore = class RetainedFrameStore {
 		this.nodeId = options.nodeId;
 		this.budgetBytes = options.budgetBytes ?? RETAINED_FRAME_BUDGET_BYTES;
 		this.perDeviceFloor = options.perDeviceFloor ?? RETAINED_FRAME_PER_DEVICE_FLOOR;
+		this.timeFloorMs = options.timeFloorMs ?? RETAINED_FRAME_TIME_FLOOR_MS;
+		this.now = options.now ?? Date.now;
 	}
 	/** Number of retained frames (tests / metrics). */
 	get size() {
@@ -1349,7 +1376,8 @@ var RetainedFrameStore = class RetainedFrameStore {
 		const key = keyOf(handle);
 		this.entries.set(key, {
 			frame,
-			deviceId
+			deviceId,
+			writtenAt: this.now()
 		});
 		const deviceKeys = this.perDeviceKeys.get(deviceId);
 		if (deviceKeys) deviceKeys.push(key);
@@ -1394,6 +1422,16 @@ var RetainedFrameStore = class RetainedFrameStore {
 	evictToBudget() {
 		if (this.bytes <= this.budgetBytes) return;
 		const oldestFirst = [...this.entries.keys()];
+		const nowMs = this.now();
+		for (const key of oldestFirst) {
+			if (this.bytes <= this.budgetBytes || this.entries.size <= 1) break;
+			const entry = this.entries.get(key);
+			if (!entry) continue;
+			if (this.timeFloorMs > 0 && nowMs - entry.writtenAt < this.timeFloorMs) continue;
+			const deviceKeys = this.perDeviceKeys.get(entry.deviceId);
+			if (deviceKeys && deviceKeys.length > this.perDeviceFloor) this.dropKey(key);
+		}
+		if (this.bytes <= this.budgetBytes) return;
 		for (const key of oldestFirst) {
 			if (this.bytes <= this.budgetBytes || this.entries.size <= 1) break;
 			const entry = this.entries.get(key);
@@ -1461,40 +1499,6 @@ function cropRgb(frame, bbox, maxWidth) {
 		height: outH
 	};
 }
-var ThumbSamplerPolicy = class {
-	intervalMs;
-	minGapMs;
-	now;
-	/** Last accepted-sample wall clock per device. */
-	lastAcceptedAt = /* @__PURE__ */ new Map();
-	constructor(options) {
-		this.intervalMs = Math.max(0, options.intervalMs);
-		this.minGapMs = Math.max(0, options.minGapMs ?? 1e3);
-		this.now = options.now ?? (() => Date.now());
-	}
-	/**
-	* Decide whether to sample `deviceId` now. Returns true (and records the
-	* acceptance) when the larger of `intervalMs` / `minGapMs` has elapsed since
-	* the last accepted sample for this device; false otherwise. The FIRST call
-	* for a device always samples (cold start).
-	*/
-	shouldSample(deviceId) {
-		const now = this.now();
-		const gate = Math.max(this.intervalMs, this.minGapMs);
-		const last = this.lastAcceptedAt.get(deviceId);
-		if (last !== void 0 && now - last < gate) return false;
-		this.lastAcceptedAt.set(deviceId, now);
-		return true;
-	}
-	/** Forget a device (detach / phase exit) so its next frame cold-starts. */
-	forget(deviceId) {
-		this.lastAcceptedAt.delete(deviceId);
-	}
-	/** Drop all per-device state (shutdown). */
-	clear() {
-		this.lastAcceptedAt.clear();
-	}
-};
 //#endregion
 //#region src/session-decode/session-decode-coordinator.ts
 /** How long to wait after `kill()` before escalating to `kill('SIGKILL')`. */
@@ -2353,8 +2357,6 @@ function resolveStepDevice(input) {
 //#region src/pipeline-runner/index.ts
 var DEFAULT_CONFIG = {
 	maxQueueDepth: 30,
-	thumbnailsEnabled: true,
-	thumbnailSampleMs: 5e3,
 	maxConcurrentInferences: 16,
 	targetLoadPercent: 80,
 	minThrottledFps: 1,
@@ -2676,12 +2678,6 @@ var PipelineRunnerAddon = class extends BaseAddon {
 	* Initialised in {@link onInitialize} once `nodeId` is known.
 	*/
 	retainedFrames = null;
-	/**
-	* Scrub-thumbnail sampler policy (2026-07-16). Gates the per-camera JPEG
-	* encode to ~1 / `thumbnailSampleMs` (with a hard 1 Hz ceiling) so the cost
-	* stays a couple ms of sharp every few seconds. Null until `onInitialize`.
-	*/
-	thumbSampler = null;
 	attached = /* @__PURE__ */ new Map();
 	nodeId = "unknown";
 	metricsSnapshotTimer = null;
@@ -2809,7 +2805,6 @@ var PipelineRunnerAddon = class extends BaseAddon {
 			nodeId: this.nodeId,
 			logger: this.ctx.logger.child("retained-frames")
 		});
-		this.thumbSampler = new ThumbSamplerPolicy({ intervalMs: this.config.thumbnailSampleMs });
 		this.runner = new PipelineRunner({
 			maxQueueDepth: this.config.maxQueueDepth,
 			maxConcurrentInferences: this.config.maxConcurrentInferences,
@@ -2900,8 +2895,6 @@ var PipelineRunnerAddon = class extends BaseAddon {
 		this.nativeCropRegistry.clear();
 		this.retainedFrames?.clear();
 		this.retainedFrames = null;
-		this.thumbSampler?.clear();
-		this.thumbSampler = null;
 	}
 	async cacheBenchFrame(input) {
 		const sharp = (await import("sharp")).default;
@@ -3468,59 +3461,6 @@ var PipelineRunnerAddon = class extends BaseAddon {
 			frameSpace: denormalizeRect(paddedBbox, handle.width, handle.height)
 		};
 	}
-	/**
-	* Scrub-thumbnail sampler (2026-07-16). Rides the already-decoded rgb
-	* detection frame: at most once per `thumbnailSampleMs` per camera (policy
-	* enforces a 1 Hz hard ceiling), downscale to a ~320px JPEG and emit it as
-	* `recording.thumb-sampled` telemetry. The recorder (single designated node)
-	* packs 5-minute sprite sheets from these. Fire-and-forget — a failed encode
-	* is logged at debug and never disturbs the decode/detect path. Zero extra
-	* decode (frame exists); one sharp encode per cadence per camera (D9: a
-	* compressed payload at 1/5 Hz, never raw pixels at frame-rate).
-	*/
-	maybeSampleThumbnail(deviceId, frame) {
-		if (!this.config.thumbnailsEnabled) return;
-		const sampler = this.thumbSampler;
-		if (!sampler || frame.format !== "rgb") return;
-		if (!sampler.shouldSample(deviceId)) return;
-		const capturedAt = typeof frame.capturedAt === "number" && frame.capturedAt > 0 ? frame.capturedAt : Date.now();
-		const width = frame.width;
-		const height = frame.height;
-		const data = frame.data;
-		(async () => {
-			try {
-				const targetW = Math.min(480, width);
-				const image = sharp(data, { raw: {
-					width,
-					height,
-					channels: 3
-				} });
-				if (targetW < width) image.resize(targetW);
-				const jpeg = await image.jpeg({ quality: 60 }).toBuffer();
-				const meta = {
-					width: targetW,
-					height: Math.round(targetW * height / width)
-				};
-				this.ctxIfReady?.eventBus.emit(createEvent(EventCategory.RecordingThumbSampled, {
-					type: "pipeline",
-					id: deviceId,
-					nodeId: this.nodeId,
-					deviceId
-				}, {
-					deviceId,
-					capturedAt,
-					width: meta.width,
-					height: meta.height,
-					jpeg: new Uint8Array(jpeg)
-				}));
-			} catch (err) {
-				this.ctx?.logger.debug("thumbnail sample encode failed", {
-					tags: { deviceId },
-					meta: { error: err instanceof Error ? err.message : String(err) }
-				});
-			}
-		})();
-	}
 	/** Real `runPipeline` dep: node-local `pipelineExecutor.runPipeline` on the `'full'` plane. */
 	async runDetailPipeline(steps, imageJpeg, deviceId, stepDeviceKey, nativeCropRef) {
 		const api = this.ctxIfReady?.api;
@@ -3601,7 +3541,6 @@ var PipelineRunnerAddon = class extends BaseAddon {
 		attachment.detectionUnsubscribe?.();
 		this.lastMotionFrameAt.delete(deviceId);
 		this.lastDecodeUnexpectedEndAt.delete(deviceId);
-		this.thumbSampler?.forget(deviceId);
 		this.packageGovernor.forget(deviceId);
 		const warnPrefix = `${deviceId}:`;
 		for (const key of this.warnedNoJumpDevice) if (key.startsWith(warnPrefix)) this.warnedNoJumpDevice.delete(key);
@@ -3848,7 +3787,6 @@ var PipelineRunnerAddon = class extends BaseAddon {
 						const handle = retainedFrames?.write(config.deviceId, frame) ?? void 0;
 						if (handle && nativeCrop) this.nativeCropRegistry.register(handle, nativeCrop);
 						this.enqueueSharedDetectionFrame(config.deviceId, frame, handle);
-						this.maybeSampleThumbnail(config.deviceId, frame);
 					}
 				});
 			}
@@ -4516,31 +4454,12 @@ var PipelineRunnerAddon = class extends BaseAddon {
 					step: 1,
 					default: DEFAULT_CONFIG.maxConcurrentDecodeSpawns,
 					showValue: true
-				},
-				{
-					type: "boolean",
-					key: "thumbnailsEnabled",
-					label: "Scrub thumbnails",
-					description: "Sample the already-decoded detection frame into small JPEG scrub thumbnails (zero extra decode). The recorder packs them into 5-minute sprite sheets the viewer timeline scrubs. Disable to stop emitting thumbnail telemetry from this node.",
-					default: DEFAULT_CONFIG.thumbnailsEnabled
-				},
-				{
-					type: "slider",
-					key: "thumbnailSampleMs",
-					label: "Thumbnail cadence (ms)",
-					description: "How often (ms) each camera contributes a scrub thumbnail. Lower = denser scrub preview + more storage; a hard 1 Hz ceiling always applies. Default 5000.",
-					min: 1e3,
-					max: 3e4,
-					step: 1e3,
-					default: DEFAULT_CONFIG.thumbnailSampleMs,
-					showValue: true
 				}
 			]
 		}] });
 	}
 	async onConfigChanged() {
 		this.runner?.updateLimits(this.config);
-		this.thumbSampler = new ThumbSamplerPolicy({ intervalMs: this.config.thumbnailSampleMs });
 		this.spawnGate?.resize(Math.max(1, this.config.maxConcurrentDecodeSpawns));
 		this.ctx.logger.info("pipeline-runner tuning updated", { meta: {
 			maxQueueDepth: this.config.maxQueueDepth,