@camstack/addon-pipeline 1.2.192 → 1.2.193

package/dist/stream-broker/index.mjs

@@ -1,11 +1,13 @@
 import { r as __toESM } from "../chunk-DnnnRqeS.mjs";
-import { $t as record, At as BOOT_RECOVERY_BACKOFF_MS, Bt as nodePin, C as RATE_CONTROL_RELAXED, Ct as webrtcSessionCapability, D as RingBuffer, Dt as buildFfmpegArgs$1, F as createHwAccelCache, Ft as createEvent, G as egressTranscodeSharingKey, Gt as _enum, Ht as parseProfileBrokerId, I as createLogChannelsProvider, Jt as discriminatedUnion, K as egressTransportFromRequest, Kt as array, Lt as isEvent, Mt as CAM_PROFILE_ORDER, N as batteryCapability, Nt as DeviceFeature, Ot as invocationFromEncodeProfile, P as cameraStreamsCapability, Pt as DeviceType, Qt as object, R as declareLogChannel, Rt as makeProfileBrokerId, Tt as AUDIO_PRESETS, V as deriveBatteryPresence, Xt as literal, Zt as number, en as string, et as loadContributionCapability, gt as resolveEgressDecodeHwAccel, h as EncodeProfileSchema, i as BatteryStatusSchema, jt as BaseAddon, k as addonWidgetsSourceCapability, kt as isSoftwareDecode, nn as EventCategory, qt as boolean, rt as maskUrlCredentials, tn as union, tt as logChannelsCapability, w as RATE_CONTROL_TIGHT, wt as errMsg, xt as streamBrokerCapability, zt as makeSourceBrokerId } from "../dist-B8J7wrtY.mjs";
-import { i as NO_COST_CLAIM, n as Fmp4FragmentChild, r as Fmp4FragmentPlane, t as ChildCostRegistry } from "../node-BSbB0or0.mjs";
+import { $t as number, A as addonWidgetsSourceCapability, At as invocationFromEncodeProfile, Bt as makeProfileBrokerId, C as RATE_CONTROL_RELAXED, Ct as streamBrokerCapability, Dt as AUDIO_PRESETS, Et as errMsg, F as cameraStreamsCapability, Ft as DeviceFeature, H as deriveBatteryPresence, Ht as nodePin, I as createHwAccelCache, It as DeviceType, Jt as array, K as egressTranscodeSharingKey, L as createLogChannelsProvider, Lt as createEvent, Mt as BOOT_RECOVERY_BACKOFF_MS, Nt as BaseAddon, O as RingBuffer, P as batteryCapability, Pt as CAM_PROFILE_ORDER, Qt as literal, Tt as webrtcSessionCapability, Vt as makeSourceBrokerId, Wt as parseProfileBrokerId, Xt as discriminatedUnion, Yt as boolean, en as object, h as EncodeProfileSchema, i as BatteryStatusSchema, in as EventCategory, it as maskUrlCredentials, jt as isSoftwareDecode, kt as buildFfmpegArgs$1, nn as string, nt as logChannelsCapability, q as egressTransportFromRequest, qt as _enum, rn as union, tn as record, tt as loadContributionCapability, vt as resolveEgressDecodeHwAccel, w as RATE_CONTROL_TIGHT, z as declareLogChannel, zt as isEvent } from "../dist-mYDK58Jp.mjs";
+import { i as NO_COST_CLAIM, n as Fmp4FragmentChild, r as Fmp4FragmentPlane, t as ChildCostRegistry } from "../node-xRsaPwBa.mjs";
 import { t as parseRestreamPath } from "../restream-intent-B4BXZra7.mjs";
 import { n as profileForStreamId } from "../remote-restream-BeHi78PZ.mjs";
 import { n as RowMapStore, t as retireRootKeys } from "../retire-root-keys-DMolfhsP.mjs";
-import { i as require_mp4box_all, n as demuxSegmentPreferJs, r as runFfmpegOnce, t as demuxSegmentFullJs } from "../segment-demux-js-0L1EF4Fg.mjs";
+import { i as require_mp4box_all, n as demuxSegmentPreferJs, r as runFfmpegOnce, t as demuxSegmentFullJs } from "../segment-demux-js-CXvgKfsn.mjs";
 import { createRequire } from "node:module";
+import * as os from "node:os";
+import { networkInterfaces, tmpdir } from "node:os";
 import * as crypto$1 from "node:crypto";
 import crypto, { createHash, randomBytes, randomUUID } from "node:crypto";
 import * as fs from "node:fs";
@@ -15,13 +17,11 @@ import { join } from "node:path";
 import { spawn } from "node:child_process";
 import { readFile } from "node:fs/promises";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import * as os from "node:os";
-import { networkInterfaces, tmpdir } from "node:os";
 import * as net$1 from "node:net";
 import net from "node:net";
 import { createSocket } from "node:dgram";
-import { Socket } from "net";
 import { once } from "events";
