not-node 6.1.3 → 6.1.5

package/src/cli/readers/init_root_user.mjs

@@ -5,29 +5,30 @@ const DEFAULT_PASSWORD = generator.generate({
     numbers: true,
 });
 
-function collectInitRootUser(inquirer) {
+function collectInitRootUser(inquirer, config) {
     return inquirer.prompt([
         {
             type: "input",
             name: "name",
-            message: "Name",
+            message: "Root username",
             default: "root",
         },
         {
             type: "input",
             name: "email",
-            message: "Email",
+            message: "Root user email",
+            default: `admin@${config.hostname.development}`,
         },
         {
             type: "input",
             name: "password",
-            message: "Password",
+            message: "Root user password",
             default: DEFAULT_PASSWORD,
         },
         {
             type: "input",
             name: "passwordConfirmation",
-            message: "Re-type password",
+            message: "Re-type root password",
             validate(inpt, answer) {
                 return inpt === answer.password;
             },
@@ -35,8 +36,8 @@ function collectInitRootUser(inquirer) {
     ]);
 }
 
-export default (inquirer) => {
-    inquirer
+export default (inquirer, config) => {
+    return inquirer
         .prompt([
             {
                 type: "confirm",
@@ -47,7 +48,7 @@ export default (inquirer) => {
         ])
         .then(({ enabled }) => {
             if (enabled) {
-                return collectInitRootUser(inquirer);
+                return collectInitRootUser(inquirer, config);
             } else {
                 return false;
             }

package/src/cli/readers/nginx.mjs

@@ -0,0 +1,41 @@
+function collectData(inquirer) {
+    return inquirer.prompt([
+        {
+            type: "confirm",
+            name: "http2",
+            message: "Enable HTTP2?",
+            default: true,
+        },
+        {
+            type: "confirm",
+            name: "http3",
+            message: "Enable HTTP3?",
+            default: false,
+        },
+        {
+            type: "confirm",
+            name: "ssl",
+            message: "Enable SSL?",
+            default: true,
+        },
+    ]);
+}
+
+export default (inquirer) => {
+    return inquirer
+        .prompt([
+            {
+                type: "confirm",
+                name: "enabled",
+                message: "Create NGINX configs set?",
+                default: true,
+            },
+        ])
+        .then((answer) => {
+            if (answer.enabled) {
+                return collectData(inquirer);
+            } else {
+                return false;
+            }
+        });
+};

package/src/cli/readers/not_node_monitor.mjs

@@ -1,11 +1,14 @@
 import { DEFAULT_NODE_API_URL } from "../const.mjs";
 
-function collectNodeMonitor(inquirer) {
+function collectNodeMonitor(inquirer, config) {
     return inquirer.prompt([
         {
             type: "input",
             name: "report_key",
             message: "Report API Key",
+            default: config?.not_node_reporter
+                ? config?.not_node_reporter.key
+                : "",
         },
         {
             type: "input",
@@ -28,8 +31,8 @@ function collectNodeMonitor(inquirer) {
     ]);
 }
 
-export default (inquirer) => {
-    inquirer
+export default (inquirer, config) => {
+    return inquirer
         .prompt([
             {
                 type: "confirm",
@@ -40,7 +43,7 @@ export default (inquirer) => {
         ])
         .then(({ enabled }) => {
             if (enabled) {
-                return collectNodeMonitor(inquirer);
+                return collectNodeMonitor(inquirer, config);
             } else {
                 return false;
             }

package/src/cli/readers/not_node_reporter.mjs

@@ -1,11 +1,14 @@
 import { DEFAULT_NODE_API_URL } from "../const.mjs";
 
-function collectNodeReporter(inquirer) {
+function collectNodeReporter(inquirer, config) {
     return inquirer.prompt([
         {
             type: "input",
             name: "key",
             message: "Report API Key",
+            default: config?.not_node_monitor
+                ? config?.not_node_monitor.report_key
+                : "",
         },
         {
             type: "input",
@@ -22,7 +25,7 @@ function collectNodeReporter(inquirer) {
     ]);
 }
 
-export default (inquirer) => {
+export default (inquirer, config) => {
     return inquirer
         .prompt([
             {
@@ -34,7 +37,7 @@ export default (inquirer) => {
         ])
         .then((answer) => {
             if (answer.enabled) {
-                return collectNodeReporter(inquirer);
+                return collectNodeReporter(inquirer, config);
             } else {
                 return false;
             }

package/src/cli/readers/pm2.mjs

@@ -0,0 +1,29 @@
+function collectData(inquirer) {
+    return inquirer.prompt([
+        {
+            type: "confirm",
+            name: "watch",
+            message: "Watch & restart?",
+            default: true,
+        },
+    ]);
+}
+
+export default (inquirer) => {
+    return inquirer
+        .prompt([
+            {
+                type: "confirm",
+                name: "enabled",
+                message: "Create pm2 environment configs set?",
+                default: true,
+            },
+        ])
+        .then((answer) => {
+            if (answer.enabled) {
+                return collectData(inquirer);
+            } else {
+                return false;
+            }
+        });
+};

package/src/cli/readers/ssl.mjs

@@ -24,7 +24,8 @@ export default (inquirer) => {
             {
                 type: "confirm",
                 name: "enabled",
-                message: "SSL",
+                message:
+                    "Node with SSL (no, if you up to reverse proxy setup like nginx)?",
                 default: false,
             },
         ])

package/src/cli/readers/ws.mjs

@@ -1,10 +1,24 @@
-function collectData(inquirer) {
+import { getDefaultPortByShift } from "../const.mjs";
+
+function collectData(inquirer, config) {
     return inquirer.prompt([
+        {
+            type: "input",
+            name: "hostname",
+            message: "WS hostname (default: window.location.hostname)",
+            default: "",
+        },
         {
             type: "input",
             name: "port",
             message: "WS port number",
-            default: 33000,
+            default: getDefaultPortByShift(config.port, 1),
+        },
+        {
+            type: "input",
+            name: "path",
+            message: "WS path ",
+            default: "websocket",
         },
         {
             type: "config",
@@ -15,7 +29,7 @@ function collectData(inquirer) {
     ]);
 }
 
-export default (inquirer) => {
+export default (inquirer, config) => {
     return inquirer
         .prompt([
             {
@@ -27,7 +41,7 @@ export default (inquirer) => {
         ])
         .then((answer) => {
             if (answer.enabled) {
-                return collectData(inquirer);
+                return collectData(inquirer, config);
             } else {
                 return false;
             }

package/src/cli/renderers/controllers.mjs

@@ -20,6 +20,7 @@ export default async (
         );
         await createFileContent(TMPL_FILE_PATH, DEST_FILE_PATH, {
             ...config,
+            roleName,
             ...data,
         });
     }

package/src/cli/renderers/deploy.mjs

@@ -0,0 +1,39 @@
+import { resolve } from "node:path";
+const TEMPLATE_FILE = "./project/deploy.ejs";
+const envs = ["development", "stage", "production"];
+
+export default async (
+    project_layer_dir,
+    data,
+    config,
+    createFileContent,
+    makeScriptExecutable
+) => {
+    for (let environment of envs) {
+        if (config.deploy[environment]) {
+            const DEST_FILE_PATH = resolve(
+                project_layer_dir,
+                "./deploy",
+                `./${environment}.sh`
+            );
+            const args = {
+                ...config,
+                ...data,
+                environment,
+                hostname: config.hostname[environment],
+                deploy: {
+                    ...config.deploy[environment],
+                },
+            };
+            await createFileContent(
+                DEST_FILE_PATH,
+                {
+                    tmpl: TEMPLATE_FILE,
+                    args: ["AppName", "environment", "deploy"],
+                },
+                args
+            );
+            await makeScriptExecutable(DEST_FILE_PATH);
+        }
+    }
+};

package/src/cli/renderers/index.mjs

@@ -27,3 +27,12 @@ export { frontModuleRoleMain };
 
 import frontModuleGuestMain from "./frontModuleGuestMain.mjs";
 export { frontModuleGuestMain };
+
+import pm2 from "./pm2.mjs";
+export { pm2 };
+
+import deploy from "./deploy.mjs";
+export { deploy };
+
+import nginx from "./nginx.mjs";
+export { nginx };

package/src/cli/renderers/nginx.mjs

@@ -0,0 +1,44 @@
+import { resolve } from "node:path";
+const TEMPLATE_FILE = "./project/nginx.ejs";
+const envs = ["development", "stage", "production"];
+
+function getPath(project_layer_dir, config, environment) {
+    if (config.deploy && config.deploy[environment]) {
+        return config.deploy[environment].path;
+    }
+    return project_layer_dir;
+}
+
+export default async (project_layer_dir, data, config, createFileContent) => {
+    for (let environment of envs) {
+        const DEST_FILE_PATH = resolve(
+            project_layer_dir,
+            "./nginx",
+            `./${environment}.conf`
+        );
+        const args = {
+            ...config,
+            ...data,
+            environment,
+            hostname: config.hostname[environment],
+            path: getPath(project_layer_dir, config, environment),
+        };
+        await createFileContent(
+            DEST_FILE_PATH,
+            {
+                tmpl: TEMPLATE_FILE,
+                args: [
+                    "AppName",
+                    "environment",
+                    "nginx",
+                    "ws",
+                    "ssl",
+                    "path",
+                    "hostname",
+                    "port",
+                ],
+            },
+            args
+        );
+    }
+};

package/src/cli/renderers/pm2.mjs

@@ -0,0 +1,42 @@
+import { resolve } from "node:path";
+const TEMPLATE_FILE = "./project/pm2.ejs";
+const envs = ["development", "stage", "production"];
+
+export default async (project_layer_dir, data, config, createFileContent) => {
+    for (let environment of envs) {
+        const DEST_FILE_PATH = resolve(
+            project_layer_dir,
+            "./pm2",
+            `./${environment}.json`
+        );
+        const args = {
+            ...config,
+            ...data,
+            environment,
+            hostname: config.hostname[environment],
+        };
+        await createFileContent(
+            DEST_FILE_PATH,
+            {
+                tmpl: TEMPLATE_FILE,
+                args: [
+                    "AppName",
+                    "appName",
+                    "environment",
+                    "nginx",
+                    "pm2",
+                    "ssl",
+                    "ws",
+                    "path",
+                    "hostname",
+                    "port",
+                    "debugPort",
+                    "not_node_reporter",
+                    "not_node_monitor",
+                    "db",
+                ],
+            },
+            args
+        );
+    }
+};

package/tmpl/dirs/module.front.mjs

@@ -3,7 +3,7 @@ export default {
         content: {
             "index.js": {
                 tmpl: "module.front/common/index.ejs",
-                args: ["modules", "AppName"],
+                args: ["modules", "AppName", "ssl", "ws"],
             },
             "ncInit.js": {
                 tmpl: "module.front/common/ncInit.ejs",

package/tmpl/dirs/project.mjs

@@ -0,0 +1,18 @@
+export default {
+    site: {
+        content: "app",
+    },
+    deploy: {
+        ifArgs: ["deploy"],
+    },
+    nginx: {
+        ifArgs: ["nginx"],
+    },
+    pm2: {
+        ifArgs: ["pm2"],
+    },
+    ".env": {
+        tmpl: "project/env.ejs",
+        args: ["init_root_user", "not_node_monitor", "not_node_reporter"],
+    },
+};

package/tmpl/dirs/server.mjs

@@ -18,25 +18,26 @@ export default {
                     "rolesSecondary",
                     "user",
                     "ws",
+                    "nginx",
                 ],
             },
             "development.json": {
                 tmpl: EMPTY_CONFIG,
-                args: ["hostname"],
+                args: ["hostname", "nginx"],
                 options: {
                     ENV: "development",
                 },
             },
             "stage.json": {
                 tmpl: EMPTY_CONFIG,
-                args: ["hostname"],
+                args: ["hostname", "nginx"],
                 options: {
                     ENV: "stage",
                 },
             },
             "production.json": {
                 tmpl: EMPTY_CONFIG,
-                args: ["hostname"],
+                args: ["hostname", "nginx"],
                 options: {
                     ENV: "production",
                 },

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

@@ -44,7 +44,7 @@
       "key": "<%- session.key %>"
     },
     <% } %>
-    <% if (ssl) { %>
+    <% if (ssl && !nginx) { %>
     "ssl": {
       "enabled": true,
       "keys": {
@@ -112,14 +112,12 @@
           "search": ""
         }
       },     
-      <% } %> 
-      <% if (modules.includes('not-filter')){ %>
+      <% } %>      
       "rateLimiter": {
         "keyPrefix": "rateLimiterMiddleware",
         "points": 500,
         "duration": 1
       }
-      <% } %>      
     },
     "middleware": {
         <%- modules.map(entry => `"${entry}": {}`).join(',') %>            

package/tmpl/files/module.front/common/index.ejs

@@ -1,4 +1,4 @@
-<% if(modules.includes('not-ws')){ %>
+<% if(modules.includes('not-ws') && ws){ %>
 import main from './ws.client.main.js';
 <% } %>
 
@@ -13,15 +13,16 @@ let manifest = {
 		url: 	'/'
 	},
   modules:{
-    <% if(modules.includes('not-ws')){ %>
+    <% if(modules.includes('not-ws') && ws){ %>
     ws:{
       clients:{
         //options for ws client here
         main: {
-          host: window.location.hostname,
-          path: 'websocket',
-          secure: true,
-          ssl: true
+          host: '<%- ws.hostname %>' || window.location.hostname,
+          port: <%- ws.port %>,
+          path: '<%- ws.path %>',
+          secure: <%- ws.secure %>,
+          ssl: <%- !!ssl %>
         }
       }
     }

package/tmpl/files/module.front/common/ws.client.main.ejs

@@ -6,9 +6,8 @@ const main = {
   getToken: () => {
     return notCommon.getApp().getModel('user', {}).$token({})
       .then((res) => {
-        logger.log('token', res.result.token);
-        notCommon.getApp().setWorking('token', res.result.token);
-        return res.result.token;
+        notCommon.getApp().setWorking('token', res.result);
+        return res.result;
       });
   },
   messenger: {

package/tmpl/files/module.front/role/index.ejs

@@ -1,7 +1,7 @@
 import ncInit from "../../common/ncInit";
 
 let manifest = {
-    environment: "client",
+    environment: "<%- roleName %>",
     router: {
         root: "/dashboard",
         manifest: [],

package/tmpl/files/project/deploy.ejs

@@ -0,0 +1,13 @@
+#!/bin/bash
+echo 'deploying <%- AppName %> to <%- environment %>'
+cd site
+npm run <%- environment %>
+cd ../
+echo 'syncing data'
+ssh <%- deploy.user %>@<%- deploy.hostname %> "echo '1' > <%- deploy.path %>/deploying"
+rsync -av --progress --exclude-from='./deploy/.exclude' site <%- deploy.user %>@<%- deploy.hostname %>:<%- deploy.path %>/
+rsync -av --progress deploy/<%- environment %>.json <%- deploy.user %>@<%- deploy.hostname %>:<%- deploy.path %>/pm2/<%- environment %>.json
+ssh <%- deploy.user %>@<%- deploy.hostname %> "cd <%- deploy.path %>/site && npm i"
+ssh <%- deploy.user %>@<%- deploy.hostname %> "cd <%- deploy.path %> && pm2 startOrRestart pm2/<%- environment %>.json"
+ssh <%- deploy.user %>@<%- deploy.hostname %> "rm <%- deploy.path %>/deploying"
+exit 0;

package/tmpl/files/{app → project}/env.ejs

@@ -1,15 +1,15 @@
-<% if (not_node_reporter) %{ %>
+<% if (not_node_reporter) { %>
 NOT_NODE_ERROR_KEY=<%- not_node_reporter.key %>
 NOT_NODE_ERROR_URL_NODE=<%- not_node_reporter.url_node %>
 NOT_NODE_ERROR_URL_BROWSER=<%- not_node_reporter.url_browser %>
 <% } %>
-<% if (not_node_monitor) %{ %>
+<% if (not_node_monitor) { %>
 NOT_NODE_MONITOR_INTERVAL=<%- not_node_monitor.interval %>
 NOT_NODE_MONITOR_REPORT_INTERVAL=<%- not_node_monitor.report_interval %>
 NOT_NODE_MONITOR_REPORT_KEY=<%- not_node_monitor.report_key %>
 NOT_NODE_MONITOR_REPORT_URL=<%- not_node_monitor.report_url %>
 <% } %>
-<% if (init_root_user) %{ %>
+<% if (init_root_user) { %>
 INIT_ROOT_USERNAME=<%- init_root_user.name %>
 INIT_ROOT_EMAIL=<%- init_root_user.email %>
 INIT_ROOT_PASSWORD=<%- init_root_user.password %>

package/tmpl/files/project/nginx.ejs

@@ -0,0 +1,63 @@
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    '' close;
+}
+
+upstream websocket2 {
+    server <%- ws.hostname %>:<%- ws.port %>;
+}
+
+server {
+    listen 80 <%- nginx.ssl?" ssl ":" " %> <%- nginx.http2?" http2 ":" " %> <%- nginx.http3?" http3 ":" " %>;
+    root <%- path %>/site/app/static;
+    index index.html index.htm;
+    server_name <%- hostname %>;
+    
+    location /assets/{expires 365d; alias <%- path %>/site/app/static/assets/;}	
+    location /css/{	expires 365d; alias <%- path %>/site/app/static/css/;}	
+    location /js/{	expires 365d;alias <%- path %>/site/app/static/js/;	}
+    location /img/{	expires 365d;alias <%- path %>/site/app/static/img/;}
+    location /webfonts/{	expires 365d;alias <%- path %>/site/app/static/webfonts/;	}
+    location /favicon.ico {	expires 365d;alias <%- path %>/site/app/static/favicon.ico;	}
+    location /sitemap.xml {	expires 1d; alias <%- path %>/site/app/static/sitemap.xml;	}
+    location /robots.txt {	expires 365d;alias <%- path %>/site/app/static/robots.txt;	}
+    location /manifest.webmaniest {	expires 365d;alias <%- path %>/site/app/static/manifest.webmaniest;	}
+
+
+    location /api {
+        expires -1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-FILENAME $http_x_filename;
+        proxy_set_header SessionID $http_SessionID;
+        proxy_pass <%- ssl?'https':'http' %>://<%- hostname %>:<%- port %>/api;
+    }
+
+    <% if (ws){ %>
+    location /<%- ws.path %> {
+        proxy_pass <%- ssl?'https':'http' %>://websocket2;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $connection_upgrade;
+        proxy_set_header Host $host;
+    }
+    <% } %>
+
+
+    location / {		
+        expires 365d;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-FILENAME $http_x_filename;
+        proxy_set_header SessionID $http_SessionID;
+        proxy_pass <%- ssl?'https':'http' %>://<%- hostname %>:<%- port %>/;
+    }
+
+    <% if (nginx.ssl) { %>
+    listen 443 ssl <%- nginx.http2?" http2 ":" " %> <%- nginx.http3?" http3 ":" " %>;
+    <% } %>
+}