@matter/nodejs 0.16.6 → 0.16.7

package/dist/cjs/environment/NodeJsEnvironment.d.ts

@@ -63,5 +63,13 @@ export declare function getDefaults(vars: VariableService): {
         exitcode: boolean;
         unhandlederrors: boolean;
     };
+    nodejs: {
+        crypto: boolean;
+        network: boolean;
+        storage: boolean;
+    };
+    storage: {
+        driver: "file" | "sqlite";
+    };
 };
 //# sourceMappingURL=NodeJsEnvironment.d.ts.map

package/dist/cjs/environment/NodeJsEnvironment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NodeJsEnvironment.d.ts","sourceRoot":"","sources":["../../../src/environment/NodeJsEnvironment.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAKH,WAAW,EASX,eAAe,EAClB,MAAM,UAAU,CAAC;AAalB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAgB,iBAAiB,gBAqBhC;AAgID,wBAAgB,cAAc,CAAC,IAAI,EAAE,eAAe;;;EAsBnD;AAoBD,wBAAgB,WAAW,CAAC,IAAI,EAAE,eAAe;;;;;;;;;;;EAiBhD"}
+{"version":3,"file":"NodeJsEnvironment.d.ts","sourceRoot":"","sources":["../../../src/environment/NodeJsEnvironment.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAKH,WAAW,EASX,eAAe,EAClB,MAAM,UAAU,CAAC;AAalB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAgB,iBAAiB,gBAqBhC;AAiID,wBAAgB,cAAc,CAAC,IAAI,EAAE,eAAe;;;EAsBnD;AAoBD,wBAAgB,WAAW,CAAC,IAAI,EAAE,eAAe;;;;;;;;;;;;;;;;;;;EAyBhD"}

package/dist/cjs/environment/NodeJsEnvironment.js

@@ -56,20 +56,20 @@ function NodeJsEnvironment() {
 function loadVariables(env) {
   const vars = env.vars;
   vars.addConfigStyle(getDefaults(vars));
-  if (import_config.config.loadProcessArgv) {
+  if (import_config.config.loadProcessEnv) {
     vars.addUnixEnvStyle(process.env);
   }
-  if (import_config.config.loadProcessEnv) {
+  if (import_config.config.loadProcessArgv) {
     vars.addArgvStyle(process.argv);
   }
   const { configPath, configVars } = loadConfigFile(vars);
   if (import_config.config.loadConfigFile) {
     vars.addConfigStyle(configVars);
   }
-  if (import_config.config.loadProcessArgv) {
+  if (import_config.config.loadProcessEnv) {
     vars.addUnixEnvStyle(process.env);
   }
-  if (import_config.config.loadProcessEnv) {
+  if (import_config.config.loadProcessArgv) {
     vars.addArgvStyle(process.argv);
   }
   vars.persistConfigValue = async (name, value) => {
@@ -85,7 +85,7 @@ function rootDirOf(env) {
 }
 function configureCrypto(env) {
   import_general.Boot.init(() => {
-    if (import_config.config.installCrypto || (env.vars.boolean("nodejs.crypto") ?? true)) {
+    if (env.vars.boolean("nodejs.crypto")) {
       let crypto;
       if (!(0, import_runtimeChecks.isBunjs)()) {
         crypto = new import_NodeJsCrypto.NodeJsCrypto();
@@ -105,21 +105,18 @@ function configureCrypto(env) {
   });
 }
 function configureNetwork(env) {
-  if (!import_config.config.installNetwork || !(env.vars.boolean("nodejs.network") ?? true)) {
-    return;
-  }
   import_general.Boot.init(() => {
-    if (import_config.config.installNetwork || (env.vars.boolean("nodejs.network") ?? true)) {
+    if (env.vars.boolean("nodejs.network")) {
       const basePathForUnixSockets = rootDirOf(env);
       env.set(import_general.Network, new import_NodeJsNetwork.NodeJsNetwork());
       env.set(import_general.HttpEndpointFactory, new import_NodeJsHttpEndpoint.NodeJsHttpEndpoint.Factory(basePathForUnixSockets));
-    } else {
-      if (import_general.Environment.default.has(import_general.Network)) {
-        env.set(import_general.Network, import_general.Environment.default.get(import_general.Network));
-      }
-      if (import_general.Environment.default.has(import_general.HttpEndpointFactory)) {
-        env.set(import_general.HttpEndpointFactory, import_general.Environment.default.get(import_general.HttpEndpointFactory));
-      }
+      return;
+    }
+    if (import_general.Environment.default.has(import_general.Network)) {
+      env.set(import_general.Network, import_general.Environment.default.get(import_general.Network));
+    }
+    if (import_general.Environment.default.has(import_general.HttpEndpointFactory)) {
+      env.set(import_general.HttpEndpointFactory, import_general.Environment.default.get(import_general.HttpEndpointFactory));
     }
   });
 }
@@ -128,27 +125,32 @@ function configureRuntime(env) {
   env.set(import_ProcessManager.ProcessManager, processManager);
 }
 function configureStorage(env) {
-  if (!import_config.config.initializeStorage || !(env.vars.boolean("nodejs.storage") ?? true)) {
-    return;
-  }
-  const service = env.get(import_general.StorageService);
-  env.vars.use(() => {
-    service.location = env.vars.get("storage.path", rootDirOf(env));
+  import_general.Boot.init(() => {
+    if (env.vars.boolean("nodejs.storage")) {
+      const service = env.get(import_general.StorageService);
+      env.vars.use(() => {
+        service.location = env.vars.get("storage.path", rootDirOf(env));
+      });
+      const shouldClear = env.vars.boolean("storage.clear") ?? false;
+      let storageDriver = env.vars.string("storage.driver") ?? "file";
+      if (storageDriver.length === 0) {
+        storageDriver = "file";
+      }
+      service.factory = async (namespace) => {
+        return await import_storage.StorageFactory.create({
+          driver: storageDriver,
+          rootDir: service.location ?? ".",
+          namespace,
+          clear: shouldClear
+        });
+      };
+      service.resolve = (...paths) => (0, import_node_path.resolve)(rootDirOf(env), ...paths);
+      return;
+    }
+    if (import_general.Environment.default.has(import_general.StorageService)) {
+      env.set(import_general.StorageService, import_general.Environment.default.get(import_general.StorageService));
+    }
   });
-  const shouldClear = env.vars.get("storage.clear", false);
-  let storageDriver = import_config.config.storageDriver ?? env.vars.string("storage.driver") ?? "file";
-  if (storageDriver.length === 0) {
-    storageDriver = "file";
-  }
-  service.factory = async (namespace) => {
-    return await import_storage.StorageFactory.create({
-      driver: storageDriver,
-      rootDir: service.location ?? ".",
-      namespace,
-      clear: shouldClear
-    });
-  };
-  service.resolve = (...paths) => (0, import_node_path.resolve)(rootDirOf(env), ...paths);
 }
 function loadConfigFile(vars) {
   const configPath = vars.get("path.config", "config.json");
@@ -198,6 +200,14 @@ function getDefaults(vars) {
       signals: import_config.config.trapProcessSignals,
       exitcode: import_config.config.setProcessExitCodeOnError,
       unhandlederrors: import_config.config.trapUnhandledErrors
+    },
+    nodejs: {
+      crypto: import_config.config.installCrypto,
+      network: import_config.config.installNetwork,
+      storage: import_config.config.initializeStorage
+    },
+    storage: {
+      driver: import_config.config.storageDriver
     }
   };
 }

package/dist/cjs/environment/NodeJsEnvironment.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/environment/NodeJsEnvironment.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/dist/esm/environment/NodeJsEnvironment.d.ts

@@ -63,5 +63,13 @@ export declare function getDefaults(vars: VariableService): {
         exitcode: boolean;
         unhandlederrors: boolean;
     };
+    nodejs: {
+        crypto: boolean;
+        network: boolean;
+        storage: boolean;
+    };
+    storage: {
+        driver: "file" | "sqlite";
+    };
 };
 //# sourceMappingURL=NodeJsEnvironment.d.ts.map

package/dist/esm/environment/NodeJsEnvironment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NodeJsEnvironment.d.ts","sourceRoot":"","sources":["../../../src/environment/NodeJsEnvironment.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAKH,WAAW,EASX,eAAe,EAClB,MAAM,UAAU,CAAC;AAalB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAgB,iBAAiB,gBAqBhC;AAgID,wBAAgB,cAAc,CAAC,IAAI,EAAE,eAAe;;;EAsBnD;AAoBD,wBAAgB,WAAW,CAAC,IAAI,EAAE,eAAe;;;;;;;;;;;EAiBhD"}
+{"version":3,"file":"NodeJsEnvironment.d.ts","sourceRoot":"","sources":["../../../src/environment/NodeJsEnvironment.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAKH,WAAW,EASX,eAAe,EAClB,MAAM,UAAU,CAAC;AAalB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAgB,iBAAiB,gBAqBhC;AAiID,wBAAgB,cAAc,CAAC,IAAI,EAAE,eAAe;;;EAsBnD;AAoBD,wBAAgB,WAAW,CAAC,IAAI,EAAE,eAAe;;;;;;;;;;;;;;;;;;;EAyBhD"}

package/dist/esm/environment/NodeJsEnvironment.js

@@ -45,20 +45,20 @@ function NodeJsEnvironment() {
 function loadVariables(env) {
   const vars = env.vars;
   vars.addConfigStyle(getDefaults(vars));
-  if (config.loadProcessArgv) {
+  if (config.loadProcessEnv) {
     vars.addUnixEnvStyle(process.env);
   }
-  if (config.loadProcessEnv) {
+  if (config.loadProcessArgv) {
     vars.addArgvStyle(process.argv);
   }
   const { configPath, configVars } = loadConfigFile(vars);
   if (config.loadConfigFile) {
     vars.addConfigStyle(configVars);
   }
-  if (config.loadProcessArgv) {
+  if (config.loadProcessEnv) {
     vars.addUnixEnvStyle(process.env);
   }
-  if (config.loadProcessEnv) {
+  if (config.loadProcessArgv) {
     vars.addArgvStyle(process.argv);
   }
   vars.persistConfigValue = async (name, value) => {
@@ -74,7 +74,7 @@ function rootDirOf(env) {
 }
 function configureCrypto(env) {
   Boot.init(() => {
-    if (config.installCrypto || (env.vars.boolean("nodejs.crypto") ?? true)) {
+    if (env.vars.boolean("nodejs.crypto")) {
       let crypto;
       if (!isBunjs()) {
         crypto = new NodeJsCrypto();
@@ -94,21 +94,18 @@ function configureCrypto(env) {
   });
 }
 function configureNetwork(env) {
-  if (!config.installNetwork || !(env.vars.boolean("nodejs.network") ?? true)) {
-    return;
-  }
   Boot.init(() => {
-    if (config.installNetwork || (env.vars.boolean("nodejs.network") ?? true)) {
+    if (env.vars.boolean("nodejs.network")) {
       const basePathForUnixSockets = rootDirOf(env);
       env.set(Network, new NodeJsNetwork());
       env.set(HttpEndpointFactory, new NodeJsHttpEndpoint.Factory(basePathForUnixSockets));
-    } else {
-      if (Environment.default.has(Network)) {
-        env.set(Network, Environment.default.get(Network));
-      }
-      if (Environment.default.has(HttpEndpointFactory)) {
-        env.set(HttpEndpointFactory, Environment.default.get(HttpEndpointFactory));
-      }
+      return;
+    }
+    if (Environment.default.has(Network)) {
+      env.set(Network, Environment.default.get(Network));
+    }
+    if (Environment.default.has(HttpEndpointFactory)) {
+      env.set(HttpEndpointFactory, Environment.default.get(HttpEndpointFactory));
     }
   });
 }
@@ -117,27 +114,32 @@ function configureRuntime(env) {
   env.set(ProcessManager, processManager);
 }
 function configureStorage(env) {
-  if (!config.initializeStorage || !(env.vars.boolean("nodejs.storage") ?? true)) {
-    return;
-  }
-  const service = env.get(StorageService);
-  env.vars.use(() => {
-    service.location = env.vars.get("storage.path", rootDirOf(env));
+  Boot.init(() => {
+    if (env.vars.boolean("nodejs.storage")) {
+      const service = env.get(StorageService);
+      env.vars.use(() => {
+        service.location = env.vars.get("storage.path", rootDirOf(env));
+      });
+      const shouldClear = env.vars.boolean("storage.clear") ?? false;
+      let storageDriver = env.vars.string("storage.driver") ?? "file";
+      if (storageDriver.length === 0) {
+        storageDriver = "file";
+      }
+      service.factory = async (namespace) => {
+        return await StorageFactory.create({
+          driver: storageDriver,
+          rootDir: service.location ?? ".",
+          namespace,
+          clear: shouldClear
+        });
+      };
+      service.resolve = (...paths) => resolve(rootDirOf(env), ...paths);
+      return;
+    }
+    if (Environment.default.has(StorageService)) {
+      env.set(StorageService, Environment.default.get(StorageService));
+    }
   });
-  const shouldClear = env.vars.get("storage.clear", false);
-  let storageDriver = config.storageDriver ?? env.vars.string("storage.driver") ?? "file";
-  if (storageDriver.length === 0) {
-    storageDriver = "file";
-  }
-  service.factory = async (namespace) => {
-    return await StorageFactory.create({
-      driver: storageDriver,
-      rootDir: service.location ?? ".",
-      namespace,
-      clear: shouldClear
-    });
-  };
-  service.resolve = (...paths) => resolve(rootDirOf(env), ...paths);
 }
 function loadConfigFile(vars) {
   const configPath = vars.get("path.config", "config.json");
@@ -187,6 +189,14 @@ function getDefaults(vars) {
       signals: config.trapProcessSignals,
       exitcode: config.setProcessExitCodeOnError,
       unhandlederrors: config.trapUnhandledErrors
+    },
+    nodejs: {
+      crypto: config.installCrypto,
+      network: config.installNetwork,
+      storage: config.initializeStorage
+    },
+    storage: {
+      driver: config.storageDriver
     }
   };
 }

package/dist/esm/environment/NodeJsEnvironment.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/environment/NodeJsEnvironment.ts"],
-  "mappings": "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",
+  "mappings": "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",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@matter/nodejs",
-    "version": "0.16.6",
+    "version": "0.16.7",
     "description": "Node.js platform support for matter.js",
     "keywords": [
         "iot",
@@ -44,17 +44,17 @@
         "#*": "./src/*"
     },
     "dependencies": {
-        "@matter/general": "0.16.6",
-        "@matter/node": "0.16.6",
-        "@matter/protocol": "0.16.6",
-        "@matter/types": "0.16.6"
+        "@matter/general": "0.16.7",
+        "@matter/node": "0.16.7",
+        "@matter/protocol": "0.16.7",
+        "@matter/types": "0.16.7"
     },
     "devDependencies": {
-        "@matter/model": "0.16.6",
-        "@matter/protocol": "0.16.6",
-        "@matter/testing": "0.16.6",
-        "@matter/tools": "0.16.6",
-        "@project-chip/matter.js": "0.16.6",
+        "@matter/model": "0.16.7",
+        "@matter/protocol": "0.16.7",
+        "@matter/testing": "0.16.7",
+        "@matter/tools": "0.16.7",
+        "@project-chip/matter.js": "0.16.7",
         "@types/bytebuffer": "^5.0.49"
     },
     "files": [

package/src/environment/NodeJsEnvironment.ts

@@ -107,10 +107,10 @@ function loadVariables(env: Environment) {
     vars.addConfigStyle(getDefaults(vars));
 
     // Preload environment and argv so we can use it to find config file
-    if (config.loadProcessArgv) {
+    if (config.loadProcessEnv) {
         vars.addUnixEnvStyle(process.env);
     }
-    if (config.loadProcessEnv) {
+    if (config.loadProcessArgv) {
         vars.addArgvStyle(process.argv);
     }
 
@@ -121,10 +121,10 @@ function loadVariables(env: Environment) {
     }
 
     // Reload environment and argv so they override config
-    if (config.loadProcessArgv) {
+    if (config.loadProcessEnv) {
         vars.addUnixEnvStyle(process.env);
     }
-    if (config.loadProcessEnv) {
+    if (config.loadProcessArgv) {
         vars.addArgvStyle(process.argv);
     }
 
@@ -145,7 +145,7 @@ function rootDirOf(env: Environment) {
 
 function configureCrypto(env: Environment) {
     Boot.init(() => {
-        if (config.installCrypto || (env.vars.boolean("nodejs.crypto") ?? true)) {
+        if (env.vars.boolean("nodejs.crypto")) {
             let crypto: Crypto;
             if (!isBunjs()) {
                 // Platform implemented crypto
@@ -169,22 +169,19 @@ function configureCrypto(env: Environment) {
 }
 
 function configureNetwork(env: Environment) {
-    if (!config.installNetwork || !(env.vars.boolean("nodejs.network") ?? true)) {
-        return;
-    }
-
     Boot.init(() => {
-        if (config.installNetwork || (env.vars.boolean("nodejs.network") ?? true)) {
+        if (env.vars.boolean("nodejs.network")) {
             const basePathForUnixSockets = rootDirOf(env);
             env.set(Network, new NodeJsNetwork());
             env.set(HttpEndpointFactory, new NodeJsHttpEndpoint.Factory(basePathForUnixSockets));
-        } else {
-            if (Environment.default.has(Network)) {
-                env.set(Network, Environment.default.get(Network));
-            }
-            if (Environment.default.has(HttpEndpointFactory)) {
-                env.set(HttpEndpointFactory, Environment.default.get(HttpEndpointFactory));
-            }
+            return;
+        }
+        // Extends default Network
+        if (Environment.default.has(Network)) {
+            env.set(Network, Environment.default.get(Network));
+        }
+        if (Environment.default.has(HttpEndpointFactory)) {
+            env.set(HttpEndpointFactory, Environment.default.get(HttpEndpointFactory));
         }
     });
 }
@@ -195,35 +192,39 @@ function configureRuntime(env: Environment) {
 }
 
 function configureStorage(env: Environment) {
-    if (!config.initializeStorage || !(env.vars.boolean("nodejs.storage") ?? true)) {
-        return;
-    }
+    Boot.init(() => {
+        if (env.vars.boolean("nodejs.storage")) {
+            const service = env.get(StorageService);
 
-    const service = env.get(StorageService);
+            env.vars.use(() => {
+                service.location = env.vars.get("storage.path", rootDirOf(env));
+            });
 
-    env.vars.use(() => {
-        service.location = env.vars.get("storage.path", rootDirOf(env));
-    });
+            const shouldClear = env.vars.boolean("storage.clear") ?? false;
+            let storageDriver = env.vars.string("storage.driver") ?? "file";
 
-    const shouldClear = env.vars.get("storage.clear", false);
-    let storageDriver = config.storageDriver ?? env.vars.string("storage.driver") ?? "file";
-
-    // fallback 'file' when storageDriver is blank
-    if (storageDriver.length === 0) {
-        storageDriver = "file";
-    }
+            // fallback 'file' when storageDriver is blank
+            if (storageDriver.length === 0) {
+                storageDriver = "file";
+            }
 
-    // code is moved to StorageFactory
-    service.factory = async namespace => {
-        return await StorageFactory.create({
-            driver: storageDriver,
-            rootDir: service.location ?? ".",
-            namespace,
-            clear: shouldClear,
-        });
-    };
+            service.factory = async namespace => {
+                return await StorageFactory.create({
+                    driver: storageDriver as "file" | "sqlite",
+                    rootDir: service.location ?? ".",
+                    namespace,
+                    clear: shouldClear,
+                });
+            };
 
-    service.resolve = (...paths) => resolve(rootDirOf(env), ...paths);
+            service.resolve = (...paths) => resolve(rootDirOf(env), ...paths);
+            return;
+        }
+        // Extends default Storage
+        if (Environment.default.has(StorageService)) {
+            env.set(StorageService, Environment.default.get(StorageService));
+        }
+    });
 }
 
 export function loadConfigFile(vars: VariableService) {
@@ -284,5 +285,13 @@ export function getDefaults(vars: VariableService) {
             exitcode: config.setProcessExitCodeOnError,
             unhandlederrors: config.trapUnhandledErrors,
         },
+        nodejs: {
+            crypto: config.installCrypto,
+            network: config.installNetwork,
+            storage: config.initializeStorage,
+        },
+        storage: {
+            driver: config.storageDriver,
+        },
     };
 }