not-node 6.1.0 → 6.1.1

package/.env

@@ -0,0 +1,12 @@
+NOT_NODE_ERROR_KEY=2f721c40-30c5-4f35-9e45-cfea1be33f03
+NOT_NODE_ERROR_URL_NODE=https://reporter.local/api/key/collect
+NOT_NODE_ERROR_URL_BROWSER=https://reporter.local/api/key/collect
+INIT_ROOT_USERNAME=root
+INIT_ROOT_EMAIL=admin@appmon.ru
+INIT_ROOT_PASSWORD=tester
+db__mongoose__uri=mongodb://localhost/reporter?authSource=reporter
+db__mongoose__options__user=reporter.production
+db__mongoose__options__pass=production.reporter
+db__mongoose__options__db=reporter
+db__mongoose__options__host=localhost
+db__mongoose__options__authSource=reporter

package/bin/not-cli.mjs

@@ -8,8 +8,9 @@ import { isAbsolute, resolve, join } from "node:path";
 
 import { copyFile, constants, mkdir, writeFile } from "node:fs/promises";
 
-import { cwd } from "node:process";
+import { cwd, stdout, stderr } from "node:process";
 const CWD = cwd();
+import { spawn } from "node:child_process";
 
 import * as url from "url";
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
@@ -330,7 +331,9 @@ program
     .addOption(
         new Option("-d, --dir <dir>").default(CWD, "current working directory")
     )
