@project-chip/matter-node.js-examples 0.11.0-alpha.0-20240909-b3b29745 → 0.11.0-alpha.0-20240911-db8f7c80

package/src/examples/cluster/DummyWifiNetworkCommissioningServer.ts

@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { Bytes } from "@project-chip/matter.js-general";
 import { GeneralCommissioningBehavior } from "@project-chip/matter.js/behavior/definitions/general-commissioning";
 import { NetworkCommissioningBehavior } from "@project-chip/matter.js/behavior/definitions/network-commissioning";
 import { NetworkCommissioning } from "@project-chip/matter.js/cluster";
-import { ByteArray } from "@project-chip/matter.js/util";
 
-const firstNetworkId = new ByteArray(32);
+const firstNetworkId = new Uint8Array(32);
 
 /**
  * This represents a Dummy version of a Wifi Network Commissioning Cluster Server without real Wifi related logic, beside
@@ -20,7 +20,9 @@ export class DummyWifiNetworkCommissioningServer extends NetworkCommissioningBeh
     NetworkCommissioning.Feature.WiFiNetworkInterface,
 ) {
     override scanNetworks({ ssid, breadcrumb }: NetworkCommissioning.ScanNetworksRequest) {
-        console.log(`---> scanNetworks called on NetworkCommissioning cluster: ${ssid?.toHex()} ${breadcrumb}`);
+        console.log(
+            `---> scanNetworks called on NetworkCommissioning cluster: ${ssid ? Bytes.toHex(ssid) : undefined} ${breadcrumb}`,
+        );
 
         // Simulate successful scan
         if (breadcrumb !== undefined) {
@@ -42,10 +44,8 @@ export class DummyWifiNetworkCommissioningServer extends NetworkCommissioningBeh
                         wpa2Personal: true,
                         wpa3Personal: true,
                     },
-                    ssid: ssid || ByteArray.fromString(this.endpoint.env.vars.get("ble.wifi.scanSsid") ?? "TestSSID"), // Set a valid existing local Wi-Fi SSID here
-                    bssid: ByteArray.fromString(
-                        this.endpoint.env.vars.get("ble.wifi.scanBssid") ?? "00:00:00:00:00:00",
-                    ),
+                    ssid: ssid || Bytes.fromString(this.endpoint.env.vars.get("ble.wifi.scanSsid") ?? "TestSSID"), // Set a valid existing local Wi-Fi SSID here
+                    bssid: Bytes.fromString(this.endpoint.env.vars.get("ble.wifi.scanBssid") ?? "00:00:00:00:00:00"),
                     channel: 1,
                 },
             ],
@@ -58,7 +58,7 @@ export class DummyWifiNetworkCommissioningServer extends NetworkCommissioningBeh
         breadcrumb,
     }: NetworkCommissioning.AddOrUpdateWiFiNetworkRequest) {
         console.log(
-            `---> addOrUpdateWiFiNetwork called on NetworkCommissioning cluster: ${ssid.toHex()} ${credentials.toHex()} ${breadcrumb}`,
+            `---> addOrUpdateWiFiNetwork called on NetworkCommissioning cluster: ${Bytes.toHex(ssid)} ${Bytes.toHex(credentials)} ${breadcrumb}`,
         );
 
         this.session.context.assertFailSafeArmed("Failsafe timer needs to be armed to add or update networks.");
@@ -80,7 +80,9 @@ export class DummyWifiNetworkCommissioningServer extends NetworkCommissioningBeh
     }
 
     override removeNetwork({ networkId, breadcrumb }: NetworkCommissioning.RemoveNetworkRequest) {
-        console.log(`---> removeNetwork called on NetworkCommissioning cluster: ${networkId.toHex()} ${breadcrumb}`);
+        console.log(
+            `---> removeNetwork called on NetworkCommissioning cluster: ${Bytes.toHex(networkId)} ${breadcrumb}`,
+        );
 
         this.session.context.assertFailSafeArmed("Failsafe timer needs to be armed to add or update networks.");
 
@@ -101,7 +103,9 @@ export class DummyWifiNetworkCommissioningServer extends NetworkCommissioningBeh
     }
 
     override async connectNetwork({ networkId, breadcrumb }: NetworkCommissioning.ConnectNetworkRequest) {
-        console.log(`---> connectNetwork called on NetworkCommissioning cluster: ${networkId.toHex()} ${breadcrumb}`);
+        console.log(
+            `---> connectNetwork called on NetworkCommissioning cluster: ${Bytes.toHex(networkId)} ${breadcrumb}`,
+        );
 
         this.session.context.assertFailSafeArmed("Failsafe timer needs to be armed to add or update networks.");
 
@@ -130,7 +134,7 @@ export class DummyWifiNetworkCommissioningServer extends NetworkCommissioningBeh
 
     override reorderNetwork({ networkId, networkIndex, breadcrumb }: NetworkCommissioning.ReorderNetworkRequest) {
         console.log(
-            `---> reorderNetwork called on NetworkCommissioning cluster: ${networkId.toHex()} ${networkIndex} ${breadcrumb}`,
+            `---> reorderNetwork called on NetworkCommissioning cluster: ${Bytes.toHex(networkId)} ${networkIndex} ${breadcrumb}`,
         );
 
         // Simulate successful connection

package/src/examples/cluster/DummyWifiNetworkCommissioningServerLegacy.ts

@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getParameter } from "@project-chip/matter-node.js/util";
+import { getParameter } from "@project-chip/matter.js-nodejs";
 import {
     ClusterServer,
     ClusterServerObj,
     GeneralCommissioningCluster,
     NetworkCommissioning,
 } from "@project-chip/matter.js/cluster";
-import { ByteArray } from "@project-chip/matter.js/util";
+import { Bytes } from "../../../../general/dist/cjs/index.js";
 
-const firstNetworkId = new ByteArray(32);
+const firstNetworkId = new Uint8Array(32);
 
 const WifiNetworkCluster = NetworkCommissioning.Cluster.with(NetworkCommissioning.Feature.WiFiNetworkInterface);
 
@@ -37,7 +37,9 @@ const Server: ClusterServerObj<typeof WifiNetworkCluster> = ClusterServer(
     },
     {
         scanNetworks: async ({ request: { ssid, breadcrumb }, attributes: { lastNetworkingStatus }, endpoint }) => {
-            console.log(`---> scanNetworks called on NetworkCommissioning cluster: ${ssid?.toHex()} ${breadcrumb}`);
+            console.log(
+                `---> scanNetworks called on NetworkCommissioning cluster: ${ssid ? Bytes.toHex(ssid) : undefined} ${breadcrumb}`,
+            );
 
             // Simulate successful scan
             if (breadcrumb !== undefined) {
@@ -59,8 +61,8 @@ const Server: ClusterServerObj<typeof WifiNetworkCluster> = ClusterServer(
                             wpa2Personal: true,
                             wpa3Personal: true,
                         },
-                        ssid: ssid || ByteArray.fromString(getParameter("ble-wifi-scan-ssid") ?? "TestSSID"), // Set a valid existing local Wi-Fi SSID here
-                        bssid: ByteArray.fromString(getParameter("ble-wifi-scan-bssid") ?? "00:00:00:00:00:00"),
+                        ssid: ssid || Bytes.fromString(getParameter("ble-wifi-scan-ssid") ?? "TestSSID"), // Set a valid existing local Wi-Fi SSID here
+                        bssid: Bytes.fromString(getParameter("ble-wifi-scan-bssid") ?? "00:00:00:00:00:00"),
                         channel: 1,
                     },
                 ],
@@ -73,7 +75,7 @@ const Server: ClusterServerObj<typeof WifiNetworkCluster> = ClusterServer(
             session,
         }) => {
             console.log(
-                `---> addOrUpdateWiFiNetwork called on NetworkCommissioning cluster: ${ssid.toHex()} ${credentials.toHex()} ${breadcrumb}`,
+                `---> addOrUpdateWiFiNetwork called on NetworkCommissioning cluster: ${Bytes.toHex(ssid)} ${Bytes.toHex(credentials)} ${breadcrumb}`,
             );
 
             session.context.assertFailSafeArmed("Failsafe timer needs to be armed to add or update networks.");
@@ -100,7 +102,7 @@ const Server: ClusterServerObj<typeof WifiNetworkCluster> = ClusterServer(
             session,
         }) => {
             console.log(
-                `---> removeNetwork called on NetworkCommissioning cluster: ${networkId.toHex()} ${breadcrumb}`,
+                `---> removeNetwork called on NetworkCommissioning cluster: ${Bytes.toHex(networkId)} ${breadcrumb}`,
             );
 
             session.context.assertFailSafeArmed("Failsafe timer needs to be armed to add or update networks.");
@@ -127,7 +129,7 @@ const Server: ClusterServerObj<typeof WifiNetworkCluster> = ClusterServer(
             session,
         }) => {
             console.log(
-                `---> connectNetwork called on NetworkCommissioning cluster: ${networkId.toHex()} ${breadcrumb}`,
+                `---> connectNetwork called on NetworkCommissioning cluster: ${Bytes.toHex(networkId)} ${breadcrumb}`,
             );
 
             session.context.assertFailSafeArmed("Failsafe timer needs to be armed to add or update networks.");
@@ -162,7 +164,7 @@ const Server: ClusterServerObj<typeof WifiNetworkCluster> = ClusterServer(
             endpoint,
         }) => {
             console.log(
-                `---> reorderNetwork called on NetworkCommissioning cluster: ${networkId.toHex()} ${networkIndex} ${breadcrumb}`,
+                `---> reorderNetwork called on NetworkCommissioning cluster: ${Bytes.toHex(networkId)} ${networkIndex} ${breadcrumb}`,
             );
 
             // Simulate successful connection

package/src/examples/cluster/MyFancyOwnFunctionality.ts

@@ -4,6 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { Identity, MaybePromise } from "@project-chip/matter.js-general";
+import {
+    AttributeElement,
+    ClusterElement,
+    ClusterModel,
+    CommandElement,
+    EventElement,
+    FieldElement,
+} from "@project-chip/matter.js-model";
 import { ClusterBehavior } from "@project-chip/matter.js/behavior/cluster";
 import {
     Attribute,
@@ -14,16 +23,7 @@ import {
     MutableCluster,
 } from "@project-chip/matter.js/cluster";
 import { ClusterId, VendorId } from "@project-chip/matter.js/datatype";
-import {
-    AttributeElement,
-    ClusterElement,
-    ClusterModel,
-    CommandElement,
-    EventElement,
-    FieldElement,
-} from "@project-chip/matter.js/model";
 import { TlvField, TlvInt16, TlvNullable, TlvObject, TlvString, TypeFromSchema } from "@project-chip/matter.js/tlv";
-import { Identity, MaybePromise } from "@project-chip/matter.js/util";
 
 /** Define the Cluster ID, custom clusters use a special extended formt that also contains the Vendor Id */
 const myFancyClusterId = ClusterId.buildVendorSpecific(VendorId(0xfff4), 0xfc00);

