@riddix/hamh 2.1.0-alpha.826 → 2.1.0-alpha.827

package/dist/backend/cli.js

@@ -132607,6 +132607,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     humidityEntity: config11.humidityEntity,
                     pressureEntity: config11.pressureEntity,
                     batteryEntity: config11.batteryEntity,
+                    disableBatteryMapping: config11.disableBatteryMapping,
                     roomEntities: config11.roomEntities,
                     disableLockPin: config11.disableLockPin,
                     lockUsercodeService: config11.lockUsercodeService,
@@ -132762,6 +132763,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                   humidityEntity: config11.humidityEntity,
                   pressureEntity: config11.pressureEntity,
                   batteryEntity: config11.batteryEntity,
+                  disableBatteryMapping: config11.disableBatteryMapping,
                   roomEntities: config11.roomEntities,
                   disableLockPin: config11.disableLockPin,
                   lockUsercodeService: config11.lockUsercodeService,
@@ -133607,6 +133609,7 @@ function entityMappingApi(mappingStorage) {
       humidityEntity: body.humidityEntity,
       pressureEntity: body.pressureEntity,
       batteryEntity: body.batteryEntity,
+      disableBatteryMapping: body.disableBatteryMapping,
       chargingStateEntity: body.chargingStateEntity,
       roomEntities: body.roomEntities,
       disableLockPin: body.disableLockPin,
@@ -134102,6 +134105,7 @@ function configToProfileEntry(config11) {
     humidityEntity: config11.humidityEntity,
     pressureEntity: config11.pressureEntity,
     batteryEntity: config11.batteryEntity,
+    disableBatteryMapping: config11.disableBatteryMapping,
     roomEntities: config11.roomEntities,
     disableLockPin: config11.disableLockPin,
     lockUsercodeService: config11.lockUsercodeService,
@@ -134235,6 +134239,7 @@ function mappingProfileApi(mappingStorage) {
           humidityEntity: entry.humidityEntity,
           pressureEntity: entry.pressureEntity,
           batteryEntity: entry.batteryEntity,
+          disableBatteryMapping: entry.disableBatteryMapping,
           roomEntities: entry.roomEntities,
           disableLockPin: entry.disableLockPin,
           lockUsercodeService: entry.lockUsercodeService,
@@ -138435,6 +138440,7 @@ var EntityMappingStorage = class extends Service {
       temperatureEntity: request.temperatureEntity?.trim() || void 0,
       humidityEntity: request.humidityEntity?.trim() || void 0,
       batteryEntity: request.batteryEntity?.trim() || void 0,
+      disableBatteryMapping: request.disableBatteryMapping || void 0,
       chargingStateEntity: request.chargingStateEntity?.trim() || void 0,
       roomEntities: roomEntities.length > 0 ? roomEntities : void 0,
       disableLockPin: request.disableLockPin || void 0,
@@ -138471,7 +138477,7 @@ var EntityMappingStorage = class extends Service {
       climateAutoMode: request.climateAutoMode || void 0,
       composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? 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.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)) {
+    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)) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config11);
@@ -156992,7 +156998,9 @@ function createEndpointId(entityId, customName) {
 function getMappedEntityIds(mapping) {
   if (!mapping) return [];
   const ids = [];
-  if (mapping.batteryEntity) ids.push(mapping.batteryEntity);
+  if (mapping.batteryEntity && !mapping.disableBatteryMapping) {
+    ids.push(mapping.batteryEntity);
+  }
   if (mapping.faultEntity) ids.push(mapping.faultEntity);
   if (mapping.chargingStateEntity) ids.push(mapping.chargingStateEntity);
   if (mapping.temperatureEntity) ids.push(mapping.temperatureEntity);
@@ -157683,6 +157691,9 @@ function PowerSourceServer2(config11) {
 var defaultBatteryConfig = {
   getBatteryPercent: (entity, agent) => {
     const homeAssistant = agent.get(HomeAssistantEntityBehavior);
+    if (homeAssistant.state.mapping?.disableBatteryMapping) {
+      return null;
+    }
     const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
     if (batteryEntity) {
       const stateProvider = agent.env.get(EntityStateProvider);
@@ -161532,6 +161543,9 @@ init_nodejs();
 init_home_assistant_entity_behavior();
 function getBatteryPercent(entity, agent) {
   const homeAssistant = agent.get(HomeAssistantEntityBehavior);
+  if (homeAssistant.state.mapping?.disableBatteryMapping) {
+    return null;
+  }
   const batteryEntity = homeAssistant.state.mapping?.batteryEntity;
   if (batteryEntity) {
     const stateProvider = agent.env.get(EntityStateProvider);
@@ -168740,7 +168754,9 @@ init_dist();
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-battery.ts
 init_home_assistant_entity_behavior();
 function getVacuumBatteryPercent(entity, agent) {
-  const mapped = agent.get(HomeAssistantEntityBehavior).state.mapping?.batteryEntity;
+  const mapping = agent.get(HomeAssistantEntityBehavior).state.mapping;
+  if (mapping?.disableBatteryMapping) return null;
+  const mapped = mapping?.batteryEntity;
   if (mapped) {
     const battery = agent.env.get(EntityStateProvider).getBatteryPercent(mapped);
     if (battery != null) return Math.max(0, Math.min(100, battery));
@@ -169931,6 +169947,16 @@ function WeatherDevice(homeAssistant) {
 // src/matter/endpoints/legacy/create-legacy-endpoint-type.ts
 var legacyLogger = Logger.get("LegacyEndpointType");
 function createLegacyEndpointType(entity, mapping, areaName, options) {
+  if (mapping?.disableBatteryMapping) {
+    entity = {
+      ...entity,
+      state: {
+        ...entity.state,
+        attributes: stripBatteryAttributes(entity.state.attributes)
+      }
+    };
+    mapping = { ...mapping, batteryEntity: void 0 };
+  }
   const domain = entity.entity_id.split(".")[0];
   const customName = mapping?.customName;
   let type;
@@ -169994,6 +170020,12 @@ function addFixedLabel(type, areaName) {
 function hasPowerSource(type) {
   return "powerSource" in type.behaviors;
 }
+function stripBatteryAttributes(attributes9) {
+  const stripped = { ...attributes9 };
+  delete stripped.battery;
+  delete stripped.battery_level;
+  return stripped;
+}
 function addPowerSource(type) {
   const mutable = type;
   if (typeof mutable.with === "function") {
@@ -170136,14 +170168,15 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
         })
       );
     }
-    if (config11.mapping?.batteryEntity) {
+    const hasParentBattery = !!config11.mapping?.batteryEntity && !config11.mapping?.disableBatteryMapping;
+    if (hasParentBattery) {
       parentType = parentType.with(DefaultPowerSourceServer);
     }
     const endpointId = createEndpointId5(primaryEntityId, config11.customName);
     const parts = [];
     const subEndpointMap = /* @__PURE__ */ new Map();
     const mappedIds = [];
-    if (config11.mapping?.batteryEntity) {
+    if (hasParentBattery && config11.mapping?.batteryEntity) {
       mappedIds.push(config11.mapping.batteryEntity);
     }
     let primaryMapping = config11.mapping;
@@ -170411,7 +170444,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
         }
       }
       const isVacuum = entityId.startsWith("vacuum.");
-      if ((registry2.isAutoBatteryMappingEnabled() || isVacuum) && !mapping?.batteryEntity) {
+      if ((registry2.isAutoBatteryMappingEnabled() || isVacuum) && !mapping?.batteryEntity && !mapping?.disableBatteryMapping) {
         const batteryEntityId = registry2.findBatteryEntityForDevice(
           entity.device_id
         );
@@ -170610,7 +170643,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
           primaryEntityId: entityId,
           humidityEntityId: effectiveMapping?.humidityEntity,
           pressureEntityId: effectiveMapping?.pressureEntity,
-          batteryEntityId: effectiveMapping?.batteryEntity,
+          batteryEntityId: effectiveMapping?.disableBatteryMapping ? void 0 : effectiveMapping?.batteryEntity,
           powerEntityId: effectiveMapping?.powerEntity,
           energyEntityId: effectiveMapping?.energyEntity,
           customName: effectiveMapping?.customName,
@@ -170629,7 +170662,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             primaryEntityId: entityId,
             temperatureEntityId,
             humidityEntityId,
-            batteryEntityId: effectiveMapping?.batteryEntity,
+            batteryEntityId: effectiveMapping?.disableBatteryMapping ? void 0 : effectiveMapping?.batteryEntity,
             powerEntityId: effectiveMapping?.powerEntity,
             energyEntityId: effectiveMapping?.energyEntity,
             mapping: effectiveMapping,
@@ -173866,11 +173899,14 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
       return void 0;
     }
     let effectiveMapping = mapping;
+    if (mapping?.disableBatteryMapping && mapping.batteryEntity) {
+      effectiveMapping = { ...mapping, batteryEntity: void 0 };
+    }
     logger243.info(
       `${entityId}: device_id=${entity.device_id}, manualBattery=${mapping?.batteryEntity ?? "none"}`
     );
     if (entity.device_id) {
-      if (!mapping?.batteryEntity) {
+      if (!mapping?.batteryEntity && !mapping?.disableBatteryMapping) {
         const batteryEntityId = registry2.findBatteryEntityForDevice(
           entity.device_id
         );