@riddix/hamh 2.1.0-alpha.748 → 2.1.0-alpha.750

package/dist/backend/cli.js

@@ -127010,6 +127010,7 @@ function entityMappingApi(mappingStorage) {
       coverSwapOpenClose: body.coverSwapOpenClose,
       coverExposeAsDimmableLight: body.coverExposeAsDimmableLight,
       coverSliderDebounceMs: body.coverSliderDebounceMs,
+      updateThrottleMs: body.updateThrottleMs,
       disableClimateOnOff: body.disableClimateOnOff,
       disableClimateFanControl: body.disableClimateFanControl,
       climateKeepModeOnIdle: body.climateKeepModeOnIdle,
@@ -131643,6 +131644,7 @@ var EntityMappingStorage = class extends Service {
       coverSwapOpenClose: request.coverSwapOpenClose || void 0,
       coverExposeAsDimmableLight: request.coverExposeAsDimmableLight || void 0,
       coverSliderDebounceMs: sanitizeDebounceMs(request.coverSliderDebounceMs),
+      updateThrottleMs: sanitizeThrottleMs(request.updateThrottleMs),
       disableClimateOnOff: request.disableClimateOnOff || void 0,
       disableClimateFanControl: request.disableClimateFanControl || void 0,
       climateKeepModeOnIdle: request.climateKeepModeOnIdle || void 0,
@@ -131650,7 +131652,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.roomEntities && !config11.disableLockPin && !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.currentRoomEntity && !config11.cleanedAreaEntity && !config11.disableCustomAreaRoomModes && !config11.valetudoIdentifier && !config11.coverSwapOpenClose && !config11.coverExposeAsDimmableLight && !config11.coverSliderDebounceMs && !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.roomEntities && !config11.disableLockPin && !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.currentRoomEntity && !config11.cleanedAreaEntity && !config11.disableCustomAreaRoomModes && !config11.valetudoIdentifier && !config11.coverSwapOpenClose && !config11.coverExposeAsDimmableLight && !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);
@@ -131690,6 +131692,16 @@ function sanitizeDebounceMs(value) {
   }
   return Math.min(5e3, Math.round(n));
 }
+function sanitizeThrottleMs(value) {
+  if (value === void 0 || value === null || value === "") {
+    return void 0;
+  }
+  const n = typeof value === "string" ? Number(value) : value;
+  if (typeof n !== "number" || !Number.isFinite(n) || n <= 0) {
+    return void 0;
+  }
+  return Math.min(6e4, Math.round(n));
+}
 
 // src/services/storage/lock-credential-storage.ts
 init_service();
