@camstack/addon-pipeline 1.2.135 → 1.2.137

package/dist/pipeline-runner/index.js

@@ -2,16 +2,17 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_dist = require("../dist-BzLiQ8Ue.js");
-const require_event_loop_stall_monitor = require("../event-loop-stall-monitor-DjV4Bow7.js");
-const require_worker_protocol = require("../worker-protocol-DvTZBvh2.js");
+const require_dist = require("../dist-4EMKvxCp.js");
+const require_node = require("../node-BOHn8gpk.js");
+const require_event_loop_stall_monitor = require("../event-loop-stall-monitor-DDm07Ei6.js");
+const require_worker_protocol = require("../worker-protocol-BLfaD5uC.js");
 const require_hub_hostname = require("../hub-hostname-DAJXlOgV.js");
-const require_lazy_sharp = require("../lazy-sharp-DxWmhTqk.js");
+const require_lazy_sharp = require("../lazy-sharp-BlA9PxWk.js");
 const require_restream_intent = require("../restream-intent-Cv9x3jmu.js");
 const require_remote_restream = require("../remote-restream-CO36Sr30.js");
+let node_child_process = require("node:child_process");
 let sharp = require("sharp");
 sharp = require_dist.__toESM(sharp);
-let node_child_process = require("node:child_process");
 let node_url = require("node:url");
 let node_perf_hooks = require("node:perf_hooks");
 let node_os = require("node:os");
@@ -29,9 +30,18 @@ var KILL_SIGNALS = {
 	SIGKILL: "SIGKILL",
 	SIGTERM: "SIGTERM"
 };
