@riddix/hamh 2.1.0-alpha.853 → 2.1.0-alpha.854

package/README.md

@@ -19,9 +19,9 @@
 ---
 
 > [!NOTE]
-> 🔀 **Community Fork** - This is a fork of the original [t0bst4r/home-assistant-matter-hub](https://github.com/t0bst4r/home-assistant-matter-hub), which was discontinued in January 2026. We continue active development with bug fixes, new features, and community support. Thank you **[@t0bst4r](https://github.com/t0bst4r)** for the original work! ❤️
+> 🔀 **Community Fork** - This is the actively maintained fork and successor of the original [t0bst4r/home-assistant-matter-hub](https://github.com/t0bst4r/home-assistant-matter-hub), which was discontinued in January 2026 and has since been archived. We continue active development with bug fixes, new features, and community support. Thank you **[@t0bst4r](https://github.com/t0bst4r)** for the original work! ❤️
 >
-> **📦 Migrating?** See [Migration Guide](#migration-from-t0bst4r) - your paired devices will continue to work!
+> **📦 Migrating?** See [Migration Guide](#migration-from-t0bst4r) - your paired devices will continue to work! For a side-by-side feature list, see the [fork comparison](https://riddix.github.io/home-assistant-matter-hub/getting-started/fork-comparison). The add-on slugs are `hamh` (stable), `hamh-alpha` and `hamh-testing`.
 
 ---
 

package/dist/backend/cli.js

@@ -133493,6 +133493,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     lockPinMaxLength: config8.lockPinMaxLength,
                     powerEntity: config8.powerEntity,
                     energyEntity: config8.energyEntity,
+                    meterSerialNumber: config8.meterSerialNumber,
+                    pointOfDelivery: config8.pointOfDelivery,
                     voltageEntity: config8.voltageEntity,
                     currentEntity: config8.currentEntity,
                     batteryPowerEntity: config8.batteryPowerEntity,
@@ -133657,6 +133659,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                   lockPinMaxLength: config8.lockPinMaxLength,
                   powerEntity: config8.powerEntity,
                   energyEntity: config8.energyEntity,
+                  meterSerialNumber: config8.meterSerialNumber,
+                  pointOfDelivery: config8.pointOfDelivery,
                   voltageEntity: config8.voltageEntity,
                   currentEntity: config8.currentEntity,
                   batteryPowerEntity: config8.batteryPowerEntity,
@@ -134512,6 +134516,8 @@ function entityMappingApi(mappingStorage, identityStorage) {
       lockPinMaxLength: body.lockPinMaxLength,
       powerEntity: body.powerEntity,
       energyEntity: body.energyEntity,
+      meterSerialNumber: body.meterSerialNumber,
+      pointOfDelivery: body.pointOfDelivery,
       voltageEntity: body.voltageEntity,
       currentEntity: body.currentEntity,
       batteryPowerEntity: body.batteryPowerEntity,
@@ -135016,6 +135022,8 @@ function configToProfileEntry(config8) {
     lockPinMaxLength: config8.lockPinMaxLength,
     powerEntity: config8.powerEntity,
     energyEntity: config8.energyEntity,
+    meterSerialNumber: config8.meterSerialNumber,
+    pointOfDelivery: config8.pointOfDelivery,
     voltageEntity: config8.voltageEntity,
     currentEntity: config8.currentEntity,
     batteryPowerEntity: config8.batteryPowerEntity,
@@ -135158,6 +135166,8 @@ function mappingProfileApi(mappingStorage) {
           lockPinMaxLength: entry.lockPinMaxLength,
           powerEntity: entry.powerEntity,
           energyEntity: entry.energyEntity,
+          meterSerialNumber: entry.meterSerialNumber,
+          pointOfDelivery: entry.pointOfDelivery,
           voltageEntity: entry.voltageEntity,
           currentEntity: entry.currentEntity,
           batteryPowerEntity: entry.batteryPowerEntity,
@@ -139936,6 +139946,8 @@ var EntityMappingStorage = class extends Service {
       lockPinMaxLength: pinLengths.max,
       powerEntity: request.powerEntity?.trim() || void 0,
       energyEntity: request.energyEntity?.trim() || void 0,
+      meterSerialNumber: request.meterSerialNumber?.trim() || void 0,
+      pointOfDelivery: request.pointOfDelivery?.trim() || void 0,
       voltageEntity: request.voltageEntity?.trim() || void 0,
       currentEntity: request.currentEntity?.trim() || void 0,
       batteryPowerEntity: request.batteryPowerEntity?.trim() || void 0,
@@ -139971,7 +139983,7 @@ var EntityMappingStorage = class extends Service {
       composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? void 0,
       disableMomentaryFlip: request.disableMomentaryFlip || void 0
     };
-    if (!config8.matterDeviceType && !config8.customName && !config8.customProductName && !config8.customVendorName && !config8.customSerialNumber && config8.customVendorId === void 0 && config8.disabled !== true && !config8.filterLifeEntity && !config8.cleaningModeEntity && !config8.temperatureEntity && !config8.humidityEntity && !config8.batteryEntity && !config8.disableBatteryMapping && !config8.chargingStateEntity && !config8.roomEntities && !config8.disableLockPin && !config8.lockUsercodeService && config8.lockUsercodeSlot === void 0 && config8.lockPinMinLength === void 0 && config8.lockPinMaxLength === void 0 && !config8.powerEntity && !config8.energyEntity && !config8.voltageEntity && !config8.currentEntity && !config8.batteryPowerEntity && !config8.batteryEnergyEntity && !config8.chargingSwitchEntity && !config8.currentLimitEntity && !config8.pressureEntity && !config8.suctionLevelEntity && !config8.mopIntensityEntity && (!config8.customServiceAreas || config8.customServiceAreas.length === 0) && (!config8.customFanSpeedTags || Object.keys(config8.customFanSpeedTags).length === 0) && (!config8.fanWindPresets || (config8.fanWindPresets.natural?.length ?? 0) === 0 && (config8.fanWindPresets.sleep?.length ?? 0) === 0) && !config8.fanRestoreSpeedOnPowerOn && !config8.currentRoomEntity && !config8.cleanedAreaEntity && !config8.vacuumAscendingRoomOrder && !config8.disableCustomAreaRoomModes && !config8.valetudoIdentifier && !config8.coverSwapOpenClose && !config8.coverExposeAsDimmableLight && !config8.selectExposeAsSwitch && !config8.selectSwitchOnOption && !config8.selectSwitchOffOption && !config8.coverSliderDebounceMs && !config8.updateThrottleMs && !config8.disableClimateOnOff && !config8.disableClimateFanControl && !config8.climateKeepModeOnIdle && !config8.climateExposeFan && !config8.climateAutoMode && (!config8.composedEntities || config8.composedEntities.length === 0) && !config8.disableMomentaryFlip) {
+    if (!config8.matterDeviceType && !config8.customName && !config8.customProductName && !config8.customVendorName && !config8.customSerialNumber && config8.customVendorId === void 0 && config8.disabled !== true && !config8.filterLifeEntity && !config8.cleaningModeEntity && !config8.temperatureEntity && !config8.humidityEntity && !config8.batteryEntity && !config8.disableBatteryMapping && !config8.chargingStateEntity && !config8.roomEntities && !config8.disableLockPin && !config8.lockUsercodeService && config8.lockUsercodeSlot === void 0 && config8.lockPinMinLength === void 0 && config8.lockPinMaxLength === void 0 && !config8.powerEntity && !config8.energyEntity && !config8.meterSerialNumber && !config8.pointOfDelivery && !config8.voltageEntity && !config8.currentEntity && !config8.batteryPowerEntity && !config8.batteryEnergyEntity && !config8.chargingSwitchEntity && !config8.currentLimitEntity && !config8.pressureEntity && !config8.suctionLevelEntity && !config8.mopIntensityEntity && (!config8.customServiceAreas || config8.customServiceAreas.length === 0) && (!config8.customFanSpeedTags || Object.keys(config8.customFanSpeedTags).length === 0) && (!config8.fanWindPresets || (config8.fanWindPresets.natural?.length ?? 0) === 0 && (config8.fanWindPresets.sleep?.length ?? 0) === 0) && !config8.fanRestoreSpeedOnPowerOn && !config8.currentRoomEntity && !config8.cleanedAreaEntity && !config8.vacuumAscendingRoomOrder && !config8.disableCustomAreaRoomModes && !config8.valetudoIdentifier && !config8.coverSwapOpenClose && !config8.coverExposeAsDimmableLight && !config8.selectExposeAsSwitch && !config8.selectSwitchOnOption && !config8.selectSwitchOffOption && !config8.coverSliderDebounceMs && !config8.updateThrottleMs && !config8.disableClimateOnOff && !config8.disableClimateFanControl && !config8.climateKeepModeOnIdle && !config8.climateExposeFan && !config8.climateAutoMode && (!config8.composedEntities || config8.composedEntities.length === 0) && !config8.disableMomentaryFlip) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config8);
@@ -149611,6 +149623,7 @@ var DoorbellDeviceDefinition = MutableEndpoint({
   behaviors: SupportedBehaviors(DoorbellRequirements.server.mandatory.Identify)
 });
 Object.freeze(DoorbellDeviceDefinition);
+var DoorbellDevice = DoorbellDeviceDefinition;
 
 // ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/commodity-price.js
 init_ClusterType();
@@ -149834,6 +149847,7 @@ var ElectricalUtilityMeterDeviceDefinition = MutableEndpoint({
   behaviors: SupportedBehaviors(ElectricalUtilityMeterRequirements.server.mandatory.MeterIdentification)
 });
 Object.freeze(ElectricalUtilityMeterDeviceDefinition);
+var ElectricalUtilityMeterDevice = ElectricalUtilityMeterDeviceDefinition;
 
 // ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/energy-evse.js
 init_ClusterType();
@@ -164991,6 +165005,9 @@ var HaGenericSwitchServer = HaGenericSwitchServerMultiBase.set({
   multiPressMax: 3
 });
 
+// src/matter/endpoints/legacy/event/doorbell.ts
+init_home_assistant_entity_behavior();
+
 // src/matter/endpoints/legacy/event/index.ts
 init_home_assistant_entity_behavior();
 var EventEndpointTypeMulti = GenericSwitchDevice.with(
@@ -165033,6 +165050,33 @@ function EventDevice(homeAssistantEntity) {
   });
 }
 
+// src/matter/endpoints/legacy/event/doorbell.ts
+var DoorbellEndpointTypeMulti = DoorbellDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  HaGenericSwitchServer
+);
+var DoorbellEndpointTypeSimple = DoorbellDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  HaGenericSwitchServerSimple
+);
+function DoorbellDevice2(homeAssistantEntity) {
+  const attrs = homeAssistantEntity.entity.state.attributes;
+  const multiPressMax = detectMultiPressMax(attrs.event_types ?? []);
+  if (multiPressMax >= 2) {
+    return DoorbellEndpointTypeMulti.set({
+      homeAssistantEntity,
+      switch: { multiPressMax }
+    });
+  }
+  return DoorbellEndpointTypeSimple.set({
+    homeAssistantEntity
+  });
+}
+
 // src/matter/endpoints/legacy/fan/index.ts
 init_dist();
 init_home_assistant_entity_behavior();
@@ -168613,6 +168657,38 @@ var ElectricalMeterType = ElectricalMeterDevice.with(
   HaPowerTopologyServer
 );
 
+// src/matter/endpoints/legacy/sensor/devices/electrical-utility-meter.ts
+init_home_assistant_entity_behavior();
+var HaMeterIdentificationServer = class extends MeterIdentificationServer {
+  async initialize() {
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    const mapping = homeAssistant.state.mapping;
+    applyPatchState(this.state, {
+      meterSerialNumber: mapping?.meterSerialNumber ?? null,
+      pointOfDelivery: mapping?.pointOfDelivery ?? null
+    });
+  }
+};
+((HaMeterIdentificationServer2) => {
+  class State extends MeterIdentificationServer.State {
+  }
+  HaMeterIdentificationServer2.State = State;
+})(HaMeterIdentificationServer || (HaMeterIdentificationServer = {}));
+var ElectricalUtilityMeterType = ElectricalUtilityMeterDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  HaMeterIdentificationServer.set({
+    meterType: null,
+    pointOfDelivery: null,
+    meterSerialNumber: null
+  }),
+  PowerServer,
+  EnergyServer,
+  HaPowerTopologyServer
+);
+
 // src/matter/endpoints/legacy/sensor/devices/energy-evse.ts
 init_esm();
 init_home_assistant_actions();
@@ -173433,6 +173509,8 @@ var matterDeviceTypeFactories = {
   // Legacy SolarPower alias, kept for existing mappings.
   electrical_sensor: (ha) => ElectricalSensorType.set({ homeAssistantEntity: ha }),
   solar_power: (ha) => ElectricalSensorType.set({ homeAssistantEntity: ha }),
+  // Matter 1.4 utility meter (0x0511), opt-in so existing pairings keep 0x0514.
+  electrical_utility_meter: (ha) => ElectricalUtilityMeterType.set({ homeAssistantEntity: ha }),
   evse: (ha) => energyEvseType().set({ homeAssistantEntity: ha }),
   contact_sensor: (ha) => ContactSensorType.set({ homeAssistantEntity: ha }),
   motion_sensor: (ha) => MotionSensorType.set({ homeAssistantEntity: ha }),
@@ -173444,6 +173522,7 @@ var matterDeviceTypeFactories = {
   water_heater: WaterHeaterDevice2,
   water_heater_management: WaterHeaterManagementDevice,
   generic_switch: EventDevice,
+  doorbell: DoorbellDevice2,
   smoke_co_alarm: (ha) => SmokeAlarmType.set({ homeAssistantEntity: ha }),
   water_freeze_detector: (ha) => WaterFreezeDetectorType.set({ homeAssistantEntity: ha }),
   water_leak_detector: (ha) => WaterLeakDetectorType.set({ homeAssistantEntity: ha })