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

package/dist/backend/cli.js

@@ -146858,6 +146858,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 +165152,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 +165173,7 @@ function trimToLength(value, maxLength, suffix) {
 var ServerModeServerNode = class extends ServerNode {
   deviceEndpoint;
   featureFlags;
+  serialNumberSuffix;
   constructor(env, bridgeData) {
     super({
       id: bridgeData.id,
@@ -165191,6 +165203,7 @@ var ServerModeServerNode = class extends ServerNode {
       }
     });
     this.featureFlags = bridgeData.featureFlags;
+    this.serialNumberSuffix = bridgeData.serialNumberSuffix;
   }
   /**
    * Add the device endpoint to this server node.
@@ -165219,13 +165232,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 +166314,9 @@ var BridgeDataProvider = class extends Service {
   get priority() {
     return this.data.priority;
   }
+  get serialNumberSuffix() {
+    return this.data.serialNumberSuffix;
+  }
   /************************************************
    * Functions
    ************************************************/
@@ -166323,6 +166341,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 ? {
@@ -168102,7 +168121,10 @@ var BasicInformationServer2 = class extends BridgedDeviceBasicInformationServer
     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 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 +168136,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)