@camstack/addon-pipeline 1.2.59 → 1.2.61

package/dist/stream-broker/index.js

@@ -3,9 +3,8 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 const require_chunk = require("../chunk-emK7D4bc.js");
-const require_dist = require("../dist-D8TX_P_A.js");
+const require_dist = require("../dist-BInMIG0Q.js");
 const require_remote_restream = require("../remote-restream-CO36Sr30.js");
-const require_addon_utils = require("../addon-utils-CQs-AjTJ.js");
 let node_crypto = require("node:crypto");
 node_crypto = require_chunk.__toESM(node_crypto, 1);
 let node_child_process = require("node:child_process");
@@ -27,35 +26,6 @@ let events = require("events");
 let node_dns_promises = require("node:dns/promises");
 let node_module = require("node:module");
 let node_events = require("node:events");
-//#region src/stream-broker/embed-file-handler.ts
-/** Build a `(req, res)` handler serving the embed bundle at `root` with SPA fallback.
-*  Web MIME types (`.html`/`.js`/`.css`/…) come from the core handler's defaults. */
-/** Cache-Control for the CONTENT-HASHED vite assets (`/assets/index-<hash>.js`):
-*  a new build changes the filename, so the old bytes can cache forever. The
-*  entry `index.html` keeps the handler's default `no-cache`. Without this the
-*  WebView re-downloaded the ~1.5MB bundle on EVERY player open — a real chunk
-*  of the "live stream takes ~10s to start" cold-start cost (worse on 4G). */
-var IMMUTABLE_CACHE = "public, max-age=31536000, immutable";
-function createEmbedSpaHandler(root) {
-	const fileHandler = require_addon_utils.createFileDataPlaneHandler({
-		getRoots: () => [root],
-		cacheControl: (rel) => rel.startsWith("assets/") ? IMMUTABLE_CACHE : void 0
-	});
-	return (req, res) => {
-		const [pathPart = "/", query] = (req.url ?? "/").split("?");
-		const lastSegment = pathPart.split("/").pop() ?? "";
-		if (pathPart === "/" || pathPart === "" || !lastSegment.includes(".")) req.url = query !== void 0 ? `/index.html?${query}` : "/index.html";
-		else if (pathPart.startsWith("/assets/")) {
-			const origWriteHead = res.writeHead.bind(res);
-			res.writeHead = ((status, headers) => origWriteHead(status, {
-				...headers,
-				"cache-control": IMMUTABLE_CACHE
-			}));
-		}
-		return fileHandler(req, res);
-	};
-}
-//#endregion
 //#region src/stream-broker/client-log-ingest.ts
 var MAX_BODY_BYTES = 512 * 1024;
 /** Camera identity carried inside an entry's `data` (the embed stamps it via
@@ -21552,11 +21522,13 @@ var AdaptiveController = class {
 	*/
 	armed = false;
 	failures;
