not-node 6.0.7 → 6.1.0

package/src/init/index.js

@@ -98,6 +98,7 @@ class Init {
         } else {
             Init.config = config;
         }
+        Init.setEnv("config", config);
     }
 
     static getConfig() {

package/src/init/lib/app.js

@@ -5,6 +5,8 @@ const logger = require("not-log");
 const log = logger(module, "not-node//init//app");
 const { notErrorReporter } = require("not-error");
 
+const CONST_CORE_PATH = path.join(__dirname, "../../core");
+
 module.exports = class InitApp {
     static AppConstructor = notAppConstructor;
     static ReporterConstructor = notErrorReporter;
@@ -35,7 +37,7 @@ module.exports = class InitApp {
 
     static async initCore({ config, options, master, emit }) {
         await emit("app.initCore.pre", { config, options, master });
-        master.getApp().importModuleFrom(path.join(__dirname, "../../core"));
+        master.getApp().importModuleFrom(CONST_CORE_PATH);
         await emit("app.initCore.post", { config, options, master });
     }
 
@@ -44,12 +46,8 @@ module.exports = class InitApp {
         master.getApp().importModulesFrom(config.get("modulesPath"));
         if (Array.isArray(config.get("importModulesFromNPM"))) {
             config.get("importModulesFromNPM").forEach((modName) => {
-                master
-                    .getApp()
-                    .importModuleFrom(
-                        path.join(config.get("npmPath"), modName),
-                        modName
-                    );
+                const modPath = path.join(config.get("npmPath"), modName);
+                master.getApp().importModuleFrom(modPath, modName);
             });
         }
         await emit("app.importModules.post", { config, options, master });

package/src/init/lib/modules.js

@@ -1,5 +1,6 @@
 module.exports = class InitModules {
     async run({ master }) {
-        master.getApp().execInModules("initialize");
+        master.getApp().execInModules("initialize", master);
+        master.getApp().execInModules("registerPagesRoutes", master);
     }
 };

package/src/init/lib/routes.js

@@ -61,6 +61,7 @@ module.exports = class InitRoutes {
         log.info("Setting up routes...");
         master.getApp().expose(master.getServer());
         require(options.routesPath)(master.getServer(), master.getApp());
+
         master.getServer().use(serveStatic(config.get("staticPath")));
         master.getServer().use(options.indexRoute);
         master.getServer().use(

package/src/manifest/module.js

@@ -6,7 +6,7 @@ const fs = require("fs"),
     notManifest = require("./manifest.js"),
     notModuleRegistrator = require("./registrator"),
     notModuleInitializator = require("./initializator"),
-    { objHas, mapBind, isAsync, isFunc } = require("../common");
+    { objHas, mapBind, executeObjectFunction } = require("../common");
 
 /**
  * Standart splitter of module resources paths
@@ -180,31 +180,17 @@ class notModule {
         this.manifest = new notManifest(expressApp, this.notApp, moduleName);
     }
 
-    async exec(methodName) {
+    async exec(methodName, params) {
         if (!this.module) {
             log.error(
                 `Cant exec ${methodName} in module ${this.path}, module not loaded`
             );
             return false;
         }
-        if (
-            objHas(this.module, methodName) &&
-            isFunc(this.module[methodName])
-        ) {
-            try {
-                if (isAsync(this.module[methodName])) {
-                    await this.module[methodName](this.notApp);
-                } else {
-                    this.module[methodName](this.notApp);
-                }
-                return true;
-            } catch (e) {
-                log.error(e);
-                return false;
-            }
-        } else {
-            return false;
-        }
+        await executeObjectFunction(this.module, methodName, [
+            this.notApp,
+            params,
+        ]);
     }
 
     getStatus() {

package/src/metas.js

@@ -0,0 +1,34 @@
+const Auth = require("./auth"),
+    Env = require("./env"),
+    notStyler = require("./styler"),
+    config = require("not-config").createReader();
+
+function getRole(req) {
+    if (Auth.isUser(req) && req.user) {
+        return req.user.getPrimaryRole(Env.getEnv("rolesPriority"));
+    } else {
+        return Auth.DEFAULT_USER_ROLE_FOR_GUEST;
+    }
+}
+
+const DEFAULT_STYLER = (req, res) => {
+    const role = getRole(req);
+    const host = config.get("fullServerName");
+    const canonical = host + req.originalUrl;
+
+    return {
+        title: res?.options?.APP_TITLE,
+        desription: res?.options?.APP_DESCRIPTION,
+        canonical,
+        rand: Math.random(),
+        host,
+        role,
+        authenticated: role !== Auth.DEFAULT_USER_ROLE_FOR_GUEST,
+    };
+};
+
+class notMetasStyler extends notStyler {}
+
+notMetasStyler.setDefault(DEFAULT_STYLER);
+
+module.exports = notMetasStyler;

package/src/styler.js

@@ -0,0 +1,38 @@
+const DEFAULT_STYLER = () => {
+    return {};
+};
+
+module.exports = class notStyler {
+    static #stylers = {};
+    static #defaultStyler = DEFAULT_STYLER;
+
+    static get(stylerName) {
+        if (
+            typeof stylerName !== "undefined" &&
+            Object.hasOwn(this.#stylers, stylerName)
+        ) {
+            return this.#stylers[stylerName];
+        } else {
+            return this.#defaultStyler;
+        }
+    }
+
+    static set(stylerName, func) {
+        if (typeof stylerName === "string") {
+            this.#stylers[stylerName] = func;
+        } else {
+            throw new Error("Styler name should be a string");
+        }
+        return this;
+    }
+
+    static setDefault(func) {
+        this.#defaultStyler = func;
+        return this;
+    }
+
+    static resetDefault() {
+        this.#defaultStyler = DEFAULT_STYLER;
+        return this;
+    }
+};

package/tmpl/dirs/app.mjs

@@ -0,0 +1,32 @@
+export default {
+    app: {
+        content: {
+            front: {
+                content: "front",
+            },
+            server: {
+                content: "server",
+            },
+            static: {
+                content: "static",
+            },
+        },
+    },
+    bin: {
+        content: {
+            "build.sh": "app/build.sh",
+        },
+    },
+    "project.manifest.json": {
+        tmpl: "app/project.manifest.ejs",
+        args: ["AppName", "roles", "modules"],
+    },
+    "package.json": {
+        tmpl: "app/package.ejs",
+        args: ["AppName", "appName", "AppDescription"],
+    },
+    ".babelrc": "app/.babelrc",
+    ".eslintignore": "app/.eslintignore",
+    ".eslintrc.json": "app/.eslintrc.json",
+    ".gitignore": "app/.gitignore",
+};

package/tmpl/dirs/front.mjs

@@ -0,0 +1,12 @@
+export default {
+    build: {},
+    src: {},
+    "index.!.js": {
+        tmpl: "app/front/index.!.ejs",
+        args: ["not_node_reporter"],
+    },
+    "rollup.!.js": {
+        tmpl: "app/front/rollup.!.ejs",
+        args: [],
+    },
+};

package/tmpl/dirs/module.front.mjs

@@ -0,0 +1,19 @@
+export default {
+    common: {
+        content: {
+            "index.js": {
+                tmpl: "module.front/common/index.ejs",
+                args: ["modules", "AppName"],
+            },
+            "ncInit.js": {
+                tmpl: "module.front/common/ncInit.ejs",
+                args: ["modules", "AppName"],
+            },
+            "ws.client.main.js": {
+                tmpl: "module.front/common/ws.client.main.ejs",
+                ifModules: ["not-ws"],
+                args: ["modules", "AppName"],
+            },
+        },
+    },
+};

package/tmpl/dirs/module.server.controllers.common.mjs

@@ -0,0 +1,7 @@
+export default {
+    "ws.client.js": {
+        tmpl: "module.server/layers/controllers/common/ws.client.ejs",
+        ifModules: ["not-ws"],
+        args: [],
+    },
+};

package/tmpl/dirs/module.server.mjs

@@ -0,0 +1,14 @@
+export default {
+    "index.js": {
+        tmpl: "module.server/index.ejs",
+        args: ["moduleLayers"],
+    },
+    src: {
+        content: {
+            "const.js": {
+                tmpl: "module.server/const.ejs",
+                args: ["ModuleName"],
+            },
+        },
+    },
+};

package/tmpl/dirs/server.mjs

@@ -0,0 +1,127 @@
+const EMPTY_CONFIG = "app/config/other.ejs";
+export default {
+    config: {
+        content: {
+            "common.json": {
+                tmpl: "app/config/common.ejs",
+                args: [
+                    "hostname",
+                    "port",
+                    "cors",
+                    "ssl",
+                    "secret",
+                    "session",
+                    "db",
+                    "modules",
+                    "filter",
+                    "roles",
+                    "rolesSecondary",
+                    "user",
+                    "ws",
+                ],
+            },
+            "development.json": {
+                tmpl: EMPTY_CONFIG,
+                args: ["hostname"],
+                options: {
+                    ENV: "development",
+                },
+            },
+            "stage.json": {
+                tmpl: EMPTY_CONFIG,
+                args: ["hostname"],
+                options: {
+                    ENV: "stage",
+                },
+            },
+            "production.json": {
+                tmpl: EMPTY_CONFIG,
+                args: ["hostname"],
+                options: {
+                    ENV: "production",
+                },
+            },
+        },
+    },
+    modules: {},
+    routes: {
+        content: {
+            "index.js": {
+                tmpl: "app/routes/index.ejs",
+                args: ["AppName", "AppDescription", "modules", "roles"],
+            },
+            "site.js": {
+                tmpl: "app/routes/site.ejs",
+                args: ["AppName", "AppDescription", "modules", "roles"],
+            },
+        },
+    },
+    views: {
+        content: {
+            admin: {
+                content: {
+                    "foot.pug": {
+                        tmpl: "app/views/admin/foot.ejs",
+                    },
+                    "head.pug": {
+                        tmpl: "app/views/admin/head.ejs",
+                    },
+                    "menu.pug": {
+                        tmpl: "app/views/admin/menu.ejs",
+                    },
+                },
+            },
+            parts: {
+                content: {
+                    "overview.pug": {
+                        tmpl: "app/views/parts/overview.ejs",
+                    },
+                    "menu.pug": {
+                        tmpl: "app/views/parts/menu.ejs",
+                    },
+                    "header.pug": {
+                        tmpl: "app/views/parts/header.ejs",
+                    },
+                    "header.ios.pug": {
+                        tmpl: "app/views/parts/header.ios.ejs",
+                    },
+                    "header.android.pug": {
+                        tmpl: "app/views/parts/header.android.ejs",
+                    },
+                },
+            },
+            "admin.pug": {
+                tmpl: "app/views/admin.ejs",
+            },
+            "dashboard.pug": {
+                tmpl: "app/views/dashboard.ejs",
+            },
+            "index.pug": {
+                tmpl: "app/views/index.ejs",
+                args: ["hostname"],
+                options: {
+                    ENV: "production",
+                },
+            },
+        },
+    },
+    ws: {
+        content: {
+            "auth.js": {
+                tmpl: "app/ws/auth.ejs",
+            },
+            "index.js": {
+                tmpl: "app/ws/index.ejs",
+            },
+        },
+        ifModules: ["not-ws"],
+    },
+    "app.js": {
+        tmpl: "app/app.ejs",
+        args: [],
+    },
+    "index.js": {
+        tmpl: "app/index.ejs",
+        args: [],
+    },
+};

package/tmpl/dirs/static.mjs

@@ -0,0 +1,9 @@
+export default {
+    assets: {},
+    img: {
+        content: {
+            icons: {},
+        },
+    },
+    webfonts: {},
+};

package/tmpl/files/app/.babelrc

@@ -0,0 +1,11 @@
+{
+    "presets": ["@babel/preset-env"],
+    "plugins": [
+        [
+            "@babel/plugin-proposal-class-properties",
+            {
+                "loose": true
+            }
+        ]
+    ]
+}

package/tmpl/files/app/.eslintignore

@@ -0,0 +1,4 @@
+node_modules/**
+coverage/**
+app/static/**
+app/server/views/**

package/tmpl/files/app/.eslintrc.json

@@ -0,0 +1,23 @@
+{
+    "parserOptions": {
+        "ecmaVersion": 10,
+        "sourceType": "module"
+    },
+    "env": {
+        "browser": true,
+        "es6": true,
+        "node": true,
+        "mongo": true,
+        "mocha": true
+    },
+    "globals": {
+        "ENV": true
+    },
+    "extends": "eslint:recommended",
+    "rules": {
+        "indent": "error",
+        "linebreak-style": ["error", "unix"],
+        "semi": ["error", "always"],
+        "no-useless-escape": [0]
+    }
+}

package/tmpl/files/app/app.ejs

@@ -0,0 +1,22 @@
+const notNode = require("not-node");
+
+const Init = require("not-node").Init,
+    path = require("path"),
+    manifest = require("./../../project.manifest.json");
+
+module.exports = () => {
+    const options = {
+        pathToApp: path.join(__dirname),
+        pathToNPM: path.join(__dirname, "../../node_modules"),
+        routesPath: path.join(__dirname, "./routes"),
+        indexRoute: require("./routes/site.js").index,
+    };
+
+    const additional = {
+        pre({ initSequence }) {
+            initSequence.remove("InitMonitoring");
+        },
+    };
+
+    Init.run({ options, manifest, additional });
+};

package/tmpl/files/app/build.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+echo 'building for' $ENV 'environment'
+rm -rf ./app/front/build/${TARGET_ROLE}.min.js
+rm -rf ./app/front/build/${TARGET_ROLE}.js
+rm -rf ./app/front/build/${TARGET_ROLE}.css
+NODE_ENV=$ENV ./node_modules/.bin/eslint ./src/controllers
+NODE_ENV=$ENV ./node_modules/.bin/rollup -c ./rollup/${TARGET_ROLE}.js --environment ENV:$ENV
+NODE_ENV=$ENV ./node_modules/.bin/terser --compress --mangle -- build/${TARGET_ROLE}.js > ./build/${TARGET_ROLE}.min.js

package/tmpl/files/app/config/common.ejs

@@ -0,0 +1,131 @@
+{
+    "port": <%- port %>,    
+    "host": "<%- hostname.development %>",
+    "cors": [<%- cors.map(entry => `"${entry}"`).join(',') %>],
+    "template": {
+      "engine": "pug",
+      "views": "views",
+      "partialsDir": "partials",
+      "partials": {}
+    },
+    <% if (db) { %>
+    "db": {
+        <% if (db.mongoose) {%>
+      "mongoose": {
+        "uri": "mongodb://<%- db.mongoose.hostname %>/<%- db.mongoose.db %>?authSource=<%- db.mongoose.authSource %>",
+        "options": {
+          "useNewUrlParser": true,
+          "useUnifiedTopology": true,
+          "db": "<%- db.mongoose.db %>",
+          "host": "<%- db.mongoose.hostname %>",
+          "user": "<%- db.mongoose.user %>",
+          "pass": "<%- db.mongoose.pass %>",
+          "autoIndex": false
+        }
+      },
+      <% } %>
+      <% if (db.redis) { %>
+      "redis": {},
+      <% } %>
+      <% if (db.ioredis) { %>
+      "ioredis": {
+        "enableOfflineQueue": false
+      }
+      <% } %>
+    },
+    <% } %>    
+    <% if (session){ %>
+    "session": {
+      "driver": "<%- session.driver %>",
+      "secret": "<%- session.secret %>",
+      "cookie": {
+        "maxAge": <%- session.ttl %>
+      },
+      "key": "<%- session.key %>"
+    },
+    <% } %>
+    <% if (ssl) { %>
+    "ssl": {
+      "enabled": true,
+      "keys": {
+        "private": "<%- ssl.private %>",
+        "fullchain": "<%- ssl.fullchain %>",
+        "chain": "<%- ssl.chain %>"
+      }
+    },
+    <% } %>
+    "path": {
+      "static": "../static",
+      "app": "/client",
+      "dbDumps": "../../../db.dumps",
+      "front": "../front/build",      
+      "ws": "./ws"
+    },
+    "defaultUserRole": "user",    
+    "modules": {
+        <% if (modules.includes('not-ws') && ws) { %>
+      "ws": {
+        "servers": {
+          "main": {
+            "connection": {
+              "port": <%- ws.port %>,
+              "secure": <%= ws.secure %>,
+              "secret": "<%- secret %>"
+            }
+          }
+        }
+      },
+      <% } %>
+      <% if (modules.includes('not-user') && user){ %>
+      "user": {        
+        "errors":{
+          "noUserData": false,
+          "noUserWithId": false
+        },
+        "debug":{
+          "loaded": false
+        },
+        "tokenTTL": <%= user.tokenTTL %>,
+        "secret": "<%- secret %>",
+        "roles": {
+          "primary": [<%- roles.map(entry => `"${entry}"`).join(",") %>],
+          "secondary": [<%- rolesSecondary.map(entry => `"${entry}"`).join(",") %>]
+        },
+        "restrict": {
+          "registration": <%= user?.restrict?.registration ?? false %>
+        }
+      },
+      <% } %>      
+      <% if (modules.includes('not-filter') && filter){ %>
+      "filter": {
+        "size": <%= filter?.size ?? 15 %>,
+        "default": {
+          "filter": {},
+          "sorter": {
+              "_id": 1
+            },
+          "pager": {
+            "size": <%= filter?.pager?.size ?? 15 %>,
+            "skip": 0,
+            "page": 0
+          },
+          "search": ""
+        }
+      },     
+      <% } %> 
+      <% if (modules.includes('not-filter')){ %>
+      "rateLimiter": {
+        "keyPrefix": "rateLimiterMiddleware",
+        "points": 500,
+        "duration": 1
+      }
+      <% } %>      
+    },
+    "middleware": {
+        <%- modules.map(entry => `"${entry}": {}`).join(',') %>            
+    },
+    "importModulesFromNPM": [
+    <%- modules.map(entry => `"${entry}"`).join(',') %>    
+    ]
+  }
+  

package/tmpl/files/app/config/other.ejs

@@ -0,0 +1,34 @@
+{
+    "hostname":"<%- hostname[__options__.ENV] %>",
+    "CSP": {
+      "connect": [
+        "'self'",
+        "*",
+        "wss:",
+        "https:",
+        "'unsafe-inline'"
+      ],
+      "default": [
+        "'self'",
+        "*",
+        "wss:",
+        "https:",
+        "'unsafe-inline'"
+      ],
+      "img": [
+        "'self'",
+        "data:"
+      ],
+      "script": [
+        "'self'",
+              "'unsafe-eval'",
+              "'unsafe-inline'"
+      ],
+      "style": [
+        "'self'",
+        "'unsafe-inline'",
+        "'unsafe-eval'"
+      ]
+    }
+  }
+  

package/tmpl/files/app/deploy.pm2.ejs

@@ -0,0 +1,23 @@
+{
+	"apps": [{
+		"name": "<%- AppName %>",
+		"script": "./<%- AppDirName %>/app/server/index.js",
+		"node_args": [
+		<% nodeArgs.forEach(function(nodeArg, index){ %>
+			"<%- nodeArg %>"<%- (nodeArgs.length - 1 > index)?',':'' %>
+		<% }); %>
+		],
+		"watch": <%- watch?'true':'false' %>,
+		"ignore_watch": [
+			<% ignoreWatchList.forEach(function(ignorePath, index){ %>
+				"<%- ignorePath %>"<%- (ignoreWatchList.length - 1 > index)?',':'' %>
+			<% }); %>
+		],
+		"exec_mode": "fork",
+		"env": {
+			<% envs.forEach(function(env, index){ %>
+				"<%- env.name %>": "<%- env.value %>"<%- (envs.length - 1 > index)?',':'' %>
+			<% }); %>
+		}
+	}]
+}