@camstack/addon-pipeline 1.1.39 → 1.1.41

package/dist/{frame-handle-plane-B7jMIZc2.js → frame-handle-plane-BP8YV4sF.js}

@@ -1,4 +1,4 @@
-const require_dist = require("./dist-DbGdZ8Nr.js");
+const require_dist = require("./dist-BJTPkJFw.js");
 let node_crypto = require("node:crypto");
 //#region src/stream-broker/stream-broker/decoder-session-proxy.ts
 /**
@@ -173,6 +173,27 @@ var DECODE_FPS_WINDOW_MS = 2e3;
 */
 var SESSION_LINGER_MS = 45e3;
 /**
+* Short keep-warm grace for a PURE-OCCUPANCY session (every remaining
+* subscriber is a periodic on-motion occupancy recheck, tag `'occupancy'`).
+*
+* Occupancy rechecks subscribe to decoded frames for ~1s every ~30s. The
+* normal `SESSION_LINGER_MS` (45s) EXCEEDS that ~30s interval, so the linger
+* timer is perpetually cancelled by the next recheck before it can fire — the
+* decoder never tears down and decodes continuously at source-rate to serve a
+* 1s/30s consumer (~30x wasted decode; multiplied across cameras this is the
+* iGPU baseline that saturated the decoder). A pure-occupancy session instead
+* tears down between polls: short enough to fire well before the next ~30s
+* recheck, long enough to absorb the ~1s poll plus minor jitter. Re-dial is
+* cheap on GPU-scale decode and the restream burst re-primes the live edge
+* fast, so on-demand re-arm on the next recheck is fine.
+*/
+var OCCUPANCY_LINGER_MS = 5e3;
+/** Subscription tag emitted by the periodic on-motion occupancy recheck. A
+*  session whose subscribers have only ever carried this tag gets the short
+*  `OCCUPANCY_LINGER_MS` teardown; any other subscriber biases to the long
+*  `SESSION_LINGER_MS` warm linger (interactive viewers, detection, motion). */
+var OCCUPANCY_TAG = "occupancy";
+/**
 * Default retry cooldown after a decoder session lands on a NON-LOCAL node
 * (see `FrameHandlePlaneOptions.sessionRetryCooldownMs`). Long enough to
 * turn a per-packet storm into a slow probe; short enough that the plane
@@ -190,6 +211,7 @@ var FrameHandlePlane = class {
 	localNodeId;
 	sessionRetryCooldownMs;
 	getSeedPackets;
+	isDebugEnabled;
 	subscriptions = /* @__PURE__ */ new Map();
 	sessions = /* @__PURE__ */ new Map();
 	/** Per-format retry gate set when a session lands on a non-local node:
@@ -219,6 +241,7 @@ var FrameHandlePlane = class {
 		this.localNodeId = options.localNodeId;
 		this.sessionRetryCooldownMs = options.sessionRetryCooldownMs ?? SESSION_RETRY_COOLDOWN_MS;
 		this.getSeedPackets = options.getSeedPackets;
+		this.isDebugEnabled = options.isDebugEnabled;
 	}
 	/** Number of active handle subscriptions — surfaced for diagnostics. */
 	get subscriberCount() {
@@ -375,15 +398,33 @@ var FrameHandlePlane = class {
 	*/
 	scheduleLinger(session) {
 		this.clearLinger(session);
+		const occupancyOnly = !session.hasNonOccupancySubscriberEver;
+		const lingerMs = occupancyOnly ? OCCUPANCY_LINGER_MS : SESSION_LINGER_MS;
+		this.logger?.debug(occupancyOnly ? "frame-handle plane: short occupancy linger scheduled" : "frame-handle plane: keep-warm linger scheduled", { meta: {
+			format: session.format,
+			lingerMs,
+			occupancyOnly
+		} });
 		const timer = setTimeout(() => {
 			session.lingerTimer = null;
 			if (session.subscriberIds.size > 0) return;
 			this.sessions.delete(session.format);
 			this.destroySession(session).catch(() => {});
-		}, SESSION_LINGER_MS);
+		}, lingerMs);
 		timer.unref?.();
 		session.lingerTimer = timer;
 	}
