@riddix/hamh 2.1.0-alpha.766 → 2.1.0-alpha.768

package/dist/backend/cli.js

@@ -126316,6 +126316,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     climateAutoMode: config11.climateAutoMode,
                     customServiceAreas: config11.customServiceAreas,
                     customFanSpeedTags: config11.customFanSpeedTags,
+                    fanWindPresets: config11.fanWindPresets,
                     composedEntities: config11.composedEntities
                   });
                   mappingsRestored++;
@@ -126466,6 +126467,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                   climateAutoMode: config11.climateAutoMode,
                   customServiceAreas: config11.customServiceAreas,
                   customFanSpeedTags: config11.customFanSpeedTags,
+                  fanWindPresets: config11.fanWindPresets,
                   composedEntities: config11.composedEntities
                 });
                 mappingsRestored++;
@@ -127300,6 +127302,7 @@ function entityMappingApi(mappingStorage) {
       mopIntensityEntity: body.mopIntensityEntity,
       customServiceAreas: body.customServiceAreas,
       customFanSpeedTags: body.customFanSpeedTags,
+      fanWindPresets: body.fanWindPresets,
       currentRoomEntity: body.currentRoomEntity,
       cleanedAreaEntity: body.cleanedAreaEntity,
       disableCustomAreaRoomModes: body.disableCustomAreaRoomModes,
@@ -127785,6 +127788,7 @@ function configToProfileEntry(config11) {
     mopIntensityEntity: config11.mopIntensityEntity,
     customServiceAreas: config11.customServiceAreas,
     customFanSpeedTags: config11.customFanSpeedTags,
+    fanWindPresets: config11.fanWindPresets,
     valetudoIdentifier: config11.valetudoIdentifier,
     coverSwapOpenClose: config11.coverSwapOpenClose,
     coverSliderDebounceMs: config11.coverSliderDebounceMs,
@@ -127912,6 +127916,7 @@ function mappingProfileApi(mappingStorage) {
           mopIntensityEntity: entry.mopIntensityEntity,
           customServiceAreas: entry.customServiceAreas,
           customFanSpeedTags: entry.customFanSpeedTags,
+          fanWindPresets: entry.fanWindPresets,
           valetudoIdentifier: entry.valetudoIdentifier,
           coverSwapOpenClose: entry.coverSwapOpenClose,
           coverSliderDebounceMs: entry.coverSliderDebounceMs,
@@ -132068,6 +132073,7 @@ var EntityMappingStorage = class extends Service {
         (a) => a.name?.trim() && a.service?.trim()
       ) ?? void 0,
       customFanSpeedTags: request.customFanSpeedTags && Object.keys(request.customFanSpeedTags).length > 0 ? request.customFanSpeedTags : void 0,
+      fanWindPresets: request.fanWindPresets && ((request.fanWindPresets.natural?.length ?? 0) > 0 || (request.fanWindPresets.sleep?.length ?? 0) > 0) ? request.fanWindPresets : void 0,
       currentRoomEntity: request.currentRoomEntity?.trim() || void 0,
       cleanedAreaEntity: request.cleanedAreaEntity?.trim() || void 0,
       disableCustomAreaRoomModes: request.disableCustomAreaRoomModes || void 0,
@@ -132083,7 +132089,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.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.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);
@@ -148478,6 +148484,7 @@ var PluginManager = class {
 init_dist();
 
 // src/utils/json/create-bridge-server-config.ts
+init_esm();
 import crypto5 from "node:crypto";
 
 // ../../node_modules/.pnpm/@matter+main@0.17.3/node_modules/@matter/main/dist/esm/endpoints.js
@@ -148736,7 +148743,14 @@ function createBridgeServerConfig(data) {
     type: ServerNode.RootEndpoint,
     id: data.id,
     network: {
-      port: data.port
+      port: data.port,
+      // No jitter: matter.js adds up to 10s over the controller's max interval,
+      // pushing our keepalive past Google's ceiling so it drops the sub (#386).
+      subscriptionOptions: {
+        minInterval: Seconds(2),
+        maxInterval: Seconds(60),
+        randomizationWindow: Seconds(0)
+      }
     },
     productDescription: {
       name: data.name,
@@ -151235,7 +151249,14 @@ function FanControlServer2(config11, defaults = {}) {
 }
 
 // src/matter/endpoints/legacy/fan/behaviors/fan-fan-control-server.ts
+init_home_assistant_entity_behavior();
 var attributes2 = (e) => e.attributes;
+var windPresets = (agent) => agent.get(HomeAssistantEntityBehavior).state.mapping?.fanWindPresets ?? {};
+var isEnglishNatural = (m) => {
+  const lower = m.toLowerCase();
+  return lower === "natural" || lower === "nature";
+};
+var isEnglishSleep = (m) => m.toLowerCase() === "sleep";
 var fanControlConfig = {
   getPercentage: (state) => state.state === "off" ? 0 : attributes2(state).percentage,
   getStepSize: (state) => attributes2(state).percentage_step,
@@ -151254,17 +151275,22 @@ var fanControlConfig = {
     attributes2(state).supported_features ?? 0,
     FanDeviceFeature.OSCILLATE
   ),
-  // Wind mode support - check if preset_modes contains natural/sleep
-  getWindMode: (state) => {
-    const mode = attributes2(state).preset_mode?.toLowerCase();
-    if (mode === "natural" || mode === "nature") return "natural";
-    if (mode === "sleep") return "sleep";
+  // Wind mode support - localized presets via mapping, english as fallback
+  getWindMode: (state, agent) => {
+    const mode = attributes2(state).preset_mode;
+    if (!mode) return void 0;
+    const presets = windPresets(agent);
+    if (presets.natural?.includes(mode)) return "natural";
+    if (presets.sleep?.includes(mode)) return "sleep";
+    if (isEnglishNatural(mode)) return "natural";
+    if (isEnglishSleep(mode)) return "sleep";
     return void 0;
   },
-  supportsWind: (state) => {
+  supportsWind: (state, agent) => {
     const modes = attributes2(state).preset_modes ?? [];
+    const presets = windPresets(agent);
     return modes.some(
-      (m) => m.toLowerCase() === "natural" || m.toLowerCase() === "nature" || m.toLowerCase() === "sleep"
+      (m) => isEnglishNatural(m) || isEnglishSleep(m) || !!presets.natural?.includes(m) || !!presets.sleep?.includes(m)
     );
   },
   turnOff: () => ({ action: "fan.turn_off" }),
@@ -151287,12 +151313,29 @@ var fanControlConfig = {
     action: "fan.oscillate",
     data: { oscillating }
   }),
-  setWindMode: (mode) => ({
-    action: "fan.set_preset_mode",
-    data: {
-      preset_mode: mode === "natural" ? "Natural" : mode === "sleep" ? "Sleep" : "Normal"
+  setWindMode: (mode, agent) => {
+    const presets = windPresets(agent);
+    let presetMode;
+    if (mode === "natural") {
+      presetMode = presets.natural?.[0] ?? "Natural";
+    } else if (mode === "sleep") {
+      presetMode = presets.sleep?.[0] ?? "Sleep";
+    } else {
+      const wind = /* @__PURE__ */ new Set([
+        ...presets.natural ?? [],
+        ...presets.sleep ?? []
+      ]);
+      const entityState = agent.get(HomeAssistantEntityBehavior).state.entity.state;
+      const modes = attributes2(entityState).preset_modes ?? [];
+      presetMode = modes.find(
+        (m) => !wind.has(m) && !isEnglishNatural(m) && !isEnglishSleep(m)
+      ) ?? "Normal";
     }
-  })
+    return {
+      action: "fan.set_preset_mode",
+      data: { preset_mode: presetMode }
+    };
+  }
 };
 var FanFanControlServer = FanControlServer2(fanControlConfig);
 
@@ -155147,7 +155190,7 @@ function FanDevice2(homeAssistantEntity) {
     features3.add("MultiSpeed");
     features3.add("Step");
   }
-  if (hasPresetMode) {
+  if (hasPresetMode && presetModes.some((m) => /auto/i.test(m))) {
     features3.add("Auto");
   }
   if (testBit(supportedFeatures, FanDeviceFeature.DIRECTION)) {
@@ -155156,8 +155199,9 @@ function FanDevice2(homeAssistantEntity) {
   if (testBit(supportedFeatures, FanDeviceFeature.OSCILLATE)) {
     features3.add("Rocking");
   }
+  const windPresets2 = homeAssistantEntity.mapping?.fanWindPresets;
   const hasWindModes = presetModes.some(
-    (m) => m.toLowerCase() === "natural" || m.toLowerCase() === "nature" || m.toLowerCase() === "sleep"
+    (m) => m.toLowerCase() === "natural" || m.toLowerCase() === "nature" || m.toLowerCase() === "sleep" || !!windPresets2?.natural?.includes(m) || !!windPresets2?.sleep?.includes(m)
   );
   if (hasWindModes) {
     features3.add("Wind");