@project-chip/matter-node.js-examples 0.8.0-alpha.1-20240308-033110a3 → 0.8.0

package/src/examples/ControllerNode.ts

@@ -20,8 +20,7 @@
 import "@project-chip/matter-node.js";
 
 import { BleNode } from "@project-chip/matter-node-ble.js/ble";
-import { StorageBackendDisk } from "@project-chip/matter-node.js/storage";
-import { getIntParameter, getParameter, hasParameter, requireMinNodeVersion } from "@project-chip/matter-node.js/util";
+import { requireMinNodeVersion } from "@project-chip/matter-node.js/util";
 import { CommissioningController, NodeCommissioningOptions } from "@project-chip/matter.js";
 import { Ble } from "@project-chip/matter.js/ble";
 import {
@@ -32,11 +31,10 @@ import {
 } from "@project-chip/matter.js/cluster";
 import { NodeId } from "@project-chip/matter.js/datatype";
 import { NodeStateInformation } from "@project-chip/matter.js/device";
-import { Environment } from "@project-chip/matter.js/environment";
-import { Format, Level, Logger } from "@project-chip/matter.js/log";
+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 { StorageManager } from "@project-chip/matter.js/storage";
 import { Time } from "@project-chip/matter.js/time";
 import { singleton } from "@project-chip/matter.js/util";
 
@@ -44,64 +42,29 @@ const logger = Logger.get("Controller");
 
 requireMinNodeVersion(16);
 
-/** Configure logging */
-switch (getParameter("loglevel")) {
-    case "fatal":
-        Logger.defaultLogLevel = Level.FATAL;
-        break;
-    case "error":
-        Logger.defaultLogLevel = Level.ERROR;
-        break;
-    case "warn":
-        Logger.defaultLogLevel = Level.WARN;
-        break;
-    case "info":
-        Logger.defaultLogLevel = Level.INFO;
-        break;
-}
-
-switch (getParameter("logformat")) {
-    case "plain":
-        Logger.format = Format.PLAIN;
-        break;
-    case "html":
-        Logger.format = Format.HTML;
-        break;
-    default:
-        if (process.stdin?.isTTY) Logger.format = Format.ANSI;
-}
+const environment = Environment.default;
 
-if (hasParameter("ble")) {
+if (environment.vars.get("ble")) {
     // Initialize Ble
     Ble.get = singleton(
         () =>
             new BleNode({
-                hciId: getIntParameter("ble-hci-id"),
+                hciId: environment.vars.number("ble-hci-id"),
             }),
     );
 }
 
-const storageLocation = getParameter("store") ?? ".controller-node";
-const storage = new StorageBackendDisk(storageLocation, hasParameter("clearstorage"));
-logger.info(`Storage location: ${storageLocation} (Directory)`);
+const storageService = environment.get(StorageService);
+
+console.log(`Storage location: ${storageService.location} (Directory)`);
 logger.info(
-    'Use the parameter "-store NAME" to specify a different storage location, use -clearstorage to start with an empty storage.',
+    'Use the parameter "--storage-path=NAME-OR-PATH" to specify a different storage location in this directory, use --storage-clear to start with an empty storage.',
 );
 
 class ControllerNode {
     async start() {
         logger.info(`node-matter Controller started`);
 
-        /**
-         * Initialize the storage system.
-         *
-         * The storage manager is then also used by the Matter server, so this code block in general is required,
-         * but you can choose a different storage backend as long as it implements the required API.
-         */
-
-        const storageManager = new StorageManager(storage);
-        await storageManager.initialize();
-
         /**
          * Collect all needed data
          *
@@ -113,15 +76,19 @@ class ControllerNode {
          * (so maybe better not ;-)).
          */
 
-        const controllerStorage = storageManager.createContext("Controller");
-        const ip = controllerStorage.has("ip") ? controllerStorage.get<string>("ip") : getParameter("ip");
-        const port = controllerStorage.has("port") ? controllerStorage.get<number>("port") : getIntParameter("port");
-        const uniqueId = controllerStorage.has("uniqueid")
-            ? controllerStorage.get<string>("uniqueid")
-            : getParameter("uniqueid") ?? Time.nowMs().toString();
-        controllerStorage.set("uniqueid", uniqueId);
-
-        const pairingCode = getParameter("pairingcode");
+        const controllerStorage = (await storageService.open("controller")).createContext("data");
+        const ip = (await controllerStorage.has("ip"))
+            ? controllerStorage.get<string>("ip")
+            : environment.vars.string("ip");
+        const port = (await controllerStorage.has("port"))
+            ? controllerStorage.get<number>("port")
+            : environment.vars.number("port");
+        const uniqueId = (await controllerStorage.has("uniqueid"))
+            ? await controllerStorage.get<string>("uniqueid")
+            : environment.vars.string("uniqueid") ?? Time.nowMs().toString();
+        await controllerStorage.set("uniqueid", uniqueId);
+
+        const pairingCode = environment.vars.string("pairingcode");
         let longDiscriminator, setupPin, shortDiscriminator;
         if (pairingCode !== undefined) {
             const pairingCodeCodec = ManualPairingCodeCodec.decode(pairingCode);
@@ -131,9 +98,10 @@ class ControllerNode {
             logger.debug(`Data extracted from pairing code: ${Logger.toJSON(pairingCodeCodec)}`);
         } else {
             longDiscriminator =
-                getIntParameter("longDiscriminator") ?? controllerStorage.get("longDiscriminator", 3840);
+                environment.vars.number("longDiscriminator") ??
+                (await controllerStorage.get("longDiscriminator", 3840));
             if (longDiscriminator > 4095) throw new Error("Discriminator value must be less than 4096");
-            setupPin = getIntParameter("pin") ?? controllerStorage.get("pin", 20202021);
+            setupPin = environment.vars.number("pin") ?? (await controllerStorage.get("pin", 20202021));
         }
         if ((shortDiscriminator === undefined && longDiscriminator === undefined) || setupPin === undefined) {
             throw new Error(
@@ -148,12 +116,12 @@ class ControllerNode {
         };
 
         let ble = false;
-        if (hasParameter("ble")) {
+        if (environment.vars.get("ble")) {
             ble = true;
-            const wifiSsid = getParameter("ble-wifi-ssid");
-            const wifiCredentials = getParameter("ble-wifi-credentials");
-            const threadNetworkName = getParameter("ble-thread-networkname");
-            const threadOperationalDataset = getParameter("ble-thread-operationaldataset");
+            const wifiSsid = environment.vars.string("ble-wifi-ssid");
+            const wifiCredentials = environment.vars.string("ble-wifi-credentials");
+            const threadNetworkName = environment.vars.string("ble-thread-networkname");
+            const threadOperationalDataset = environment.vars.string("ble-thread-operationaldataset");
             if (wifiSsid !== undefined && wifiCredentials !== undefined) {
                 logger.info(`Registering Commissioning over BLE with WiFi: ${wifiSsid}`);
                 commissioningOptions.wifiNetwork = {
@@ -183,7 +151,6 @@ class ControllerNode {
          * are called.
          */
 
-        const environment = Environment.default;
         const commissioningController = new CommissioningController({
             environment: {
                 environment,
@@ -230,7 +197,7 @@ class ControllerNode {
             const nodes = commissioningController.getCommissionedNodes();
             console.log("Found commissioned nodes:", Logger.toJSON(nodes));
 
-            const nodeId = NodeId(getIntParameter("nodeid") ?? nodes[0]);
+            const nodeId = NodeId(environment.vars.number("nodeid") ?? nodes[0]);
             if (!nodes.includes(nodeId)) {
                 throw new Error(`Node ${nodeId} not found in commissioned nodes`);
             }
@@ -349,12 +316,3 @@ class ControllerNode {
 }
 
 new ControllerNode().start().catch(error => logger.error(error));
-
-process.on("SIGINT", () => {
-    // Clean up on CTRL-C
-    // Pragmatic way to make sure the storage is correctly closed before the process ends.
-    storage
-        .close()
-        .then(() => process.exit(0))
-        .catch(() => process.exit(1));
-});

package/src/examples/ControllerNodeLegacy.ts

@@ -347,8 +347,6 @@ new ControllerNode().start().catch(error => logger.error(error));
 process.on("SIGINT", () => {
     // Clean up on CTRL-C
     // Pragmatic way to make sure the storage is correctly closed before the process ends.
-    storage
-        .close()
-        .then(() => process.exit(0))
-        .catch(() => process.exit(1));
+    storage.close();
+    process.exit(0);
 });

package/src/examples/DeviceNode.ts

@@ -162,30 +162,33 @@ async function getConfiguration() {
     );
     const deviceStorage = (await storageService.open("device")).createContext("data");
 
-    const isSocket = deviceStorage.get("isSocket", environment.vars.get("type") === "socket");
-    if (deviceStorage.has("isSocket")) {
+    const isSocket = await deviceStorage.get("isSocket", environment.vars.get("type") === "socket");
+    if (await deviceStorage.has("isSocket")) {
         console.log(`Device type ${isSocket ? "socket" : "light"} found in storage. --type parameter is ignored.`);
     }
     const deviceName = "Matter test device";
     const vendorName = "matter-node.js";
-    const passcode = environment.vars.number("passcode") ?? deviceStorage.get("passcode", 20202021);
-    const discriminator = environment.vars.number("discriminator") ?? deviceStorage.get("discriminator", 3840);
+    const passcode = environment.vars.number("passcode") ?? (await deviceStorage.get("passcode", 20202021));
+    const discriminator = environment.vars.number("discriminator") ?? (await deviceStorage.get("discriminator", 3840));
     // product name / id and vendor id should match what is in the device certificate
-    const vendorId = environment.vars.number("vendorid") ?? deviceStorage.get("vendorid", 0xfff1);
+    const vendorId = environment.vars.number("vendorid") ?? (await deviceStorage.get("vendorid", 0xfff1));
     const productName = `node-matter OnOff ${isSocket ? "Socket" : "Light"}`;
-    const productId = environment.vars.number("productid") ?? deviceStorage.get("productid", 0x8000);
+    const productId = environment.vars.number("productid") ?? (await deviceStorage.get("productid", 0x8000));
 
     const port = environment.vars.number("port") ?? 5540;
 
-    const uniqueId = environment.vars.string("uniqueid") ?? deviceStorage.get("uniqueid", Time.nowMs().toString());
+    const uniqueId =
+        environment.vars.string("uniqueid") ?? (await deviceStorage.get("uniqueid", Time.nowMs())).toString();
 
     // Persist basic data to keep them also on restart
-    deviceStorage.set("passcode", passcode);
-    deviceStorage.set("discriminator", discriminator);
-    deviceStorage.set("vendorid", vendorId);
-    deviceStorage.set("productid", productId);
-    deviceStorage.set("isSocket", isSocket);
-    deviceStorage.set("uniqueid", uniqueId);
+    await deviceStorage.set({
+        passcode,
+        discriminator,
+        vendorid: vendorId,
+        productid: productId,
+        isSocket,
+        uniqueid: uniqueId,
+    });
 
     return {
         isSocket,

package/src/examples/DeviceNodeFull.ts

@@ -115,29 +115,31 @@ console.log(
 
 const deviceStorage = (await storageService.open("device")).createContext("data");
 
-if (deviceStorage.has("isSocket")) {
+if (await deviceStorage.has("isSocket")) {
     console.log("Device type found in storage. --type parameter is ignored.");
 }
-const isSocket = deviceStorage.get("isSocket", environment.vars.string("type") === "socket");
+const isSocket = await deviceStorage.get("isSocket", environment.vars.string("type") === "socket");
 const deviceName = "Matter test device";
 const vendorName = "matter-node.js";
-const passcode = environment.vars.number("passcode") ?? deviceStorage.get("passcode", 20202021);
-const discriminator = environment.vars.number("discriminator") ?? deviceStorage.get("discriminator", 3840);
+const passcode = environment.vars.number("passcode") ?? (await deviceStorage.get("passcode", 20202021));
+const discriminator = environment.vars.number("discriminator") ?? (await deviceStorage.get("discriminator", 3840));
 // product name / id and vendor id should match what is in the device certificate
-const vendorId = environment.vars.number("vendorid") ?? deviceStorage.get("vendorid", 0xfff1);
+const vendorId = environment.vars.number("vendorid") ?? (await deviceStorage.get("vendorid", 0xfff1));
 const productName = `node-matter OnOff ${isSocket ? "Socket" : "Light"}`;
-const productId = environment.vars.number("productid") ?? deviceStorage.get("productid", 0x8000);
+const productId = environment.vars.number("productid") ?? (await deviceStorage.get("productid", 0x8000));
 
 const port = environment.vars.number("port") ?? 5540;
 
-const uniqueId = environment.vars.string("uniqueid") ?? deviceStorage.get("uniqueid", Time.nowMs().toString());
+const uniqueId = environment.vars.string("uniqueid") ?? (await deviceStorage.get("uniqueid", Time.nowMs().toString()));
 
-deviceStorage.set("passcode", passcode);
-deviceStorage.set("discriminator", discriminator);
-deviceStorage.set("vendorid", vendorId);
-deviceStorage.set("productid", productId);
-deviceStorage.set("isSocket", isSocket);
-deviceStorage.set("uniqueid", uniqueId);
+await deviceStorage.set({
+    passcode,
+    discriminator,
+    vendorid: vendorId,
+    productid: productId,
+    isSocket,
+    uniqueid: uniqueId,
+});
 
 // Matter exposes functionality in groups called "clusters".  For this example device we override the matter.js "On/Off"
 // cluster implementation to print status to the console.
@@ -323,7 +325,7 @@ server.lifecycle.offline.on(() => console.log("Server is offline"));
  * This event is triggered when a fabric is added, removed or updated on the device. Use this if more granular
  * information is needed.
  */
-server.events.commissioning.commissionedFabricsChanged.on((fabricIndex, fabricAction) => {
+server.events.commissioning.fabricsChanged.on((fabricIndex, fabricAction) => {
     let action = "";
     switch (fabricAction) {
         case FabricAction.Added:
@@ -337,7 +339,7 @@ server.events.commissioning.commissionedFabricsChanged.on((fabricIndex, fabricAc
             break;
     }
     console.log(`Commissioned Fabrics changed event (${action}) for ${fabricIndex} triggered`);
-    console.log(server.state.operationalCredentials.fabrics);
+    console.log(server.state.commissioning.fabrics[fabricIndex]);
 });
 
 /**

package/src/examples/DeviceNodeFullLegacy.ts

@@ -134,13 +134,14 @@ class Device {
 
         const uniqueId = getIntParameter("uniqueid") ?? deviceStorage.get("uniqueid", Time.nowMs());
 
-        deviceStorage.set("passcode", passcode);
-        deviceStorage.set("discriminator", discriminator);
-        deviceStorage.set("vendorid", vendorId);
-        deviceStorage.set("productid", productId);
-        deviceStorage.set("isSocket", isSocket);
-        deviceStorage.set("uniqueid", uniqueId);
-
+        deviceStorage.set({
+            passcode,
+            discriminator,
+            vendorid: vendorId,
+            productid: productId,
+            isSocket,
+            uniqueid: uniqueId,
+        });
         /**
          * Create Device instance and add needed Listener
          *
@@ -298,10 +299,8 @@ process.on("SIGINT", () => {
         .stop()
         .then(() => {
             // Pragmatic way to make sure the storage is correctly closed before the process ends.
-            storage
-                .close()
-                .then(() => process.exit(0))
-                .catch(err => console.error(err));
+            storage.close();
+            process.exit(0);
         })
         .catch(err => console.error(err));
 });

package/src/examples/LegacyStorageConverter.ts

@@ -0,0 +1,156 @@
+/**
+ * @license
+ * Copyright 2022-2024 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import "@project-chip/matter-node.js";
+import { StorageBackendDisk } from "@project-chip/matter-node.js/storage";
+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;
+
+const legacyStoragePath = environment.vars.string("legacy.storage.path");
+const newStoragePath = environment.vars.string("storage.path");
+
+if (!legacyStoragePath || !newStoragePath) {
+    console.error("Usage: node LegacyStorageConverter.js --legacy-storage-path=<path> --storage-path=<path>");
+    process.exit(1);
+}
+
+const legacyLocalStorage = new LocalStorage(legacyStoragePath);
+
+const legacyNodes = new Array<string>();
+Object.keys(legacyLocalStorage).forEach(key => {
+    const firstLevel = key.split(".")[0];
+    if (!legacyNodes.includes(firstLevel)) {
+        legacyNodes.push(firstLevel);
+    }
+});
+
+const storageService = environment.get(StorageService);
+
+const legacyStorage = new StorageBackendDisk(legacyStoragePath);
+legacyStorage.initialize();
+
+const uniqueIds: Record<string, string> = {};
+if (legacyNodes.includes("Device")) {
+    console.log("Example Device found ...");
+    legacyNodes.splice(legacyNodes.indexOf("Device"), 1);
+
+    const newDeviceStorage = (await storageService.open("device")).createContext("data");
+
+    for (const key of legacyStorage.keys(["Device"])) {
+        console.log("Migrate Device.", key);
+        const value = legacyStorage.get(["Device"], key);
+        await newDeviceStorage.set(key, value);
+        if (key === "uniqueid") {
+            uniqueIds["0"] = String(value);
+            await newDeviceStorage.set(key, String(value));
+        } else if (key.startsWith("uniqueid")) {
+            const id = parseInt(key.substring(8));
+            uniqueIds[id - 1] = String(value);
+            await newDeviceStorage.set(key, String(value));
+        }
+    }
+}
+
+if (legacyNodes.includes("Controller")) {
+    console.log("Example Controller found ...");
+    legacyNodes.splice(legacyNodes.indexOf("Controller"), 1);
+
+    const newControllerStorage = (await storageService.open("controller")).createContext("data");
+
+    for (const key of legacyStorage.keys(["Controller"])) {
+        console.log("Migrate Controller.", key);
+        const value = legacyStorage.get(["Controller"], key);
+        await newControllerStorage.set(key, value);
+        if (key === "uniqueid") {
+            uniqueIds["0"] = String(value);
+            await newControllerStorage.set(key, String(value));
+        }
+    }
+}
+
+console.log(uniqueIds);
+
+if (!Object.keys(uniqueIds).length) {
+    console.error("No uniqueId(s) found in legacy storage. Can not convert the node storage.");
+    process.exit(1);
+}
+
+for (const nodeId of legacyNodes) {
+    if (!uniqueIds[nodeId]) {
+        const rootCertId = legacyStorage.get(["0", "RootCertificateManager"], "rootCertId");
+
+        if (nodeId !== "0" || rootCertId === undefined) {
+            console.error(`No uniqueId found for node ${nodeId}. Can not convert the node storage.`);
+            continue;
+        }
+
+        // Migrate the controller storage
+        const newControllerStorage = (await storageService.open("controller")).createContext("data");
+        const uniqueId = Time.nowMs().toString();
+        await newControllerStorage.set("uniqueid", uniqueId);
+
+        const newNodeStorage = await storageService.open(uniqueId);
+
+        const credentialsStorage = newNodeStorage.createContext("credentials");
+        await credentialsStorage.set("rootCertId", rootCertId);
+        await credentialsStorage.set(
+            "nextCertificateId",
+            legacyStorage.get(["0", "RootCertificateManager"], "nextCertificateId"),
+        );
+        await credentialsStorage.set(
+            "rootCertBytes",
+            legacyStorage.get(["0", "RootCertificateManager"], "rootCertBytes"),
+        );
+        await credentialsStorage.set(
+            "rootKeyIdentifier",
+            legacyStorage.get(["0", "RootCertificateManager"], "rootKeyIdentifier"),
+        );
+        await credentialsStorage.set("rootKeyPair", legacyStorage.get(["0", "RootCertificateManager"], "rootKeyPair"));
+        await credentialsStorage.set("fabric", legacyStorage.get(["0", "MatterController"], "fabric"));
+
+        const sessionsStorage = newNodeStorage.createContext("sessions");
+        await sessionsStorage.set(
+            "resumptionRecords",
+            legacyStorage.get([nodeId, "SessionManager"], "resumptionRecords"),
+        );
+
+        const nodesStorage = newNodeStorage.createContext("nodes");
+        await nodesStorage.set(
+            "resumptionRecords",
+            legacyStorage.get([nodeId, "MatterController"], "commissionedNodes"),
+        );
+
+        console.log(`Controller Node ${nodeId} with new unique id ${uniqueId} migrated successfully.`);
+    } else {
+        // Migrate the device storage
+        const newNodeStorage = await storageService.open(uniqueIds[nodeId]);
+
+        const nextEndpointNumber = legacyStorage.get<number>([nodeId, "EndpointStructure"], "nextEndpointId");
+        if (nextEndpointNumber !== undefined && nextEndpointNumber > 2) {
+            console.log(
+                "It seems you used a bridged or composed example before, please make sure to use all details (type, ids,...) in the parameters when starting the new example. When using a bridge and you had changed devices after pairing it could happen that the new example introduces new devices to the controller. If you are unsure unpair the old example and start fresh.",
+            );
+        }
+
+        const eventsStorage = newNodeStorage.createContext("events");
+        await eventsStorage.set("lastEventNumber", legacyStorage.get([nodeId, "EventHandler"], "lastEventNumber"));
+
+        const fabricsStorage = newNodeStorage.createContext("fabrics");
+        await fabricsStorage.set("fabrics", legacyStorage.get([nodeId, "FabricManager"], "fabrics"));
+        await fabricsStorage.set("nextFabricIndex", legacyStorage.get([nodeId, "FabricManager"], "nextFabricIndex"));
+
+        const sessionsStorage = newNodeStorage.createContext("sessions");
+        await sessionsStorage.set(
+            "resumptionRecords",
+            legacyStorage.get([nodeId, "SessionManager"], "resumptionRecords"),
+        );
+
+        console.log(`Device Node ${nodeId} with unique id ${uniqueIds[nodeId]} migrated successfully.`);
+    }
+}

package/src/examples/MultiDeviceNode.ts

@@ -163,34 +163,36 @@ async function getConfiguration() {
     const devices = [];
     const numDevices = environment.vars.number("num") ?? 2;
     for (let i = 1; i <= numDevices; i++) {
-        const isSocket = deviceStorage.get(`isSocket${i}`, environment.vars.string(`type${i}`) === "socket");
-        if (deviceStorage.has(`isSocket${i}`)) {
+        const isSocket = await deviceStorage.get(`isSocket${i}`, environment.vars.string(`type${i}`) === "socket");
+        if (await deviceStorage.has(`isSocket${i}`)) {
             console.log(`Device type ${isSocket ? "socket" : "light"} found in storage. --type parameter is ignored.`);
         }
         const deviceName = `Matter ${environment.vars.string(`type${i}`) ?? "light"} device ${i}`;
         const vendorName = "matter-node.js";
         const passcode =
-            environment.vars.number(`passcode${i}`) ?? deviceStorage.get(`passcode${i}`, defaultPasscode++);
+            environment.vars.number(`passcode${i}`) ?? (await deviceStorage.get(`passcode${i}`, defaultPasscode++));
         const discriminator =
             environment.vars.number(`discriminator${i}`) ??
-            deviceStorage.get(`discriminator${i}`, defaultDiscriminator++);
+            (await deviceStorage.get(`discriminator${i}`, defaultDiscriminator++));
         // product name / id and vendor id should match what is in the device certificate
-        const vendorId = environment.vars.number(`vendorid${i}`) ?? deviceStorage.get(`vendorid${i}`, 0xfff1);
+        const vendorId = environment.vars.number(`vendorid${i}`) ?? (await deviceStorage.get(`vendorid${i}`, 0xfff1));
         const productName = `node-matter OnOff-Device ${i}`;
-        const productId = environment.vars.number(`productid${i}`) ?? deviceStorage.get(`productid${i}`, 0x8000);
+        const productId =
+            environment.vars.number(`productid${i}`) ?? (await deviceStorage.get(`productid${i}`, 0x8000));
 
         const port = environment.vars.number(`port${i}`) ?? defaultPort++;
 
         const uniqueId =
-            environment.vars.string(`uniqueid${i}`) ?? deviceStorage.get(`uniqueid${i}`, `${i}-${Time.nowMs()}`);
+            environment.vars.string(`uniqueid${i}`) ??
+            (await deviceStorage.get(`uniqueid${i}`, `${i}-${Time.nowMs()}`));
 
         // Persist basic data to keep them also on restart
-        deviceStorage.set(`passcode${i}`, passcode);
-        deviceStorage.set(`discriminator${i}`, discriminator);
-        deviceStorage.set(`vendorid${i}`, vendorId);
-        deviceStorage.set(`productid${i}`, productId);
-        deviceStorage.set(`isSocket${i}`, isSocket);
-        deviceStorage.set(`uniqueid${i}`, uniqueId);
+        await deviceStorage.set(`passcode${i}`, passcode);
+        await deviceStorage.set(`discriminator${i}`, discriminator);
+        await deviceStorage.set(`vendorid${i}`, vendorId);
+        await deviceStorage.set(`productid${i}`, productId);
+        await deviceStorage.set(`isSocket${i}`, isSocket);
+        await deviceStorage.set(`uniqueid${i}`, uniqueId);
 
         devices.push({
             isSocket,

package/src/examples/MultiDeviceNodeLegacy.ts

@@ -258,10 +258,8 @@ process.on("SIGINT", () => {
         .stop()
         .then(() => {
             // Pragmatic way to make sure the storage is correctly closed before the process ends.
-            storage
-                .close()
-                .then(() => process.exit(0))
-                .catch(err => console.error(err));
+            storage.close();
+            process.exit(0);
         })
         .catch(err => console.error(err));
 });

package/src/examples/SensorDeviceNode.ts

@@ -186,13 +186,13 @@ async function getConfiguration() {
     );
     const deviceStorage = (await storageService.open("device")).createContext("data");
 
-    const isTemperature = deviceStorage.get("isTemperature", environment.vars.get("type") !== "humidity");
-    if (deviceStorage.has("isTemperature")) {
+    const isTemperature = await deviceStorage.get("isTemperature", environment.vars.get("type") !== "humidity");
+    if (await deviceStorage.has("isTemperature")) {
         console.log(
             `Device type ${isTemperature ? "temperature" : "humidity"} found in storage. --type parameter is ignored.`,
         );
     }
-    let interval = environment.vars.number("interval") ?? deviceStorage.get("interval", 60);
+    let interval = environment.vars.number("interval") ?? (await deviceStorage.get("interval", 60));
     if (interval < 1) {
         console.log(`Invalid Interval ${interval}, set to 60s`);
         interval = 60;
@@ -200,25 +200,28 @@ async function getConfiguration() {
 
     const deviceName = "Matter test device";
     const vendorName = "matter-node.js";
-    const passcode = environment.vars.number("passcode") ?? deviceStorage.get("passcode", 20202021);
-    const discriminator = environment.vars.number("discriminator") ?? deviceStorage.get("discriminator", 3840);
+    const passcode = environment.vars.number("passcode") ?? (await deviceStorage.get("passcode", 20202021));
+    const discriminator = environment.vars.number("discriminator") ?? (await deviceStorage.get("discriminator", 3840));
     // product name / id and vendor id should match what is in the device certificate
-    const vendorId = environment.vars.number("vendorid") ?? deviceStorage.get("vendorid", 0xfff1);
+    const vendorId = environment.vars.number("vendorid") ?? (await deviceStorage.get("vendorid", 0xfff1));
     const productName = `node-matter OnOff ${isTemperature ? "Temperature" : "Humidity"}`;
-    const productId = environment.vars.number("productid") ?? deviceStorage.get("productid", 0x8000);
+    const productId = environment.vars.number("productid") ?? (await deviceStorage.get("productid", 0x8000));
 
     const port = environment.vars.number("port") ?? 5540;
 
-    const uniqueId = environment.vars.string("uniqueid") ?? deviceStorage.get("uniqueid", Time.nowMs().toString());
+    const uniqueId =
+        environment.vars.string("uniqueid") ?? (await deviceStorage.get("uniqueid", Time.nowMs().toString()));
 
     // Persist basic data to keep them also on restart
-    deviceStorage.set("passcode", passcode);
-    deviceStorage.set("discriminator", discriminator);
-    deviceStorage.set("vendorid", vendorId);
-    deviceStorage.set("productid", productId);
-    deviceStorage.set("interval", interval);
-    deviceStorage.set("isTemperature", isTemperature);
-    deviceStorage.set("uniqueid", uniqueId);
+    await deviceStorage.set({
+        passcode,
+        discriminator,
+        vendorid: vendorId,
+        productid: productId,
+        interval,
+        isTemperature,
+        uniqueid: uniqueId,
+    });
 
     return {
         isTemperature,

package/src/examples/cluster/DummyThreadNetworkCommissioningServer.ts

@@ -21,7 +21,7 @@ import { ByteArray } from "@project-chip/matter.js/util";
 const firstNetworkId = new ByteArray(32);
 
 /**
- * This represents a Dummy version of a Wifi Network Commissioning Cluster Server without real Wifi related logic, beside
+ * This represents a Dummy version of a Thread Network Commissioning Cluster Server without real thread related logic, beside
  * returning some values provided as CLI parameters. This dummy implementation is only there for tests/as showcase for BLE
  * commissioning of a device.
  */
@@ -64,7 +64,7 @@ export class DummyThreadNetworkCommissioningServer extends NetworkCommissioningB
 
     override addOrUpdateThreadNetwork({ operationalDataset, breadcrumb }: AddOrUpdateThreadNetworkRequest) {
         console.log(
-            `---> addOrUpdateWiFiNetwork called on NetworkCommissioning cluster: ${operationalDataset.toHex()} ${breadcrumb}`,
+            `---> addOrUpdateThreadNetwork called on NetworkCommissioning cluster: ${operationalDataset.toHex()} ${breadcrumb}`,
         );
 
         this.session.context.assertFailSafeArmed("Failsafe timer needs to be armed to add or update networks.");