not-node 6.1.4 → 6.1.5

package/playground/{app → site/app}/front/index.user.js

@@ -1,4 +1,6 @@
 
+    window.NOT_NODE_ERROR_URL_BROWSER = 'https://appmon.ru/api/key/collect';
+    
     
     import {
       Frame
@@ -42,7 +44,7 @@
     
     
     import * as mod_0
-    from '/var/server/nn/playground/node_modules/not-options/src/controllers/common';
+    from '/var/server/nn/playground/site/node_modules/not-options/src/controllers/common';
     appDefaultOptions = notCommon.absorbModule({
       defaultConf: appDefaultOptions,
       mod: mod_0,
@@ -50,7 +52,7 @@
     });
     
     import * as mod_1
-    from '/var/server/nn/playground/node_modules/not-filter/src/controllers/common';
+    from '/var/server/nn/playground/site/node_modules/not-filter/src/controllers/common';
     appDefaultOptions = notCommon.absorbModule({
       defaultConf: appDefaultOptions,
       mod: mod_1,
@@ -58,7 +60,7 @@
     });
     
     import * as mod_2
-    from '/var/server/nn/playground/node_modules/not-notification/src/controllers/user';
+    from '/var/server/nn/playground/site/node_modules/not-notification/src/controllers/user';
     appDefaultOptions = notCommon.absorbModule({
       defaultConf: appDefaultOptions,
       mod: mod_2,
@@ -66,7 +68,7 @@
     });
     
     import * as mod_3
-    from '/var/server/nn/playground/node_modules/not-locale/src/controllers/common';
+    from '/var/server/nn/playground/site/node_modules/not-locale/src/controllers/common';
     appDefaultOptions = notCommon.absorbModule({
       defaultConf: appDefaultOptions,
       mod: mod_3,
@@ -74,7 +76,7 @@
     });
     
     import * as mod_4
-    from '/var/server/nn/playground/node_modules/not-key/src/controllers/common';
+    from '/var/server/nn/playground/site/node_modules/not-key/src/controllers/common';
     appDefaultOptions = notCommon.absorbModule({
       defaultConf: appDefaultOptions,
       mod: mod_4,
@@ -82,7 +84,7 @@
     });
     
     import * as mod_5
-    from '/var/server/nn/playground/node_modules/not-ws/src/controllers/common';
+    from '/var/server/nn/playground/site/node_modules/not-ws/src/controllers/common';
     appDefaultOptions = notCommon.absorbModule({
       defaultConf: appDefaultOptions,
       mod: mod_5,
@@ -90,7 +92,7 @@
     });
     
     import * as mod_6
-    from '/var/server/nn/playground/node_modules/not-store/src/controllers/common';
+    from '/var/server/nn/playground/site/node_modules/not-store/src/controllers/common';
     appDefaultOptions = notCommon.absorbModule({
       defaultConf: appDefaultOptions,
       mod: mod_6,
@@ -98,7 +100,7 @@
     });
     
     import * as mod_7
-    from '/var/server/nn/playground/node_modules/not-dbdump/src/controllers/common';
+    from '/var/server/nn/playground/site/node_modules/not-dbdump/src/controllers/common';
     appDefaultOptions = notCommon.absorbModule({
       defaultConf: appDefaultOptions,
       mod: mod_7,
@@ -106,7 +108,7 @@
     });
     
     import * as mod_8
-    from '/var/server/nn/playground/node_modules/not-user/src/controllers/user';
+    from '/var/server/nn/playground/site/node_modules/not-user/src/controllers/user';
     appDefaultOptions = notCommon.absorbModule({
       defaultConf: appDefaultOptions,
       mod: mod_8,
@@ -114,7 +116,7 @@
     });
     
     import * as mod_9
-    from '/var/server/nn/playground/node_modules/not-user/src/controllers/common';
+    from '/var/server/nn/playground/site/node_modules/not-user/src/controllers/common';
     appDefaultOptions = notCommon.absorbModule({
       defaultConf: appDefaultOptions,
       mod: mod_9,
@@ -122,7 +124,7 @@
     });
     
     import * as mod_10
-    from '/var/server/nn/playground/node_modules/not-error/src/controllers/common';
+    from '/var/server/nn/playground/site/node_modules/not-error/src/controllers/common';
     appDefaultOptions = notCommon.absorbModule({
       defaultConf: appDefaultOptions,
       mod: mod_10,
@@ -130,7 +132,7 @@
     });
     
     import * as mod_11
-    from '/var/server/nn/playground/app/front/src/common';
+    from '/var/server/nn/playground/site/app/front/src/common';
     appDefaultOptions = notCommon.absorbModule({
       defaultConf: appDefaultOptions,
       mod: mod_11,
@@ -138,7 +140,7 @@
     });
     
     import * as mod_12
-    from '/var/server/nn/playground/app/front/src/user/main';
+    from '/var/server/nn/playground/site/app/front/src/user/main';
     appDefaultOptions = notCommon.absorbModule({
       defaultConf: appDefaultOptions,
       mod: mod_12,
@@ -151,7 +153,7 @@
     import 'bulma';
     
     
-    import '/var/server/nn/playground/node_modules/not-user/src/styles/common/common.scss';
+    import '/var/server/nn/playground/site/node_modules/not-user/src/styles/common/common.scss';
         
     
     appDefaultOptions.services = services;

package/playground/{app → site/app}/front/rollup.admin.js

@@ -11,9 +11,9 @@ import json from "@rollup/plugin-json";
 import { babelOn } from "./build.env.js";
 
 export default {
-    input: "/var/server/nn/playground/app/front/index.admin.js",
+    input: "/var/server/nn/playground/site/app/front/index.admin.js",
     output: {
-        file: "/var/server/nn/playground/app/front/build/admin.js",
+        file: "/var/server/nn/playground/site/app/front/build/admin.js",
         name: "notNodeApplication",
         format: "iife",
         sourcemap:

package/playground/{app/front/rollup.root.js → site/app/front/rollup.client.js}

@@ -11,9 +11,9 @@ import json from "@rollup/plugin-json";
 import { babelOn } from "./build.env.js";
 
 export default {
-    input: "/var/server/nn/playground/app/front/index.root.js",
+    input: "/var/server/nn/playground/site/app/front/index.client.js",
     output: {
-        file: "/var/server/nn/playground/app/front/build/root.js",
+        file: "/var/server/nn/playground/site/app/front/build/client.js",
         name: "notNodeApplication",
         format: "iife",
         sourcemap:

package/playground/{app → site/app}/front/rollup.guest.js

@@ -11,9 +11,9 @@ import json from "@rollup/plugin-json";
 import { babelOn } from "./build.env.js";
 
 export default {
-    input: "/var/server/nn/playground/app/front/index.guest.js",
+    input: "/var/server/nn/playground/site/app/front/index.guest.js",
     output: {
-        file: "/var/server/nn/playground/app/front/build/guest.js",
+        file: "/var/server/nn/playground/site/app/front/build/guest.js",
         name: "notNodeApplication",
         format: "iife",
         sourcemap:

package/playground/{app/front/rollup.client.js → site/app/front/rollup.root.js}

@@ -11,9 +11,9 @@ import json from "@rollup/plugin-json";
 import { babelOn } from "./build.env.js";
 
 export default {
-    input: "/var/server/nn/playground/app/front/index.client.js",
+    input: "/var/server/nn/playground/site/app/front/index.root.js",
     output: {
-        file: "/var/server/nn/playground/app/front/build/client.js",
+        file: "/var/server/nn/playground/site/app/front/build/root.js",
         name: "notNodeApplication",
         format: "iife",
         sourcemap:

package/playground/{app → site/app}/front/rollup.user.js

@@ -11,9 +11,9 @@ import json from "@rollup/plugin-json";
 import { babelOn } from "./build.env.js";
 
 export default {
-    input: "/var/server/nn/playground/app/front/index.user.js",
+    input: "/var/server/nn/playground/site/app/front/index.user.js",
     output: {
-        file: "/var/server/nn/playground/app/front/build/user.js",
+        file: "/var/server/nn/playground/site/app/front/build/user.js",
         name: "notNodeApplication",
         format: "iife",
         sourcemap:

package/playground/{app → site/app}/front/src/common/index.js

@@ -19,7 +19,7 @@ let manifest = {
         //options for ws client here
         main: {
           host: '' || window.location.hostname,
-          port: 3030,
+          port: 3001,
           path: 'websocket',
           secure: true,
           ssl: false

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

@@ -0,0 +1,126 @@
+{
+  "port": 3000,
+  "host": "localhost",
+  "cors": [
+    ""
+  ],
+  "template": {
+    "engine": "pug",
+    "views": "views",
+    "partialsDir": "partials",
+    "partials": {}
+  },
+  "db": {
+    "mongoose": {
+      "uri": "mongodb://localhost/reporter?authSource=reporter",
+      "options": {
+        "useNewUrlParser": true,
+        "useUnifiedTopology": true,
+        "db": "reporter",
+        "host": "localhost",
+        "user": "reporter",
+        "pass": "developer",
+        "autoIndex": false
+      }
+    },
+    "redis": {},
+    "ioredis": {
+      "enableOfflineQueue": false
+    }
+  },
+  "session": {
+    "driver": "redis",
+    "secret": "liIP3qDKWpbBqfaX9s7uVLklLKuMeZi4tEFvJY1B",
+    "cookie": {
+      "maxAge": 2628000000
+    },
+    "key": "SessionID"
+  },
+  "path": {
+    "static": "../static",
+    "app": "/client",
+    "dbDumps": "../../../db.dumps",
+    "front": "../front/build",
+    "ws": "./ws"
+  },
+  "defaultUserRole": "user",
+  "modules": {
+    "ws": {
+      "servers": {
+        "main": {
+          "connection": {
+            "port": 3001,
+            "secure": true,
+            "secret": "A9PDMCNecv7bz0CrpDA5Key8YjkzYPvNPEq88clq"
+          }
+        }
+      }
+    },
+    "user": {
+      "errors": {
+        "noUserData": false,
+        "noUserWithId": false
+      },
+      "debug": {
+        "loaded": false
+      },
+      "tokenTTL": 3600,
+      "secret": "A9PDMCNecv7bz0CrpDA5Key8YjkzYPvNPEq88clq",
+      "roles": {
+        "primary": [
+          "root",
+          "admin",
+          "client",
+          "user",
+          "guest"
+        ],
+        "secondary": [
+          "confirmed",
+          "manager"
+        ]
+      },
+      "restrict": {
+        "registration": false
+      }
+    },
+    "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/site/app/server/config/development.json

@@ -0,0 +1,33 @@
+{
+  "hostname": "localhost",
+  "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/playground/{app → site/app}/server/config/production.json

@@ -1,5 +1,5 @@
 {
-    "hostname":"localhost",
+    "hostname":"not-node-application",
     "CSP": {
       "connect": [
         "'self'",

package/playground/{app → site/app}/server/config/stage.json

@@ -1,5 +1,5 @@
 {
-    "hostname":"localhost",
+    "hostname":"stage.not-node-application",
     "CSP": {
       "connect": [
         "'self'",

package/src/cli/const.mjs

@@ -69,3 +69,12 @@ export { DEFAULT_MODULES_SET_ENABLED };
 
 const DEFAULT_NODE_API_URL = "https://appmon.ru/api/key/collect";
 export { DEFAULT_NODE_API_URL };
+
+function getDefaultPortByShift(port, shift) {
+    if (port && !isNaN(parseInt(port))) {
+        return parseInt(port) + shift;
+    }
+    return false;
+}
+
+export { getDefaultPortByShift };

package/src/cli/readers/debugPort.mjs

@@ -0,0 +1,16 @@
+import { getDefaultPortByShift } from "../const.mjs";
+
+export default (inquirer, config) => {
+    return inquirer
+        .prompt([
+            {
+                type: "input",
+                name: "debugPort",
+                message: "Debug port number for development env",
+                default: getDefaultPortByShift(config.port, 2),
+            },
+        ])
+        .then(({ debugPort }) => {
+            return debugPort;
+        });
+};

package/src/cli/readers/deploy.mjs

@@ -0,0 +1,80 @@
+import os from "node:os";
+const envs = ["development", "stage", "production"];
+
+let cache = {
+    user: os.userInfo().username,
+    path: "/var/server",
+};
+
+function collectData(inquirer, env, config) {
+    return inquirer
+        .prompt([
+            {
+                type: "input",
+                name: "user",
+                message: `${env}: SSH user`,
+                default: cache.user || "",
+            },
+            {
+                type: "input",
+                name: "hostname",
+                message: `${env}: server address`,
+                default: config.hostname[env],
+            },
+            {
+                type: "input",
+                name: "path",
+                message: `${env}: path on remote server`,
+                default: cache.path || "",
+            },
+        ])
+        .then((answer) => {
+            cache = { ...answer };
+            return answer;
+        });
+}
+
+function collectThisEnv(inquirer, env) {
+    return inquirer
+        .prompt([
+            {
+                type: "confirm",
+                name: "enabled",
+                message: `Create deploy script for '${env}'?`,
+                default: ["stage", "production"].includes(env),
+            },
+        ])
+        .then(({ enabled }) => enabled);
+}
+
+async function collectForAllEnvs(inquirer, config) {
+    let result = {};
+    cache.path = `/var/server/${config.appName}`;
+    for (let env of envs) {
+        if (await collectThisEnv(inquirer, env)) {
+            result[env] = await collectData(inquirer, env, config);
+        } else {
+            result[env] = false;
+        }
+    }
+    return result;
+}
+
+export default (inquirer, config) => {
+    return inquirer
+        .prompt([
+            {
+                type: "confirm",
+                name: "enabled",
+                message: "Create deploy scripts?",
+                default: true,
+            },
+        ])
+        .then((answer) => {
+            if (answer.enabled) {
+                return collectForAllEnvs(inquirer, config);
+            } else {
+                return false;
+            }
+        });
+};

package/src/cli/readers/hostname.mjs

@@ -1,23 +1,22 @@
-const DEFAULT_HOST = "localhost";
-export default (inquirer) => {
+export default (inquirer, config) => {
     return inquirer.prompt([
         {
             type: "input",
             name: "development",
             message: "Hostname (dev)",
-            default: DEFAULT_HOST,
+            default: `${config.appName}.local`,
         },
         {
             type: "input",
             name: "stage",
             message: "Hostname (stage)",
-            default: DEFAULT_HOST,
+            default: `stage.${config.appName}`,
         },
         {
             type: "input",
             name: "production",
             message: "Hostname (production)",
-            default: DEFAULT_HOST,
+            default: `${config.appName}`,
         },
     ]);
 };

package/src/cli/readers/index.mjs

@@ -16,6 +16,15 @@ export { cors };
 import db from "./db.mjs";
 export { db };
 
+import deploy from "./deploy.mjs";
+export { deploy };
+
+import debugPort from "./debugPort.mjs";
+export { debugPort };
+
+import pm2 from "./pm2.mjs";
+export { pm2 };
+
 import filter from "./filter.mjs";
 export { filter };
 
@@ -46,6 +55,9 @@ export { ModelName };
 import modules from "./modules.mjs";
 export { modules };
 
+import nginx from "./nginx.mjs";
+export { nginx };
+
 import not_node_monitor from "./not_node_monitor.mjs";
 export { not_node_monitor };