@matter/protocol 0.13.0-alpha.0-20250318-c1aa38b08 → 0.13.0-alpha.0-20250323-770919c6a

package/dist/esm/peer/ControllerCommissioningFlow.js

@@ -9,7 +9,17 @@ import { GeneralCommissioning } from "#clusters/general-commissioning";
 import { NetworkCommissioning } from "#clusters/network-commissioning";
 import { OperationalCredentials } from "#clusters/operational-credentials";
 import { TimeSynchronizationCluster } from "#clusters/time-synchronization";
-import { Bytes, ChannelType, Crypto, Logger, MatterError, repackErrorAs, Time, UnexpectedDataError } from "#general";
+import {
+  Bytes,
+  ChannelType,
+  Crypto,
+  Diagnostic,
+  Logger,
+  MatterError,
+  repackErrorAs,
+  Time,
+  UnexpectedDataError
+} from "#general";
 import {
   EndpointNumber,
   StatusResponseError
@@ -31,27 +41,27 @@ class RecoverableCommissioningError extends CommissioningError {
 }
 const DEFAULT_FAILSAFE_TIME_MS = 6e4;
 class ControllerCommissioningFlow {
-  #interactionClient;
-  #ca;
-  #fabric;
-  #transitionToCase;
-  #commissioningOptions;
-  #commissioningSteps = new Array();
-  #commissioningStepResults = /* @__PURE__ */ new Map();
+  interactionClient;
+  ca;
+  fabric;
+  transitionToCase;
+  commissioningOptions;
+  commissioningSteps = new Array();
+  commissioningStepResults = /* @__PURE__ */ new Map();
   #clusterClients = /* @__PURE__ */ new Map();
   #commissioningStartedTime;
   #commissioningExpiryTime;
   #lastFailSafeTime;
-  #lastBreadcrumb = 1;
-  #collectedCommissioningData = {};
+  lastBreadcrumb = 1;
+  collectedCommissioningData = {};
   #failSafeTimeMs = DEFAULT_FAILSAFE_TIME_MS;
   constructor(interactionClient, ca, fabric, commissioningOptions, transitionToCase) {
-    this.#interactionClient = interactionClient;
-    this.#ca = ca;
-    this.#fabric = fabric;
-    this.#transitionToCase = transitionToCase;
-    this.#commissioningOptions = commissioningOptions;
-    logger.debug(`Commissioning options: ${Logger.toJSON(commissioningOptions)}`);
+    this.interactionClient = interactionClient;
+    this.ca = ca;
+    this.fabric = fabric;
+    this.transitionToCase = transitionToCase;
+    this.commissioningOptions = commissioningOptions;
+    logger.debug(`Commissioning options: ${Diagnostic.json(commissioningOptions)}`);
     this.#initializeCommissioningSteps();
   }
   /**
@@ -63,7 +73,7 @@ class ControllerCommissioningFlow {
   async executeCommissioning() {
     this.#sortSteps();
     let failSafeTimerReArmedAfterPreviousStep = false;
-    for (const step of this.#commissioningSteps) {
+    for (const step of this.commissioningSteps) {
       logger.info(`Executing commissioning step ${step.stepNumber}.${step.subStepNumber}: ${step.name}`);
       try {
         if (step.reArmFailsafe && !failSafeTimerReArmedAfterPreviousStep) {
@@ -128,7 +138,7 @@ class ControllerCommissioningFlow {
     logger.debug(
       `Creating new cluster client for cluster ${cluster.name} (endpoint ${endpointId}, isFeatureSpecific ${isFeatureSpecific})`
     );
-    const client = ClusterClient(cluster, endpointId, this.#interactionClient);
+    const client = ClusterClient(cluster, endpointId, this.interactionClient);
     this.#clusterClients.set(cluster.id, client);
     return client;
   }
@@ -137,59 +147,59 @@ class ControllerCommissioningFlow {
    * @see {@link MatterSpecification.v13.Core} § 5.5
    */
   #initializeCommissioningSteps() {
-    this.#commissioningSteps.push({
+    this.commissioningSteps.push({
       stepNumber: 0,
       // Preparation
       subStepNumber: 1,
       name: "GetInitialData",
       stepLogic: () => this.#getInitialData()
     });
-    this.#commissioningSteps.push({
+    this.commissioningSteps.push({
       stepNumber: 7,
       subStepNumber: 1,
       name: "GeneralCommissioning.ArmFailsafe",
       stepLogic: () => this.#armFailsafe()
     });
-    this.#commissioningSteps.push({
+    this.commissioningSteps.push({
       stepNumber: 8,
       subStepNumber: 1,
       name: "GeneralCommissioning.ConfigureRegulatoryInformation",
       stepLogic: () => this.#configureRegulatoryInformation()
     });
-    this.#commissioningSteps.push({
+    this.commissioningSteps.push({
       stepNumber: 8,
       subStepNumber: 2,
       name: "TimeSynchronization.SynchronizeTime",
       stepLogic: () => this.#synchronizeTime()
     });
-    this.#commissioningSteps.push({
+    this.commissioningSteps.push({
       stepNumber: 10,
       subStepNumber: 1,
       name: "OperationalCredentials.DeviceAttestation",
       stepLogic: () => this.#deviceAttestation()
     });
-    this.#commissioningSteps.push({
+    this.commissioningSteps.push({
       stepNumber: 11,
       // includes 11-13
       subStepNumber: 1,
       name: "OperationalCredentials.Certificates",
       stepLogic: () => this.#certificates()
     });
-    this.#commissioningSteps.push({
+    this.commissioningSteps.push({
       stepNumber: 15,
       subStepNumber: 1,
       name: "AccessControl",
       stepLogic: () => this.#configureAccessControlLists()
     });
-    if (this.#interactionClient.channelType === ChannelType.BLE) {
-      this.#commissioningSteps.push({
+    if (this.interactionClient.channelType === ChannelType.BLE) {
+      this.commissioningSteps.push({
         stepNumber: 16,
         subStepNumber: 1,
         name: "NetworkCommissioning.Validate",
         stepLogic: () => this.#validateNetwork()
       });
-      if (this.#commissioningOptions.wifiNetwork !== void 0) {
-        this.#commissioningSteps.push({
+      if (this.commissioningOptions.wifiNetwork !== void 0) {
+        this.commissioningSteps.push({
           stepNumber: 16,
           // includes step 17
           subStepNumber: 2,
@@ -198,8 +208,8 @@ class ControllerCommissioningFlow {
           stepLogic: () => this.#configureNetworkWifi()
         });
       }
-      if (this.#commissioningOptions.threadNetwork !== void 0) {
-        this.#commissioningSteps.push({
+      if (this.commissioningOptions.threadNetwork !== void 0) {
+        this.commissioningSteps.push({
           stepNumber: 16,
           // includes step 17
           subStepNumber: 3,
@@ -210,10 +220,10 @@ class ControllerCommissioningFlow {
       }
     } else {
       logger.info(
-        `Skipping NetworkCommissioning steps because the device is already on IP network (${this.#interactionClient.channelType})`
+        `Skipping NetworkCommissioning steps because the device is already on IP network (${this.interactionClient.channelType})`
       );
     }
-    this.#commissioningSteps.push({
+    this.commissioningSteps.push({
       stepNumber: 18,
       // includes step 19 (CASE connection)
       subStepNumber: 1,
@@ -221,13 +231,13 @@ class ControllerCommissioningFlow {
       reArmFailsafe: true,
       stepLogic: () => this.#reconnectWithDevice()
     });
-    this.#commissioningSteps.push({
+    this.commissioningSteps.push({
       stepNumber: 20,
       subStepNumber: 1,
       name: "GeneralCommissioning.Complete",
       stepLogic: () => this.#completeCommissioning()
     });
-    this.#commissioningSteps.push({
+    this.commissioningSteps.push({
       stepNumber: 99,
       // Should be allowed in Step 13, but Tasmota is not supporting this
       subStepNumber: 1,
@@ -236,16 +246,16 @@ class ControllerCommissioningFlow {
     });
   }
   #sortSteps() {
-    this.#commissioningSteps.sort((a, b) => {
+    this.commissioningSteps.sort((a, b) => {
       if (a.stepNumber !== b.stepNumber) return a.stepNumber - b.stepNumber;
       return a.subStepNumber - b.subStepNumber;
     });
   }
   #setCommissioningStepResult(step, result) {
-    this.#commissioningStepResults.set(`${step.stepNumber}-${step.subStepNumber}`, result);
+    this.commissioningStepResults.set(`${step.stepNumber}-${step.subStepNumber}`, result);
   }
   getCommissioningStepResult(stepNumber, subStepNumber) {
-    return this.#commissioningStepResults.get(`${stepNumber}-${subStepNumber}`);
+    return this.commissioningStepResults.get(`${stepNumber}-${subStepNumber}`);
   }
   /** Helper method to check for errorCode/debugTest responses and throw error on failure */
   #ensureOperationalCredentialsSuccess(context, { statusCode, debugText, fabricIndex }) {
@@ -275,9 +285,9 @@ class ControllerCommissioningFlow {
    */
   async #getInitialData() {
     const descriptorClient = this.#getClusterClient(Descriptor.Cluster);
-    this.#collectedCommissioningData.rootPartsList = await descriptorClient.getPartsListAttribute();
-    this.#collectedCommissioningData.rootServerList = await descriptorClient.getServerListAttribute();
-    const networkData = await this.#interactionClient.getMultipleAttributes({
+    this.collectedCommissioningData.rootPartsList = await descriptorClient.getPartsListAttribute();
+    this.collectedCommissioningData.rootServerList = await descriptorClient.getServerListAttribute();
+    const networkData = await this.interactionClient.getMultipleAttributes({
       attributes: [
         {
           clusterId: NetworkCommissioning.Complete.id,
@@ -301,17 +311,17 @@ class ControllerCommissioningFlow {
         networkStatus.push({ endpointId, value });
       }
     }
-    this.#collectedCommissioningData.networkFeatures = networkFeatures;
-    this.#collectedCommissioningData.networkStatus = networkStatus;
+    this.collectedCommissioningData.networkFeatures = networkFeatures;
+    this.collectedCommissioningData.networkStatus = networkStatus;
     const basicInfoClient = this.#getClusterClient(BasicInformation.Cluster);
-    this.#collectedCommissioningData.vendorId = await basicInfoClient.getVendorIdAttribute();
-    this.#collectedCommissioningData.productId = await basicInfoClient.getProductIdAttribute();
-    this.#collectedCommissioningData.productName = await basicInfoClient.getProductNameAttribute();
+    this.collectedCommissioningData.vendorId = await basicInfoClient.getVendorIdAttribute();
+    this.collectedCommissioningData.productId = await basicInfoClient.getProductIdAttribute();
+    this.collectedCommissioningData.productName = await basicInfoClient.getProductNameAttribute();
     const generalCommissioningClient = this.#getClusterClient(GeneralCommissioning.Cluster);
-    this.#collectedCommissioningData.supportsConcurrentConnection = await generalCommissioningClient.getSupportsConcurrentConnectionAttribute();
+    this.collectedCommissioningData.supportsConcurrentConnection = await generalCommissioningClient.getSupportsConcurrentConnectionAttribute();
     return {
       code: 0 /* Success */,
-      breadcrumb: this.#lastBreadcrumb
+      breadcrumb: this.lastBreadcrumb
     };
   }
   /**
@@ -325,9 +335,9 @@ class ControllerCommissioningFlow {
    */
   async #armFailsafe() {
     const client = this.#getClusterClient(GeneralCommissioning.Cluster);
-    if (this.#collectedCommissioningData.basicCommissioningInfo === void 0) {
+    if (this.collectedCommissioningData.basicCommissioningInfo === void 0) {
       const basicCommissioningInfo = await client.getBasicCommissioningInfoAttribute();
-      this.#collectedCommissioningData.basicCommissioningInfo = basicCommissioningInfo;
+      this.collectedCommissioningData.basicCommissioningInfo = basicCommissioningInfo;
       this.#failSafeTimeMs = basicCommissioningInfo.failSafeExpiryLengthSeconds * 1e3;
       this.#commissioningStartedTime = Time.nowMs();
       this.#commissioningExpiryTime = this.#commissioningStartedTime + basicCommissioningInfo.maxCumulativeFailsafeSeconds * 1e3;
@@ -335,14 +345,14 @@ class ControllerCommissioningFlow {
     this.#ensureGeneralCommissioningSuccess(
       "armFailSafe",
       await client.armFailSafe({
-        breadcrumb: this.#lastBreadcrumb,
-        expiryLengthSeconds: this.#collectedCommissioningData.basicCommissioningInfo?.failSafeExpiryLengthSeconds
+        breadcrumb: this.lastBreadcrumb,
+        expiryLengthSeconds: this.collectedCommissioningData.basicCommissioningInfo?.failSafeExpiryLengthSeconds
       })
     );
     this.#lastFailSafeTime = Time.nowMs();
     return {
       code: 0 /* Success */,
-      breadcrumb: this.#lastBreadcrumb
+      breadcrumb: this.lastBreadcrumb
     };
   }
   async #resetFailsafeTimer() {
@@ -350,7 +360,7 @@ class ControllerCommissioningFlow {
     try {
       const client = this.#getClusterClient(GeneralCommissioning.Cluster);
       await client.armFailSafe({
-        breadcrumb: this.#lastBreadcrumb,
+        breadcrumb: this.lastBreadcrumb,
         expiryLengthSeconds: 0
       });
       this.#lastFailSafeTime = void 0;
@@ -366,26 +376,26 @@ class ControllerCommissioningFlow {
    * Commissionee using the SetRegulatoryConfig command.
    */
   async #configureRegulatoryInformation() {
-    if (this.#collectedCommissioningData.networkFeatures === void 0) {
+    if (this.collectedCommissioningData.networkFeatures === void 0) {
       throw new CommissioningError("No network features collected. This should never happen.");
     }
-    const hasRadioNetwork = this.#collectedCommissioningData.networkFeatures.some(
+    const hasRadioNetwork = this.collectedCommissioningData.networkFeatures.some(
       ({ value: { wiFiNetworkInterface, threadNetworkInterface } }) => wiFiNetworkInterface || threadNetworkInterface
     );
     if (hasRadioNetwork) {
       const client = this.#getClusterClient(GeneralCommissioning.Cluster);
       let locationCapability = await client.getLocationCapabilityAttribute();
       if (locationCapability === GeneralCommissioning.RegulatoryLocationType.IndoorOutdoor) {
-        locationCapability = this.#commissioningOptions.regulatoryLocation;
+        locationCapability = this.commissioningOptions.regulatoryLocation;
       } else {
         logger.debug(
           `Device does not support a configurable regulatory location type. Location is set to "${locationCapability === GeneralCommissioning.RegulatoryLocationType.Indoor ? "Indoor" : "Outdoor"}"`
         );
       }
-      let countryCode = this.#commissioningOptions.regulatoryCountryCode;
+      let countryCode = this.commissioningOptions.regulatoryCountryCode;
       const regulatoryResult = await client.setRegulatoryConfig(
         {
-          breadcrumb: this.#lastBreadcrumb++,
+          breadcrumb: this.lastBreadcrumb++,
           newRegulatoryConfig: locationCapability,
           countryCode
         },
@@ -400,7 +410,7 @@ class ControllerCommissioningFlow {
           "setRegulatoryConfig",
           await client.setRegulatoryConfig(
             {
-              breadcrumb: this.#lastBreadcrumb,
+              breadcrumb: this.lastBreadcrumb,
               newRegulatoryConfig: locationCapability,
               countryCode
             },
@@ -412,12 +422,12 @@ class ControllerCommissioningFlow {
       }
       return {
         code: 0 /* Success */,
-        breadcrumb: this.#lastBreadcrumb
+        breadcrumb: this.lastBreadcrumb
       };
     }
     return {
       code: 2 /* Skipped */,
-      breadcrumb: this.#lastBreadcrumb
+      breadcrumb: this.lastBreadcrumb
     };
   }
   /**
@@ -430,14 +440,14 @@ class ControllerCommissioningFlow {
    * ▪ The Commissioner SHOULD set a Default NTP server using the SetDefaultNTP command if the NTPClient Feature is supported and the DefaultNTP attribute is null. If the current value is non-null, Commissioners MAY opt to overwrite the current value.
    */
   async #synchronizeTime() {
-    if (this.#collectedCommissioningData.rootServerList !== void 0 && this.#collectedCommissioningData.rootServerList.find(
+    if (this.collectedCommissioningData.rootServerList !== void 0 && this.collectedCommissioningData.rootServerList.find(
       (clusterId) => clusterId === TimeSynchronizationCluster.id
     )) {
       logger.debug("TimeSynchronization cluster is supported");
     }
     return {
       code: 2 /* Skipped */,
-      breadcrumb: this.#lastBreadcrumb
+      breadcrumb: this.lastBreadcrumb
     };
   }
   /**
@@ -470,7 +480,7 @@ class ControllerCommissioningFlow {
     }
     return {
       code: 0 /* Success */,
-      breadcrumb: this.#lastBreadcrumb
+      breadcrumb: this.lastBreadcrumb
     };
   }
   /**
@@ -502,31 +512,31 @@ class ControllerCommissioningFlow {
     const operationalPublicKey = CertificateManager.getPublicKeyFromCsr(certSigningRequest);
     await operationalCredentialsClusterClient.addTrustedRootCertificate(
       {
-        rootCaCertificate: this.#ca.rootCert
+        rootCaCertificate: this.ca.rootCert
       },
       { useExtendedFailSafeMessageResponseTimeout: true }
     );
-    const peerOperationalCert = this.#ca.generateNoc(
+    const peerOperationalCert = this.ca.generateNoc(
       operationalPublicKey,
-      this.#fabric.fabricId,
-      this.#interactionClient.address.nodeId
+      this.fabric.fabricId,
+      this.interactionClient.address.nodeId
     );
     const addNocResponse = await operationalCredentialsClusterClient.addNoc(
       {
         nocValue: peerOperationalCert,
         icacValue: new Uint8Array(0),
-        ipkValue: this.#fabric.identityProtectionKey,
-        adminVendorId: this.#fabric.rootVendorId,
-        caseAdminSubject: this.#fabric.rootNodeId
+        ipkValue: this.fabric.identityProtectionKey,
+        adminVendorId: this.fabric.rootVendorId,
+        caseAdminSubject: this.fabric.rootNodeId
       },
       { useExtendedFailSafeMessageResponseTimeout: true }
     );
     this.#ensureOperationalCredentialsSuccess("addNoc", addNocResponse);
     const { fabricIndex } = addNocResponse;
-    this.#collectedCommissioningData.fabricIndex = fabricIndex;
+    this.collectedCommissioningData.fabricIndex = fabricIndex;
     return {
       code: 0 /* Success */,
-      breadcrumb: this.#lastBreadcrumb
+      breadcrumb: this.lastBreadcrumb
     };
   }
   /**
@@ -537,12 +547,12 @@ class ControllerCommissioningFlow {
    * the commissioning process.
    */
   async #updateFabricLabel() {
-    const { fabricIndex } = this.#collectedCommissioningData;
+    const { fabricIndex } = this.collectedCommissioningData;
     if (fabricIndex === void 0) {
       logger.error("No fabric index available after addNoc. This should never happen.");
       return {
         code: 1 /* Failure */,
-        breadcrumb: this.#lastBreadcrumb
+        breadcrumb: this.lastBreadcrumb
       };
     }
     const operationalCredentialCluster = this.#getClusterClient(OperationalCredentials.Cluster);
@@ -550,7 +560,7 @@ class ControllerCommissioningFlow {
       this.#ensureOperationalCredentialsSuccess(
         "updateFabricLabel",
         await operationalCredentialCluster.updateFabricLabel({
-          label: this.#fabric.label,
+          label: this.fabric.label,
           fabricIndex
         })
       );
@@ -559,7 +569,7 @@ class ControllerCommissioningFlow {
     }
     return {
       code: 0 /* Success */,
-      breadcrumb: this.#lastBreadcrumb
+      breadcrumb: this.lastBreadcrumb
     };
   }
   /**
@@ -572,7 +582,7 @@ class ControllerCommissioningFlow {
   async #configureAccessControlLists() {
     return {
       code: 2 /* Skipped */,
-      breadcrumb: this.#lastBreadcrumb
+      breadcrumb: this.lastBreadcrumb
     };
   }
   /**
@@ -589,14 +599,14 @@ class ControllerCommissioningFlow {
    *     operational network.
    */
   async #validateNetwork() {
-    if (this.#collectedCommissioningData.networkFeatures === void 0 || this.#collectedCommissioningData.networkStatus === void 0) {
+    if (this.collectedCommissioningData.networkFeatures === void 0 || this.collectedCommissioningData.networkStatus === void 0) {
       throw new CommissioningError("No network features or status collected. This should never happen.");
     }
-    if (this.#commissioningOptions.wifiNetwork === void 0 && this.#commissioningOptions.threadNetwork === void 0) {
-      const anyEthernetInterface = this.#collectedCommissioningData.networkFeatures.length === 0 || this.#collectedCommissioningData.networkFeatures.some(
+    if ((this.commissioningOptions.wifiNetwork === void 0 || !this.commissioningOptions.wifiNetwork.wifiSsid || !this.commissioningOptions.wifiNetwork.wifiCredentials) && (this.commissioningOptions.threadNetwork === void 0 || !this.commissioningOptions.threadNetwork.networkName || !this.commissioningOptions.threadNetwork.operationalDataset)) {
+      const anyEthernetInterface = this.collectedCommissioningData.networkFeatures.length === 0 || this.collectedCommissioningData.networkFeatures.some(
         ({ value: { ethernetNetworkInterface } }) => ethernetNetworkInterface === true
       );
-      const anyInterfaceConnected = this.#collectedCommissioningData.networkStatus.length === 0 || this.#collectedCommissioningData.networkStatus.some(
+      const anyInterfaceConnected = this.collectedCommissioningData.networkStatus.length === 0 || this.collectedCommissioningData.networkStatus.some(
         ({ value }) => value.some(({ connected }) => connected)
       );
       if (!anyEthernetInterface && !anyInterfaceConnected) {
@@ -607,40 +617,40 @@ class ControllerCommissioningFlow {
     }
     return {
       code: 0 /* Success */,
-      breadcrumb: this.#lastBreadcrumb
+      breadcrumb: this.lastBreadcrumb
     };
   }
   async #configureNetworkWifi() {
-    if (this.#commissioningOptions.wifiNetwork === void 0) {
+    if (this.commissioningOptions.wifiNetwork === void 0) {
       logger.debug("WiFi network is not configured");
       return {
         code: 2 /* Skipped */,
-        breadcrumb: this.#lastBreadcrumb
+        breadcrumb: this.lastBreadcrumb
       };
     }
-    if (this.#collectedCommissioningData.networkFeatures !== void 0 && this.#collectedCommissioningData.networkStatus !== void 0) {
-      const rootNetworkFeatures = this.#collectedCommissioningData.networkFeatures.find(
+    if (this.collectedCommissioningData.networkFeatures !== void 0 && this.collectedCommissioningData.networkStatus !== void 0) {
+      const rootNetworkFeatures = this.collectedCommissioningData.networkFeatures.find(
         ({ endpointId }) => endpointId === 0
       )?.value;
-      const rootNetworkStatus = this.#collectedCommissioningData.networkStatus.find(
+      const rootNetworkStatus = this.collectedCommissioningData.networkStatus.find(
         ({ endpointId }) => endpointId === 0
       )?.value;
       logger.debug(
-        `Root Networks found: ${Logger.toJSON(rootNetworkFeatures)} - ${Logger.toJSON(rootNetworkStatus)}`
+        `Root Networks found: ${Diagnostic.json(rootNetworkFeatures)} - ${Diagnostic.json(rootNetworkStatus)}`
       );
       if (rootNetworkFeatures?.wiFiNetworkInterface !== true) {
         logger.debug("Commissionee does not support any WiFi network interface");
         return {
           code: 2 /* Skipped */,
-          breadcrumb: this.#lastBreadcrumb
+          breadcrumb: this.lastBreadcrumb
         };
       }
       if (rootNetworkStatus !== void 0 && rootNetworkStatus.length > 0 && rootNetworkStatus[0].connected) {
         logger.debug("Commissionee is already connected to the WiFi network");
-        this.#collectedCommissioningData.successfullyConnectedToNetwork = true;
+        this.collectedCommissioningData.successfullyConnectedToNetwork = true;
         return {
           code: 2 /* Skipped */,
-          breadcrumb: this.#lastBreadcrumb
+          breadcrumb: this.lastBreadcrumb
         };
       }
     }
@@ -650,12 +660,12 @@ class ControllerCommissioningFlow {
       EndpointNumber(0),
       true
     );
-    const ssid = Bytes.fromString(this.#commissioningOptions.wifiNetwork.wifiSsid);
-    const credentials = Bytes.fromString(this.#commissioningOptions.wifiNetwork.wifiCredentials);
+    const ssid = Bytes.fromString(this.commissioningOptions.wifiNetwork.wifiSsid);
+    const credentials = Bytes.fromString(this.commissioningOptions.wifiNetwork.wifiCredentials);
     const { networkingStatus, wiFiScanResults, debugText } = await networkCommissioningClusterClient.scanNetworks(
       {
         ssid,
-        breadcrumb: this.#lastBreadcrumb++
+        breadcrumb: this.lastBreadcrumb++
       },
       { useExtendedFailSafeMessageResponseTimeout: true }
     );
@@ -664,7 +674,7 @@ class ControllerCommissioningFlow {
     }
     if (wiFiScanResults === void 0 || wiFiScanResults.length === 0) {
       throw new CommissioningError(
-        `Commissionee did not return any WiFi networks for the requested SSID ${this.#commissioningOptions.wifiNetwork.wifiSsid}`
+        `Commissionee did not return any WiFi networks for the requested SSID ${this.commissioningOptions.wifiNetwork.wifiSsid}`
       );
     }
     const {
@@ -675,7 +685,7 @@ class ControllerCommissioningFlow {
       {
         ssid,
         credentials,
-        breadcrumb: this.#lastBreadcrumb++
+        breadcrumb: this.lastBreadcrumb++
       },
       { useExtendedFailSafeMessageResponseTimeout: true }
     );
@@ -686,7 +696,7 @@ class ControllerCommissioningFlow {
       throw new CommissioningError(`Commissionee did not return network index`);
     }
     logger.debug(
-      `Commissionee added WiFi network ${this.#commissioningOptions.wifiNetwork.wifiSsid} with network index ${networkIndex}`
+      `Commissionee added WiFi network ${this.commissioningOptions.wifiNetwork.wifiSsid} with network index ${networkIndex}`
     );
     const updatedNetworks = await networkCommissioningClusterClient.getNetworksAttribute();
     if (updatedNetworks[networkIndex] === void 0) {
@@ -694,71 +704,71 @@ class ControllerCommissioningFlow {
     }
     const { networkId, connected } = updatedNetworks[networkIndex];
     if (connected) {
-      this.#collectedCommissioningData.successfullyConnectedToNetwork = true;
+      this.collectedCommissioningData.successfullyConnectedToNetwork = true;
       logger.debug(
-        `Commissionee is already connected to WiFi network ${this.#commissioningOptions.wifiNetwork.wifiSsid} (networkId ${Bytes.toHex(networkId)})`
+        `Commissionee is already connected to WiFi network ${this.commissioningOptions.wifiNetwork.wifiSsid} (networkId ${Bytes.toHex(networkId)})`
       );
       return {
         code: 0 /* Success */,
-        breadcrumb: this.#lastBreadcrumb
+        breadcrumb: this.lastBreadcrumb
       };
     }
     const connectResult = await networkCommissioningClusterClient.connectNetwork(
       {
         networkId,
-        breadcrumb: this.#lastBreadcrumb++
+        breadcrumb: this.lastBreadcrumb++
       },
       { useExtendedFailSafeMessageResponseTimeout: true }
     );
     if (connectResult.networkingStatus !== NetworkCommissioning.NetworkCommissioningStatus.Success) {
       throw new CommissioningError(`Commissionee failed to connect to WiFi network: ${connectResult.debugText}`);
     }
-    this.#collectedCommissioningData.successfullyConnectedToNetwork = true;
+    this.collectedCommissioningData.successfullyConnectedToNetwork = true;
     logger.debug(
-      `Commissionee successfully connected to WiFi network ${this.#commissioningOptions.wifiNetwork.wifiSsid} (networkId ${Bytes.toHex(networkId)})`
+      `Commissionee successfully connected to WiFi network ${this.commissioningOptions.wifiNetwork.wifiSsid} (networkId ${Bytes.toHex(networkId)})`
     );
     return {
       code: 0 /* Success */,
-      breadcrumb: this.#lastBreadcrumb
+      breadcrumb: this.lastBreadcrumb
     };
   }
   async #configureNetworkThread() {
-    if (this.#collectedCommissioningData.successfullyConnectedToNetwork) {
-      logger.debug("Node is already connected to a network. Skipping Thread configuration.");
+    if (this.collectedCommissioningData.successfullyConnectedToNetwork) {
+      logger.info("Node is already connected to a network. Skipping Thread configuration.");
       return {
         code: 2 /* Skipped */,
-        breadcrumb: this.#lastBreadcrumb
+        breadcrumb: this.lastBreadcrumb
       };
     }
-    if (this.#commissioningOptions.threadNetwork === void 0) {
+    if (this.commissioningOptions.threadNetwork === void 0) {
       logger.debug("Thread network is not configured");
       return {
         code: 2 /* Skipped */,
-        breadcrumb: this.#lastBreadcrumb
+        breadcrumb: this.lastBreadcrumb
       };
     }
-    if (this.#collectedCommissioningData.networkFeatures !== void 0 && this.#collectedCommissioningData.networkStatus !== void 0) {
-      const rootNetworkFeatures = this.#collectedCommissioningData.networkFeatures.find(
+    if (this.collectedCommissioningData.networkFeatures !== void 0 && this.collectedCommissioningData.networkStatus !== void 0) {
+      const rootNetworkFeatures = this.collectedCommissioningData.networkFeatures.find(
         ({ endpointId }) => endpointId === 0
       )?.value;
-      const rootNetworkStatus = this.#collectedCommissioningData.networkStatus.find(
+      const rootNetworkStatus = this.collectedCommissioningData.networkStatus.find(
         ({ endpointId }) => endpointId === 0
       )?.value;
       logger.debug(
-        `Root Networks found: ${Logger.toJSON(rootNetworkFeatures)} - ${Logger.toJSON(rootNetworkStatus)}`
+        `Root Networks found: ${Diagnostic.json(rootNetworkFeatures)} - ${Diagnostic.json(rootNetworkStatus)}`
       );
       if (rootNetworkFeatures?.threadNetworkInterface !== true) {
         logger.debug("Commissionee does not support any Thread network interface");
         return {
           code: 2 /* Skipped */,
-          breadcrumb: this.#lastBreadcrumb
+          breadcrumb: this.lastBreadcrumb
         };
       }
       if (rootNetworkStatus !== void 0 && rootNetworkStatus.length > 0 && rootNetworkStatus[0].connected) {
         logger.debug("Commissionee is already connected to the Thread network");
         return {
           code: 2 /* Skipped */,
-          breadcrumb: this.#lastBreadcrumb
+          breadcrumb: this.lastBreadcrumb
         };
       }
     }
@@ -769,7 +779,7 @@ class ControllerCommissioningFlow {
       true
     );
     const { networkingStatus, threadScanResults, debugText } = await networkCommissioningClusterClient.scanNetworks(
-      { breadcrumb: this.#lastBreadcrumb++ },
+      { breadcrumb: this.lastBreadcrumb++ },
       { useExtendedFailSafeMessageResponseTimeout: true }
     );
     if (networkingStatus !== NetworkCommissioning.NetworkCommissioningStatus.Success) {
@@ -777,19 +787,19 @@ class ControllerCommissioningFlow {
     }
     if (threadScanResults === void 0 || threadScanResults.length === 0) {
       throw new CommissioningError(
-        `Commissionee did not return any Thread networks for the requested Network ${this.#commissioningOptions.threadNetwork.networkName}`
+        `Commissionee did not return any Thread networks for the requested Network ${this.commissioningOptions.threadNetwork.networkName}`
       );
     }
     const wantedNetworkFound = threadScanResults.find(
-      ({ networkName }) => networkName === this.#commissioningOptions.threadNetwork?.networkName
+      ({ networkName }) => networkName === this.commissioningOptions.threadNetwork?.networkName
     );
     if (wantedNetworkFound === void 0) {
       throw new CommissioningError(
-        `Commissionee did not return the requested Network ${this.#commissioningOptions.threadNetwork.networkName}: ${Logger.toJSON(threadScanResults)}`
+        `Commissionee did not return the requested Network ${this.commissioningOptions.threadNetwork.networkName}: ${Diagnostic.json(threadScanResults)}`
       );
     }
     logger.debug(
-      `Commissionee found wanted Thread network ${this.#commissioningOptions.threadNetwork.networkName}: ${Logger.toJSON(wantedNetworkFound)}`
+      `Commissionee found wanted Thread network ${this.commissioningOptions.threadNetwork.networkName}: ${Diagnostic.json(wantedNetworkFound)}`
     );
     const {
       networkingStatus: addNetworkingStatus,
@@ -797,8 +807,8 @@ class ControllerCommissioningFlow {
       networkIndex
     } = await networkCommissioningClusterClient.addOrUpdateThreadNetwork(
       {
-        operationalDataset: Bytes.fromHex(this.#commissioningOptions.threadNetwork.operationalDataset),
-        breadcrumb: this.#lastBreadcrumb++
+        operationalDataset: Bytes.fromHex(this.commissioningOptions.threadNetwork.operationalDataset),
+        breadcrumb: this.lastBreadcrumb++
       },
       { useExtendedFailSafeMessageResponseTimeout: true }
     );
@@ -809,7 +819,7 @@ class ControllerCommissioningFlow {
       throw new CommissioningError(`Commissionee did not return network index`);
     }
     logger.debug(
-      `Commissionee added Thread network ${this.#commissioningOptions.threadNetwork.networkName} with network index ${networkIndex}`
+      `Commissionee added Thread network ${this.commissioningOptions.threadNetwork.networkName} with network index ${networkIndex}`
     );
     const updatedNetworks = await networkCommissioningClusterClient.getNetworksAttribute();
     if (updatedNetworks[networkIndex] === void 0) {
@@ -818,17 +828,17 @@ class ControllerCommissioningFlow {
     const { networkId, connected } = updatedNetworks[networkIndex];
     if (connected) {
       logger.debug(
-        `Commissionee is already connected to Thread network ${this.#commissioningOptions.threadNetwork.networkName} (networkId ${Bytes.toHex(networkId)})`
+        `Commissionee is already connected to Thread network ${this.commissioningOptions.threadNetwork.networkName} (networkId ${Bytes.toHex(networkId)})`
       );
       return {
         code: 0 /* Success */,
-        breadcrumb: this.#lastBreadcrumb
+        breadcrumb: this.lastBreadcrumb
       };
     }
     const connectResult = await networkCommissioningClusterClient.connectNetwork(
       {
         networkId,
-        breadcrumb: this.#lastBreadcrumb++
+        breadcrumb: this.lastBreadcrumb++
       },
       { useExtendedFailSafeMessageResponseTimeout: true }
     );
@@ -838,11 +848,11 @@ class ControllerCommissioningFlow {
       );
     }
     logger.debug(
-      `Commissionee successfully connected to Thread network ${this.#commissioningOptions.threadNetwork.networkName} (networkId ${Bytes.toHex(networkId)})`
+      `Commissionee successfully connected to Thread network ${this.commissioningOptions.threadNetwork.networkName} (networkId ${Bytes.toHex(networkId)})`
     );
     return {
       code: 0 /* Success */,
-      breadcrumb: this.#lastBreadcrumb
+      breadcrumb: this.lastBreadcrumb
     };
   }
   /**
@@ -854,7 +864,7 @@ class ControllerCommissioningFlow {
    *     (CASE)”) session with the Commissionee over the operational network.
    */
   async #reconnectWithDevice() {
-    const isConcurrentFlow = this.#collectedCommissioningData.supportsConcurrentConnection !== false;
+    const isConcurrentFlow = this.collectedCommissioningData.supportsConcurrentConnection !== false;
     logger.debug(`Reconnecting with device with ${isConcurrentFlow ? "concurrent" : "non-concurrent"} flow ...`);
     const reArmFailsafeInterval = Time.getPeriodicTimer(
       "Re-Arm Failsafe during reconnect",
@@ -877,8 +887,8 @@ class ControllerCommissioningFlow {
     if (isConcurrentFlow) {
       reArmFailsafeInterval.start();
     }
-    const transitionResult = await this.#transitionToCase(
-      this.#interactionClient.address,
+    const transitionResult = await this.transitionToCase(
+      this.interactionClient.address,
       // Assume concurrent connections are supported if not know (which should not be the case when we came here)
       isConcurrentFlow
     );
@@ -887,15 +897,15 @@ class ControllerCommissioningFlow {
       logger.debug("CASE commissioning handled externally, terminating commissioning flow");
       return {
         code: 3 /* Stop */,
-        breadcrumb: this.#lastBreadcrumb
+        breadcrumb: this.lastBreadcrumb
       };
     }
-    this.#interactionClient = transitionResult;
+    this.interactionClient = transitionResult;
     this.#clusterClients.clear();
     logger.debug("Successfully reconnected with device ...");
     return {
       code: 0 /* Success */,
-      breadcrumb: this.#lastBreadcrumb
+      breadcrumb: this.lastBreadcrumb
     };
   }
   /**
@@ -916,7 +926,7 @@ class ControllerCommissioningFlow {
     this.#lastFailSafeTime = void 0;
     return {
       code: 0 /* Success */,
-      breadcrumb: this.#lastBreadcrumb
+      breadcrumb: this.lastBreadcrumb
     };
   }
 }