@riddix/hamh 2.1.0-alpha.792 → 2.1.0-alpha.794

package/dist/backend/cli.js

@@ -125304,6 +125304,12 @@ var init_bridge_config_schema = __esm({
           description: "Append a suffix to every entity serial number on this bridge. Useful for forcing controllers like Aqara to treat devices as new and bypass cached device data. Leave empty for default behavior.",
           maxLength: 16
         },
+        uniqueIdSuffix: {
+          title: "Unique ID Suffix",
+          type: "string",
+          description: "Mixed into the unique ID of every bridged device on this bridge (standard bridge mode). Controllers like Alexa cache device records keyed on the unique ID, so setting or changing this can help mint fresh identities. Applies after a bridge restart, then re-discover in the controller. Leave empty for default behavior.",
+          maxLength: 16
+        },
         sessionMaxAgeHours: {
           title: "Session Rotation Max Age (hours)",
           type: "number",
@@ -147720,6 +147726,9 @@ var BridgeDataProvider = class extends Service {
   get serialNumberSuffix() {
     return this.data.serialNumberSuffix;
   }
+  get uniqueIdSuffix() {
+    return this.data.uniqueIdSuffix;
+  }
   get sessionMaxAgeHours() {
     return this.data.sessionMaxAgeHours;
   }
@@ -147753,6 +147762,7 @@ var BridgeDataProvider = class extends Service {
       icon: this.icon,
       priority: this.priority,
       serialNumberSuffix: this.serialNumberSuffix,
+      uniqueIdSuffix: this.uniqueIdSuffix,
       sessionMaxAgeHours: this.sessionMaxAgeHours,
       status: status3.code,
       statusReason: status3.reason,
@@ -149965,6 +149975,7 @@ init_esm7();
 import crypto6 from "node:crypto";
 init_home_assistant_entity_behavior();
 var logger191 = Logger.get("BasicInformationServer");
+var appliedUniqueIds = /* @__PURE__ */ new Map();
 var BasicInformationServer2 = class extends BridgedDeviceBasicInformationServer {
   async initialize() {
     await super.initialize();
@@ -150004,12 +150015,24 @@ var BasicInformationServer2 = class extends BridgedDeviceBasicInformationServer
       serialNumber,
       // UniqueId helps controllers (especially Alexa) identify devices across
       // multiple fabric connections. Using MD5 hash of entity_id for stability.
-      uniqueId: crypto6.createHash("md5").update(entity.entity_id).digest("hex").substring(0, 32)
+      // uniqueIdSuffix mints a fresh identity so stale controller cloud
+      // records keyed on it can be shed (#385).
+      uniqueId: this.frozenUniqueId(entity.entity_id)
     });
     logger191.debug(
       `[${entity.entity_id}] basicInfo vendor=${this.state.vendorName} product=${this.state.productName} label=${this.state.productLabel} serial=${this.state.serialNumber} node=${this.state.nodeLabel}`
     );
   }
+  frozenUniqueId(entityId) {
+    const provider = this.env.get(BridgeDataProvider);
+    const key = `${provider.id}:${entityId}`;
+    let uniqueId = appliedUniqueIds.get(key);
+    if (uniqueId == null) {
+      uniqueId = crypto6.createHash("md5").update(entityId + (provider.uniqueIdSuffix ?? "")).digest("hex").substring(0, 32);
+      appliedUniqueIds.set(key, uniqueId);
+    }
+    return uniqueId;
+  }
 };
 function ellipse(maxLength, value) {
   return trimToLength(value, maxLength, "...");
@@ -150216,6 +150239,47 @@ var HaElectricalPowerMeasurementServer = ElectricalPowerMeasurementServerBase.se
   ]
 });
 
+// src/matter/behaviors/fan-speed-memory.ts
+init_esm7();
+
+// ../../node_modules/.pnpm/@matter+main@0.17.3/node_modules/@matter/main/dist/esm/model.js
+init_nodejs();
+init_esm2();
+
+// src/matter/behaviors/fan-speed-memory.ts
+var FanSpeedMemoryBehavior = class extends Behavior {
+  static id = "fanSpeedMemory";
+  static schema = new DatatypeModel(
+    { name: "FanSpeedMemoryState", type: "struct" },
+    FieldElement({
+      name: "lastPercent",
+      type: "uint8",
+      quality: "N",
+      default: 0
+    }),
+    FieldElement({
+      name: "lastSpeed",
+      type: "uint8",
+      quality: "N",
+      default: 0
+    }),
+    FieldElement({
+      name: "lastAuto",
+      type: "bool",
+      quality: "N",
+      default: false
+    })
+  );
+};
+((FanSpeedMemoryBehavior2) => {
+  class State {
+    lastPercent = 0;
+    lastSpeed = 0;
+    lastAuto = false;
+  }
+  FanSpeedMemoryBehavior2.State = State;
+})(FanSpeedMemoryBehavior || (FanSpeedMemoryBehavior = {}));
+
 // src/matter/endpoints/composed/composed-air-purifier-endpoint.ts
 init_home_assistant_entity_behavior();
 
