@riddix/hamh 2.1.0-alpha.753 → 2.1.0-alpha.755

package/dist/backend/cli.js

@@ -127033,6 +127033,7 @@ function entityMappingApi(mappingStorage) {
       humidityEntity: body.humidityEntity,
       pressureEntity: body.pressureEntity,
       batteryEntity: body.batteryEntity,
+      chargingStateEntity: body.chargingStateEntity,
       roomEntities: body.roomEntities,
       disableLockPin: body.disableLockPin,
       powerEntity: body.powerEntity,
@@ -131671,6 +131672,7 @@ var EntityMappingStorage = class extends Service {
       temperatureEntity: request.temperatureEntity?.trim() || void 0,
       humidityEntity: request.humidityEntity?.trim() || void 0,
       batteryEntity: request.batteryEntity?.trim() || void 0,
+      chargingStateEntity: request.chargingStateEntity?.trim() || void 0,
       roomEntities: roomEntities.length > 0 ? roomEntities : void 0,
       disableLockPin: request.disableLockPin || void 0,
       powerEntity: request.powerEntity?.trim() || void 0,
@@ -131697,7 +131699,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.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.chargingStateEntity && !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);
@@ -148434,6 +148436,7 @@ function seedExistingSessionStarts(startedAt, sessions, now = Date.now()) {
 // src/services/bridges/bridge.ts
 var AUTO_FORCE_SYNC_INTERVAL_MS = 9e4;
 var DEAD_SESSION_TIMEOUT_MS = 6e4;
+var SHUTDOWN_SESSION_CLOSE_TIMEOUT_MS = 2500;
 var Bridge = class {
   constructor(env, logger234, dataProvider, endpointManager) {
     this.dataProvider = dataProvider;
@@ -148683,6 +148686,7 @@ ${e?.toString()}`);
   async runStop(code, reason) {
     this.unwireSessionDiagnostics();
     this.stopAutoForceSync();
+    await this.closeActiveSessions();
     await this.endpointManager.stopPlugins();
     this.endpointManager.stopObserving();
     try {
@@ -148713,6 +148717,7 @@ ${e?.toString()}`);
     this.log.info(`Force sync: every ${AUTO_FORCE_SYNC_INTERVAL_MS / 1e3}s`);
   }
   wireSessionDiagnostics() {
+    this.unwireSessionDiagnostics();
     try {
       const sessionManager = this.server.env.get(SessionManager);
       seedExistingSessionStarts(this.sessionStartedAt, sessionManager.sessions);
@@ -148868,6 +148873,42 @@ ${e?.toString()}`);
     } catch {
     }
   }
+  // Close every active session on shutdown so each controller is told to drop
+  // its CASE session instead of being left with a stale one. Mirrors the
+  // dead-session close, but covers all sessions and waits (capped) so the
+  // close actually reaches the peer before the server is canceled.
+  async closeActiveSessions() {
+    try {
+      const sessionManager = this.server.env.get(SessionManager);
+      const closes = [];
+      for (const s of [...sessionManager.sessions]) {
+        if (s.isClosing) {
+          continue;
+        }
+        closes.push(
+          s.initiateClose().catch(() => {
+            return s.initiateForceClose({
+              cause: new Error("graceful close failed, forcing")
+            });
+          })
+        );
+      }
+      if (closes.length === 0) {
+        return;
+      }
+      this.log.info(`Closing ${closes.length} active session(s) on shutdown`);
+      let timer;
+      const timeout = new Promise((resolve11) => {
+        timer = setTimeout(resolve11, SHUTDOWN_SESSION_CLOSE_TIMEOUT_MS);
+      });
+      try {
+        await Promise.race([Promise.allSettled(closes), timeout]);
+      } finally {
+        clearTimeout(timer);
+      }
+    } catch {
+    }
+  }
   /**
    * Force a fresh mDNS operational advertisement after session cleanup.
    * matter.js DeviceAdvertiser only re-announces when a subscription is
@@ -149217,6 +149258,7 @@ function getMappedEntityIds(mapping) {
   if (!mapping) return [];
   const ids = [];
   if (mapping.batteryEntity) ids.push(mapping.batteryEntity);
+  if (mapping.chargingStateEntity) ids.push(mapping.chargingStateEntity);
   if (mapping.temperatureEntity) ids.push(mapping.temperatureEntity);
   if (mapping.humidityEntity) ids.push(mapping.humidityEntity);
   if (mapping.pressureEntity) ids.push(mapping.pressureEntity);
@@ -149749,6 +149791,13 @@ var PowerSourceServerBase = class extends FeaturedBase2 {
     } else if (isCharging2 === false) {
       batChargeState = PowerSource3.BatChargeState.IsNotCharging;
     }
+    const explicitChargeState = config11.getChargeState?.(
+      entity.state,
+      this.agent
+    );
+    if (explicitChargeState != null) {
+      batChargeState = explicitChargeState;
+    }
     applyPatchState(this.state, {
       status: PowerSource3.PowerSourceStatus.Active,
       batPercentRemaining,
@@ -160330,6 +160379,28 @@ function getVacuumBatteryPercent(entity, agent) {
   const parsed = Number.parseFloat(String(raw));
   return Number.isNaN(parsed) ? null : parsed;
 }
+var CHARGING_STRINGS = {
+  charging: "charging",
+  go_charging: "charging",
+  on: "charging",
+  true: "charging",
+  full: "full",
+  not_charging: "not_charging",
+  not_chargeable: "not_charging",
+  discharging: "not_charging",
+  off: "not_charging",
+  false: "not_charging"
+};
+function mapChargingString(raw) {
+  return CHARGING_STRINGS[raw.trim().toLowerCase()] ?? null;
+}
+function getVacuumChargingState(agent) {
+  const id = agent.get(HomeAssistantEntityBehavior).state.mapping?.chargingStateEntity;
+  if (!id) return null;
+  const state = agent.env.get(EntityStateProvider).getState(id);
+  if (!state) return null;
+  return mapChargingString(state.state);
+}
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-power-source-server.ts
 var VacuumPowerSourceServer = PowerSourceServer2({
@@ -160337,6 +160408,14 @@ var VacuumPowerSourceServer = PowerSourceServer2({
   isCharging(entity) {
     const state = entity.state;
     return state === VacuumState.docked;
+  },
+  getChargeState(_, agent) {
+    const signal = getVacuumChargingState(agent);
+    if (signal === "charging") return PowerSource3.BatChargeState.IsCharging;
+    if (signal === "full") return PowerSource3.BatChargeState.IsAtFullCharge;
+    if (signal === "not_charging")
+      return PowerSource3.BatChargeState.IsNotCharging;
+    return null;
   }
 });
 
@@ -161086,7 +161165,7 @@ function isDockedCharging(entity, batteryPercent) {
   if (batteryPercent != null) return batteryPercent < 100;
   return isCharging(entity);
 }
-function mapVacuumOperationalState(entity, batteryPercent = batteryFromAttributes(entity.attributes)) {
+function mapVacuumOperationalState(entity, batteryPercent = batteryFromAttributes(entity.attributes), chargingState = null) {
   const state = entity.state;
   const cleaningStates = [
     VacuumState.cleaning,
@@ -161097,11 +161176,8 @@ function mapVacuumOperationalState(entity, batteryPercent = batteryFromAttribute
   ];
   let operationalState;
   if (state === VacuumState.docked) {
-    if (isDockedCharging(entity, batteryPercent)) {
-      operationalState = RvcOperationalState4.OperationalState.Charging;
-    } else {
-      operationalState = RvcOperationalState4.OperationalState.Docked;
-    }
+    const charging = chargingState != null ? chargingState === "charging" : isDockedCharging(entity, batteryPercent);
+    operationalState = charging ? RvcOperationalState4.OperationalState.Charging : RvcOperationalState4.OperationalState.Docked;
   } else if (state === VacuumState.returning) {
     operationalState = RvcOperationalState4.OperationalState.SeekingCharger;
   } else if (cleaningStates.includes(state)) {
@@ -161109,11 +161185,8 @@ function mapVacuumOperationalState(entity, batteryPercent = batteryFromAttribute
   } else if (state === VacuumState.paused) {
     operationalState = RvcOperationalState4.OperationalState.Paused;
   } else if (state === VacuumState.idle) {
-    if (isCharging(entity)) {
-      operationalState = RvcOperationalState4.OperationalState.Charging;
-    } else {
-      operationalState = RvcOperationalState4.OperationalState.Stopped;
-    }
+    const charging = chargingState != null ? chargingState === "charging" : isCharging(entity);
+    operationalState = charging ? RvcOperationalState4.OperationalState.Charging : RvcOperationalState4.OperationalState.Stopped;
   } else if (state === VacuumState.error || state === "unavailable") {
     operationalState = RvcOperationalState4.OperationalState.Error;
   } else {
@@ -161136,7 +161209,8 @@ var VacuumRvcOperationalStateServer = RvcOperationalStateServer2({
   getOperationalState(entity, agent) {
     return mapVacuumOperationalState(
       entity,
-      getVacuumBatteryPercent(entity, agent)
+      getVacuumBatteryPercent(entity, agent),
+      getVacuumChargingState(agent)
     );
   },
   pause: (_, agent) => {
@@ -164306,6 +164380,7 @@ init_dist();
 init_diagnostic_event_bus();
 var AUTO_FORCE_SYNC_INTERVAL_MS2 = 9e4;
 var DEAD_SESSION_TIMEOUT_MS2 = 6e4;
+var SHUTDOWN_SESSION_CLOSE_TIMEOUT_MS2 = 2500;
 function makeWarmStartState(state, now = (/* @__PURE__ */ new Date()).toISOString()) {
   return { ...state, last_updated: now };
 }
@@ -164469,6 +164544,7 @@ ${e?.toString()}`);
     this.unwireSessionDiagnostics();
     this.cancelWarmStart();
     this.stopAutoForceSync();
+    await this.closeActiveSessions();
     this.endpointManager.stopObserving();
     try {
       await this.server.cancel();
@@ -164538,6 +164614,7 @@ ${e?.toString()}`);
     this.log.info(`Force sync: every ${AUTO_FORCE_SYNC_INTERVAL_MS2 / 1e3}s`);
   }
   wireSessionDiagnostics() {
+    this.unwireSessionDiagnostics();
     try {
       const sessionManager = this.server.env.get(SessionManager);
       this.sessionDiagHandler = (session) => {
@@ -164658,6 +164735,42 @@ ${e?.toString()}`);
     } catch {
     }
   }
+  // Close every active session on shutdown so each controller is told to drop
+  // its CASE session instead of being left with a stale one. Mirrors the
+  // dead-session close, but covers all sessions and waits (capped) so the
+  // close actually reaches the peer before the server is canceled.
+  async closeActiveSessions() {
+    try {
+      const sessionManager = this.server.env.get(SessionManager);
+      const closes = [];
+      for (const s of [...sessionManager.sessions]) {
+        if (s.isClosing) {
+          continue;
+        }
+        closes.push(
+          s.initiateClose().catch(() => {
+            return s.initiateForceClose({
+              cause: new Error("graceful close failed, forcing")
+            });
+          })
+        );
+      }
+      if (closes.length === 0) {
+        return;
+      }
+      this.log.info(`Closing ${closes.length} active session(s) on shutdown`);
+      let timer;
+      const timeout = new Promise((resolve11) => {
+        timer = setTimeout(resolve11, SHUTDOWN_SESSION_CLOSE_TIMEOUT_MS2);
+      });
+      try {
+        await Promise.race([Promise.allSettled(closes), timeout]);
+      } finally {
+        clearTimeout(timer);
+      }
+    } catch {
+    }
+  }
   /**
    * Force a fresh mDNS operational advertisement after session cleanup.
    * matter.js DeviceAdvertiser only re-announces when a subscription is
@@ -165883,6 +165996,14 @@ async function startHandler(startOptions, webUiDist) {
     if (shuttingDown) return;
     shuttingDown = true;
     console.log(`Received ${signal}, shutting down gracefully...`);
+    try {
+      await Promise.race([
+        bridgeService.stopAll(),
+        new Promise((resolve11) => setTimeout(resolve11, 1e4))
+      ]);
+    } catch (e) {
+      console.warn("Stopping bridges during shutdown failed:", e);
+    }
     try {
       await Promise.race([
         backupService.createAutoBackup(),