not-node 6.3.72 → 6.3.74

package/index.js

@@ -1,8 +1,12 @@
 /**
  * @module not-node
  */
-
+/** Environment variables */
 module.exports.Env = require("./src/env.js");
+/** getter/setter shortcuts */
+module.exports.getEnv = module.exports.Env.get;
+module.exports.setEnv = module.exports.Env.set;
+
 /** Error module
  * @type {not-node/Error}
  */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.3.72",
+	"version": "6.3.74",
 	"description": "node complimentary part for client side notFramework.",
 	"main": "index.js",
 	"scripts": {

package/src/cluster/cluster.redis.js

@@ -49,7 +49,7 @@ module.exports = class notClusterRedisProvider {
             if (this.#clientGetter) {
                 return this.#clientGetter();
             } else {
-                return notEnv.getEnv(this.#clientName);
+                return notEnv.get(this.#clientName);
             }
         } catch (e) {
             error(e);

package/src/domain.js

@@ -466,7 +466,7 @@ class notDomain extends EventEmitter {
     }
 
     getEnv(key) {
-        return Env.getEnv(key);
+        return Env.get(key);
     }
 
     /**
@@ -476,7 +476,7 @@ class notDomain extends EventEmitter {
      *  @return {notDomain}      chainable
      */
     static setEnv(key, val) {
-        Env.setEnv(key, val);
+        Env.set(key, val);
         return this;
     }
 

package/src/env.js

@@ -6,11 +6,24 @@ const ENVS = {
 
 module.exports = class notEnv {
     /**
-     *  Returns application environment variable
+     * Obsolete!
+     * Wrapper for 'get'
+     * @static
      *  @param   {string}      key  name of var
      *  @return {object|undefined}    value or undefined
      */
     static getEnv(key) {
+        console.error("Obsolete: use Env.get instead!");
+        return this.get(key);
+    }
+
+    /**
+     *  Returns application environment variable
+     * @static
+     *  @param   {string}      key  name of var
+     *  @return {object|undefined}    value or undefined
+     */
+    static get(key) {
         if (objHas(ENVS, key)) {
             return ENVS[key];
         } else {
@@ -19,12 +32,26 @@ module.exports = class notEnv {
     }
 
     /**
-     *  Setting application environment variable
+     * Obsolete!
+     * Wrapper for 'set'
+     * @static
      *  @param   {string}      key  name of var
      *  @param   {object}      val  value
      *  @return     {notEnv}      chainable
      */
     static setEnv(key, val) {
+        console.error("Obsolete: use Env.set instead!");
+        return this.set(key, val);
+    }
+
+    /**
+     *  Setting application environment variable
+     * @static
+     *  @param   {string}      key  name of var
+     *  @param   {object}      val  value
+     *  @return     {notEnv}      chainable
+     */
+    static set(key, val) {
         ENVS[key] = val;
         return notEnv;
     }

package/src/init/index.js

@@ -76,11 +76,11 @@ class Init {
     }
 
     static setEnv(key, val) {
-        Env.setEnv(key, val);
+        Env.set(key, val);
     }
 
     static getEnv(key) {
-        return Env.getEnv(key);
+        return Env.get(key);
     }
 
     static getApp() {

package/src/init/lib/db/index.js

@@ -28,7 +28,8 @@ module.exports = class InitDB {
      *  [db_driver_name_1]: options,
      *  [db_driver_name_2]: options,
      * }
-     * to get driver require('not-node').getEnv(db_driver_name_2)
+     * to get driver
+     * require('not-node').getEnv(db_driver_name_2)
      * require('not-node').getEnv('mongoose')
      * require('not-node').getEnv('redis')
      **/

package/src/init/lib/env.js

@@ -1,5 +1,6 @@
 const log = require("not-log")(module, "not-node//init//env");
 const { tryDirAsync } = require("../../common");
+const notEnv = require("../../env");
 const {
     DEFAULT_PATH_WS,
     DEFAULT_PATH_MODULES,
@@ -9,6 +10,34 @@ const {
 } = require("../../const");
 
 module.exports = class InitENV {
+    static CONFIG_SET = [
+        {
+            from: "path:static",
+            to: "staticPath",
+            def: DEFAULT_PATH_STATIC,
+        },
+        {
+            from: "path:modules",
+            to: "modulesPath",
+            def: DEFAULT_PATH_MODULES,
+        },
+        {
+            from: "path:tmp",
+            to: "tmpPath",
+            def: DEFAULT_PATH_TMP,
+        },
+        {
+            from: "path:dbDumps",
+            to: "dbDumpsPath",
+            def: DEFAULT_PATH_DB_DUMPS,
+        },
+        {
+            from: "path:ws",
+            to: "wsPath",
+            def: DEFAULT_PATH_WS,
+        },
+    ];
+
     static getProxyPort(config) {
         return parseInt(config.get("proxy:port") || config.get("port"));
     }
@@ -41,46 +70,56 @@ module.exports = class InitENV {
         }
     }
 
+    static addToEnv(key, val) {
+        notEnv.set(key, val);
+        return val;
+    }
+
+    static setObsoleteAndNew({ config, master, from, to, def }) {
+        config.set(
+            to,
+            InitENV.addToEnv(to, master.getAbsolutePath(config.get(from, def))),
+            `obsolete: use notEnv.get('${to}') instead`
+        );
+    }
+
+    static initFromTemplate({ config, master }) {
+        InitENV.CONFIG_SET.forEach((item) => {
+            InitENV.setObsoleteAndNew({
+                config,
+                master,
+                ...item,
+            });
+        });
+    }
+
     async run({ config, options, master, emit }) {
         log?.info("Setting up server environment variables...");
         await emit("env.pre", { config, options, master });
+
+        InitENV.initFromTemplate({ config, master });
+
         config.set(
-            "staticPath",
-            master.getAbsolutePath(
-                config.get("path:static", DEFAULT_PATH_STATIC)
-            )
-        );
-        config.set(
-            "modulesPath",
-            master.getAbsolutePath(
-                config.get("path:modules", DEFAULT_PATH_MODULES)
-            )
+            "appPath",
+            InitENV.addToEnv("appPath", options.pathToApp),
+            "obsolete: use notEnv.get('appPath')"
         );
 
         config.set(
-            "tmpPath",
-            master.getAbsolutePath(config.get("path:tmp", DEFAULT_PATH_TMP))
+            "npmPath",
+            InitENV.addToEnv("npmPath", options.pathToNPM),
+            "obsolete: use notEnv.get('npmPath')"
         );
 
         config.set(
-            "dbDumpsPath",
-            master.getAbsolutePath(
-                config.get("path:dbDumps", DEFAULT_PATH_DB_DUMPS)
-            )
+            "fullServerName",
+            InitENV.addToEnv(
+                "fullServerName",
+                InitENV.getFullServerName(config)
+            ),
+            "obsolete: use notEnv.get('fullServerName')"
         );
-        config.set("appPath", options.pathToApp);
-        config.set("npmPath", options.pathToNPM);
-        config.set("fullServerName", InitENV.getFullServerName(config));
-        if (config.get("path:ws")) {
-            log?.log(
-                "wsPath",
-                master.getAbsolutePath(config.get("path:ws", DEFAULT_PATH_WS))
-            );
-            config.set(
-                "wsPath",
-                master.getAbsolutePath(config.get("path:ws", DEFAULT_PATH_WS))
-            );
-        }
+
         await InitENV.checkPaths(master, config);
         await emit("env.post", { config, options, master });
     }

package/src/init/lib/rateLimiter.js

@@ -71,7 +71,7 @@ module.exports = class InitRateLimiter {
     }
 
     static getClient(storeClient) {
-        return notEnv.getEnv(`db.${storeClient}`);
+        return notEnv.get(`db.${storeClient}`);
     }
 
     static initCustom(

package/src/init/lib/routes.js

@@ -2,7 +2,11 @@
 
 const serveStatic = require("serve-static");
 const log = require("not-log")(module, "not-node//init//routes");
-const { notError, notValidationError, notRequestError } = require("not-error");
+const {
+    notError,
+    notValidationError,
+    notRequestError,
+} = require("not-error/src/index.cjs");
 
 module.exports = class InitRoutes {
     static finalError({ master }) {
@@ -57,7 +61,7 @@ module.exports = class InitRoutes {
         };
     }
 
-    async run({ master, config, options }) {
+    async run({ master, options }) {
         log?.info("Setting up routes...");
         //pages rendering
         await master.getApp().execInModules("registerPagesRoutes", master);
@@ -65,7 +69,7 @@ module.exports = class InitRoutes {
         master.getApp().expose(master.getServer());
         //user defined pages
         require(options.routesPath)(master.getServer(), master.getApp());
-        master.getServer().use(serveStatic(config.get("staticPath")));
+        master.getServer().use(serveStatic(master.getEnv("staticPath")));
         master.getServer().use(options.indexRoute);
         master.getServer().use(
             InitRoutes.finalError({

package/src/model/buildValidator.js

@@ -11,7 +11,7 @@ function extractValidationEnvGetter(options) {
     ) {
         return options.validationEnv;
     } else {
-        const globalValidationEnvGetter = notEnv.getEnv("validationEnv");
+        const globalValidationEnvGetter = notEnv.get("validationEnv");
         if (globalValidationEnvGetter && isFunc(globalValidationEnvGetter)) {
             return globalValidationEnvGetter;
         } else {

package/test/init/routes.js

@@ -182,16 +182,14 @@ module.exports = ({ expect }) => {
                     getServer() {
                         return fakeServer;
                     },
+                    getEnv(str) {
+                        return str + "__fake";
+                    },
                     getApp() {
                         return fakeApp;
                     },
                 };
-                const config = {
-                    get(str) {
-                        return str + "__fake";
-                    },
-                };
-                await new InitRoutes().run({ master, config, options });
+                await new InitRoutes().run({ master, options });
             });
         });
     });