+	/**
+	* Latch `session.hasNonOccupancySubscriberEver` when the subscription
+	* `subscriptionId` carries any tag other than `OCCUPANCY_TAG`. Called at
+	* every point a subscription is attached to a session so the keep-warm
+	* decision only fast-tears-down sessions that have been PURELY on-demand
+	* occupancy rechecks. Unknown ids (mid-teardown) are ignored.
+	*/
+	noteSessionSubscriberTag(session, subscriptionId) {
+		const subscription = this.subscriptions.get(subscriptionId);
+		if (subscription && subscription.tag !== OCCUPANCY_TAG) session.hasNonOccupancySubscriberEver = true;
+	}
 	/** Cancel a session's pending keep-warm teardown timer, if any. */
 	clearLinger(session) {
 		if (session.lingerTimer) {
@@ -563,12 +604,17 @@ var FrameHandlePlane = class {
 		if (existing) {
 			this.clearLinger(existing);
 			existing.subscriberIds.add(subscriptionId);
+			this.noteSessionSubscriberTag(existing, subscriptionId);
 			return;
 		}
 		const inflight = this.sessionCreating.get(format);
 		if (inflight) {
 			await inflight;
-			this.sessions.get(format)?.subscriberIds.add(subscriptionId);
+			const session = this.sessions.get(format);
+			if (session) {
+				session.subscriberIds.add(subscriptionId);
+				this.noteSessionSubscriberTag(session, subscriptionId);
+			}
 			return;
 		}
 		if (Date.now() < (this.sessionRetryCooldownUntil.get(format) ?? 0)) return;
@@ -583,8 +629,10 @@ var FrameHandlePlane = class {
 				bootstrapped: false,
 				pullMode: false,
 				targetFps: this.computeFormatFps(format),
-				lingerTimer: null
+				lingerTimer: null,
+				hasNonOccupancySubscriberEver: false
 			};
+			for (const id of subscriberIds) this.noteSessionSubscriberTag(session, id);
 			let started = false;
 			try {
 				started = await this.startSessionDecoder(session);
@@ -631,7 +679,8 @@ var FrameHandlePlane = class {
 			scale: 1,
 			frameSink: "shm",
 			...info.numericDeviceId !== void 0 ? { deviceId: info.numericDeviceId } : {},
-			tag: `${info.tag}:shm:${format}`
+			tag: `${info.tag}:shm:${format}`,
+			...this.isDebugEnabled?.() ? { debug: true } : {}
 		});
 		if (!isDecoderNodeColocated(this.localNodeId, nodeId)) {
 			this.sessionRetryCooldownUntil.set(format, Date.now() + this.sessionRetryCooldownMs);

package/dist/{frame-handle-plane-BFzoIfkd.mjs → frame-handle-plane-DKAXTtfn.mjs}

@@ -1,4 +1,4 @@
-import { I as errMsg, d as RingBuffer } from "./dist-DvvYzO58.mjs";
+import { I as errMsg, d as RingBuffer } from "./dist-v6cKLmU3.mjs";
 import { randomUUID } from "node:crypto";
 //#region src/stream-broker/stream-broker/decoder-session-proxy.ts
 /**
@@ -173,6 +173,27 @@ var DECODE_FPS_WINDOW_MS = 2e3;
 */
 var SESSION_LINGER_MS = 45e3;
 /**
+* Short keep-warm grace for a PURE-OCCUPANCY session (every remaining
+* subscriber is a periodic on-motion occupancy recheck, tag `'occupancy'`).
+*
+* Occupancy rechecks subscribe to decoded frames for ~1s every ~30s. The
+* normal `SESSION_LINGER_MS` (45s) EXCEEDS that ~30s interval, so the linger
+* timer is perpetually cancelled by the next recheck before it can fire — the
+* decoder never tears down and decodes continuously at source-rate to serve a
+* 1s/30s consumer (~30x wasted decode; multiplied across cameras this is the
+* iGPU baseline that saturated the decoder). A pure-occupancy session instead
+* tears down between polls: short enough to fire well before the next ~30s
+* recheck, long enough to absorb the ~1s poll plus minor jitter. Re-dial is
+* cheap on GPU-scale decode and the restream burst re-primes the live edge
+* fast, so on-demand re-arm on the next recheck is fine.
+*/
+var OCCUPANCY_LINGER_MS = 5e3;
+/** Subscription tag emitted by the periodic on-motion occupancy recheck. A
+*  session whose subscribers have only ever carried this tag gets the short
+*  `OCCUPANCY_LINGER_MS` teardown; any other subscriber biases to the long
+*  `SESSION_LINGER_MS` warm linger (interactive viewers, detection, motion). */
+var OCCUPANCY_TAG = "occupancy";
+/**
 * Default retry cooldown after a decoder session lands on a NON-LOCAL node
 * (see `FrameHandlePlaneOptions.sessionRetryCooldownMs`). Long enough to
 * turn a per-packet storm into a slow probe; short enough that the plane
@@ -190,6 +211,7 @@ var FrameHandlePlane = class {
 	localNodeId;
 	sessionRetryCooldownMs;
 	getSeedPackets;
+	isDebugEnabled;
 	subscriptions = /* @__PURE__ */ new Map();
 	sessions = /* @__PURE__ */ new Map();
 	/** Per-format retry gate set when a session lands on a non-local node:
@@ -219,6 +241,7 @@ var FrameHandlePlane = class {
 		this.localNodeId = options.localNodeId;
 		this.sessionRetryCooldownMs = options.sessionRetryCooldownMs ?? SESSION_RETRY_COOLDOWN_MS;
 		this.getSeedPackets = options.getSeedPackets;
+		this.isDebugEnabled = options.isDebugEnabled;
 	}
 	/** Number of active handle subscriptions — surfaced for diagnostics. */
 	get subscriberCount() {
@@ -375,15 +398,33 @@ var FrameHandlePlane = class {
 	*/
 	scheduleLinger(session) {
 		this.clearLinger(session);
+		const occupancyOnly = !session.hasNonOccupancySubscriberEver;
+		const lingerMs = occupancyOnly ? OCCUPANCY_LINGER_MS : SESSION_LINGER_MS;
+		this.logger?.debug(occupancyOnly ? "frame-handle plane: short occupancy linger scheduled" : "frame-handle plane: keep-warm linger scheduled", { meta: {
+			format: session.format,
+			lingerMs,
+			occupancyOnly
+		} });
 		const timer = setTimeout(() => {
 			session.lingerTimer = null;
 			if (session.subscriberIds.size > 0) return;
 			this.sessions.delete(session.format);
 			this.destroySession(session).catch(() => {});
-		}, SESSION_LINGER_MS);
+		}, lingerMs);
 		timer.unref?.();
 		session.lingerTimer = timer;
 	}
+	/**
+	* Latch `session.hasNonOccupancySubscriberEver` when the subscription
+	* `subscriptionId` carries any tag other than `OCCUPANCY_TAG`. Called at
+	* every point a subscription is attached to a session so the keep-warm
+	* decision only fast-tears-down sessions that have been PURELY on-demand
+	* occupancy rechecks. Unknown ids (mid-teardown) are ignored.
+	*/
+	noteSessionSubscriberTag(session, subscriptionId) {
+		const subscription = this.subscriptions.get(subscriptionId);
+		if (subscription && subscription.tag !== OCCUPANCY_TAG) session.hasNonOccupancySubscriberEver = true;
+	}
 	/** Cancel a session's pending keep-warm teardown timer, if any. */
 	clearLinger(session) {
 		if (session.lingerTimer) {
@@ -563,12 +604,17 @@ var FrameHandlePlane = class {
 		if (existing) {
 			this.clearLinger(existing);
 			existing.subscriberIds.add(subscriptionId);
+			this.noteSessionSubscriberTag(existing, subscriptionId);
 			return;
 		}
 		const inflight = this.sessionCreating.get(format);
 		if (inflight) {
 			await inflight;
-			this.sessions.get(format)?.subscriberIds.add(subscriptionId);
+			const session = this.sessions.get(format);
+			if (session) {
+				session.subscriberIds.add(subscriptionId);
+				this.noteSessionSubscriberTag(session, subscriptionId);
+			}
 			return;
 		}
 		if (Date.now() < (this.sessionRetryCooldownUntil.get(format) ?? 0)) return;
@@ -583,8 +629,10 @@ var FrameHandlePlane = class {
 				bootstrapped: false,
 				pullMode: false,
 				targetFps: this.computeFormatFps(format),
-				lingerTimer: null
+				lingerTimer: null,
+				hasNonOccupancySubscriberEver: false
 			};
+			for (const id of subscriberIds) this.noteSessionSubscriberTag(session, id);
 			let started = false;
 			try {
 				started = await this.startSessionDecoder(session);
@@ -631,7 +679,8 @@ var FrameHandlePlane = class {
 			scale: 1,
 			frameSink: "shm",
 			...info.numericDeviceId !== void 0 ? { deviceId: info.numericDeviceId } : {},
-			tag: `${info.tag}:shm:${format}`
+			tag: `${info.tag}:shm:${format}`,
+			...this.isDebugEnabled?.() ? { debug: true } : {}
 		});
 		if (!isDecoderNodeColocated(this.localNodeId, nodeId)) {
 			this.sessionRetryCooldownUntil.set(format, Date.now() + this.sessionRetryCooldownMs);

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-DbGdZ8Nr.js");
+const require_dist = require("../dist-BJTPkJFw.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 { B as DeviceType, E as motionDetectionCapability, L as BaseAddon, U as hydrateSchema, x as evaluateZoneRules } from "../dist-DvvYzO58.mjs";
+import { B as DeviceType, E as motionDetectionCapability, L as BaseAddon, U as hydrateSchema, x as evaluateZoneRules } from "../dist-v6cKLmU3.mjs";
 import { FrameRingReaderCache } from "@camstack/shm-ring";
 import { readFileSync } from "node:fs";
 import { join } from "node:path";