@riddix/hamh 2.1.0-alpha.840 → 2.1.0-alpha.841

package/dist/backend/cli.js

@@ -1767,8 +1767,8 @@ var init_Cancelable = __esm({
         };
         return result;
       }
-      static set logger(logger250) {
-        this.#logger = logger250;
+      static set logger(logger251) {
+        this.#logger = logger251;
       }
       static get logger() {
         return this.#logger;
@@ -3475,13 +3475,13 @@ var init_Logger = __esm({
        *
        * @deprecated use {@link destinations}
        */
-      static addLogger(identifier, logger250, options) {
+      static addLogger(identifier, logger251, options) {
         if (identifier in this.destinations) {
           throw new ImplementationError(`Logger "${identifier}" already exists`);
         }
         const dest = LogDestination({ name: identifier });
         const legacy = adaptDestinationToLegacy(dest);
-        legacy.log = logger250;
+        legacy.log = logger251;
         if (options?.defaultLogLevel !== void 0) {
           legacy.defaultLogLevel = options.defaultLogLevel;
         }
@@ -5687,8 +5687,8 @@ var init_Construction = __esm({
           }
         }
         #unhandledError(...args) {
-          const logger250 = Logger.get(this.#subject.constructor.name);
-          logger250.error(...args);
+          const logger251 = Logger.get(this.#subject.constructor.name);
+          logger251.error(...args);
         }
         #createErrorHandler(name) {
           return (e) => {
@@ -11712,18 +11712,18 @@ var init_FileHandleTracker = __esm({
     logger12 = Logger.get("FileHandleTracker");
     ((FileHandleTracker2) => {
       const openHandles = /* @__PURE__ */ new Set();
-      const registry2 = new FinalizationRegistry((info) => {
+      const registry3 = new FinalizationRegistry((info) => {
         logger12.warn(`File handle GC'd without close: "${info.purpose}" for ${info.path}`);
       });
       function register(handle) {
         const info = { purpose: handle.purpose, path: handle.path };
-        registry2.register(handle, info, handle);
+        registry3.register(handle, info, handle);
         const ref = new WeakRef(handle);
         openHandles.add(ref);
       }
       FileHandleTracker2.register = register;
       function unregister(handle) {
-        registry2.unregister(handle);
+        registry3.unregister(handle);
         for (const ref of openHandles) {
           if (ref.deref() === handle) {
             openHandles.delete(ref);
@@ -64070,8 +64070,8 @@ var init_NodeSession = __esm({
         return session?.type === SessionType.Unicast;
       }
       NodeSession2.is = is;
-      function logNew(logger250, operation, session, messenger, fabric, peerNodeId) {
-        logger250.info(
+      function logNew(logger251, operation, session, messenger, fabric, peerNodeId) {
+        logger251.info(
           session.via,
           `${operation} session with`,
           Diagnostic.strong(PeerAddress({ fabricIndex: fabric.fabricIndex, nodeId: peerNodeId }).toString()),
@@ -117714,11 +117714,11 @@ var init_Api = __esm({
       }
       Api2.resourceFor = resourceFor;
       function log(level, facility, id, ...message) {
-        let logger250 = loggers.get(facility);
-        if (!logger250) {
-          loggers.set(facility, logger250 = Logger.get(facility));
+        let logger251 = loggers.get(facility);
+        if (!logger251) {
+          loggers.set(facility, logger251 = Logger.get(facility));
         }
-        logger250[level](Diagnostic.via(id || "(anon)"), message);
+        logger251[level](Diagnostic.via(id || "(anon)"), message);
       }
       Api2.log = log;
       function logRequest(facility, id, method, target) {
@@ -132631,10 +132631,10 @@ var init_home_assistant_actions = __esm({
       circuitBreakerResetMs: 3e4
     };
     HomeAssistantActions = class extends Service {
-      constructor(logger250, client, config11) {
+      constructor(logger251, client, config11) {
         super("HomeAssistantActions");
         this.client = client;
-        this.log = logger250.get(this);
+        this.log = logger251.get(this);
         this.config = { ...defaultConfig, ...config11 };
         this.circuitBreaker = new CircuitBreaker(
           this.config.circuitBreakerThreshold,
@@ -132980,10 +132980,10 @@ var DiagnosticService = class {
 };
 
 // src/api/access-log.ts
-function accessLogger(logger250) {
+function accessLogger(logger251) {
   return (req, res, next) => {
     res.on("finish", () => {
-      logger250.debug(
+      logger251.debug(
         `${req.method} ${decodeURI(req.originalUrl)} ${res.statusCode} ${res.statusMessage} from ${req.socket.remoteAddress}`
       );
     });
@@ -136617,7 +136617,7 @@ var BLOCKED_PREFIXES = [
 function pluginApi(bridgeService, storageLocation) {
   const router = express14.Router();
   const installer = new PluginInstaller(storageLocation);
-  const registry2 = new PluginRegistry(storageLocation);
+  const registry3 = new PluginRegistry(storageLocation);
   router.get("/", (_req, res) => {
     const result = [];
     for (const bridge of bridgeService.bridges) {
@@ -136702,7 +136702,7 @@ function pluginApi(bridgeService, storageLocation) {
     res.json({ success: true, pluginName, reset: true });
   });
   router.get("/installed", (_req, res) => {
-    const registered = registry2.getAll();
+    const registered = registry3.getAll();
     const npmInstalled = installer.listInstalled();
     const result = registered.map((entry) => {
       const npm = npmInstalled.find((p) => p.name === entry.packageName);
@@ -136732,7 +136732,7 @@ function pluginApi(bridgeService, storageLocation) {
         });
         return;
       }
-      registry2.add(packageName, config11 ?? {});
+      registry3.add(packageName, config11 ?? {});
       res.json({
         success: true,
         packageName,
@@ -136760,7 +136760,7 @@ function pluginApi(bridgeService, storageLocation) {
         });
         return;
       }
-      registry2.remove(packageName);
+      registry3.remove(packageName);
       res.json({
         success: true,
         packageName,
@@ -136800,7 +136800,7 @@ function pluginApi(bridgeService, storageLocation) {
         });
         return;
       }
-      registry2.add(result.packageName, {});
+      registry3.add(result.packageName, {});
       res.json({
         success: true,
         packageName: result.packageName,
@@ -136833,7 +136833,7 @@ function pluginApi(bridgeService, storageLocation) {
         });
         return;
       }
-      registry2.add(result.packageName, {});
+      registry3.add(result.packageName, {});
       res.json({
         success: true,
         packageName: result.packageName,
@@ -137530,7 +137530,7 @@ var WebSocketApi = class {
 
 // src/api/web-api.ts
 var WebApi = class extends Service {
-  constructor(logger250, bridgeService, haClient, haRegistry, bridgeStorage, mappingStorage, identityStorage, lockCredentialStorage, settingsStorage, backupService, props) {
+  constructor(logger251, bridgeService, haClient, haRegistry, bridgeStorage, mappingStorage, identityStorage, lockCredentialStorage, settingsStorage, backupService, props) {
     super("WebApi");
     this.bridgeService = bridgeService;
     this.haClient = haClient;
@@ -137542,8 +137542,8 @@ var WebApi = class extends Service {
     this.settingsStorage = settingsStorage;
     this.backupService = backupService;
     this.props = props;
-    this.logger = logger250;
-    this.log = logger250.get(this);
+    this.logger = logger251;
+    this.log = logger251.get(this);
     this.accessLogger = accessLogger(this.log.createChild("Access Log"));
     this.startTime = Date.now();
     this.wsApi = new WebSocketApi(
@@ -138734,10 +138734,10 @@ function isTransientConnectError(reason) {
   return msg.includes("socket hang up") || msg.includes("tls") || msg.includes("TLS");
 }
 var HomeAssistantClient = class extends Service {
-  constructor(logger250, options) {
+  constructor(logger251, options) {
     super("HomeAssistantClient");
     this.options = options;
-    this.log = logger250.get(this);
+    this.log = logger251.get(this);
   }
   options;
   static Options = /* @__PURE__ */ Symbol.for("HomeAssistantClientProps");
@@ -156524,8 +156524,8 @@ var PluginManager = class {
     this.storageDir = storageDir;
     this.homeAssistant = homeAssistant;
   }
-  setRegistry(registry2) {
-    this.registry = registry2;
+  setRegistry(registry3) {
+    this.registry = registry3;
   }
   /**
    * Load and register a built-in plugin instance.
@@ -157335,11 +157335,11 @@ var AUTO_FORCE_SYNC_INTERVAL_MS = 9e4;
 var SHUTDOWN_SESSION_CLOSE_TIMEOUT_MS = 2500;
 var MDNS_ADDRESS_CHECK_INTERVAL_MS = 6e4;
 var Bridge = class {
-  constructor(env, logger250, dataProvider, endpointManager, serverOptions) {
+  constructor(env, logger251, dataProvider, endpointManager, serverOptions) {
     this.dataProvider = dataProvider;
     this.endpointManager = endpointManager;
     this.serverOptions = serverOptions;
-    this.log = logger250.get(`Bridge / ${dataProvider.id}`);
+    this.log = logger251.get(`Bridge / ${dataProvider.id}`);
     this.server = new BridgeServerNode(
       env,
       this.dataProvider,
@@ -158471,9 +158471,9 @@ function resolveBatteryPercent(state) {
   return BATTERY_ENUM_PERCENT[state.toLowerCase()] ?? null;
 }
 var EntityStateProvider = class extends Service {
-  constructor(registry2) {
+  constructor(registry3) {
     super("EntityStateProvider");
-    this.registry = registry2;
+    this.registry = registry3;
   }
   registry;
   /**
@@ -160391,11 +160391,11 @@ function createEndpointId2(entityId, customName) {
   const baseName = customName || entityId;
   return baseName.replace(/\./g, "_").replace(/\s+/g, "_");
 }
-function buildEntityPayload(registry2, entityId) {
-  const state = registry2.initialState(entityId);
+function buildEntityPayload(registry3, entityId) {
+  const state = registry3.initialState(entityId);
   if (!state) return void 0;
-  const entity = registry2.entity(entityId);
-  const deviceRegistry = registry2.deviceOf(entityId);
+  const entity = registry3.entity(entityId);
+  const deviceRegistry = registry3.deviceOf(entityId);
   return {
     entity_id: entityId,
     state,
@@ -160410,8 +160410,8 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
   lastStates = /* @__PURE__ */ new Map();
   debouncedUpdates = /* @__PURE__ */ new Map();
   static async create(config11) {
-    const { registry: registry2, primaryEntityId } = config11;
-    const primaryPayload = buildEntityPayload(registry2, primaryEntityId);
+    const { registry: registry3, primaryEntityId } = config11;
+    const primaryPayload = buildEntityPayload(registry3, primaryEntityId);
     if (!primaryPayload) return void 0;
     const airPurifierAttributes = primaryPayload.state.attributes;
     const supportedFeatures = airPurifierAttributes.supported_features ?? 0;
@@ -160499,7 +160499,7 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
     let tempSub;
     if (config11.temperatureEntityId) {
       const tempPayload = buildEntityPayload(
-        registry2,
+        registry3,
         config11.temperatureEntityId
       );
       if (tempPayload) {
@@ -160514,7 +160514,7 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
     }
     let humSub;
     if (config11.humidityEntityId) {
-      const humPayload = buildEntityPayload(registry2, config11.humidityEntityId);
+      const humPayload = buildEntityPayload(registry3, config11.humidityEntityId);
       if (humPayload) {
         humSub = new Endpoint(
           HumiditySubType.set({
@@ -161968,14 +161968,14 @@ function createEndpointId3(entityId, customName) {
   const baseName = customName || entityId;
   return baseName.replace(/\./g, "_").replace(/\s+/g, "_");
 }
-function buildEntityPayload2(registry2, entityId) {
-  const state = registry2.initialState(entityId);
+function buildEntityPayload2(registry3, entityId) {
+  const state = registry3.initialState(entityId);
   if (!state) return void 0;
   return {
     entity_id: entityId,
     state,
-    registry: registry2.entity(entityId),
-    deviceRegistry: registry2.deviceOf(entityId)
+    registry: registry3.entity(entityId),
+    deviceRegistry: registry3.deviceOf(entityId)
   };
 }
 var ComposedClimateFanEndpoint = class _ComposedClimateFanEndpoint extends Endpoint {
@@ -161985,8 +161985,8 @@ var ComposedClimateFanEndpoint = class _ComposedClimateFanEndpoint extends Endpo
   lastStates = /* @__PURE__ */ new Map();
   debouncedUpdates = /* @__PURE__ */ new Map();
   static async create(config11) {
-    const { registry: registry2, primaryEntityId } = config11;
-    const payload = buildEntityPayload2(registry2, primaryEntityId);
+    const { registry: registry3, primaryEntityId } = config11;
+    const payload = buildEntityPayload2(registry3, primaryEntityId);
     if (!payload) return void 0;
     const endpointId = config11.endpointId ?? createEndpointId3(primaryEntityId, config11.customName);
     const mapping = config11.mapping ?? {
@@ -162244,11 +162244,11 @@ function createEndpointId4(entityId, customName) {
   const baseName = customName || entityId;
   return baseName.replace(/\./g, "_").replace(/\s+/g, "_");
 }
-function buildEntityPayload3(registry2, entityId) {
-  const state = registry2.initialStateIncludingUnfiltered(entityId);
+function buildEntityPayload3(registry3, entityId) {
+  const state = registry3.initialStateIncludingUnfiltered(entityId);
   if (!state) return void 0;
-  const entity = registry2.entityIncludingUnfiltered(entityId);
-  const deviceRegistry = registry2.deviceOfIncludingUnfiltered(entityId);
+  const entity = registry3.entityIncludingUnfiltered(entityId);
+  const deviceRegistry = registry3.deviceOfIncludingUnfiltered(entityId);
   return {
     entity_id: entityId,
     state,
@@ -162263,8 +162263,8 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
   lastStates = /* @__PURE__ */ new Map();
   debouncedUpdates = /* @__PURE__ */ new Map();
   static async create(config11) {
-    const { registry: registry2, primaryEntityId } = config11;
-    const primaryPayload = buildEntityPayload3(registry2, primaryEntityId);
+    const { registry: registry3, primaryEntityId } = config11;
+    const primaryPayload = buildEntityPayload3(registry3, primaryEntityId);
     if (!primaryPayload) return void 0;
     let parentType = BridgedNodeEndpoint.with(
       BasicInformationServer2,
@@ -162308,7 +162308,7 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
     parts.push(tempSub);
     let humSub;
     if (config11.humidityEntityId) {
-      const humPayload = buildEntityPayload3(registry2, config11.humidityEntityId);
+      const humPayload = buildEntityPayload3(registry3, config11.humidityEntityId);
       if (humPayload) {
         humSub = new Endpoint(
           HumiditySubType2.set({
@@ -162322,7 +162322,7 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
     let pressSub;
     if (config11.pressureEntityId) {
       const pressPayload = buildEntityPayload3(
-        registry2,
+        registry3,
         config11.pressureEntityId
       );
       if (pressPayload) {
@@ -169774,8 +169774,8 @@ var VacuumIdentifyServer = class extends IdentifyServer2 {
   #findIdentifyButton(homeAssistant) {
     const deviceId = homeAssistant.entity.registry?.device_id;
     if (!deviceId) return void 0;
-    const registry2 = this.env.get(HomeAssistantRegistry);
-    for (const entity of Object.values(registry2.entities)) {
+    const registry3 = this.env.get(HomeAssistantRegistry);
+    for (const entity of Object.values(registry3.entities)) {
       if (entity.device_id !== deviceId) continue;
       if (!entity.entity_id.startsWith("button.")) continue;
       const uniqueId = entity.unique_id ?? "";
@@ -172178,11 +172178,11 @@ function createEndpointId5(entityId, customName) {
   const baseName = customName || entityId;
   return baseName.replace(/\./g, "_").replace(/\s+/g, "_");
 }
-function buildEntityPayload4(registry2, entityId) {
-  const state = registry2.initialStateIncludingUnfiltered(entityId);
+function buildEntityPayload4(registry3, entityId) {
+  const state = registry3.initialStateIncludingUnfiltered(entityId);
   if (!state) return void 0;
-  const entity = registry2.entityIncludingUnfiltered(entityId);
-  const deviceRegistry = registry2.deviceOfIncludingUnfiltered(entityId);
+  const entity = registry3.entityIncludingUnfiltered(entityId);
+  const deviceRegistry = registry3.deviceOfIncludingUnfiltered(entityId);
   return {
     entity_id: entityId,
     state,
@@ -172198,8 +172198,8 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
   lastMappedStates = /* @__PURE__ */ new Map();
   debouncedUpdates = /* @__PURE__ */ new Map();
   static async create(config11) {
-    const { registry: registry2, primaryEntityId, composedEntities } = config11;
-    const primaryPayload = buildEntityPayload4(registry2, primaryEntityId);
+    const { registry: registry3, primaryEntityId, composedEntities } = config11;
+    const primaryPayload = buildEntityPayload4(registry3, primaryEntityId);
     if (!primaryPayload) return void 0;
     let parentType = BridgedNodeEndpoint.with(
       BasicInformationServer2,
@@ -172241,7 +172241,7 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
       primarySubPayload,
       primaryMapping,
       config11.areaName,
-      { vacuumOnOff: registry2.isVacuumOnOffEnabled() }
+      { vacuumOnOff: registry3.isVacuumOnOffEnabled() }
     );
     if (!primaryType) {
       logger242.warn(
@@ -172257,7 +172257,7 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
     for (let i = 0; i < composedEntities.length; i++) {
       const sub = composedEntities[i];
       if (!sub.entityId) continue;
-      const subPayload = buildEntityPayload4(registry2, sub.entityId);
+      const subPayload = buildEntityPayload4(registry3, sub.entityId);
       if (!subPayload) {
         logger242.warn(
           `Cannot find state for composed sub-entity ${sub.entityId}, it does not exist in Home Assistant (removed or renamed?)`
@@ -172419,32 +172419,32 @@ function asStandaloneEndpointType(type) {
 // src/matter/endpoints/legacy/legacy-endpoint.ts
 var logger243 = Logger.get("LegacyEndpoint");
 var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
-  static async create(registry2, entityId, mapping, pluginDomainMappings, standalone = false, endpointId, identityAnchor) {
-    const deviceRegistry = registry2.deviceOf(entityId);
-    let state = registry2.initialState(entityId);
-    const entity = registry2.entity(entityId);
+  static async create(registry3, entityId, mapping, pluginDomainMappings, standalone = false, endpointId, identityAnchor) {
+    const deviceRegistry = registry3.deviceOf(entityId);
+    let state = registry3.initialState(entityId);
+    const entity = registry3.entity(entityId);
     if (!state) {
       return;
     }
-    if (registry2.isAutoBatteryMappingEnabled() && registry2.isBatteryEntityUsed(entityId)) {
+    if (registry3.isAutoBatteryMappingEnabled() && registry3.isBatteryEntityUsed(entityId)) {
       logger243.debug(
         `Skipping ${entityId} - already auto-assigned as battery to another device`
       );
       return;
     }
-    if (registry2.isAutoHumidityMappingEnabled() && registry2.isHumidityEntityUsed(entityId)) {
+    if (registry3.isAutoHumidityMappingEnabled() && registry3.isHumidityEntityUsed(entityId)) {
       logger243.debug(
         `Skipping ${entityId} - already auto-assigned as humidity to a temperature sensor`
       );
       return;
     }
-    if (registry2.isAutoPressureMappingEnabled() && registry2.isPressureEntityUsed(entityId)) {
+    if (registry3.isAutoPressureMappingEnabled() && registry3.isPressureEntityUsed(entityId)) {
       logger243.debug(
         `Skipping ${entityId} - already auto-assigned as pressure to a temperature sensor`
       );
       return;
     }
-    if (registry2.isAutoComposedDevicesEnabled() && registry2.isComposedSubEntityUsed(entityId)) {
+    if (registry3.isAutoComposedDevicesEnabled() && registry3.isComposedSubEntityUsed(entityId)) {
       logger243.debug(
         `Skipping ${entityId} - already consumed by a composed device`
       );
@@ -172452,10 +172452,10 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
     }
     let effectiveMapping = mapping;
     if (entity.device_id) {
-      if (registry2.isAutoHumidityMappingEnabled()) {
+      if (registry3.isAutoHumidityMappingEnabled()) {
         const attrs = state.attributes;
         if (!mapping?.humidityEntity && entityId.startsWith("sensor.") && attrs.device_class === SensorDeviceClass.temperature) {
-          const humidityEntityId = registry2.findHumidityEntityForDevice(
+          const humidityEntityId = registry3.findHumidityEntityForDevice(
             entity.device_id
           );
           if (humidityEntityId && humidityEntityId !== entityId) {
@@ -172464,17 +172464,17 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               entityId: effectiveMapping?.entityId ?? entityId,
               humidityEntity: humidityEntityId
             };
-            registry2.markHumidityEntityUsed(humidityEntityId);
+            registry3.markHumidityEntityUsed(humidityEntityId);
             logger243.debug(
               `Auto-assigned humidity ${humidityEntityId} to ${entityId}`
             );
           }
         }
       }
-      if (registry2.isAutoPressureMappingEnabled()) {
+      if (registry3.isAutoPressureMappingEnabled()) {
         const attrs = state.attributes;
         if (!mapping?.pressureEntity && entityId.startsWith("sensor.") && attrs.device_class === SensorDeviceClass.temperature) {
-          const pressureEntityId = registry2.findPressureEntityForDevice(
+          const pressureEntityId = registry3.findPressureEntityForDevice(
             entity.device_id
           );
           if (pressureEntityId && pressureEntityId !== entityId) {
@@ -172483,7 +172483,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               entityId: effectiveMapping?.entityId ?? entityId,
               pressureEntity: pressureEntityId
             };
-            registry2.markPressureEntityUsed(pressureEntityId);
+            registry3.markPressureEntityUsed(pressureEntityId);
             logger243.debug(
               `Auto-assigned pressure ${pressureEntityId} to ${entityId}`
             );
@@ -172491,8 +172491,8 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
         }
       }
       const isVacuum = entityId.startsWith("vacuum.");
-      if ((registry2.isAutoBatteryMappingEnabled() || isVacuum) && !mapping?.batteryEntity && !mapping?.disableBatteryMapping) {
-        const batteryEntityId = registry2.findBatteryEntityForDevice(
+      if ((registry3.isAutoBatteryMappingEnabled() || isVacuum) && !mapping?.batteryEntity && !mapping?.disableBatteryMapping) {
+        const batteryEntityId = registry3.findBatteryEntityForDevice(
           entity.device_id
         );
         if (batteryEntityId && batteryEntityId !== entityId) {
@@ -172501,7 +172501,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             entityId: effectiveMapping?.entityId ?? entityId,
             batteryEntity: batteryEntityId
           };
-          registry2.markBatteryEntityUsed(batteryEntityId);
+          registry3.markBatteryEntityUsed(batteryEntityId);
           logger243.debug(
             `Auto-assigned battery ${batteryEntityId} to ${entityId}`
           );
@@ -172509,8 +172509,8 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
       }
       const alarmDeviceClass = state.attributes.device_class;
       const isSmokeCoAlarm = mapping?.matterDeviceType === "smoke_co_alarm" || entityId.startsWith("binary_sensor.") && (alarmDeviceClass === "smoke" || alarmDeviceClass === "carbon_monoxide" || alarmDeviceClass === "gas");
-      if (registry2.isAutoBatteryMappingEnabled() && !mapping?.faultEntity && isSmokeCoAlarm) {
-        const faultEntityId = registry2.findProblemEntityForDevice(
+      if (registry3.isAutoBatteryMappingEnabled() && !mapping?.faultEntity && isSmokeCoAlarm) {
+        const faultEntityId = registry3.findProblemEntityForDevice(
           entity.device_id
         );
         if (faultEntityId && faultEntityId !== entityId) {
@@ -172525,7 +172525,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
       if (!mapping?.powerEntity) {
         const domain = entityId.split(".")[0];
         if (domain === "switch") {
-          const powerEntityId = registry2.findPowerEntityForDevice(
+          const powerEntityId = registry3.findPowerEntityForDevice(
             entity.device_id
           );
           if (powerEntityId && powerEntityId !== entityId) {
@@ -172534,7 +172534,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               entityId: effectiveMapping?.entityId ?? entityId,
               powerEntity: powerEntityId
             };
-            registry2.markPowerEntityUsed(powerEntityId);
+            registry3.markPowerEntityUsed(powerEntityId);
             logger243.debug(`Auto-assigned power ${powerEntityId} to ${entityId}`);
           }
         }
@@ -172542,7 +172542,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
       if (!mapping?.energyEntity) {
         const domain = entityId.split(".")[0];
         if (domain === "switch") {
-          const energyEntityId = registry2.findEnergyEntityForDevice(
+          const energyEntityId = registry3.findEnergyEntityForDevice(
             entity.device_id
           );
           if (energyEntityId && energyEntityId !== entityId) {
@@ -172551,7 +172551,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               entityId: effectiveMapping?.entityId ?? entityId,
               energyEntity: energyEntityId
             };
-            registry2.markEnergyEntityUsed(energyEntityId);
+            registry3.markEnergyEntityUsed(energyEntityId);
             logger243.debug(
               `Auto-assigned energy ${energyEntityId} to ${entityId}`
             );
@@ -172559,7 +172559,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
         }
       }
       if (entityId.startsWith("vacuum.")) {
-        const vacuumEntities = registry2.findVacuumSelectEntities(
+        const vacuumEntities = registry3.findVacuumSelectEntities(
           entity.device_id
         );
         if (!effectiveMapping?.cleaningModeEntity && vacuumEntities.cleaningModeEntity) {
@@ -172603,7 +172603,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
           );
         }
         const supportedFeatures = state.attributes.supported_features ?? 0;
-        const cleanAreaRooms = await registry2.resolveCleanAreaRooms(
+        const cleanAreaRooms = await registry3.resolveCleanAreaRooms(
           entityId,
           supportedFeatures
         );
@@ -172619,7 +172619,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
         }
         const vacAttrs = state.attributes;
         if (cleanAreaRooms.length === 0 && !vacAttrs.rooms && !vacAttrs.segments && !vacAttrs.room_mapping) {
-          const valetudoRooms = registry2.findValetudoMapSegments(
+          const valetudoRooms = registry3.findValetudoMapSegments(
             entity.device_id
           );
           if (valetudoRooms.length > 0) {
@@ -172638,7 +172638,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
               `Auto-detected ${valetudoRooms.length} Valetudo segments for ${entityId}`
             );
           } else {
-            const roborockRooms = await registry2.resolveRoborockRooms(entityId);
+            const roborockRooms = await registry3.resolveRoborockRooms(entityId);
             if (roborockRooms.length > 0) {
               const roomsObj = {};
               for (const r of roborockRooms) {
@@ -172664,10 +172664,10 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
         `Composed mappings are not supported in server mode, exposing ${entityId} as a flat standalone endpoint`
       );
     }
-    if (!standalone && registry2.isAutoComposedDevicesEnabled() && effectiveMapping?.composedEntities && effectiveMapping.composedEntities.length > 0) {
-      const composedAreaName = registry2.getAreaName(entityId);
+    if (!standalone && registry3.isAutoComposedDevicesEnabled() && effectiveMapping?.composedEntities && effectiveMapping.composedEntities.length > 0) {
+      const composedAreaName = registry3.getAreaName(entityId);
       const composed = await UserComposedEndpoint.create({
-        registry: registry2,
+        registry: registry3,
         primaryEntityId: entityId,
         mapping: effectiveMapping,
         composedEntities: effectiveMapping.composedEntities,
@@ -172683,12 +172683,12 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
         `User composed device creation failed for ${entityId}, falling back to standalone`
       );
     }
-    if (!standalone && registry2.isAutoComposedDevicesEnabled()) {
+    if (!standalone && registry3.isAutoComposedDevicesEnabled()) {
       const attrs = state.attributes;
       if (entityId.startsWith("sensor.") && attrs.device_class === SensorDeviceClass.temperature && (effectiveMapping?.humidityEntity || effectiveMapping?.pressureEntity)) {
-        const composedAreaName = registry2.getAreaName(entityId);
+        const composedAreaName = registry3.getAreaName(entityId);
         const composed = await ComposedSensorEndpoint.create({
-          registry: registry2,
+          registry: registry3,
           primaryEntityId: entityId,
           humidityEntityId: effectiveMapping?.humidityEntity,
           pressureEntityId: effectiveMapping?.pressureEntity,
@@ -172704,12 +172704,12 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
       }
       const resolvedMatterType = mapping?.matterDeviceType ?? (entityId.startsWith("fan.") ? "fan" : void 0);
       if (resolvedMatterType === "air_purifier") {
-        const temperatureEntityId = effectiveMapping?.temperatureEntity || (entity.device_id ? registry2.findTemperatureEntityForDevice(entity.device_id) : void 0);
-        const humidityEntityId = effectiveMapping?.humidityEntity || (entity.device_id ? registry2.findHumidityEntityForDevice(entity.device_id) : void 0);
+        const temperatureEntityId = effectiveMapping?.temperatureEntity || (entity.device_id ? registry3.findTemperatureEntityForDevice(entity.device_id) : void 0);
+        const humidityEntityId = effectiveMapping?.humidityEntity || (entity.device_id ? registry3.findHumidityEntityForDevice(entity.device_id) : void 0);
         if (temperatureEntityId || humidityEntityId) {
-          const composedAreaName = registry2.getAreaName(entityId);
+          const composedAreaName = registry3.getAreaName(entityId);
           const composed = await ComposedAirPurifierEndpoint.create({
-            registry: registry2,
+            registry: registry3,
             primaryEntityId: entityId,
             temperatureEntityId,
             humidityEntityId,
@@ -172731,9 +172731,9 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
     if (!standalone && entityId.startsWith("climate.") && effectiveMapping?.climateExposeFan === true) {
       const climateFeatures = state.attributes.supported_features ?? 0;
       if ((climateFeatures & ClimateDeviceFeature.FAN_MODE) !== 0) {
-        const composedAreaName = registry2.getAreaName(entityId);
+        const composedAreaName = registry3.getAreaName(entityId);
         const composed = await ComposedClimateFanEndpoint.create({
-          registry: registry2,
+          registry: registry3,
           primaryEntityId: entityId,
           mapping: effectiveMapping,
           customName: effectiveMapping?.customName,
@@ -172758,7 +172758,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
     let cleaningModeOptions;
     if (entityId.startsWith("vacuum.")) {
       if (effectiveMapping?.cleaningModeEntity) {
-        const cmState = registry2.initialState(
+        const cmState = registry3.initialState(
           effectiveMapping.cleaningModeEntity
         );
         cleaningModeOptions = cmState?.attributes?.options;
@@ -172772,13 +172772,13 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
         ];
       }
     }
-    const areaName = registry2.getAreaName(entityId);
+    const areaName = registry3.getAreaName(entityId);
     let type = createLegacyEndpointType(
       payload,
       effectiveMapping,
       areaName,
       {
-        vacuumOnOff: registry2.isVacuumOnOffEnabled(),
+        vacuumOnOff: registry3.isVacuumOnOffEnabled(),
         cleaningModeOptions,
         pluginDomainMappings
       },
@@ -172960,27 +172960,181 @@ var CameraAvStreamServer = class extends Base4 {
 init_esm();
 init_esm7();
 init_esm3();
-var logger244 = Logger.get("CameraWebRtc");
+
+// src/plugins/builtin/camera/requestor-client.ts
+init_esm();
+init_esm4();
+var logger244 = Logger.get("CameraWebRtcRequestor");
+var registry2 = /* @__PURE__ */ new Map();
+var pendingDeliveries = /* @__PURE__ */ new Map();
+var invokeTransport = defaultInvoke;
+function registerRequestor(sessionId, registration) {
+  registry2.set(sessionId, registration);
+}
+function unregisterRequestor(sessionId) {
+  registry2.delete(sessionId);
+  const timer = pendingDeliveries.get(sessionId);
+  if (timer) {
+    clearTimeout(timer);
+    pendingDeliveries.delete(sessionId);
+  }
+}
+function unregisterAllRequestors() {
+  for (const id of [...registry2.keys()]) unregisterRequestor(id);
+  for (const timer of pendingDeliveries.values()) clearTimeout(timer);
+  pendingDeliveries.clear();
+}
+function deliverAnswerDeferred(sessionId, sdp, onGiveUp) {
+  const prior = pendingDeliveries.get(sessionId);
+  if (prior) clearTimeout(prior);
+  const owner = registry2.get(sessionId);
+  const timer = setTimeout(() => {
+    void (async () => {
+      try {
+        for (const delayMs of [0, 250, 500]) {
+          if (delayMs > 0) await new Promise((r) => setTimeout(r, delayMs));
+          if (registry2.get(sessionId) !== owner || pendingDeliveries.get(sessionId) !== timer) {
+            return;
+          }
+          if (await sendAnswer(sessionId, sdp)) {
+            logger244.info(`answer delivered for session ${sessionId}`);
+            return;
+          }
+        }
+        if (registry2.get(sessionId) !== owner || pendingDeliveries.get(sessionId) !== timer) {
+          return;
+        }
+        logger244.info(
+          `answer delivery failed for session ${sessionId}, giving up`
+        );
+        await onGiveUp();
+      } catch (err) {
+        logger244.info(
+          `answer delivery for session ${sessionId} threw: ${errText(err)}`
+        );
+      } finally {
+        if (pendingDeliveries.get(sessionId) === timer) {
+          pendingDeliveries.delete(sessionId);
+        }
+      }
+    })();
+  }, 0);
+  timer.unref?.();
+  pendingDeliveries.set(sessionId, timer);
+}
+function hasRequestor(sessionId) {
+  return registry2.has(sessionId);
+}
+function sendAnswer(sessionId, sdp) {
+  return invokeRequestor(sessionId, "answer", {
+    webRtcSessionId: sessionId,
+    sdp
+  });
+}
+async function invokeRequestor(sessionId, command, fields) {
+  const registration = registry2.get(sessionId);
+  if (!registration) {
+    logger244.info(`requestor ${command}: no session ${sessionId} registered`);
+    return false;
+  }
+  if (registration.session.isClosed) {
+    logger244.info(`requestor ${command}: session ${sessionId} already closed`);
+    return false;
+  }
+  const request = {
+    endpoint: registration.requestorEndpoint,
+    cluster: WebRtcTransportRequestor3.Cluster,
+    command,
+    fields
+  };
+  try {
+    return await invokeTransport({ registration, request });
+  } catch (err) {
+    logger244.info(
+      `requestor ${command} failed for session ${sessionId}: ${errText(err)}`
+    );
+    return false;
+  }
+}
+async function defaultInvoke({
+  registration,
+  request
+}) {
+  const { session, env } = registration;
+  const exchangeManager = env.get(ExchangeManager);
+  const exchangeProvider = new DedicatedChannelExchangeProvider(
+    exchangeManager,
+    session
+  );
+  const client = new ClientInteraction({ environment: env, exchangeProvider });
+  try {
+    const result = client.invoke(
+      Invoke({
+        commands: [
+          {
+            endpoint: request.endpoint,
+            cluster: request.cluster,
+            command: request.command,
+            // biome-ignore lint/suspicious/noExplicitAny: fields typed per command by caller
+            fields: request.fields
+          }
+        ]
+      })
+    );
+    for await (const chunk of result) {
+      for (const entry of chunk) {
+        if (entry.kind === "cmd-status") {
+          if (entry.status !== Status2.Success) {
+            logger244.info(
+              `requestor ${request.command} status ${entry.status} for session ${String(request.fields.webRtcSessionId)}`
+            );
+            return false;
+          }
+          return true;
+        }
+      }
+    }
+    return true;
+  } finally {
+    await client.close().catch(() => {
+    });
+  }
+}
+function errText(err) {
+  return err instanceof Error ? err.message : String(err);
+}
+
+// src/plugins/builtin/camera/webrtc-provider-server.ts
+var logger245 = Logger.get("CameraWebRtc");
+var nextGlobalSessionId = 0;
+function mintSessionId() {
+  for (let i = 0; i <= 65534; i++) {
+    const id = nextGlobalSessionId;
+    nextGlobalSessionId = nextGlobalSessionId >= 65534 ? 0 : nextGlobalSessionId + 1;
+    if (!hasRequestor(id)) return id;
+  }
+  return nextGlobalSessionId;
+}
 var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
   solicitOffer(request) {
-    const id = this.state.nextSessionId++;
+    const id = mintSessionId();
     this.trackSession(id, request.streamUsage, request.originatingEndpointId);
-    logger244.info(
+    logger245.info(
       `solicitOffer session=${id} (${this.state.entityId}), deferred offer`
     );
     void this.state.bridge.startSession(id, this.state.entityId, {
       iceServers: request.iceServers,
       iceTransportPolicy: request.iceTransportPolicy
     }).catch(
-      (err) => logger244.info(
-        `solicitOffer startSession failed for ${this.state.entityId}: ${errText(err)}`
+      (err) => logger245.info(
+        `solicitOffer startSession failed for ${this.state.entityId}: ${errText2(err)}`
       )
     );
     return { webRtcSessionId: id, deferredOffer: true };
   }
   async provideOffer(request) {
-    const id = request.webRtcSessionId ?? this.state.nextSessionId++;
-    logger244.info(
+    const id = request.webRtcSessionId ?? mintSessionId();
+    logger245.info(
       `provideOffer entry: entityId=${this.state.entityId} session=${id} (sdp ${request.sdp.length} chars)`
     );
     if (request.webRtcSessionId == null) {
@@ -172990,6 +173144,15 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
         request.originatingEndpointId ?? EndpointNumber(0)
       );
     }
+    const requestorEndpoint = request.originatingEndpointId ?? EndpointNumber(0);
+    const session = this.context.session;
+    if (session) {
+      registerRequestor(id, {
+        session,
+        requestorEndpoint,
+        env: this.env
+      });
+    }
     let answerSdp;
     try {
       answerSdp = await this.state.bridge.acceptControllerOffer(
@@ -173002,10 +173165,11 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
         }
       );
     } catch (err) {
-      const message = errText(err);
-      logger244.info(
+      const message = errText2(err);
+      logger245.info(
         `provideOffer failed for ${this.state.entityId} session=${id}: ${message}`
       );
+      unregisterRequestor(id);
       this.state.currentSessions = this.state.currentSessions.filter(
         (s) => s.id !== id
       );
@@ -173014,14 +173178,26 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
         StatusCode.Failure
       );
     }
-    logger244.info(
-      `provideOffer answer computed for ${this.state.entityId} session=${id} (${answerSdp.length} chars); awaiting requestor delivery path`
+    logger245.info(
+      `provideOffer answer computed for ${this.state.entityId} session=${id} (${answerSdp.length} chars); delivering via requestor`
     );
-    void answerSdp;
+    const bridge = this.state.bridge;
+    const state = this.state;
+    deliverAnswerDeferred(id, answerSdp, async () => {
+      await bridge.endSession(id).catch(() => {
+      });
+      unregisterRequestor(id);
+      try {
+        state.currentSessions = state.currentSessions.filter(
+          (s) => s.id !== id
+        );
+      } catch {
+      }
+    });
     return { webRtcSessionId: id };
   }
   provideAnswer(request) {
-    logger244.info(
+    logger245.info(
       `provideAnswer session=${request.webRtcSessionId} (sdp ${request.sdp.length} chars, ${this.state.entityId})`
     );
     return this.state.bridge.acceptControllerAnswer(
@@ -173030,7 +173206,7 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
     );
   }
   async provideIceCandidates(request) {
-    logger244.info(
+    logger245.info(
       `provideIceCandidates session=${request.webRtcSessionId}: ${request.iceCandidates.length} candidate(s) (${this.state.entityId})`
     );
     for (const c of request.iceCandidates) {
@@ -173043,16 +173219,21 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
     }
   }
   async endSession(request) {
-    logger244.info(
+    logger245.info(
       `endSession session=${request.webRtcSessionId} (${this.state.entityId})`
     );
     await this.state.bridge.endSession(request.webRtcSessionId);
+    unregisterRequestor(request.webRtcSessionId);
     this.state.currentSessions = this.state.currentSessions.filter(
       (s) => s.id !== request.webRtcSessionId
     );
   }
   trackSession(id, streamUsage, peerEndpointId) {
     const session = this.context.session;
+    const fabricIndex = session?.associatedFabric?.fabricIndex;
+    if (fabricIndex == null) {
+      return;
+    }
     this.state.currentSessions = [
       ...this.state.currentSessions,
       {
@@ -173061,19 +173242,18 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
         peerEndpointId,
         streamUsage,
         metadataEnabled: false,
-        fabricIndex: session?.associatedFabric?.fabricIndex ?? FabricIndex3(0)
+        fabricIndex
       }
     ];
   }
 };
-function errText(err) {
+function errText2(err) {
   return err instanceof Error ? err.message : String(err);
 }
 ((CameraWebRtcProviderServer2) => {
   class State extends WebRtcTransportProviderServer.State {
     bridge;
     entityId;
-    nextSessionId = 1;
   }
   CameraWebRtcProviderServer2.State = State;
 })(CameraWebRtcProviderServer || (CameraWebRtcProviderServer = {}));
@@ -173092,8 +173272,7 @@ function createCameraEndpointType(bridge, entityId, sensor = defaultSensorParams
     webRtcTransportProvider: {
       bridge,
       entityId,
-      currentSessions: [],
-      nextSessionId: 1
+      currentSessions: []
     },
     cameraAvStreamManagement: {
       bridge,
@@ -173161,7 +173340,7 @@ import {
   createLongLivedTokenAuth as createLongLivedTokenAuth2
 } from "home-assistant-js-websocket";
 import { RTCPeerConnection } from "werift";
-var logger245 = Logger.get("CameraWebRtc");
+var logger246 = Logger.get("CameraWebRtc");
 var DEFAULT_HA_WEBRTC_TIMEOUT_MS = 15e3;
 var haWebRtcTimeoutMs = DEFAULT_HA_WEBRTC_TIMEOUT_MS;
 var WebRtcBridge = class {
@@ -173200,6 +173379,7 @@ var WebRtcBridge = class {
       controllerPeer.addTransceiver("video", { direction: "sendonly" })
     );
     this.forwardHaTracks(haPeer, senders, entityId);
+    await this.closeExistingPeers(matterSessionId);
     this.sessions.set(matterSessionId, { entityId, haPeer, controllerPeer });
     try {
       haPeer.addTransceiver("video", { direction: "recvonly" });
@@ -173207,7 +173387,7 @@ var WebRtcBridge = class {
       const haOffer = await haPeer.createOffer();
       await haPeer.setLocalDescription(haOffer);
       const haOfferSdp = this.localSdp(haPeer);
-      logger245.info(`HA offer sent for ${entityId} (${haOfferSdp.length} chars)`);
+      logger246.info(`HA offer sent for ${entityId} (${haOfferSdp.length} chars)`);
       const { answer, sessionId, unsubscribe } = await this.requestHaWebRtc(
         entityId,
         haOfferSdp,
@@ -173230,12 +173410,12 @@ var WebRtcBridge = class {
       const controllerOffer = await controllerPeer.createOffer();
       await controllerPeer.setLocalDescription(controllerOffer);
       const sdp = this.localSdp(controllerPeer);
-      logger245.info(
+      logger246.info(
         `controller offer created for ${entityId} (${sdp.length} chars)`
       );
       return { sdp, iceCandidates };
     } catch (err) {
-      logger245.info(`startSession failed for ${entityId}: ${errText2(err)}`);
+      logger246.info(`startSession failed for ${entityId}: ${errText3(err)}`);
       await this.endSession(matterSessionId);
       throw err;
     }
@@ -173257,6 +173437,7 @@ var WebRtcBridge = class {
       );
     }
     this.forwardHaTracks(haPeer, senders, entityId);
+    await this.closeExistingPeers(matterSessionId);
     this.sessions.set(matterSessionId, { entityId, haPeer, controllerPeer });
     try {
       haPeer.addTransceiver("video", { direction: "recvonly" });
@@ -173264,7 +173445,7 @@ var WebRtcBridge = class {
       const haOffer = await haPeer.createOffer();
       await haPeer.setLocalDescription(haOffer);
       const haOfferSdp = this.localSdp(haPeer);
-      logger245.info(`HA offer sent for ${entityId} (${haOfferSdp.length} chars)`);
+      logger246.info(`HA offer sent for ${entityId} (${haOfferSdp.length} chars)`);
       const { answer, sessionId, unsubscribe } = await this.requestHaWebRtc(
         entityId,
         haOfferSdp,
@@ -173283,13 +173464,13 @@ var WebRtcBridge = class {
       const controllerAnswer = await controllerPeer.createAnswer();
       await controllerPeer.setLocalDescription(controllerAnswer);
       const answerSdp = this.localSdp(controllerPeer);
-      logger245.info(
+      logger246.info(
         `controller answer created for ${entityId} (${answerSdp.length} chars)`
       );
       return answerSdp;
     } catch (err) {
-      logger245.info(
-        `acceptControllerOffer failed for ${entityId}: ${errText2(err)}`
+      logger246.info(
+        `acceptControllerOffer failed for ${entityId}: ${errText3(err)}`
       );
       await this.endSession(matterSessionId);
       throw err;
@@ -173299,14 +173480,14 @@ var WebRtcBridge = class {
   async acceptControllerAnswer(matterSessionId, sdp) {
     const session = this.sessions.get(matterSessionId);
     if (!session) return;
-    logger245.debug(`controller answer applied for ${session.entityId}`);
+    logger246.debug(`controller answer applied for ${session.entityId}`);
     await session.controllerPeer.setRemoteDescription({ type: "answer", sdp });
   }
   /** Add a remote ICE candidate from the Matter controller. */
   async addControllerIceCandidate(matterSessionId, candidate, sdpMid, sdpMLineIndex) {
     const session = this.sessions.get(matterSessionId);
     if (!session) return;
-    logger245.debug(
+    logger246.debug(
       `controller ICE candidate for ${session.entityId}: ${candidate}`
     );
     await session.controllerPeer.addIceCandidate({
@@ -173315,32 +173496,53 @@ var WebRtcBridge = class {
       sdpMLineIndex: sdpMLineIndex ?? void 0
     });
   }
+  // Close the peers of a session we are about to overwrite. Leaves no map
+  // entry; the caller replaces it with fresh peers under the same id.
+  async closeExistingPeers(matterSessionId) {
+    const prior = this.sessions.get(matterSessionId);
+    if (!prior) return;
+    logger246.info(
+      `replacing session ${matterSessionId} (${prior.entityId}), closing prior peers`
+    );
+    if (prior.haUnsubscribe) {
+      await Promise.resolve(prior.haUnsubscribe()).catch(
+        (err) => logger246.debug(`HA unsubscribe failed: ${errText3(err)}`)
+      );
+    }
+    await prior.haPeer.close().catch(() => {
+    });
+    await prior.controllerPeer.close().catch(() => {
+    });
+    await this.stopHaStream(prior).catch(() => {
+    });
+  }
   async endSession(matterSessionId) {
     const session = this.sessions.get(matterSessionId);
     if (!session) return;
-    logger245.info(`ending session ${matterSessionId} (${session.entityId})`);
+    logger246.info(`ending session ${matterSessionId} (${session.entityId})`);
     this.sessions.delete(matterSessionId);
     if (session.haUnsubscribe) {
       await Promise.resolve(session.haUnsubscribe()).catch(
-        (err) => logger245.debug(`HA unsubscribe failed: ${errText2(err)}`)
+        (err) => logger246.debug(`HA unsubscribe failed: ${errText3(err)}`)
       );
     }
     await session.haPeer.close().catch(() => {
     });
     await session.controllerPeer.close().catch(() => {
     });
-    if (session.haSessionId) {
-      try {
-        const conn = await this.ha();
-        await conn.sendMessagePromise({
-          type: "camera/webrtc/candidate",
-          entity_id: session.entityId,
-          session_id: session.haSessionId,
-          candidate: { candidate: "" }
-        });
-      } catch {
-      }
-    }
+    await this.stopHaStream(session).catch(() => {
+    });
+  }
+  // Tell HA to stop the stream if we tracked an HA session id. Best effort.
+  async stopHaStream(session) {
+    if (!session.haSessionId) return;
+    const conn = await this.ha();
+    await conn.sendMessagePromise({
+      type: "camera/webrtc/candidate",
+      entity_id: session.entityId,
+      session_id: session.haSessionId,
+      candidate: { candidate: "" }
+    });
   }
   // Grab a still JPEG via HA's camera proxy (for CaptureSnapshot).
   async snapshot(entityId) {
@@ -173351,11 +173553,11 @@ var WebRtcBridge = class {
         headers: { Authorization: `Bearer ${this.config.haToken}` }
       });
     } catch (err) {
-      logger245.info(`snapshot fetch failed for ${entityId}: ${errText2(err)}`);
+      logger246.info(`snapshot fetch failed for ${entityId}: ${errText3(err)}`);
       throw err;
     }
     if (!res.ok) {
-      logger245.info(
+      logger246.info(
         `snapshot fetch failed for ${entityId}: camera_proxy ${res.status}`
       );
       throw new Error(`HA camera_proxy ${entityId}: ${res.status}`);
@@ -173372,10 +173574,10 @@ var WebRtcBridge = class {
   // Forward every track HA sends into the matching pre-added controller sender.
   forwardHaTracks(haPeer, senders, entityId) {
     haPeer.onTrack.subscribe((track) => {
-      logger245.info(`onTrack ${track.kind} from HA (${entityId})`);
+      logger246.info(`onTrack ${track.kind} from HA (${entityId})`);
       const transceiver = senders.get(track.kind);
       if (!transceiver) {
-        logger245.info(
+        logger246.info(
           `no controller transceiver for ${track.kind} (${entityId})`
         );
         return;
@@ -173384,7 +173586,7 @@ var WebRtcBridge = class {
       track.onReceiveRtp.subscribe((rtp) => {
         if (!firstLogged) {
           firstLogged = true;
-          logger245.info(`first RTP forwarded for ${track.kind} (${entityId})`);
+          logger246.info(`first RTP forwarded for ${track.kind} (${entityId})`);
         }
         transceiver.sender.sendRtp(rtp);
       });
@@ -173393,10 +173595,10 @@ var WebRtcBridge = class {
   // Log connection/ice state transitions (these events fire on change only).
   wireStateLogging(peer, label, entityId) {
     peer.connectionStateChange.subscribe(
-      (s) => logger245.info(`${label} connectionState=${s} (${entityId})`)
+      (s) => logger246.info(`${label} connectionState=${s} (${entityId})`)
     );
     peer.iceConnectionStateChange.subscribe(
-      (s) => logger245.info(`${label} iceConnectionState=${s} (${entityId})`)
+      (s) => logger246.info(`${label} iceConnectionState=${s} (${entityId})`)
     );
   }
   // Map the Matter ICE struct onto werift's config. Only the controller peer
@@ -173410,11 +173612,11 @@ var WebRtcBridge = class {
       }))
     );
     if (iceServers.length === 0) {
-      logger245.info(`controller peer using default ICE servers (${entityId})`);
+      logger246.info(`controller peer using default ICE servers (${entityId})`);
       return void 0;
     }
     const policy = ice?.iceTransportPolicy === "relay" || ice?.iceTransportPolicy === "all" ? ice.iceTransportPolicy : void 0;
-    logger245.info(
+    logger246.info(
       `controller peer using ${iceServers.length} controller ICE server(s)${policy ? ` policy=${policy}` : ""} (${entityId})`
     );
     return policy ? { iceServers, iceTransportPolicy: policy } : { iceServers };
@@ -173428,14 +173630,14 @@ var WebRtcBridge = class {
   feedHaCandidate(entityId, haPeer, candidate) {
     const value = candidate?.candidate;
     if (!value) return;
-    logger245.debug(`HA ICE candidate for ${entityId}: ${value}`);
+    logger246.debug(`HA ICE candidate for ${entityId}: ${value}`);
     void haPeer.addIceCandidate({
       candidate: value,
       sdpMid: candidate?.sdpMid ?? void 0,
       sdpMLineIndex: candidate?.sdpMLineIndex ?? void 0
     }).catch(
-      (e) => logger245.debug(
-        `HA addIceCandidate failed for ${entityId}: ${errText2(e)}`
+      (e) => logger246.debug(
+        `HA addIceCandidate failed for ${entityId}: ${errText3(e)}`
       )
     );
   }
@@ -173463,7 +173665,7 @@ var WebRtcBridge = class {
         reject(err);
       });
       timer = setTimeout(() => {
-        logger245.info(
+        logger246.info(
           `HA WebRTC timed out after ${haWebRtcTimeoutMs}ms for ${entityId}`
         );
         fail(
@@ -173481,7 +173683,7 @@ var WebRtcBridge = class {
                 if (msg.session_id) sessionId = msg.session_id;
                 const ans = msg.answer;
                 settle(() => {
-                  logger245.info(
+                  logger246.info(
                     `HA answer received for ${entityId} (${ans.length} chars)`
                   );
                   resolve11(ans);
@@ -173490,7 +173692,7 @@ var WebRtcBridge = class {
               break;
             case "error": {
               const detail = msg.message ?? msg.code ?? "unknown error";
-              logger245.info(`HA WebRTC error for ${entityId}: ${detail}`);
+              logger246.info(`HA WebRTC error for ${entityId}: ${detail}`);
               fail(new Error(`HA WebRTC error: ${detail}`));
               break;
             }
@@ -173517,7 +173719,7 @@ function offerKinds(sdp) {
   }
   return kinds;
 }
-function errText2(err) {
+function errText3(err) {
   return err instanceof Error ? err.message : String(err);
 }
 
@@ -173652,6 +173854,7 @@ var CameraPlugin = class {
     await this.bridge?.close().catch(() => {
     });
     this.bridge = void 0;
+    unregisterAllRequestors();
   }
 };
 
@@ -173665,7 +173868,7 @@ import {
   getCollection
 } from "home-assistant-js-websocket";
 import { atLeastHaVersion } from "home-assistant-js-websocket/dist/util.js";
-var logger246 = Logger.get("SubscribeEntities");
+var logger247 = Logger.get("SubscribeEntities");
 function processEvent(store, updates) {
   const state = { ...store.state };
   if (updates.a) {
@@ -173691,7 +173894,7 @@ function processEvent(store, updates) {
     for (const entityId in updates.c) {
       let entityState = state[entityId];
       if (!entityState) {
-        logger246.warn("Received state update for unknown entity", entityId);
+        logger247.warn("Received state update for unknown entity", entityId);
         continue;
       }
       entityState = { ...entityState };
@@ -173780,7 +173983,7 @@ var subscribeEntities = (conn, onChange, entityIds) => {
 // src/services/bridges/entity-isolation-service.ts
 init_esm();
 init_diagnostic_event_bus();
-var logger247 = Logger.get("EntityIsolation");
+var logger248 = Logger.get("EntityIsolation");
 var EntityIsolationServiceImpl = class {
   isolatedEntities = /* @__PURE__ */ new Map();
   isolationCallbacks = /* @__PURE__ */ new Map();
@@ -173845,13 +174048,13 @@ var EntityIsolationServiceImpl = class {
     }
     const parsed = this.parseEndpointPath(msg);
     if (!parsed) {
-      logger247.warn("Could not parse entity from error:", msg);
+      logger248.warn("Could not parse entity from error:", msg);
       return false;
     }
     const { bridgeId, entityName } = parsed;
     const callback = this.isolationCallbacks.get(bridgeId);
     if (!callback) {
-      logger247.warn(
+      logger248.warn(
         `No isolation callback registered for bridge ${bridgeId}, entity: ${entityName}`
       );
       return false;
@@ -173866,7 +174069,7 @@ var EntityIsolationServiceImpl = class {
       reason,
       failedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
-    logger247.warn(
+    logger248.warn(
       `Isolating entity "${entityName}" from bridge ${bridgeId} due to: ${reason}`
     );
     diagnosticEventBus.emit("entity_error", `Entity isolated: ${entityName}`, {
@@ -173878,7 +174081,7 @@ var EntityIsolationServiceImpl = class {
       await callback(entityName);
       return true;
     } catch (e) {
-      logger247.error(`Failed to isolate entity ${entityName}:`, e);
+      logger248.error(`Failed to isolate entity ${entityName}:`, e);
       return false;
     }
   }
@@ -173911,10 +174114,10 @@ var EntityIsolationService = new EntityIsolationServiceImpl();
 var MAX_ENTITY_ID_LENGTH = 150;
 var ENDPOINT_REMOVAL_GRACE_MS = 6e4;
 var BridgeEndpointManager = class extends Service {
-  constructor(client, registry2, mappingStorage, identityStorage, bridgeId, log, pluginManager, pluginRegistry, pluginInstaller) {
+  constructor(client, registry3, mappingStorage, identityStorage, bridgeId, log, pluginManager, pluginRegistry, pluginInstaller) {
     super("BridgeEndpointManager");
     this.client = client;
-    this.registry = registry2;
+    this.registry = registry3;
     this.mappingStorage = mappingStorage;
     this.identityStorage = identityStorage;
     this.bridgeId = bridgeId;
@@ -174625,8 +174828,8 @@ init_send_ha_message();
 import { callService as callService2 } from "home-assistant-js-websocket";
 import { keys as keys2, pickBy, values as values3 } from "lodash-es";
 var BridgeRegistry = class _BridgeRegistry {
-  constructor(registry2, dataProvider, client) {
-    this.registry = registry2;
+  constructor(registry3, dataProvider, client) {
+    this.registry = registry3;
     this.dataProvider = dataProvider;
     this.client = client;
     this.refresh();
@@ -175396,11 +175599,11 @@ function makeWarmStartState(state, now = (/* @__PURE__ */ new Date()).toISOStrin
   return { ...state, last_updated: now };
 }
 var ServerModeBridge = class {
-  constructor(logger250, dataProvider, endpointManager, server) {
+  constructor(logger251, dataProvider, endpointManager, server) {
     this.dataProvider = dataProvider;
     this.endpointManager = endpointManager;
     this.server = server;
-    this.log = logger250.get(`ServerModeBridge / ${dataProvider.id}`);
+    this.log = logger251.get(`ServerModeBridge / ${dataProvider.id}`);
   }
   dataProvider;
   endpointManager;
@@ -176430,12 +176633,12 @@ function ServerModeVacuumDevice(homeAssistantEntity, includeOnOff = false, clean
 }
 
 // src/matter/endpoints/server-mode-vacuum-endpoint.ts
-var logger248 = Logger.get("ServerModeVacuumEndpoint");
+var logger249 = Logger.get("ServerModeVacuumEndpoint");
 var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEndpoint {
-  static async create(registry2, entityId, mapping, endpointId) {
-    const deviceRegistry = registry2.deviceOf(entityId);
-    let state = registry2.initialState(entityId);
-    const entity = registry2.entity(entityId);
+  static async create(registry3, entityId, mapping, endpointId) {
+    const deviceRegistry = registry3.deviceOf(entityId);
+    let state = registry3.initialState(entityId);
+    const entity = registry3.entity(entityId);
     if (!state) {
       return void 0;
     }
@@ -176443,12 +176646,12 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
     if (mapping?.disableBatteryMapping && mapping.batteryEntity) {
       effectiveMapping = { ...mapping, batteryEntity: void 0 };
     }
-    logger248.info(
+    logger249.info(
       `${entityId}: device_id=${entity.device_id}, manualBattery=${mapping?.batteryEntity ?? "none"}`
     );
     if (entity.device_id) {
       if (!mapping?.batteryEntity && !mapping?.disableBatteryMapping) {
-        const batteryEntityId = registry2.findBatteryEntityForDevice(
+        const batteryEntityId = registry3.findBatteryEntityForDevice(
           entity.device_id
         );
         if (batteryEntityId && batteryEntityId !== entityId) {
@@ -176457,22 +176660,22 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
             entityId: effectiveMapping?.entityId ?? entityId,
             batteryEntity: batteryEntityId
           };
-          registry2.markBatteryEntityUsed(batteryEntityId);
-          logger248.info(`${entityId}: Auto-assigned battery ${batteryEntityId}`);
+          registry3.markBatteryEntityUsed(batteryEntityId);
+          logger249.info(`${entityId}: Auto-assigned battery ${batteryEntityId}`);
         } else {
           const attrs = state.attributes;
           if (attrs.battery_level != null || attrs.battery != null) {
-            logger248.info(
+            logger249.info(
               `${entityId}: No battery entity found, using battery attribute from vacuum state`
             );
           } else {
-            logger248.warn(
+            logger249.warn(
               `${entityId}: No battery entity found for device ${entity.device_id}`
             );
           }
         }
       }
-      const vacuumEntities = registry2.findVacuumSelectEntities(
+      const vacuumEntities = registry3.findVacuumSelectEntities(
         entity.device_id
       );
       if (!effectiveMapping?.cleaningModeEntity && vacuumEntities.cleaningModeEntity) {
@@ -176481,7 +176684,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           entityId: effectiveMapping?.entityId ?? entityId,
           cleaningModeEntity: vacuumEntities.cleaningModeEntity
         };
-        logger248.info(
+        logger249.info(
           `${entityId}: Auto-assigned cleaningMode ${vacuumEntities.cleaningModeEntity}`
         );
       }
@@ -176491,7 +176694,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           entityId: effectiveMapping?.entityId ?? entityId,
           suctionLevelEntity: vacuumEntities.suctionLevelEntity
         };
-        logger248.info(
+        logger249.info(
           `${entityId}: Auto-assigned suctionLevel ${vacuumEntities.suctionLevelEntity}`
         );
       }
@@ -176501,7 +176704,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           entityId: effectiveMapping?.entityId ?? entityId,
           mopIntensityEntity: vacuumEntities.mopIntensityEntity
         };
-        logger248.info(
+        logger249.info(
           `${entityId}: Auto-assigned mopIntensity ${vacuumEntities.mopIntensityEntity}`
         );
       }
@@ -176511,12 +176714,12 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           entityId: effectiveMapping?.entityId ?? entityId,
           currentRoomEntity: vacuumEntities.currentRoomEntity
         };
-        logger248.info(
+        logger249.info(
           `${entityId}: Auto-assigned currentRoom ${vacuumEntities.currentRoomEntity}`
         );
       }
       const supportedFeatures = state.attributes.supported_features ?? 0;
-      const cleanAreaRooms = await registry2.resolveCleanAreaRooms(
+      const cleanAreaRooms = await registry3.resolveCleanAreaRooms(
         entityId,
         supportedFeatures
       );
@@ -176526,13 +176729,13 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
           entityId: effectiveMapping?.entityId ?? entityId,
           cleanAreaRooms
         };
-        logger248.info(
+        logger249.info(
           `${entityId}: Using ${cleanAreaRooms.length} HA areas via CLEAN_AREA`
         );
       }
       const vacAttrs = state.attributes;
       if (cleanAreaRooms.length === 0 && !vacAttrs.rooms && !vacAttrs.segments && !vacAttrs.room_mapping) {
-        const valetudoRooms = registry2.findValetudoMapSegments(
+        const valetudoRooms = registry3.findValetudoMapSegments(
           entity.device_id
         );
         if (valetudoRooms.length > 0) {
@@ -176547,11 +176750,11 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
               rooms: roomsObj
             }
           };
-          logger248.info(
+          logger249.info(
             `${entityId}: Auto-detected ${valetudoRooms.length} Valetudo segments`
           );
         } else {
-          const roborockRooms = await registry2.resolveRoborockRooms(entityId);
+          const roborockRooms = await registry3.resolveRoborockRooms(entityId);
           if (roborockRooms.length > 0) {
             const roomsObj = {};
             for (const r of roborockRooms) {
@@ -176564,14 +176767,14 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
                 rooms: roomsObj
               }
             };
-            logger248.info(
+            logger249.info(
               `${entityId}: Auto-detected ${roborockRooms.length} Roborock rooms`
             );
           }
         }
       }
     } else {
-      logger248.warn(`${entityId}: No device_id, cannot auto-assign battery`);
+      logger249.warn(`${entityId}: No device_id, cannot auto-assign battery`);
     }
     const payload = {
       entity_id: entityId,
@@ -176582,7 +176785,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
     const vacAttrsForClean = state.attributes;
     let cleaningModeOptions;
     if (effectiveMapping?.cleaningModeEntity) {
-      const cmState = registry2.initialState(
+      const cmState = registry3.initialState(
         effectiveMapping.cleaningModeEntity
       );
       cleaningModeOptions = cmState?.attributes?.options;
@@ -176602,7 +176805,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
         customName,
         mapping: effectiveMapping
       },
-      registry2.isServerModeVacuumOnOffEnabled(),
+      registry3.isServerModeVacuumOnOffEnabled(),
       cleaningModeOptions
     );
     if (!endpointType) {
@@ -176644,11 +176847,11 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
     }
     if (mappedChanged) {
       this.pendingMappedChange = true;
-      logger248.debug(
+      logger249.debug(
         `Mapped entity change detected for ${this.entityId}, forcing update`
       );
     }
-    logger248.debug(
+    logger249.debug(
       `State update received for ${this.entityId}: state=${state.state}`
     );
     this.lastState = state;
@@ -176688,11 +176891,11 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
 // src/services/bridges/server-mode-endpoint-manager.ts
 var MAX_SERVER_MODE_DEVICES = 10;
 var ServerModeEndpointManager = class extends Service {
-  constructor(serverNode, client, registry2, mappingStorage, identityStorage, dataProvider, log) {
+  constructor(serverNode, client, registry3, mappingStorage, identityStorage, dataProvider, log) {
     super("ServerModeEndpointManager");
     this.serverNode = serverNode;
     this.client = client;
-    this.registry = registry2;
+    this.registry = registry3;
     this.mappingStorage = mappingStorage;
     this.identityStorage = identityStorage;
     this.dataProvider = dataProvider;
@@ -177226,10 +177429,10 @@ var BridgeEnvironmentFactory = class extends BridgeFactory {
 // src/core/ioc/app-environment.ts
 var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
   constructor(rootEnv, options) {
-    const logger250 = rootEnv.get(LoggerService);
+    const logger251 = rootEnv.get(LoggerService);
     super({
       id: "App",
-      log: logger250.get("AppContainer"),
+      log: logger251.get("AppContainer"),
       parent: rootEnv
     });
     this.options = options;
@@ -177243,8 +177446,8 @@ var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
   }
   construction;
   async init() {
-    const logger250 = this.get(LoggerService);
-    this.set(LoggerService, logger250);
+    const logger251 = this.get(LoggerService);
+    this.set(LoggerService, logger251);
     this.set(AppStorage, new AppStorage(await this.load(StorageService)));
     this.set(BridgeStorage, new BridgeStorage(await this.load(AppStorage)));
     this.set(
@@ -177265,7 +177468,7 @@ var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
     );
     this.set(
       HomeAssistantClient,
-      new HomeAssistantClient(logger250, this.options.homeAssistant)
+      new HomeAssistantClient(logger251, this.options.homeAssistant)
     );
     this.set(
       HomeAssistantConfig,
@@ -177273,7 +177476,7 @@ var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
     );
     this.set(
       HomeAssistantActions,
-      new HomeAssistantActions(logger250, await this.load(HomeAssistantClient))
+      new HomeAssistantActions(logger251, await this.load(HomeAssistantClient))
     );
     this.set(
       HomeAssistantRegistry,
@@ -177309,7 +177512,7 @@ var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
     this.set(
       WebApi,
       new WebApi(
-        logger250,
+        logger251,
         await this.load(BridgeService),
         await this.load(HomeAssistantClient),
         await this.load(HomeAssistantRegistry),
@@ -177330,7 +177533,7 @@ var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
 
 // src/matter/patches/patch-level-control-tlv.ts
 init_esm();
-var logger249 = Logger.get("PatchLevelControlTlv");
+var logger250 = Logger.get("PatchLevelControlTlv");
 var optionalFieldModels = /* @__PURE__ */ new WeakSet();
 var fieldModelMandatoryGetterPatched = false;
 function patchLevelControlTlv() {
@@ -177386,11 +177589,11 @@ function patchLevelControlTlv() {
     patched++;
   }
   if (patched > 0) {
-    logger249.info(
+    logger250.info(
       `Patched ${patched} LevelControl TLV schema(s): transitionTime is now optional (Google Home compatibility)`
     );
   } else {
-    logger249.warn(
+    logger250.warn(
       "Failed to patch LevelControl TLV schemas, field definitions not found. Google Home brightness adjustment may not work.",
       {
         moveToLevel: describeFields(