-/** Adapt a Node {@link ChildProcess} to the coordinator's {@link ForkedChildLike}. */
-function wrapChild(child) {
+/**
+* Adapt a Node {@link ChildProcess} to the coordinator's
+* {@link ForkedChildLike}.
+*
+* `onExit` is invoked exactly once, on the child's real exit, before the
+* coordinator's own listener — it is how the cost claim is released. It is a
+* parameter rather than a second `child.on('exit')` in the caller because
+* every listener added out here is one somebody can forget to remove.
+*/
+function wrapChild(child, onExit) {
 	child.on("error", () => void 0);
+	child.on("exit", onExit);
 	return {
 		send: (msg) => {
 			if (!child.connected) return;
@@ -75,14 +85,21 @@ function wrapChild(child) {
 * node-av through `CAMSTACK_FRAMEWORK_DIR` / `CAMSTACK_BUNDLED_ADDONS_DIR` on
 * agents, so a replaced env would silently break decoding off the hub.
 */
-function forkDecodeWorker(_source, leaseOverride = {}) {
-	return wrapChild((0, node_child_process.fork)(CHILD_ENTRY_PATH, [], {
+function forkDecodeWorker(source, leaseOverride = {}, costRegistry) {
+	const child = (0, node_child_process.fork)(CHILD_ENTRY_PATH, [], {
 		serialization: "advanced",
 		env: {
 			...process.env,
 			...require_worker_protocol.nativeLeaseSettingEnv(leaseOverride)
 		}
-	}));
+	});
+	const costClaim = costRegistry?.claim({
+		role: "decode",
+		deviceId: source.deviceId,
+		unit: `${source.deviceId}/decode`,
+		pid: child.pid
+	}) ?? require_node.NO_COST_CLAIM;
+	return wrapChild(child, () => costClaim.release());
 }
 //#endregion
 //#region src/session-decode/guarded-session-decode.ts
@@ -5210,6 +5227,12 @@ var METRICS_HEARTBEAT_MS = 3e4;
 var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAddon {
 	runner = null;
 	/**
+	* The decode-worker children this addon forked, claimed at the fork and
+	* released at their exit. One registry per PROCESS; it dies with the
+	* process, which is correct — those workers were this process's children.
+	*/
+	costRegistry = new require_node.ChildCostRegistry();
+	/**
 	* Per-runner (per-node) decode-worker SPAWN-CONCURRENCY GATE (P5). A single
 	* counting semaphore every session-decode fork (detection + motion, all
 	* cameras on this node) passes through, sized to
@@ -5511,6 +5534,9 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 			providers: [{
 				capability: require_dist.pipelineRunnerCapability,
 				provider: this
+			}, {
+				capability: require_dist.loadContributionCapability,
+				provider: { list: () => this.costRegistry.contributions() }
 			}],
 			customActions: pipelineRunnerBenchActions,
 			actionHandlers: {
@@ -6660,7 +6686,7 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends require_dist.BaseAdd
 	* knobs are read at spawn, so a changed setting reaches NEW sessions and
 	* leaves running ones alone (a live session would have to be re-dialled).
 	*/
-	forkDecodeWorkerWithLease = (source) => forkDecodeWorker(source, this.nativeLease.current());
+	forkDecodeWorkerWithLease = (source) => forkDecodeWorker(source, this.nativeLease.current(), this.costRegistry);
 	/**
 	* Refresh the lease knobs before a decode worker is spawned. Awaited on the
 	* `acquire` leg of `startGuardedSessionDecode` (which always completes before

package/dist/pipeline-runner/index.mjs

@@ -1,12 +1,13 @@
-import { $t as EventCategory, B as defineCustomActions, H as deriveDetailCropRect, Ht as _enum, Jt as number, Kt as lazy, L as customAction, Lt as nodePin, Mt as createEvent, Ot as BaseAddon, St as errMsg, Ut as array, Wt as boolean, Yt as object, Zt as string, ct as pickNativeLeaseOverride, m as DEVICE_BACKEND_TO_FORMAT, p as DEFAULT_NATIVE_LEASE_SETTINGS, qt as literal, st as pickDetailCropConvention, u as DEFAULT_DETAIL_CROP_CONVENTION, ut as pipelineRunnerCapability } from "../dist-C1dXLLQq.mjs";
-import { i as resolveFrameViewGeometry, r as localFrameRegistry, t as attributeStall, u as getStepDefinition } from "../event-loop-stall-monitor-CU-xxX5c.mjs";
-import { a as nativeLeaseSettingEnv, t as isWorkerReply } from "../worker-protocol-DxsVx0G7.mjs";
+import { $ as loadContributionCapability, B as defineCustomActions, Ct as errMsg, Gt as boolean, H as deriveDetailCropRect, Jt as literal, L as customAction, Nt as createEvent, Qt as string, Rt as nodePin, Ut as _enum, Wt as array, Xt as object, Yt as number, ct as pickDetailCropConvention, dt as pipelineRunnerCapability, en as EventCategory, kt as BaseAddon, lt as pickNativeLeaseOverride, m as DEVICE_BACKEND_TO_FORMAT, p as DEFAULT_NATIVE_LEASE_SETTINGS, qt as lazy, u as DEFAULT_DETAIL_CROP_CONVENTION } from "../dist-g0Or5_pR.mjs";
+import { i as NO_COST_CLAIM, t as ChildCostRegistry } from "../node-Bo1g8hLO.mjs";
+import { i as resolveFrameViewGeometry, r as localFrameRegistry, t as attributeStall, u as getStepDefinition } from "../event-loop-stall-monitor-CskL9Lgu.mjs";
+import { a as nativeLeaseSettingEnv, t as isWorkerReply } from "../worker-protocol-vc8WWhjx.mjs";
 import { t as resolveHubHostname } from "../hub-hostname-cCknRYKj.mjs";
-import { t as getSharp } from "../lazy-sharp-BtT5x-qP.mjs";
+import { t as getSharp } from "../lazy-sharp-DXsqwpph.mjs";
 import { n as withDetectionIntent } from "../restream-intent-B4BXZra7.mjs";
 import { n as profileForStreamId, t as isRemoteRestream } from "../remote-restream-BeHi78PZ.mjs";
-import sharp from "sharp";
 import { fork } from "node:child_process";
+import sharp from "sharp";
 import { fileURLToPath } from "node:url";
 import { PerformanceObserver } from "node:perf_hooks";
 import * as os from "node:os";
@@ -23,9 +24,18 @@ var KILL_SIGNALS = {
 	SIGKILL: "SIGKILL",
 	SIGTERM: "SIGTERM"
 };
-/** Adapt a Node {@link ChildProcess} to the coordinator's {@link ForkedChildLike}. */
-function wrapChild(child) {
+/**
+* Adapt a Node {@link ChildProcess} to the coordinator's
+* {@link ForkedChildLike}.
+*
+* `onExit` is invoked exactly once, on the child's real exit, before the
+* coordinator's own listener — it is how the cost claim is released. It is a
+* parameter rather than a second `child.on('exit')` in the caller because
+* every listener added out here is one somebody can forget to remove.
+*/
+function wrapChild(child, onExit) {
 	child.on("error", () => void 0);
+	child.on("exit", onExit);
 	return {
 		send: (msg) => {
 			if (!child.connected) return;
@@ -69,14 +79,21 @@ function wrapChild(child) {
 * node-av through `CAMSTACK_FRAMEWORK_DIR` / `CAMSTACK_BUNDLED_ADDONS_DIR` on
 * agents, so a replaced env would silently break decoding off the hub.
 */
-function forkDecodeWorker(_source, leaseOverride = {}) {
-	return wrapChild(fork(CHILD_ENTRY_PATH, [], {
+function forkDecodeWorker(source, leaseOverride = {}, costRegistry) {
+	const child = fork(CHILD_ENTRY_PATH, [], {
 		serialization: "advanced",
 		env: {
 			...process.env,
 			...nativeLeaseSettingEnv(leaseOverride)
 		}
-	}));
+	});
+	const costClaim = costRegistry?.claim({
+		role: "decode",
+		deviceId: source.deviceId,
+		unit: `${source.deviceId}/decode`,
+		pid: child.pid
+	}) ?? NO_COST_CLAIM;
+	return wrapChild(child, () => costClaim.release());
 }
 //#endregion
 //#region src/session-decode/guarded-session-decode.ts
@@ -5203,6 +5220,12 @@ var METRICS_HEARTBEAT_MS = 3e4;
 var PipelineRunnerAddon = class PipelineRunnerAddon extends BaseAddon {
 	runner = null;
 	/**
+	* The decode-worker children this addon forked, claimed at the fork and
+	* released at their exit. One registry per PROCESS; it dies with the
+	* process, which is correct — those workers were this process's children.
+	*/
+	costRegistry = new ChildCostRegistry();
+	/**
 	* Per-runner (per-node) decode-worker SPAWN-CONCURRENCY GATE (P5). A single
 	* counting semaphore every session-decode fork (detection + motion, all
 	* cameras on this node) passes through, sized to
@@ -5504,6 +5527,9 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends BaseAddon {
 			providers: [{
 				capability: pipelineRunnerCapability,
 				provider: this
+			}, {
+				capability: loadContributionCapability,
+				provider: { list: () => this.costRegistry.contributions() }
 			}],
 			customActions: pipelineRunnerBenchActions,
 			actionHandlers: {
@@ -6653,7 +6679,7 @@ var PipelineRunnerAddon = class PipelineRunnerAddon extends BaseAddon {
 	* knobs are read at spawn, so a changed setting reaches NEW sessions and
 	* leaves running ones alone (a live session would have to be re-dialled).
 	*/
-	forkDecodeWorkerWithLease = (source) => forkDecodeWorker(source, this.nativeLease.current());
+	forkDecodeWorkerWithLease = (source) => forkDecodeWorker(source, this.nativeLease.current(), this.costRegistry);
 	/**
 	* Refresh the lease knobs before a decode worker is spawned. Awaited on the
 	* `acquire` leg of `startGuardedSessionDecode` (which always completes before

package/dist/{process-memory-CZK3D3kM.js → process-memory-C3084DOt.js}

@@ -1,7 +1,7 @@
-const require_dist = require("./dist-BzLiQ8Ue.js");
-let node_child_process = require("node:child_process");
+const require_dist = require("./dist-4EMKvxCp.js");
 let node_fs = require("node:fs");
 node_fs = require_dist.__toESM(node_fs);
+let node_child_process = require("node:child_process");
 //#region src/shared/node-topology-platform.ts
 /**
 * Pick a node's `{ platform, arch }` from the cluster topology. Returns an empty

package/dist/{process-memory-CaEwi5Cd.mjs → process-memory-DmrHWybb.mjs}

@@ -1,6 +1,6 @@
-import { it as parseProcStatus } from "./dist-C1dXLLQq.mjs";
-import { execFile } from "node:child_process";
+import { at as parseProcStatus } from "./dist-g0Or5_pR.mjs";
 import * as fs from "node:fs";
+import { execFile } from "node:child_process";
 //#region src/shared/node-topology-platform.ts
 /**
 * Pick a node's `{ platform, arch }` from the cluster topology. Returns an empty