@riddix/hamh 2.1.0-alpha.584 → 2.1.0-alpha.586

package/dist/backend/cli.js

@@ -164899,6 +164899,74 @@ init_esm5();
 init_nodejs();
 init_esm3();
 
+// src/utils/apply-patch-state.ts
+init_esm();
+var logger157 = Logger.get("ApplyPatchState");
+function applyPatchState(state, patch, options) {
+  return applyPatch(state, patch, options?.force);
+}
+function applyPatch(state, patch, force = false) {
+  const actualPatch = {};
+  for (const key in patch) {
+    if (Object.hasOwn(patch, key)) {
+      const patchValue = patch[key];
+      if (patchValue !== void 0) {
+        const stateValue = state[key];
+        if (force || !deepEqual(stateValue, patchValue)) {
+          actualPatch[key] = patchValue;
+        }
+      }
+    }
+  }
+  const failedKeys = [];
+  for (const key in actualPatch) {
+    if (!Object.hasOwn(actualPatch, key)) continue;
+    try {
+      state[key] = actualPatch[key];
+    } catch (e) {
+      const errorMessage = e instanceof Error ? e.message : String(e);
+      if (errorMessage.includes(
+        "Endpoint storage inaccessible because endpoint is not a node and is not owned by another endpoint"
+      )) {
+        logger157.debug(
+          `Suppressed endpoint storage error, patch not applied: ${JSON.stringify(actualPatch)}`
+        );
+        return actualPatch;
+      }
+      if (errorMessage.includes("synchronous-transaction-conflict")) {
+        logger157.warn(
+          `Transaction conflict, state update DROPPED: ${JSON.stringify(actualPatch)}`
+        );
+        return actualPatch;
+      }
+      failedKeys.push(key);
+      logger157.warn(`Failed to set property '${key}': ${errorMessage}`);
+    }
+  }
+  if (failedKeys.length > 0) {
+    logger157.warn(
+      `${failedKeys.length} properties failed to update: [${failedKeys.join(", ")}]`
+    );
+  }
+  return actualPatch;
+}
+function deepEqual(a, b) {
+  if (a == null || b == null) {
+    return a === b;
+  }
+  if (typeof a !== typeof b || Array.isArray(a) !== Array.isArray(b)) {
+    return false;
+  }
+  if (Array.isArray(a) && Array.isArray(b)) {
+    return a.length === b.length && a.every((vA, idx) => deepEqual(vA, b[idx]));
+  }
+  if (typeof a === "object" && typeof b === "object") {
+    const keys3 = Object.keys({ ...a, ...b });
+    return keys3.every((key) => deepEqual(a[key], b[key]));
+  }
+  return a === b;
+}
+
 // src/utils/trim-to-length.ts
 function trimToLength(value, maxLength, suffix) {
   const stringValue = value?.toString();
@@ -164962,6 +165030,23 @@ var ServerModeServerNode = class extends ServerNode {
   clearDevice() {
     this.deviceEndpoint = void 0;
   }
+  /**
+   * Update root-level BasicInformation with entity-specific data.
+   * In server mode, controllers (Apple Home, Alexa) read the root node's
+   * BasicInformation — not the device endpoint's BridgedDeviceBasicInformation.
+   * Without this, server-mode devices show bridge defaults (e.g. "riddix" / "MatterHub").
+   */
+  updateDeviceIdentity(entityId, device, mapping, friendlyName) {
+    applyPatchState(this.state.basicInformation, {
+      vendorName: trimToLength(mapping?.customVendorName, 32, "...") ?? trimToLength(device?.manufacturer, 32, "..."),
+      productName: trimToLength(mapping?.customProductName, 32, "...") ?? trimToLength(device?.model_id, 32, "...") ?? trimToLength(device?.model, 32, "..."),
+      productLabel: trimToLength(device?.model, 64, "..."),
+      nodeLabel: trimToLength(mapping?.customName, 32, "...") ?? trimToLength(friendlyName, 32, "...") ?? trimToLength(entityId, 32, "..."),
+      serialNumber: trimToLength(mapping?.customSerialNumber, 32, "..."),
+      hardwareVersionString: trimToLength(device?.hw_version, 64, "..."),
+      softwareVersionString: trimToLength(device?.sw_version, 64, "...")
+    });
+  }
   async factoryReset() {
     await this.cancel();
     await this.erase();
@@ -165053,7 +165138,7 @@ init_basic_information2();
 init_descriptor2();
 init_aggregator();
 init_esm();
-var logger157 = Logger.get("BridgedDeviceBasicInformationServer");
+var logger158 = Logger.get("BridgedDeviceBasicInformationServer");
 var BridgedDeviceBasicInformationServer = class extends BridgedDeviceBasicInformationBehavior {
   async initialize() {
     if (this.endpoint.lifecycle.isInstalled) {
@@ -165068,7 +165153,7 @@ var BridgedDeviceBasicInformationServer = class extends BridgedDeviceBasicInform
       this.state.uniqueId = BasicInformationServer.createUniqueId();
     }
     if (serialNumber !== void 0 && uniqueId === this.state.serialNumber) {
-      logger157.warn("uniqueId and serialNumber shall not be the same.");
+      logger158.warn("uniqueId and serialNumber shall not be the same.");
     }
   }
   static schema = BasicInformationServer.enableUniqueIdPersistence(
@@ -165940,7 +166025,7 @@ var IdentifyServer2 = class extends IdentifyServer {
 // src/matter/endpoints/validate-endpoint-type.ts
 init_esm();
 init_esm7();
-var logger158 = Logger.get("EndpointValidation");
+var logger159 = Logger.get("EndpointValidation");
 function toCamelCase(name) {
   return name.charAt(0).toLowerCase() + name.slice(1);
 }
@@ -165970,12 +166055,12 @@ function validateEndpointType(endpointType, entityId) {
   }
   const prefix = entityId ? `[${entityId}] ` : "";
   if (missingMandatory.length > 0) {
-    logger158.warn(
+    logger159.warn(
       `${prefix}${deviceTypeModel.name} (0x${endpointType.deviceType.toString(16)}): missing mandatory clusters: ${missingMandatory.join(", ")}`
     );
   }
   if (availableOptional.length > 0) {
-    logger158.debug(
+    logger159.debug(
       `${prefix}${deviceTypeModel.name} (0x${endpointType.deviceType.toString(16)}): optional clusters not used: ${availableOptional.join(", ")}`
     );
   }
@@ -166078,74 +166163,6 @@ var BridgeDataProvider = class extends Service {
   }
 };
 
-// src/utils/apply-patch-state.ts
-init_esm();
-var logger159 = Logger.get("ApplyPatchState");
-function applyPatchState(state, patch, options) {
-  return applyPatch(state, patch, options?.force);
-}
-function applyPatch(state, patch, force = false) {
-  const actualPatch = {};
-  for (const key in patch) {
-    if (Object.hasOwn(patch, key)) {
-      const patchValue = patch[key];
-      if (patchValue !== void 0) {
-        const stateValue = state[key];
-        if (force || !deepEqual(stateValue, patchValue)) {
-          actualPatch[key] = patchValue;
-        }
-      }
-    }
-  }
-  const failedKeys = [];
-  for (const key in actualPatch) {
-    if (!Object.hasOwn(actualPatch, key)) continue;
-    try {
-      state[key] = actualPatch[key];
-    } catch (e) {
-      const errorMessage = e instanceof Error ? e.message : String(e);
-      if (errorMessage.includes(
-        "Endpoint storage inaccessible because endpoint is not a node and is not owned by another endpoint"
-      )) {
-        logger159.debug(
-          `Suppressed endpoint storage error, patch not applied: ${JSON.stringify(actualPatch)}`
-        );
-        return actualPatch;
-      }
-      if (errorMessage.includes("synchronous-transaction-conflict")) {
-        logger159.warn(
-          `Transaction conflict, state update DROPPED: ${JSON.stringify(actualPatch)}`
-        );
-        return actualPatch;
-      }
-      failedKeys.push(key);
-      logger159.warn(`Failed to set property '${key}': ${errorMessage}`);
-    }
-  }
-  if (failedKeys.length > 0) {
-    logger159.warn(
-      `${failedKeys.length} properties failed to update: [${failedKeys.join(", ")}]`
-    );
-  }
-  return actualPatch;
-}
-function deepEqual(a, b) {
-  if (a == null || b == null) {
-    return a === b;
-  }
-  if (typeof a !== typeof b || Array.isArray(a) !== Array.isArray(b)) {
-    return false;
-  }
-  if (Array.isArray(a) && Array.isArray(b)) {
-    return a.length === b.length && a.every((vA, idx) => deepEqual(vA, b[idx]));
-  }
-  if (typeof a === "object" && typeof b === "object") {
-    const keys3 = Object.keys({ ...a, ...b });
-    return keys3.every((key) => deepEqual(a[key], b[key]));
-  }
-  return a === b;
-}
-
 // src/plugins/plugin-behavior.ts
 init_esm7();
 var PluginDeviceBehavior = class extends Behavior {
@@ -168708,6 +168725,7 @@ var FanControlServerBase = class extends FeaturedBase5 {
   // Track last non-zero fan speed for restore on turn-on (#225)
   lastNonZeroPercent = 0;
   lastNonZeroSpeed = 0;
+  lastIsAutoMode = false;
   async initialize() {
     if (this.features.multiSpeed) {
       if (this.state.speedMax == null || this.state.speedMax < minSpeedMax) {
@@ -168819,6 +168837,7 @@ var FanControlServerBase = class extends FeaturedBase5 {
     if (percentage > 0) {
       this.lastNonZeroPercent = percentage;
       this.lastNonZeroSpeed = speed;
+      this.lastIsAutoMode = config10.isInAutoMode(entity.state, this.agent);
     }
     try {
       applyPatchState(this.state, {
@@ -168885,6 +168904,9 @@ var FanControlServerBase = class extends FeaturedBase5 {
     if (speed == null) {
       return;
     }
+    if (speed === 0 && (this.state.percentSetting ?? 0) > 0) {
+      return;
+    }
     this.agent.asLocalActor(() => {
       const percentage = Math.floor(speed / this.state.speedMax * 100);
       this.applyPercentageAction(percentage);
@@ -169033,6 +169055,18 @@ var FanControlServerBase = class extends FeaturedBase5 {
         } catch {
         }
       });
+      const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+      if (homeAssistant.isAvailable) {
+        if (this.lastIsAutoMode) {
+          homeAssistant.callAction(
+            this.state.config.setAutoMode(void 0, this.agent)
+          );
+        } else {
+          homeAssistant.callAction(
+            this.state.config.turnOn(this.lastNonZeroPercent, this.agent)
+          );
+        }
+      }
     }
   }
   // Cross-cluster sync: keep OnOff in sync with FanControl per Matter spec
@@ -181592,6 +181626,7 @@ var ServerModeEndpointManager = class extends Service {
         await this.serverNode.addDevice(endpoint2);
         this.deviceEndpoint = endpoint2;
         this.mappingFingerprint = currentFp;
+        this.updateServerNodeIdentity(entityId, mapping);
         this.log.info(
           `Server mode: Added vacuum ${entityId} as standalone device`
         );
@@ -181612,6 +181647,7 @@ var ServerModeEndpointManager = class extends Service {
       await this.serverNode.addDevice(endpoint);
       this.deviceEndpoint = endpoint;
       this.mappingFingerprint = currentFp;
+      this.updateServerNodeIdentity(entityId, mapping);
       this.log.info(`Server mode: Added device ${entityId}`);
     } catch (e) {
       const reason = e instanceof Error ? e.message : String(e);
@@ -181632,6 +181668,17 @@ var ServerModeEndpointManager = class extends Service {
       }
     }
   }
+  updateServerNodeIdentity(entityId, mapping) {
+    const device = this.registry.deviceOf(entityId);
+    const state = this.registry.initialState(entityId);
+    const friendlyName = state?.attributes?.friendly_name;
+    this.serverNode.updateDeviceIdentity(
+      entityId,
+      device,
+      mapping,
+      friendlyName
+    );
+  }
   /**
    * Creates a Server Mode Vacuum endpoint without BridgedDeviceBasicInformation.
    * This makes the vacuum appear as a standalone Matter device, which is required