@camstack/addon-pipeline 1.1.24 → 1.1.26

package/dist/audio-analyzer/index.js

@@ -2,8 +2,8 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_model_download_service_C_IHWnXx = require("../model-download-service-C-IHWnXx-BnQ_awK4.js");
-const require_dist = require("../dist-CE3a05qT.js");
+const require_model_download_service_C_IHWnXx = require("../model-download-service-C-IHWnXx-DxM2DSns.js");
+const require_dist = require("../dist-DAIlCdAx.js");
 let node_fs = require("node:fs");
 node_fs = require_model_download_service_C_IHWnXx.__toESM(node_fs);
 let node_path = require("node:path");

package/dist/audio-analyzer/index.mjs

@@ -1,6 +1,6 @@
 import { t as __require } from "../chunk-BdkLduGY.mjs";
-import { B as BaseAddon, E as mapAudioLabelToMacro, J as hydrateSchema, g as audioAnalyzerCapability, h as audioAnalysisCapability, l as HF_BASE_URL, n as AUDIO_BACKEND_CHOICES, o as DEFAULT_AUDIO_ANALYZER_CONFIG, z as errMsg } from "../dist-pd_-3C0T.mjs";
-import { r as downloadFile } from "../model-download-service-C-IHWnXx-3Mmeob3l.mjs";
+import { B as errMsg, D as mapAudioLabelToMacro, V as BaseAddon, Y as hydrateSchema, _ as audioAnalyzerCapability, g as audioAnalysisCapability, n as AUDIO_BACKEND_CHOICES, o as DEFAULT_AUDIO_ANALYZER_CONFIG, u as HF_BASE_URL } from "../dist-CgEP_0OL.mjs";
+import { r as downloadFile } from "../model-download-service-C-IHWnXx-BPy6aoAx.mjs";
 import * as fs from "node:fs";
 import * as path$1 from "node:path";
 //#region src/audio-analyzer/audio-pipeline.ts

package/dist/audio-codec-ffmpeg/index.js

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_dist = require("../dist-CE3a05qT.js");
+const require_dist = require("../dist-DAIlCdAx.js");
 let node_crypto = require("node:crypto");
 let node_child_process = require("node:child_process");
 //#region src/audio-codec-ffmpeg/ffmpeg-audio-process.ts

package/dist/audio-codec-ffmpeg/index.mjs

@@ -1,4 +1,4 @@
-import { B as BaseAddon, _ as audioCodecCapability, z as errMsg } from "../dist-pd_-3C0T.mjs";
+import { B as errMsg, V as BaseAddon, v as audioCodecCapability } from "../dist-CgEP_0OL.mjs";
 import { randomUUID } from "node:crypto";
 import { spawn } from "node:child_process";
 //#region src/audio-codec-ffmpeg/ffmpeg-audio-process.ts

package/dist/decoder-ffmpeg/index.js

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_dist = require("../dist-CE3a05qT.js");
+const require_dist = require("../dist-DAIlCdAx.js");
 const require_frame_dropper = require("../frame-dropper-7RTo_YyG.js");
 let _camstack_shm_ring = require("@camstack/shm-ring");
 let node_crypto = require("node:crypto");