-    .description("create application in target directory")
+    .description(
+        "create application in target directory (create -d [pathToDir])"
+    )
     .action(async (opts) => {
         //      console.log("create command called :" + opts.dir);
         if (!isAbsolute(opts.dir)) {
@@ -364,6 +367,19 @@ program
         if (await Readers.isUserNeedFrontModuleBootstrap(inquirer)) {
             await createBootstrapFrontModule(PATH_MODULES_FRONT, AppConfig);
         }
+        console.log(`cd '${opts.dir}' && npm i`);
+        let npmInstall = spawn(`npm`, ["i"], { cwd: opts.dir });
+        npmInstall.stdout.on("data", (data) => {
+            console.log(data.toString());
+        });
+
+        npmInstall.stderr.on("data", (data) => {
+            console.error(data.toString());
+        });
+
+        npmInstall.on("exit", (code) => {
+            console.log(`NPM install exited with code ${code}`);
+        });
     });
 
 program.parse();

package/package.json

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

package/playground/app/front/build.env.js

@@ -0,0 +1,15 @@
+
+let replaceSets = {
+	development: {},
+	production: {},
+	stage: {},
+};
+
+let babelOn = () => {
+	return ['production', 'stage', 'development'].indexOf(process.env.NODE_ENV) > -1;
+};
+
+export {
+	babelOn,
+	replaceSets
+};

package/playground/app/server/config/common.json

@@ -1,53 +1,99 @@
 {
-    "port": 3000,    
-    "host": "https://localhost",
-    "cors": [""],
-    "template": {
-      "engine": "pug",
-      "views": "views",
-      "partialsDir": "partials",
-      "partials": {}
-    },
-    
-    "db": {
-        
-      
-      "redis": {},
-      
-      
-      "ioredis": {
-        "enableOfflineQueue": false
+  "port": 3000,
+  "host": "https://localhost",
+  "cors": [
+    ""
+  ],
+  "template": {
+    "engine": "pug",
+    "views": "views",
+    "partialsDir": "partials",
+    "partials": {}
+  },
+  "db": {
+    "mongoose": {
+      "uri": "mongodb:///test?authSource=admin",
+      "options": {
+        "useNewUrlParser": true,
+        "useUnifiedTopology": true,
+        "db": "test",
+        "host": "",
+        "user": "tester",
+        "pass": "test",
+        "autoIndex": false
       }
-      
     },
-        
-    
-    
-    "path": {
-      "static": "../static",
-      "app": "/client",
-      "dbDumps": "../../../db.dumps",
-      "front": "../front/build",      
-      "ws": "./ws"
+    "redis": {},
+    "ioredis": {
+      "enableOfflineQueue": false
+    }
+  },
+  "session": {
+    "driver": "redis",
+    "secret": "NG1ARzt2kIFQ82GbldZACMYE12xBiuRnPObMqeba",
+    "cookie": {
+      "maxAge": 2628000000
     },
-    "defaultUserRole": "user",    
-    "modules": {
-        
-            
-       
-      
-      "rateLimiter": {
-        "keyPrefix": "rateLimiterMiddleware",
-        "points": 500,
-        "duration": 1
+    "key": "SessionID"
+  },
+  "path": {
+    "static": "../static",
+    "app": "/client",
+    "dbDumps": "../../../db.dumps",
+    "front": "../front/build",
+    "ws": "./ws"
+  },
+  "defaultUserRole": "user",
+  "modules": {
+    "ws": {
+      "servers": {
+        "main": {
+          "connection": {
+            "port": 303,
+            "secure": true,
+            "secret": "Nqh6DCD9lZ0Px575JmBJuimO1giVlPgBbjEHhHmE"
+          }
+        }
       }
-            
-    },
-    "middleware": {
-        "not-options": {},"not-filter": {},"not-inform": {},"not-inform-rule-tag": {},"not-inform-sink-email": {},"not-inform-sink-ws": {},"not-key": {},"not-ws": {},"not-store": {},"not-dbdump": {},"not-user": {},"not-error": {}            
     },
-    "importModulesFromNPM": [
-    "not-options","not-filter","not-inform","not-inform-rule-tag","not-inform-sink-email","not-inform-sink-ws","not-key","not-ws","not-store","not-dbdump","not-user","not-error"    
-    ]
-  }
-  
+    "rateLimiter": {
+      "keyPrefix": "rateLimiterMiddleware",
+      "points": 500,
+      "duration": 1
+    }
+  },
+  "middleware": {
+    "not-options": {},
+    "not-filter": {},
+    "not-notification": {},
+    "not-locale": {},
+    "not-inform": {},
+    "not-inform-rule-tag": {},
+    "not-inform-sink-email": {},
+    "not-inform-sink-notification": {},
+    "not-inform-sink-ws": {},
+    "not-key": {},
+    "not-ws": {},
+    "not-store": {},
+    "not-dbdump": {},
+    "not-user": {},
+    "not-error": {}
+  },
+  "importModulesFromNPM": [
+    "not-options",
+    "not-filter",
+    "not-notification",
+    "not-locale",
+    "not-inform",
+    "not-inform-rule-tag",
+    "not-inform-sink-email",
+    "not-inform-sink-notification",
+    "not-inform-sink-ws",
+    "not-key",
+    "not-ws",
+    "not-store",
+    "not-dbdump",
+    "not-user",
+    "not-error"
+  ]
+}

package/playground/package.json

@@ -2,12 +2,13 @@
     "name": "not-node-application",
 	"version": "0.0.1",
 	"description": "notNodeApplication",
-	"main": "app.js",
+	"main": "app/server/index.js",
 	"private": true,
 	"engines": {
 		"node": ">14.9"
 	  },
 	"scripts": {
+		"start":"node ./app/server/index.js",
 		"test": "./node_modules/.bin/mocha --reporter spec ./tests/**.js",
 		"lint": "./node_modules/.bin/eslint ./app/**/**.js ./app/server/**/**/**.js ./app/server/**/**/**/**.js ./app/server/**/**/**/**/**.js --fix",
 		"docs": "./node_modules/.bin/jsdoc -c jsdoc.json",
@@ -29,7 +30,25 @@
 	},
 	"dependencies": {
         "redis": "*",
-		"not-node": "*"
+		"pug":"*",
+		"not-node": "*",		
+		"not-options":"*",
+		"not-filter":"*",
+		"not-notification":"*",
+		"not-locale":"*",
+		"not-inform":"*",
+		"not-inform-rule-tag":"*",
+		"not-inform-sink-email":"*",
+		"not-inform-sink-notification":"*",
+		"not-inform-sink-ws":"*",
+		"not-key":"*",
+		"not-ws":"*",
+		"not-store":"*",
+		"not-dbdump":"*",
+		"not-user":"*",
+		"not-error":"*",
+		
+		"dotenv": "*"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.18.9",

package/playground/project.manifest.json

@@ -16,9 +16,12 @@
 				"npm": {
                     "not-options": {},
                     "not-filter": {},
+                    "not-notification": {},
+                    "not-locale": {},
                     "not-inform": {},
                     "not-inform-rule-tag": {},
                     "not-inform-sink-email": {},
+                    "not-inform-sink-notification": {},
                     "not-inform-sink-ws": {},
                     "not-key": {},
                     "not-ws": {},

package/src/cli/readers/db/mongoose.mjs

@@ -1,8 +1,9 @@
 const DEFAULT = {
     db: "test",
     host: "localhost",
-    user: "",
-    pass: "",
+    user: "tester",
+    pass: "test",
+    authSource: "admin",
 };
 
 function collectData(inquirer) {
@@ -36,24 +37,43 @@ function collectData(inquirer) {
             type: "input",
             name: "authSource",
             message: "MongoDB authSource",
-            default: "admin",
+            default: DEFAULT.authSource,
         },
     ]);
 }
 
+function needToConfigure(inquirer) {
+    return inquirer
+        .prompt([
+            {
+                type: "confirm",
+                name: "configure",
+                message: "Configure mongoose connection?",
+                default: false,
+            },
+        ])
+        .then((answer) => {
+            if (answer.configure) {
+                return collectData(inquirer);
+            } else {
+                return DEFAULT;
+            }
+        });
+}
+
 export default (inquirer) => {
     return inquirer
         .prompt([
             {
                 type: "confirm",
                 name: "enabled",
-                message: "Configure mongoose?",
+                message: "Add mongoose connection?",
                 default: false,
             },
         ])
         .then((answer) => {
             if (answer.enabled) {
-                return collectData(inquirer);
+                return needToConfigure(inquirer);
             } else {
                 return false;
             }

package/src/cli/readers/session.mjs

@@ -5,6 +5,13 @@ const DEFAULT_SECRET = generator.generate({
     numbers: true,
 });
 
+const DEFAULT_SESSION_OPTIONS = {
+    driver: "redis",
+    secret: DEFAULT_SECRET,
+    ttl: 2628000000,
+    key: "SessionID",
+};
+
 function collectData(inquirer) {
     return inquirer.prompt([
         {
@@ -41,7 +48,7 @@ export default (inquirer) => {
             {
                 type: "confirm",
                 name: "enabled",
-                message: "Configure Session module?",
+                message: "Change default configuration of sessions module?",
                 default: false,
             },
         ])
@@ -49,7 +56,7 @@ export default (inquirer) => {
             if (answer.enabled) {
                 return collectData(inquirer);
             } else {
-                return false;
+                return DEFAULT_SESSION_OPTIONS;
             }
         });
 };

package/src/common.js

@@ -156,9 +156,23 @@ module.exports.executeFunctionAsAsync = executeFunctionAsAsync;
  **/
 module.exports.executeObjectFunction = async (obj, name, params) => {
     if (obj) {
-        const proc =
-            typeof obj == "object" ? notPath.get(":" + name, obj) : obj[name];
-        return await executeFunctionAsAsync(proc, params);
+        if (name.indexOf(".") > -1) {
+            const proc =
+                typeof obj == "object"
+                    ? notPath.get(":" + name, obj)
+                    : obj[name];
+            if (proc) {
+                return await executeFunctionAsAsync(proc.bind(obj), params);
+            }
+        } else {
+            if (obj[name] && isFunc(obj[name])) {
+                if (isAsync(obj[name])) {
+                    return await obj[name](...params);
+                } else {
+                    return obj[name](...params);
+                }
+            }
+        }
     }
 };
 

package/src/domain.js

@@ -277,7 +277,7 @@ class notDomain extends EventEmitter {
     async execInModules(methodName, params) {
         for (let mod of Object.values(this.#modules)) {
             try {
-                await executeObjectFunction(mod, "exec", [params]);
+                await executeObjectFunction(mod, "exec", [methodName, params]);
             } catch (e) {
                 this.report(e);
             }

package/src/headers.js

@@ -10,8 +10,6 @@ const DEFAULT_STYLER = (req, res) => {
     res.set("Cache-Control", "max-age=31536000");
 };
 
-class notHeadersStyler extends notStyler {}
-
-notHeadersStyler.setDefault(DEFAULT_STYLER);
+let notHeadersStyler = new notStyler(DEFAULT_STYLER);
 
 module.exports = notHeadersStyler;

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

@@ -12,6 +12,7 @@ module.exports = class InitDBMongoose {
         const Increment = require("../../../model/increment.js");
         log.info("Setting up mongoose connection...");
         const mongoose = require("mongoose");
+        mongoose.set("strictQuery", true);
         mongoose.Promise = global.Promise;
         await mongoose.connect(
             conf.uri,

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

@@ -1,3 +1,5 @@
+const log = require("not-log")(module, "not-node//init//sessions");
+
 module.exports = class InitSessions {
     /**
      * Returns constructor of Session driver
@@ -18,7 +20,17 @@ module.exports = class InitSessions {
 
     async run({ master, config, options, emit }) {
         const conf = config.get("session");
-        const Constructor = InitSessions.getConstructor(conf);
-        await new Constructor().run({ master, config, options, conf, emit });
+        if (conf) {
+            const Constructor = InitSessions.getConstructor(conf);
+            await new Constructor().run({
+                master,
+                config,
+                options,
+                conf,
+                emit,
+            });
+        } else {
+            log("no session options");
+        }
     }
 };

package/src/metas.js

@@ -27,8 +27,6 @@ const DEFAULT_STYLER = (req, res) => {
     };
 };
 
-class notMetasStyler extends notStyler {}
-
-notMetasStyler.setDefault(DEFAULT_STYLER);
+const notMetasStyler = new notStyler(DEFAULT_STYLER);
 
 module.exports = notMetasStyler;

package/src/styler.js

@@ -3,10 +3,14 @@ const DEFAULT_STYLER = () => {
 };
 
 module.exports = class notStyler {
-    static #stylers = {};
-    static #defaultStyler = DEFAULT_STYLER;
+    #stylers = {};
+    #defaultStyler = DEFAULT_STYLER;
 
-    static get(stylerName) {
+    constructor(defaultStyler = DEFAULT_STYLER) {
+        this.setDefault(defaultStyler);
+    }
+
+    get(stylerName) {
         if (
             typeof stylerName !== "undefined" &&
             Object.hasOwn(this.#stylers, stylerName)
@@ -17,7 +21,7 @@ module.exports = class notStyler {
         }
     }
 
-    static set(stylerName, func) {
+    set(stylerName, func) {
         if (typeof stylerName === "string") {
             this.#stylers[stylerName] = func;
         } else {
@@ -26,12 +30,12 @@ module.exports = class notStyler {
         return this;
     }
 
-    static setDefault(func) {
+    setDefault(func) {
         this.#defaultStyler = func;
         return this;
     }
 
-    static resetDefault() {
+    resetDefault() {
         this.#defaultStyler = DEFAULT_STYLER;
         return this;
     }

package/tmpl/dirs/app.mjs

@@ -23,7 +23,7 @@ export default {
     },
     "package.json": {
         tmpl: "app/package.ejs",
-        args: ["AppName", "appName", "AppDescription"],
+        args: ["AppName", "appName", "AppDescription", "modules"],
     },
     ".babelrc": "app/.babelrc",
     ".eslintignore": "app/.eslintignore",

package/tmpl/dirs/front.mjs

@@ -9,4 +9,8 @@ export default {
         tmpl: "app/front/rollup.!.ejs",
         args: [],
     },
+    "build.env.js": {
+        tmpl: "app/front/build.env.ejs",
+        args: [],
+    },
 };

package/tmpl/files/app/front/build.env.ejs

@@ -1,7 +1,15 @@
+
+let replaceSets = {
+	development: {},
+	production: {},
+	stage: {},
+};
+
 let babelOn = () => {
 	return ['production', 'stage', 'development'].indexOf(process.env.NODE_ENV) > -1;
 };
 
 export {
-	babelOn
+	babelOn,
+	replaceSets
 };

package/tmpl/files/app/package.ejs

@@ -2,12 +2,13 @@
     "name": "<%- appName %>",
 	"version": "0.0.1",
 	"description": "<%- AppDescription %>",
-	"main": "app.js",
+	"main": "app/server/index.js",
 	"private": true,
 	"engines": {
 		"node": ">14.9"
 	  },
 	"scripts": {
+		"start":"node ./app/server/index.js",
 		"test": "./node_modules/.bin/mocha --reporter spec ./tests/**.js",
 		"lint": "./node_modules/.bin/eslint ./app/**/**.js ./app/server/**/**/**.js ./app/server/**/**/**/**.js ./app/server/**/**/**/**/**.js --fix",
 		"docs": "./node_modules/.bin/jsdoc -c jsdoc.json",
@@ -29,7 +30,11 @@
 	},
 	"dependencies": {
         "redis": "*",
-		"not-node": "*"
+		"pug":"*",
+		"not-node": "*",		
+		<% for(let moduleName of modules){ %>"<%- moduleName %>":"*",
+		<% } %>
+		"dotenv": "*"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.18.9",