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

package/src/examples/BridgedDevicesNodeLegacy.ts

@@ -19,21 +19,20 @@
  * Import needed modules from @project-chip/matter-node.js
  */
 // 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 {
+    StorageBackendDisk,
     commandExecutor,
     getIntParameter,
     getParameter,
     hasParameter,
     requireMinNodeVersion,
-} from "@project-chip/matter-node.js/util";
+} from "@project-chip/matter.js-nodejs";
+
+import { CommissioningServer, MatterServer } from "@project-chip/matter.js";
+import { LogFormat, LogLevel, Logger, StorageManager, Time } from "@project-chip/matter.js-general";
+import { VendorId } from "@project-chip/matter.js/datatype";
+import { Aggregator, DeviceTypes, OnOffLightDevice, OnOffPluginUnitDevice } from "@project-chip/matter.js/device";
+import { QrCode } from "@project-chip/matter.js/schema";
 
 const logger = Logger.get("Device");
 
@@ -42,28 +41,28 @@ requireMinNodeVersion(16);
 /** Configure logging */
 switch (getParameter("loglevel")) {
     case "fatal":
-        Logger.defaultLogLevel = Level.FATAL;
+        Logger.defaultLogLevel = LogLevel.FATAL;
         break;
     case "error":
-        Logger.defaultLogLevel = Level.ERROR;
+        Logger.defaultLogLevel = LogLevel.ERROR;
         break;
     case "warn":
-        Logger.defaultLogLevel = Level.WARN;
+        Logger.defaultLogLevel = LogLevel.WARN;
         break;
     case "info":
-        Logger.defaultLogLevel = Level.INFO;
+        Logger.defaultLogLevel = LogLevel.INFO;
         break;
 }
 
 switch (getParameter("logformat")) {
     case "plain":
-        Logger.format = Format.PLAIN;
+        Logger.format = LogFormat.PLAIN;
         break;
     case "html":
-        Logger.format = Format.HTML;
+        Logger.format = LogFormat.HTML;
         break;
     default:
-        if (process.stdin?.isTTY) Logger.format = Format.ANSI;
+        if (process.stdin?.isTTY) Logger.format = LogFormat.ANSI;
 }
 
 const storageLocation = getParameter("store") ?? ".device-node";

package/src/examples/ComposedDeviceNode.ts

@@ -16,9 +16,9 @@
  * Import needed modules from @project-chip/matter-node.js
  */
 // Include this first to auto-register Crypto, Network and Time Node.js implementations
-import "@project-chip/matter-node.js";
+import { requireMinNodeVersion } from "@project-chip/matter.js-nodejs";
 
-import { requireMinNodeVersion } from "@project-chip/matter-node.js/util";
+import { Time } from "@project-chip/matter.js-general";
 import { DeviceTypeId, VendorId } from "@project-chip/matter.js/datatype";
 import { logEndpoint } from "@project-chip/matter.js/device";
 import { OnOffLightDevice } from "@project-chip/matter.js/devices/OnOffLightDevice";
@@ -26,7 +26,6 @@ import { OnOffPlugInUnitDevice } from "@project-chip/matter.js/devices/OnOffPlug
 import { Endpoint, EndpointServer } from "@project-chip/matter.js/endpoint";
 import { Environment, StorageService } from "@project-chip/matter.js/environment";
 import { ServerNode } from "@project-chip/matter.js/node";
-import { Time } from "@project-chip/matter.js/time";
 import { execSync } from "child_process";
 
 requireMinNodeVersion(16);

package/src/examples/ComposedDeviceNodeLegacy.ts

@@ -21,21 +21,20 @@
  * Import needed modules from @project-chip/matter-node.js
  */
 // 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 { 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 {
     commandExecutor,
     getIntParameter,
     getParameter,
     hasParameter,
     requireMinNodeVersion,
-} from "@project-chip/matter-node.js/util";
+    StorageBackendDisk,
+} from "@project-chip/matter.js-nodejs";
+
+import { CommissioningServer, MatterServer } from "@project-chip/matter.js";
+import { LogFormat, Logger, LogLevel, StorageManager, Time } from "@project-chip/matter.js-general";
+import { VendorId } from "@project-chip/matter.js/datatype";
+import { DeviceTypes, OnOffLightDevice, OnOffPluginUnitDevice } from "@project-chip/matter.js/device";
+import { QrCode } from "@project-chip/matter.js/schema";
 
 const logger = Logger.get("Device");
 
