@riddix/hamh 2.1.0-alpha.367 → 2.1.0-alpha.368

package/dist/backend/cli.js

@@ -151141,9 +151141,12 @@ var EntityMappingStorage = class extends Service {
       energyEntity: request.energyEntity?.trim() || void 0,
       pressureEntity: request.pressureEntity?.trim() || void 0,
       suctionLevelEntity: request.suctionLevelEntity?.trim() || void 0,
-      mopIntensityEntity: request.mopIntensityEntity?.trim() || void 0
+      mopIntensityEntity: request.mopIntensityEntity?.trim() || void 0,
+      customServiceAreas: request.customServiceAreas?.filter(
+        (a) => a.name?.trim() && a.service?.trim()
+      ) ?? 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) {
+    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)) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config10);
@@ -171966,6 +171969,28 @@ function createDefaultServiceAreaServer() {
     currentArea: null
   });
 }
+function createCustomServiceAreaServer(customAreas) {
+  const supportedAreas = customAreas.map((area, index) => ({
+    areaId: index + 1,
+    mapId: null,
+    areaInfo: {
+      locationInfo: {
+        locationName: area.name,
+        floorNumber: null,
+        areaType: null
+      },
+      landmarkInfo: null
+    }
+  }));
+  logger179.info(
+    `Using ${customAreas.length} custom service areas: ${customAreas.map((a) => a.name).join(", ")}`
+  );
+  return ServiceAreaServer2({
+    supportedAreas,
+    selectedAreas: [],
+    currentArea: null
+  });
+}
 
 // src/matter/endpoints/legacy/vacuum/behaviors/vacuum-rvc-run-mode-server.ts
 var logger180 = Logger.get("VacuumRvcRunModeServer");
@@ -171995,6 +172020,33 @@ function buildSupportedModes2(attributes7, includeUnnamedRooms = false) {
   }
   return modes;
 }
+function handleCustomServiceAreas(selectedAreas, customAreas, homeAssistant, serviceArea) {
+  serviceArea.state.selectedAreas = [];
+  const matched = selectedAreas.map((areaId) => customAreas[areaId - 1]).filter(Boolean);
+  if (matched.length === 0) {
+    logger180.warn(
+      `Custom service areas: no match for selected IDs ${selectedAreas.join(", ")}`
+    );
+    return { action: "vacuum.start" };
+  }
+  logger180.info(
+    `Custom service areas: calling ${matched.length} service(s): ${matched.map((a) => `${a.service} (${a.name})`).join(", ")}`
+  );
+  for (let i = 1; i < matched.length; i++) {
+    const area = matched[i];
+    homeAssistant.callAction({
+      action: area.service,
+      target: area.target,
+      data: area.data
+    });
+  }
+  const first = matched[0];
+  return {
+    action: first.service,
+    target: first.target,
+    data: first.data
+  };
+}
 var vacuumRvcRunModeConfig = {
   getCurrentMode: (entity) => {
     const state = entity.state;
@@ -172024,6 +172076,15 @@ var vacuumRvcRunModeConfig = {
         const homeAssistant = agent.get(HomeAssistantEntityBehavior);
         const entity = homeAssistant.entity;
         const attributes7 = entity.state.attributes;
+        const customAreas = homeAssistant.state.mapping?.customServiceAreas;
+        if (customAreas && customAreas.length > 0) {
+          return handleCustomServiceAreas(
+            selectedAreas,
+            customAreas,
+            homeAssistant,
+            serviceArea
+          );
+        }
         const roomEntities = homeAssistant.state.mapping?.roomEntities;
         if (roomEntities && roomEntities.length > 0) {
           const buttonEntityIds = [];
@@ -173210,12 +173271,18 @@ function VacuumDevice(homeAssistantEntity, includeOnOff = false) {
     device = device.with(VacuumOnOffServer);
   }
   device = device.with(VacuumPowerSourceServer);
+  const customAreas = homeAssistantEntity.mapping?.customServiceAreas;
   const roomEntities = homeAssistantEntity.mapping?.roomEntities;
   const rooms = parseVacuumRooms(attributes7);
   logger185.info(
-    `${entityId}: roomEntities=${JSON.stringify(roomEntities ?? [])}, parsedRooms=${rooms.length}`
+    `${entityId}: customAreas=${customAreas?.length ?? 0}, roomEntities=${JSON.stringify(roomEntities ?? [])}, parsedRooms=${rooms.length}`
   );
-  if (rooms.length > 0 || roomEntities && roomEntities.length > 0) {
+  if (customAreas && customAreas.length > 0) {
+    logger185.info(
+      `${entityId}: Adding ServiceArea (${customAreas.length} custom areas)`
+    );
+    device = device.with(createCustomServiceAreaServer(customAreas));
+  } else if (rooms.length > 0 || roomEntities && roomEntities.length > 0) {
     logger185.info(`${entityId}: Adding ServiceArea (${rooms.length} rooms)`);
     device = device.with(
       createVacuumServiceAreaServer(attributes7, roomEntities)
@@ -175126,9 +175193,12 @@ function ServerModeVacuumDevice(homeAssistantEntity, includeOnOff = false) {
     device = device.with(VacuumOnOffServer);
   }
   device = device.with(VacuumPowerSourceServer);
+  const customAreas = homeAssistantEntity.mapping?.customServiceAreas;
   const roomEntities = homeAssistantEntity.mapping?.roomEntities;
   const rooms = parseVacuumRooms(attributes7);
-  if (rooms.length > 0 || roomEntities && roomEntities.length > 0) {
+  if (customAreas && customAreas.length > 0) {
+    device = device.with(createCustomServiceAreaServer(customAreas));
+  } else if (rooms.length > 0 || roomEntities && roomEntities.length > 0) {
     device = device.with(
       createVacuumServiceAreaServer(attributes7, roomEntities)
     );