@camstack/addon-pipeline 1.1.26 → 1.1.27

package/dist/stream-broker/index.js

@@ -17799,30 +17799,35 @@ var FfmpegDecoderSession = class {
 		this.outputBuffer = Buffer.alloc(0);
 		this.cachedWidth = 0;
 		this.cachedHeight = 0;
-		const args = buildFfmpegArgs(this.config);
-		this.process = (0, node_child_process.spawn)("ffmpeg", args);
-		this.process.stdin?.on("error", () => {});
-		this.process.stdout?.on("data", (chunk) => {
-			this.handleOutputData(chunk);
+		const child = (0, node_child_process.spawn)("ffmpeg", buildFfmpegArgs(this.config));
+		this.process = child;
+		child.stdin?.on("error", () => {});
+		child.stdout?.on("data", (chunk) => {
+			if (child === this.process) this.handleOutputData(chunk);
 		});
-		this.process.stderr?.on("data", (data) => {
+		child.stderr?.on("data", (data) => {
+			if (child !== this.process) return;
 			const line = data.toString().trim();
 			if (line) this.logger.debug("ffmpeg stderr", { meta: { line } });
 		});
-		this.process.on("error", (err) => {
+		child.on("error", (err) => {
+			if (child !== this.process) return;
 			this.logger.error("FFmpeg decoder spawn error", { meta: { error: err.message } });
 		});
-		this.process.on("close", (_code, _signal) => {
-			if (!this.destroyed) this.process = null;
+		child.on("close", (_code, _signal) => {
+			if (child === this.process && !this.destroyed) this.process = null;
 		});
 	}
 	killFfmpeg() {
-		if (this.process) {
-			try {
-				this.process.kill("SIGKILL");
-			} catch {}
-			this.process = null;
-		}
+		const child = this.process;
+		if (!child) return;
+		this.process = null;
+		child.stdout?.removeAllListeners("data");
+		child.stderr?.removeAllListeners("data");
+		child.removeAllListeners("close");
+		try {
+			child.kill("SIGKILL");
+		} catch {}
 	}
 	handleOutputData(chunk) {
 		this.outputBuffer = Buffer.concat([this.outputBuffer, chunk]);

package/dist/stream-broker/index.mjs

@@ -17795,30 +17795,35 @@ var FfmpegDecoderSession = class {
 		this.outputBuffer = Buffer.alloc(0);
 		this.cachedWidth = 0;
 		this.cachedHeight = 0;
-		const args = buildFfmpegArgs(this.config);
-		this.process = spawn("ffmpeg", args);
-		this.process.stdin?.on("error", () => {});
-		this.process.stdout?.on("data", (chunk) => {
-			this.handleOutputData(chunk);
+		const child = spawn("ffmpeg", buildFfmpegArgs(this.config));
+		this.process = child;
+		child.stdin?.on("error", () => {});
+		child.stdout?.on("data", (chunk) => {
+			if (child === this.process) this.handleOutputData(chunk);
 		});
-		this.process.stderr?.on("data", (data) => {
+		child.stderr?.on("data", (data) => {
+			if (child !== this.process) return;
 			const line = data.toString().trim();
 			if (line) this.logger.debug("ffmpeg stderr", { meta: { line } });
 		});
-		this.process.on("error", (err) => {
+		child.on("error", (err) => {
+			if (child !== this.process) return;
 			this.logger.error("FFmpeg decoder spawn error", { meta: { error: err.message } });
 		});
-		this.process.on("close", (_code, _signal) => {
-			if (!this.destroyed) this.process = null;
+		child.on("close", (_code, _signal) => {
+			if (child === this.process && !this.destroyed) this.process = null;
 		});
 	}
 	killFfmpeg() {
-		if (this.process) {
-			try {
-				this.process.kill("SIGKILL");
-			} catch {}
-			this.process = null;
-		}
+		const child = this.process;
+		if (!child) return;
+		this.process = null;
+		child.stdout?.removeAllListeners("data");
+		child.stderr?.removeAllListeners("data");
+		child.removeAllListeners("close");
+		try {
+			child.kill("SIGKILL");
+		} catch {}
 	}
 	handleOutputData(chunk) {
 		this.outputBuffer = Buffer.concat([this.outputBuffer, chunk]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-pipeline",
-  "version": "1.1.26",
+  "version": "1.1.27",
   "description": "CamStack Pipeline bundle — runner, detection, motion, decoders, audio + stream broker. Multi-entry npm package shipping 7 addons under a single bundle.",
   "keywords": [
     "camstack",
@@ -36,6 +36,10 @@
       "import": "./dist/decoder-ffmpeg/index.mjs",
       "require": "./dist/decoder-ffmpeg/index.js"
     },
+    "./decoder-nodeav": {
+      "import": "./dist/decoder-nodeav/index.mjs",
+      "require": "./dist/decoder-nodeav/index.js"
+    },
     "./audio-codec-ffmpeg": {
       "import": "./dist/audio-codec-ffmpeg/index.mjs",
       "require": "./dist/audio-codec-ffmpeg/index.js"
@@ -149,7 +153,7 @@
         "category": "pipeline",
         "name": "Decoder (ffmpeg)",
         "version": "0.1.0",
-        "description": "Out-of-process video decoder spawning an ffmpeg subprocess — VA-API safe on Intel (a decode crash is isolated to the child, never taking down the runner). The sole decoder; ffmpeg is provisioned per node via ctx.deps.ensureFfmpeg().",
+        "description": "Out-of-process video decoder spawning an ffmpeg subprocess — a decode crash is isolated to the child, never taking down the runner. The DEFAULT decoder backend: it registers the decoder cap only when the node's `decoder` settings section selects `ffmpeg` (the default). ffmpeg is provisioned per node via ctx.deps.ensureFfmpeg().",
         "entry": "./dist/decoder-ffmpeg/index.js",
         "execution": {
           "placement": "any-node",
@@ -157,7 +161,30 @@
         },
         "capabilities": [
           {
-            "name": "decoder"
+            "name": "decoder",
+            "optional": true
+          }
+        ],
+        "passive": true,
+        "protected": true,
+        "icon": "assets/icon.svg",
+        "color": "#0ea5e9"
+      },
+      {
+        "id": "decoder-nodeav",
+        "category": "pipeline",
+        "name": "Decoder (node-av)",
+        "version": "0.1.0",
+        "description": "In-process video decoder using FFmpeg native bindings (node-av) — no subprocess lifecycle (nothing to spawn, supervise, or leak). Registers the decoder cap only when the node's `decoder` settings section selects `nodeav`; decoder-ffmpeg is the default backend.",
+        "entry": "./dist/decoder-nodeav/index.js",
+        "execution": {
+          "placement": "any-node",
+          "heapProfile": "heavy"
+        },
+        "capabilities": [
+          {
+            "name": "decoder",
+            "optional": true
           }
         ],
         "passive": true,
@@ -299,6 +326,7 @@
     "@camstack/system": "*",
     "lucide-react": "^0.511.0",
     "mp4box": "0.5.4",
+    "node-av": "^6.0.0",
     "sharp": "^0.35.2",
     "zod": "^4.3.6"
   },

package/python/inference_pool.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """Async inference pool — request_id multiplexed, per-runtime concurrency.
 
-Architecture mirrors Scrypted's ML plugins (coreml / openvino / onnx):
+Per-runtime ML backends (coreml / openvino / onnx):
   - asyncio main loop reads requests from stdin; inference is dispatched
     onto a runtime-specific executor so the reader never blocks.
   - Each request carries a 32-bit id; responses are tagged with the same
@@ -76,7 +76,7 @@ MSG_INFER_RAW = 0x02
 # Each item is dispatched concurrently via asyncio.gather so the
 # predict pool's existing parallelism applies; the saving over N
 # separate calls is one IPC round-trip per item collapsed to one,
-# matching Scrypted's batch=4 semantics for fair benchmarking.
+# with batch=4 semantics for fair benchmarking.
 MSG_INFER_BATCH = 0x03
 MSG_CACHE_FRAME = 0x04
 MSG_INFER_CACHED = 0x05
@@ -172,22 +172,21 @@ _ov_optimal_reqs: int = 0
 # query the device's optimal request count). ≈ measured optimal on Intel
 # CPU/iGPU/NPU (4-5). Threads idle-block on infer, so over-provisioning is cheap.
 OV_DEFAULT_CONCURRENCY: int = 4
-# OpenVINO device-mode decision — EXACT port of Scrypted's OpenVINO plugin
-# device switch (scrypted-ov-init.py:109-194). Scrypted's rationale, kept
-# verbatim: "AUTO mode can cause conflicts or hide errors with NPU and GPU
-# so try to be explicit and fall back accordingly." The intel-iGPU-only case
-# (the N100) compiles explicit "GPU" — the exact host where the AUTO plugin's
-# mid-flight CPU-helper -> GPU handover invalidated in-flight InferRequest
-# output ports ("Cannot find tensor for port opset1::Result score_8").
+# OpenVINO device-mode decision. AUTO mode can hide errors / cause conflicts
+# with NPU and GPU, so we resolve an explicit device and fall back accordingly.
+# The intel-iGPU-only case (the N100) compiles explicit "GPU" — the exact host
+# where the AUTO plugin's mid-flight CPU-helper -> GPU handover invalidated
+# in-flight InferRequest output ports ("Cannot find tensor for port
+# opset1::Result score_8").
 
 
 def _resolve_ov_mode(available: list[str], full_names: dict[str, str]) -> str:
-    """Scrypted's exact mode string for an AUTO/default device request.
+    """Resolve the device-mode string for an AUTO/default device request.
 
     `available` is `core.available_devices`; `full_names` maps each device to
     its FULL_DEVICE_NAME property (entries whose property query failed are
-    absent — mirrors Scrypted's per-device `except: pass`, so such a device
-    is not classified). The branch matrix, byte-faithful to Scrypted:
+    absent — a device whose FULL_DEVICE_NAME probe failed is not classified).
+    The branch matrix:
 
       npu & gpu          -> "AUTO:NPU,GPU,CPU"
       npu & !gpu         -> "AUTO:NPU,CPU"
@@ -217,8 +216,8 @@ def _resolve_ov_mode(available: list[str], full_names: dict[str, str]) -> str:
             mode = "AUTO:NPU,CPU"
     elif len(dgpus):
         mode = f"AUTO:{','.join(dgpus)},CPU"
-    # forcing GPU can cause crashes on older GPU. (Scrypted's comment — the
-    # GPU-mode compile failure falls back to AUTO in the compile loop below.)
+    # forcing GPU can crash on older GPUs — the GPU-mode compile failure falls
+    # back to AUTO in the compile loop below.
     elif gpu:
         mode = "GPU"
     return mode
@@ -239,8 +238,7 @@ def _resolve_onnx_providers(
 ) -> list:
     """Ordered ONNX Runtime providers — hardware first, CPU always last.
 
-    Mirrors Scrypted's ONNX plugin ordering (scrypted-onnx-init.py:95-109)
-    for the AUTO/default case:
+    Ordering for the AUTO/default case:
 
       darwin                    -> CoreMLExecutionProvider
       linux/win on x86_64/AMD64 -> ("CUDAExecutionProvider", {"device_id": N})
@@ -253,8 +251,8 @@ def _resolve_onnx_providers(
         (ort.get_available_providers()) are dropped — camstack ships the
         plain `onnxruntime` wheel on most nodes, and requesting an EP the
         build lacks raises at session creation instead of falling back.
-      - platform match uses startswith so "darwin" never matches "win"
-        (Scrypted's `"win" in sys.platform` would).
+      - platform match uses startswith so a substring test on "win" never
+        wrongly matches "darwin".
     """
     dev = (device or "").strip().lower()
     ordered: list = []
@@ -265,7 +263,7 @@ def _resolve_onnx_providers(
     elif dev == "cpu":
         pass  # explicit CPU pin — no hardware EPs
     else:
-        # AUTO/default — Scrypted's platform-driven ordering.
+        # AUTO/default — platform-driven ordering.
         if plat == "darwin":
             ordered.append(ONNX_COREML_EP)
         if plat.startswith(("linux", "win")) and machine in ("x86_64", "AMD64"):
@@ -281,8 +279,8 @@ def _resolve_onnx_providers(
 # ---------------------------------------------------------------------------
 # CoreML persistent compiled-model cache
 # ---------------------------------------------------------------------------
-# macOS bug (documented by Scrypted, coreml-init comment): the OS-level
-# compiled-model cache is NOT reused across process restarts — every
+# Known macOS behavior: the OS-level compiled-model cache is NOT reused across
+# process restarts — every
 # `ct.models.MLModel(.mlpackage)` load RECOMPILES the model, and the stale OS
 # cache is only cleared on reboot. camstack loads the .mlpackage on every pool
 # spawn, so each spawn paid the full recompile. Fix: after the first compile,
@@ -472,9 +470,9 @@ def _load_model(slot: ModelSlot, config: dict) -> None:
             "ane": ct.ComputeUnit.CPU_AND_NE,
             "all": ct.ComputeUnit.ALL,
         }
-        # NOTE (Scrypted caveat, coreml-init comment): a macOS bug can cause
-        # the .mlpackage to be RECOMPILED on every load with the compiled
-        # cache not reused until reboot. camstack loads the .mlpackage on
+        # NOTE: a macOS behavior can cause the .mlpackage to be RECOMPILED on
+        # every load with the compiled cache not reused until reboot. camstack
+        # loads the .mlpackage on
         # every pool spawn, so it was exposed to the same trap.
         # _acquire_coreml_model routes through a persistent `.coreml-cache`
         # of the compiled `.mlmodelc` (CompiledMLModel on hit, plain MLModel
@@ -526,11 +524,10 @@ def _load_model(slot: ModelSlot, config: dict) -> None:
     elif _runtime == "openvino":
         core = _runtime_lib
         ov_device = str(config.get("device", "AUTO")).upper()
-        # Scrypted's exact device switch (see _resolve_ov_mode above): an
-        # AUTO/default request classifies the enumerated devices by their
-        # FULL_DEVICE_NAME and builds the same mode string Scrypted's
-        # OpenVINO plugin does. An operator-pinned device (config "device" =
-        # gpu/cpu/npu) is honored unchanged — compiled directly.
+        # Device switch (see _resolve_ov_mode above): an AUTO/default request
+        # classifies the enumerated devices by their FULL_DEVICE_NAME and
+        # builds an explicit mode string. An operator-pinned device (config
+        # "device" = gpu/cpu/npu) is honored unchanged — compiled directly.
         if ov_device in ("AUTO", "DEFAULT", ""):
             available = list(core.available_devices)
             full_names: dict[str, str] = {}
@@ -565,11 +562,10 @@ def _load_model(slot: ModelSlot, config: dict) -> None:
             ov_config["CACHE_DIR"] = _cache_dir
         except OSError:
             pass
-        # Compile the resolved mode. Failure fallback is Scrypted's, exactly:
-        # any mode containing "GPU" reverts to plain "AUTO" and recompiles
-        # once; if THAT also fails (or the mode had no GPU), re-raise —
-        # camstack has no reset-and-restart like Scrypted, so the existing
-        # load/replace error handler reports the failure.
+        # Compile the resolved mode. Failure fallback: any mode containing
+        # "GPU" reverts to plain "AUTO" and recompiles once; if THAT also
+        # fails (or the mode had no GPU), re-raise — the existing load/replace
+        # error handler reports the failure.
         candidates = [ov_device]
         if "GPU" in ov_device:
             candidates.append("AUTO")
@@ -591,7 +587,7 @@ def _load_model(slot: ModelSlot, config: dict) -> None:
                 raise last_exc
             raise RuntimeError("OpenVINO: no device available to compile the model")
         # Name the resolved mode + what OpenVINO actually placed the model on
-        # (mirrors Scrypted's EXECUTION_DEVICES print) so a silent CPU
+        # (the EXECUTION_DEVICES property) so a silent CPU
         # placement is visible in the pool stderr.
         try:
             _exec_devices = compiled.get_property("EXECUTION_DEVICES")
@@ -646,7 +642,7 @@ def _load_model(slot: ModelSlot, config: dict) -> None:
     elif _runtime == "onnxruntime":
         ort = _runtime_lib
         ort_device = str(config.get("device", "") or "")
-        # Scrypted-style ordered providers — hardware EP first, CPU LAST as
+        # Ordered providers — hardware EP first, CPU LAST as
         # fallback (see _resolve_onnx_providers): a "cuda"/"coreml" pin puts
         # that EP first, a "cpu" pin compiles CPU only, and the AUTO/default
         # case derives the hardware EP from the platform.
@@ -658,8 +654,8 @@ def _load_model(slot: ModelSlot, config: dict) -> None:
             ort_device, sys.platform, platform.machine(), available_eps,
         )
         session = ort.InferenceSession(path, providers=providers)
-        # Report the EP that ACTUALLY initialized — Scrypted strips CPU and
-        # logs the remainder — so a silent CPU fallback is visible.
+        # Report the EP that ACTUALLY initialized (CPU stripped from the log)
+        # so a silent CPU fallback is visible.
         _active_eps = [p for p in session.get_providers() if p != ONNX_CPU_EP]
         _requested = [p[0] if isinstance(p, tuple) else p for p in providers]
         sys.stderr.write(

package/python/test_inference_pool_device_selection.py

@@ -1,10 +1,9 @@
 """Unit tests for the runtime device/provider selection in inference_pool.
 
 Covers:
-  - _resolve_ov_mode — Scrypted's exact OpenVINO device-mode branch matrix
-    (scrypted-ov-init.py:109-194).
-  - _resolve_onnx_providers — Scrypted's ONNX execution-provider ordering
-    (scrypted-onnx-init.py:95-109) with camstack's pin + availability filter.
+  - _resolve_ov_mode — the OpenVINO device-mode branch matrix.
+  - _resolve_onnx_providers — the ONNX execution-provider ordering
+    with camstack's pin + availability filter.
 
 Pure-python: stubs numpy / PIL / postprocessors in sys.modules so the module
 imports without the ML runtime installed (inference_pool uses
@@ -47,10 +46,10 @@ from inference_pool import (
 
 
 class ResolveOvModeTest(unittest.TestCase):
-    """Branch matrix of Scrypted's OpenVINO device switch."""
+    """Branch matrix of the OpenVINO device switch."""
 
     def test_n100_intel_igpu_and_cpu_is_explicit_gpu(self) -> None:
-        # Intel iGPU + CPU, no NPU, no dGPU — Scrypted compiles explicit GPU.
+        # Intel iGPU + CPU, no NPU, no dGPU — compiles explicit GPU.
         self.assertEqual(
             _resolve_ov_mode(
                 ["CPU", "GPU"],
@@ -127,7 +126,7 @@ class ResolveOvModeTest(unittest.TestCase):
         )
 
     def test_npu_wins_over_nvidia_dgpu(self) -> None:
-        # Scrypted checks npu FIRST — dGPUs only matter when no NPU exists.
+        # npu is checked FIRST — dGPUs only matter when no NPU exists.
         self.assertEqual(
             _resolve_ov_mode(
                 ["CPU", "GPU.0", "NPU"],
@@ -150,7 +149,7 @@ class ResolveOvModeTest(unittest.TestCase):
         self.assertEqual(_resolve_ov_mode([], {}), "AUTO")
 
     def test_device_without_full_name_is_not_classified(self) -> None:
-        # Mirrors Scrypted's per-device `except: pass` — a device whose
+        # A device whose
         # FULL_DEVICE_NAME query failed is skipped entirely.
         self.assertEqual(
             _resolve_ov_mode(["CPU", "GPU"], {"CPU": "Intel(R) N100"}),
@@ -159,7 +158,7 @@ class ResolveOvModeTest(unittest.TestCase):
 
 
 class ResolveOnnxProvidersTest(unittest.TestCase):
-    """Scrypted's ONNX EP ordering + camstack's pin/availability filter."""
+    """ONNX EP ordering + camstack's pin/availability filter."""
 
     def test_darwin_auto_prefers_coreml_cpu_last(self) -> None:
         self.assertEqual(
@@ -203,7 +202,7 @@ class ResolveOnnxProvidersTest(unittest.TestCase):
 
     def test_darwin_never_matches_win_substring(self) -> None:
         # "win" in "darwin" is True — the helper must NOT add CUDA on an
-        # Intel Mac (Scrypted's `"win" in sys.platform` latent quirk).
+        # Intel Mac (a substring "win" in platform check would misfire).
         self.assertEqual(
             _resolve_onnx_providers(
                 "", "darwin", "x86_64",

package/python/yamnet_audio.py

@@ -54,7 +54,7 @@ def main() -> None:
     # YAMNet is a tiny model — ONNX Runtime otherwise defaults intra_op threads to the CPU core
     # count, so every short inference spins up N threads whose coordination overhead dwarfs the
     # actual compute (observed: ~1000% CPU across a handful of always-on audio streams). Cap to a
-    # single op thread (Frigate runs it the same way); overridable via --threads for large hosts.
+    # single op thread; overridable via --threads for large hosts.
     ap.add_argument("--threads", type=int, default=1)
     args = ap.parse_args()