@camstack/addon-decoder-nodeav 1.1.1 → 1.1.2

package/dist/index.js

@@ -13315,7 +13315,9 @@ var decoderCapability = {
 			id: string(),
 			name: string(),
 			isPullMode: boolean().optional(),
-			priority: number().optional()
+			priority: number().optional(),
+			hwaccel: string().optional(),
+			probedBestHwaccel: string().optional()
 		})),
 		createSession: method(DecoderSessionConfigSchema, object({
 			sessionId: string(),
@@ -23131,79 +23133,10 @@ function normalizeDecoderNodeId(rawNodeId) {
 }
 //#endregion
 //#region src/shared/decoder-backend.ts
-/**
-* Decoder backend selection — decides which decoder addon registers the
-* `decoder` cap on a node.
-*
-* Two decoder addons ship in this bundle: `decoder-ffmpeg` (subprocess
-* decode; a decode crash is isolated to the child) and `decoder-nodeav`
-* (in-process decode via FFmpeg native bindings; no subprocess lifecycle).
-* Both are installed on every node, but only ONE may provide the `decoder`
-* cap at a time.
-*
-* ## Why selection happens at REGISTRATION time (race-free by construction)
-*
-* The `decoder` cap is a singleton. Historically both decoder addons
-* registered a provider and the active slot was resolved AFTER the fact —
-* which exposed a boot-order race: whichever addon's runner initialised
-* first briefly held the active slot, and any consumer that resolved the
-* cap inside that window was dispatched to the wrong backend (the
-* cap-declared `preferredProvider` override only corrects the slot when
-* the preferred addon's registration eventually lands).
-*
-* This module removes the race by construction instead of arbitrating it:
-* each decoder addon calls {@link resolveDecoderBackend} at the START of
-* its `onInitialize` and registers its provider ONLY when it is the
-* selected backend — the other addon returns no registrations at all. At
-* most one `decoder` provider ever exists per node, so no resolution layer
-* (kernel `CapabilityRegistry`, route resolver, UDS child preference) can
-* pick a wrong one, regardless of boot order or timing.
-*
-* ## The setting
-*
-* The per-node selection lives in the `decoder-ffmpeg` OWNER addon's global
-* settings — the standard `addon-settings` surface, visible in the admin UI
-* as the owner's `backend` select field. The store is hub-central and the
-* value is persisted node-scoped as `backend@<nodeId>`
-* (`decoder-backend-keys.ts`); the owner's `getGlobalSettings` projects the
-* requested node's value onto the bare `backend` field.
-*
-* Both decoder addons read it the SAME way, placement-agnostically: via
-* `ctx.api.addonSettings.getGlobalSettings({ addonId: 'decoder-ffmpeg',
-* nodeId })`. The `addon-settings` cap is hub-routed at the system level
-* (`AddonCallGateway.classify` sends settings calls to the addon's base
-* node — the hub instance answers for every node), so an agent addon
-* transparently reads the hub-central store with no placement branching.
-* NOT used: `ctx.settings.getSection` (node-local — empty on an agent, the
-* original bug), the raw settings-store cap, or any custom side channel.
-*
-* Resolution: the node's scoped value → the built-in default
-* {@link DEFAULT_DECODER_BACKEND} (`'nodeav'` — node-av is primary everywhere;
-* ffmpeg is an explicit opt-in fallback only). There is deliberately NO
-* bare-key fallback (see `decoder-backend-keys.ts`), and any read failure
-* resolves to the default so a decoder still comes up — and, because the
-* default IS the primary backend, a stale/failed read can never leave the node
-* with NO decoder (the old `'ffmpeg'` default made node-av stand down on a
-* missed read → both addons down).
-*
-* ## Switching backends
-*
-* Because registration is decided once at addon init, changing the setting
-* takes effect on the next restart of the two decoder addons on the
-* affected node (addon restart / redeploy / node reboot). This is the
-* price of race-freedom: there is deliberately NO live re-arbitration
-* path — a live hand-off would reintroduce a window with two providers.
-*/
-/** The addon whose global settings OWN the per-node `backend` field. */
-var DECODER_OWNER_ADDON_ID = "decoder-ffmpeg";
-/** Fail-safe when the owner's hwaccel can't be read: defer to the local probe. */
-var DEFAULT_DECODER_HWACCEL = "auto";
-/** Narrow an arbitrary stored value to a known {@link HwAccelChoice}, else null. */
-function parseDecoderHwAccel(raw) {
-	if (typeof raw !== "string") return null;
-	const match = HWACCEL_OPTIONS.find((o) => o.value === raw);
-	return match ? match.value : null;
-}
+/** The NEUTRAL addon (pipeline-orchestrator, hub-resident) whose global
+* settings OWN the per-node `backend` selector. Neither decoder addon owns
+* it, so decoder-nodeav / decoder-ffmpeg stay fully independent. */
+var DECODER_OWNER_ADDON_ID = "pipeline-orchestrator";
 function isHydratedField(entry) {
 	return typeof entry === "object" && entry !== null && "key" in entry;
 }
@@ -23294,37 +23227,6 @@ async function resolveDecoderBackend(api, nodeId, logger) {
 	} });
 	return DEFAULT_DECODER_BACKEND;
 }
