@riddix/hamh 2.1.0-alpha.865 → 2.1.0-alpha.867

package/dist/backend/cli.js

@@ -132391,6 +132391,18 @@ var init_bridge_config_schema = __esm({
           maximum: 1e4,
           default: 0
         },
+        advertiseSpecVersion151: {
+          title: "Advertise Matter 1.5.1 (Alexa pairing diagnostic)",
+          description: "Mask the Matter version identifiers as 1.5.1 instead of 1.6.0, in the BasicInformation attributes and the session parameters. The data model itself stays 1.6. Only for diagnosing Alexa pairing failures that stop right after the attestation step (#449): 2.0.49 was the last release to advertise 1.5.1 and the last with a confirmed Echo pairing. Every controller on this bridge sees the masked version on its next reconnect, so use a dedicated test bridge, and restart the bridge plus re-pair the Echo after changing it. Default off.",
+          type: "boolean",
+          default: false
+        },
+        supportTermsAndConditions: {
+          title: "Accept Terms and Conditions commands (Alexa pairing diagnostic)",
+          description: "Advertise the Matter 1.4 TermsAndConditions feature and accept the SetTcAcknowledgements command instead of rejecting it as unsupported. No terms are enforced, the bridge accepts any acknowledgement. Alexa sends this command during pairing and some Echo firmwares may stall when it fails (#449). Restart the bridge and re-pair after changing it. Default off.",
+          type: "boolean",
+          default: false
+        },
         fastSessionRecovery: {
           title: "Fast Session Recovery (Google offline workaround)",
           description: "When a controller drops all subscriptions, clean up the dead session and re-announce after 5 seconds instead of 60. Opt-in for Google Home users whose devices go offline after a cancelled subscription (#386). It shortens the offline window but cannot stop the controller from rejecting the subscription. Default off.",
@@ -155241,6 +155253,30 @@ function trimToLength(value, maxLength, suffix) {
   return stringValue.substring(0, maxLength - suffix.length) + suffix;
 }
 
+// ../../node_modules/.pnpm/@matter+main@0.17.9/node_modules/@matter/main/dist/esm/model.js
+init_nodejs();
+init_esm2();
+
+// src/matter/legacy-spec-version.ts
+var SPEC_VERSION_1_5_1 = 17105152;
+var DATA_MODEL_REVISION_19 = 19;
+function specVersionValues(flags2) {
+  return flags2?.advertiseSpecVersion151 ? {
+    specificationVersion: SPEC_VERSION_1_5_1,
+    dataModelRevision: DATA_MODEL_REVISION_19
+  } : {
+    specificationVersion: Specification.SPECIFICATION_VERSION,
+    dataModelRevision: Specification.DATA_MODEL_REVISION
+  };
+}
+function legacySpecBasicInformation(flags2) {
+  if (!flags2?.advertiseSpecVersion151) return {};
+  return specVersionValues(flags2);
+}
+function applyLegacySpecSessionParameters(sessionManager, flags2) {
+  sessionManager.sessionParameters = specVersionValues(flags2);
+}
+
 // src/matter/subscription-options.ts
 init_esm();
 function matterSubscriptionOptions() {
@@ -155251,164 +155287,6 @@ function matterSubscriptionOptions() {
   };
 }
 
-// src/matter/endpoints/server-mode-server-node.ts
-var logger196 = Logger.get("ServerModeServerNode");
-var ServerModeServerNode = class extends ServerNode {
-  deviceEndpoints = /* @__PURE__ */ new Map();
-  featureFlags;
-  serialNumberSuffix;
-  constructor(env, bridgeData) {
-    super({
-      id: bridgeData.id,
-      environment: env,
-      network: {
-        port: bridgeData.port,
-        // Shared zero-jitter window, see matterSubscriptionOptions: 60s max so
-        // iOS does not show a stale "Updating" tile (#287), no jitter so the
-        // keepalive stays inside a controller's ceiling (#386).
-        subscriptionOptions: matterSubscriptionOptions()
-      },
-      productDescription: {
-        name: bridgeData.name,
-        deviceType: DeviceTypeId(RoboticVacuumCleanerDevice.deviceType)
-      },
-      basicInformation: {
-        uniqueId: bridgeData.id,
-        nodeLabel: trimToLength(bridgeData.name, 32, "..."),
-        vendorId: VendorId(bridgeData.basicInformation.vendorId),
-        vendorName: bridgeData.basicInformation.vendorName,
-        productId: bridgeData.basicInformation.productId,
-        productName: bridgeData.basicInformation.productName,
-        productLabel: bridgeData.basicInformation.productLabel,
-        serialNumber: `server-${bridgeData.id}`.substring(0, 32),
-        hardwareVersion: bridgeData.basicInformation.hardwareVersion,
-        softwareVersion: bridgeData.basicInformation.softwareVersion,
-        hardwareVersionString: bridgeData.basicInformation.hardwareVersionString,
-        softwareVersionString: bridgeData.basicInformation.softwareVersionString ?? String(bridgeData.basicInformation.softwareVersion),
-        ...bridgeData.countryCode ? { location: bridgeData.countryCode } : {}
-      },
-      subscriptions: {
-        persistenceEnabled: false
-      }
-    });
-    this.featureFlags = bridgeData.featureFlags;
-    this.serialNumberSuffix = bridgeData.serialNumberSuffix;
-  }
-  /** Number of device endpoints currently attached. */
-  get deviceCount() {
-    return this.deviceEndpoints.size;
-  }
-  /**
-   * Add a device endpoint to this server node. Several endpoints per node are
-   * supported (#301); the call is idempotent per endpoint id.
-   */
-  async addDevice(endpoint) {
-    if (this.deviceEndpoints.has(endpoint.id)) {
-      return;
-    }
-    this.deviceEndpoints.set(endpoint.id, endpoint);
-    await this.add(endpoint);
-  }
-  /**
-   * Drop one device reference after the endpoint has been deleted externally.
-   * Must be called before re-adding an endpoint with the same id.
-   */
-  forgetDevice(endpoint) {
-    this.deviceEndpoints.delete(endpoint.id);
-  }
-  /** Drop all device references after the endpoints were deleted externally. */
-  clearDevices() {
-    this.deviceEndpoints.clear();
-  }
-  /**
-   * 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").
-   */
-  async updateDeviceIdentity(entityId, device, mapping, friendlyName) {
-    const nodeLabel = trimToLength(mapping?.customName, 32, "...") ?? trimToLength(friendlyName, 32, "...") ?? trimToLength(entityId, 32, "...");
-    const productNameFromNodeLabel = this.featureFlags?.productNameFromNodeLabel === true ? trimToLength(sanitizeMatterString(nodeLabel ?? ""), 32, "...") ?? void 0 : void 0;
-    const maxRawLen = 32 - (this.serialNumberSuffix?.length ?? 0);
-    const registrySerial = this.featureFlags?.useHaRegistrySerial ? trimToLength(device?.serial_number, maxRawLen, "...") : void 0;
-    const rawSerial = trimToLength(mapping?.customSerialNumber, maxRawLen, "...") ?? registrySerial;
-    const serialNumber = rawSerial && this.serialNumberSuffix ? `${rawSerial}${this.serialNumberSuffix}` : rawSerial;
-    const basicInformation = dropUndefined({
-      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,
-      hardwareVersionString: trimToLength(device?.hw_version, 64, "..."),
-      softwareVersionString: trimToLength(device?.sw_version, 64, "...")
-    });
-    if (Object.keys(basicInformation).length === 0) {
-      return;
-    }
-    try {
-      await this.set({ basicInformation });
-    } catch (e) {
-      const msg = e instanceof Error ? e.message : String(e);
-      logger196.warn(
-        `Failed to apply server-mode identity for ${entityId}: ${msg}`
-      );
-    }
-  }
-  // align the pairing device-type hint with the real device (default is vacuum)
-  async updateAdvertisedDeviceType(deviceType) {
-    try {
-      await this.set({ productDescription: { deviceType } });
-    } catch (e) {
-      const msg = e instanceof Error ? e.message : String(e);
-      logger196.warn(`Failed to set server-mode device type: ${msg}`);
-    }
-  }
-  async factoryReset() {
-    await this.cancel();
-    await this.erase();
-  }
-};
-function dropUndefined(obj) {
-  const result = {};
-  for (const key in obj) {
-    if (obj[key] !== void 0) {
-      result[key] = obj[key];
-    }
-  }
-  return result;
-}
-
-// src/plugins/builtin/camera/camera-tcp-requirement.ts
-import { readFileSync as readFileSync6 } from "node:fs";
-var CAMERA_TCP_CONFIG = { incoming: true, outgoing: false };
-function parseCameraList(cameras) {
-  if (typeof cameras !== "string") return [];
-  return cameras.split(",").map((s) => s.trim()).filter(Boolean);
-}
-function bridgeNeedsTcpForCameras(storageDir, bridgeId) {
-  try {
-    const raw = readFileSync6(
-      pluginStorageFilePath(storageDir, bridgeId, "camera"),
-      "utf-8"
-    );
-    const json = JSON.parse(raw);
-    return parseCameraList(json.config?.cameras).length > 0;
-  } catch {
-    return false;
-  }
-}
-
-// src/plugins/plugin-manager.ts
-init_esm();
-import * as fs10 from "node:fs";
-import * as path12 from "node:path";
-
-// src/plugins/plugin-device-factory.ts
-init_esm();
-
-// src/matter/behaviors/identify-server.ts
-init_esm();
-
 // ../../node_modules/.pnpm/@matter+main@0.17.9/node_modules/@matter/main/dist/esm/behaviors.js
 init_nodejs();
 
@@ -155702,7 +155580,7 @@ init_esm4();
 init_esm3();
 init_access_control();
 init_groupcast();
-var logger197 = Logger.get("GroupcastServer");
+var logger196 = Logger.get("GroupcastServer");
 var UNMAPPED_KEYSET_ID = 65535;
 var GROUPCAST_IS_PROVISIONAL = true;
 var GroupcastServer = class extends GroupcastBehavior {
@@ -156119,7 +155997,7 @@ var GroupcastServer = class extends GroupcastBehavior {
       if (hasMembership) continue;
       const fabricGroups = gkmState.groupTable.filter((g) => g.fabricIndex === fi);
       if (fabricGroups.length === 0) continue;
-      logger197.info(`Migrating ${fabricGroups.length} legacy group(s) for fabric ${fi} to Groupcast`);
+      logger196.info(`Migrating ${fabricGroups.length} legacy group(s) for fabric ${fi} to Groupcast`);
       const newEntries = fabricGroups.map((group) => {
         const keyMapping = gkmState.groupKeyMap.find((m) => m.fabricIndex === fi && m.groupId === group.groupId);
         const mcastAddrPolicy = this.features.perGroup ? Groupcast3.MulticastAddrPolicy.PerGroup : Groupcast3.MulticastAddrPolicy.IanaAddr;
@@ -156141,7 +156019,7 @@ var GroupcastServer = class extends GroupcastBehavior {
     }
     if (migrated) {
       this.#updateUsedMcastAddrCount();
-      logger197.info("Groupcast migration complete");
+      logger196.info("Groupcast migration complete");
     }
   }
   async [Symbol.asyncDispose]() {
@@ -156675,7 +156553,193 @@ var WebRtcTransportDefinitions3 = ClusterType(WebRtcTransportDefinitions2);
 // ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/index.js
 init_wi_fi_network_diagnostics();
 
+// src/matter/tc-general-commissioning.ts
+var TcBase = GeneralCommissioningServer.with(
+  GeneralCommissioning3.Feature.TermsAndConditions
+);
+var TcGeneralCommissioningServer = class extends TcBase {
+  setTcAcknowledgements({
+    tcVersion
+  }) {
+    this.state.tcAcceptedVersion = tcVersion;
+    return { errorCode: GeneralCommissioning3.CommissioningError.Ok };
+  }
+};
+((TcGeneralCommissioningServer2) => {
+  class State extends TcBase.State {
+    tcAcceptedVersion = 0;
+    tcMinRequiredVersion = 0;
+    // typed number upstream, managed as a bitmap object at runtime
+    tcAcknowledgements = {};
+    // model default is true, but nothing is enforced here
+    tcAcknowledgementsRequired = false;
+    tcUpdateDeadline = null;
+  }
+  TcGeneralCommissioningServer2.State = State;
+})(TcGeneralCommissioningServer || (TcGeneralCommissioningServer = {}));
+function rootEndpointType(flags2) {
+  return flags2?.supportTermsAndConditions ? ServerNode.RootEndpoint.with(TcGeneralCommissioningServer) : ServerNode.RootEndpoint;
+}
+
+// src/matter/endpoints/server-mode-server-node.ts
+var logger197 = Logger.get("ServerModeServerNode");
+var ServerModeServerNode = class extends ServerNode {
+  deviceEndpoints = /* @__PURE__ */ new Map();
+  featureFlags;
+  serialNumberSuffix;
+  constructor(env, bridgeData) {
+    super({
+      type: rootEndpointType(bridgeData.featureFlags),
+      id: bridgeData.id,
+      environment: env,
+      network: {
+        port: bridgeData.port,
+        // Shared zero-jitter window, see matterSubscriptionOptions: 60s max so
+        // iOS does not show a stale "Updating" tile (#287), no jitter so the
+        // keepalive stays inside a controller's ceiling (#386).
+        subscriptionOptions: matterSubscriptionOptions()
+      },
+      productDescription: {
+        name: bridgeData.name,
+        deviceType: DeviceTypeId(RoboticVacuumCleanerDevice.deviceType)
+      },
+      basicInformation: {
+        ...legacySpecBasicInformation(bridgeData.featureFlags),
+        uniqueId: bridgeData.id,
+        nodeLabel: trimToLength(bridgeData.name, 32, "..."),
+        vendorId: VendorId(bridgeData.basicInformation.vendorId),
+        vendorName: bridgeData.basicInformation.vendorName,
+        productId: bridgeData.basicInformation.productId,
+        productName: bridgeData.basicInformation.productName,
+        productLabel: bridgeData.basicInformation.productLabel,
+        serialNumber: `server-${bridgeData.id}`.substring(0, 32),
+        hardwareVersion: bridgeData.basicInformation.hardwareVersion,
+        softwareVersion: bridgeData.basicInformation.softwareVersion,
+        hardwareVersionString: bridgeData.basicInformation.hardwareVersionString,
+        softwareVersionString: bridgeData.basicInformation.softwareVersionString ?? String(bridgeData.basicInformation.softwareVersion),
+        ...bridgeData.countryCode ? { location: bridgeData.countryCode } : {}
+      },
+      subscriptions: {
+        persistenceEnabled: false
+      }
+    });
+    this.featureFlags = bridgeData.featureFlags;
+    this.serialNumberSuffix = bridgeData.serialNumberSuffix;
+  }
+  /** Number of device endpoints currently attached. */
+  get deviceCount() {
+    return this.deviceEndpoints.size;
+  }
+  /**
+   * Add a device endpoint to this server node. Several endpoints per node are
+   * supported (#301); the call is idempotent per endpoint id.
+   */
+  async addDevice(endpoint) {
+    if (this.deviceEndpoints.has(endpoint.id)) {
+      return;
+    }
+    this.deviceEndpoints.set(endpoint.id, endpoint);
+    await this.add(endpoint);
+  }
+  /**
+   * Drop one device reference after the endpoint has been deleted externally.
+   * Must be called before re-adding an endpoint with the same id.
+   */
+  forgetDevice(endpoint) {
+    this.deviceEndpoints.delete(endpoint.id);
+  }
+  /** Drop all device references after the endpoints were deleted externally. */
+  clearDevices() {
+    this.deviceEndpoints.clear();
+  }
+  /**
+   * 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").
+   */
+  async updateDeviceIdentity(entityId, device, mapping, friendlyName) {
+    const nodeLabel = trimToLength(mapping?.customName, 32, "...") ?? trimToLength(friendlyName, 32, "...") ?? trimToLength(entityId, 32, "...");
+    const productNameFromNodeLabel = this.featureFlags?.productNameFromNodeLabel === true ? trimToLength(sanitizeMatterString(nodeLabel ?? ""), 32, "...") ?? void 0 : void 0;
+    const maxRawLen = 32 - (this.serialNumberSuffix?.length ?? 0);
+    const registrySerial = this.featureFlags?.useHaRegistrySerial ? trimToLength(device?.serial_number, maxRawLen, "...") : void 0;
+    const rawSerial = trimToLength(mapping?.customSerialNumber, maxRawLen, "...") ?? registrySerial;
+    const serialNumber = rawSerial && this.serialNumberSuffix ? `${rawSerial}${this.serialNumberSuffix}` : rawSerial;
+    const basicInformation = dropUndefined({
+      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,
+      hardwareVersionString: trimToLength(device?.hw_version, 64, "..."),
+      softwareVersionString: trimToLength(device?.sw_version, 64, "...")
+    });
+    if (Object.keys(basicInformation).length === 0) {
+      return;
+    }
+    try {
+      await this.set({ basicInformation });
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : String(e);
+      logger197.warn(
+        `Failed to apply server-mode identity for ${entityId}: ${msg}`
+      );
+    }
+  }
+  // align the pairing device-type hint with the real device (default is vacuum)
+  async updateAdvertisedDeviceType(deviceType) {
+    try {
+      await this.set({ productDescription: { deviceType } });
+    } catch (e) {
+      const msg = e instanceof Error ? e.message : String(e);
+      logger197.warn(`Failed to set server-mode device type: ${msg}`);
+    }
+  }
+  async factoryReset() {
+    await this.cancel();
+    await this.erase();
+  }
+};
+function dropUndefined(obj) {
+  const result = {};
+  for (const key in obj) {
+    if (obj[key] !== void 0) {
+      result[key] = obj[key];
+    }
+  }
+  return result;
+}
+
+// src/plugins/builtin/camera/camera-tcp-requirement.ts
+import { readFileSync as readFileSync6 } from "node:fs";
+var CAMERA_TCP_CONFIG = { incoming: true, outgoing: false };
+function parseCameraList(cameras) {
+  if (typeof cameras !== "string") return [];
+  return cameras.split(",").map((s) => s.trim()).filter(Boolean);
+}
+function bridgeNeedsTcpForCameras(storageDir, bridgeId) {
+  try {
+    const raw = readFileSync6(
+      pluginStorageFilePath(storageDir, bridgeId, "camera"),
+      "utf-8"
+    );
+    const json = JSON.parse(raw);
+    return parseCameraList(json.config?.cameras).length > 0;
+  } catch {
+    return false;
+  }
+}
+
+// src/plugins/plugin-manager.ts
+init_esm();
+import * as fs10 from "node:fs";
+import * as path12 from "node:path";
+
+// src/plugins/plugin-device-factory.ts
+init_esm();
+
 // src/matter/behaviors/identify-server.ts
+init_esm();
 init_home_assistant_entity_behavior();
 var logger198 = Logger.get("IdentifyServer");
 var IDENTIFY_BUTTON_SUFFIXES = ["_identify", "_locate", "_find_me"];
@@ -158048,7 +158112,7 @@ Object.freeze(SecondaryNetworkInterfaceEndpointDefinition);
 init_types2();
 function createBridgeServerConfig(data, options) {
   return {
-    type: ServerNode.RootEndpoint,
+    type: rootEndpointType(data.featureFlags),
     id: data.id,
     network: {
       port: data.port,
@@ -158060,6 +158124,7 @@ function createBridgeServerConfig(data, options) {
       deviceType: AggregatorEndpoint.deviceType
     },
     basicInformation: {
+      ...legacySpecBasicInformation(data.featureFlags),
       uniqueId: data.id,
       nodeLabel: trimToLength(data.name, 32, "..."),
       vendorId: VendorId(data.basicInformation.vendorId),
@@ -158640,6 +158705,14 @@ var Bridge = class {
       );
       this.endpointManager.startObserving();
       ensureCommissioningConfig(this.server);
+      applyLegacySpecSessionParameters(
+        this.server.env.get(SessionManager),
+        this.dataProvider.featureFlags
+      );
+      await this.server.setStateOf(
+        BasicInformationServer,
+        specVersionValues(this.dataProvider.featureFlags)
+      );
       await this.server.start();
       await this.endpointManager.startPlugins();
       this.setStatus({ code: BridgeStatus.Running });
@@ -160080,12 +160153,6 @@ var HaElectricalPowerMeasurementServer = ElectricalPowerMeasurementServerBase.se
 
 // src/matter/behaviors/fan-speed-memory.ts
 init_esm7();
-
-// ../../node_modules/.pnpm/@matter+main@0.17.9/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(
@@ -179276,6 +179343,14 @@ var ServerModeBridge = class {
       logMemoryUsage(this.log, "after refreshDevices (server mode)");
       this.endpointManager.startObserving();
       ensureCommissioningConfig(this.server);
+      applyLegacySpecSessionParameters(
+        this.server.env.get(SessionManager),
+        this.dataProvider.featureFlags
+      );
+      await this.server.setStateOf(
+        BasicInformationServer,
+        specVersionValues(this.dataProvider.featureFlags)
+      );
       await this.server.start();
       this.setStatus({ code: BridgeStatus.Running });
       this.startAutoForceSyncIfEnabled();
@@ -183476,6 +183551,7 @@ export {
 @matter/node/dist/esm/devices/index.js:
 @matter/main/dist/esm/devices.js:
 @matter/main/dist/esm/node.js:
+@matter/main/dist/esm/model.js:
 @matter/node/dist/esm/behaviors/account-login/index.js:
 @matter/node/dist/esm/behaviors/actions/ActionsClient.js:
 @matter/node/dist/esm/behaviors/actions/index.js:
@@ -183718,7 +183794,6 @@ export {
 @matter/node/dist/esm/endpoints/secondary-network-interface.js:
 @matter/node/dist/esm/endpoints/index.js:
 @matter/main/dist/esm/endpoints.js:
-@matter/main/dist/esm/model.js:
 @matter/main/dist/esm/forwards/clusters/level-control.js:
 @matter/main/dist/esm/forwards/behaviors/boolean-state.js:
 @matter/main/dist/esm/forwards/behaviors/smoke-co-alarm.js: