@riddix/hamh 2.1.0-alpha.605 → 2.1.0-alpha.607

package/dist/backend/cli.js

@@ -146794,6 +146794,12 @@ var init_bridge_config_schema = __esm({
           type: "boolean",
           default: false
         },
+        preferEntityRegistryName: {
+          title: "Prefer Entity Registry Name (HA 2026.4 workaround)",
+          description: "Use the entity registry name (or original_name) as nodeLabel instead of the composed friendly_name. Since Home Assistant 2026.4, friendly_name is prefixed with the device name, which breaks voice commands that relied on the short entity name. Resolution order: customName \u2192 registry name \u2192 registry original_name \u2192 friendly_name \u2192 entity_id. Matter has no alias concept \u2014 this only changes which single name is reported.",
+          type: "boolean",
+          default: false
+        },
         vacuumOnOff: {
           title: "Vacuum: Include OnOff Cluster (Alexa)",
           description: "Add an OnOff cluster to robot vacuum endpoints. Alexa REQUIRES this (PowerController) to show robotic vacuums in the app. Without it, Alexa commissions the device but never displays it. In Server Mode this is enabled automatically \u2014 only check this for bridge mode. WARNING: OnOff is NOT part of the Matter RVC device type specification. Enabling this may break Apple Home (shows 'Updating') and Google Home.",
@@ -146858,6 +146864,12 @@ var init_bridge_config_schema = __esm({
           minimum: 1,
           maximum: 999
         },
+        serialNumberSuffix: {
+          title: "Serial Number Suffix",
+          type: "string",
+          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
+        },
         filter: homeAssistantFilterSchema,
         featureFlags: featureFlagSchema
       },
@@ -165146,6 +165158,11 @@ function deepEqual(a, b) {
   return a === b;
 }
 
+// src/utils/sanitize-matter-string.ts
+function sanitizeMatterString(value) {
+  return value.replace(/[*!~\x00-\x1f\x7f]/g, "").trim();
+}
+
 // src/utils/trim-to-length.ts
 function trimToLength(value, maxLength, suffix) {
   const stringValue = value?.toString();
@@ -165162,6 +165179,7 @@ function trimToLength(value, maxLength, suffix) {
 var ServerModeServerNode = class extends ServerNode {
   deviceEndpoint;
   featureFlags;
+  serialNumberSuffix;
   constructor(env, bridgeData) {
     super({
       id: bridgeData.id,
@@ -165191,6 +165209,7 @@ var ServerModeServerNode = class extends ServerNode {
       }
     });
     this.featureFlags = bridgeData.featureFlags;
+    this.serialNumberSuffix = bridgeData.serialNumberSuffix;
   }
   /**
    * Add the device endpoint to this server node.
@@ -165219,13 +165238,15 @@ var ServerModeServerNode = class extends ServerNode {
    */
   updateDeviceIdentity(entityId, device, mapping, friendlyName) {
     const nodeLabel = trimToLength(mapping?.customName, 32, "...") ?? trimToLength(friendlyName, 32, "...") ?? trimToLength(entityId, 32, "...");
-    const productNameFromNodeLabel = this.featureFlags?.productNameFromNodeLabel === true ? nodeLabel : void 0;
+    const productNameFromNodeLabel = this.featureFlags?.productNameFromNodeLabel === true ? trimToLength(sanitizeMatterString(nodeLabel ?? ""), 32, "...") ?? void 0 : void 0;
+    const rawSerial = trimToLength(mapping?.customSerialNumber, 32, "...");
+    const serialNumber = rawSerial && this.serialNumberSuffix ? trimToLength(`${rawSerial}${this.serialNumberSuffix}`, 32, "...") : rawSerial;
     applyPatchState(this.state.basicInformation, {
       vendorName: trimToLength(mapping?.customVendorName, 32, "...") ?? trimToLength(device?.manufacturer, 32, "..."),
       productName: trimToLength(mapping?.customProductName, 32, "...") ?? productNameFromNodeLabel ?? trimToLength(device?.model_id, 32, "...") ?? trimToLength(device?.model, 32, "..."),
       productLabel: trimToLength(device?.model, 64, "..."),
       nodeLabel,
-      serialNumber: trimToLength(mapping?.customSerialNumber, 32, "..."),
+      serialNumber,
       hardwareVersionString: trimToLength(device?.hw_version, 64, "..."),
       softwareVersionString: trimToLength(device?.sw_version, 64, "...")
     });
@@ -166299,6 +166320,9 @@ var BridgeDataProvider = class extends Service {
   get priority() {
     return this.data.priority;
   }
+  get serialNumberSuffix() {
+    return this.data.serialNumberSuffix;
+  }
   /************************************************
    * Functions
    ************************************************/
@@ -166323,6 +166347,7 @@ var BridgeDataProvider = class extends Service {
       countryCode: this.countryCode,
       icon: this.icon,
       priority: this.priority,
+      serialNumberSuffix: this.serialNumberSuffix,
       status: status3.code,
       statusReason: status3.reason,
       commissioning: commissioning ? {
@@ -168101,8 +168126,12 @@ var BasicInformationServer2 = class extends BridgedDeviceBasicInformationServer
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const device = entity.deviceRegistry;
     const mapping = homeAssistant.state.mapping;
-    const nodeLabel = ellipse(32, homeAssistant.state.customName) ?? ellipse(32, entity.state?.attributes?.friendly_name) ?? ellipse(32, entity.entity_id);
-    const productNameFromNodeLabel = featureFlags?.productNameFromNodeLabel === true ? nodeLabel : void 0;
+    const registryName = featureFlags?.preferEntityRegistryName ? entity.registry?.name ?? entity.registry?.original_name : void 0;
+    const nodeLabel = ellipse(32, homeAssistant.state.customName) ?? ellipse(32, registryName) ?? ellipse(32, entity.state?.attributes?.friendly_name) ?? ellipse(32, entity.entity_id);
+    const productNameFromNodeLabel = featureFlags?.productNameFromNodeLabel === true ? ellipse(32, sanitizeMatterString(nodeLabel ?? "")) ?? void 0 : void 0;
+    const serialNumberSuffix = this.env.get(BridgeDataProvider).serialNumberSuffix;
+    const rawSerial = ellipse(32, mapping?.customSerialNumber) ?? hash(32, entity.entity_id);
+    const serialNumber = serialNumberSuffix ? ellipse(32, `${rawSerial}${serialNumberSuffix}`) : rawSerial;
     applyPatchState(this.state, {
       vendorId: VendorId(basicInformation.vendorId),
       vendorName: ellipse(32, mapping?.customVendorName) ?? ellipse(32, device?.manufacturer) ?? hash(32, basicInformation.vendorName),
@@ -168114,7 +168143,7 @@ var BasicInformationServer2 = class extends BridgedDeviceBasicInformationServer
       softwareVersionString: ellipse(64, device?.sw_version),
       nodeLabel,
       reachable: entity.state?.state != null && entity.state.state !== "unavailable",
-      serialNumber: ellipse(32, mapping?.customSerialNumber) ?? hash(32, entity.entity_id),
+      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)