@camstack/addon-pipeline 1.1.20 → 1.1.21

package/dist/{ffmpeg-args-common-c3p-nWtU.mjs → frame-dropper-CwkBTPGV.mjs}

@@ -1,24 +1,3 @@
-//#region src/stream-broker/stream-broker/frame-dropper.ts
-var FrameDropper = class {
-	intervalMs;
-	lastPassedAt = -Infinity;
-	constructor(maxFps) {
-		this.intervalMs = maxFps > 0 ? 1e3 / maxFps : 0;
-	}
-	shouldKeep() {
-		if (this.intervalMs === 0) return true;
-		const now = Date.now();
-		if (now - this.lastPassedAt >= this.intervalMs) {
-			this.lastPassedAt = now;
-			return true;
-		}
-		return false;
-	}
-	setMaxFps(maxFps) {
-		this.intervalMs = maxFps > 0 ? 1e3 / maxFps : 0;
-	}
-};
-//#endregion
 //#region src/stream-broker/stream-broker/ffmpeg-args-common.ts
 var AUDIO_ENCODER_BY_CODEC = {
 	opus: "libopus",
@@ -48,4 +27,25 @@ function logBannerArgs(level) {
 	];
 }
 //#endregion
-export { logBannerArgs as n, FrameDropper as r, audioEncoderArgs as t };
+//#region src/stream-broker/stream-broker/frame-dropper.ts
+var FrameDropper = class {
+	intervalMs;
+	lastPassedAt = -Infinity;
+	constructor(maxFps) {
+		this.intervalMs = maxFps > 0 ? 1e3 / maxFps : 0;
+	}
+	shouldKeep() {
+		if (this.intervalMs === 0) return true;
+		const now = Date.now();
+		if (now - this.lastPassedAt >= this.intervalMs) {
+			this.lastPassedAt = now;
+			return true;
+		}
+		return false;
+	}
+	setMaxFps(maxFps) {
+		this.intervalMs = maxFps > 0 ? 1e3 / maxFps : 0;
+	}
+};
+//#endregion
+export { audioEncoderArgs as n, logBannerArgs as r, FrameDropper as t };

package/dist/stream-broker/index.js

@@ -4,7 +4,7 @@ Object.defineProperties(exports, {
 });
 const require_model_download_service_C_IHWnXx = require("../model-download-service-C-IHWnXx-BnQ_awK4.js");
 const require_dist = require("../dist-BiP1gPeY.js");
-const require_ffmpeg_args_common = require("../ffmpeg-args-common-CASoNt42.js");
+const require_frame_dropper = require("../frame-dropper-7RTo_YyG.js");
 let node_fs = require("node:fs");
 node_fs = require_model_download_service_C_IHWnXx.__toESM(node_fs);
 let node_path = require("node:path");