@@ -150979,10 +151043,26 @@ var FeaturedBase5 = FanControlServer.with(
   windSupport: { naturalWind: true, sleepWind: true }
 });
 var FanControlServerBase = class extends FeaturedBase5 {
-  // Track last non-zero fan speed for restore on turn-on (#225)
+  // Fallback last-speed tracking for endpoints without FanSpeedMemoryBehavior
+  // (climate companion, humidifier). matter.js builds behavior instances per
+  // transaction, so these fields only live within one interaction; fans use
+  // the persisted memory behavior instead (#225/#387).
   lastNonZeroPercent = 0;
   lastNonZeroSpeed = 0;
   lastIsAutoMode = false;
+  // Remembered speed, read at decision time. Behavior state survives
+  // transactions and restarts, instance fields do not (#387).
+  remembered() {
+    if (this.agent.has(FanSpeedMemoryBehavior)) {
+      const s = this.agent.get(FanSpeedMemoryBehavior).state;
+      return { percent: s.lastPercent, speed: s.lastSpeed, auto: s.lastAuto };
+    }
+    return {
+      percent: this.lastNonZeroPercent,
+      speed: this.lastNonZeroSpeed,
+      auto: this.lastIsAutoMode
+    };
+  }
   async initialize() {
     if (this.features.multiSpeed) {
       if (this.state.speedMax == null || this.state.speedMax < minSpeedMax) {
@@ -151000,6 +151080,13 @@ var FanControlServerBase = class extends FeaturedBase5 {
         this.lastNonZeroSpeed = ss;
       }
     }
+    if (this.agent.has(FanSpeedMemoryBehavior)) {
+      const memory = await this.agent.load(FanSpeedMemoryBehavior);
+      if (memory.state.lastPercent === 0 && this.lastNonZeroPercent > 0) {
+        memory.state.lastPercent = this.lastNonZeroPercent;
+        memory.state.lastSpeed = this.lastNonZeroSpeed;
+      }
+    }
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     this.update(homeAssistant.entity);
     this.reactTo(homeAssistant.onChange, this.update);
@@ -151095,6 +151182,7 @@ var FanControlServerBase = class extends FeaturedBase5 {
       this.lastNonZeroPercent = percentage;
       this.lastNonZeroSpeed = speed;
       this.lastIsAutoMode = config11.isInAutoMode(entity.state, this.agent);
+      this.persistSpeed(this.lastIsAutoMode);
     }
     try {
       applyPatchState(this.state, {
@@ -151207,20 +151295,21 @@ var FanControlServerBase = class extends FeaturedBase5 {
     }
     const restoreOnPowerOn = homeAssistant.state.mapping?.fanRestoreSpeedOnPowerOn === true;
     const wasOff = homeAssistant.entity.state?.state === "off" || this.agent.has(OnOffBehavior) && !this.agent.get(OnOffBehavior).state.onOff;
+    const remembered = this.remembered();
     if (wasOff) {
       logger198.debug(
-        `[${homeAssistant.entityId}] power-on write ${percentage}%: restore flag=${restoreOnPowerOn}, last speed=${this.lastNonZeroPercent}`
+        `[${homeAssistant.entityId}] power-on write ${percentage}%: restore flag=${restoreOnPowerOn}, last speed=${remembered.percent}`
       );
     }
-    if (restoreOnPowerOn && wasOff && this.lastNonZeroPercent > 0 && percentage > 0) {
-      percentage = this.lastNonZeroPercent;
+    if (restoreOnPowerOn && wasOff && remembered.percent > 0 && percentage > 0) {
+      percentage = remembered.percent;
       try {
         applyPatchState(this.state, {
-          percentSetting: this.lastNonZeroPercent,
-          percentCurrent: this.lastNonZeroPercent,
-          ...this.features.multiSpeed && this.lastNonZeroSpeed > 0 ? {
-            speedSetting: this.lastNonZeroSpeed,
-            speedCurrent: this.lastNonZeroSpeed
+          percentSetting: remembered.percent,
+          percentCurrent: remembered.percent,
+          ...this.features.multiSpeed && remembered.speed > 0 ? {
+            speedSetting: remembered.speed,
+            speedCurrent: remembered.speed
           } : {}
         });
       } catch {
@@ -151279,6 +151368,23 @@ var FanControlServerBase = class extends FeaturedBase5 {
         Math.ceil(speedMax * (percentage / 100))
       );
     }
+    this.persistSpeed(false);
+  }
+  // Write the remembered speed through to the memory behavior. Instance
+  // fields die with the transaction, this is what later interactions and
+  // restarts read (#387).
+  persistSpeed(auto) {
+    if (!this.agent.has(FanSpeedMemoryBehavior)) {
+      return;
+    }
+    try {
+      applyPatchState(this.agent.get(FanSpeedMemoryBehavior).state, {
+        lastPercent: this.lastNonZeroPercent,
+        lastSpeed: this.lastNonZeroSpeed,
+        ...auto !== void 0 ? { lastAuto: auto } : {}
+      });
+    } catch {
+    }
   }
   targetAirflowDirectionChanged(airflowDirection, _oldValue, context) {
     if (transactionIsOffline(context)) {
@@ -151341,25 +151447,26 @@ var FanControlServerBase = class extends FeaturedBase5 {
     if (transactionIsOffline(context)) {
       return;
     }
-    if (onOff && this.lastNonZeroPercent > 0) {
+    const remembered = this.remembered();
+    if (onOff && remembered.percent > 0) {
       this.agent.asLocalActor(() => {
         try {
           applyPatchState(this.state, {
-            percentSetting: this.lastNonZeroPercent,
-            ...this.features.multiSpeed && this.lastNonZeroSpeed > 0 ? { speedSetting: this.lastNonZeroSpeed } : {}
+            percentSetting: remembered.percent,
+            ...this.features.multiSpeed && remembered.speed > 0 ? { speedSetting: remembered.speed } : {}
           });
         } catch {
         }
       });
       const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
       if (homeAssistant.isAvailable) {
-        if (this.lastIsAutoMode) {
+        if (remembered.auto) {
           homeAssistant.callAction(
             this.state.config.setAutoMode(void 0, this.agent)
           );
         } else {
           homeAssistant.callAction(
-            this.state.config.turnOn(this.lastNonZeroPercent, this.agent)
+            this.state.config.turnOn(remembered.percent, this.agent)
           );
         }
       }
@@ -151593,7 +151700,8 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
       IdentifyServer2,
       HomeAssistantEntityBehavior,
       FanOnOffServer,
-      FanFanControlServer.with(...features3)
+      FanFanControlServer.with(...features3),
+      FanSpeedMemoryBehavior
     );
     const hasFilterLife = airPurifierAttributes.filter_life != null || airPurifierAttributes.filter_life_remaining != null || airPurifierAttributes.filter_life_level != null || !!config11.mapping?.filterLifeEntity;
     if (hasFilterLife) {
@@ -153630,7 +153738,8 @@ function AirPurifierEndpoint(homeAssistantEntity) {
     BasicInformationServer2,
     HomeAssistantEntityBehavior,
     FanOnOffServer,
-    FanFanControlServer.with(...features3)
+    FanFanControlServer.with(...features3),
+    FanSpeedMemoryBehavior
   );
   if (hasFilterLifeSupport(attributes9, mapping)) {
     const deviceWithFilter = baseDevice.with(
@@ -155378,6 +155487,7 @@ function FanDevice2(homeAssistantEntity) {
     GroupsServer,
     FanOnOffServer,
     FanFanControlServer.with(...features3),
+    FanSpeedMemoryBehavior,
     DefaultPowerSourceServer
   ) : FanDevice.with(
     IdentifyServer2,
@@ -155385,7 +155495,8 @@ function FanDevice2(homeAssistantEntity) {
     HomeAssistantEntityBehavior,
     GroupsServer,
     FanOnOffServer,
-    FanFanControlServer.with(...features3)
+    FanFanControlServer.with(...features3),
+    FanSpeedMemoryBehavior
   );
   return device.set({ homeAssistantEntity });
 }
@@ -169052,6 +169163,7 @@ export {
 @matter/types/dist/esm/clusters/web-rtc-transport-definitions.js:
 @matter/types/dist/esm/clusters/index.js:
 @matter/main/dist/esm/clusters.js:
+@matter/main/dist/esm/model.js:
 @matter/main/dist/esm/forwards/behaviors/boolean-state.js:
 @matter/main/dist/esm/forwards/behaviors/smoke-co-alarm.js:
 @matter/main/dist/esm/forwards/behaviors/operational-state.js: