@riddix/hamh 2.1.0-alpha.527 → 2.1.0-alpha.529

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,
@@ -166283,6 +166283,7 @@ function validatePluginDevice(device) {
 }
 var PluginManager = class {
   instances = /* @__PURE__ */ new Map();
+  domainMappings = /* @__PURE__ */ new Map();
   storageDir;
   bridgeId;
   runner = new SafePluginRunner();
@@ -166414,6 +166415,21 @@ var PluginManager = class {
           clusterId3,
           attributes7
         );
+      },
+      registerDomainMapping: (mapping) => {
+        if (!mapping.domain || typeof mapping.domain !== "string" || !mapping.matterDeviceType || typeof mapping.matterDeviceType !== "string") {
+          pluginLogger.warn("Invalid domain mapping, skipping");
+          return;
+        }
+        if (this.domainMappings.has(mapping.domain)) {
+          pluginLogger.warn(
+            `Domain "${mapping.domain}" already mapped by another plugin, overwriting`
+          );
+        }
+        this.domainMappings.set(mapping.domain, mapping);
+        pluginLogger.info(
+          `Registered domain mapping: ${mapping.domain} \u2192 ${mapping.matterDeviceType}`
+        );
       }
     };
     this.instances.set(plugin.name, {
@@ -166539,6 +166555,9 @@ var PluginManager = class {
     if (!instance) return void 0;
     return instance.plugin.getConfigSchema?.();
   }
+  getDomainMappings() {
+    return new Map(this.domainMappings);
+  }
   async updateConfig(pluginName, config10) {
     const instance = this.instances.get(pluginName);
     if (!instance) return false;
@@ -167718,6 +167737,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();
@@ -169227,6 +169266,9 @@ init_esm7();
 import debounce4 from "debounce";
 init_home_assistant_entity_behavior();
 
+// src/matter/endpoints/legacy/create-legacy-endpoint-type.ts
+init_esm();
+
 // src/matter/endpoints/legacy/air-purifier/index.ts
 init_dist();
 init_home_assistant_entity_behavior();
@@ -170802,25 +170844,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) {
@@ -170830,7 +170853,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) {
@@ -171424,25 +171447,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)) {
@@ -171477,7 +171481,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);
 };
