@riddix/hamh 2.1.0-alpha.528 → 2.1.0-alpha.530

package/dist/backend/cli.js

@@ -147567,7 +147567,7 @@ var DiagnosticService = class {
             }
           }
         }
-        const entities = this.collectEntities(bridge.aggregator);
+        const entities = bridge.aggregator ? this.collectEntities(bridge.aggregator) : [];
         return {
           bridgeId: data.id,
           bridgeName: data.name,
@@ -167168,9 +167168,9 @@ ${e?.toString()}`);
             `Closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS / 1e3}s)`
           );
           s.initiateClose().catch(() => {
-            s.initiateForceClose().catch(() => {
-            });
-          });
+            return s.initiateForceClose();
+          }).catch(() => {
+          }).finally(() => this.triggerMdnsReAnnounce());
           break;
         }
       }
@@ -167181,17 +167181,37 @@ ${e?.toString()}`);
     try {
       const sessionManager = this.server.env.get(SessionManager);
       const sessions = [...sessionManager.sessions];
+      const closes = [];
       for (const s of sessions) {
         if (!s.isClosing && s.subscriptions.size === 0) {
           this.log.warn(
             `Closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS / 1e3}s)`
           );
-          s.initiateClose().catch(() => {
-            s.initiateForceClose().catch(() => {
-            });
-          });
+          closes.push(
+            s.initiateClose().catch(() => {
+              return s.initiateForceClose();
+            })
+          );
         }
       }
+      if (closes.length > 0) {
+        Promise.allSettled(closes).then(() => this.triggerMdnsReAnnounce());
+      }
+    } catch {
+    }
+  }
+  /**
+   * Force a fresh mDNS operational advertisement after session cleanup.
+   * matter.js DeviceAdvertiser only re-announces when a subscription is
+   * canceled BY THE PEER. When the server cancels after 3 delivery
+   * timeouts, no re-announcement happens and the controller may not
+   * realize it should reconnect (#266).
+   */
+  triggerMdnsReAnnounce() {
+    try {
+      const advertiser = this.server.env.get(DeviceAdvertiser);
+      advertiser.restartAdvertisement();
+      this.log.info("Triggered mDNS re-announcement after session cleanup");
     } catch {
     }
   }
@@ -167737,6 +167757,26 @@ function PowerSourceServer2(config10) {
     order: PowerSource3.Cluster.id
   });
 }
+var defaultBatteryConfig = {
+  getBatteryPercent: (entity, agent) => {
+    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
+    const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
+    if (batteryEntity) {
+      const stateProvider = agent.env.get(EntityStateProvider);
+      const battery = stateProvider.getBatteryPercent(batteryEntity);
+      if (battery != null) {
+        return Math.max(0, Math.min(100, battery));
+      }
+    }
+    const attrs = entity.attributes;
+    const level = attrs.battery_level ?? attrs.battery;
+    if (level == null || Number.isNaN(Number(level))) {
+      return null;
+    }
+    return Number(level);
+  }
+};
+var DefaultPowerSourceServer = PowerSourceServer2(defaultBatteryConfig);
 
 // src/matter/behaviors/temperature-measurement-server.ts
 init_home_assistant_entity_behavior();
@@ -170824,25 +170864,6 @@ function ClimateThermostatServer(initialState = {}, features2) {
 }
 
 // src/matter/endpoints/legacy/climate/index.ts
