@riddix/hamh 2.1.0-alpha.399 → 2.1.0-alpha.401

package/dist/backend/cli.js

@@ -166940,41 +166940,6 @@ function buildEntityPayload(registry2, entityId) {
     deviceRegistry
   };
 }
-function buildAirPurifierSubType(attributes7, mapping) {
-  const supportedFeatures = attributes7.supported_features ?? 0;
-  const features2 = /* @__PURE__ */ new Set();
-  if (testBit(supportedFeatures, FanDeviceFeature.SET_SPEED)) {
-    features2.add("MultiSpeed");
-    features2.add("Step");
-  }
-  if (testBit(supportedFeatures, FanDeviceFeature.PRESET_MODE)) {
-    features2.add("Auto");
-  }
-  if (testBit(supportedFeatures, FanDeviceFeature.DIRECTION)) {
-    features2.add("AirflowDirection");
-  }
-  if (testBit(supportedFeatures, FanDeviceFeature.OSCILLATE)) {
-    features2.add("Rocking");
-  }
-  const presetModes = attributes7.preset_modes ?? [];
-  const hasWindModes = presetModes.some(
-    (m) => m.toLowerCase() === "natural" || m.toLowerCase() === "nature" || m.toLowerCase() === "sleep"
-  );
-  if (hasWindModes) {
-    features2.add("Wind");
-  }
-  let device = AirPurifierDevice.with(
-    IdentifyServer2,
-    HomeAssistantEntityBehavior,
-    FanOnOffServer,
-    FanFanControlServer.with(...features2)
-  );
-  const hasFilterLife = attributes7.filter_life != null || attributes7.filter_life_remaining != null || attributes7.filter_life_level != null || !!mapping?.filterLifeEntity;
-  if (hasFilterLife) {
-    device = device.with(AirPurifierHepaFilterMonitoringServer);
-  }
-  return device;
-}
 var coolingModes = [
   ClimateHvacMode.heat_cool,
   ClimateHvacMode.cool
@@ -167069,11 +167034,40 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
     const { registry: registry2, primaryEntityId } = config10;
     const primaryPayload = buildEntityPayload(registry2, primaryEntityId);
     if (!primaryPayload) return void 0;
-    let parentType = BridgedNodeEndpoint.with(
+    const airPurifierAttributes = primaryPayload.state.attributes;
+    const supportedFeatures = airPurifierAttributes.supported_features ?? 0;
+    const features2 = /* @__PURE__ */ new Set();
+    if (testBit(supportedFeatures, FanDeviceFeature.SET_SPEED)) {
+      features2.add("MultiSpeed");
+      features2.add("Step");
+    }
+    if (testBit(supportedFeatures, FanDeviceFeature.PRESET_MODE)) {
+      features2.add("Auto");
+    }
+    if (testBit(supportedFeatures, FanDeviceFeature.DIRECTION)) {
+      features2.add("AirflowDirection");
+    }
+    if (testBit(supportedFeatures, FanDeviceFeature.OSCILLATE)) {
+      features2.add("Rocking");
+    }
+    const presetModes = airPurifierAttributes.preset_modes ?? [];
+    const hasWindModes = presetModes.some(
+      (m) => m.toLowerCase() === "natural" || m.toLowerCase() === "nature" || m.toLowerCase() === "sleep"
+    );
+    if (hasWindModes) {
+      features2.add("Wind");
+    }
+    let parentType = AirPurifierDevice.with(
       BasicInformationServer2,
       IdentifyServer2,
-      HomeAssistantEntityBehavior
+      HomeAssistantEntityBehavior,
+      FanOnOffServer,
+      FanFanControlServer.with(...features2)
     );
+    const hasFilterLife = airPurifierAttributes.filter_life != null || airPurifierAttributes.filter_life_remaining != null || airPurifierAttributes.filter_life_level != null || !!config10.mapping?.filterLifeEntity;
+    if (hasFilterLife) {
+      parentType = parentType.with(AirPurifierHepaFilterMonitoringServer);
+    }
     const mapping = {
       entityId: primaryEntityId,
       ...config10.batteryEntityId ? { batteryEntity: config10.batteryEntityId } : {},
@@ -167093,22 +167087,6 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
     const endpointId = createEndpointId2(primaryEntityId, config10.customName);
     const parts = [];
     const subEndpointMap = /* @__PURE__ */ new Map();
-    const airPurifierAttributes = primaryPayload.state.attributes;
-    const airPurifierSubType = buildAirPurifierSubType(
-      airPurifierAttributes,
-      config10.mapping
-    );
-    const airPurifierSub = new Endpoint(
-      airPurifierSubType.set({
-        homeAssistantEntity: {
-          entity: primaryPayload,
-          mapping
-        }
-      }),
-      { id: `${endpointId}_purifier` }
-    );
-    parts.push(airPurifierSub);
-    subEndpointMap.set(primaryEntityId, airPurifierSub);
     let tempSub;
     if (config10.temperatureEntityId) {
       const tempPayload = buildEntityPayload(
@@ -167174,7 +167152,7 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
       endpoint.subEndpoints.set(entityId, sub);
     }
     const subLabels = [
-      "AirPurifier",
+      "AirPurifier(parent)",
       tempSub ? "+Temp" : "",
       humSub ? "+Hum" : "",
       climateSub ? "+Therm" : "",
@@ -173043,14 +173021,14 @@ function RvcCleanModeServer2(config10, initialState) {
   const defaultModes = [
     {
       label: "Vacuum",
-      mode: 1,
+      mode: 0,
       modeTags: [{ value: RvcCleanMode3.ModeTag.Vacuum }]
     }
   ];
   return RvcCleanModeServerBase.set({
     config: config10,
     supportedModes: initialState?.supportedModes ?? defaultModes,
-    currentMode: initialState?.currentMode ?? 1
+    currentMode: initialState?.currentMode ?? 0
   });
 }
 
@@ -173646,7 +173624,16 @@ function createDefaultRvcCleanModeServer() {
     ],
     setCleanMode: () => void 0
   };
-  return RvcCleanModeServer2(defaultConfig2);
+  return RvcCleanModeServer2(defaultConfig2, {
+    supportedModes: [
+      {
+        label: "Vacuum",
+        mode: MODE_VACUUM,
+        modeTags: [{ value: RvcCleanMode3.ModeTag.Vacuum }]
+      }
+    ],
+    currentMode: MODE_VACUUM
+  });
 }
 function supportsCleaningModes(attributes7) {
   return isDreameVacuum(attributes7) || isEcovacsVacuum(attributes7);