@project-chip/matter-node.js-examples 0.8.0-alpha.0-20240328-f7f45db5 → 0.8.0-alpha.0-20240329-133f426f

package/src/examples/BridgedDevicesNodeLegacy.ts

@@ -117,11 +117,13 @@ class BridgedDevice {
 
         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("uniqueid", uniqueId);
+        deviceStorage.set({
+            passcode,
+            discriminator,
+            vendorid: vendorId,
+            productid: productId,
+            uniqueid: uniqueId,
+        });
 
         /**
          * Create Matter Server and CommissioningServer Node
@@ -245,10 +247,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/ComposedDeviceNode.ts

@@ -152,9 +152,9 @@ async function getConfiguration() {
 
     const isSocket = Array<boolean>();
     const numDevices = environment.vars.number("num") || 2;
-    if (deviceStorage.has("isSocket")) {
+    if (await deviceStorage.has("isSocket")) {
         console.log(`Device types found in storage. --type parameter is ignored.`);
-        deviceStorage.get<Array<boolean>>("isSocket").forEach(type => isSocket.push(type));
+        (await deviceStorage.get<Array<boolean>>("isSocket")).forEach(type => isSocket.push(type));
     }
     for (let i = 1; i < numDevices; i++) {
         if (isSocket[i - 1] !== undefined) continue;
@@ -163,24 +163,27 @@ 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 ${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/ComposedDeviceNodeLegacy.ts

@@ -124,12 +124,14 @@ class ComposedDevice {
 
         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 Matter Server and CommissioningServer Node
@@ -243,10 +245,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/ControllerNode.ts

@@ -77,14 +77,16 @@ class ControllerNode {
          */
 
         const controllerStorage = (await storageService.open("controller")).createContext("data");
-        const ip = controllerStorage.has("ip") ? controllerStorage.get<string>("ip") : environment.vars.string("ip");
-        const port = controllerStorage.has("port")
+        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 = controllerStorage.has("uniqueid")
-            ? controllerStorage.get<string>("uniqueid")
+        const uniqueId = (await controllerStorage.has("uniqueid"))
+            ? await controllerStorage.get<string>("uniqueid")
             : environment.vars.string("uniqueid") ?? Time.nowMs().toString();
-        controllerStorage.set("uniqueid", uniqueId);
+        await controllerStorage.set("uniqueid", uniqueId);
 
         const pairingCode = environment.vars.string("pairingcode");
         let longDiscriminator, setupPin, shortDiscriminator;
@@ -96,9 +98,10 @@ class ControllerNode {
             logger.debug(`Data extracted from pairing code: ${Logger.toJSON(pairingCodeCodec)}`);
         } else {
             longDiscriminator =
-                environment.vars.number("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 = environment.vars.number("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(

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.

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

@@ -33,7 +33,7 @@ Object.keys(legacyLocalStorage).forEach(key => {
 const storageService = environment.get(StorageService);
 
 const legacyStorage = new StorageBackendDisk(legacyStoragePath);
-await legacyStorage.initialize();
+legacyStorage.initialize();
 
 const uniqueIds: Record<string, string> = {};
 if (legacyNodes.includes("Device")) {
@@ -42,19 +42,19 @@ if (legacyNodes.includes("Device")) {
 
     const newDeviceStorage = (await storageService.open("device")).createContext("data");
 
-    legacyStorage.keys(["Device"]).forEach(key => {
+    for (const key of legacyStorage.keys(["Device"])) {
         console.log("Migrate Device.", key);
         const value = legacyStorage.get(["Device"], key);
-        newDeviceStorage.set(key, value);
+        await newDeviceStorage.set(key, value);
         if (key === "uniqueid") {
             uniqueIds["0"] = String(value);
-            newDeviceStorage.set(key, String(value));
+            await newDeviceStorage.set(key, String(value));
         } else if (key.startsWith("uniqueid")) {
             const id = parseInt(key.substring(8));
             uniqueIds[id - 1] = String(value);
-            newDeviceStorage.set(key, String(value));
+            await newDeviceStorage.set(key, String(value));
         }
-    });
+    }
 }
 
 if (legacyNodes.includes("Controller")) {
@@ -63,15 +63,15 @@ if (legacyNodes.includes("Controller")) {
 
     const newControllerStorage = (await storageService.open("controller")).createContext("data");
 
-    legacyStorage.keys(["Controller"]).forEach(key => {
+    for (const key of legacyStorage.keys(["Controller"])) {
         console.log("Migrate Controller.", key);
         const value = legacyStorage.get(["Controller"], key);
-        newControllerStorage.set(key, value);
+        await newControllerStorage.set(key, value);
         if (key === "uniqueid") {
             uniqueIds["0"] = String(value);
-            newControllerStorage.set(key, String(value));
+            await newControllerStorage.set(key, String(value));
         }
-    });
+    }
 }
 
 console.log(uniqueIds);
@@ -93,29 +93,38 @@ for (const nodeId of legacyNodes) {
         // Migrate the controller storage
         const newControllerStorage = (await storageService.open("controller")).createContext("data");
         const uniqueId = Time.nowMs().toString();
-        newControllerStorage.set("uniqueid", uniqueId);
+        await newControllerStorage.set("uniqueid", uniqueId);
 
         const newNodeStorage = await storageService.open(uniqueId);
 
         const credentialsStorage = newNodeStorage.createContext("credentials");
-        credentialsStorage.set("rootCertId", rootCertId);
-        credentialsStorage.set(
+        await credentialsStorage.set("rootCertId", rootCertId);
+        await credentialsStorage.set(
             "nextCertificateId",
             legacyStorage.get(["0", "RootCertificateManager"], "nextCertificateId"),
         );
-        credentialsStorage.set("rootCertBytes", legacyStorage.get(["0", "RootCertificateManager"], "rootCertBytes"));
-        credentialsStorage.set(
+        await credentialsStorage.set(
+            "rootCertBytes",
+            legacyStorage.get(["0", "RootCertificateManager"], "rootCertBytes"),
+        );
+        await credentialsStorage.set(
             "rootKeyIdentifier",
             legacyStorage.get(["0", "RootCertificateManager"], "rootKeyIdentifier"),
         );
-        credentialsStorage.set("rootKeyPair", legacyStorage.get(["0", "RootCertificateManager"], "rootKeyPair"));
-        credentialsStorage.set("fabric", legacyStorage.get(["0", "MatterController"], "fabric"));
+        await credentialsStorage.set("rootKeyPair", legacyStorage.get(["0", "RootCertificateManager"], "rootKeyPair"));
+        await credentialsStorage.set("fabric", legacyStorage.get(["0", "MatterController"], "fabric"));
 
         const sessionsStorage = newNodeStorage.createContext("sessions");
-        sessionsStorage.set("resumptionRecords", legacyStorage.get([nodeId, "SessionManager"], "resumptionRecords"));
+        await sessionsStorage.set(
+            "resumptionRecords",
+            legacyStorage.get([nodeId, "SessionManager"], "resumptionRecords"),
+        );
 
         const nodesStorage = newNodeStorage.createContext("nodes");
-        nodesStorage.set("resumptionRecords", legacyStorage.get([nodeId, "MatterController"], "commissionedNodes"));
+        await nodesStorage.set(
+            "resumptionRecords",
+            legacyStorage.get([nodeId, "MatterController"], "commissionedNodes"),
+        );
 
         console.log(`Controller Node ${nodeId} with new unique id ${uniqueId} migrated successfully.`);
     } else {
@@ -130,14 +139,17 @@ for (const nodeId of legacyNodes) {
         }
 
         const eventsStorage = newNodeStorage.createContext("events");
-        eventsStorage.set("lastEventNumber", legacyStorage.get([nodeId, "EventHandler"], "lastEventNumber"));
+        await eventsStorage.set("lastEventNumber", legacyStorage.get([nodeId, "EventHandler"], "lastEventNumber"));
 
         const fabricsStorage = newNodeStorage.createContext("fabrics");
-        fabricsStorage.set("fabrics", legacyStorage.get([nodeId, "FabricManager"], "fabrics"));
-        fabricsStorage.set("nextFabricIndex", legacyStorage.get([nodeId, "FabricManager"], "nextFabricIndex"));
+        await fabricsStorage.set("fabrics", legacyStorage.get([nodeId, "FabricManager"], "fabrics"));
+        await fabricsStorage.set("nextFabricIndex", legacyStorage.get([nodeId, "FabricManager"], "nextFabricIndex"));
 
         const sessionsStorage = newNodeStorage.createContext("sessions");
-        sessionsStorage.set("resumptionRecords", legacyStorage.get([nodeId, "SessionManager"], "resumptionRecords"));
+        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,