@@ -44,28 +43,28 @@ requireMinNodeVersion(16);
 /** Configure logging */
 switch (getParameter("loglevel")) {
     case "fatal":
-        Logger.defaultLogLevel = Level.FATAL;
+        Logger.defaultLogLevel = LogLevel.FATAL;
         break;
     case "error":
-        Logger.defaultLogLevel = Level.ERROR;
+        Logger.defaultLogLevel = LogLevel.ERROR;
         break;
     case "warn":
-        Logger.defaultLogLevel = Level.WARN;
+        Logger.defaultLogLevel = LogLevel.WARN;
         break;
     case "info":
-        Logger.defaultLogLevel = Level.INFO;
+        Logger.defaultLogLevel = LogLevel.INFO;
         break;
 }
 
 switch (getParameter("logformat")) {
     case "plain":
-        Logger.format = Format.PLAIN;
+        Logger.format = LogFormat.PLAIN;
         break;
     case "html":
-        Logger.format = Format.HTML;
+        Logger.format = LogFormat.HTML;
         break;
     default:
-        if (process.stdin?.isTTY) Logger.format = Format.ANSI;
+        if (process.stdin?.isTTY) Logger.format = LogFormat.ANSI;
 }
 
 const storageLocation = getParameter("store") ?? ".device-node";

package/src/examples/ControllerNode.ts

@@ -15,12 +15,11 @@
  * Import needed modules from @project-chip/matter-node.js
  */
 // Include this first to auto-register Crypto, Network and Time Node.js implementations
-// Include this first to auto-register Crypto, Network and Time Node.js implementations
-import "@project-chip/matter-node.js";
+import { requireMinNodeVersion } from "@project-chip/matter.js-nodejs";
 
 import { BleNode } from "@project-chip/matter-node-ble.js/ble";
-import { requireMinNodeVersion } from "@project-chip/matter-node.js/util";
 import { CommissioningController, NodeCommissioningOptions } from "@project-chip/matter.js";
+import { Logger, singleton, Time } from "@project-chip/matter.js-general";
 import { Ble } from "@project-chip/matter.js/ble";
 import {
     BasicInformationCluster,
@@ -32,11 +31,8 @@ import {
 import { NodeId } from "@project-chip/matter.js/datatype";
 import { NodeStateInformation } from "@project-chip/matter.js/device";
 import { Environment, StorageService } from "@project-chip/matter.js/environment";
-import { Logger } from "@project-chip/matter.js/log";
 import { CommissioningOptions } from "@project-chip/matter.js/protocol";
 import { ManualPairingCodeCodec } from "@project-chip/matter.js/schema";
-import { Time } from "@project-chip/matter.js/time";
-import { singleton } from "@project-chip/matter.js/util";
 
 const logger = Logger.get("Controller");
 

package/src/examples/ControllerNodeLegacy.ts

@@ -15,29 +15,28 @@
  * 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, NodeCommissioningOptions } from "@project-chip/matter-node.js";
+import {
+    StorageBackendDisk,
+    getIntParameter,
+    getParameter,
+    hasParameter,
+    requireMinNodeVersion,
+} from "@project-chip/matter.js-nodejs";
 
 import { BleNode } from "@project-chip/matter-node-ble.js/ble";
-import { Ble } from "@project-chip/matter-node.js/ble";
+import { CommissioningController, MatterServer, NodeCommissioningOptions } from "@project-chip/matter.js";
+import { LogFormat, LogLevel, Logger, StorageManager, singleton } from "@project-chip/matter.js-general";
+import { Ble } from "@project-chip/matter.js/ble";
 import {
     BasicInformationCluster,
     DescriptorCluster,
     GeneralCommissioning,
     OnOffCluster,
-} from "@project-chip/matter-node.js/cluster";
-import { NodeId } from "@project-chip/matter-node.js/datatype";
-import { NodeStateInformation } from "@project-chip/matter-node.js/device";
-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";
-import { StorageBackendDisk, StorageManager } from "@project-chip/matter-node.js/storage";
-import {
-    getIntParameter,
-    getParameter,
-    hasParameter,
-    requireMinNodeVersion,
-    singleton,
-} from "@project-chip/matter-node.js/util";
+} from "@project-chip/matter.js/cluster";
+import { NodeId } from "@project-chip/matter.js/datatype";
+import { NodeStateInformation } from "@project-chip/matter.js/device";
+import { CommissioningOptions } from "@project-chip/matter.js/protocol";
+import { ManualPairingCodeCodec } from "@project-chip/matter.js/schema";
 
 const logger = Logger.get("Controller");
 
