@riddix/hamh 2.1.0-alpha.553 → 2.1.0-alpha.555

package/dist/backend/cli.js

@@ -146521,6 +146521,7 @@ var init_home_assistant_domain = __esm({
       HomeAssistantDomain2["select"] = "select";
       HomeAssistantDomain2["script"] = "script";
       HomeAssistantDomain2["sensor"] = "sensor";
+      HomeAssistantDomain2["siren"] = "siren";
       HomeAssistantDomain2["switch"] = "switch";
       HomeAssistantDomain2["vacuum"] = "vacuum";
       HomeAssistantDomain2["valve"] = "valve";
@@ -152309,39 +152310,44 @@ var HomeAssistantClient = class extends Service {
     this.connection?.close();
   }
   async createConnection(props) {
-    try {
-      const connection = await createConnection({
-        auth: createLongLivedTokenAuth(
-          props.url.replace(/\/$/, ""),
-          props.accessToken
-        )
-      });
-      await this.waitForHomeAssistantToBeUpAndRunning(connection);
-      return connection;
-    } catch (reason) {
-      return this.handleInitializationError(reason, props);
-    }
-  }
-  async handleInitializationError(reason, props) {
-    if (reason === ERR_CANNOT_CONNECT) {
-      this.log.warnCtx("Unable to connect to Home Assistant, retrying...", {
-        url: props.url,
-        retryDelayMs: 5e3
-      });
-      await new Promise((resolve6) => setTimeout(resolve6, 5e3));
-      return this.createConnection(props);
-    }
-    if (reason === ERR_INVALID_AUTH) {
-      this.log.errorCtx(
-        "Authentication failed",
-        new Error("Invalid authentication credentials"),
-        { url: props.url }
-      );
-      throw new Error(
-        "Authentication failed while connecting to home assistant"
-      );
+    const maxConnectAttempts = 60;
+    for (let attempt = 1; attempt <= maxConnectAttempts; attempt++) {
+      try {
+        const connection = await createConnection({
+          auth: createLongLivedTokenAuth(
+            props.url.replace(/\/$/, ""),
+            props.accessToken
+          )
+        });
+        await this.waitForHomeAssistantToBeUpAndRunning(connection);
+        return connection;
+      } catch (reason) {
+        if (reason === ERR_CANNOT_CONNECT) {
+          this.log.warnCtx("Unable to connect to Home Assistant, retrying...", {
+            url: props.url,
+            attempt,
+            maxAttempts: maxConnectAttempts,
+            retryDelayMs: 5e3
+          });
+          await new Promise((resolve6) => setTimeout(resolve6, 5e3));
+          continue;
+        }
+        if (reason === ERR_INVALID_AUTH) {
+          this.log.errorCtx(
+            "Authentication failed",
+            new Error("Invalid authentication credentials"),
+            { url: props.url }
+          );
+          throw new Error(
+            "Authentication failed while connecting to home assistant"
+          );
+        }
+        throw new Error(`Unable to connect to home assistant: ${reason}`);
+      }
     }
-    throw new Error(`Unable to connect to home assistant: ${reason}`);
+    throw new Error(
+      `Failed to connect to Home Assistant at ${props.url} after ${maxConnectAttempts} attempts (5 minutes)`
+    );
   }
   async waitForHomeAssistantToBeUpAndRunning(connection) {
     this.log.infoCtx("Waiting for Home Assistant to be up and running", {
@@ -152364,8 +152370,15 @@ var HomeAssistantClient = class extends Service {
       this.log.debugCtx("Home Assistant state update", { state: state2 });
       return state2;
     };
+    const maxWaitAttempts = 120;
     let state;
+    let waitAttempt = 0;
     while (state !== "RUNNING") {
+      if (++waitAttempt > maxWaitAttempts) {
+        throw new Error(
+          `Home Assistant did not reach RUNNING state within 10 minutes (last state: ${state ?? "unknown"})`
+        );
+      }
       await new Promise((resolve6) => setTimeout(resolve6, 5e3));
       state = await getState();
     }
@@ -152869,6 +152882,8 @@ var EntityMappingStorage = class extends Service {
       entityId: request.entityId,
       matterDeviceType: request.matterDeviceType,
       customName: request.customName?.trim() || void 0,
+      customProductName: request.customProductName?.trim() || void 0,
+      customVendorName: request.customVendorName?.trim() || void 0,
       disabled: request.disabled,
       filterLifeEntity: request.filterLifeEntity?.trim() || void 0,
       cleaningModeEntity: request.cleaningModeEntity?.trim() || void 0,
@@ -152891,7 +152906,7 @@ var EntityMappingStorage = class extends Service {
       coverSwapOpenClose: request.coverSwapOpenClose || void 0,
       composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? void 0
     };
-    if (!config10.matterDeviceType && !config10.customName && config10.disabled !== true && !config10.filterLifeEntity && !config10.cleaningModeEntity && !config10.temperatureEntity && !config10.humidityEntity && !config10.batteryEntity && !config10.roomEntities && !config10.disableLockPin && !config10.powerEntity && !config10.energyEntity && !config10.pressureEntity && !config10.suctionLevelEntity && !config10.mopIntensityEntity && (!config10.customServiceAreas || config10.customServiceAreas.length === 0) && (!config10.customFanSpeedTags || Object.keys(config10.customFanSpeedTags).length === 0) && !config10.currentRoomEntity && !config10.valetudoIdentifier && !config10.coverSwapOpenClose && (!config10.composedEntities || config10.composedEntities.length === 0)) {
+    if (!config10.matterDeviceType && !config10.customName && !config10.customProductName && !config10.customVendorName && config10.disabled !== true && !config10.filterLifeEntity && !config10.cleaningModeEntity && !config10.temperatureEntity && !config10.humidityEntity && !config10.batteryEntity && !config10.roomEntities && !config10.disableLockPin && !config10.powerEntity && !config10.energyEntity && !config10.pressureEntity && !config10.suctionLevelEntity && !config10.mopIntensityEntity && (!config10.customServiceAreas || config10.customServiceAreas.length === 0) && (!config10.customFanSpeedTags || Object.keys(config10.customFanSpeedTags).length === 0) && !config10.currentRoomEntity && !config10.valetudoIdentifier && !config10.coverSwapOpenClose && (!config10.composedEntities || config10.composedEntities.length === 0)) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config10);
@@ -159873,6 +159888,7 @@ var DishwasherDeviceDefinition = MutableEndpoint({
   behaviors: SupportedBehaviors(DishwasherRequirements.server.mandatory.OperationalState)
 });
 Object.freeze(DishwasherDeviceDefinition);
+var DishwasherDevice = DishwasherDeviceDefinition;
 
 // ../../node_modules/.pnpm/@matter+node@0.16.10/node_modules/@matter/node/dist/esm/devices/door-lock-controller.js
 init_TimeSynchronizationServer();
@@ -167787,10 +167803,11 @@ var BasicInformationServer2 = class extends BridgedDeviceBasicInformationServer
     const { basicInformation } = this.env.get(BridgeDataProvider);
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const device = entity.deviceRegistry;
+    const mapping = homeAssistant.state.mapping;
     applyPatchState(this.state, {
       vendorId: VendorId(basicInformation.vendorId),
-      vendorName: ellipse(32, device?.manufacturer) ?? hash(32, basicInformation.vendorName),
-      productName: ellipse(32, device?.model_id) ?? ellipse(32, device?.model) ?? hash(32, basicInformation.productName),
+      vendorName: ellipse(32, mapping?.customVendorName) ?? ellipse(32, device?.manufacturer) ?? hash(32, basicInformation.vendorName),
+      productName: ellipse(32, mapping?.customProductName) ?? ellipse(32, device?.model_id) ?? ellipse(32, device?.model) ?? hash(32, basicInformation.productName),
       productLabel: ellipse(64, device?.model) ?? hash(64, basicInformation.productLabel),
       hardwareVersion: basicInformation.hardwareVersion,
       softwareVersion: basicInformation.softwareVersion,
@@ -171373,6 +171390,19 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
   static DEBOUNCE_INITIAL_MS = 400;
   static DEBOUNCE_SUBSEQUENT_MS = 150;
   static COMMAND_SEQUENCE_THRESHOLD_MS = 600;
+  async [Symbol.asyncDispose]() {
+    if (this.liftDebounceTimer) {
+      clearTimeout(this.liftDebounceTimer);
+      this.liftDebounceTimer = null;
+    }
+    if (this.tiltDebounceTimer) {
+      clearTimeout(this.tiltDebounceTimer);
+      this.tiltDebounceTimer = null;
+    }
+    this.pendingLiftAction = null;
+    this.pendingTiltAction = null;
+    await super[Symbol.asyncDispose]();
+  }
   async initialize() {
     if (this.features.lift) {
       if (this.state.installedOpenLimitLift == null) {
@@ -171885,6 +171915,106 @@ function CoverDevice(homeAssistantEntity) {
   });
 }
 
+// ../../node_modules/.pnpm/@matter+main@0.16.10/node_modules/@matter/main/dist/esm/forwards/behaviors/operational-state.js
+init_nodejs();
+
+// ../../node_modules/.pnpm/@matter+main@0.16.10/node_modules/@matter/main/dist/esm/forwards/clusters/operational-state.js
+init_nodejs();
+init_operational_state();
+
+// src/matter/endpoints/legacy/dishwasher/index.ts
+init_home_assistant_entity_behavior();
+var haStateToDishwasherState = {
+  off: OperationalState3.OperationalStateEnum.Stopped,
+  idle: OperationalState3.OperationalStateEnum.Stopped,
+  standby: OperationalState3.OperationalStateEnum.Stopped,
+  on: OperationalState3.OperationalStateEnum.Running,
+  running: OperationalState3.OperationalStateEnum.Running,
+  active: OperationalState3.OperationalStateEnum.Running,
+  drying: OperationalState3.OperationalStateEnum.Running,
+  washing: OperationalState3.OperationalStateEnum.Running,
+  paused: OperationalState3.OperationalStateEnum.Paused,
+  complete: OperationalState3.OperationalStateEnum.Stopped,
+  finished: OperationalState3.OperationalStateEnum.Stopped
+};
+var DishwasherOperationalStateServer = class extends OperationalStateServer {
+  async initialize() {
+    this.state.operationalStateList = [
+      { operationalStateId: OperationalState3.OperationalStateEnum.Stopped },
+      { operationalStateId: OperationalState3.OperationalStateEnum.Running },
+      { operationalStateId: OperationalState3.OperationalStateEnum.Paused },
+      { operationalStateId: OperationalState3.OperationalStateEnum.Error }
+    ];
+    this.state.operationalState = OperationalState3.OperationalStateEnum.Stopped;
+    this.state.operationalError = {
+      errorStateId: OperationalState3.ErrorState.NoError
+    };
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    this.update(homeAssistant.entity);
+    this.reactTo(homeAssistant.onChange, this.update);
+  }
+  update(entity) {
+    if (!entity.state) {
+      return;
+    }
+    const haState = entity.state.state?.toLowerCase() ?? "off";
+    const newState = haStateToDishwasherState[haState] ?? OperationalState3.OperationalStateEnum.Stopped;
+    applyPatchState(this.state, {
+      operationalState: newState,
+      operationalError: {
+        errorStateId: OperationalState3.ErrorState.NoError
+      }
+    });
+  }
+  pause() {
+    return {
+      commandResponseState: {
+        errorStateId: OperationalState3.ErrorState.CommandInvalidInState
+      }
+    };
+  }
+  stop() {
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    homeAssistant.callAction({ action: "homeassistant.turn_off" });
+    return {
+      commandResponseState: {
+        errorStateId: OperationalState3.ErrorState.NoError
+      }
+    };
+  }
+  start() {
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    homeAssistant.callAction({ action: "homeassistant.turn_on" });
+    return {
+      commandResponseState: {
+        errorStateId: OperationalState3.ErrorState.NoError
+      }
+    };
+  }
+  resume() {
+    return this.start();
+  }
+};
+var DishwasherOnOffServer = OnOffServer2({
+  turnOn: () => ({
+    action: "homeassistant.turn_on"
+  }),
+  turnOff: () => ({
+    action: "homeassistant.turn_off"
+  })
+});
+var DishwasherDeviceType = DishwasherDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  DishwasherOperationalStateServer,
+  DishwasherOnOffServer
+);
+function DishwasherEndpoint(homeAssistantEntity) {
+  return DishwasherDeviceType.set({ homeAssistantEntity });
+}
+
 // src/matter/behaviors/generic-switch-server.ts
 init_esm();
 init_home_assistant_entity_behavior();
@@ -172218,6 +172348,12 @@ function consumePendingColorStaging(entityId) {
 var FeaturedBase8 = ColorControlServer.with("ColorTemperature", "HueSaturation");
 var ColorControlServerBase = class extends FeaturedBase8 {
   pendingTransitionTime;
+  async [Symbol.asyncDispose]() {
+    const entityId = this.agent.get(HomeAssistantEntityBehavior).entityId;
+    optimisticColorState.delete(entityId);
+    pendingColorStaging.delete(entityId);
+    await super[Symbol.asyncDispose]();
+  }
   async initialize() {
     if (this.features.colorTemperature) {
       const defaultMinMireds = 147;
@@ -175592,6 +175728,26 @@ function SensorDevice(homeAssistantEntity) {
   return void 0;
 }
 
+// src/matter/endpoints/legacy/siren/index.ts
+init_home_assistant_entity_behavior();
+var SirenOnOffServer = OnOffServer2({
+  turnOn: () => ({
+    action: "siren.turn_on"
+  }),
+  turnOff: () => ({
+    action: "siren.turn_off"
+  })
+});
+var SirenDeviceType = OnOffPlugInUnitDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  SirenOnOffServer
+);
+function SirenDevice(homeAssistantEntity) {
+  return SirenDeviceType.set({ homeAssistantEntity });
+}
+
 // src/matter/endpoints/legacy/switch/dimmable-plugin-unit.ts
 init_home_assistant_entity_behavior();
 var DimmablePlugInUnitType = DimmablePlugInUnitDevice.with(
@@ -178187,6 +178343,7 @@ var deviceCtrs = {
   select: SelectDevice,
   input_select: InputSelectDevice,
   scene: SceneDevice,
+  siren: SirenDevice,
   media_player: MediaPlayerDevice,
   humidifier: HumidifierDevice,
   vacuum: VacuumDevice,
@@ -178197,18 +178354,10 @@ var deviceCtrs = {
   event: EventDevice
 };
 var matterDeviceTypeFactories = {
-  on_off_light: (ha) => OnOffLightType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  dimmable_light: (ha) => DimmableLightType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  color_temperature_light: (ha) => ColorTemperatureLightType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  extended_color_light: (ha) => ExtendedColorLightType(true, true).set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
+  on_off_light: (ha) => OnOffLightType.set({ homeAssistantEntity: ha }),
+  dimmable_light: (ha) => DimmableLightType.set({ homeAssistantEntity: ha }),
+  color_temperature_light: (ha) => ColorTemperatureLightType.set({ homeAssistantEntity: ha }),
+  extended_color_light: (ha) => ExtendedColorLightType(true, true).set({ homeAssistantEntity: ha }),
   on_off_plugin_unit: (ha) => {
     const domain = ha.entity.entity_id.split(".")[0];
     if (domain === "alarm_control_panel") {
@@ -178216,9 +178365,8 @@ var matterDeviceTypeFactories = {
     }
     return SwitchDevice(ha);
   },
-  dimmable_plugin_unit: (ha) => DimmablePlugInUnitType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
+  dishwasher: DishwasherEndpoint,
+  dimmable_plugin_unit: (ha) => DimmablePlugInUnitType.set({ homeAssistantEntity: ha }),
   on_off_switch: SwitchDevice,
   door_lock: LockDevice,
   window_covering: CoverDevice,
@@ -178229,77 +178377,33 @@ var matterDeviceTypeFactories = {
   humidifier_dehumidifier: HumidifierDevice,
   speaker: MediaPlayerDevice,
   basic_video_player: VideoPlayerDevice,
-  humidity_sensor: (ha) => HumiditySensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  temperature_sensor: (ha) => TemperatureSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  pressure_sensor: (ha) => PressureSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  light_sensor: (ha) => IlluminanceSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  flow_sensor: (ha) => FlowSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  air_quality_sensor: (ha) => AirQualitySensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  battery_storage: (ha) => BatterySensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  tvoc_sensor: (ha) => TvocSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  carbon_monoxide_sensor: (ha) => CarbonMonoxideSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  nitrogen_dioxide_sensor: (ha) => NitrogenDioxideSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  ozone_sensor: (ha) => OzoneSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  formaldehyde_sensor: (ha) => FormaldehydeSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  radon_sensor: (ha) => RadonSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  pm1_sensor: (ha) => Pm1SensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  electrical_sensor: (ha) => ElectricalSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  contact_sensor: (ha) => ContactSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  motion_sensor: (ha) => MotionSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  occupancy_sensor: (ha) => OccupancySensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
+  humidity_sensor: (ha) => HumiditySensorType.set({ homeAssistantEntity: ha }),
+  temperature_sensor: (ha) => TemperatureSensorType.set({ homeAssistantEntity: ha }),
+  pressure_sensor: (ha) => PressureSensorType.set({ homeAssistantEntity: ha }),
+  light_sensor: (ha) => IlluminanceSensorType.set({ homeAssistantEntity: ha }),
+  flow_sensor: (ha) => FlowSensorType.set({ homeAssistantEntity: ha }),
+  air_quality_sensor: (ha) => AirQualitySensorType.set({ homeAssistantEntity: ha }),
+  battery_storage: (ha) => BatterySensorType.set({ homeAssistantEntity: ha }),
+  tvoc_sensor: (ha) => TvocSensorType.set({ homeAssistantEntity: ha }),
+  carbon_monoxide_sensor: (ha) => CarbonMonoxideSensorType.set({ homeAssistantEntity: ha }),
+  nitrogen_dioxide_sensor: (ha) => NitrogenDioxideSensorType.set({ homeAssistantEntity: ha }),
+  ozone_sensor: (ha) => OzoneSensorType.set({ homeAssistantEntity: ha }),
+  formaldehyde_sensor: (ha) => FormaldehydeSensorType.set({ homeAssistantEntity: ha }),
+  radon_sensor: (ha) => RadonSensorType.set({ homeAssistantEntity: ha }),
+  pm1_sensor: (ha) => Pm1SensorType.set({ homeAssistantEntity: ha }),
+  electrical_sensor: (ha) => ElectricalSensorType.set({ homeAssistantEntity: ha }),
+  contact_sensor: (ha) => ContactSensorType.set({ homeAssistantEntity: ha }),
+  motion_sensor: (ha) => MotionSensorType.set({ homeAssistantEntity: ha }),
+  occupancy_sensor: (ha) => OccupancySensorType.set({ homeAssistantEntity: ha }),
   mode_select: SelectDevice,
   water_valve: ValveDevice,
   pump: PumpEndpoint,
-  rain_sensor: (ha) => RainSensorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
+  rain_sensor: (ha) => RainSensorType.set({ homeAssistantEntity: ha }),
   water_heater: WaterHeaterDevice,
   generic_switch: EventDevice,
-  smoke_co_alarm: (ha) => SmokeAlarmType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  water_freeze_detector: (ha) => WaterFreezeDetectorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  }),
-  water_leak_detector: (ha) => WaterLeakDetectorType.set({
-    homeAssistantEntity: { entity: ha.entity, customName: ha.customName }
-  })
+  smoke_co_alarm: (ha) => SmokeAlarmType.set({ homeAssistantEntity: ha }),
+  water_freeze_detector: (ha) => WaterFreezeDetectorType.set({ homeAssistantEntity: ha }),
+  water_leak_detector: (ha) => WaterLeakDetectorType.set({ homeAssistantEntity: ha })
 };
 
 // src/matter/endpoints/composed/user-composed-endpoint.ts
@@ -183613,6 +183717,8 @@ export {
 @matter/main/dist/esm/clusters.js:
 @matter/main/dist/esm/forwards/behaviors/boolean-state.js:
 @matter/main/dist/esm/forwards/behaviors/smoke-co-alarm.js:
+@matter/main/dist/esm/forwards/behaviors/operational-state.js:
+@matter/main/dist/esm/forwards/clusters/operational-state.js:
 @matter/main/dist/esm/forwards/behaviors/color-control.js:
 @matter/main/dist/esm/forwards/behaviors/pump-configuration-and-control.js:
 @matter/main/dist/esm/forwards/clusters/mode-base.js: