@camstack/addon-pipeline 1.2.63 → 1.2.65

package/dist/stream-broker/index.mjs

@@ -1,5 +1,5 @@
 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-DTvDedJV.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-B9_C-QmC.mjs";
 import { n as profileForStreamId } from "../remote-restream-BeHi78PZ.mjs";
 import { createRequire } from "node:module";
 import * as crypto$1 from "node:crypto";
@@ -14694,9 +14694,67 @@ var StreamBrokerManager = class StreamBrokerManager {
 	setProfileMapPersister(persister) {
 		this.profileMapPersister = persister;
 	}
-	loadPersistedProfileMap(entries) {
+	/**
+	* Rehydrate the persisted profile map, then reconcile it against the live
+	* device registry — a blob written before a camera was deleted otherwise
+	* resurrects that camera's slots on every boot.
+	*
+	* Call AFTER `setProfileMapPersister` / `setApiAccess`: the prune persists
+	* what it drops, and reads the registry to decide what to drop.
+	*/
+	async loadPersistedProfileMap(entries) {
 		this.assignments.clear();
 		for (const [k, v] of entries) this.assignments.set(k, v);
+		await this.pruneAssignmentsForRemovedDevices();
+	}
+	/**
+	* Drop assignments for devices the registry no longer knows.
+	*
+	* Deletion decided by a fallible read, so every way the read can be WRONG
+	* skips the prune outright (D49): no api yet, a failed enumeration, or an
+	* empty enumeration standing next to persisted assignments — that last one
+	* is device-restore not having run, and believing it would wipe the whole
+	* fleet's slot map on one bad boot. Nothing here is retried: the next boot
+	* reads the same blob, and A3 already removes a device at the moment it is
+	* deleted.
+	*/
+	async pruneAssignmentsForRemovedDevices() {
+		const persistedCount = this.assignments.size;
+		if (persistedCount === 0) return;
+		const api = this.api;
+		if (!api) {
+			this.logger.warn("profile-map prune skipped — no api access", { meta: { persistedCount } });
+			return;
+		}
+		let devices;
+		try {
+			devices = await api.deviceManager.listAll.query({});
+		} catch (err) {
+			this.logger.warn("profile-map prune skipped — deviceManager.listAll failed", { meta: {
+				persistedCount,
+				error: errMsg(err)
+			} });
+			return;
+		}
+		if (devices.length === 0) {
+			this.logger.warn("profile-map prune skipped — device enumeration came back empty", { meta: { persistedCount } });
+			return;
+		}
+		const known = new Set(devices.map((d) => d.id));
+		const dropped = [...this.assignments.keys()].filter((deviceId) => !known.has(deviceId));
+		if (dropped.length === 0) {
+			this.logger.debug("profile-map prune: every persisted device still exists", { meta: { persistedCount } });
+			return;
+		}
+		for (const deviceId of dropped) {
+			this.assignments.delete(deviceId);
+			this.logger.debug("profile-map prune dropped a device that no longer exists", { tags: { deviceId } });
+		}
+		this.persistProfileMap();
+		this.logger.info("profile-map prune — dropped assignments for devices that no longer exist", { meta: {
+			dropped,
+			remaining: this.assignments.size
+		} });
 	}
 	getRtspRestreamProvider() {
 		return this.rtspProvider;
@@ -15140,12 +15198,32 @@ var StreamBrokerManager = class StreamBrokerManager {
 	}
 	async retractDeviceNow(deviceId, opts) {
 		const existing = this.cameraStreams.get(deviceId);
-		if (!existing) return;
-		for (const camStreamId of Array.from(existing.keys())) await this.retractCameraStream({
+		if (existing) for (const camStreamId of Array.from(existing.keys())) await this.retractCameraStream({
 			deviceId,
 			camStreamId,
 			preserveAssignment: opts.preserveAssignments === true
 		});
+		if (opts.purgeAssignments === true) this.purgeDeviceAssignments(deviceId);
+	}
+	/**
+	* Forget a device's profile-slot assignments and persist the shrunk map.
+	*
+	* Reachable only from the PERMANENT-removal path. A deleted device that
+	* keeps its entry stays in `listAllProfileSlots` for the life of the
+	* process AND is written straight back into the persisted `profileMap`
+	* blob, so it returns at every boot — which is how 3217/3218 outlived
+	* their cameras.
+	*/
+	purgeDeviceAssignments(deviceId) {
+		const existing = this.assignments.get(deviceId);
+		if (!existing) return;
+		const profiles = CAM_PROFILE_ORDER.filter((profile) => existing.map[profile] !== void 0);
+		this.assignments.delete(deviceId);
+		this.persistProfileMap();
+		this.logger.info("device removed — dropping its profile-slot assignments", {
+			tags: { deviceId },
+			meta: { profiles }
+		});
 	}
 	async runDeviceCatalogOperation(deviceId, operation) {
 		const previous = this.deviceCatalogOperations.get(deviceId) ?? Promise.resolve();
@@ -33597,6 +33675,17 @@ var StreamBrokerAddon = class extends BaseAddon {
 			});
 		});
 		const profileMapState = this.state("profileMap", ProfileMapSchema, {});
+		const profileMapPersister = (assignments) => {
+			const obj = {};
+			for (const [deviceId, assignment] of assignments) obj[`${deviceId}`] = {
+				map: { ...assignment.map },
+				auto: assignment.auto
+			};
+			profileMapState.set(obj).catch((err) => {
+				this.ctx.logger.warn("Failed to persist profile map", { meta: { error: errMsg(err) } });
+			});
+		};
+		this.brokerManager.setProfileMapPersister(profileMapPersister);
 		try {
 			const obj = await profileMapState.get();
 			const loaded = /* @__PURE__ */ new Map();
@@ -33613,22 +33702,11 @@ var StreamBrokerAddon = class extends BaseAddon {
 					auto: val.auto
 				});
 			}
-			this.brokerManager.loadPersistedProfileMap(loaded);
+			await this.brokerManager.loadPersistedProfileMap(loaded);
 			this.ctx.logger.info("Loaded persisted profile map", { meta: { deviceCount: loaded.size } });
 		} catch (err) {
 			this.ctx.logger.warn("Failed to load profile map", { meta: { error: errMsg(err) } });
 		}
-		const profileMapPersister = (assignments) => {
-			const obj = {};
-			for (const [deviceId, assignment] of assignments) obj[`${deviceId}`] = {
-				map: { ...assignment.map },
-				auto: assignment.auto
-			};
-			profileMapState.set(obj).catch((err) => {
-				this.ctx.logger.warn("Failed to persist profile map", { meta: { error: errMsg(err) } });
-			});
-		};
-		this.brokerManager.setProfileMapPersister(profileMapPersister);
 		const probeSnapshotsState = this.state("probeSnapshots", ProbedSnapshotMapSchema, {});
 		this.probeSnapshotsState = probeSnapshotsState;
 		try {
@@ -33710,12 +33788,7 @@ var StreamBrokerAddon = class extends BaseAddon {
 		});
 		this.subscribe({ category: EventCategory.DeviceUnregistered }, (event) => {
 			const deviceId = event.data.deviceId;
-			if (typeof deviceId === "number") this.brokerManager?.retractDevice(deviceId, { preserveAssignments: true }).catch((err) => {
-				this.ctx.logger.warn("device retract failed", {
-					tags: { deviceId },
-					meta: { error: errMsg(err) }
-				});
-			});
+			if (typeof deviceId === "number") this.handleDeviceRemoved(deviceId);
 		});
 		this.subscribe({ category: EventCategory.StreamParamsChanged }, (event) => {
 			const deviceId = event.data.deviceId;
@@ -33917,6 +33990,30 @@ var StreamBrokerAddon = class extends BaseAddon {
 		this.brokerManager = null;
 	}
 	/**
+	* A device was PERMANENTLY removed (`DeviceUnregistered`).
+	*
+	* Retracts its cam-streams AND purges its profile-slot assignments.
+	* `preserveAssignments` alone is the provider-restart contract — the streams
+	* come back and the operator's manual slot choices must survive — but a
+	* DELETED device that keeps its assignments stays in `listAllProfileSlots`
+	* for the life of the process and is written straight back into the
+	* persisted `profileMap` blob, so it returns at every boot. Live ids
+	* 3217/3218 outlived their cameras exactly that way.
+	*/
+	async handleDeviceRemoved(deviceId) {
+		try {
+			await this.brokerManager?.retractDevice(deviceId, {
+				preserveAssignments: true,
+				purgeAssignments: true
+			});
+		} catch (err) {
+			this.ctx.logger.warn("device retract failed", {
+				tags: { deviceId },
+				meta: { error: errMsg(err) }
+			});
+		}
+	}
+	/**
 	* Emit one `stream-broker.metrics-snapshot` event per active broker.
 	* BrokerStats already aggregates everything UI consumers need
 	* (status, fps, bitrate, codec, subscriber count). Skipped when no

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

package/dist/{worker-protocol-D8ZsVii1.js → worker-protocol-CDkbdSuM.js}

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

package/dist/{worker-protocol-C3pPkCGe.mjs → worker-protocol-CQHY2NeB.mjs}

@@ -1,4 +1,4 @@
-import { g as NativeLeaseSettingsSchema, h as NativeLeaseAdmissionSchema, l as DEFAULT_NATIVE_LEASE_SETTINGS } from "./dist-DTvDedJV.mjs";
+import { g as NativeLeaseSettingsSchema, h as NativeLeaseAdmissionSchema, l as DEFAULT_NATIVE_LEASE_SETTINGS } from "./dist-B9_C-QmC.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.63",
+  "version": "1.2.65",
   "description": "Pipeline bundle — runner, detection, motion, audio + stream broker. Multi-entry npm package shipping pipeline addons under a single bundle.",
   "keywords": [
     "camstack",