-/**
-* Pure selection of the owner's `hwaccel` field from an already-read hydrated
-* settings payload. Missing/invalid/null → {@link DEFAULT_DECODER_HWACCEL}.
-*/
-function pickDecoderHwAccelFromSettings(view) {
-	if (view === null) return DEFAULT_DECODER_HWACCEL;
-	for (const section of view.sections) for (const entry of section.fields) {
-		if (!isHydratedField(entry) || entry.key !== "hwaccel") continue;
-		return parseDecoderHwAccel(entry.value) ?? "auto";
-	}
-	return DEFAULT_DECODER_HWACCEL;
-}
-/**
-* Resolve the effective decoder hwaccel override for a node by reading the
-* `decoder-ffmpeg` OWNER's `hwaccel@<node>` setting — the exact same
-* hub-routed, placement-agnostic read as {@link resolveDecoderBackend}, so
-* node-av and ffmpeg honour ONE per-node value (the one the UI edits). Fails
-* safe to {@link DEFAULT_DECODER_HWACCEL} (`'auto'` → the session's local probe).
-*/
-async function resolveDecoderHwAccel(api, nodeId, logger) {
-	if (!api) return DEFAULT_DECODER_HWACCEL;
-	try {
-		return pickDecoderHwAccelFromSettings(await api.addonSettings.getGlobalSettings.query({
-			addonId: DECODER_OWNER_ADDON_ID,
-			nodeId: normalizeDecoderNodeId(nodeId)
-		}));
-	} catch (err) {
-		logger.warn("decoder-hwaccel: owner settings read failed — deferring to local probe", { meta: { error: err instanceof Error ? err.message : String(err) } });
-		return DEFAULT_DECODER_HWACCEL;
-	}
-}
 //#endregion
 //#region src/scaler-geometry.ts
 /**
@@ -24473,16 +24375,14 @@ var DecoderNodeAvAddon = class extends BaseAddon {
 		}];
 	}
 	/**
-	* Resolve the effective hwaccel backend for a new session. Reads the SHARED
-	* per-node override from the `decoder-ffmpeg` OWNER — the single value the
-	* Pipeline UI edits — exactly as `resolveDecoderBackend` reads the owner's
-	* `backend`. This makes a manual hwaccel override take effect even when
-	* node-av is the active backend (its OWN `hwaccel@node` is never surfaced by
-	* the UI). `'auto'` defers to the session's local resolver
-	* (`ctx.kernel.hwaccel`). Fails safe to `'auto'`.
+	* Resolve the effective hwaccel backend for a new session — from THIS addon's
+	* OWN per-node `hwaccel` config (edited via the Pipeline UI when node-av is
+	* the active decoder). No cross-read of another addon's store. `'auto'`
+	* defers to the session's local resolver (`ctx.kernel.hwaccel`); fails safe
+	* to `'auto'`.
 	*/
 	resolveHwAccelPref() {
-		return resolveDecoderHwAccel(this.ctx.api, this.resolveLocalNodeId(), this.ctx.logger);
+		return Promise.resolve(this.config.hwaccel ?? "auto");
 	}
 	/**
 	* Re-run the platform probe on this host and persist the detected
@@ -24524,7 +24424,9 @@ var DecoderNodeAvAddon = class extends BaseAddon {
 			id: "decoder-nodeav",
 			name: "Decoder (node-av)",
 			isPullMode: true,
-			priority: 10
+			priority: 10,
+			hwaccel: this.config.hwaccel,
+			probedBestHwaccel: this.config.probedBestHwaccel || void 0
 		};
 	}
 	/**

package/dist/index.mjs

@@ -13311,7 +13311,9 @@ var decoderCapability = {
 			id: string(),
 			name: string(),
 			isPullMode: boolean().optional(),
-			priority: number().optional()
+			priority: number().optional(),
+			hwaccel: string().optional(),
+			probedBestHwaccel: string().optional()
 		})),
 		createSession: method(DecoderSessionConfigSchema, object({
 			sessionId: string(),
@@ -23127,79 +23129,10 @@ function normalizeDecoderNodeId(rawNodeId) {
 }
 //#endregion
 //#region src/shared/decoder-backend.ts
-/**
-* Decoder backend selection — decides which decoder addon registers the
-* `decoder` cap on a node.
-*
-* Two decoder addons ship in this bundle: `decoder-ffmpeg` (subprocess
-* decode; a decode crash is isolated to the child) and `decoder-nodeav`
-* (in-process decode via FFmpeg native bindings; no subprocess lifecycle).
-* Both are installed on every node, but only ONE may provide the `decoder`
-* cap at a time.
-*
-* ## Why selection happens at REGISTRATION time (race-free by construction)
-*
-* The `decoder` cap is a singleton. Historically both decoder addons
-* registered a provider and the active slot was resolved AFTER the fact —
-* which exposed a boot-order race: whichever addon's runner initialised
-* first briefly held the active slot, and any consumer that resolved the
-* cap inside that window was dispatched to the wrong backend (the
-* cap-declared `preferredProvider` override only corrects the slot when
-* the preferred addon's registration eventually lands).
-*
-* This module removes the race by construction instead of arbitrating it:
-* each decoder addon calls {@link resolveDecoderBackend} at the START of
-* its `onInitialize` and registers its provider ONLY when it is the
-* selected backend — the other addon returns no registrations at all. At
-* most one `decoder` provider ever exists per node, so no resolution layer
-* (kernel `CapabilityRegistry`, route resolver, UDS child preference) can
-* pick a wrong one, regardless of boot order or timing.
-*
-* ## The setting
-*
-* The per-node selection lives in the `decoder-ffmpeg` OWNER addon's global
-* settings — the standard `addon-settings` surface, visible in the admin UI
-* as the owner's `backend` select field. The store is hub-central and the
-* value is persisted node-scoped as `backend@<nodeId>`
-* (`decoder-backend-keys.ts`); the owner's `getGlobalSettings` projects the
-* requested node's value onto the bare `backend` field.
-*
-* Both decoder addons read it the SAME way, placement-agnostically: via
-* `ctx.api.addonSettings.getGlobalSettings({ addonId: 'decoder-ffmpeg',
-* nodeId })`. The `addon-settings` cap is hub-routed at the system level
-* (`AddonCallGateway.classify` sends settings calls to the addon's base
-* node — the hub instance answers for every node), so an agent addon
-* transparently reads the hub-central store with no placement branching.
-* NOT used: `ctx.settings.getSection` (node-local — empty on an agent, the
-* original bug), the raw settings-store cap, or any custom side channel.
-*
-* Resolution: the node's scoped value → the built-in default
-* {@link DEFAULT_DECODER_BACKEND} (`'nodeav'` — node-av is primary everywhere;
-* ffmpeg is an explicit opt-in fallback only). There is deliberately NO
-* bare-key fallback (see `decoder-backend-keys.ts`), and any read failure
-* resolves to the default so a decoder still comes up — and, because the
-* default IS the primary backend, a stale/failed read can never leave the node
-* with NO decoder (the old `'ffmpeg'` default made node-av stand down on a
-* missed read → both addons down).
-*
-* ## Switching backends
-*
-* Because registration is decided once at addon init, changing the setting
-* takes effect on the next restart of the two decoder addons on the
-* affected node (addon restart / redeploy / node reboot). This is the
-* price of race-freedom: there is deliberately NO live re-arbitration
-* path — a live hand-off would reintroduce a window with two providers.
-*/
-/** The addon whose global settings OWN the per-node `backend` field. */
-var DECODER_OWNER_ADDON_ID = "decoder-ffmpeg";
-/** Fail-safe when the owner's hwaccel can't be read: defer to the local probe. */
-var DEFAULT_DECODER_HWACCEL = "auto";
-/** Narrow an arbitrary stored value to a known {@link HwAccelChoice}, else null. */
-function parseDecoderHwAccel(raw) {
-	if (typeof raw !== "string") return null;
-	const match = HWACCEL_OPTIONS.find((o) => o.value === raw);
-	return match ? match.value : null;
-}
+/** The NEUTRAL addon (pipeline-orchestrator, hub-resident) whose global
+* settings OWN the per-node `backend` selector. Neither decoder addon owns
+* it, so decoder-nodeav / decoder-ffmpeg stay fully independent. */
+var DECODER_OWNER_ADDON_ID = "pipeline-orchestrator";
 function isHydratedField(entry) {
 	return typeof entry === "object" && entry !== null && "key" in entry;
 }