@@ -145,8 +145,10 @@ function buildVideoFilter(hwaccel, pixel, outWidth, outHeight, maxW, gpuScaleFil
 *   stream line from stderr to learn the exact output W×H (the broker does not
 *   pass source geometry for the shm path). `-nostats` suppresses the periodic
 *   `frame= …` counter while keeping the one-shot Output block.
-* - The input is `pipe:0` (Annex-B packets written to stdin); the output is raw
-*   video on `pipe:1`.
+* - The input is `pipe:0` (Annex-B packets written to stdin) in push mode, or
+*   `options.inputUrl` (the owner's restream, dialed by ffmpeg itself —
+*   `-rtsp_transport tcp` for rtsp URLs) in pull mode; the output is raw video
+*   on `pipe:1` either way.
 */
 function buildFfmpegDecodeArgs(config, options) {
 	const inputFormat = codecToInputFormat(config.codec);
@@ -162,6 +164,16 @@ function buildFfmpegDecodeArgs(config, options) {
 		if (needsHwDownload(hwaccel)) hwaccelArgs.push("-hwaccel_device", options.renderDevice ?? "/dev/dri/renderD128");
 		if (keepFramesOnGpu(hwaccel, gpuScaleFilter)) hwaccelArgs.push("-hwaccel_output_format", hwaccel);
 	}
+	const inputArgs = options.inputUrl !== void 0 ? [
+		...options.inputUrl.startsWith("rtsp") ? ["-rtsp_transport", "tcp"] : [],
+		"-i",
+		options.inputUrl
+	] : [
+		"-f",
+		inputFormat,
+		"-i",
+		"pipe:0"
+	];
 	return [
 		...require_frame_dropper.logBannerArgs("info"),
 		"-nostats",
@@ -174,10 +186,7 @@ function buildFfmpegDecodeArgs(config, options) {
 		"-analyzeduration",
 		"0",
 		...hwaccelArgs,
-		"-f",
-		inputFormat,
-		"-i",
-		"pipe:0",
+		...inputArgs,
 		"-vf",
 		vf,
 		"-f",
@@ -650,6 +659,16 @@ var noopLogger = {
 *  hwaccel init failure (missing render node, unsupported codec on GPU, the
 *  Intel `qsv` `code=171`) surfaces this early. */
 var HWACCEL_FALLBACK_WINDOW_MS = 4e3;
+/**
+* Delay before a PULL-MODE session re-dials its input URL after the child
+* exits (RTSP EOF, restream teardown, network blip). Push mode never
+* self-respawns on a plain exit — the broker's packet feed drives recovery —
+* but a pull-mode child owns its own input, so the session must re-dial or a
+* single EOF would silence it forever. The delay turns a hard-down source
+* into a slow probe instead of a spawn storm; the consumer tearing the
+* session down (`destroy`) cancels the pending re-dial.
+*/
+var PULL_REDIAL_DELAY_MS = 3e3;
 var FfmpegDecoderSession = class {
 	config;
 	logger;
@@ -680,6 +699,15 @@ var FfmpegDecoderSession = class {
 	process = null;
 	spawnedAtMs = 0;
 	/**
+	* PULL-MODE input URL (P2b). `null` = push mode (packets via stdin — the
+	* default). Set by {@link openStream}; every (re)spawn since reads this URL
+	* directly instead of `pipe:0`. A session is push-mode or pull-mode for its
+	* whole life — `openStream` on a packet-fed session throws.
+	*/
+	pullUrl = null;
+	/** Pending pull-mode re-dial timer (armed on a pull child exit). */
+	pullRedialTimer = null;
+	/**
 	* Splits ffmpeg's raw stdout byte stream into frames, filling each DIRECTLY
 	* into its shm slot (zero-copy) — created once the output geometry is known.
 	*/
@@ -733,7 +761,25 @@ var FfmpegDecoderSession = class {
 		return this.frameRingSink;
 	}
 	get isPullMode() {
-		return false;
+		return this.pullUrl !== null;
+	}
+	/**
+	* Switch the session to PULL MODE: (re)spawn ffmpeg reading `url` directly
+	* (`-rtsp_transport tcp -i <url>` for rtsp) instead of stdin. The whole
+	* output path (filtergraph, rawvideo pipe, shm ring sink) is unchanged.
+	*
+	* - Calling it again re-dials with the FRESH url (a hub restream bounce
+	*   mints a new token URL — never cache the old one).
+	* - Calling it on a session already fed via `pushPacket` throws: a session
+	*   is push-mode or pull-mode, never both (mixing inputs would corrupt the
+	*   decode).
+	*/
+	async openStream(url) {
+		if (this.destroyed) return;
+		if (this.pullUrl === null && this.inputPackets > 0) throw new Error("ffmpeg decoder: openStream on a push-fed session — a session is push-mode or pull-mode, never both");
+		this.pullUrl = url;
+		this.logger.info("ffmpeg decoder: pull-mode openStream — dialing input URL", { meta: { url } });
+		this.spawnFfmpeg();
 	}
 	ensureFrameRingSink() {
 		if (this.frameRingSink === null) {
@@ -751,6 +797,7 @@ var FfmpegDecoderSession = class {
 	}
 	spawnFfmpeg() {
 		if (this.destroyed) return;
+		this.clearPullRedial();
 		this.killFfmpeg();
 		this.abortOpenSlot();
 		this.splitter = null;
@@ -767,7 +814,8 @@ var FfmpegDecoderSession = class {
 		}, {
 			hwaccel: this.hwaccel,
 			renderDevice: this.renderDevice,
-			gpuScaleFilter: this.activeGpuScaleFilter
+			gpuScaleFilter: this.activeGpuScaleFilter,
+			...this.pullUrl !== null ? { inputUrl: this.pullUrl } : {}
 		});
 		let child;
 		try {
@@ -854,6 +902,27 @@ var FfmpegDecoderSession = class {
 			signal,
 			outputFrames: this.outputFrames
 		} });
+		if (this.pullUrl !== null) {
+			this.clearPullRedial();
+			const timer = setTimeout(() => {
+				this.pullRedialTimer = null;
+				this.spawnFfmpeg();
+			}, PULL_REDIAL_DELAY_MS);
+			timer.unref?.();
+			this.pullRedialTimer = timer;
+			this.logger.info("ffmpeg decoder: pull-mode child exited — re-dial scheduled", { meta: {
+				code,
+				signal,
+				redialInMs: PULL_REDIAL_DELAY_MS
+			} });
+		}
+	}
+	/** Cancel a pending pull-mode re-dial, if armed. */
+	clearPullRedial() {
+		if (this.pullRedialTimer !== null) {
+			clearTimeout(this.pullRedialTimer);
+			this.pullRedialTimer = null;
+		}
 	}
 	handleStderr(data) {
 		const text = data.toString();
@@ -958,6 +1027,7 @@ var FfmpegDecoderSession = class {
 	}
 	pushPacket(packet) {
 		if (this.destroyed) return;
+		if (this.pullUrl !== null) return;
 		const stdin = this.process?.stdin;
 		if (!stdin) return;
 		this.inputPackets++;
@@ -990,6 +1060,7 @@ var FfmpegDecoderSession = class {
 	async destroy() {
 		if (this.destroyed) return;
 		this.destroyed = true;
+		this.clearPullRedial();
 		this.killFfmpeg();
 		this.abortOpenSlot();
 		this.splitter = null;
@@ -1235,7 +1306,7 @@ var DecoderFfmpegAddon = class extends require_dist.BaseAddon {
 		return {
 			id: "decoder-ffmpeg",
 			name: "Decoder (ffmpeg)",
-			isPullMode: false,
+			isPullMode: true,
 			priority: 20
 		};
 	}
@@ -1346,8 +1417,9 @@ var DecoderFfmpegAddon = class extends require_dist.BaseAddon {
 		});
 	}
 	async openStream(input) {
-		if (!this.sessions.get(input.sessionId)) throw new Error(`decoder-ffmpeg: unknown sessionId ${input.sessionId}`);
-		input.url;
+		const session = this.sessions.get(input.sessionId);
+		if (!session) throw new Error(`decoder-ffmpeg: unknown sessionId ${input.sessionId}`);
+		await session.openStream(input.url);
 	}
 	async pullFrames(input) {
 		if (!this.sessions.has(input.sessionId)) throw new Error(`decoder-ffmpeg: unknown sessionId ${input.sessionId}`);

package/dist/decoder-ffmpeg/index.mjs

@@ -1,4 +1,4 @@
-import { B as BaseAddon, b as decoderCapability, f as RingBuffer, s as DEFAULT_DECODER_HWACCEL_CONFIG, u as HWACCEL_OPTIONS, z as errMsg } from "../dist-pd_-3C0T.mjs";
+import { B as errMsg, V as BaseAddon, d as HWACCEL_OPTIONS, p as RingBuffer, s as DEFAULT_DECODER_HWACCEL_CONFIG, x as decoderCapability } from "../dist-CgEP_0OL.mjs";
 import { r as logBannerArgs, t as FrameDropper } from "../frame-dropper-CwkBTPGV.mjs";
 import { FrameRingReaderCache, FrameRingWriter, MIN_RING_SLOTS, computeSegmentSize, computeSlotByteLength, createSegment, deriveSlotCount } from "@camstack/shm-ring";
 import { randomUUID } from "node:crypto";
@@ -141,8 +141,10 @@ function buildVideoFilter(hwaccel, pixel, outWidth, outHeight, maxW, gpuScaleFil
 *   stream line from stderr to learn the exact output W×H (the broker does not
 *   pass source geometry for the shm path). `-nostats` suppresses the periodic
 *   `frame= …` counter while keeping the one-shot Output block.
-* - The input is `pipe:0` (Annex-B packets written to stdin); the output is raw
-*   video on `pipe:1`.
+* - The input is `pipe:0` (Annex-B packets written to stdin) in push mode, or
+*   `options.inputUrl` (the owner's restream, dialed by ffmpeg itself —
+*   `-rtsp_transport tcp` for rtsp URLs) in pull mode; the output is raw video
+*   on `pipe:1` either way.
 */
 function buildFfmpegDecodeArgs(config, options) {
 	const inputFormat = codecToInputFormat(config.codec);
@@ -158,6 +160,16 @@ function buildFfmpegDecodeArgs(config, options) {
 		if (needsHwDownload(hwaccel)) hwaccelArgs.push("-hwaccel_device", options.renderDevice ?? "/dev/dri/renderD128");
 		if (keepFramesOnGpu(hwaccel, gpuScaleFilter)) hwaccelArgs.push("-hwaccel_output_format", hwaccel);
 	}
+	const inputArgs = options.inputUrl !== void 0 ? [
+		...options.inputUrl.startsWith("rtsp") ? ["-rtsp_transport", "tcp"] : [],
+		"-i",
+		options.inputUrl
+	] : [
+		"-f",
+		inputFormat,
+		"-i",
+		"pipe:0"
+	];
 	return [
 		...logBannerArgs("info"),
 		"-nostats",
@@ -170,10 +182,7 @@ function buildFfmpegDecodeArgs(config, options) {
 		"-analyzeduration",
 		"0",
 		...hwaccelArgs,
-		"-f",
-		inputFormat,
-		"-i",
-		"pipe:0",
+		...inputArgs,
 		"-vf",
 		vf,
 		"-f",
@@ -646,6 +655,16 @@ var noopLogger = {
 *  hwaccel init failure (missing render node, unsupported codec on GPU, the
 *  Intel `qsv` `code=171`) surfaces this early. */
 var HWACCEL_FALLBACK_WINDOW_MS = 4e3;
+/**
+* Delay before a PULL-MODE session re-dials its input URL after the child
+* exits (RTSP EOF, restream teardown, network blip). Push mode never
+* self-respawns on a plain exit — the broker's packet feed drives recovery —
+* but a pull-mode child owns its own input, so the session must re-dial or a
+* single EOF would silence it forever. The delay turns a hard-down source
+* into a slow probe instead of a spawn storm; the consumer tearing the
+* session down (`destroy`) cancels the pending re-dial.
+*/
+var PULL_REDIAL_DELAY_MS = 3e3;
 var FfmpegDecoderSession = class {
 	config;
 	logger;
@@ -676,6 +695,15 @@ var FfmpegDecoderSession = class {
 	process = null;
 	spawnedAtMs = 0;
 	/**
+	* PULL-MODE input URL (P2b). `null` = push mode (packets via stdin — the
+	* default). Set by {@link openStream}; every (re)spawn since reads this URL
+	* directly instead of `pipe:0`. A session is push-mode or pull-mode for its
+	* whole life — `openStream` on a packet-fed session throws.
+	*/
+	pullUrl = null;
+	/** Pending pull-mode re-dial timer (armed on a pull child exit). */
+	pullRedialTimer = null;
+	/**
 	* Splits ffmpeg's raw stdout byte stream into frames, filling each DIRECTLY
 	* into its shm slot (zero-copy) — created once the output geometry is known.
 	*/
@@ -729,7 +757,25 @@ var FfmpegDecoderSession = class {
 		return this.frameRingSink;
 	}
 	get isPullMode() {
-		return false;
+		return this.pullUrl !== null;
+	}
+	/**
+	* Switch the session to PULL MODE: (re)spawn ffmpeg reading `url` directly
+	* (`-rtsp_transport tcp -i <url>` for rtsp) instead of stdin. The whole
+	* output path (filtergraph, rawvideo pipe, shm ring sink) is unchanged.
+	*
+	* - Calling it again re-dials with the FRESH url (a hub restream bounce
+	*   mints a new token URL — never cache the old one).
+	* - Calling it on a session already fed via `pushPacket` throws: a session
+	*   is push-mode or pull-mode, never both (mixing inputs would corrupt the
+	*   decode).
+	*/
+	async openStream(url) {
+		if (this.destroyed) return;
+		if (this.pullUrl === null && this.inputPackets > 0) throw new Error("ffmpeg decoder: openStream on a push-fed session — a session is push-mode or pull-mode, never both");
+		this.pullUrl = url;
+		this.logger.info("ffmpeg decoder: pull-mode openStream — dialing input URL", { meta: { url } });
+		this.spawnFfmpeg();
 	}
 	ensureFrameRingSink() {
 		if (this.frameRingSink === null) {
@@ -747,6 +793,7 @@ var FfmpegDecoderSession = class {
 	}
 	spawnFfmpeg() {
 		if (this.destroyed) return;
+		this.clearPullRedial();
 		this.killFfmpeg();
 		this.abortOpenSlot();
 		this.splitter = null;
@@ -763,7 +810,8 @@ var FfmpegDecoderSession = class {
 		}, {
 			hwaccel: this.hwaccel,
 			renderDevice: this.renderDevice,
-			gpuScaleFilter: this.activeGpuScaleFilter
+			gpuScaleFilter: this.activeGpuScaleFilter,
+			...this.pullUrl !== null ? { inputUrl: this.pullUrl } : {}
 		});
 		let child;
 		try {
@@ -850,6 +898,27 @@ var FfmpegDecoderSession = class {
 			signal,
 			outputFrames: this.outputFrames
 		} });
+		if (this.pullUrl !== null) {
+			this.clearPullRedial();
+			const timer = setTimeout(() => {
+				this.pullRedialTimer = null;
+				this.spawnFfmpeg();
+			}, PULL_REDIAL_DELAY_MS);
+			timer.unref?.();
+			this.pullRedialTimer = timer;
+			this.logger.info("ffmpeg decoder: pull-mode child exited — re-dial scheduled", { meta: {
+				code,
+				signal,
+				redialInMs: PULL_REDIAL_DELAY_MS
+			} });
+		}
+	}
+	/** Cancel a pending pull-mode re-dial, if armed. */
+	clearPullRedial() {
+		if (this.pullRedialTimer !== null) {
+			clearTimeout(this.pullRedialTimer);
+			this.pullRedialTimer = null;
+		}
 	}
 	handleStderr(data) {
 		const text = data.toString();
@@ -954,6 +1023,7 @@ var FfmpegDecoderSession = class {
 	}
 	pushPacket(packet) {
 		if (this.destroyed) return;
+		if (this.pullUrl !== null) return;
 		const stdin = this.process?.stdin;
 		if (!stdin) return;
 		this.inputPackets++;
@@ -986,6 +1056,7 @@ var FfmpegDecoderSession = class {
 	async destroy() {
 		if (this.destroyed) return;
 		this.destroyed = true;
+		this.clearPullRedial();
 		this.killFfmpeg();
 		this.abortOpenSlot();
 		this.splitter = null;
@@ -1231,7 +1302,7 @@ var DecoderFfmpegAddon = class extends BaseAddon {
 		return {
 			id: "decoder-ffmpeg",
 			name: "Decoder (ffmpeg)",
-			isPullMode: false,
+			isPullMode: true,
 			priority: 20
 		};
 	}
@@ -1342,8 +1413,9 @@ var DecoderFfmpegAddon = class extends BaseAddon {
 		});
 	}
 	async openStream(input) {
-		if (!this.sessions.get(input.sessionId)) throw new Error(`decoder-ffmpeg: unknown sessionId ${input.sessionId}`);
-		input.url;
+		const session = this.sessions.get(input.sessionId);
+		if (!session) throw new Error(`decoder-ffmpeg: unknown sessionId ${input.sessionId}`);
+		await session.openStream(input.url);
 	}
 	async pullFrames(input) {
 		if (!this.sessions.has(input.sessionId)) throw new Error(`decoder-ffmpeg: unknown sessionId ${input.sessionId}`);