@matter/nodejs-shell 0.13.1-alpha.0-20250501-80c86b03e → 0.13.1-alpha.0-20250502-43a54f780

package/dist/cjs/MatterNode.js

@@ -33,27 +33,28 @@ var import_node_path = require("node:path");
  */
 const logger = import_general.Logger.get("Node");
 class MatterNode {
+  #storageLocation;
+  #storageContext;
+  #environment;
+  commissioningController;
+  #started = false;
+  #nodeNum;
+  #netInterface;
   constructor(nodeNum, netInterface) {
-    this.nodeNum = nodeNum;
-    this.netInterface = netInterface;
     this.#environment = import_general.Environment.default;
     this.#environment.runtime.add(this);
+    this.#nodeNum = nodeNum;
+    this.#netInterface = netInterface;
   }
-  #storageLocation;
-  storage;
-  storageContext;
-  #environment;
-  commissioningController;
-  started = false;
   get storageLocation() {
     return this.#storageLocation;
   }
   async initialize(resetStorage) {
     if (this.#environment) {
-      if (this.netInterface !== void 0) {
-        this.#environment.vars.set("mdns.networkinterface", this.netInterface);
+      if (this.#netInterface !== void 0) {
+        this.#environment.vars.set("mdns.networkinterface", this.#netInterface);
       }
-      const id = `shell-${this.nodeNum.toString()}`;
+      const id = `shell-${this.#nodeNum.toString()}`;
       this.commissioningController = new import_matter.CommissioningController({
         environment: {
           environment: this.#environment,
@@ -67,7 +68,7 @@ class MatterNode {
       if (resetStorage) {
         await controllerStore.erase();
       }
-      this.storageContext = controllerStore.storage.createContext("Node");
+      this.#storageContext = controllerStore.storage.createContext("Node");
       const storageService = this.#environment.get(import_general.StorageService);
       const baseLocation = storageService.location;
       if (baseLocation !== void 0) {
@@ -81,23 +82,19 @@ class MatterNode {
     }
   }
   get Store() {
-    if (!this.storageContext) {
+    if (!this.#storageContext) {
       throw new Error("Storage uninitialized");
     }
-    return this.storageContext;
+    return this.#storageContext;
   }
   async close() {
     await this.commissioningController?.close();
-    return await this.closeStorage();
-  }
-  async closeStorage() {
-    await this.storage?.close();
   }
   async start() {
-    if (this.started) {
+    if (this.#started) {
       return;
     }
-    logger.info(`matter.js shell controller started for node ${this.nodeNum}`);
+    logger.info(`matter.js shell controller started for node ${this.#nodeNum}`);
     if (this.commissioningController !== void 0) {
       await this.commissioningController.start();
       if (await this.Store.has("ControllerFabricLabel")) {
@@ -108,7 +105,7 @@ class MatterNode {
     } else {
       throw new Error("No controller initialized");
     }
-    this.started = true;
+    this.#started = true;
   }
   async connectAndGetNodes(nodeIdStr, connectOptions) {
     await this.start();

package/dist/cjs/MatterNode.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../src/MatterNode.ts"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAOA,qBAAoE;AACpE,kBAAgC;AAGhC,mBAAuB;AACvB,oBAAwC;AAExC,uBAAqB;AAdrB;AAAA;AAAA;AAAA;AAAA;AAgBA,MAAM,SAAS,sBAAO,IAAI,MAAM;AAEzB,MAAM,WAAW;AAAA,EASpB,YACqB,SACA,cACnB;AAFmB;AACA;AAEjB,SAAK,eAAe,2BAAY;AAChC,SAAK,aAAa,QAAQ,IAAI,IAAI;AAAA,EACtC;AAAA,EAdA;AAAA,EACQ;AAAA,EACA;AAAA,EAER;AAAA,EACA;AAAA,EACQ,UAAU;AAAA,EAUlB,IAAI,kBAAkB;AAClB,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,MAAM,WAAW,cAAuB;AAQpC,QAAI,KAAK,cAAc;AACnB,UAAI,KAAK,iBAAiB,QAAW;AACjC,aAAK,aAAa,KAAK,IAAI,yBAAyB,KAAK,YAAY;AAAA,MACzE;AAEA,YAAM,KAAK,SAAS,KAAK,QAAQ,SAAS,CAAC;AAC3C,WAAK,0BAA0B,IAAI,sCAAwB;AAAA,QACvD,aAAa;AAAA,UACT,aAAa,KAAK;AAAA,UAClB;AAAA,QACJ;AAAA,QACA,aAAa;AAAA,QACb,kBAAkB;AAAA,MACtB,CAAC;AACD,YAAM,KAAK,wBAAwB,0BAA0B;AAE7D,YAAM,kBAAkB,KAAK,aAAa,IAAI,2BAAe;AAC7D,UAAI,cAAc;AACd,cAAM,gBAAgB,MAAM;AAAA,MAChC;AACA,WAAK,iBAAiB,gBAAgB,QAAQ,cAAc,MAAM;AAElE,YAAM,iBAAiB,KAAK,aAAa,IAAI,6BAAc;AAC3D,YAAM,eAAe,eAAe;AACpC,UAAI,iBAAiB,QAAW;AAC5B,aAAK,uBAAmB,uBAAK,cAAc,EAAE;AAAA,MACjD;AAAA,IACJ,OAAO;AACH,cAAQ;AAAA,QACJ;AAAA,MACJ;AACA,cAAQ,KAAK,CAAC;AAAA,IAClB;AAAA,EACJ;AAAA,EAEA,IAAI,QAAQ;AACR,QAAI,CAAC,KAAK,gBAAgB;AACtB,YAAM,IAAI,MAAM,uBAAuB;AAAA,IAC3C;AACA,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,MAAM,QAAQ;AACV,UAAM,KAAK,yBAAyB,MAAM;AAC1C,WAAO,MAAM,KAAK,aAAa;AAAA,EACnC;AAAA,EAEA,MAAM,eAAe;AACjB,UAAM,KAAK,SAAS,MAAM;AAAA,EAC9B;AAAA,EAEA,MAAM,QAAQ;AACV,QAAI,KAAK,SAAS;AACd;AAAA,IACJ;AACA,WAAO,KAAK,+CAA+C,KAAK,OAAO,EAAE;AAEzE,QAAI,KAAK,4BAA4B,QAAW;AAC5C,YAAM,KAAK,wBAAwB,MAAM;AAEzC,UAAI,MAAM,KAAK,MAAM,IAAI,uBAAuB,GAAG;AAC/C,cAAM,KAAK,wBAAwB;AAAA,UAC/B,MAAM,KAAK,MAAM,IAAY,yBAAyB,iBAAiB;AAAA,QAC3E;AAAA,MACJ;AAAA,IACJ,OAAO;AACH,YAAM,IAAI,MAAM,2BAA2B;AAAA,IAC/C;AACA,SAAK,UAAU;AAAA,EACnB;AAAA,EAEA,MAAM,mBAAmB,WAAoB,gBAAqD;AAC9F,UAAM,KAAK,MAAM;AACjB,UAAM,SAAS,cAAc,aAAY,qBAAO,OAAO,SAAS,CAAC,IAAI;AAErE,QAAI,KAAK,4BAA4B,QAAW;AAC5C,YAAM,IAAI,MAAM,yCAAyC;AAAA,IAC7D;AAEA,QAAI,WAAW,QAAW;AACtB,aAAO,MAAM,KAAK,wBAAwB,QAAQ,cAAc;AAAA,IACpE;AAEA,UAAM,OAAO,MAAM,KAAK,wBAAwB,YAAY,QAAQ,cAAc;AAClF,QAAI,CAAC,KAAK,aAAa;AACnB,YAAM,KAAK,OAAO;AAAA,IACtB;AACA,WAAO,CAAC,IAAI;AAAA,EAChB;AAAA,EAEA,IAAI,aAAa;AACb,QAAI,KAAK,4BAA4B,QAAW;AAC5C,YAAM,IAAI,MAAM,sDAAsD;AAAA,IAC1E;AACA,WAAO,KAAK;AAAA,EAChB;AAAA,EAEA,MAAM,mBACF,OACA,UACA,YACF;AACE,eAAW,QAAQ,OAAO;AACtB,UAAI,UAAU,KAAK,WAAW;AAC9B,UAAI,eAAe,QAAW;AAC1B,kBAAU,QAAQ,OAAO,YAAU,OAAO,WAAW,UAAU;AAAA,MACnE;AAEA,iBAAW,UAAU,SAAS;AAC1B,cAAM,SAAS,QAAQ,IAAI;AAAA,MAC/B;AAAA,IACJ;AAAA,EACJ;AAAA,EAEA,kBAAkB,OAAe;AAC7B,WAAO,KAAK,yBAAyB,kBAAkB,KAAK;AAAA,EAChE;AACJ;",
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/nodejs-shell",
-    "version": "0.13.1-alpha.0-20250501-80c86b03e",
+    "version": "0.13.1-alpha.0-20250502-43a54f780",
     "description": "Shell app for Matter controller",
     "keywords": [
         "iot",
@@ -36,11 +36,11 @@
         "#types": "@matter/types"
     },
     "dependencies": {
-        "@matter/general": "0.13.1-alpha.0-20250501-80c86b03e",
-        "@matter/nodejs": "0.13.1-alpha.0-20250501-80c86b03e",
-        "@matter/nodejs-ble": "0.13.1-alpha.0-20250501-80c86b03e",
-        "@matter/tools": "0.13.1-alpha.0-20250501-80c86b03e",
-        "@project-chip/matter.js": "0.13.1-alpha.0-20250501-80c86b03e",
+        "@matter/general": "0.13.1-alpha.0-20250502-43a54f780",
+        "@matter/nodejs": "0.13.1-alpha.0-20250502-43a54f780",
+        "@matter/nodejs-ble": "0.13.1-alpha.0-20250502-43a54f780",
+        "@matter/tools": "0.13.1-alpha.0-20250502-43a54f780",
+        "@project-chip/matter.js": "0.13.1-alpha.0-20250502-43a54f780",
         "yargs": "^17.7.2"
     },
     "engines": {

package/src/MatterNode.ts

@@ -7,7 +7,6 @@
 // Include this first to auto-register Crypto, Network and Time Node.js implementations
 import { Environment, Logger, StorageContext, StorageService } from "@matter/general";
 import { ControllerStore } from "@matter/node";
-import { StorageBackendDisk } from "@matter/nodejs";
 import { EndpointInterface } from "@matter/protocol";
 import { NodeId } from "@matter/types";
 import { CommissioningController } from "@project-chip/matter.js";
@@ -18,19 +17,18 @@ const logger = Logger.get("Node");
 
 export class MatterNode {
     #storageLocation?: string;
-    private storage?: StorageBackendDisk;
-    private storageContext?: StorageContext;
-
-    #environment?: Environment;
+    #storageContext?: StorageContext;
+    readonly #environment?: Environment;
     commissioningController?: CommissioningController;
-    private started = false;
+    #started = false;
+    readonly #nodeNum: number;
+    readonly #netInterface?: string;
 
-    constructor(
-        private readonly nodeNum: number,
-        private readonly netInterface?: string,
-    ) {
+    constructor(nodeNum: number, netInterface?: string) {
         this.#environment = Environment.default;
         this.#environment.runtime.add(this);
+        this.#nodeNum = nodeNum;
+        this.#netInterface = netInterface;
     }
 
     get storageLocation() {
@@ -46,11 +44,11 @@ export class MatterNode {
          */
 
         if (this.#environment) {
-            if (this.netInterface !== undefined) {
-                this.#environment.vars.set("mdns.networkinterface", this.netInterface);
+            if (this.#netInterface !== undefined) {
+                this.#environment.vars.set("mdns.networkinterface", this.#netInterface);
             }
             // Build up the "Not-so-legacy" Controller
-            const id = `shell-${this.nodeNum.toString()}`;
+            const id = `shell-${this.#nodeNum.toString()}`;
             this.commissioningController = new CommissioningController({
                 environment: {
                     environment: this.#environment,
@@ -65,7 +63,7 @@ export class MatterNode {
             if (resetStorage) {
                 await controllerStore.erase();
             }
-            this.storageContext = controllerStore.storage.createContext("Node");
+            this.#storageContext = controllerStore.storage.createContext("Node");
 
             const storageService = this.#environment.get(StorageService);
             const baseLocation = storageService.location;
@@ -81,26 +79,21 @@ export class MatterNode {
     }
 
     get Store() {
-        if (!this.storageContext) {
+        if (!this.#storageContext) {
             throw new Error("Storage uninitialized");
         }
-        return this.storageContext;
+        return this.#storageContext;
     }
 
     async close() {
         await this.commissioningController?.close();
-        return await this.closeStorage();
-    }
-
-    async closeStorage() {
-        await this.storage?.close();
     }
 
     async start() {
-        if (this.started) {
+        if (this.#started) {
             return;
         }
-        logger.info(`matter.js shell controller started for node ${this.nodeNum}`);
+        logger.info(`matter.js shell controller started for node ${this.#nodeNum}`);
 
         if (this.commissioningController !== undefined) {
             await this.commissioningController.start();
@@ -113,7 +106,7 @@ export class MatterNode {
         } else {
             throw new Error("No controller initialized");
         }
-        this.started = true;
+        this.#started = true;
     }
 
     async connectAndGetNodes(nodeIdStr?: string, connectOptions?: CommissioningControllerNodeOptions) {