@@ -46,28 +45,28 @@ requireMinNodeVersion(16);
 /** Configure logging */
 switch (getParameter("loglevel")) {
     case "fatal":
-        Logger.defaultLogLevel = Level.FATAL;
+        Logger.defaultLogLevel = LogLevel.FATAL;
         break;
     case "error":
-        Logger.defaultLogLevel = Level.ERROR;
+        Logger.defaultLogLevel = LogLevel.ERROR;
         break;
     case "warn":
-        Logger.defaultLogLevel = Level.WARN;
+        Logger.defaultLogLevel = LogLevel.WARN;
         break;
     case "info":
-        Logger.defaultLogLevel = Level.INFO;
+        Logger.defaultLogLevel = LogLevel.INFO;
         break;
 }
 
 switch (getParameter("logformat")) {
     case "plain":
-        Logger.format = Format.PLAIN;
+        Logger.format = LogFormat.PLAIN;
         break;
     case "html":
-        Logger.format = Format.HTML;
+        Logger.format = LogFormat.HTML;
         break;
     default:
-        if (process.stdin?.isTTY) Logger.format = Format.ANSI;
+        if (process.stdin?.isTTY) Logger.format = LogFormat.ANSI;
 }
 
 if (hasParameter("ble")) {

package/src/examples/DeviceNode.ts

@@ -15,9 +15,9 @@
  * Import needed modules from @project-chip/matter-node.js
  */
 // Include this first to auto-register Crypto, Network and Time Node.js implementations
-import "@project-chip/matter-node.js";
+import { requireMinNodeVersion } from "@project-chip/matter.js-nodejs";
 
-import { requireMinNodeVersion } from "@project-chip/matter-node.js/util";
+import { Time } from "@project-chip/matter.js-general";
 import { DeviceTypeId, VendorId } from "@project-chip/matter.js/datatype";
 import { logEndpoint } from "@project-chip/matter.js/device";
 import { OnOffLightDevice } from "@project-chip/matter.js/devices/OnOffLightDevice";
@@ -25,7 +25,6 @@ import { OnOffPlugInUnitDevice } from "@project-chip/matter.js/devices/OnOffPlug
 import { Endpoint, EndpointServer } from "@project-chip/matter.js/endpoint";
 import { Environment, StorageService } from "@project-chip/matter.js/environment";
 import { ServerNode } from "@project-chip/matter.js/node";
-import { Time } from "@project-chip/matter.js/time";
 import { execSync } from "child_process";
 
 requireMinNodeVersion(16);

package/src/examples/DeviceNodeFull.ts

@@ -24,16 +24,14 @@
  * Import needed modules from @project-chip/matter-node.js
  */
 // Include this first to auto-register Crypto, Network and Time Node.js implementations
-import "@project-chip/matter-node.js";
+import { createFileLogger, requireMinNodeVersion } from "@project-chip/matter.js-nodejs";
 
 import { BleNode } from "@project-chip/matter-node-ble.js/ble";
-import { GeneralDiagnostics } from "@project-chip/matter-node.js/cluster";
-import { createFileLogger } from "@project-chip/matter-node.js/log";
-import { requireMinNodeVersion } from "@project-chip/matter-node.js/util";
+import { LogLevel, Logger, Time, logLevelFromString, singleton } from "@project-chip/matter.js-general";
 import { NetworkCommissioningServer } from "@project-chip/matter.js/behavior/definitions/network-commissioning";
 import { OnOffServer } from "@project-chip/matter.js/behavior/definitions/on-off";
 import { Ble } from "@project-chip/matter.js/ble";
-import { NetworkCommissioning } from "@project-chip/matter.js/cluster";
+import { GeneralDiagnostics, NetworkCommissioning } from "@project-chip/matter.js/cluster";
 import { DeviceTypeId, VendorId } from "@project-chip/matter.js/datatype";
 import { logEndpoint } from "@project-chip/matter.js/device";
 import { OnOffLightDevice } from "@project-chip/matter.js/devices/OnOffLightDevice";
@@ -42,11 +40,8 @@ import { Endpoint, EndpointServer } from "@project-chip/matter.js/endpoint";
 import { RootRequirements } from "@project-chip/matter.js/endpoint/definitions";
 import { Environment, StorageService } from "@project-chip/matter.js/environment";
 import { FabricAction } from "@project-chip/matter.js/fabric";
-import { Level, Logger, levelFromString } from "@project-chip/matter.js/log";
 import { ServerNode } from "@project-chip/matter.js/node";
 import { QrCode } from "@project-chip/matter.js/schema";
-import { Time } from "@project-chip/matter.js/time";
-import { ByteArray, singleton } from "@project-chip/matter.js/util";
 import { execSync } from "child_process";
 import { DummyThreadNetworkCommissioningServer } from "./cluster/DummyThreadNetworkCommissioningServer.js";
 import { DummyWifiNetworkCommissioningServer } from "./cluster/DummyWifiNetworkCommissioningServer.js";
@@ -104,7 +99,7 @@ function executeCommand(scriptParamName: string) {
 const logFile = environment.vars.string("logfile.filename");
 if (logFile !== undefined) {
     Logger.addLogger("filelogger", await createFileLogger(logFile), {
-        defaultLogLevel: levelFromString(environment.vars.string("logfile.loglevel")) ?? Level.DEBUG,
+        defaultLogLevel: logLevelFromString(environment.vars.string("logfile.loglevel")) ?? LogLevel.DEBUG,
     });
 }
 
@@ -254,7 +249,7 @@ if (Ble.enabled) {
     );
 }
 
-const networkId = new ByteArray(32);
+const networkId = new Uint8Array(32);
 // Physical devices appear as "nodes" on a Matter network.  As a device implementer you use a NodeServer to bring a
 // device online.
 //

package/src/examples/DeviceNodeFullLegacy.ts

@@ -19,24 +19,22 @@
  * Import needed modules from @project-chip/matter-node.js
  */
 // Include this first to auto-register Crypto, Network and Time Node.js implementations
-import { CommissioningServer, MatterServer } 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";
-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 {
+    StorageBackendDisk,
     commandExecutor,
     getIntParameter,
     getParameter,
     hasParameter,
     requireMinNodeVersion,
-    singleton,
-} from "@project-chip/matter-node.js/util";
+} from "@project-chip/matter.js-nodejs";
+
+import { BleNode } from "@project-chip/matter-node-ble.js/ble";
+import { CommissioningServer, MatterServer } from "@project-chip/matter.js";
+import { LogFormat, LogLevel, Logger, StorageManager, Time, singleton } from "@project-chip/matter.js-general";
+import { Ble } from "@project-chip/matter.js/ble";
 import { DeviceTypeId, VendorId } from "@project-chip/matter.js/datatype";
