@riddix/hamh 2.1.0-alpha.795 → 2.1.0-alpha.797

package/dist/backend/cli.js

@@ -127325,6 +127325,9 @@ function entityMappingApi(mappingStorage) {
       valetudoIdentifier: body.valetudoIdentifier,
       coverSwapOpenClose: body.coverSwapOpenClose,
       coverExposeAsDimmableLight: body.coverExposeAsDimmableLight,
+      selectExposeAsSwitch: body.selectExposeAsSwitch,
+      selectSwitchOnOption: body.selectSwitchOnOption,
+      selectSwitchOffOption: body.selectSwitchOffOption,
       coverSliderDebounceMs: body.coverSliderDebounceMs,
       updateThrottleMs: body.updateThrottleMs,
       disableClimateOnOff: body.disableClimateOnOff,
@@ -132133,6 +132136,9 @@ var EntityMappingStorage = class extends Service {
       valetudoIdentifier: request.valetudoIdentifier?.trim() || void 0,
       coverSwapOpenClose: request.coverSwapOpenClose || void 0,
       coverExposeAsDimmableLight: request.coverExposeAsDimmableLight || void 0,
+      selectExposeAsSwitch: request.selectExposeAsSwitch || void 0,
+      selectSwitchOnOption: request.selectSwitchOnOption || void 0,
+      selectSwitchOffOption: request.selectSwitchOffOption || void 0,
       coverSliderDebounceMs: sanitizeDebounceMs(request.coverSliderDebounceMs),
       updateThrottleMs: sanitizeThrottleMs(request.updateThrottleMs),
       disableClimateOnOff: request.disableClimateOnOff || void 0,
@@ -132142,7 +132148,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.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.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.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);
@@ -148902,14 +148908,26 @@ var STALE_SESSION_QUIET_WINDOW_MS = 5 * 60 * 1e3;
 function staleSessionQuietWindowMs(flags2) {
   return flags2?.fastSessionRecovery ? 0 : STALE_SESSION_QUIET_WINDOW_MS;
 }
-function staleSessionShouldClose(session, quietWindowMs = STALE_SESSION_QUIET_WINDOW_MS, now = Date.now()) {
-  if (session.subscriptions.size > 0 || session.isClosing) return false;
+function sessionIsQuiet(session, quietWindowMs = STALE_SESSION_QUIET_WINDOW_MS, now = Date.now()) {
+  if (session.isClosing) return false;
   if (session.isPeerActive) return false;
   if (quietWindowMs > 0 && typeof session.timestamp === "number" && now - session.timestamp < quietWindowMs) {
     return false;
   }
   return true;
 }
+function staleSessionShouldClose(session, quietWindowMs = STALE_SESSION_QUIET_WINDOW_MS, now = Date.now()) {
+  return session.subscriptions.size === 0 && sessionIsQuiet(session, quietWindowMs, now);
+}
+function selectSupersededSessions(sessions, newSession, quietWindowMs = STALE_SESSION_QUIET_WINDOW_MS, now = Date.now()) {
+  const ids = [];
+  for (const s of sessions) {
+    if (s.id !== newSession.id && s.peerNodeId === newSession.peerNodeId && s.fabric?.fabricIndex === newSession.fabric?.fabricIndex && !s.isClosing && sessionIsQuiet(s, quietWindowMs, now)) {
+      ids.push(s.id);
+    }
+  }
+  return ids;
+}
 function seedExistingSessionStarts(startedAt, sessions, now = Date.now()) {
   for (const session of sessions) {
     if (!startedAt.has(session.id)) {
@@ -149296,6 +149314,36 @@ ${e?.toString()}`);
             });
           }
         }
+        const quietWindowMs = staleSessionQuietWindowMs(
+          this.dataProvider.featureFlags
+        );
+        const now = Date.now();
+        const supersededIds = new Set(
+          selectSupersededSessions(
+            [...sessionManager.sessions],
+            newSession,
+            quietWindowMs,
+            now
+          )
+        );
+        const closes = [];
+        for (const s of [...sessionManager.sessions]) {
+          if (!supersededIds.has(s.id) || s.subscriptions.size === 0) continue;
+          const quietSec = Math.round((now - s.timestamp) / 1e3);
+          this.log.info(
+            `Closing superseded session ${s.id} (peer ${s.peerNodeId}, ${s.subscriptions.size} subs, quiet ${quietSec}s), replaced by session ${newSession.id}`
+          );
+          closes.push(
+            s.initiateClose().catch(
+              () => s.initiateForceClose({
+                cause: new Error("superseded session, forcing")
+              })
+            )
+          );
+        }
+        if (closes.length > 0) {
+          Promise.allSettled(closes).then(() => this.triggerMdnsReAnnounce());
+        }
       };
       this.sessionDeletedHandler = (session) => {
         this.sessionStartedAt.delete(session.id);
@@ -158252,6 +158300,43 @@ var SelectModeServer = buildSelectModeServer("select.select_option");
 var InputSelectModeServer = buildSelectModeServer(
   "input_select.select_option"
 );
+function buildSelectSwitchType(action) {
+  const option = (agent, key) => {
+    const mapping = agent.get(HomeAssistantEntityBehavior).state.mapping;
+    return key === "on" ? mapping?.selectSwitchOnOption : mapping?.selectSwitchOffOption;
+  };
+  return OnOffPlugInUnitDevice.with(
+    BasicInformationServer2,
+    IdentifyServer2,
+    HomeAssistantEntityBehavior,
+    GroupsServer,
+    ScenesManagementServer,
+    OnOffServer2({
+      // Case-insensitive like the ModeSelect path, some integrations
+      // report options with different casing.
+      isOn: (state, agent) => state.state?.toLowerCase() === option(agent, "on")?.toLowerCase(),
+      turnOn: (_, agent) => ({
+        action,
+        data: { option: option(agent, "on") }
+      }),
+      turnOff: (_, agent) => ({
+        action,
+        data: { option: option(agent, "off") }
+      })
+    })
+  );
+}
+var SelectSwitchType = buildSelectSwitchType("select.select_option");
+var InputSelectSwitchType = buildSelectSwitchType(
+  "input_select.select_option"
+);
+function selectAsSwitch(homeAssistantEntity, type) {
+  const mapping = homeAssistantEntity.mapping;
+  if (mapping?.selectExposeAsSwitch !== true || !mapping.selectSwitchOnOption || !mapping.selectSwitchOffOption) {
+    return void 0;
+  }
+  return type.set({ homeAssistantEntity });
+}
 var SelectEndpointType = ModeSelectDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
@@ -158265,6 +158350,10 @@ var InputSelectEndpointType = ModeSelectDevice.with(
   InputSelectModeServer
 );
 function SelectDevice(homeAssistantEntity) {
+  const asSwitch = selectAsSwitch(homeAssistantEntity, SelectSwitchType);
+  if (asSwitch) {
+    return asSwitch;
+  }
   const attrs = homeAssistantEntity.entity.state.attributes;
   const options = attrs.options ?? [];
   if (options.length === 0) {
@@ -158282,6 +158371,10 @@ function SelectDevice(homeAssistantEntity) {
   });
 }
 function InputSelectDevice(homeAssistantEntity) {
+  const asSwitch = selectAsSwitch(homeAssistantEntity, InputSelectSwitchType);
+  if (asSwitch) {
+    return asSwitch;
+  }
   const attrs = homeAssistantEntity.entity.state.attributes;
   const options = attrs.options ?? [];
   if (options.length === 0) {
@@ -165497,6 +165590,36 @@ ${e?.toString()}`);
             });
           }
         }
+        const quietWindowMs = staleSessionQuietWindowMs(
+          this.dataProvider.featureFlags
+        );
+        const now = Date.now();
+        const supersededIds = new Set(
+          selectSupersededSessions(
+            [...sessionManager.sessions],
+            newSession,
+            quietWindowMs,
+            now
+          )
+        );
+        const closes = [];
+        for (const s of [...sessionManager.sessions]) {
+          if (!supersededIds.has(s.id) || s.subscriptions.size === 0) continue;
+          const quietSec = Math.round((now - s.timestamp) / 1e3);
+          this.log.info(
+            `Closing superseded session ${s.id} (peer ${s.peerNodeId}, ${s.subscriptions.size} subs, quiet ${quietSec}s), replaced by session ${newSession.id}`
+          );
+          closes.push(
+            s.initiateClose().catch(
+              () => s.initiateForceClose({
+                cause: new Error("superseded session, forcing")
+              })
+            )
+          );
+        }
+        if (closes.length > 0) {
+          Promise.allSettled(closes).then(() => this.triggerMdnsReAnnounce());
+        }
       };
       this.sessionDeletedHandler = (session) => {
         this.sessionStartedAt.delete(session.id);