-var ClimatePowerSourceServer = PowerSourceServer2({
-  getBatteryPercent: (entity, agent) => {
-    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-    const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-    if (batteryEntity) {
-      const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getBatteryPercent(batteryEntity);
-      if (battery != null) {
-        return Math.max(0, Math.min(100, battery));
-      }
-    }
-    const attrs = entity.attributes;
-    const level = attrs.battery_level ?? attrs.battery;
-    if (level == null || Number.isNaN(Number(level))) {
-      return null;
-    }
-    return Number(level);
-  }
-});
 var ClimateDeviceType = (supportsOnOff, supportsHumidity, supportsFanMode, hasBattery, features2, initialState = {}) => {
   const additionalClusters = [];
   if (supportsOnOff) {
@@ -170852,7 +170873,7 @@ var ClimateDeviceType = (supportsOnOff, supportsHumidity, supportsFanMode, hasBa
     additionalClusters.push(ClimateHumidityMeasurementServer);
   }
   if (hasBattery) {
-    additionalClusters.push(ClimatePowerSourceServer);
+    additionalClusters.push(DefaultPowerSourceServer);
   }
   const thermostatServer = ClimateThermostatServer(initialState, features2);
   if (supportsFanMode) {
@@ -171446,25 +171467,6 @@ var CoverWindowCoveringServer = WindowCoveringServer2(config5);
 
 // src/matter/endpoints/legacy/cover/index.ts
 var logger177 = Logger.get("CoverDevice");
-var CoverPowerSourceServer = PowerSourceServer2({
-  getBatteryPercent: (entity, agent) => {
-    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-    const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-    if (batteryEntity) {
-      const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getBatteryPercent(batteryEntity);
-      if (battery != null) {
-        return Math.max(0, Math.min(100, battery));
-      }
-    }
-    const attrs = entity.attributes;
-    const level = attrs.battery_level ?? attrs.battery;
-    if (level == null || Number.isNaN(Number(level))) {
-      return null;
-    }
-    return Number(level);
-  }
-});
 var CoverDeviceType = (supportedFeatures, hasBattery, entityId) => {
   const features2 = /* @__PURE__ */ new Set();
   if (testBit(supportedFeatures, CoverSupportedFeatures.support_open)) {
@@ -171499,7 +171501,10 @@ var CoverDeviceType = (supportedFeatures, hasBattery, entityId) => {
     CoverWindowCoveringServer.with(...features2)
   ];
   if (hasBattery) {
-    return WindowCoveringDevice.with(...baseBehaviors, CoverPowerSourceServer);
+    return WindowCoveringDevice.with(
+      ...baseBehaviors,
+      DefaultPowerSourceServer
+    );
   }
   return WindowCoveringDevice.with(...baseBehaviors);
 };
@@ -171620,25 +171625,6 @@ function EventDevice(homeAssistantEntity) {
 // src/matter/endpoints/legacy/fan/index.ts
 init_dist();
 init_home_assistant_entity_behavior();
-var FanPowerSourceServer = PowerSourceServer2({
-  getBatteryPercent: (entity, agent) => {
-    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-    const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-    if (batteryEntity) {
-      const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getBatteryPercent(batteryEntity);
-      if (battery != null) {
-        return Math.max(0, Math.min(100, battery));
-      }
-    }
-    const attrs = entity.attributes;
-    const level = attrs.battery_level ?? attrs.battery;
-    if (level == null || Number.isNaN(Number(level))) {
-      return null;
-    }
-    return Number(level);
-  }
-});
 function FanDevice2(homeAssistantEntity) {
   const attributes7 = homeAssistantEntity.entity.state.attributes;
   const supportedFeatures = attributes7.supported_features ?? 0;
@@ -171658,7 +171644,7 @@ function FanDevice2(homeAssistantEntity) {
       BasicInformationServer2,
       HomeAssistantEntityBehavior,
       FanOnOffServer,
-      FanPowerSourceServer
+      DefaultPowerSourceServer
     ) : OnOffPlugInUnitDevice.with(
       IdentifyServer2,
       BasicInformationServer2,
@@ -171693,7 +171679,7 @@ function FanDevice2(homeAssistantEntity) {
     HomeAssistantEntityBehavior,
     FanOnOffServer,
     FanFanControlServer.with(...features2),
-    FanPowerSourceServer
+    DefaultPowerSourceServer
   ) : FanDevice.with(
     IdentifyServer2,
     BasicInformationServer2,
@@ -172218,25 +172204,6 @@ var ColorTemperatureLightType = ColorTemperatureLightDevice.with(
 
 // src/matter/endpoints/legacy/light/devices/dimmable-light.ts
 init_home_assistant_entity_behavior();
-var LightPowerSourceServer = PowerSourceServer2({
-  getBatteryPercent: (entity, agent) => {
-    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-    const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-    if (batteryEntity) {
-      const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getBatteryPercent(batteryEntity);
-      if (battery != null) {
-        return Math.max(0, Math.min(100, battery));
-      }
-    }
-    const attrs = entity.attributes;
-    const level = attrs.battery_level ?? attrs.battery;
-    if (level == null || Number.isNaN(Number(level))) {
-      return null;
-    }
-    return Number(level);
-  }
-});
 var DimmableLightType = DimmableLightDevice.with(
   IdentifyServer2,
   BasicInformationServer2,
@@ -172250,30 +172217,11 @@ var DimmableLightWithBatteryType = DimmableLightDevice.with(
   HomeAssistantEntityBehavior,
   LightOnOffServer,
   LightLevelControlServer,
-  LightPowerSourceServer
+  DefaultPowerSourceServer
 );
 
 // src/matter/endpoints/legacy/light/devices/extended-color-light.ts
 init_home_assistant_entity_behavior();
-var LightPowerSourceServer2 = PowerSourceServer2({
-  getBatteryPercent: (entity, agent) => {
-    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-    const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-    if (batteryEntity) {
-      const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getBatteryPercent(batteryEntity);
-      if (battery != null) {
-        return Math.max(0, Math.min(100, battery));
-      }
-    }
-    const attrs = entity.attributes;
-    const level = attrs.battery_level ?? attrs.battery;
-    if (level == null || Number.isNaN(Number(level))) {
-      return null;
-    }
-    return Number(level);
-  }
-});
 var ExtendedColorLightType = (supportsColorControl, supportsTemperature, hasBattery = false) => {
   const features2 = /* @__PURE__ */ new Set();
   if (supportsColorControl) {
@@ -172290,7 +172238,7 @@ var ExtendedColorLightType = (supportsColorControl, supportsTemperature, hasBatt
       LightOnOffServer,
       LightLevelControlServer,
       LightColorControlServer.with(...features2),
-      LightPowerSourceServer2
+      DefaultPowerSourceServer
     );
   }
   return ExtendedColorLightDevice.with(
@@ -172305,25 +172253,6 @@ var ExtendedColorLightType = (supportsColorControl, supportsTemperature, hasBatt
 
 // src/matter/endpoints/legacy/light/devices/on-off-light-device.ts
 init_home_assistant_entity_behavior();
-var LightPowerSourceServer3 = PowerSourceServer2({
-  getBatteryPercent: (entity, agent) => {
-    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-    const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-    if (batteryEntity) {
-      const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getBatteryPercent(batteryEntity);
-      if (battery != null) {
-        return Math.max(0, Math.min(100, battery));
-      }
-    }
-    const attrs = entity.attributes;
-    const level = attrs.battery_level ?? attrs.battery;
-    if (level == null || Number.isNaN(Number(level))) {
-      return null;
-    }
-    return Number(level);
-  }
-});
 var OnOffLightType = OnOffLightDevice.with(
   IdentifyServer2,
   BasicInformationServer2,
@@ -172335,7 +172264,7 @@ var OnOffLightWithBatteryType = OnOffLightDevice.with(
   BasicInformationServer2,
   HomeAssistantEntityBehavior,
   LightOnOffServer,
-  LightPowerSourceServer3
+  DefaultPowerSourceServer
 );
 
 // src/matter/endpoints/legacy/light/index.ts
@@ -173026,25 +172955,6 @@ var lockServerConfig = {
   unlock: () => ({ action: "lock.unlock" }),
   unlatch: () => ({ action: "lock.open" })
 };
-var LockPowerSourceServer = PowerSourceServer2({
-  getBatteryPercent: (entity, agent) => {
-    const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-    const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-    if (batteryEntity) {
-      const stateProvider = agent.env.get(EntityStateProvider);
-      const battery = stateProvider.getBatteryPercent(batteryEntity);
-      if (battery != null) {
-        return Math.max(0, Math.min(100, battery));
-      }
-    }
-    const attrs = entity.attributes;
-    const level = attrs.battery_level ?? attrs.battery;
-    if (level == null || Number.isNaN(Number(level))) {
-      return null;
-    }
-    return Number(level);
-  }
-});
 var LockDeviceType = DoorLockDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
@@ -173056,7 +172966,7 @@ var LockWithBatteryDeviceType = DoorLockDevice.with(
   IdentifyServer2,
   HomeAssistantEntityBehavior,
   LockServerWithPin(lockServerConfig),
-  LockPowerSourceServer
+  DefaultPowerSourceServer
 );
 var LockWithUnlatchDeviceType = DoorLockDevice.with(
   BasicInformationServer2,
@@ -173069,7 +172979,7 @@ var LockWithUnlatchAndBatteryDeviceType = DoorLockDevice.with(
   IdentifyServer2,
   HomeAssistantEntityBehavior,
   LockServerWithPinAndUnbolt(lockServerConfig),
-  LockPowerSourceServer
+  DefaultPowerSourceServer
 );
 function LockDevice(homeAssistantEntity) {
   const attrs = homeAssistantEntity.entity.state.attributes;
@@ -173651,25 +173561,7 @@ var PumpWithBatteryType = PumpDevice.with(
   HomeAssistantEntityBehavior,
   PumpOnOffServer,
   PumpConfigurationAndControlServer2,
-  PowerSourceServer2({
-    getBatteryPercent: (entity, agent) => {
-      const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-      const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-      if (batteryEntity) {
-        const stateProvider = agent.env.get(EntityStateProvider);
-        const battery = stateProvider.getBatteryPercent(batteryEntity);
-        if (battery != null) {
-          return Math.max(0, Math.min(100, battery));
-        }
-      }
-      const attrs = entity.attributes;
-      const level = attrs.battery_level ?? attrs.battery;
-      if (level == null || Number.isNaN(Number(level))) {
-        return null;
-      }
-      return Number(level);
-    }
-  })
+  DefaultPowerSourceServer
 );
 function PumpEndpoint(homeAssistantEntity) {
   const attrs = homeAssistantEntity.entity.state.attributes;
@@ -175481,25 +175373,7 @@ var SwitchWithBatteryEndpointType = OnOffPlugInUnitDevice.with(
   IdentifyServer2,
   HomeAssistantEntityBehavior,
   SwitchOnOffServer,
-  PowerSourceServer2({
-    getBatteryPercent: (entity, agent) => {
-      const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-      const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-      if (batteryEntity) {
-        const stateProvider = agent.env.get(EntityStateProvider);
-        const battery = stateProvider.getBatteryPercent(batteryEntity);
-        if (battery != null) {
-          return Math.max(0, Math.min(100, battery));
-        }
-      }
-      const attrs = entity.attributes;
-      const level = attrs.battery_level ?? attrs.battery;
-      if (level == null || Number.isNaN(Number(level))) {
-        return null;
-      }
-      return Number(level);
-    }
-  })
+  DefaultPowerSourceServer
 );
 function SwitchDevice(homeAssistantEntity) {
   const attrs = homeAssistantEntity.entity.state.attributes;
@@ -177701,25 +177575,7 @@ var ValveWithBatteryEndpointType = WaterValveDevice.with(
   IdentifyServer2,
   HomeAssistantEntityBehavior,
   ValveServer,
-  PowerSourceServer2({
-    getBatteryPercent: (entity, agent) => {
-      const homeAssistant = agent.get(HomeAssistantEntityBehavior);
-      const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
-      if (batteryEntity) {
-        const stateProvider = agent.env.get(EntityStateProvider);
-        const battery = stateProvider.getBatteryPercent(batteryEntity);
-        if (battery != null) {
-          return Math.max(0, Math.min(100, battery));
-        }
-      }
-      const attrs = entity.attributes;
-      const level = attrs.battery_level ?? attrs.battery;
-      if (level == null || Number.isNaN(Number(level))) {
-        return null;
-      }
-      return Number(level);
-    }
-  })
+  DefaultPowerSourceServer
 );
 function ValveDevice(homeAssistantEntity) {
   const attrs = homeAssistantEntity.entity.state.attributes;
@@ -180215,9 +180071,9 @@ ${e?.toString()}`);
             `Closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s)`
           );
           s.initiateClose().catch(() => {
-            s.initiateForceClose().catch(() => {
-            });
-          });
+            return s.initiateForceClose();
+          }).catch(() => {
+          }).finally(() => this.triggerMdnsReAnnounce());
           break;
         }
       }
@@ -180228,17 +180084,37 @@ ${e?.toString()}`);
     try {
       const sessionManager = this.server.env.get(SessionManager);
       const sessions = [...sessionManager.sessions];
+      const closes = [];
       for (const s of sessions) {
         if (!s.isClosing && s.subscriptions.size === 0) {
           this.log.warn(
             `Closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s)`
           );
-          s.initiateClose().catch(() => {
-            s.initiateForceClose().catch(() => {
-            });
-          });
+          closes.push(
+            s.initiateClose().catch(() => {
+              return s.initiateForceClose();
+            })
+          );
         }
       }
+      if (closes.length > 0) {
+        Promise.allSettled(closes).then(() => this.triggerMdnsReAnnounce());
+      }
+    } catch {
+    }
+  }
+  /**
+   * Force a fresh mDNS operational advertisement after session cleanup.
+   * matter.js DeviceAdvertiser only re-announces when a subscription is
+   * canceled BY THE PEER. When the server cancels after 3 delivery
+   * timeouts, no re-announcement happens and the controller may not
+   * realize it should reconnect (#266).
+   */
+  triggerMdnsReAnnounce() {
+    try {
+      const advertiser = this.server.env.get(DeviceAdvertiser);
+      advertiser.restartAdvertisement();
+      this.log.info("Triggered mDNS re-announcement after session cleanup");
     } catch {
     }
   }