@riddix/hamh 2.1.0-alpha.704 → 2.1.0-alpha.706

package/dist/backend/cli.js

@@ -126210,6 +126210,7 @@ function entityMappingApi(mappingStorage) {
       disableClimateOnOff: body.disableClimateOnOff,
       disableClimateFanControl: body.disableClimateFanControl,
       climateKeepModeOnIdle: body.climateKeepModeOnIdle,
+      climateExposeFan: body.climateExposeFan,
       composedEntities: body.composedEntities
     };
     const config11 = await mappingStorage.setMapping(request);
@@ -126676,7 +126677,8 @@ function configToProfileEntry(config11) {
     coverSliderDebounceMs: config11.coverSliderDebounceMs,
     disableClimateOnOff: config11.disableClimateOnOff,
     disableClimateFanControl: config11.disableClimateFanControl,
-    climateKeepModeOnIdle: config11.climateKeepModeOnIdle
+    climateKeepModeOnIdle: config11.climateKeepModeOnIdle,
+    climateExposeFan: config11.climateExposeFan
   };
 }
 function mappingProfileApi(mappingStorage) {
@@ -126801,7 +126803,8 @@ function mappingProfileApi(mappingStorage) {
           coverSliderDebounceMs: entry.coverSliderDebounceMs,
           disableClimateOnOff: entry.disableClimateOnOff,
           disableClimateFanControl: entry.disableClimateFanControl,
-          climateKeepModeOnIdle: entry.climateKeepModeOnIdle
+          climateKeepModeOnIdle: entry.climateKeepModeOnIdle,
+          climateExposeFan: entry.climateExposeFan
         });
         applied++;
       } catch (e) {
@@ -130737,9 +130740,10 @@ var EntityMappingStorage = class extends Service {
       disableClimateOnOff: request.disableClimateOnOff || void 0,
       disableClimateFanControl: request.disableClimateFanControl || void 0,
       climateKeepModeOnIdle: request.climateKeepModeOnIdle || void 0,
+      climateExposeFan: request.climateExposeFan || 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.valetudoIdentifier && !config11.coverSwapOpenClose && !config11.coverSliderDebounceMs && !config11.disableClimateOnOff && !config11.disableClimateFanControl && !config11.climateKeepModeOnIdle && (!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.valetudoIdentifier && !config11.coverSwapOpenClose && !config11.coverSliderDebounceMs && !config11.disableClimateOnOff && !config11.disableClimateFanControl && !config11.climateKeepModeOnIdle && !config11.climateExposeFan && (!config11.composedEntities || config11.composedEntities.length === 0)) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config11);
@@ -148777,6 +148781,65 @@ function _autoSupported(sequence) {
   }
 }
 
+// src/utils/converters/fan-mode-order.ts
+var SPEED_RANK = {
+  quiet: 0,
+  silent: 0,
+  sleep: 0,
+  eco: 0,
+  mute: 0,
+  min: 0,
+  minimum: 0,
+  low: 1,
+  lo: 1,
+  slow: 1,
+  weak: 1,
+  light: 1,
+  mediumlow: 2,
+  midlow: 2,
+  medium: 3,
+  mid: 3,
+  med: 3,
+  normal: 3,
+  moderate: 3,
+  standard: 3,
+  mediumhigh: 4,
+  midhigh: 4,
+  high: 5,
+  hi: 5,
+  fast: 5,
+  strong: 6,
+  powerful: 6,
+  power: 6,
+  focus: 6,
+  turbo: 7,
+  max: 7,
+  maximum: 7,
+  boost: 7,
+  jet: 7
+};
+function rankOf(token) {
+  const key = token.toLowerCase().replace(/[ _-]/g, "");
+  if (key in SPEED_RANK) {
+    return SPEED_RANK[key];
+  }
+  const level = key.match(/^level(\d+)$/);
+  if (level) {
+    return Number(level[1]);
+  }
+  if (/^\d+$/.test(key)) {
+    return Number(key);
+  }
+  return void 0;
+}
+function toAscendingSpeedPresets(presets) {
+  const ranks = presets.map(rankOf);
+  if (ranks.some((rank) => rank === void 0)) {
+    return presets.slice();
+  }
+  return presets.map((value, index) => ({ value, index, rank: ranks[index] })).sort((a, b) => a.rank - b.rank || a.index - b.index).map((entry) => entry.value);
+}
+
 // src/utils/converters/fan-speed.ts
 var FanSpeed = class _FanSpeed {
   constructor(currentSpeed, maxSpeed) {
@@ -149198,8 +149261,8 @@ var FanControlServerBase = class extends FeaturedBase5 {
       );
       speed = percentage === 0 ? 0 : Math.max(1, Math.ceil(speedMax * (percentage / 100)));
     } else {
-      const speedPresets = presetModes.filter(
-        (m) => m.toLowerCase() !== "auto"
+      const speedPresets = toAscendingSpeedPresets(
+        presetModes.filter((m) => m.toLowerCase() !== "auto")
       );
       speedMax = Math.max(
         minSpeedMax,
@@ -149356,8 +149419,8 @@ var FanControlServerBase = class extends FeaturedBase5 {
       homeAssistant.callAction(config11.turnOn(clampedPercentage, this.agent));
     } else {
       const presetModes = config11.getPresetModes(homeAssistant.entity.state, this.agent) ?? [];
-      const speedPresets = presetModes.filter(
-        (m) => m.toLowerCase() !== "auto"
+      const speedPresets = toAscendingSpeedPresets(
+        presetModes.filter((m) => m.toLowerCase() !== "auto")
       );
       if (speedPresets.length > 0) {
         const presetIndex = Math.min(