@@ -352,6 +352,11 @@ var FrameHandlePlane = class {
 	localNodeId;
 	subscriptions = /* @__PURE__ */ new Map();
 	sessions = /* @__PURE__ */ new Map();
+	/** In-flight `ensureSession` creation per format. Coalesces concurrent
+	*  same-format callers onto ONE decoder session — without it two callers
+	*  both pass the `sessions.get` check, both `createSession` (two ffmpeg),
+	*  and the second registration orphans the first with no `destroySession`. */
+	sessionCreating = /* @__PURE__ */ new Map();
 	disposed = false;
 	/** Re-entrancy guard for `armPendingSessions` — collapses the per-packet
 	*  `pushPacket` calls into a single in-flight deferred-arm pass. */
@@ -626,15 +631,29 @@ var FrameHandlePlane = class {
 			existing.subscriberIds.add(subscriptionId);
 			return;
 		}
-		const subscriberIds = new Set([subscriptionId]);
-		for (const subscription of this.subscriptions.values()) if (subscription.format === format) subscriberIds.add(subscription.id);
-		const session = {
-			format,
-			proxy: null,
-			nodeId: null,
-			subscriberIds
-		};
-		if (await this.startSessionDecoder(session)) this.sessions.set(format, session);
+		const inflight = this.sessionCreating.get(format);
+		if (inflight) {
+			await inflight;
+			this.sessions.get(format)?.subscriberIds.add(subscriptionId);
+			return;
+		}
+		const creation = (async () => {
+			const subscriberIds = new Set([subscriptionId]);
+			for (const subscription of this.subscriptions.values()) if (subscription.format === format) subscriberIds.add(subscription.id);
+			const session = {
+				format,
+				proxy: null,
+				nodeId: null,
+				subscriberIds
+			};
+			if (await this.startSessionDecoder(session)) this.sessions.set(format, session);
+		})();
+		this.sessionCreating.set(format, creation);
+		try {
+			await creation;
+		} finally {
+			this.sessionCreating.delete(format);
+		}
 	}
 	/**
 	* Create the `frameSink: 'shm'` decoder for a `FormatSession` and start
@@ -6502,6 +6521,7 @@ var RtspListenServer = class RtspListenServer {
 			releaseOnce();
 		}, isMuted);
 		restreamer.addSession(session);
+		releaseOnce();
 		socket.unshift(Buffer.from(requestBuffer, "ascii"));
 	}
 	/**
@@ -6704,23 +6724,23 @@ function pickVideoEncoder(target, encoders, hwAccel) {
 /** Audio encoder args for a transcode target (preset values over the shared low-level builder). */
 function pickAudioEncoderArgs(audio) {
 	switch (audio) {
-		case "aac": return require_ffmpeg_args_common.audioEncoderArgs("aac", {
+		case "aac": return require_frame_dropper.audioEncoderArgs("aac", {
 			bitrateKbps: 128,
 			sampleRateHz: 48e3,
 			channels: 2
 		});
-		case "opus": return require_ffmpeg_args_common.audioEncoderArgs("opus", {
+		case "opus": return require_frame_dropper.audioEncoderArgs("opus", {
 			bitrateKbps: 64,
 			sampleRateHz: 48e3,
 			channels: 2
 		});
-		case "pcmu": return require_ffmpeg_args_common.audioEncoderArgs("pcmu", {
+		case "pcmu": return require_frame_dropper.audioEncoderArgs("pcmu", {
 			sampleRateHz: 8e3,
 			channels: 1
 		});
-		case "copy": return require_ffmpeg_args_common.audioEncoderArgs("copy");
+		case "copy": return require_frame_dropper.audioEncoderArgs("copy");
 		case "none": return ["-an"];
-		default: return require_ffmpeg_args_common.audioEncoderArgs("aac", { bitrateKbps: 128 });
+		default: return require_frame_dropper.audioEncoderArgs("aac", { bitrateKbps: 128 });
 	}
 }
 /**
@@ -6785,7 +6805,7 @@ function buildFfmpegArgs$1(inv) {
 	const threadArgs = inv.threadCount > 0 ? ["-threads", String(inv.threadCount)] : [];
 	const audioArgs = inv.sink.kind === "stdout" && (inv.sink.container === "h264" || inv.sink.container === "hevc") ? ["-an"] : pickAudioEncoderArgs(inv.audio);
 	return [
-		...require_ffmpeg_args_common.logBannerArgs("warning"),
+		...require_frame_dropper.logBannerArgs("warning"),
 		...decodeArgs,
 		"-rtsp_transport",
 		"tcp",
@@ -11586,7 +11606,7 @@ function planAudioSilencePadPackets(input) {
 *   audio plane honours the profile literally.
 */
 function buildTranscodeFfmpegArgs(inputFormat, profile, decodeHwAccel, sourceUrl) {
-	const args = [...require_ffmpeg_args_common.logBannerArgs("error")];
+	const args = [...require_frame_dropper.logBannerArgs("error")];
 	if (profile.inputArgs?.length) args.push(...profile.inputArgs);
 	if (decodeHwAccel && decodeHwAccel !== "none") args.push("-hwaccel", decodeHwAccel);
 	args.push("-fflags", "+discardcorrupt", "-rtsp_transport", "tcp", "-i", sourceUrl);
@@ -11608,7 +11628,7 @@ function buildTranscodeFfmpegArgs(inputFormat, profile, decodeHwAccel, sourceUrl
 	if (profile.audio === "passthrough") args.push("-an");
 	else {
 		const a = profile.audio;
-		args.push(...require_ffmpeg_args_common.audioEncoderArgs(a.codec, {
+		args.push(...require_frame_dropper.audioEncoderArgs(a.codec, {
 			bitrateKbps: a.bitrateKbps,
 			sampleRateHz: a.sampleRateHz,
 			channels: a.channels
@@ -16927,7 +16947,7 @@ function codecToInputFormat(codec) {
 function buildFfmpegArgs(config) {
 	const inputFormat = codecToInputFormat(config.codec);
 	const args = [
-		...require_ffmpeg_args_common.logBannerArgs("error"),
+		...require_frame_dropper.logBannerArgs("error"),
 		"-fflags",
 		"+nobuffer+flush_packets",
 		"-flags",
@@ -16964,7 +16984,7 @@ var FfmpegDecoderSession = class {
 	constructor(config, logger = noopLogger) {
 		this.config = { ...config };
 		this.logger = logger;
-		this.frameDropper = new require_ffmpeg_args_common.FrameDropper(config.maxFps);
+		this.frameDropper = new require_frame_dropper.FrameDropper(config.maxFps);
 		this.spawnFfmpeg();
 	}
 	spawnFfmpeg() {

package/dist/stream-broker/index.mjs

@@ -1,7 +1,7 @@
 import { t as __require } from "../chunk-BdkLduGY.mjs";
 import { A as nodePin, B as BaseAddon, D as maskUrlCredentials, G as asJsonObject, H as DeviceFeature, I as streamBrokerCapability, Q as parseProfileBrokerId, R as webrtcSessionCapability, U as DeviceType, V as CAM_PROFILE_ORDER, W as EventCategory, X as makeSourceBrokerId, Y as makeProfileBrokerId, c as EncodeProfileSchema, ct as object, dt as union, f as RingBuffer, it as discriminatedUnion, lt as record, m as addonWidgetsSourceCapability, ot as literal, q as createEvent, rt as boolean, st as number, tt as _enum, ut as string, v as cameraStreamsCapability, z as errMsg } from "../dist-tzhTTRq4.mjs";
 import { t as createFileDataPlaneHandler } from "../model-download-service-C-IHWnXx-3Mmeob3l.mjs";
-import { n as logBannerArgs, r as FrameDropper, t as audioEncoderArgs } from "../ffmpeg-args-common-c3p-nWtU.mjs";
+import { n as audioEncoderArgs, r as logBannerArgs, t as FrameDropper } from "../frame-dropper-CwkBTPGV.mjs";
 import { createRequire } from "node:module";
 import * as fs from "node:fs";
 import * as path$1 from "node:path";
@@ -348,6 +348,11 @@ var FrameHandlePlane = class {
 	localNodeId;
 	subscriptions = /* @__PURE__ */ new Map();
 	sessions = /* @__PURE__ */ new Map();
+	/** In-flight `ensureSession` creation per format. Coalesces concurrent
+	*  same-format callers onto ONE decoder session — without it two callers
+	*  both pass the `sessions.get` check, both `createSession` (two ffmpeg),
+	*  and the second registration orphans the first with no `destroySession`. */
+	sessionCreating = /* @__PURE__ */ new Map();
 	disposed = false;
 	/** Re-entrancy guard for `armPendingSessions` — collapses the per-packet
 	*  `pushPacket` calls into a single in-flight deferred-arm pass. */
@@ -622,15 +627,29 @@ var FrameHandlePlane = class {
 			existing.subscriberIds.add(subscriptionId);
 			return;
 		}
-		const subscriberIds = new Set([subscriptionId]);
-		for (const subscription of this.subscriptions.values()) if (subscription.format === format) subscriberIds.add(subscription.id);
-		const session = {
-			format,
-			proxy: null,
-			nodeId: null,
-			subscriberIds
-		};
-		if (await this.startSessionDecoder(session)) this.sessions.set(format, session);
+		const inflight = this.sessionCreating.get(format);
+		if (inflight) {
+			await inflight;
+			this.sessions.get(format)?.subscriberIds.add(subscriptionId);
+			return;
+		}
+		const creation = (async () => {
+			const subscriberIds = new Set([subscriptionId]);
+			for (const subscription of this.subscriptions.values()) if (subscription.format === format) subscriberIds.add(subscription.id);
+			const session = {
+				format,
+				proxy: null,
+				nodeId: null,
+				subscriberIds
+			};
+			if (await this.startSessionDecoder(session)) this.sessions.set(format, session);
+		})();
+		this.sessionCreating.set(format, creation);
+		try {
+			await creation;
+		} finally {
+			this.sessionCreating.delete(format);
+		}
 	}
 	/**
 	* Create the `frameSink: 'shm'` decoder for a `FormatSession` and start
@@ -6498,6 +6517,7 @@ var RtspListenServer = class RtspListenServer {
 			releaseOnce();
 		}, isMuted);
 		restreamer.addSession(session);
+		releaseOnce();
 		socket.unshift(Buffer.from(requestBuffer, "ascii"));
 	}
 	/**

package/package.json

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

package/dist/{ffmpeg-args-common-CASoNt42.js → frame-dropper-7RTo_YyG.js}

@@ -1,24 +1,3 @@
-//#region src/stream-broker/stream-broker/frame-dropper.ts
-var FrameDropper = class {
-	intervalMs;
-	lastPassedAt = -Infinity;
-	constructor(maxFps) {
-		this.intervalMs = maxFps > 0 ? 1e3 / maxFps : 0;
-	}
-	shouldKeep() {
-		if (this.intervalMs === 0) return true;
-		const now = Date.now();
-		if (now - this.lastPassedAt >= this.intervalMs) {
-			this.lastPassedAt = now;
-			return true;
-		}
-		return false;
-	}
-	setMaxFps(maxFps) {
-		this.intervalMs = maxFps > 0 ? 1e3 / maxFps : 0;
-	}
-};
-//#endregion
 //#region src/stream-broker/stream-broker/ffmpeg-args-common.ts
 var AUDIO_ENCODER_BY_CODEC = {
 	opus: "libopus",
@@ -48,6 +27,27 @@ function logBannerArgs(level) {
 	];
 }
 //#endregion
+//#region src/stream-broker/stream-broker/frame-dropper.ts
+var FrameDropper = class {
+	intervalMs;
+	lastPassedAt = -Infinity;
+	constructor(maxFps) {
+		this.intervalMs = maxFps > 0 ? 1e3 / maxFps : 0;
+	}
+	shouldKeep() {
+		if (this.intervalMs === 0) return true;
+		const now = Date.now();
+		if (now - this.lastPassedAt >= this.intervalMs) {
+			this.lastPassedAt = now;
+			return true;
+		}
+		return false;
+	}
+	setMaxFps(maxFps) {
+		this.intervalMs = maxFps > 0 ? 1e3 / maxFps : 0;
+	}
+};
+//#endregion
 Object.defineProperty(exports, "FrameDropper", {
 	enumerable: true,
 	get: function() {