@@ -171598,25 +171605,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;
@@ -171636,7 +171624,7 @@ function FanDevice2(homeAssistantEntity) {
       BasicInformationServer2,
       HomeAssistantEntityBehavior,
       FanOnOffServer,
-      FanPowerSourceServer
+      DefaultPowerSourceServer
     ) : OnOffPlugInUnitDevice.with(
       IdentifyServer2,
       BasicInformationServer2,
@@ -171671,7 +171659,7 @@ function FanDevice2(homeAssistantEntity) {
     HomeAssistantEntityBehavior,
     FanOnOffServer,
     FanFanControlServer.with(...features2),
-    FanPowerSourceServer
+    DefaultPowerSourceServer
   ) : FanDevice.with(
     IdentifyServer2,
     BasicInformationServer2,
@@ -172196,25 +172184,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,
@@ -172228,30 +172197,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) {
@@ -172268,7 +172218,7 @@ var ExtendedColorLightType = (supportsColorControl, supportsTemperature, hasBatt
       LightOnOffServer,
       LightLevelControlServer,
       LightColorControlServer.with(...features2),
-      LightPowerSourceServer2
+      DefaultPowerSourceServer
     );
   }
   return ExtendedColorLightDevice.with(
@@ -172283,25 +172233,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,
@@ -172313,7 +172244,7 @@ var OnOffLightWithBatteryType = OnOffLightDevice.with(
   BasicInformationServer2,
   HomeAssistantEntityBehavior,
   LightOnOffServer,
-  LightPowerSourceServer3
+  DefaultPowerSourceServer
 );
 
 // src/matter/endpoints/legacy/light/index.ts
@@ -173004,25 +172935,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,
@@ -173034,7 +172946,7 @@ var LockWithBatteryDeviceType = DoorLockDevice.with(
   IdentifyServer2,
   HomeAssistantEntityBehavior,
   LockServerWithPin(lockServerConfig),
-  LockPowerSourceServer
+  DefaultPowerSourceServer
 );
 var LockWithUnlatchDeviceType = DoorLockDevice.with(
   BasicInformationServer2,
@@ -173047,7 +172959,7 @@ var LockWithUnlatchAndBatteryDeviceType = DoorLockDevice.with(
   IdentifyServer2,
   HomeAssistantEntityBehavior,
   LockServerWithPinAndUnbolt(lockServerConfig),
-  LockPowerSourceServer
+  DefaultPowerSourceServer
 );
 function LockDevice(homeAssistantEntity) {
   const attrs = homeAssistantEntity.entity.state.attributes;
@@ -173629,25 +173541,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;
@@ -175459,25 +175353,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;
@@ -177679,25 +177555,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;
@@ -177825,6 +177683,7 @@ function WaterHeaterDevice(homeAssistantEntity) {
 }
 
 // src/matter/endpoints/legacy/create-legacy-endpoint-type.ts
+var legacyLogger = Logger.get("LegacyEndpointType");
 function createLegacyEndpointType(entity, mapping, areaName, options) {
   const domain = entity.entity_id.split(".")[0];
   const customName = mapping?.customName;
@@ -177844,10 +177703,20 @@ function createLegacyEndpointType(entity, mapping, areaName, options) {
       );
     } else {
       const factory = deviceCtrs[domain];
-      if (!factory) {
+      if (factory) {
+        type = factory({ entity, customName, mapping });
+      } else if (options?.pluginDomainMappings?.has(domain)) {
+        const mappedType = options.pluginDomainMappings.get(domain);
+        const mappedFactory = matterDeviceTypeFactories[mappedType];
+        if (mappedFactory) {
+          legacyLogger.info(
+            `Using plugin domain mapping for "${domain}" \u2192 "${mappedType}"`
+          );
+          type = mappedFactory({ entity, customName, mapping });
+        }
+      } else {
         return void 0;
       }
-      type = factory({ entity, customName, mapping });
     }
   }
   if (!type) {
@@ -178190,7 +178059,7 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
 // src/matter/endpoints/legacy/legacy-endpoint.ts
 var logger199 = Logger.get("LegacyEndpoint");
 var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
-  static async create(registry2, entityId, mapping) {
+  static async create(registry2, entityId, mapping, pluginDomainMappings) {
     const deviceRegistry = registry2.deviceOf(entityId);
     let state = registry2.initialState(entityId);
     const entity = registry2.entity(entityId);
@@ -178485,7 +178354,8 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
     const areaName = registry2.getAreaName(entityId);
     const type = createLegacyEndpointType(payload, effectiveMapping, areaName, {
       vacuumOnOff: registry2.isVacuumOnOffEnabled(),
-      cleaningModeOptions
+      cleaningModeOptions,
+      pluginDomainMappings
     });
     if (!type) {
       return;
@@ -178989,6 +178859,16 @@ var BridgeEndpointManager = class extends Service {
       }
     }
   }
+  getPluginDomainMappings() {
+    if (!this.pluginManager) return void 0;
+    const mappings = this.pluginManager.getDomainMappings();
+    if (mappings.size === 0) return void 0;
+    const result = /* @__PURE__ */ new Map();
+    for (const [domain, mapping] of mappings) {
+      result.set(domain, mapping.matterDeviceType);
+    }
+    return result;
+  }
   getEntityMapping(entityId) {
     return this.mappingStorage.getMapping(this.bridgeId, entityId);
   }
@@ -179144,10 +179024,12 @@ var BridgeEndpointManager = class extends Service {
       let endpoint = existingEndpoints.find((e) => e.entityId === entityId);
       if (!endpoint) {
         try {
+          const domainMappings = this.getPluginDomainMappings();
           endpoint = await LegacyEndpoint.create(
             this.registry,
             entityId,
-            mapping
+            mapping,
+            domainMappings
           );
         } catch (e) {
           const reason = this.extractErrorReason(e);
@@ -181170,8 +181052,7 @@ process.on("unhandledRejection", (reason) => {
   if (shouldSuppressError(reason)) {
     return;
   }
-  console.error("Unhandled rejection:", reason);
-  process.exit(1);
+  console.error("Unhandled rejection (process continuing):", reason);
 });
 function registerFinalErrorHandlers() {
   process.removeAllListeners("uncaughtException");
@@ -181197,8 +181078,7 @@ function registerFinalErrorHandlers() {
       console.warn("Suppressed Matter.js internal error:", reason);
       return;
     }
-    console.error("Unhandled rejection:", reason);
-    process.exit(1);
+    console.error("Unhandled rejection (process continuing):", reason);
   });
 }
 async function startHandler(startOptions, webUiDist) {