@@ -149079,10 +149091,54 @@ var AggregatorEndpoint2 = class extends Endpoint {
 // src/matter/endpoints/legacy/legacy-endpoint.ts
 init_dist();
 init_esm();
-init_home_assistant_entity_behavior();
 import debounce6 from "debounce";
 import { isEqual } from "lodash-es";
 
+// src/utils/throttle-latest.ts
+function throttleLatest(fn, intervalMs) {
+  let lastRun = Number.NEGATIVE_INFINITY;
+  let timer;
+  let pending;
+  const run = (args) => {
+    lastRun = Date.now();
+    fn(...args);
+  };
+  const throttled = ((...args) => {
+    const elapsed = Date.now() - lastRun;
+    if (elapsed >= intervalMs) {
+      if (timer) {
+        clearTimeout(timer);
+        timer = void 0;
+      }
+      pending = void 0;
+      run(args);
+      return;
+    }
+    pending = args;
+    if (!timer) {
+      timer = setTimeout(() => {
+        timer = void 0;
+        if (pending) {
+          const next = pending;
+          pending = void 0;
+          run(next);
+        }
+      }, intervalMs - elapsed);
+    }
+  });
+  throttled.clear = () => {
+    if (timer) {
+      clearTimeout(timer);
+      timer = void 0;
+    }
+    pending = void 0;
+  };
+  return throttled;
+}
+
+// src/matter/endpoints/legacy/legacy-endpoint.ts
+init_home_assistant_entity_behavior();
+
 // src/matter/endpoints/entity-endpoint.ts
 init_esm7();
 var EntityEndpoint = class extends Endpoint {
@@ -160183,29 +160239,26 @@ var VacuumOnOffServer = OnOffServer2({
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-power-source-server.ts
 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;
+  if (mapped) {
+    const battery = agent.env.get(EntityStateProvider).getBatteryPercent(mapped);
+    if (battery != null) return Math.max(0, Math.min(100, battery));
+  }
+  const attrs = entity.attributes;
+  const raw = attrs.battery_level ?? attrs.battery;
+  if (raw == null) return null;
+  if (typeof raw === "number") return raw;
+  const parsed = Number.parseFloat(String(raw));
+  return Number.isNaN(parsed) ? null : parsed;
+}
+
+// src/matter/endpoints/legacy/vacuum/behaviors/vacuum-power-source-server.ts
 var VacuumPowerSourceServer = 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 attributes9 = entity.attributes;
-    const batteryLevel = attributes9.battery_level ?? attributes9.battery;
-    if (batteryLevel == null) {
-      return null;
-    }
-    if (typeof batteryLevel === "number") {
-      return batteryLevel;
-    }
-    const parsed = Number.parseFloat(String(batteryLevel));
-    return Number.isNaN(parsed) ? null : parsed;
-  },
+  getBatteryPercent: getVacuumBatteryPercent,
   isCharging(entity) {
     const state = entity.state;
     return state === VacuumState.docked;
@@ -160934,19 +160987,31 @@ init_dist();
 init_esm();
 init_home_assistant_entity_behavior();
 var logger225 = Logger.get("VacuumRvcOperationalStateServer");
+function batteryFromAttributes(attrs) {
+  const raw = attrs.battery_level ?? attrs.battery;
+  if (raw == null) return null;
+  const n = typeof raw === "number" ? raw : Number.parseFloat(String(raw));
+  return Number.isFinite(n) ? n : null;
+}
 function isCharging(entity) {
   const attrs = entity.attributes;
   if (attrs.is_charging === true || attrs.charging === true) return true;
   if (attrs.is_charging === false || attrs.charging === false) return false;
-  const raw = attrs.battery_level ?? attrs.battery;
-  const level = typeof raw === "number" ? raw : Number.parseFloat(String(raw ?? ""));
-  if (Number.isFinite(level) && level >= 100) return false;
+  const level = batteryFromAttributes(entity.attributes);
+  if (level != null && level >= 100) return false;
   if (attrs.battery_icon?.includes("charging")) return true;
   if (typeof attrs.status === "string" && attrs.status.toLowerCase().includes("charg"))
     return true;
   return false;
 }
-function mapVacuumOperationalState(entity) {
+function isDockedCharging(entity, batteryPercent) {
+  const attrs = entity.attributes;
+  if (attrs.is_charging === true || attrs.charging === true) return true;
+  if (attrs.is_charging === false || attrs.charging === false) return false;
+  if (batteryPercent != null) return batteryPercent < 100;
+  return isCharging(entity);
+}
+function mapVacuumOperationalState(entity, batteryPercent = batteryFromAttributes(entity.attributes)) {
   const state = entity.state;
   const cleaningStates = [
     VacuumState.cleaning,
@@ -160957,7 +161022,7 @@ function mapVacuumOperationalState(entity) {
   ];
   let operationalState;
   if (state === VacuumState.docked) {
-    if (isCharging(entity)) {
+    if (isDockedCharging(entity, batteryPercent)) {
       operationalState = RvcOperationalState4.OperationalState.Charging;
     } else {
       operationalState = RvcOperationalState4.OperationalState.Docked;
@@ -160993,8 +161058,11 @@ function mapVacuumOperationalState(entity) {
   return operationalState;
 }
 var VacuumRvcOperationalStateServer = RvcOperationalStateServer2({
-  getOperationalState(entity) {
-    return mapVacuumOperationalState(entity);
+  getOperationalState(entity, agent) {
+    return mapVacuumOperationalState(
+      entity,
+      getVacuumBatteryPercent(entity, agent)
+    );
   },
   pause: (_, agent) => {
     const supportedFeatures = agent.get(HomeAssistantEntityBehavior).entity.state.attributes.supported_features ?? 0;
@@ -162034,11 +162102,17 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
     }
     const customName = effectiveMapping?.customName;
     const mappedIds = getMappedEntityIds(effectiveMapping);
-    return new _LegacyEndpoint(type, entityId, customName, mappedIds);
+    return new _LegacyEndpoint(
+      type,
+      entityId,
+      customName,
+      mappedIds,
+      effectiveMapping?.updateThrottleMs
+    );
   }
-  constructor(type, entityId, customName, mappedEntityIds) {
+  constructor(type, entityId, customName, mappedEntityIds, throttleMs) {
     super(type, entityId, customName, mappedEntityIds);
-    this.flushUpdate = debounce6(this.flushPendingUpdate.bind(this), 50);
+    this.flushUpdate = throttleMs && throttleMs > 50 ? throttleLatest(this.flushPendingUpdate.bind(this), throttleMs) : debounce6(this.flushPendingUpdate.bind(this), 50);
   }
   lastState;
   pendingMappedChange = false;