@riddix/hamh 2.1.0-alpha.831 → 2.1.0-alpha.832

package/dist/backend/cli.js

@@ -130689,7 +130689,14 @@ var init_controller_compat = __esm({
         google: "no",
         alexa: "unknown",
         aqara: "unknown",
-        note: "Power/energy is rarely shown unless it is on a smart plug."
+        note: "SolarPower is only rendered standalone by SmartThings today."
+      },
+      1300: {
+        apple: "no",
+        google: "yes",
+        alexa: "no",
+        aqara: "unknown",
+        note: "ElectricalMeter shows in Google Home and SmartThings; Apple and Alexa do not surface standalone power/energy."
       },
       24: {
         apple: "no",
@@ -132628,6 +132635,10 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     lockPinMaxLength: config11.lockPinMaxLength,
                     powerEntity: config11.powerEntity,
                     energyEntity: config11.energyEntity,
+                    voltageEntity: config11.voltageEntity,
+                    currentEntity: config11.currentEntity,
+                    batteryPowerEntity: config11.batteryPowerEntity,
+                    batteryEnergyEntity: config11.batteryEnergyEntity,
                     suctionLevelEntity: config11.suctionLevelEntity,
                     mopIntensityEntity: config11.mopIntensityEntity,
                     valetudoIdentifier: config11.valetudoIdentifier,
@@ -132785,6 +132796,10 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                   lockPinMaxLength: config11.lockPinMaxLength,
                   powerEntity: config11.powerEntity,
                   energyEntity: config11.energyEntity,
+                  voltageEntity: config11.voltageEntity,
+                  currentEntity: config11.currentEntity,
+                  batteryPowerEntity: config11.batteryPowerEntity,
+                  batteryEnergyEntity: config11.batteryEnergyEntity,
                   suctionLevelEntity: config11.suctionLevelEntity,
                   mopIntensityEntity: config11.mopIntensityEntity,
                   temperatureEntity: config11.temperatureEntity,
@@ -133633,6 +133648,10 @@ function entityMappingApi(mappingStorage, identityStorage) {
       lockPinMaxLength: body.lockPinMaxLength,
       powerEntity: body.powerEntity,
       energyEntity: body.energyEntity,
+      voltageEntity: body.voltageEntity,
+      currentEntity: body.currentEntity,
+      batteryPowerEntity: body.batteryPowerEntity,
+      batteryEnergyEntity: body.batteryEnergyEntity,
       suctionLevelEntity: body.suctionLevelEntity,
       mopIntensityEntity: body.mopIntensityEntity,
       customServiceAreas: body.customServiceAreas,
@@ -134130,6 +134149,10 @@ function configToProfileEntry(config11) {
     lockPinMaxLength: config11.lockPinMaxLength,
     powerEntity: config11.powerEntity,
     energyEntity: config11.energyEntity,
+    voltageEntity: config11.voltageEntity,
+    currentEntity: config11.currentEntity,
+    batteryPowerEntity: config11.batteryPowerEntity,
+    batteryEnergyEntity: config11.batteryEnergyEntity,
     suctionLevelEntity: config11.suctionLevelEntity,
     mopIntensityEntity: config11.mopIntensityEntity,
     customServiceAreas: config11.customServiceAreas,
@@ -134265,6 +134288,10 @@ function mappingProfileApi(mappingStorage) {
           lockPinMaxLength: entry.lockPinMaxLength,
           powerEntity: entry.powerEntity,
           energyEntity: entry.energyEntity,
+          voltageEntity: entry.voltageEntity,
+          currentEntity: entry.currentEntity,
+          batteryPowerEntity: entry.batteryPowerEntity,
+          batteryEnergyEntity: entry.batteryEnergyEntity,
           suctionLevelEntity: entry.suctionLevelEntity,
           mopIntensityEntity: entry.mopIntensityEntity,
           customServiceAreas: entry.customServiceAreas,
@@ -138581,6 +138608,10 @@ var EntityMappingStorage = class extends Service {
       lockPinMaxLength: pinLengths.max,
       powerEntity: request.powerEntity?.trim() || void 0,
       energyEntity: request.energyEntity?.trim() || void 0,
+      voltageEntity: request.voltageEntity?.trim() || void 0,
+      currentEntity: request.currentEntity?.trim() || void 0,
+      batteryPowerEntity: request.batteryPowerEntity?.trim() || void 0,
+      batteryEnergyEntity: request.batteryEnergyEntity?.trim() || void 0,
       pressureEntity: request.pressureEntity?.trim() || void 0,
       suctionLevelEntity: request.suctionLevelEntity?.trim() || void 0,
       mopIntensityEntity: request.mopIntensityEntity?.trim() || void 0,
@@ -138609,7 +138640,7 @@ var EntityMappingStorage = class extends Service {
       composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? void 0,
       disableMomentaryFlip: request.disableMomentaryFlip || void 0
     };
-    if (!config11.matterDeviceType && !config11.customName && !config11.customProductName && !config11.customVendorName && !config11.customSerialNumber && config11.customVendorId === void 0 && config11.disabled !== true && !config11.filterLifeEntity && !config11.cleaningModeEntity && !config11.temperatureEntity && !config11.humidityEntity && !config11.batteryEntity && !config11.disableBatteryMapping && !config11.chargingStateEntity && !config11.roomEntities && !config11.disableLockPin && !config11.lockUsercodeService && config11.lockUsercodeSlot === void 0 && config11.lockPinMinLength === void 0 && config11.lockPinMaxLength === void 0 && !config11.powerEntity && !config11.energyEntity && !config11.pressureEntity && !config11.suctionLevelEntity && !config11.mopIntensityEntity && (!config11.customServiceAreas || config11.customServiceAreas.length === 0) && (!config11.customFanSpeedTags || Object.keys(config11.customFanSpeedTags).length === 0) && (!config11.fanWindPresets || (config11.fanWindPresets.natural?.length ?? 0) === 0 && (config11.fanWindPresets.sleep?.length ?? 0) === 0) && !config11.fanRestoreSpeedOnPowerOn && !config11.currentRoomEntity && !config11.cleanedAreaEntity && !config11.disableCustomAreaRoomModes && !config11.valetudoIdentifier && !config11.coverSwapOpenClose && !config11.coverExposeAsDimmableLight && !config11.selectExposeAsSwitch && !config11.selectSwitchOnOption && !config11.selectSwitchOffOption && !config11.coverSliderDebounceMs && !config11.updateThrottleMs && !config11.disableClimateOnOff && !config11.disableClimateFanControl && !config11.climateKeepModeOnIdle && !config11.climateExposeFan && !config11.climateAutoMode && (!config11.composedEntities || config11.composedEntities.length === 0) && !config11.disableMomentaryFlip) {
+    if (!config11.matterDeviceType && !config11.customName && !config11.customProductName && !config11.customVendorName && !config11.customSerialNumber && config11.customVendorId === void 0 && config11.disabled !== true && !config11.filterLifeEntity && !config11.cleaningModeEntity && !config11.temperatureEntity && !config11.humidityEntity && !config11.batteryEntity && !config11.disableBatteryMapping && !config11.chargingStateEntity && !config11.roomEntities && !config11.disableLockPin && !config11.lockUsercodeService && config11.lockUsercodeSlot === void 0 && config11.lockPinMinLength === void 0 && config11.lockPinMaxLength === void 0 && !config11.powerEntity && !config11.energyEntity && !config11.voltageEntity && !config11.currentEntity && !config11.batteryPowerEntity && !config11.batteryEnergyEntity && !config11.pressureEntity && !config11.suctionLevelEntity && !config11.mopIntensityEntity && (!config11.customServiceAreas || config11.customServiceAreas.length === 0) && (!config11.customFanSpeedTags || Object.keys(config11.customFanSpeedTags).length === 0) && (!config11.fanWindPresets || (config11.fanWindPresets.natural?.length ?? 0) === 0 && (config11.fanWindPresets.sleep?.length ?? 0) === 0) && !config11.fanRestoreSpeedOnPowerOn && !config11.currentRoomEntity && !config11.cleanedAreaEntity && !config11.disableCustomAreaRoomModes && !config11.valetudoIdentifier && !config11.coverSwapOpenClose && !config11.coverExposeAsDimmableLight && !config11.selectExposeAsSwitch && !config11.selectSwitchOnOption && !config11.selectSwitchOffOption && !config11.coverSliderDebounceMs && !config11.updateThrottleMs && !config11.disableClimateOnOff && !config11.disableClimateFanControl && !config11.climateKeepModeOnIdle && !config11.climateExposeFan && !config11.climateAutoMode && (!config11.composedEntities || config11.composedEntities.length === 0) && !config11.disableMomentaryFlip) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config11);
@@ -148423,6 +148454,7 @@ var ElectricalMeterDeviceDefinition = MutableEndpoint({
   behaviors: SupportedBehaviors()
 });
 Object.freeze(ElectricalMeterDeviceDefinition);
+var ElectricalMeterDevice = ElectricalMeterDeviceDefinition;
 
 // ../../node_modules/.pnpm/@matter+types@0.17.5/node_modules/@matter/types/dist/esm/clusters/meter-identification.js
 init_ClusterType();
@@ -157144,6 +157176,10 @@ function getMappedEntityIds(mapping) {
   if (mapping.filterLifeEntity) ids.push(mapping.filterLifeEntity);
   if (mapping.powerEntity) ids.push(mapping.powerEntity);
   if (mapping.energyEntity) ids.push(mapping.energyEntity);
+  if (mapping.voltageEntity) ids.push(mapping.voltageEntity);
+  if (mapping.currentEntity) ids.push(mapping.currentEntity);
+  if (mapping.batteryPowerEntity) ids.push(mapping.batteryPowerEntity);
+  if (mapping.batteryEnergyEntity) ids.push(mapping.batteryEnergyEntity);
   if (mapping.currentRoomEntity) ids.push(mapping.currentRoomEntity);
   if (mapping.cleanedAreaEntity) ids.push(mapping.cleanedAreaEntity);
   if (mapping.composedEntities) {
@@ -157586,7 +157622,8 @@ var HaElectricalEnergyMeasurementServer = ElectricalEnergyMeasurementServerBase.
 init_esm();
 init_home_assistant_entity_behavior();
 var logger203 = Logger.get("ElectricalPowerMeasurementServer");
-var ElectricalPowerMeasurementServerBase = class extends ElectricalPowerMeasurementServer {
+var FeaturedBase2 = ElectricalPowerMeasurementServer.with("AlternatingCurrent");
+var ElectricalPowerMeasurementServerBase = class extends FeaturedBase2 {
   async initialize() {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -157602,23 +157639,38 @@ var ElectricalPowerMeasurementServerBase = class extends ElectricalPowerMeasurem
   }
   update() {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    const powerEntity = homeAssistant.state.mapping?.powerEntity;
-    if (!powerEntity) return;
+    const mapping = homeAssistant.state.mapping;
+    const powerEntity = mapping?.powerEntity;
+    const voltageEntity = mapping?.voltageEntity;
+    const currentEntity = mapping?.currentEntity;
+    if (!powerEntity && !voltageEntity && !currentEntity) return;
     const stateProvider = this.agent.env.get(EntityStateProvider);
-    const powerWatts = stateProvider.getNumericState(powerEntity);
-    if (powerWatts == null) return;
-    const activePower = Math.round(powerWatts * 1e3);
-    applyPatchState(this.state, { activePower });
+    const patch = {};
+    if (powerEntity) {
+      const powerWatts = stateProvider.getNumericState(powerEntity);
+      if (powerWatts != null) patch.activePower = Math.round(powerWatts * 1e3);
+    }
+    if (voltageEntity) {
+      const volts = stateProvider.getNumericState(voltageEntity);
+      if (volts != null) patch.voltage = Math.round(volts * 1e3);
+    }
+    if (currentEntity) {
+      const amps = stateProvider.getNumericState(currentEntity);
+      if (amps != null) patch.activeCurrent = Math.round(amps * 1e3);
+    }
+    if (Object.keys(patch).length > 0) applyPatchState(this.state, patch);
   }
 };
 ((ElectricalPowerMeasurementServerBase2) => {
-  class State extends ElectricalPowerMeasurementServer.State {
+  class State extends FeaturedBase2.State {
   }
   ElectricalPowerMeasurementServerBase2.State = State;
 })(ElectricalPowerMeasurementServerBase || (ElectricalPowerMeasurementServerBase = {}));
 var HaElectricalPowerMeasurementServer = ElectricalPowerMeasurementServerBase.set({
   powerMode: ElectricalPowerMeasurement3.PowerMode.Ac,
-  numberOfMeasurementTypes: 1,
+  // Voltage and current are folded onto this endpoint when mapped, so the
+  // accuracy list carries an entry for each reported measurement type.
+  numberOfMeasurementTypes: 3,
   accuracy: [
     {
       measurementType: ElectricalPowerMeasurement3.MeasurementType.ActivePower,
@@ -157635,6 +157687,37 @@ var HaElectricalPowerMeasurementServer = ElectricalPowerMeasurementServerBase.se
           // 1W accuracy
         }
       ]
+    },
+    {
+      measurementType: ElectricalPowerMeasurement3.MeasurementType.Voltage,
+      measured: true,
+      minMeasuredValue: 0,
+      maxMeasuredValue: 1e6,
+      // 1000V in mV
+      accuracyRanges: [
+        {
+          rangeMin: 0,
+          rangeMax: 1e6,
+          fixedMax: 1e3
+          // 1V accuracy
+        }
+      ]
+    },
+    {
+      measurementType: ElectricalPowerMeasurement3.MeasurementType.ActiveCurrent,
+      measured: true,
+      minMeasuredValue: -1e6,
+      // -1000A in mA
+      maxMeasuredValue: 1e6,
+      // 1000A in mA
+      accuracyRanges: [
+        {
+          rangeMin: -1e6,
+          rangeMax: 1e6,
+          fixedMax: 1e3
+          // 1A accuracy
+        }
+      ]
     }
   ]
 });
@@ -157730,8 +157813,8 @@ function HumidityMeasurementServer(config11) {
 init_esm();
 init_home_assistant_entity_behavior();
 var logger205 = Logger.get("PowerSourceServer");
-var FeaturedBase2 = PowerSourceServer.with("Battery", "Rechargeable");
-var PowerSourceServerBase = class extends FeaturedBase2 {
+var FeaturedBase3 = PowerSourceServer.with("Battery", "Rechargeable");
+var PowerSourceServerBase = class extends FeaturedBase3 {
   async initialize() {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -157809,7 +157892,7 @@ var PowerSourceServerBase = class extends FeaturedBase2 {
   }
 };
 ((PowerSourceServerBase2) => {
-  class State extends FeaturedBase2.State {
+  class State extends FeaturedBase3.State {
     config;
   }
   PowerSourceServerBase2.State = State;
@@ -157890,8 +157973,8 @@ function TemperatureMeasurementServer2(config11) {
 
 // src/matter/behaviors/hepa-filter-monitoring-server.ts
 init_home_assistant_entity_behavior();
-var FeaturedBase3 = HepaFilterMonitoringServer.with("Condition", "Warning");
-var HepaFilterMonitoringServerBase = class extends FeaturedBase3 {
+var FeaturedBase4 = HepaFilterMonitoringServer.with("Condition", "Warning");
+var HepaFilterMonitoringServerBase = class extends FeaturedBase4 {
   async initialize() {
     this.state.condition = 100;
     this.state.degradationDirection = ResourceMonitoring3.DegradationDirection.Down;
@@ -157928,7 +158011,7 @@ var HepaFilterMonitoringServerBase = class extends FeaturedBase3 {
   }
 };
 ((HepaFilterMonitoringServerBase2) => {
-  class State extends FeaturedBase3.State {
+  class State extends FeaturedBase4.State {
     config;
   }
   HepaFilterMonitoringServerBase2.State = State;
@@ -158186,8 +158269,8 @@ function notifyLightTurnedOn(entityId) {
   lastTurnOnTimestamps.set(entityId, now);
 }
 var logger206 = Logger.get("LevelControlServer");
-var FeaturedBase4 = LevelControlServer.with("OnOff", "Lighting");
-var LevelControlServerBase = class extends FeaturedBase4 {
+var FeaturedBase5 = LevelControlServer.with("OnOff", "Lighting");
+var LevelControlServerBase = class extends FeaturedBase5 {
   pendingTransitionTime;
   async initialize() {
     if (this.state.currentLevel == null) {
@@ -158344,7 +158427,7 @@ var LevelControlServerBase = class extends FeaturedBase4 {
   }
 };
 ((LevelControlServerBase2) => {
-  class State extends FeaturedBase4.State {
+  class State extends FeaturedBase5.State {
     config;
   }
   LevelControlServerBase2.State = State;
@@ -158486,7 +158569,7 @@ var logger208 = Logger.get("FanControlServer");
 var defaultStepSize = 33.33;
 var minSpeedMax = 3;
 var maxSpeedMax = 100;
-var FeaturedBase5 = FanControlServer.with(
+var FeaturedBase6 = FanControlServer.with(
   "Step",
   "MultiSpeed",
   "AirflowDirection",
@@ -158496,7 +158579,7 @@ var FeaturedBase5 = FanControlServer.with(
 ).set({
   windSupport: { naturalWind: true, sleepWind: true }
 });
-var FanControlServerBase = class extends FeaturedBase5 {
+var FanControlServerBase = class extends FeaturedBase6 {
   // Fallback last-speed tracking for endpoints without FanSpeedMemoryBehavior
   // (climate companion, humidifier). matter.js builds behavior instances per
   // transaction, so these fields only live within one interaction; fans use
@@ -158949,7 +159032,7 @@ var FanControlServerBase = class extends FeaturedBase5 {
   }
 };
 ((FanControlServerBase2) => {
-  class State extends FeaturedBase5.State {
+  class State extends FeaturedBase6.State {
     config;
   }
   FanControlServerBase2.State = State;
@@ -161951,7 +162034,7 @@ init_home_assistant_actions();
 init_home_assistant_entity_behavior();
 var logger216 = Logger.get("WindowCoveringServer");
 var MovementStatus = WindowCovering3.MovementStatus;
-var FeaturedBase6 = WindowCoveringServer.with(
+var FeaturedBase7 = WindowCoveringServer.with(
   "Lift",
   "PositionAwareLift",
   "Tilt",
@@ -161987,7 +162070,7 @@ function clearPendingTilt(st) {
   }
   st.pendingTilt = null;
 }
-var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedBase6 {
+var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedBase7 {
   // Written and read within one synchronous command (upOrOpen fires lift then
   // tilt on the same instance), so these stay as instance fields (#246).
   lastLiftMovementMs = 0;
@@ -162296,7 +162379,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
   }
 };
 ((WindowCoveringServerBase2) => {
-  class State extends FeaturedBase6.State {
+  class State extends FeaturedBase7.State {
     config;
   }
   WindowCoveringServerBase2.State = State;
@@ -164008,8 +164091,8 @@ function consumePendingColorStaging(entityId) {
   pendingColorStaging.delete(entityId);
   return data;
 }
-var FeaturedBase7 = ColorControlServer.with("ColorTemperature", "HueSaturation", "Xy");
-var ColorControlServerBase = class extends FeaturedBase7 {
+var FeaturedBase8 = ColorControlServer.with("ColorTemperature", "HueSaturation", "Xy");
+var ColorControlServerBase = class extends FeaturedBase8 {
   pendingTransitionTime;
   async [Symbol.asyncDispose]() {
     const entityId = this.agent.get(HomeAssistantEntityBehavior).entityId;
@@ -164354,7 +164437,7 @@ var ColorControlServerBase = class extends FeaturedBase7 {
   }
 };
 ((ColorControlServerBase2) => {
-  class State extends FeaturedBase7.State {
+  class State extends FeaturedBase8.State {
     config;
   }
   ColorControlServerBase2.State = State;
@@ -164571,11 +164654,12 @@ function LightDevice(homeAssistantEntity) {
   ) : supportsBrightness ? hasBattery ? DimmableLightWithBatteryType : DimmableLightType : hasBattery ? OnOffLightWithBatteryType : OnOffLightType;
   const hasPowerEntity = !!homeAssistantEntity.mapping?.powerEntity;
   const hasEnergyEntity = !!homeAssistantEntity.mapping?.energyEntity;
+  const hasElectricalPower = hasPowerEntity || !!homeAssistantEntity.mapping?.voltageEntity || !!homeAssistantEntity.mapping?.currentEntity;
   let device = deviceType;
-  if (hasPowerEntity || hasEnergyEntity) {
+  if (hasElectricalPower || hasEnergyEntity) {
     device = device.with(HaPowerTopologyServer);
   }
-  if (hasPowerEntity) {
+  if (hasElectricalPower) {
     device = device.with(HaElectricalPowerMeasurementServer);
   }
   if (hasEnergyEntity) {
@@ -165607,8 +165691,8 @@ function sweepOptimisticLevel2(now) {
     }
   }
 }
-var FeaturedBase8 = LevelControlServer.with("OnOff");
-var SpeakerLevelControlServerBase = class extends FeaturedBase8 {
+var FeaturedBase9 = LevelControlServer.with("OnOff");
+var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
   async initialize() {
     if (this.state.currentLevel == null) {
       this.state.currentLevel = 0;
@@ -165710,7 +165794,7 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase8 {
   }
 };
 ((SpeakerLevelControlServerBase2) => {
-  class State extends FeaturedBase8.State {
+  class State extends FeaturedBase9.State {
     config;
   }
   SpeakerLevelControlServerBase2.State = State;
@@ -166144,6 +166228,126 @@ var BatterySensorType = BatteryStorageDevice.with(
   })
 );
 
+// src/matter/endpoints/legacy/sensor/devices/battery-storage-ess.ts
+init_home_assistant_entity_behavior();
+var PowerFeaturedBase = ElectricalPowerMeasurementServer.with("DirectCurrent");
+var EssPowerServer = class extends PowerFeaturedBase {
+  async initialize() {
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    this.update();
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
+  }
+  update() {
+    const mapping = this.agent.get(HomeAssistantEntityBehavior).state.mapping;
+    const powerEntity = mapping?.batteryPowerEntity;
+    if (!powerEntity) return;
+    const stateProvider = this.agent.env.get(EntityStateProvider);
+    const watts = stateProvider.getNumericState(powerEntity);
+    if (watts == null) return;
+    applyPatchState(this.state, { activePower: Math.round(watts * -1e3) });
+  }
+};
+((EssPowerServer2) => {
+  class State extends PowerFeaturedBase.State {
+  }
+  EssPowerServer2.State = State;
+})(EssPowerServer || (EssPowerServer = {}));
+var EssPower = EssPowerServer.set({
+  powerMode: ElectricalPowerMeasurement3.PowerMode.Dc,
+  numberOfMeasurementTypes: 1,
+  // Seed 0 so the cluster reports a value before the first update (SmartThings).
+  activePower: 0,
+  accuracy: [
+    {
+      measurementType: ElectricalPowerMeasurement3.MeasurementType.ActivePower,
+      measured: true,
+      // Wide symmetric range: batteries both charge (negative) and discharge.
+      minMeasuredValue: -1e8,
+      maxMeasuredValue: 1e8,
+      accuracyRanges: [
+        {
+          rangeMin: -1e8,
+          rangeMax: 1e8,
+          fixedMax: 1e3
+        }
+      ]
+    }
+  ]
+});
+var EnergyFeaturedBase = ElectricalEnergyMeasurementServer.with(
+  "CumulativeEnergy",
+  "ImportedEnergy"
+);
+var EssEnergyServer = class extends EnergyFeaturedBase {
+  async initialize() {
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    this.update();
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
+  }
+  update() {
+    const mapping = this.agent.get(HomeAssistantEntityBehavior).state.mapping;
+    const energyEntity = mapping?.batteryEnergyEntity;
+    if (!energyEntity) return;
+    const stateProvider = this.agent.env.get(EntityStateProvider);
+    const kwh = stateProvider.getNumericState(energyEntity);
+    if (kwh == null) return;
+    const energyImported = { energy: Math.round(kwh * 1e6) };
+    const changed = applyPatchState(this.state, {
+      cumulativeEnergyImported: energyImported
+    });
+    if ("cumulativeEnergyImported" in changed) {
+      this.events.cumulativeEnergyMeasured?.emit(
+        { energyImported, energyExported: void 0 },
+        this.context
+      );
+    }
+  }
+};
+((EssEnergyServer2) => {
+  class State extends EnergyFeaturedBase.State {
+  }
+  EssEnergyServer2.State = State;
+})(EssEnergyServer || (EssEnergyServer = {}));
+var EssEnergy = EssEnergyServer.set({
+  cumulativeEnergyImported: { energy: 0 },
+  accuracy: {
+    measurementType: ElectricalPowerMeasurement3.MeasurementType.ElectricalEnergy,
+    measured: true,
+    minMeasuredValue: -1e6,
+    maxMeasuredValue: 1e11,
+    accuracyRanges: [
+      {
+        rangeMin: -1e6,
+        rangeMax: 1e11,
+        fixedMax: 1e3
+      }
+    ]
+  }
+});
+var BatteryStorageEssBase = BatteryStorageDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  HaPowerTopologyServer,
+  PowerSourceServer2({
+    getBatteryPercent(entity) {
+      const state = entity.state;
+      if (state == null || Number.isNaN(+state)) {
+        return null;
+      }
+      return +state;
+    }
+  })
+);
+function batteryStorageEssType(mapping) {
+  let device = BatteryStorageEssBase;
+  if (mapping?.batteryPowerEntity) device = device.with(EssPower);
+  if (mapping?.batteryEnergyEntity) device = device.with(EssEnergy);
+  return device;
+}
+
 // src/matter/behaviors/carbon-monoxide-concentration-measurement-server.ts
 init_home_assistant_entity_behavior();
 var CarbonMonoxideConcentrationMeasurementServerBase = CarbonMonoxideConcentrationMeasurementServer.with(
@@ -166235,10 +166439,14 @@ var CarbonMonoxideSensorType = AirQualitySensorDevice.with(
   CarbonMonoxideConcentrationMeasurementServer2
 );
 
+// src/matter/endpoints/legacy/sensor/devices/electrical-meter.ts
+init_home_assistant_entity_behavior();
+
 // src/matter/endpoints/legacy/sensor/devices/electrical-sensor.ts
 init_dist();
 init_home_assistant_entity_behavior();
-var StandalonePowerServer = class extends ElectricalPowerMeasurementServer {
+var PowerFeaturedBase2 = ElectricalPowerMeasurementServer.with("AlternatingCurrent");
+var StandalonePowerServer = class extends PowerFeaturedBase2 {
   async initialize() {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -166246,36 +166454,48 @@ var StandalonePowerServer = class extends ElectricalPowerMeasurementServer {
     this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
-    if (!entity.state || !entity.state.attributes) {
-      return;
-    }
-    const state = entity.state.state;
-    if (state == null || Number.isNaN(+state)) return;
-    const attrs = entity.state.attributes;
-    const dc = attrs.device_class;
-    if (dc === SensorDeviceClass.power) {
-      applyPatchState(this.state, {
-        activePower: Math.round(+state * 1e3)
-      });
-    } else if (dc === SensorDeviceClass.voltage) {
-      applyPatchState(this.state, {
-        voltage: Math.round(+state * 1e3)
-      });
-    } else if (dc === SensorDeviceClass.current) {
-      applyPatchState(this.state, {
-        activeCurrent: Math.round(+state * 1e3)
-      });
+    const patch = {};
+    const attrs = entity.state?.attributes;
+    const dc = attrs?.device_class;
+    const primary = entity.state?.state;
+    if (primary != null && !Number.isNaN(+primary)) {
+      if (dc === SensorDeviceClass.power) {
+        patch.activePower = Math.round(+primary * 1e3);
+      } else if (dc === SensorDeviceClass.voltage) {
+        patch.voltage = Math.round(+primary * 1e3);
+      } else if (dc === SensorDeviceClass.current) {
+        patch.activeCurrent = Math.round(+primary * 1e3);
+      }
+    }
+    const mapping = this.agent.get(HomeAssistantEntityBehavior).state.mapping;
+    if (mapping?.powerEntity || mapping?.voltageEntity || mapping?.currentEntity) {
+      const stateProvider = this.agent.env.get(EntityStateProvider);
+      if (mapping.powerEntity) {
+        const w = stateProvider.getNumericState(mapping.powerEntity);
+        if (w != null) patch.activePower = Math.round(w * 1e3);
+      }
+      if (mapping.voltageEntity) {
+        const v = stateProvider.getNumericState(mapping.voltageEntity);
+        if (v != null) patch.voltage = Math.round(v * 1e3);
+      }
+      if (mapping.currentEntity) {
+        const a = stateProvider.getNumericState(mapping.currentEntity);
+        if (a != null) patch.activeCurrent = Math.round(a * 1e3);
+      }
     }
+    if (Object.keys(patch).length > 0) applyPatchState(this.state, patch);
   }
 };
 ((StandalonePowerServer2) => {
-  class State extends ElectricalPowerMeasurementServer.State {
+  class State extends PowerFeaturedBase2.State {
   }
   StandalonePowerServer2.State = State;
 })(StandalonePowerServer || (StandalonePowerServer = {}));
 var PowerServer = StandalonePowerServer.set({
   powerMode: ElectricalPowerMeasurement3.PowerMode.Ac,
-  numberOfMeasurementTypes: 1,
+  // Power, voltage and current can all be folded onto this endpoint, so the
+  // accuracy list carries an entry for each reported measurement type.
+  numberOfMeasurementTypes: 3,
   // SmartThings keeps the endpoint in a "device not yet updated" state
   // when activePower stays null. Seed 0 so the cluster reports a value
   // for energy/voltage/current-only sensors that never feed activePower.
@@ -166293,14 +166513,43 @@ var PowerServer = StandalonePowerServer.set({
           fixedMax: 1e3
         }
       ]
+    },
+    {
+      measurementType: ElectricalPowerMeasurement3.MeasurementType.Voltage,
+      measured: true,
+      minMeasuredValue: 0,
+      maxMeasuredValue: 1e6,
+      // 1000V in mV
+      accuracyRanges: [
+        {
+          rangeMin: 0,
+          rangeMax: 1e6,
+          fixedMax: 1e3
+        }
+      ]
+    },
+    {
+      measurementType: ElectricalPowerMeasurement3.MeasurementType.ActiveCurrent,
+      measured: true,
+      minMeasuredValue: -1e6,
+      // -1000A in mA
+      maxMeasuredValue: 1e6,
+      // 1000A in mA
+      accuracyRanges: [
+        {
+          rangeMin: -1e6,
+          rangeMax: 1e6,
+          fixedMax: 1e3
+        }
+      ]
     }
   ]
 });
-var EnergyFeaturedBase = ElectricalEnergyMeasurementServer.with(
+var EnergyFeaturedBase2 = ElectricalEnergyMeasurementServer.with(
   "CumulativeEnergy",
   "ImportedEnergy"
 );
-var StandaloneEnergyServer = class extends EnergyFeaturedBase {
+var StandaloneEnergyServer = class extends EnergyFeaturedBase2 {
   async initialize() {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -166308,32 +166557,39 @@ var StandaloneEnergyServer = class extends EnergyFeaturedBase {
     this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
-    if (!entity.state || !entity.state.attributes) {
-      return;
+    let energyKwh = null;
+    const attrs = entity.state?.attributes;
+    if (attrs?.device_class === SensorDeviceClass.energy) {
+      const state = entity.state?.state;
+      if (state != null && !Number.isNaN(+state)) energyKwh = +state;
+    }
+    const mapping = this.agent.get(HomeAssistantEntityBehavior).state.mapping;
+    if (mapping?.energyEntity) {
+      const stateProvider = this.agent.env.get(EntityStateProvider);
+      const mapped = stateProvider.getNumericState(mapping.energyEntity);
+      if (mapped != null) energyKwh = mapped;
     }
-    const attrs = entity.state.attributes;
-    if (attrs.device_class !== SensorDeviceClass.energy) return;
-    const state = entity.state.state;
-    if (state == null || Number.isNaN(+state)) return;
-    const energyMwh = Math.round(+state * 1e6);
-    const energyImported = { energy: energyMwh };
-    applyPatchState(this.state, {
+    if (energyKwh == null) return;
+    const energyImported = { energy: Math.round(energyKwh * 1e6) };
+    const changed = applyPatchState(this.state, {
       cumulativeEnergyImported: energyImported
     });
-    this.events.cumulativeEnergyMeasured?.emit(
-      { energyImported, energyExported: void 0 },
-      this.context
-    );
+    if ("cumulativeEnergyImported" in changed) {
+      this.events.cumulativeEnergyMeasured?.emit(
+        { energyImported, energyExported: void 0 },
+        this.context
+      );
+    }
   }
 };
 ((StandaloneEnergyServer2) => {
-  class State extends EnergyFeaturedBase.State {
+  class State extends EnergyFeaturedBase2.State {
   }
   StandaloneEnergyServer2.State = State;
 })(StandaloneEnergyServer || (StandaloneEnergyServer = {}));
 var EnergyServer = StandaloneEnergyServer.set({
   // Match the activePower=0 default so SmartThings doesn't show "- kWh"
-  // on a SolarPower endpoint whose mapped entity only carries power data.
+  // on an endpoint whose mapped entity only carries power data.
   cumulativeEnergyImported: { energy: 0 },
   accuracy: {
     measurementType: ElectricalPowerMeasurement3.MeasurementType.ElectricalEnergy,
@@ -166358,6 +166614,15 @@ var ElectricalSensorType = SolarPowerDevice.with(
   EnergyServer
 );
 
+// src/matter/endpoints/legacy/sensor/devices/electrical-meter.ts
+var ElectricalMeterType = ElectricalMeterDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  PowerServer,
+  EnergyServer
+);
+
 // src/matter/behaviors/flow-measurement-server.ts
 init_home_assistant_entity_behavior();
 var FlowMeasurementServerBase = class extends FlowMeasurementServer {
@@ -167725,9 +167990,12 @@ function SensorDevice(homeAssistantEntity) {
     return RadonSensorType.set({ homeAssistantEntity });
   }
   if (deviceClass === SensorDeviceClass.power || deviceClass === SensorDeviceClass.energy || deviceClass === SensorDeviceClass.voltage || deviceClass === SensorDeviceClass.current) {
-    return ElectricalSensorType.set({ homeAssistantEntity });
+    return ElectricalMeterType.set({ homeAssistantEntity });
   }
   if (deviceClass === SensorDeviceClass.battery) {
+    if (mapping?.batteryPowerEntity || mapping?.batteryEnergyEntity) {
+      return batteryStorageEssType(mapping).set({ homeAssistantEntity });
+    }
     return BatterySensorType.set({ homeAssistantEntity });
   }
   if (deviceClass) {
@@ -167801,11 +168069,12 @@ function SwitchDevice(homeAssistantEntity) {
   const hasBatteryEntity = !!homeAssistantEntity.mapping?.batteryEntity;
   const hasPowerEntity = !!homeAssistantEntity.mapping?.powerEntity;
   const hasEnergyEntity = !!homeAssistantEntity.mapping?.energyEntity;
+  const hasElectricalPower = hasPowerEntity || !!homeAssistantEntity.mapping?.voltageEntity || !!homeAssistantEntity.mapping?.currentEntity;
   let device = hasBatteryAttr || hasBatteryEntity ? SwitchWithBatteryEndpointType : SwitchEndpointType;
-  if (hasPowerEntity || hasEnergyEntity) {
+  if (hasElectricalPower || hasEnergyEntity) {
     device = device.with(HaPowerTopologyServer);
   }
-  if (hasPowerEntity) {
+  if (hasElectricalPower) {
     device = device.with(HaElectricalPowerMeasurementServer);
   }
   if (hasEnergyEntity) {
@@ -170243,7 +170512,12 @@ var matterDeviceTypeFactories = {
   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 }),
+  battery_storage: (ha) => {
+    if (ha.mapping?.batteryPowerEntity || ha.mapping?.batteryEnergyEntity) {
+      return batteryStorageEssType(ha.mapping).set({ homeAssistantEntity: ha });
+    }
+    return 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 }),
@@ -170251,7 +170525,10 @@ var matterDeviceTypeFactories = {
   formaldehyde_sensor: (ha) => FormaldehydeSensorType.set({ homeAssistantEntity: ha }),
   radon_sensor: (ha) => RadonSensorType.set({ homeAssistantEntity: ha }),
   pm1_sensor: (ha) => Pm1SensorType.set({ homeAssistantEntity: ha }),
+  electrical_meter: (ha) => ElectricalMeterType.set({ homeAssistantEntity: ha }),
+  // Legacy SolarPower alias, kept for existing mappings.
   electrical_sensor: (ha) => ElectricalSensorType.set({ homeAssistantEntity: ha }),
+  solar_power: (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 }),