@project-chip/matter-node.js-examples 0.6.1-alpha.0-20231014-2f70dc2 → 0.6.1-alpha.0-20231019-ee0fce9

package/src/examples/BridgedDevicesNode.ts

@@ -16,8 +16,10 @@
 // Include this first to auto-register Crypto, Network and Time Node.js implementations
 import { CommissioningServer, MatterServer } from "@project-chip/matter-node.js";
 
+import { VendorId } from "@project-chip/matter-node.js/datatype";
 import { Aggregator, DeviceTypes, OnOffLightDevice, OnOffPluginUnitDevice } from "@project-chip/matter-node.js/device";
 import { Format, Level, Logger } from "@project-chip/matter-node.js/log";
+import { QrCode } from "@project-chip/matter-node.js/schema";
 import { StorageBackendDisk, StorageManager } from "@project-chip/matter-node.js/storage";
 import { Time } from "@project-chip/matter-node.js/time";
 import {
@@ -27,7 +29,6 @@ import {
     hasParameter,
     requireMinNodeVersion,
 } from "@project-chip/matter-node.js/util";
-import { VendorId } from "@project-chip/matter.js/datatype";
 
 const logger = Logger.get("Device");
 
@@ -208,9 +209,9 @@ class BridgedDevice {
         logger.info("Listening");
         if (!commissioningServer.isCommissioned()) {
             const pairingData = commissioningServer.getPairingCode();
-            const { qrCode, qrPairingCode, manualPairingCode } = pairingData;
+            const { qrPairingCode, manualPairingCode } = pairingData;
 
-            console.log(qrCode);
+            console.log(QrCode.get(qrPairingCode));
             console.log(
                 `QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`,
             );

package/src/examples/ComposedDeviceNode.ts

@@ -21,6 +21,7 @@ import { CommissioningServer, MatterServer } from "@project-chip/matter-node.js"
 import { VendorId } from "@project-chip/matter-node.js/datatype";
 import { DeviceTypes, OnOffLightDevice, OnOffPluginUnitDevice } from "@project-chip/matter-node.js/device";
 import { Format, Level, Logger } from "@project-chip/matter-node.js/log";
+import { QrCode } from "@project-chip/matter-node.js/schema";
 import { StorageBackendDisk, StorageManager } from "@project-chip/matter-node.js/storage";
 import { Time } from "@project-chip/matter-node.js/time";
 import {
@@ -206,9 +207,9 @@ class ComposedDevice {
         logger.info("Listening");
         if (!commissioningServer.isCommissioned()) {
             const pairingData = commissioningServer.getPairingCode();
-            const { qrCode, qrPairingCode, manualPairingCode } = pairingData;
+            const { qrPairingCode, manualPairingCode } = pairingData;
 
-            console.log(qrCode);
+            console.log(QrCode.get(qrPairingCode));
             console.log(
                 `QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`,
             );

package/src/examples/ControllerNode.ts

@@ -16,7 +16,7 @@
  * Import needed modules from @project-chip/matter-node.js
  */
 // Include this first to auto-register Crypto, Network and Time Node.js implementations
-import { CommissioningController, MatterServer } from "@project-chip/matter-node.js";
+import { CommissioningController, MatterServer, NodeCommissioningOptions } from "@project-chip/matter-node.js";
 
 import { BleNode } from "@project-chip/matter-node-ble.js/ble";
 import { Ble } from "@project-chip/matter-node.js/ble";
@@ -26,7 +26,7 @@ import {
     GeneralCommissioning,
     OnOffCluster,
 } from "@project-chip/matter-node.js/cluster";
-import { logEndpoint } from "@project-chip/matter-node.js/device";
+import { NodeId } from "@project-chip/matter-node.js/datatype";
 import { Format, Level, Logger } from "@project-chip/matter-node.js/log";
 import { CommissioningOptions } from "@project-chip/matter-node.js/protocol";
 import { ManualPairingCodeCodec } from "@project-chip/matter-node.js/schema";
@@ -177,13 +177,7 @@ class ControllerNode {
 
         const matterServer = new MatterServer(storageManager);
         const commissioningController = new CommissioningController({
-            serverAddress: ip !== undefined && port !== undefined ? { ip, port, type: "udp" } : undefined,
-            longDiscriminator,
-            shortDiscriminator,
-            passcode: setupPin,
-            delayedPairing: true,
-            commissioningOptions,
-            subscribeAllAttributes: true,
+            autoConnect: false,
         });
         matterServer.addCommissioningController(commissioningController);
 
@@ -196,29 +190,47 @@ class ControllerNode {
 
         await matterServer.start();
 
+        if (!commissioningController.isCommissioned()) {
+            const options = {
+                commissioning: commissioningOptions,
+                discovery: {
+                    knownAddress: ip !== undefined && port !== undefined ? { ip, port, type: "udp" } : undefined,
+                    identifierData:
+                        longDiscriminator !== undefined
+                            ? { longDiscriminator }
+                            : shortDiscriminator !== undefined
+                            ? { shortDiscriminator }
+                            : {},
+                },
+                passcode: setupPin,
+            } as NodeCommissioningOptions;
+            logger.info(`Commissioning ... ${JSON.stringify(options)}`);
+            const nodeId = await commissioningController.commissionNode(options);
+
+            console.log(`Commissioning successfully done with nodeId ${nodeId}`);
+        }
+
         /**
          * TBD
          */
         try {
-            await commissioningController.connect();
+            const nodes = commissioningController.getCommissionedNodes();
+            console.log("Found commissioned nodes:", Logger.toJSON(nodes));
 
-            if (commissioningController.serverAddress !== undefined) {
-                const { ip, port } = commissioningController.serverAddress;
-                controllerStorage.set("ip", ip);
-                controllerStorage.set("port", port);
+            const nodeId = NodeId(getIntParameter("nodeid") ?? nodes[0]);
+            if (!nodes.includes(nodeId)) {
+                throw new Error(`Node ${nodeId} not found in commissioned nodes`);
             }
-            if (longDiscriminator !== undefined) {
-                controllerStorage.set("longDiscriminator", longDiscriminator);
-            }
-            controllerStorage.set("pin", setupPin);
+
+            const node = await commissioningController.connectNode(nodeId);
 
             // Important: This is a temporary API to proof the methods working and this will change soon and is NOT stable!
             // It is provided to proof the concept
 
-            logEndpoint(commissioningController.getRootEndpoint());
+            node.logStructure();
 
             // Example to initialize a ClusterClient and access concrete fields as API methods
-            const descriptor = commissioningController.getRootClusterClient(DescriptorCluster);
+            const descriptor = node.getRootClusterClient(DescriptorCluster);
             if (descriptor !== undefined) {
                 console.log(await descriptor.attributes.deviceTypeList.get()); // you can call that way
                 console.log(await descriptor.getServerListAttribute()); // or more convenient that way
@@ -227,7 +239,7 @@ class ControllerNode {
             }
 
             // Example to subscribe to a field and get the value
-            const info = commissioningController.getRootClusterClient(BasicInformationCluster);
+            const info = node.getRootClusterClient(BasicInformationCluster);
             if (info !== undefined) {
                 console.log(await info.getProductNameAttribute()); // This call is executed remotely
                 //console.log(await info.subscribeProductNameAttribute(value => console.log("productName", value), 5, 30));
@@ -248,7 +260,7 @@ class ControllerNode {
             //const attributesBasicInformation = await interactionClient.getMultipleAttributes([{ endpointId: 0, clusterId: BasicInformationCluster.id} ]);
             //console.log("Attributes-BasicInformation:", JSON.stringify(attributesBasicInformation, null, 2));
 
-            const devices = commissioningController.getDevices();
+            const devices = node.getDevices();
             if (devices[0] && devices[0].id === 1) {
                 // Example to subscribe to all Attributes of endpoint 1 of the commissioned node: */*/*
                 //await interactionClient.subscribeMultipleAttributes([{ endpointId: 1, /* subscribe anything from endpoint 1 */ }], 0, 180, data => {

package/src/examples/DeviceNode.ts

@@ -20,6 +20,7 @@ import { BleNode } from "@project-chip/matter-node-ble.js/ble";
 import { Ble } from "@project-chip/matter-node.js/ble";
 import { OnOffLightDevice, OnOffPluginUnitDevice, logEndpoint } from "@project-chip/matter-node.js/device";
 import { Format, Level, Logger } from "@project-chip/matter-node.js/log";
+import { QrCode } from "@project-chip/matter-node.js/schema";
 import { StorageBackendDisk, StorageManager } from "@project-chip/matter-node.js/storage";
 import { Time } from "@project-chip/matter-node.js/time";
 import {
@@ -249,9 +250,9 @@ class Device {
                 onIpNetwork: false,
             });
 
-            const { qrCode, qrPairingCode, manualPairingCode } = pairingData;
+            const { qrPairingCode, manualPairingCode } = pairingData;
 
-            console.log(qrCode);
+            console.log(QrCode.get(qrPairingCode));
             logger.info(
                 `QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`,
             );

package/src/examples/MultiDeviceNode.ts

@@ -20,6 +20,7 @@ import { CommissioningServer, MatterServer } from "@project-chip/matter-node.js"
 
 import { DeviceTypes, OnOffLightDevice, OnOffPluginUnitDevice } from "@project-chip/matter-node.js/device";
 import { Format, Level, Logger } from "@project-chip/matter-node.js/log";
+import { QrCode } from "@project-chip/matter-node.js/schema";
 import { StorageBackendDisk, StorageManager } from "@project-chip/matter-node.js/storage";
 import { Time } from "@project-chip/matter-node.js/time";
 import {
@@ -219,9 +220,9 @@ class Device {
             console.log(`Device ${index + 1}:`);
             if (!commissioningServer.isCommissioned()) {
                 const pairingData = commissioningServer.getPairingCode();
-                const { qrCode, qrPairingCode, manualPairingCode } = pairingData;
+                const { qrPairingCode, manualPairingCode } = pairingData;
 
-                console.log(qrCode);
+                console.log(QrCode.get(qrPairingCode));
                 console.log(
                     `QR Code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=${qrPairingCode}`,
                 );