+import { Socket } from "net";
 import { lookup } from "node:dns/promises";
 import { Worker } from "node:worker_threads";
 import { EventEmitter } from "node:events";
@@ -1723,6 +1723,65 @@ function fillEmptyProfileSlots(current, autoRanked) {
 	}
 	return next;
 }
+//#endregion
+//#region src/stream-broker/initial-assignment.ts
+function pixels(stream) {
+	return stream.resolution ? stream.resolution.width * stream.resolution.height : -1;
+}
+/** Pixels descending, then publish order — the heuristic as it always was. */
+function rankByPixels(streams) {
+	return [...streams].toSorted((a, b) => {
+		const aPx = pixels(a);
+		const bPx = pixels(b);
+		if (aPx !== bPx) return bPx - aPx;
+		return a.order - b.order;
+	});
+}
+/**
+* The slots the un-hinted ranking fills, by how many streams are left: one
+* stream is a `mid`, two are `high`+`low`, three fill everything. Filtered to
+* the slots the hints did not take, in this priority order, so a camera with
+* one hinted `low` and one other stream gets `high` for the other — the pair
+* every two-stream camera already had.
+*/
+var RANK_ORDER_BY_COUNT = {
+	1: ["mid"],
+	2: ["high", "low"],
+	3: [
+		"high",
+		"mid",
+		"low"
+	]
+};
+/**
+* Streams marked `autoEligible: false` are skipped — they remain published
+* (visible + manually assignable via `assignProfile`) but never become the
+* default. If every stream is non-eligible the map stays empty: ranking
+* ineligible streams (a derived that beat the catalog to boot) parked a
+* transcode on `high` and left the natives around it (618, 2026-08-17).
+*/
+function rankInitialAssignment(streams) {
+	const eligible = streams.filter((s) => s.autoEligible);
+	if (eligible.length === 0) return {};
+	const hinted = {};
+	const rest = [];
+	for (const stream of [...eligible].toSorted((a, b) => a.order - b.order)) {
+		const hint = stream.profileHint;
+		if (hint !== void 0 && hinted[hint] === void 0) hinted[hint] = stream.camStreamId;
+		else rest.push(stream);
+	}
+	const ranked = rankByPixels(rest).slice(0, 3);
+	const freeSlots = (RANK_ORDER_BY_COUNT[Math.min(3, eligible.length)] ?? []).filter((slot) => hinted[slot] === void 0);
+	const byRank = {};
+	ranked.forEach((stream, index) => {
+		const slot = freeSlots[index];
+		if (slot !== void 0) byRank[slot] = stream.camStreamId;
+	});
+	return {
+		...hinted,
+		...byRank
+	};
+}
 /**
 * Ceiling for a configured pre-roll.
 *
@@ -7444,16 +7503,28 @@ function aacSamplingIndexToHz(index) {
 	return AAC_SAMPLE_RATES[index] ?? null;
 }
 //#endregion
+//#region src/stream-broker/rtmp/rtmp-url.ts
+var DEFAULT_RTMP_PORT = 1935;
+var RTMP_URL = /^rtmp:\/\/([^/:]+)(?::(\d+))?\/(.*)$/;
+function parseRtmpUrl(url) {
+	const m = RTMP_URL.exec(url);
+	if (!m) throw new Error(`not an rtmp:// url: ${url}`);
+	const host = m[1] ?? "";
+	const port = m[2] !== void 0 ? Number(m[2]) : DEFAULT_RTMP_PORT;
+	const path = m[3] ?? "";
+	const slash = path.lastIndexOf("/");
+	if (slash < 0) throw new Error(`rtmp url has no playpath: ${url}`);
+	const app = path.slice(0, slash);
+	return {
+		host,
+		port,
+		app,
+		playPath: path.slice(slash + 1),
+		tcUrl: `rtmp://${host}:${String(port)}/${app}`
+	};
+}
+//#endregion
 //#region src/stream-broker/rtmp/rtmp-client.ts
-/**
-* RTMP client (TCP, handshake, AMF0 connect/createStream/play, chunk parser).
-*
-* RTMP client with the following adaptations from the original implementation:
-*   - `console` replaced with project `IScopedLogger`.
-*   - Inlined `readLength` helper (no external dependency).
-*   - Strict TS — AMF0 encoder accepts a tagged union instead of `any`.
-*   - Async-friendly `destroy()` for the broker's reconnect cycle.
-*/
 var StreamEndError = class extends Error {
 	constructor(where) {
 		super(`stream ended: ${where}`);
@@ -7492,7 +7563,6 @@ async function readLength(readable, length) {
 }
 var HANDSHAKE_SIZE = 1536;
 var RTMP_VERSION = 3;
-var DEFAULT_RTMP_PORT = 1935;
 function encodeAmf0(value) {
 	if (typeof value === "number") {
 		const buf = Buffer.alloc(9);
@@ -7591,9 +7661,7 @@ var RtmpClient = class {
 		const { messageTypeId } = (await this.readMessage()).chunkStream;
 		if (messageTypeId !== 20) throw new Error(`Unexpected message type for createStream result: ${messageTypeId}`);
 		this.logger?.debug("rtmp createStream _result received");
-		const parsedUrl = new URL(this.url);
-		const parts = parsedUrl.pathname.split("/");
-		const playPath = (parts.length > 2 ? parts.slice(2).join("/") : "") + parsedUrl.search;
+		const { playPath } = parseRtmpUrl(this.url);
 		const getStreamLengthData = encodeAmf0Command("getStreamLength", this.transactionId++, null, playPath);
 		this.sendMessage(5, 0, 20, 0, getStreamLengthData);
 		this.sendPlay(this.streamId, playPath);
@@ -7626,9 +7694,7 @@ var RtmpClient = class {
 		} catch {}
 	}
 	async connect() {
-		const parsedUrl = new URL(this.url);
-		const host = parsedUrl.hostname;
-		const port = parseInt(parsedUrl.port || `${DEFAULT_RTMP_PORT}`, 10) || DEFAULT_RTMP_PORT;
+		const { host, port } = parseRtmpUrl(this.url);
 		this.logger?.debug("rtmp tcp connecting", { meta: {
 			host,
 			port
@@ -7791,10 +7857,9 @@ var RtmpClient = class {
 		for (const chunk of chunks) this.socket.write(chunk);
 	}
 	async sendConnect() {
-		const parsedUrl = new URL(this.url);
-		const tcUrl = `${parsedUrl.protocol}//${parsedUrl.host}/${parsedUrl.pathname.split("/")[1]}`;
+		const { app, tcUrl } = parseRtmpUrl(this.url);
 		const connectObject = {
-			app: parsedUrl.pathname.split("/")[1],
+			app,
 			flashVer: "LNX 9,0,124,2",
 			tcUrl,
 			fpad: false,
@@ -16230,6 +16295,7 @@ var StreamBrokerManager = class StreamBrokerManager {
 		const order = existing?.order ?? this.nextOrder(deviceId);
 		const deviceFeatures = input.deviceFeatures ? [...input.deviceFeatures] : existing?.deviceFeatures ? [...existing.deviceFeatures] : [];
 		const autoEligible = input.autoEligible ?? existing?.autoEligible ?? true;
+		const profileHint = input.profileHint ?? existing?.profileHint;
 		const brokerOwned = input.brokerOwned ?? existing?.brokerOwned ?? false;
 		const cam = {
 			camStreamId,
@@ -16244,6 +16310,7 @@ var StreamBrokerManager = class StreamBrokerManager {
 			order,
 			deviceFeatures,
 			autoEligible,
+			...profileHint !== void 0 ? { profileHint } : {},
 			brokerOwned
 		};
 		streamMap.set(camStreamId, cam);
@@ -18577,24 +18644,7 @@ var StreamBrokerManager = class StreamBrokerManager {
 	* around it (618, 2026-08-17).
 	*/
 	computeInitialAssignment(streams) {
-		const eligible = streams.filter((s) => s.autoEligible);
-		if (eligible.length === 0) return {};
-		const ranked = [...eligible].toSorted((a, b) => {
-			const aPx = a.resolution ? a.resolution.width * a.resolution.height : -1;
-			const bPx = b.resolution ? b.resolution.width * b.resolution.height : -1;
-			if (aPx !== bPx) return bPx - aPx;
-			return a.order - b.order;
-		});
-		if (ranked.length === 1) return { mid: ranked[0].camStreamId };
-		if (ranked.length === 2) return {
-			high: ranked[0].camStreamId,
-			low: ranked[1].camStreamId
-		};
-		return {
-			high: ranked[0].camStreamId,
-			mid: ranked[1].camStreamId,
-			low: ranked[2].camStreamId
-		};
+		return rankInitialAssignment(streams);
 	}
 	/**
 	* Recompute the auto profile assignment for a device over its CURRENT

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-BmNfrv_U.mjs")).catch((e) => {
+	return l ||= d(() => import("./_virtual_mf-localSharedImportMap___mfe_internal__addon_stream_broker_widgets-CUjbLOm9.mjs")).catch((e) => {
 		throw l = void 0, e;
 	}), l;
 }

package/dist/{worker-protocol-WiXU2VuW.mjs → worker-protocol-C0R1DDC0.mjs}

@@ -1,4 +1,4 @@
-import { b as NativeLeaseSettingsSchema, p as DEFAULT_NATIVE_LEASE_SETTINGS, y as NativeLeaseAdmissionSchema } from "./dist-B8J7wrtY.mjs";
+import { b as NativeLeaseSettingsSchema, p as DEFAULT_NATIVE_LEASE_SETTINGS, y as NativeLeaseAdmissionSchema } from "./dist-mYDK58Jp.mjs";
 //#region src/session-decode/native-lease-config.ts
 /**
 * Resolution of the native-frame hold / tile knobs for one decode worker.

package/dist/{worker-protocol-BJzhw3t0.js → worker-protocol-DCsi4YS1.js}

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

package/package.json

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