@matter/nodejs-shell 0.17.9 → 0.18.0-alpha.0-20260812-4d7f2790e

package/dist/esm/shell/cmd_commission.js

@@ -3,18 +3,65 @@
  * Copyright 2022-2026 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Diagnostic, Logger, MatterError } from "@matter/general";
+import { Diagnostic, ImplementationError, Logger, Seconds } from "@matter/general";
+import { BasicInformationClient } from "@matter/node/behaviors/basic-information";
+import { DescriptorClient } from "@matter/node/behaviors/descriptor";
 import { DiscoveryCapabilitiesSchema, ManualPairingCodeCodec, NodeId, QrCode, QrPairingCodeCodec } from "@matter/types";
-import { BasicInformation, Descriptor, GeneralCommissioning } from "@matter/types/clusters";
-import { createDiagnosticCallbacks } from "../MatterNode.js";
+import { GeneralCommissioning } from "@matter/types/clusters";
+import { awaitSeeded } from "../util/awaitSeeded.js";
 const logger = Logger.get("Commission");
+function findCommissionedNode(theNode, nodeId) {
+  return theNode.node.peers.commissioned.find((peer) => peer.peerAddress?.nodeId === nodeId);
+}
 function commands(theNode) {
   return {
     command: "commission",
     describe: "Handle device commissioning",
     builder: (yargs) => yargs.command("pair", "Pair with a matter device", (yargs2) => {
-      return yargs2.command(
-        "* [node-id] [ip:[port]]",
+      return yargs2.options({
+        pairingCode: {
+          describe: "pairing code",
+          default: void 0,
+          type: "string"
+        },
+        qrCode: {
+          describe: "QR code string (MT:...)",
+          default: void 0,
+          type: "string"
+        },
+        qrCodeIndex: {
+          describe: "Index of QR code entry if multiple (1..n)",
+          default: 1,
+          type: "number"
+        },
+        setupPinCode: {
+          describe: "setup pin code",
+          default: 20202021,
+          type: "number"
+        },
+        instanceId: {
+          alias: "i",
+          describe: "instance id",
+          type: "string"
+        },
+        discriminator: {
+          alias: "d",
+          description: "Long discriminator",
+          type: "number"
+        },
+        shortDiscriminator: {
+          alias: "s",
+          description: "Short discriminator",
+          type: "number"
+        },
+        ble: {
+          alias: "b",
+          description: "Also discover over BLE",
+          type: "boolean",
+          default: false
+        }
+      }).command(
+        "* [node-id] [ip] [port]",
         "Commission a matter device",
         (yargs3) => {
           return yargs3.positional("node-id", {
@@ -32,16 +79,14 @@ function commands(theNode) {
           });
         },
         async (argv) => {
-          const {
-            pairingCode,
-            qrCode,
-            nodeId: nodeIdStr,
-            ipPort,
-            ip,
-            ble = false,
-            instanceId
-          } = argv;
+          const { pairingCode, qrCode, nodeId: nodeIdStr, port, ip, ble, instanceId } = argv;
           let { setupPinCode, discriminator, shortDiscriminator, qrCodeIndex } = argv;
+          if (ip === void 0 !== (port === void 0)) {
+            console.log(
+              "Known-address commissioning requires both <ip> and <port>; provide both or neither (to use discovery)."
+            );
+            return;
+          }
           if (typeof pairingCode === "string" && pairingCode.length > 0) {
             const { shortDiscriminator: pairingCodeShortDiscriminator, passcode } = ManualPairingCodeCodec.decode(pairingCode);
             shortDiscriminator = pairingCodeShortDiscriminator;
@@ -84,27 +129,16 @@ function commands(theNode) {
           }
           const nodeId = nodeIdStr !== void 0 ? NodeId(BigInt(nodeIdStr)) : void 0;
           await theNode.start();
-          if (theNode.commissioningController === void 0) {
-            throw new Error("CommissioningController not initialized");
-          }
-          const options = {
-            discovery: {
-              knownAddress: ip !== void 0 && ipPort !== void 0 ? { ip, port: ipPort, type: "udp" } : void 0,
-              identifierData: instanceId !== void 0 ? { instanceId } : discriminator !== void 0 ? { longDiscriminator: discriminator } : shortDiscriminator !== void 0 ? { shortDiscriminator } : {},
-              discoveryCapabilities: {
-                ble,
-                onIpNetwork: true
-              }
-            },
-            passcode: setupPinCode,
-            ...createDiagnosticCallbacks()
-          };
           const strictAttestation = await theNode.Store.get(
             "StrictAttestationValidation",
             false
           );
-          options.commissioning = {
-            nodeId: nodeId !== void 0 ? NodeId(nodeId) : void 0,
+          const commissioningOptions = {
+            passcode: setupPinCode,
+            discriminator,
+            nodeId,
+            // The shell subscribes on demand via the `subscribe` command, not at commission.
+            autoSubscribe: false,
             regulatoryLocation: GeneralCommissioning.RegulatoryLocationType.Outdoor,
             // Set to the most restrictive if relevant
             regulatoryCountryCode: "XX",
@@ -120,86 +154,64 @@ function commands(theNode) {
               return accept;
             }
           };
-          console.log(Diagnostic.json(options));
+          const { passcode: _passcode, wifiNetwork, ...loggable } = commissioningOptions;
+          console.log(
+            Diagnostic.json({
+              ...loggable,
+              ...wifiNetwork && {
+                wifiNetwork: { ...wifiNetwork, wifiCredentials: "<redacted>" }
+              }
+            })
+          );
           await theNode.certificateService();
           const wifiSsid = await theNode.Store.get("WiFiSsid", "");
           const wifiCredentials = await theNode.Store.get("WiFiPassword", "");
           if (wifiSsid.length > 0 && wifiCredentials.length > 0) {
-            options.commissioning.wifiNetwork = { wifiSsid, wifiCredentials };
+            commissioningOptions.wifiNetwork = { wifiSsid, wifiCredentials };
           }
           const threadOperationalDataset = await theNode.Store.get(
             "ThreadOperationalDataset",
             ""
           );
           if (threadOperationalDataset.length > 0) {
-            options.commissioning.threadNetwork = {
+            commissioningOptions.threadNetwork = {
               networkName: await theNode.Store.get("ThreadName", ""),
               operationalDataset: threadOperationalDataset
             };
           }
-          const commissionedNodeId = await theNode.commissioningController.commissionNode(options);
-          console.log("Commissioned Node:", commissionedNodeId);
-          const node = theNode.commissioningController.getPairedNode(commissionedNodeId);
-          if (node === void 0) {
-            throw new MatterError("Node not found after commissioning.");
+          let node;
+          if (ip !== void 0 && port !== void 0) {
+            node = await theNode.node.peers.forDescriptor({
+              addresses: [{ ip, port, type: "udp" }]
+            });
+            await node.commission(commissioningOptions);
+          } else {
+            const identifierData = instanceId !== void 0 ? { instanceId } : shortDiscriminator !== void 0 ? { shortDiscriminator } : {};
+            node = await theNode.node.peers.commission({
+              ...identifierData,
+              ...commissioningOptions,
+              discoveryCapabilities: { ble, onIpNetwork: true }
+            });
           }
-          const descriptor = node.getRootClusterClient(Descriptor);
+          console.log("Commissioned Node:", node.peerAddress?.nodeId.toString());
+          if (!await awaitSeeded(node)) {
+            return;
+          }
+          const descriptor = node.maybeStateOf(DescriptorClient);
           if (descriptor !== void 0) {
-            console.log(await descriptor.attributes.deviceTypeList.get());
-            console.log(await descriptor.getServerListAttribute());
+            console.log(descriptor.deviceTypeList);
+            console.log(descriptor.serverList);
           } else {
             console.log("No Descriptor Cluster found. This should never happen!");
           }
-          const info = node.getRootClusterClient(BasicInformation);
+          const info = node.maybeStateOf(BasicInformationClient);
           if (info !== void 0) {
-            console.log(await info.getProductNameAttribute());
+            console.log(info.productName);
           } else {
             console.log("No BasicInformation Cluster found. This should never happen!");
           }
         }
-      ).options({
-        pairingCode: {
-          describe: "pairing code",
-          default: void 0,
-          type: "string"
-        },
-        qrCode: {
-          describe: "QR code string (MT:...)",
-          default: void 0,
-          type: "string"
-        },
-        qrCodeIndex: {
-          describe: "Index of QR code entry if multiple (1..n)",
-          default: 1,
-          type: "number"
-        },
-        setupPinCode: {
-          describe: "setup pin code",
-          default: 20202021,
-          type: "number"
-        },
-        instanceId: {
-          alias: "i",
-          describe: "instance id",
-          type: "string"
-        },
-        discriminator: {
-          alias: "d",
-          description: "Long discriminator",
-          type: "number"
-        },
-        shortDiscriminator: {
-          alias: "s",
-          description: "Short discriminator",
-          type: "number"
-        },
-        ble: {
-          alias: "b",
-          description: "Also discover over BLE",
-          type: "boolean",
-          default: false
-        }
-      });
+      );
     }).command(
       "open-basic-window <node-id> [timeout]",
       "Open a basic commissioning window",
@@ -218,7 +230,10 @@ function commands(theNode) {
         const { nodeId, timeout } = argv;
         await theNode.start();
         const node = (await theNode.connectAndGetNodes(nodeId, { autoSubscribe: false }))[0];
-        await node.openBasicCommissioningWindow(timeout);
+        if (!await awaitSeeded(node)) {
+          return;
+        }
+        await node.openBasicCommissioningWindow(Seconds(timeout));
         console.log(`Basic Commissioning Window for node ${nodeId} opened`);
       }
     ).command(
@@ -239,9 +254,13 @@ function commands(theNode) {
         await theNode.start();
         const { nodeId, timeout } = argv;
         const node = (await theNode.connectAndGetNodes(nodeId, { autoSubscribe: false }))[0];
-        const data = await node.openEnhancedCommissioningWindow(timeout);
+        if (!await awaitSeeded(node)) {
+          return;
+        }
+        const { qrPairingCode, manualPairingCode } = await node.openEnhancedCommissioningWindow(
+          Seconds(timeout)
+        );
         console.log(`Enhanced Commissioning Window for node ${nodeId} opened`);
-        const { qrPairingCode, manualPairingCode } = data;
         console.log(QrCode.get(qrPairingCode));
         console.log(
           `QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`
@@ -266,11 +285,18 @@ function commands(theNode) {
       },
       async (argv) => {
         await theNode.start();
-        const { nodeId, force } = argv;
+        const { nodeId: nodeIdStr, force } = argv;
         if (force) {
-          await theNode.controller.removeNode(NodeId(BigInt(nodeId)), !force);
+          const node = findCommissionedNode(theNode, NodeId(BigInt(nodeIdStr)));
+          if (node === void 0) {
+            throw new ImplementationError(`Node ${nodeIdStr} not commissioned`);
+          }
+          await node.delete();
         } else {
-          const node = (await theNode.connectAndGetNodes(nodeId, { autoSubscribe: false }))[0];
+          const node = (await theNode.connectAndGetNodes(nodeIdStr, { autoSubscribe: false }))[0];
+          if (!await awaitSeeded(node)) {
+            return;
+          }
           await node.decommission();
         }
       }

package/dist/esm/shell/cmd_commission.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/shell/cmd_commission.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["yargs"]
 }

package/dist/esm/shell/cmd_discover.js

@@ -3,7 +3,7 @@
  * Copyright 2022-2026 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Diagnostic, Seconds } from "@matter/general";
+import { ChannelType, Diagnostic, Seconds } from "@matter/general";
 import { ManualPairingCodeCodec, VendorId } from "@matter/types";
 function commands(theNode) {
   return {
@@ -75,33 +75,35 @@ function commands(theNode) {
           discriminator = void 0;
         }
         await theNode.start();
-        if (theNode.commissioningController === void 0) {
-          throw new Error("CommissioningController not initialized");
-        }
         const identifierData = discriminator !== void 0 ? { longDiscriminator: discriminator } : shortDiscriminator !== void 0 ? { shortDiscriminator } : vendorId !== void 0 ? { vendorId: VendorId(vendorId) } : productId !== void 0 ? { productId } : deviceType !== void 0 ? { deviceType } : {};
         console.log(
           `Discover devices with identifier ${Diagnostic.json(
             identifierData
           )} for ${once ? "first match or " : ""}${timeoutSeconds} seconds.`
         );
-        const results = await theNode.commissioningController.discoverCommissionableDevices(
-          identifierData,
-          {
-            ble,
-            onIpNetwork: true
-          },
-          (device) => {
-            console.log(`Discovered device ${Diagnostic.json(device)}`);
-            if (once) {
-              theNode.commissioningController?.cancelCommissionableDeviceDiscovery(
-                identifierData,
-                { ble, onIpNetwork: true }
-              );
-            }
-          },
-          Seconds(timeoutSeconds)
+        const discovery = theNode.node.peers.discover({
+          ...identifierData,
+          timeout: Seconds(timeoutSeconds),
+          scannerFilter: (scanner) => scanner.type === ChannelType.UDP || ble && scanner.type === ChannelType.BLE
+        });
+        const seen = /* @__PURE__ */ new Set();
+        discovery.discovered.on((node) => {
+          const { deviceIdentifier, addresses } = node.state.commissioning;
+          const id = deviceIdentifier || (addresses ?? []).map((a) => JSON.stringify(a)).sort().join("|");
+          if (seen.has(id)) {
+            return;
+          }
+          seen.add(id);
+          console.log(`Discovered device ${Diagnostic.json(node.state.commissioning)}`);
+          if (once) {
+            discovery.stop();
+          }
+        });
+        const results = await discovery;
+        console.log(
+          `Discovered ${results.length} devices`,
+          results.map((node) => node.state.commissioning)
         );
-        console.log(`Discovered ${results.length} devices`, results);
       }
     ),
     handler: async (argv) => {

package/dist/esm/shell/cmd_discover.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/shell/cmd_discover.ts"],
-  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,YAAY,eAAe;AAEpC,SAAS,wBAAwB,gBAAgB;AAIlC,SAAR,SAA0B,SAAqB;AAClD,SAAO;AAAA,IACH,SAAS;AAAA,IACT,UAAU;AAAA,IACV,SAAS,CAAC,UACN,MAEK;AAAA,MACG;AAAA,MACA;AAAA,MACA,MAAM;AACF,eAAO,MACF,WAAW,mBAAmB;AAAA,UAC3B,UAAU;AAAA,UACV,SAAS;AAAA,UACT,MAAM;AAAA,QACV,CAAC,EACA,QAAQ;AAAA,UACL,aAAa;AAAA,YACT,UAAU;AAAA,YACV,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,eAAe;AAAA,YACX,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,oBAAoB;AAAA,YAChB,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,UAAU;AAAA,YACN,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,WAAW;AAAA,YACP,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,YAAY;AAAA,YACR,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,KAAK;AAAA,YACD,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,MAAM;AAAA,YACF,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,QACJ,CAAC;AAAA,MACT;AAAA,MACA,OAAM,SAAQ;AACV,cAAM,EAAE,KAAK,MAAM,aAAa,UAAU,WAAW,YAAY,eAAe,IAAI;AACpF,YAAI,EAAE,eAAe,mBAAmB,IAAI;AAE5C,YAAI,OAAO,gBAAgB,UAAU;AACjC,gBAAM,EAAE,oBAAoB,8BAA8B,IACtD,uBAAuB,OAAO,WAAW;AAC7C,+BAAqB;AACrB,0BAAgB;AAAA,QACpB;AAEA,cAAM,QAAQ,MAAM;AACpB,YAAI,QAAQ,4BAA4B,QAAW;AAC/C,gBAAM,IAAI,MAAM,yCAAyC;AAAA,QAC7D;AAEA,cAAM,iBACF,kBAAkB,SACZ,EAAE,mBAAmB,cAAc,IACnC,uBAAuB,SACrB,EAAE,mBAAmB,IACrB,aAAa,SACX,EAAE,UAAU,SAAS,QAAQ,EAAE,IAC/B,cAAc,SACZ,EAAE,UAAU,IACZ,eAAe,SACb,EAAE,WAAW,IACb,CAAC;AAEnB,gBAAQ;AAAA,UACJ,oCAAoC,WAAW;AAAA,YAC3C;AAAA,UACJ,CAAC,QAAQ,OAAO,oBAAoB,EAAE,GAAG,cAAc;AAAA,QAC3D;AAEA,cAAM,UAAU,MAAM,QAAQ,wBAAwB;AAAA,UAClD;AAAA,UACA;AAAA,YACI;AAAA,YACA,aAAa;AAAA,UACjB;AAAA,UACA,YAAU;AACN,oBAAQ,IAAI,qBAAqB,WAAW,KAAK,MAAM,CAAC,EAAE;AAC1D,gBAAI,MAAM;AACN,sBAAQ,yBAAyB;AAAA,gBAC7B;AAAA,gBACA,EAAE,KAAK,aAAa,KAAK;AAAA,cAC7B;AAAA,YACJ;AAAA,UACJ;AAAA,UACA,QAAQ,cAAc;AAAA,QAC1B;AAEA,gBAAQ,IAAI,cAAc,QAAQ,MAAM,YAAY,OAAO;AAAA,MAC/D;AAAA,IACJ;AAAA,IACR,SAAS,OAAO,SAAc;AAC1B,WAAK,YAAY;AAAA,IACrB;AAAA,EACJ;AACJ;",
+  "mappings": "AAAA;AAAA;AAAA;AAAA;AAAA;AAMA,SAAS,aAAa,YAAY,eAAe;AAEjD,SAAS,wBAAwB,gBAAgB;AAIlC,SAAR,SAA0B,SAAqB;AAClD,SAAO;AAAA,IACH,SAAS;AAAA,IACT,UAAU;AAAA,IACV,SAAS,CAAC,UACN,MAEK;AAAA,MACG;AAAA,MACA;AAAA,MACA,MAAM;AACF,eAAO,MACF,WAAW,mBAAmB;AAAA,UAC3B,UAAU;AAAA,UACV,SAAS;AAAA,UACT,MAAM;AAAA,QACV,CAAC,EACA,QAAQ;AAAA,UACL,aAAa;AAAA,YACT,UAAU;AAAA,YACV,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,eAAe;AAAA,YACX,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,oBAAoB;AAAA,YAChB,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,UAAU;AAAA,YACN,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,WAAW;AAAA,YACP,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,YAAY;AAAA,YACR,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,KAAK;AAAA,YACD,OAAO;AAAA,YACP,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,UACA,MAAM;AAAA,YACF,aAAa;AAAA,YACb,SAAS;AAAA,YACT,MAAM;AAAA,UACV;AAAA,QACJ,CAAC;AAAA,MACT;AAAA,MACA,OAAM,SAAQ;AACV,cAAM,EAAE,KAAK,MAAM,aAAa,UAAU,WAAW,YAAY,eAAe,IAAI;AACpF,YAAI,EAAE,eAAe,mBAAmB,IAAI;AAE5C,YAAI,OAAO,gBAAgB,UAAU;AACjC,gBAAM,EAAE,oBAAoB,8BAA8B,IACtD,uBAAuB,OAAO,WAAW;AAC7C,+BAAqB;AACrB,0BAAgB;AAAA,QACpB;AAEA,cAAM,QAAQ,MAAM;AAEpB,cAAM,iBACF,kBAAkB,SACZ,EAAE,mBAAmB,cAAc,IACnC,uBAAuB,SACrB,EAAE,mBAAmB,IACrB,aAAa,SACX,EAAE,UAAU,SAAS,QAAQ,EAAE,IAC/B,cAAc,SACZ,EAAE,UAAU,IACZ,eAAe,SACb,EAAE,WAAW,IACb,CAAC;AAEnB,gBAAQ;AAAA,UACJ,oCAAoC,WAAW;AAAA,YAC3C;AAAA,UACJ,CAAC,QAAQ,OAAO,oBAAoB,EAAE,GAAG,cAAc;AAAA,QAC3D;AAGA,cAAM,YAAY,QAAQ,KAAK,MAAM,SAAS;AAAA,UAC1C,GAAG;AAAA,UACH,SAAS,QAAQ,cAAc;AAAA,UAC/B,eAAe,aACX,QAAQ,SAAS,YAAY,OAAQ,OAAO,QAAQ,SAAS,YAAY;AAAA,QACjF,CAAC;AAGD,cAAM,OAAO,oBAAI,IAAY;AAC7B,kBAAU,WAAW,GAAG,UAAQ;AAC5B,gBAAM,EAAE,kBAAkB,UAAU,IAAI,KAAK,MAAM;AAGnD,gBAAM,KACF,qBACC,aAAa,CAAC,GACV,IAAI,OAAK,KAAK,UAAU,CAAC,CAAC,EAC1B,KAAK,EACL,KAAK,GAAG;AACjB,cAAI,KAAK,IAAI,EAAE,GAAG;AACd;AAAA,UACJ;AACA,eAAK,IAAI,EAAE;AACX,kBAAQ,IAAI,qBAAqB,WAAW,KAAK,KAAK,MAAM,aAAa,CAAC,EAAE;AAC5E,cAAI,MAAM;AACN,sBAAU,KAAK;AAAA,UACnB;AAAA,QACJ,CAAC;AAED,cAAM,UAAU,MAAM;AAEtB,gBAAQ;AAAA,UACJ,cAAc,QAAQ,MAAM;AAAA,UAC5B,QAAQ,IAAI,UAAQ,KAAK,MAAM,aAAa;AAAA,QAChD;AAAA,MACJ;AAAA,IACJ;AAAA,IACR,SAAS,OAAO,SAAc;AAC1B,WAAK,YAAY;AAAA,IACrB;AAAA,EACJ;AACJ;",
   "names": []
 }

package/dist/esm/shell/cmd_icd.js

@@ -3,18 +3,20 @@
  * Copyright 2022-2026 Matter.js Authors
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Duration, Millis, ObserverGroup } from "@matter/general";
-import { IcdClient, IcdMultiAdminError } from "@matter/node";
+import { Duration, ImplementationError, Millis, ObserverGroup } from "@matter/general";
+import { IcdClient, IcdMultiAdminError, NodeConnectionState } from "@matter/node";
 import { IcdManagementClient } from "@matter/node/behaviors/icd-management";
 import { NodeId, SubjectId, VendorId } from "@matter/types";
 import { IcdManagement } from "@matter/types/clusters/icd-management";
-import { NodeStates } from "@project-chip/matter.js/device";
+import { awaitSeeded } from "../util/awaitSeeded.js";
 const watchers = /* @__PURE__ */ new Map();
-async function printStatus(paired) {
-  const clientNode = paired.node;
+function findCommissionedNode(theNode, nodeId) {
+  return theNode.node.peers.commissioned.find((peer) => peer.peerAddress?.nodeId === nodeId);
+}
+async function printStatus(nodeId, clientNode) {
   if (!clientNode.behaviors.has(IcdClient)) {
-    if (!paired.initialized) {
-      console.log(`node ${paired.nodeId}: uninitialized (no cached data yet)`);
+    if (!clientNode.lifecycle.isSeeded) {
+      console.log(`node ${nodeId}: uninitialized (no cached data yet)`);
     }
     return;
   }
@@ -23,10 +25,10 @@ async function printStatus(paired) {
   const supportsLit = IcdClient.litSupported(clientNode);
   const awake = await clientNode.act((agent) => agent.get(IcdClient).awake);
   const operatingModeLabel = mgmt === void 0 ? "n/a" : IcdManagement.OperatingMode[mgmt.operatingMode ?? -1] ?? mgmt.operatingMode ?? "unknown";
-  const marker = paired.initialized ? "" : " [uninitialized]";
+  const marker = clientNode.lifecycle.isSeeded ? "" : " [uninitialized]";
   console.log(
     [
-      `node ${paired.nodeId}:${marker}`,
+      `node ${nodeId}:${marker}`,
       `  registered=${icd.registered}`,
       `  available=${icd.available}`,
       `  awake=${awake}`,
@@ -45,7 +47,10 @@ function selectsAll(nodeIdStr) {
 }
 async function targetNodeIds(theNode, nodeIdStr) {
   await theNode.start();
-  return selectsAll(nodeIdStr) ? theNode.controller.getCommissionedNodes() : [NodeId(BigInt(nodeIdStr))];
+  if (!selectsAll(nodeIdStr)) {
+    return [NodeId(BigInt(nodeIdStr))];
+  }
+  return theNode.node.peers.commissioned.map((peer) => peer.peerAddress?.nodeId).filter((nodeId) => nodeId !== void 0);
 }
 async function eachNode(theNode, nodeIdStr, action) {
   const all = selectsAll(nodeIdStr);
@@ -65,18 +70,18 @@ async function eachNode(theNode, nodeIdStr, action) {
     }
   }
 }
-async function pairedNodeFor(theNode, nodeId) {
-  const paired = (await theNode.connectAndGetNodes(String(nodeId)))[0];
-  if (paired === void 0) {
-    throw new Error(`Node ${nodeId} not found / not connected`);
+async function connectedIcdNode(theNode, nodeId) {
+  const clientNode = (await theNode.connectAndGetNodes(String(nodeId)))[0];
+  if (clientNode === void 0) {
+    throw new ImplementationError(`Node ${nodeId} not found / not connected`);
   }
-  if (!paired.node.behaviors.has(IcdClient)) {
-    throw new Error(`Node ${nodeId} is not an ICD device (no IcdManagement cluster)`);
+  if (!await awaitSeeded(clientNode, { quiet: true })) {
+    throw new ImplementationError(`Node ${nodeId} did not become ready (offline?)`);
   }
-  return paired;
-}
-async function clientNodeFor(theNode, nodeId) {
-  return (await pairedNodeFor(theNode, nodeId)).node;
+  if (!clientNode.behaviors.has(IcdClient)) {
+    throw new ImplementationError(`Node ${nodeId} is not an ICD device (no IcdManagement cluster)`);
+  }
+  return clientNode;
 }
 function stopWatch(nodeIdStr) {
   if (selectsAll(nodeIdStr)) {
@@ -96,8 +101,7 @@ async function startWatch(theNode, nodeId) {
   const key = String(nodeId);
   watchers.get(key)?.close();
   watchers.delete(key);
-  const paired = await pairedNodeFor(theNode, nodeId);
-  const clientNode = paired.node;
+  const clientNode = await connectedIcdNode(theNode, nodeId);
   const observers = new ObserverGroup();
   const stamp = (msg) => console.log(`[icd ${nodeId}] ${msg}`);
   const wakefulnessSuffix = async () => {
@@ -121,9 +125,12 @@ async function startWatch(theNode, nodeId) {
   observers.on(events.checkInMissed, async () => stamp(`check-in MISSED ${await wakefulnessSuffix()}`));
   observers.on(events.keyRefreshed, () => stamp("key refreshed"));
   observers.on(events.available$Changed, (value) => stamp(`available=${value}`));
-  observers.on(paired.events.stateChanged, (state) => stamp(`connection=${NodeStates[state] ?? state}`));
+  observers.on(
+    clientNode.lifecycle.connectionStateChanged,
+    (state) => stamp(`connection=${NodeConnectionState[state] ?? state}`)
+  );
   watchers.set(key, observers);
-  clientNode.lifecycle.destroyed.once(() => {
+  observers.on(clientNode.lifecycle.destroyed, () => {
     watchers.get(key)?.close();
     watchers.delete(key);
   });
@@ -160,7 +167,7 @@ function commands(theNode) {
           ignoredVendors: argv.ignoreVendor?.map((v) => VendorId(Number(v)))
         };
         await eachNode(theNode, argv.nodeId, async (nodeId) => {
-          const clientNode = await clientNodeFor(theNode, nodeId);
+          const clientNode = await connectedIcdNode(theNode, nodeId);
           try {
             await clientNode.act((agent) => agent.get(IcdClient).register(options));
             console.log(`Registered as Check-In client on node ${nodeId}`);
@@ -190,9 +197,14 @@ function commands(theNode) {
       handler: async (argv) => {
         await eachNode(theNode, argv.nodeId, async (nodeId) => {
           if (argv.force) {
-            const clientNode2 = (await theNode.controller.getNode(nodeId)).node;
+            const clientNode2 = findCommissionedNode(theNode, nodeId);
+            if (clientNode2 === void 0) {
+              throw new ImplementationError(`Node ${nodeId} is not commissioned`);
+            }
             if (!clientNode2.behaviors.has(IcdClient)) {
-              throw new Error(`Node ${nodeId} is not an ICD device (no IcdManagement cluster)`);
+              throw new ImplementationError(
+                `Node ${nodeId} is not an ICD device (no IcdManagement cluster)`
+              );
             }
             await clientNode2.act((agent) => agent.get(IcdClient).forget());
             console.log(
@@ -200,7 +212,7 @@ function commands(theNode) {
             );
             return;
           }
-          const clientNode = await clientNodeFor(theNode, nodeId);
+          const clientNode = await connectedIcdNode(theNode, nodeId);
           await clientNode.act((agent) => agent.get(IcdClient).unregister());
           console.log(`Unregistered Check-In client on node ${nodeId}`);
         });
@@ -219,7 +231,7 @@ function commands(theNode) {
       }),
       handler: async (argv) => {
         await eachNode(theNode, argv.nodeId, async (nodeId) => {
-          const clientNode = await clientNodeFor(theNode, nodeId);
+          const clientNode = await connectedIcdNode(theNode, nodeId);
           const promised = await clientNode.act(
             (agent) => agent.get(IcdClient).stayActive(Millis(argv.durationMs))
           );
@@ -238,7 +250,11 @@ function commands(theNode) {
         }
         for (const nodeId of nodeIds) {
           try {
-            await printStatus(await theNode.controller.getNode(nodeId));
+            const clientNode = findCommissionedNode(theNode, nodeId);
+            if (clientNode === void 0) {
+              throw new ImplementationError(`Node ${nodeId} is not commissioned`);
+            }
+            await printStatus(nodeId, clientNode);
           } catch (e) {
             console.log(
               `node ${nodeId}: unavailable (${e instanceof Error ? e.message : String(e)})`

package/dist/esm/shell/cmd_icd.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/shell/cmd_icd.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": ["clientNode"]
 }