+import { OnOffLightDevice, OnOffPluginUnitDevice, logEndpoint } from "@project-chip/matter.js/device";
+import { QrCode } from "@project-chip/matter.js/schema";
 import DummyWifiNetworkCommissioningClusterServer from "./cluster/DummyWifiNetworkCommissioningServerLegacy.js";
 
 const logger = Logger.get("Device");
@@ -46,28 +44,28 @@ requireMinNodeVersion(16);
 /** Configure logging */
 switch (getParameter("loglevel")) {
     case "fatal":
-        Logger.defaultLogLevel = Level.FATAL;
+        Logger.defaultLogLevel = LogLevel.FATAL;
         break;
     case "error":
-        Logger.defaultLogLevel = Level.ERROR;
+        Logger.defaultLogLevel = LogLevel.ERROR;
         break;
     case "warn":
-        Logger.defaultLogLevel = Level.WARN;
+        Logger.defaultLogLevel = LogLevel.WARN;
         break;
     case "info":
-        Logger.defaultLogLevel = Level.INFO;
+        Logger.defaultLogLevel = LogLevel.INFO;
         break;
 }
 
 switch (getParameter("logformat")) {
     case "plain":
-        Logger.format = Format.PLAIN;
+        Logger.format = LogFormat.PLAIN;
         break;
     case "html":
-        Logger.format = Format.HTML;
+        Logger.format = LogFormat.HTML;
         break;
     default:
-        if (process.stdin?.isTTY) Logger.format = Format.ANSI;
+        if (process.stdin?.isTTY) Logger.format = LogFormat.ANSI;
 }
 
 if (hasParameter("ble")) {

package/src/examples/IlluminatedRollerShade.ts

@@ -6,7 +6,7 @@
  */
 
 // Include this first to auto-register Crypto, Network and Time Node.js implementations
-import "@project-chip/matter-node.js";
+import "@project-chip/matter.js-nodejs";
 
 import {
     MovementDirection,

package/src/examples/LegacyStorageConverter.ts

@@ -5,10 +5,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import "@project-chip/matter-node.js";
-import { StorageBackendDisk } from "@project-chip/matter-node.js/storage";
+import { StorageBackendDisk } from "@project-chip/matter.js-nodejs";
+
+import { Time } from "@project-chip/matter.js-general";
 import { Environment, StorageService } from "@project-chip/matter.js/environment";
-import { Time } from "@project-chip/matter.js/time";
 import { LocalStorage } from "node-localstorage";
 
 const environment = Environment.default;

package/src/examples/LightDevice.ts

@@ -8,7 +8,7 @@
 // This demonstrates bringing a "light" device online with matter.js.
 
 // Include this first to auto-register Crypto, Network and Time Node.js implementations
-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/examples/MultiDeviceNode.ts

@@ -16,9 +16,9 @@
  * Import needed modules from @project-chip/matter-node.js
  */
 // Include this first to auto-register Crypto, Network and Time Node.js implementations
-import "@project-chip/matter-node.js";
+import { requireMinNodeVersion } from "@project-chip/matter.js-nodejs";
 
-import { requireMinNodeVersion } from "@project-chip/matter-node.js/util";
+import { Time } from "@project-chip/matter.js-general";
 import { DeviceTypeId, VendorId } from "@project-chip/matter.js/datatype";
 import { logEndpoint } from "@project-chip/matter.js/device";
 import { OnOffLightDevice } from "@project-chip/matter.js/devices/OnOffLightDevice";
@@ -26,7 +26,6 @@ import { OnOffPlugInUnitDevice } from "@project-chip/matter.js/devices/OnOffPlug
 import { Endpoint, EndpointServer } from "@project-chip/matter.js/endpoint";
 import { Environment, StorageService } from "@project-chip/matter.js/environment";
 import { ServerNode } from "@project-chip/matter.js/node";
-import { Time } from "@project-chip/matter.js/time";
 import { execSync } from "child_process";
 
 requireMinNodeVersion(16);

package/src/examples/MultiDeviceNodeLegacy.ts

@@ -21,21 +21,21 @@
  * Import needed modules from @project-chip/matter-node.js
  */
 // Include this first to auto-register Crypto, Network and Time Node.js implementations
-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 {
+    StorageBackendDisk,
     commandExecutor,
     getIntParameter,
     getParameter,
     hasParameter,
     requireMinNodeVersion,
-} from "@project-chip/matter-node.js/util";
+} from "@project-chip/matter.js-nodejs";
+
+import { CommissioningServer, MatterServer } from "@project-chip/matter.js";
+
+import { LogFormat, LogLevel, Logger, StorageManager, Time } from "@project-chip/matter.js-general";
 import { VendorId } from "@project-chip/matter.js/datatype";
+import { DeviceTypes, OnOffLightDevice, OnOffPluginUnitDevice } from "@project-chip/matter.js/device";
+import { QrCode } from "@project-chip/matter.js/schema";
 
 const logger = Logger.get("MultiDevice");
 
@@ -44,28 +44,28 @@ requireMinNodeVersion(16);
 /** Configure logging */
 switch (getParameter("loglevel")) {
     case "fatal":
-        Logger.defaultLogLevel = Level.FATAL;
+        Logger.defaultLogLevel = LogLevel.FATAL;
         break;
     case "error":
-        Logger.defaultLogLevel = Level.ERROR;
+        Logger.defaultLogLevel = LogLevel.ERROR;
         break;
     case "warn":
-        Logger.defaultLogLevel = Level.WARN;
+        Logger.defaultLogLevel = LogLevel.WARN;
         break;
     case "info":
-        Logger.defaultLogLevel = Level.INFO;
+        Logger.defaultLogLevel = LogLevel.INFO;
         break;
 }
 
 switch (getParameter("logformat")) {
     case "plain":
-        Logger.format = Format.PLAIN;
+        Logger.format = LogFormat.PLAIN;
         break;
     case "html":
-        Logger.format = Format.HTML;
+        Logger.format = LogFormat.HTML;
         break;
     default:
-        if (process.stdin?.isTTY) Logger.format = Format.ANSI;
+        if (process.stdin?.isTTY) Logger.format = LogFormat.ANSI;
 }
 
 const storageLocation = getParameter("store") ?? ".device-node";

package/src/examples/SensorDeviceNode.ts

@@ -15,9 +15,9 @@
  * Import needed modules from @project-chip/matter-node.js
  */
 // Include this first to auto-register Crypto, Network and Time Node.js implementations
-import "@project-chip/matter-node.js";
+import { requireMinNodeVersion } from "@project-chip/matter.js-nodejs";
 
-import { requireMinNodeVersion } from "@project-chip/matter-node.js/util";
+import { Time } from "@project-chip/matter.js-general";
 import { DeviceTypeId, VendorId } from "@project-chip/matter.js/datatype";
 import { logEndpoint } from "@project-chip/matter.js/device";
 import { HumiditySensorDevice } from "@project-chip/matter.js/devices/HumiditySensorDevice";
@@ -25,7 +25,6 @@ import { TemperatureSensorDevice } from "@project-chip/matter.js/devices/Tempera
 import { Endpoint, EndpointServer } from "@project-chip/matter.js/endpoint";
 import { Environment, StorageService } from "@project-chip/matter.js/environment";
 import { ServerNode } from "@project-chip/matter.js/node";
-import { Time } from "@project-chip/matter.js/time";
 import { execSync } from "child_process";
 
 requireMinNodeVersion(16);

package/src/examples/cluster/DummyThreadNetworkCommissioningServer.ts

@@ -4,13 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { Bytes, Logger } 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 { Logger } from "@project-chip/matter.js/log";
-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 Thread Network Commissioning Cluster Server without real thread related logic, beside
@@ -41,7 +40,7 @@ export class DummyThreadNetworkCommissioningServer extends NetworkCommissioningB
                 networkName: this.endpoint.env.vars.string("ble.thread.networkName"),
                 channel: this.endpoint.env.vars.number("ble.thread.channel"),
                 version: 130,
-                extendedAddress: ByteArray.fromString(
+                extendedAddress: Bytes.fromString(
                     (this.endpoint.env.vars.string("ble.thread.address") ?? "000000000000").toLowerCase(),
                 ),
                 rssi: -50,
@@ -61,7 +60,7 @@ export class DummyThreadNetworkCommissioningServer extends NetworkCommissioningB
         breadcrumb,
     }: NetworkCommissioning.AddOrUpdateThreadNetworkRequest) {
         console.log(
-            `---> addOrUpdateThreadNetwork called on NetworkCommissioning cluster: ${operationalDataset.toHex()} ${breadcrumb}`,
+            `---> addOrUpdateThreadNetwork called on NetworkCommissioning cluster: ${Bytes.toHex(operationalDataset)} ${breadcrumb}`,
         );
 
         this.session.context.assertFailSafeArmed("Failsafe timer needs to be armed to add or update networks.");
@@ -83,7 +82,9 @@ export class DummyThreadNetworkCommissioningServer extends NetworkCommissioningB
     }
 
     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.");
 
@@ -104,7 +105,9 @@ export class DummyThreadNetworkCommissioningServer extends NetworkCommissioningB
     }
 
     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.");
 
@@ -133,7 +136,7 @@ export class DummyThreadNetworkCommissioningServer extends NetworkCommissioningB
 
     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