+	upgradeCount;
 	constructor(opts) {
 		this.opts = opts;
 		this.tracker = new LossTracker(opts.config);
 		this.tier = opts.initialTier;
 		this.failures = new Map(opts.priorFailures ?? []);
+		this.upgradeCount = Math.max(0, opts.priorUpgradeCount ?? 0);
 	}
 	get currentTier() {
 		return this.tier;
@@ -21569,6 +21541,9 @@ var AdaptiveController = class {
 	get failureCounts() {
 		return this.failures;
 	}
+	get successfulUpgradeCount() {
+		return this.upgradeCount;
+	}
 	onLoss(sample, now) {
 		this.tracker.track(sample, now);
 	}
@@ -21621,8 +21596,9 @@ var AdaptiveController = class {
 	*/
 	requiredHealthyMs(tier) {
 		const failures = this.failures.get(tier) ?? 0;
-		if (failures <= 0) return this.opts.config.upgradeHealthyMs;
-		return Math.min(this.opts.config.upgradeHealthyMs * 2 ** failures, this.opts.config.maxUpgradeBackoffMs);
+		const progressiveMs = Math.min(this.opts.config.upgradeHealthyMs * this.opts.config.upgradeHealthyGrowthFactor ** this.upgradeCount, this.opts.config.maxProgressiveUpgradeHealthyMs);
+		if (failures <= 0) return progressiveMs;
+		return Math.min(progressiveMs * 2 ** failures, this.opts.config.maxUpgradeBackoffMs);
 	}
 	commitChange(now) {
 		this.lastChangeAt = now;
@@ -21659,6 +21635,7 @@ var AdaptiveController = class {
 		this.tier = next;
 		this.mtuReduced = false;
 		this.transcodeEngaged = false;
+		this.upgradeCount += 1;
 		this.opts.onSwitchTier(next);
 		this.commitChange(now);
 		this.healthySince = now;
@@ -31397,8 +31374,10 @@ var ADAPTIVE_CONFIG = {
 	analyzeWindowMs: 15e3,
 	minFailPercent: .05,
 	waitAfterResetMs: 8e3,
-	upgradeHealthyMs: 2e4,
-	minTimeBetweenChangesMs: 2e4,
+	upgradeHealthyMs: 4e3,
+	upgradeHealthyGrowthFactor: 3,
+	maxProgressiveUpgradeHealthyMs: 3e4,
+	minTimeBetweenChangesMs: 4e3,
 	maxUpgradeBackoffMs: 9e5
 };
 /**
@@ -32466,7 +32445,7 @@ var BrokerWebrtcServer = class {
 		};
 		if (streamId.endsWith("/adaptive")) {
 			const initialTier = this.profileTierResolver?.(brokerId) ?? "high";
-			this.startAdaptive(entry, deviceId, initialTier, sessionId, intent?.failures);
+			this.startAdaptive(entry, deviceId, initialTier, sessionId, intent?.failures, intent?.upgradeCount);
 		}
 		return {
 			sessionId,
@@ -32567,10 +32546,11 @@ var BrokerWebrtcServer = class {
 	* whichever produces the higher loss ratio across its window. The async
 	* poll is guarded against overlapping ticks via `tickInFlight`.
 	*/
-	startAdaptive(entry, deviceId, initialTier, sessionId, priorFailures) {
+	startAdaptive(entry, deviceId, initialTier, sessionId, priorFailures, priorUpgradeCount) {
 		const controller = new AdaptiveController({
 			initialTier,
 			priorFailures,
+			priorUpgradeCount,
 			config: ADAPTIVE_CONFIG,
 			onSwitchTier: (tier) => {
 				this.switchSessionTier(entry, deviceId, tier, sessionId);
@@ -32628,10 +32608,12 @@ var BrokerWebrtcServer = class {
 	switchSessionTier(entry, deviceId, tier, sessionId, forceTranscodeDown = false) {
 		const prev = this.adaptiveIntent.get(sessionId);
 		const failures = new Map(entry.adaptiveController?.failureCounts ?? prev?.failures);
+		const upgradeCount = entry.adaptiveController?.successfulUpgradeCount ?? prev?.upgradeCount ?? 0;
 		this.adaptiveIntent.set(sessionId, {
 			prefersTier: tier,
 			forceTranscodeDown: forceTranscodeDown || (prev?.forceTranscodeDown ?? false),
-			failures
+			failures,
+			upgradeCount
 		});
 		const epoch = (entry.session.pendingRenegotiation?.epoch ?? 0) + 1;
 		entry.session.pendingRenegotiation = {
@@ -32646,7 +32628,8 @@ var BrokerWebrtcServer = class {
 				tier,
 				forceTranscodeDown,
 				epoch,
-				failures: Object.fromEntries(failures)
+				failures: Object.fromEntries(failures),
+				upgradeCount
 			}
 		});
 	}
@@ -33429,8 +33412,6 @@ var StreamBrokerAddon = class extends require_dist.BaseAddon {
 	*  leaks those sockets and wedges the next runner's werift ICE agent
 	*  (DTLS never connects until a full hub restart). */
 	webrtcServer = null;
-	/** Handle for the embed SPA data-plane listener (disposed on shutdown). */
-	embedDataPlane = null;
 	/** Names this process's event-loop stalls — see onInitialize. */
 	loopStallMonitor = null;
 	/**
@@ -33828,17 +33809,6 @@ var StreamBrokerAddon = class extends require_dist.BaseAddon {
 			defaultRows: 2
 		}] };
 		this.ctx.logger.info("Stream broker manager initialized");
-		try {
-			const handler = createEmbedSpaHandler(node_path.default.resolve(__dirname, "../../embed-dist"));
-			this.embedDataPlane = await this.ctx.dataPlane?.serve({
-				prefix: "embed",
-				access: "public",
-				handler
-			}) ?? null;
-			this.ctx.logger.info("stream-broker: embed served", { meta: { baseUrl: this.embedDataPlane?.baseUrl ?? "(no dataPlane facility)" } });
-		} catch (err) {
-			this.ctx.logger.warn("stream-broker: embed data-plane failed to serve", { meta: { error: require_dist.errMsg(err) } });
-		}
 		try {
 			const clientLogHandler = createClientLogIngest((entries, source) => {
 				for (const e of entries) {
@@ -33898,12 +33868,6 @@ var StreamBrokerAddon = class extends require_dist.BaseAddon {
 			clearInterval(this.catalogReconcileTimer);
 			this.catalogReconcileTimer = null;
 		}
-		try {
-			await this.embedDataPlane?.dispose();
-		} catch (err) {
-			this.ctx?.logger?.warn?.("stream-broker: embed data-plane dispose failed", { meta: { error: require_dist.errMsg(err) } });
-		}
-		this.embedDataPlane = null;
 		try {
 			await this.webrtcServer?.stop();
 		} catch (err) {

package/dist/stream-broker/index.mjs

@@ -1,7 +1,6 @@
 import { r as __toESM, t as __commonJSMin } from "../chunk-DnnnRqeS.mjs";
-import { $ as webrtcSessionCapability, At as union, B as maskUrlCredentials, C as addonWidgetsSourceCapability, Ct as discriminatedUnion, D as createHwAccelCache, Dt as object, E as cameraStreamsCapability, Et as number, F as egressTransportFromRequest, J as resolveEgressDecodeHwAccel, Ot as record, P as egressTranscodeSharingKey, St as boolean, Tt as literal, Z as streamBrokerCapability, _t as parseProfileBrokerId, at as isSoftwareDecode, bt as _enum, ct as DeviceFeature, et as errMsg, f as EncodeProfileSchema, ft as isEvent, ht as nodePin, it as invocationFromEncodeProfile, jt as EventCategory, kt as string, lt as DeviceType, mt as makeSourceBrokerId, nt as Fmp4BoxSplitter, ot as BaseAddon, pt as makeProfileBrokerId, rt as buildFfmpegArgs$1, st as CAM_PROFILE_ORDER, tt as AUDIO_PRESETS, ut as createEvent, v as RATE_CONTROL_RELAXED, x as RingBuffer, xt as array, y as RATE_CONTROL_TIGHT } from "../dist-B55xTTsS.mjs";
+import { $ as webrtcSessionCapability, At as union, B as maskUrlCredentials, C as addonWidgetsSourceCapability, Ct as discriminatedUnion, D as createHwAccelCache, Dt as object, E as cameraStreamsCapability, Et as number, F as egressTransportFromRequest, J as resolveEgressDecodeHwAccel, Ot as record, P as egressTranscodeSharingKey, St as boolean, Tt as literal, Z as streamBrokerCapability, _t as parseProfileBrokerId, at as isSoftwareDecode, bt as _enum, ct as DeviceFeature, et as errMsg, f as EncodeProfileSchema, ft as isEvent, ht as nodePin, it as invocationFromEncodeProfile, jt as EventCategory, kt as string, lt as DeviceType, mt as makeSourceBrokerId, nt as Fmp4BoxSplitter, ot as BaseAddon, pt as makeProfileBrokerId, rt as buildFfmpegArgs$1, st as CAM_PROFILE_ORDER, tt as AUDIO_PRESETS, ut as createEvent, v as RATE_CONTROL_RELAXED, x as RingBuffer, xt as array, y as RATE_CONTROL_TIGHT } from "../dist-aslBaGaT.mjs";
 import { n as profileForStreamId } from "../remote-restream-BeHi78PZ.mjs";
-import { n as createFileDataPlaneHandler } from "../addon-utils-CZ2xo67g.mjs";
 import { createRequire } from "node:module";
 import * as crypto$1 from "node:crypto";
 import crypto, { createHash, randomBytes, randomUUID } from "node:crypto";
@@ -12,7 +11,7 @@ import { networkInterfaces, tmpdir } from "node:os";
 import * as fs from "node:fs";
 import "node:fs";
 import * as path$1 from "node:path";
-import path, { join } from "node:path";
+import { join } from "node:path";
 import * as net$1 from "node:net";
 import net from "node:net";
 import { readFile } from "node:fs/promises";
@@ -21,35 +20,6 @@ import { Socket } from "net";
 import { once } from "events";
 import { lookup } from "node:dns/promises";
 import { EventEmitter } from "node:events";
-//#region src/stream-broker/embed-file-handler.ts
-/** Build a `(req, res)` handler serving the embed bundle at `root` with SPA fallback.
-*  Web MIME types (`.html`/`.js`/`.css`/…) come from the core handler's defaults. */
-/** Cache-Control for the CONTENT-HASHED vite assets (`/assets/index-<hash>.js`):
-*  a new build changes the filename, so the old bytes can cache forever. The
-*  entry `index.html` keeps the handler's default `no-cache`. Without this the
-*  WebView re-downloaded the ~1.5MB bundle on EVERY player open — a real chunk
-*  of the "live stream takes ~10s to start" cold-start cost (worse on 4G). */
-var IMMUTABLE_CACHE = "public, max-age=31536000, immutable";
-function createEmbedSpaHandler(root) {
-	const fileHandler = createFileDataPlaneHandler({
-		getRoots: () => [root],
-		cacheControl: (rel) => rel.startsWith("assets/") ? IMMUTABLE_CACHE : void 0
-	});
-	return (req, res) => {
-		const [pathPart = "/", query] = (req.url ?? "/").split("?");
-		const lastSegment = pathPart.split("/").pop() ?? "";
-		if (pathPart === "/" || pathPart === "" || !lastSegment.includes(".")) req.url = query !== void 0 ? `/index.html?${query}` : "/index.html";
-		else if (pathPart.startsWith("/assets/")) {
-			const origWriteHead = res.writeHead.bind(res);
-			res.writeHead = ((status, headers) => origWriteHead(status, {
-				...headers,
-				"cache-control": IMMUTABLE_CACHE
-			}));
-		}
-		return fileHandler(req, res);
-	};
-}
-//#endregion
 //#region src/stream-broker/client-log-ingest.ts
 var MAX_BODY_BYTES = 512 * 1024;
 /** Camera identity carried inside an entry's `data` (the embed stamps it via
@@ -21546,11 +21516,13 @@ var AdaptiveController = class {
 	*/
 	armed = false;
 	failures;
+	upgradeCount;
 	constructor(opts) {
 		this.opts = opts;
 		this.tracker = new LossTracker(opts.config);
 		this.tier = opts.initialTier;
 		this.failures = new Map(opts.priorFailures ?? []);
+		this.upgradeCount = Math.max(0, opts.priorUpgradeCount ?? 0);
 	}
 	get currentTier() {
 		return this.tier;
@@ -21563,6 +21535,9 @@ var AdaptiveController = class {
 	get failureCounts() {
 		return this.failures;
 	}
+	get successfulUpgradeCount() {
+		return this.upgradeCount;
+	}
 	onLoss(sample, now) {
 		this.tracker.track(sample, now);
 	}
@@ -21615,8 +21590,9 @@ var AdaptiveController = class {
 	*/
 	requiredHealthyMs(tier) {
 		const failures = this.failures.get(tier) ?? 0;
-		if (failures <= 0) return this.opts.config.upgradeHealthyMs;
-		return Math.min(this.opts.config.upgradeHealthyMs * 2 ** failures, this.opts.config.maxUpgradeBackoffMs);
+		const progressiveMs = Math.min(this.opts.config.upgradeHealthyMs * this.opts.config.upgradeHealthyGrowthFactor ** this.upgradeCount, this.opts.config.maxProgressiveUpgradeHealthyMs);
+		if (failures <= 0) return progressiveMs;
+		return Math.min(progressiveMs * 2 ** failures, this.opts.config.maxUpgradeBackoffMs);
 	}
 	commitChange(now) {
 		this.lastChangeAt = now;
@@ -21653,6 +21629,7 @@ var AdaptiveController = class {
 		this.tier = next;
 		this.mtuReduced = false;
 		this.transcodeEngaged = false;
+		this.upgradeCount += 1;
 		this.opts.onSwitchTier(next);
 		this.commitChange(now);
 		this.healthySince = now;
@@ -31388,8 +31365,10 @@ var ADAPTIVE_CONFIG = {
 	analyzeWindowMs: 15e3,
 	minFailPercent: .05,
 	waitAfterResetMs: 8e3,
-	upgradeHealthyMs: 2e4,
-	minTimeBetweenChangesMs: 2e4,
+	upgradeHealthyMs: 4e3,
+	upgradeHealthyGrowthFactor: 3,
+	maxProgressiveUpgradeHealthyMs: 3e4,
+	minTimeBetweenChangesMs: 4e3,
 	maxUpgradeBackoffMs: 9e5
 };
 /**
@@ -32457,7 +32436,7 @@ var BrokerWebrtcServer = class {
 		};
 		if (streamId.endsWith("/adaptive")) {
 			const initialTier = this.profileTierResolver?.(brokerId) ?? "high";
-			this.startAdaptive(entry, deviceId, initialTier, sessionId, intent?.failures);
+			this.startAdaptive(entry, deviceId, initialTier, sessionId, intent?.failures, intent?.upgradeCount);
 		}
 		return {
 			sessionId,
@@ -32558,10 +32537,11 @@ var BrokerWebrtcServer = class {
 	* whichever produces the higher loss ratio across its window. The async
 	* poll is guarded against overlapping ticks via `tickInFlight`.
 	*/
-	startAdaptive(entry, deviceId, initialTier, sessionId, priorFailures) {
+	startAdaptive(entry, deviceId, initialTier, sessionId, priorFailures, priorUpgradeCount) {
 		const controller = new AdaptiveController({
 			initialTier,
 			priorFailures,
+			priorUpgradeCount,
 			config: ADAPTIVE_CONFIG,
 			onSwitchTier: (tier) => {
 				this.switchSessionTier(entry, deviceId, tier, sessionId);
@@ -32619,10 +32599,12 @@ var BrokerWebrtcServer = class {
 	switchSessionTier(entry, deviceId, tier, sessionId, forceTranscodeDown = false) {
 		const prev = this.adaptiveIntent.get(sessionId);
 		const failures = new Map(entry.adaptiveController?.failureCounts ?? prev?.failures);
+		const upgradeCount = entry.adaptiveController?.successfulUpgradeCount ?? prev?.upgradeCount ?? 0;
 		this.adaptiveIntent.set(sessionId, {
 			prefersTier: tier,
 			forceTranscodeDown: forceTranscodeDown || (prev?.forceTranscodeDown ?? false),
-			failures
+			failures,
+			upgradeCount
 		});
 		const epoch = (entry.session.pendingRenegotiation?.epoch ?? 0) + 1;
 		entry.session.pendingRenegotiation = {
@@ -32637,7 +32619,8 @@ var BrokerWebrtcServer = class {
 				tier,
 				forceTranscodeDown,
 				epoch,
-				failures: Object.fromEntries(failures)
+				failures: Object.fromEntries(failures),
+				upgradeCount
 			}
 		});
 	}
@@ -33420,8 +33403,6 @@ var StreamBrokerAddon = class extends BaseAddon {
 	*  leaks those sockets and wedges the next runner's werift ICE agent
 	*  (DTLS never connects until a full hub restart). */
 	webrtcServer = null;
-	/** Handle for the embed SPA data-plane listener (disposed on shutdown). */
-	embedDataPlane = null;
 	/** Names this process's event-loop stalls — see onInitialize. */
 	loopStallMonitor = null;
 	/**
@@ -33819,17 +33800,6 @@ var StreamBrokerAddon = class extends BaseAddon {
 			defaultRows: 2
 		}] };
 		this.ctx.logger.info("Stream broker manager initialized");
-		try {
-			const handler = createEmbedSpaHandler(path.resolve(__dirname, "../../embed-dist"));
-			this.embedDataPlane = await this.ctx.dataPlane?.serve({
-				prefix: "embed",
-				access: "public",
-				handler
-			}) ?? null;
-			this.ctx.logger.info("stream-broker: embed served", { meta: { baseUrl: this.embedDataPlane?.baseUrl ?? "(no dataPlane facility)" } });
-		} catch (err) {
-			this.ctx.logger.warn("stream-broker: embed data-plane failed to serve", { meta: { error: errMsg(err) } });
-		}
 		try {
 			const clientLogHandler = createClientLogIngest((entries, source) => {
 				for (const e of entries) {
@@ -33889,12 +33859,6 @@ var StreamBrokerAddon = class extends BaseAddon {
 			clearInterval(this.catalogReconcileTimer);
 			this.catalogReconcileTimer = null;
 		}
-		try {
-			await this.embedDataPlane?.dispose();
-		} catch (err) {
-			this.ctx?.logger?.warn?.("stream-broker: embed data-plane dispose failed", { meta: { error: errMsg(err) } });
-		}
-		this.embedDataPlane = null;
 		try {
 			await this.webrtcServer?.stop();
 		} catch (err) {

package/dist/stream-broker/remoteEntry.js

@@ -30,7 +30,7 @@ async function d(e) {
 	}
 }
 async function f() {
-	return l ||= d(() => import("./_virtual_mf-localSharedImportMap___mfe_internal__addon_stream_broker_widgets-C-9q6y1s.mjs")).catch((e) => {
+	return l ||= d(() => import("./_virtual_mf-localSharedImportMap___mfe_internal__addon_stream_broker_widgets-BqfT64lY.mjs")).catch((e) => {
 		throw l = void 0, e;
 	}), l;
 }

package/dist/{worker-protocol-C2uctCrd.js → worker-protocol-Bs2ULhzO.js}

@@ -1,4 +1,4 @@
-const require_dist = require("./dist-D8TX_P_A.js");
+const require_dist = require("./dist-BInMIG0Q.js");
 //#region src/session-decode/native-lease-config.ts
 /**
 * Resolution of the native-frame lease knobs for one decode worker.

package/dist/{worker-protocol-Bol291_n.mjs → worker-protocol-DQJWq-MP.mjs}

@@ -1,4 +1,4 @@
-import { g as NativeLeaseSettingsSchema, h as NativeLeaseAdmissionSchema, l as DEFAULT_NATIVE_LEASE_SETTINGS } from "./dist-B55xTTsS.mjs";
+import { g as NativeLeaseSettingsSchema, h as NativeLeaseAdmissionSchema, l as DEFAULT_NATIVE_LEASE_SETTINGS } from "./dist-aslBaGaT.mjs";
 //#region src/session-decode/native-lease-config.ts
 /**
 * Resolution of the native-frame lease knobs for one decode worker.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-pipeline",
-  "version": "1.2.59",
+  "version": "1.2.61",
   "description": "Pipeline bundle — runner, detection, motion, audio + stream broker. Multi-entry npm package shipping pipeline addons under a single bundle.",
   "keywords": [
     "camstack",
@@ -47,7 +47,6 @@
   },
   "files": [
     "dist",
-    "embed-dist",
     "python",
     "swift",
     "wasm",
@@ -239,13 +238,11 @@
     ]
   },
   "scripts": {
-    "build": "vite build && vite build --config vite.widgets.stream-broker.config.ts && npm run build:embed",
+    "build": "vite build && vite build --config vite.widgets.stream-broker.config.ts",
     "build:server": "vite build",
     "build:widgets": "vite build --config vite.widgets.stream-broker.config.ts",
-    "build:embed": "vite build -c embed/vite.config.ts",
     "dev": "vite build --watch",
     "typecheck": "tsc --noEmit",
-    "typecheck:embed": "tsc --noEmit -p embed/tsconfig.json",
     "test": "vitest run",
     "test:embed": "vitest run -c embed/vitest.config.ts",
     "publish": "npm publish --access public"