@riddix/hamh 2.1.0-alpha.414 → 2.1.0-alpha.416

package/dist/backend/cli.js

@@ -148435,7 +148435,8 @@ function entityMappingApi(mappingStorage) {
       energyEntity: body.energyEntity,
       suctionLevelEntity: body.suctionLevelEntity,
       mopIntensityEntity: body.mopIntensityEntity,
-      customServiceAreas: body.customServiceAreas
+      customServiceAreas: body.customServiceAreas,
+      customFanSpeedTags: body.customFanSpeedTags
     };
     const config10 = await mappingStorage.setMapping(request);
     res.status(200).json(config10);
@@ -151322,9 +151323,10 @@ var EntityMappingStorage = class extends Service {
       mopIntensityEntity: request.mopIntensityEntity?.trim() || void 0,
       customServiceAreas: request.customServiceAreas?.filter(
         (a) => a.name?.trim() && a.service?.trim()
-      ) ?? void 0
+      ) ?? void 0,
+      customFanSpeedTags: request.customFanSpeedTags && Object.keys(request.customFanSpeedTags).length > 0 ? request.customFanSpeedTags : void 0
     };
-    if (!config10.matterDeviceType && !config10.customName && config10.disabled !== true && !config10.filterLifeEntity && !config10.cleaningModeEntity && !config10.humidityEntity && !config10.batteryEntity && !config10.roomEntities && !config10.disableLockPin && !config10.powerEntity && !config10.energyEntity && !config10.pressureEntity && !config10.suctionLevelEntity && !config10.mopIntensityEntity && (!config10.customServiceAreas || config10.customServiceAreas.length === 0)) {
+    if (!config10.matterDeviceType && !config10.customName && config10.disabled !== true && !config10.filterLifeEntity && !config10.cleaningModeEntity && !config10.humidityEntity && !config10.batteryEntity && !config10.roomEntities && !config10.disableLockPin && !config10.powerEntity && !config10.energyEntity && !config10.pressureEntity && !config10.suctionLevelEntity && !config10.mopIntensityEntity && (!config10.customServiceAreas || config10.customServiceAreas.length === 0) && (!config10.customFanSpeedTags || Object.keys(config10.customFanSpeedTags).length === 0)) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config10);
@@ -172733,8 +172735,8 @@ function buildSupportedModes2(attributes7, includeUnnamedRooms = false, customAr
   return modes;
 }
 function handleCustomServiceAreas(selectedAreas, customAreas, homeAssistant, serviceArea) {
-  serviceArea.state.selectedAreas = [];
   const matched = selectedAreas.map((areaId) => customAreas[areaId - 1]).filter(Boolean);
+  serviceArea.state.selectedAreas = [];
   if (matched.length === 0) {
     logger181.warn(
       `Custom service areas: no match for selected IDs ${selectedAreas.join(", ")}`
@@ -172783,8 +172785,8 @@ var vacuumRvcRunModeConfig = {
   start: (_, agent) => {
     try {
       const serviceArea = agent.get(ServiceAreaBehavior);
-      const selectedAreas = serviceArea.state.selectedAreas;
-      if (selectedAreas && selectedAreas.length > 0) {
+      const selectedAreas = [...serviceArea.state.selectedAreas];
+      if (selectedAreas.length > 0) {
         const homeAssistant = agent.get(HomeAssistantEntityBehavior);
         const entity = homeAssistant.entity;
         const attributes7 = entity.state.attributes;
@@ -173200,7 +173202,7 @@ function resolveCleanTypes(cleaningModeOptions) {
   }
   return types;
 }
-function buildSupportedModes3(fanSpeedList, mopIntensityList, cleaningModeOptions) {
+function buildSupportedModes3(fanSpeedList, mopIntensityList, cleaningModeOptions, customFanSpeedTags) {
   const cleanTypes = resolveCleanTypes(cleaningModeOptions);
   const modes = [
     {
@@ -173227,7 +173229,7 @@ function buildSupportedModes3(fanSpeedList, mopIntensityList, cleaningModeOption
     });
   }
   if (fanSpeedList && fanSpeedList.length > 0) {
-    modes.push(...buildFanSpeedModes(fanSpeedList));
+    modes.push(...buildFanSpeedModes(fanSpeedList, customFanSpeedTags));
   }
   const hasMopping = cleanTypes.has(1 /* Mopping */) || cleanTypes.has(2 /* SweepingAndMopping */);
   if (hasMopping && mopIntensityList && mopIntensityList.length > 0) {
@@ -173297,7 +173299,10 @@ var FAN_TAG_PATTERNS = [
     tag: RvcCleanMode3.ModeTag.Max
   }
 ];
-function getFanSpeedTag(name) {
+function getFanSpeedTag(name, customTags) {
+  if (customTags && customTags[name] !== void 0) {
+    return customTags[name];
+  }
   const s = name.toLowerCase().trim();
   for (const { pattern: pattern2, tag: tag3 } of FAN_TAG_PATTERNS) {
     if (pattern2.test(s)) return tag3;
@@ -173307,9 +173312,9 @@ function getFanSpeedTag(name) {
 function formatFanSpeedLabel(name) {
   return name.replace(/_/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
 }
-function buildFanSpeedModes(fanSpeedList) {
+function buildFanSpeedModes(fanSpeedList, customTags) {
   return fanSpeedList.map((name, index) => {
-    const tag3 = getFanSpeedTag(name);
+    const tag3 = getFanSpeedTag(name, customTags);
     const modeTags = [
       { value: RvcCleanMode3.ModeTag.Vacuum }
     ];
@@ -173491,7 +173496,7 @@ function buildCleaningModeAction(targetCleanType, agent) {
     target: selectEntityId
   };
 }
-function matchFanSpeedOption(name, availableOptions) {
+function matchFanSpeedOption(name, availableOptions, customTags) {
   if (!availableOptions || availableOptions.length === 0) return void 0;
   const s = name.toLowerCase();
   const exact = availableOptions.find((o) => o.toLowerCase() === s);
@@ -173500,7 +173505,7 @@ function matchFanSpeedOption(name, availableOptions) {
     (o) => o.toLowerCase().includes(s) || s.includes(o.toLowerCase())
   );
   if (contains) return contains;
-  const tag3 = getFanSpeedTag(name);
+  const tag3 = getFanSpeedTag(name, customTags);
   if (tag3 !== void 0) {
     const group = FAN_TAG_PATTERNS.find((p) => p.tag === tag3);
     if (group) {
@@ -173535,7 +173540,7 @@ function readSelectEntity(entityId, agent) {
     options: attrs?.options
   };
 }
-function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptions) {
+function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptions, customFanSpeedTags) {
   const hasCleanTypes = !!cleaningModeOptions && cleaningModeOptions.length > 0;
   return {
     getCurrentMode: (entity, agent) => {
@@ -173600,13 +173605,18 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
       }
       return cleanTypeToModeId(cleanType);
     },
-    getSupportedModes: () => buildSupportedModes3(fanSpeedList, mopIntensityList, cleaningModeOptions),
+    getSupportedModes: () => buildSupportedModes3(
+      fanSpeedList,
+      mopIntensityList,
+      cleaningModeOptions,
+      customFanSpeedTags
+    ),
     setCleanMode: (mode, agent) => {
       const homeAssistant = agent.get(HomeAssistantEntityBehavior);
       const vacuumEntityId = homeAssistant.entityId;
       const mapping = homeAssistant.state.mapping;
       logger183.info(
-        `setCleanMode(${mode}) for ${vacuumEntityId} \u2014 suctionEntity=${mapping?.suctionLevelEntity ?? "none"}, mopEntity=${mapping?.mopIntensityEntity ?? "none"}, fanSpeedList=${JSON.stringify(fanSpeedList ?? [])}, mopIntensityList=${JSON.stringify(mopIntensityList ?? [])}`
+        `setCleanMode(${mode}) for ${vacuumEntityId} \u2014 suctionEntity=${mapping?.suctionLevelEntity ?? "none"}, mopEntity=${mapping?.mopIntensityEntity ?? "none"}, fanSpeedList=${JSON.stringify(fanSpeedList ?? [])}, mopIntensityList=${JSON.stringify(mopIntensityList ?? [])}, customTags=${JSON.stringify(customFanSpeedTags ?? {})}`
       );
       if (mopIntensityList && mopIntensityList.length > 0 && isMopIntensityMode(mode)) {
         const mopIndex = mode - MOP_INTENSITY_MODE_BASE;
@@ -173675,7 +173685,11 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
           logger183.info(
             `Suction entity ${mapping.suctionLevelEntity}: current="${state}", options=${JSON.stringify(options ?? [])}`
           );
-          let option = matchFanSpeedOption(fanSpeedName, options);
+          let option = matchFanSpeedOption(
+            fanSpeedName,
+            options,
+            customFanSpeedTags
+          );
           if (!option && options && fanSpeedIndex < options.length) {
             option = options[fanSpeedIndex];
             logger183.info(
@@ -173735,14 +173749,15 @@ function createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptio
     }
   };
 }
-function createVacuumRvcCleanModeServer(_attributes, fanSpeedList, mopIntensityList, cleaningModeOptions) {
+function createVacuumRvcCleanModeServer(_attributes, fanSpeedList, mopIntensityList, cleaningModeOptions, customFanSpeedTags) {
   const supportedModes = buildSupportedModes3(
     fanSpeedList,
     mopIntensityList,
-    cleaningModeOptions
+    cleaningModeOptions,
+    customFanSpeedTags
   );
   logger183.info(
-    `Creating VacuumRvcCleanModeServer with ${supportedModes.length} modes (fanSpeedList=${JSON.stringify(fanSpeedList ?? [])}, mopIntensityList=${JSON.stringify(mopIntensityList ?? [])}, cleaningModeOptions=${JSON.stringify(cleaningModeOptions ?? [])})`
+    `Creating VacuumRvcCleanModeServer with ${supportedModes.length} modes (fanSpeedList=${JSON.stringify(fanSpeedList ?? [])}, mopIntensityList=${JSON.stringify(mopIntensityList ?? [])}, cleaningModeOptions=${JSON.stringify(cleaningModeOptions ?? [])}, customTags=${JSON.stringify(customFanSpeedTags ?? {})})`
   );
   logger183.info(
     `Modes: ${supportedModes.map((m) => `${m.mode}:${m.label}[${m.modeTags.map((t) => t.value).join(",")}]`).join(", ")}`
@@ -173752,7 +173767,12 @@ function createVacuumRvcCleanModeServer(_attributes, fanSpeedList, mopIntensityL
     currentMode: MODE_VACUUM
   };
   return RvcCleanModeServer2(
-    createCleanModeConfig(fanSpeedList, mopIntensityList, cleaningModeOptions),
+    createCleanModeConfig(
+      fanSpeedList,
+      mopIntensityList,
+      cleaningModeOptions,
+      customFanSpeedTags
+    ),
     initialState
   );
 }
@@ -174067,7 +174087,8 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false, minimalClusters
         attributes7,
         fanSpeedList,
         mopIntensityList,
-        cleaningModeOptions
+        cleaningModeOptions,
+        homeAssistantEntity.mapping?.customFanSpeedTags
       )
     );
   } else {
@@ -176137,7 +176158,8 @@ function ServerModeVacuumDevice(homeAssistantEntity, includeOnOff = false, minim
         attributes7,
         fanSpeedList,
         mopIntensityList,
-        cleaningModeOptions
+        cleaningModeOptions,
+        homeAssistantEntity.mapping?.customFanSpeedTags
       )
     );
   } else {