@@ -23290,37 +23223,6 @@ async function resolveDecoderBackend(api, nodeId, logger) {
 	} });
 	return DEFAULT_DECODER_BACKEND;
 }
-/**
-* Pure selection of the owner's `hwaccel` field from an already-read hydrated
-* settings payload. Missing/invalid/null → {@link DEFAULT_DECODER_HWACCEL}.
-*/
-function pickDecoderHwAccelFromSettings(view) {
-	if (view === null) return DEFAULT_DECODER_HWACCEL;
-	for (const section of view.sections) for (const entry of section.fields) {
-		if (!isHydratedField(entry) || entry.key !== "hwaccel") continue;
-		return parseDecoderHwAccel(entry.value) ?? "auto";
-	}
-	return DEFAULT_DECODER_HWACCEL;
-}
-/**
-* Resolve the effective decoder hwaccel override for a node by reading the
-* `decoder-ffmpeg` OWNER's `hwaccel@<node>` setting — the exact same
-* hub-routed, placement-agnostic read as {@link resolveDecoderBackend}, so
-* node-av and ffmpeg honour ONE per-node value (the one the UI edits). Fails
-* safe to {@link DEFAULT_DECODER_HWACCEL} (`'auto'` → the session's local probe).
-*/
-async function resolveDecoderHwAccel(api, nodeId, logger) {
-	if (!api) return DEFAULT_DECODER_HWACCEL;
-	try {
-		return pickDecoderHwAccelFromSettings(await api.addonSettings.getGlobalSettings.query({
-			addonId: DECODER_OWNER_ADDON_ID,
-			nodeId: normalizeDecoderNodeId(nodeId)
-		}));
-	} catch (err) {
-		logger.warn("decoder-hwaccel: owner settings read failed — deferring to local probe", { meta: { error: err instanceof Error ? err.message : String(err) } });
-		return DEFAULT_DECODER_HWACCEL;
-	}
-}
 //#endregion
 //#region src/scaler-geometry.ts
 /**
@@ -24469,16 +24371,14 @@ var DecoderNodeAvAddon = class extends BaseAddon {
 		}];
 	}
 	/**
-	* Resolve the effective hwaccel backend for a new session. Reads the SHARED
-	* per-node override from the `decoder-ffmpeg` OWNER — the single value the
-	* Pipeline UI edits — exactly as `resolveDecoderBackend` reads the owner's
-	* `backend`. This makes a manual hwaccel override take effect even when
-	* node-av is the active backend (its OWN `hwaccel@node` is never surfaced by
-	* the UI). `'auto'` defers to the session's local resolver
-	* (`ctx.kernel.hwaccel`). Fails safe to `'auto'`.
+	* Resolve the effective hwaccel backend for a new session — from THIS addon's
+	* OWN per-node `hwaccel` config (edited via the Pipeline UI when node-av is
+	* the active decoder). No cross-read of another addon's store. `'auto'`
+	* defers to the session's local resolver (`ctx.kernel.hwaccel`); fails safe
+	* to `'auto'`.
 	*/
 	resolveHwAccelPref() {
-		return resolveDecoderHwAccel(this.ctx.api, this.resolveLocalNodeId(), this.ctx.logger);
+		return Promise.resolve(this.config.hwaccel ?? "auto");
 	}
 	/**
 	* Re-run the platform probe on this host and persist the detected
@@ -24520,7 +24420,9 @@ var DecoderNodeAvAddon = class extends BaseAddon {
 			id: "decoder-nodeav",
 			name: "Decoder (node-av)",
 			isPullMode: true,
-			priority: 10
+			priority: 10,
+			hwaccel: this.config.hwaccel,
+			probedBestHwaccel: this.config.probedBestHwaccel || void 0
 		};
 	}
 	/**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-decoder-nodeav",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Standalone in-process node-av decoder addon for CamStack",
   "keywords": [
     "camstack",