not-node 6.3.70 → 6.3.72

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.3.70",
+	"version": "6.3.72",
 	"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/app.js

@@ -24,10 +24,20 @@ module.exports = class InitApp {
         master.setEnv("validationEnv", options.validationEnv);
         master.setEnv("hostname", config.get("hostname"));
         master.setEnv("server", `https://` + config.get("host"));
-        master.setEnv("appPath", config.get("appPath"));
+        master.setEnv(
+            "appPath",
+            master.getAbsolutePath(config.get("path.app"))
+        );
+        master.setEnv(
+            "dbDumpsPath",
+            master.getAbsolutePath(config.get("path.dbDumps"))
+        );
+        master.setEnv(
+            "tmpPath",
+            master.getAbsolutePath(config.get("path.tmp"))
+        );
         master.setEnv("name", master.getManifest().name);
         master.setEnv("fullServerName", config.get("fullServerName"));
-        master.setEnv("dbDumpsPath", config.get("dbDumpsPath"));
         master.setEnv(
             "rolesPriority",
             master.getManifest().targets.server.roles

package/src/init/lib/env.js

@@ -1,5 +1,12 @@
 const log = require("not-log")(module, "not-node//init//env");
 const { tryDirAsync } = require("../../common");
+const {
+    DEFAULT_PATH_WS,
+    DEFAULT_PATH_MODULES,
+    DEFAULT_PATH_STATIC,
+    DEFAULT_PATH_TMP,
+    DEFAULT_PATH_DB_DUMPS,
+} = require("../../const");
 
 module.exports = class InitENV {
     static getProxyPort(config) {
@@ -39,24 +46,40 @@ module.exports = class InitENV {
         await emit("env.pre", { config, options, master });
         config.set(
             "staticPath",
-            master.getAbsolutePath(config.get("path:static") || "static")
+            master.getAbsolutePath(
+                config.get("path:static", DEFAULT_PATH_STATIC)
+            )
         );
         config.set(
             "modulesPath",
-            master.getAbsolutePath(config.get("path:modules") || "modules")
+            master.getAbsolutePath(
+                config.get("path:modules", DEFAULT_PATH_MODULES)
+            )
         );
+
+        config.set(
+            "tmpPath",
+            master.getAbsolutePath(config.get("path:tmp", DEFAULT_PATH_TMP))
+        );
+
         config.set(
             "dbDumpsPath",
             master.getAbsolutePath(
-                config.get("path:dbDumps") || "../../db.dumps"
+                config.get("path:dbDumps", DEFAULT_PATH_DB_DUMPS)
             )
         );
         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")));
+            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/test/init/app.js

@@ -35,6 +35,9 @@ module.exports = ({ expect }) => {
                     getMongoose() {
                         return fakeMongoose;
                     },
+                    getAbsolutePath(val) {
+                        return val;
+                    },
                 };
 
                 await InitApp.createApp({
@@ -81,6 +84,9 @@ module.exports = ({ expect }) => {
                     getMongoose() {
                         return fakeMongoose;
                     },
+                    getAbsolutePath(val) {
+                        return val;
+                    },
                 };
 
                 await InitApp.createApp({
@@ -132,6 +138,9 @@ module.exports = ({ expect }) => {
                         return fakeManifest;
                     },
                     setEnv() {},
+                    getAbsolutePath(val) {
+                        return val;
+                    },
                 };
 
                 await InitApp.setAppEnvs({
@@ -406,6 +415,9 @@ module.exports = ({ expect }) => {
                     getManifest() {
                         return fakeManifest;
                     },
+                    getAbsolutePath(val) {
+                        return val;
+                    },
                 };
                 try {
                     await new InitApp().run({