package/src/tsconfig.json

@@ -1,5 +1,5 @@
 {
-    "extends": "../../matter.js-tools/tsconfig.base.json",
+    "extends": "../../tools/tsconfig.base.json",
     "compilerOptions": {
         "outDir": "../dist/esm",
         "types": ["node"],

package/src/tutorial/example01.ts

@@ -1,4 +1,4 @@
-import "@project-chip/matter-node.js";
+import "@project-chip/matter.js-nodejs";
 import { ServerNode } from "@project-chip/matter.js/node";
 
 const node = await ServerNode.create();

package/src/tutorial/example02.ts

@@ -1,4 +1,4 @@
-import "@project-chip/matter-node.js";
+import "@project-chip/matter.js-nodejs";
 import { OnOffLightDevice } from "@project-chip/matter.js/devices/OnOffLightDevice";
 import { ServerNode } from "@project-chip/matter.js/node";
 

package/src/tutorial/example03.ts

@@ -1,4 +1,4 @@
-import "@project-chip/matter-node.js";
+import "@project-chip/matter.js-nodejs";
 import { OnOffLightDevice, OnOffLightRequirements } from "@project-chip/matter.js/devices/OnOffLightDevice";
 import { ServerNode } from "@project-chip/matter.js/node";
 

package/src/tutorial/example04.ts

@@ -1,4 +1,4 @@
-import "@project-chip/matter-node.js";
+import "@project-chip/matter.js-nodejs";
 import { OnOffLightDevice } from "@project-chip/matter.js/devices/OnOffLightDevice";
 import { ServerNode } from "@project-chip/matter.js/node";
 

package/src/tutorial/example05.ts

@@ -1,4 +1,4 @@
-import "@project-chip/matter-node.js";
+import "@project-chip/matter.js-nodejs";
 import { OnOffLightDevice } from "@project-chip/matter.js/devices/OnOffLightDevice";
 import { ServerNode } from "@project-chip/matter.js/node";