not-node 6.3.71 → 6.3.73

package/package.json

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

package/src/const.js

@@ -0,0 +1,13 @@
+const DEFAULT_PATH_TMP = "../../tmp";
+const DEFAULT_PATH_STATIC = "../static";
+const DEFAULT_PATH_MODULES = "./modules";
+const DEFAULT_PATH_WS = "./ws";
+const DEFAULT_PATH_DB_DUMPS = "../../db.dumps";
+
+module.exports = {
+    DEFAULT_PATH_WS,
+    DEFAULT_PATH_MODULES,
+    DEFAULT_PATH_STATIC,
+    DEFAULT_PATH_TMP,
+    DEFAULT_PATH_DB_DUMPS,
+};

package/src/init/lib/env.js

@@ -1,7 +1,43 @@
 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,
+    DEFAULT_PATH_STATIC,
+    DEFAULT_PATH_TMP,
+    DEFAULT_PATH_DB_DUMPS,
+} = 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"));
     }
@@ -34,30 +70,56 @@ module.exports = class InitENV {
         }
     }
 
+    static addToEnv(key, val) {
+        notEnv.setEnv(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.getEnv('${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") || "static")
+            "appPath",
+            InitENV.addToEnv("appPath", options.pathToApp),
+            "obsolete: use notEnv.getEnv('appPath')"
         );
+
         config.set(
-            "modulesPath",
-            master.getAbsolutePath(config.get("path:modules") || "modules")
+            "npmPath",
+            InitENV.addToEnv("npmPath", options.pathToNPM),
+            "obsolete: use notEnv.getEnv('npmPath')"
         );
+
         config.set(
-            "dbDumpsPath",
-            master.getAbsolutePath(
-                config.get("path:dbDumps") || "../../db.dumps"
-            )
+            "fullServerName",
+            InitENV.addToEnv(
+                "fullServerName",
+                InitENV.getFullServerName(config)
+            ),
+            "obsolete: use notEnv.getEnv('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")));
-            config.set("wsPath", master.getAbsolutePath(config.get("path:ws")));
-        }
+
         await InitENV.checkPaths(master, config);
         await emit("env.post", { config, options, master });
     }