not-node 6.1.1 → 6.1.3

package/.env

@@ -5,8 +5,8 @@ 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__user=reporter
+db__mongoose__options__pass=developer
 db__mongoose__options__db=reporter
 db__mongoose__options__host=localhost
 db__mongoose__options__authSource=reporter

package/.vscode/launch.json

@@ -0,0 +1,19 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "address": "127.0.0.1",
+            "localRoot": "${workspaceFolder}/playground",
+            "name": "Debug playground",
+            "port": 3031,
+            "sourceMaps": true,
+            "remoteRoot": "${workspaceFolder}/playground",
+            "request": "attach",
+            "skipFiles": ["<node_internals>/**"],
+            "type": "node"
+        }
+    ]
+}

package/bin/not-cli.mjs

@@ -8,7 +8,7 @@ import { isAbsolute, resolve, join } from "node:path";
 
 import { copyFile, constants, mkdir, writeFile } from "node:fs/promises";
 
-import { cwd, stdout, stderr } from "node:process";
+import { cwd } from "node:process";
 const CWD = cwd();
 import { spawn } from "node:child_process";
 
@@ -326,6 +326,51 @@ async function createBootstrapFrontModule(modules_dir, config) {
     }
 }
 
+function installPackages(opts) {
+    return new Promise((resolve, reject) => {
+        console.log("installing packages...");
+        let npmInstall = spawn(`npm`, ["i"], { cwd: opts.dir });
+
+        npmInstall.stderr.on("data", (data) => {
+            console.error(data.toString());
+        });
+        npmInstall.on("exit", (code) => {
+            if (code == 0) {
+                resolve();
+            } else {
+                reject(`NPM install exited with code ${code}`);
+            }
+        });
+    });
+}
+
+function buildClientSideScripts(opts) {
+    return new Promise((resolve, reject) => {
+        console.log("building client side scripts...");
+        let npmInstall = spawn(`npm`, ["run", "build"], { cwd: opts.dir });
+
+        npmInstall.stderr.on("data", (data) => {
+            console.error(data.toString());
+        });
+        npmInstall.on("exit", (code) => {
+            if (code == 0) {
+                resolve();
+            } else {
+                reject(`npm run build job exited with code ${code}`);
+            }
+        });
+    });
+}
+
+function postStartupInstructions(opts) {
+    console.log(
+        "Generation of source code, configurations and installation of packages successfully finished."
+    );
+    console.log(
+        `To start server navigate to directory '${opts.dir}' (cd '${opts.dir}') and run 'npm start'`
+    );
+}
+
 program
     .command("create")
     .addOption(
@@ -368,18 +413,9 @@ program
             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}`);
-        });
+        await installPackages(opts);
+        await buildClientSideScripts(opts);
+        postStartupInstructions(opts);
     });
 
 program.parse();

package/package.json

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

package/src/cli/readers/hostname.mjs

@@ -1,4 +1,4 @@
-const DEFAULT_HOST = "https://localhost";
+const DEFAULT_HOST = "localhost";
 export default (inquirer) => {
     return inquirer.prompt([
         {

package/src/cli/readers/user.mjs

@@ -1,3 +1,10 @@
+const DEFAULT_CONFIG = {
+    restrict: {
+        registration: false,
+    },
+    tokenTTL: 3600,
+};
+
 function collectRestrictions(inquirer) {
     return inquirer.prompt([
         {
@@ -56,7 +63,7 @@ export default (inquirer) => {
             if (answer.enabled) {
                 return collectData(inquirer);
             } else {
-                return false;
+                return DEFAULT_CONFIG;
             }
         });
 };

package/src/init/lib/modules.js

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

package/src/init/lib/routes.js

@@ -59,9 +59,12 @@ module.exports = class InitRoutes {
 
     async run({ master, config, options }) {
         log.info("Setting up routes...");
+        //pages rendering
+        await master.getApp().execInModules("registerPagesRoutes", master);
+        //api first
         master.getApp().expose(master.getServer());
+        //user defined pages
         require(options.routesPath)(master.getServer(), master.getApp());
-
         master.getServer().use(serveStatic(config.get("staticPath")));
         master.getServer().use(options.indexRoute);
         master.getServer().use(

package/src/metas.js

@@ -1,11 +1,12 @@
 const Auth = require("./auth"),
-    Env = require("./env"),
+    notAppIdentity = require("./identity"),
     notStyler = require("./styler"),
     config = require("not-config").createReader();
 
 function getRole(req) {
-    if (Auth.isUser(req) && req.user) {
-        return req.user.getPrimaryRole(Env.getEnv("rolesPriority"));
+    const identity = new notAppIdentity(req);
+    if (identity.isUser()) {
+        return identity.getRole();
     } else {
         return Auth.DEFAULT_USER_ROLE_FOR_GUEST;
     }

package/tmpl/files/app/app.ejs

@@ -1,5 +1,7 @@
 const notNode = require("not-node");
 
+const InitIdentityTokens = require("not-user").InitIdentityTokens;
+
 const Init = require("not-node").Init,
     path = require("path"),
     manifest = require("./../../project.manifest.json");
@@ -15,6 +17,7 @@ module.exports = () => {
     const additional = {
         pre({ initSequence }) {
             initSequence.remove("InitMonitoring");
+            initSequence.insert(InitIdentityTokens);
         },
     };
 

package/tmpl/files/app/routes/index.ejs

@@ -1,36 +1,34 @@
-const
-  notNode = require('not-node'),
-  Auth = require('not-node').Auth,
-  siteRouter = require('./site');
+const notNode = require("not-node"),
+    { Auth, notAppIdentity } = require("not-node"),
+    siteRouter = require("./site");
 
 module.exports = (web) => {
+    web.get("/api/manifest", function (req, res) {
+        notNode.notHeadersStyler.get()(req, res);
+        res.status(200).json(notNode.Application.getManifest(req));
+    });
 
-  web.get('/api/manifest', function(req, res) {
-    notNode.notHeadersStyler.get()(req,res);    
-    res.status(200).json(notNode.Application.getManifest(req));
-  });
-
-
-  web.get('/', (req, res, next) => {
-      if (Auth.isUser(req)) {
-        res.redirect('/dashboard');
-      }else{
-        next();
-      }
-    },
-    siteRouter.index
-  );
-
-
-  web.get('/dashboard*',
-    (req, res, next) => {
-      if (Auth.isUser(req)) {
-        next();
-      } else {
-        res.redirect('/login');
-      }
-    },
-    siteRouter.dashboard
-  );
+    web.get(
+        "/",
+        (req, res, next) => {
+            if (new notAppIdentity(req).isUser()) {
+                res.redirect("/dashboard");
+            } else {
+                next();
+            }
+        },
+        siteRouter.index
+    );
 
+    web.get(
+        "/dashboard*",
+        (req, res, next) => {
+            if (new notAppIdentity(req).isUser()) {
+                next();
+            } else {
+                res.redirect("/login");
+            }
+        },
+        siteRouter.dashboard
+    );
 };

package/tmpl/files/app/views/parts/header.android.ejs

@@ -1,7 +1,6 @@
-
- <!-- Android -->
- meta(name="theme-color" content="#48c774")
- meta(name="color-scheme" content="light")
- meta(name="mobile-web-app-capable" content="yes")
- link(rel="stylesheet" href=host+"/front/"+role+".css")
- link(rel="stylesheet" href=host+"/assets/font-awesome.min.css")
+<!-- Android -->
+meta(name="theme-color" content="#48c774")
+meta(name="color-scheme" content="light")
+meta(name="mobile-web-app-capable" content="yes")
+link(rel="stylesheet" href=host+"/front/"+role+".css")
+link(rel="stylesheet" href=host+"/assets/font-awesome.min.css")

package/tmpl/files/app/views/parts/header.ios.ejs

@@ -1,5 +1,5 @@
- <!-- iOS -->
- meta(name="apple-mobile-web-app-title" content=title)
- meta(name="apple-mobile-web-app-capable" content="yes")
- meta(name="apple-mobile-web-app-status-bar-style" content="#48c774")
- link(rel="apple-touch-icon" href="./img/icons/icon-512.png")
+<!-- iOS -->
+meta(name="apple-mobile-web-app-title" content=title)
+meta(name="apple-mobile-web-app-capable" content="yes")
+meta(name="apple-mobile-web-app-status-bar-style" content="#48c774")
+link(rel="apple-touch-icon" href="./img/icons/icon-512.png")

package/tmpl/files/app/views/parts/menu.ejs

@@ -1 +1 @@
-nav(class="navbar is-success" role="navigation" aria-label="dropdown navigation" id="top-menu")
+nav(class="navbar is-success" role="navigation" aria-label="dropdown navigation" id="top-menu")

package/tmpl/files/app/views/parts/overview.ejs

@@ -1,2 +1,2 @@
 div(class="is-success is-fullheight")
-  p Story of another little side project.
+  p Story of another little side project.

package/playground/.babelrc

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

package/playground/.eslintignore

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

package/playground/.eslintrc.json

@@ -1,23 +0,0 @@
-{
-    "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/playground/app/front/build.env.js

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

package/playground/app/front/index.!.js

@@ -1,64 +0,0 @@
-
-    
-    import {
-      Frame
-    } from 'not-bulma';
-    
-    const {notCommon, notApp, COMPONENTS} = Frame;
-    
-    notCommon.register('backlog', true);
-    window.dumpBacklog = notCommon.dumpBacklog.bind(notCommon);
-    
-    let appDefaultOptions = {
-      manifestURL: '/api/manifest',
-      router: {
-        root: '/',
-        manifest: [],
-        index: ''
-      },
-      language: 'ru',
-      crud: {
-        navigateBackAfter: ['create', 'update', 'delete']
-      },
-      modules: {
-        user: {
-          redirectTimout: 1000,
-          afterLoginURL: '/dashboard',
-          loginForm: {
-            modes: [
-              'login',
-              'requestLoginCodeOnEmail',
-              'loginByCode'
-            ]
-          },
-          loginFormContainerSelector: '.main-container',
-          restoreFormContainerSelector: '.main-container',
-          registerFormContainerSelector: '.main-container'
-        }
-      }
-    };
-    
-    let services = {}, uis = {}, wsc = {}, fields = {};
-    
-    <% for(var i = 0; i < mods.length; i++) { %>
-    import * as mod_<%= i %>
-    from '<%= mods[i] %>';
-    appDefaultOptions = notCommon.absorbModule({
-      defaultConf: appDefaultOptions,
-      mod: mod_<%= i %>,
-      services, uis, wsc, fields
-    });
-    <% } %>    
-    
-    COMPONENTS.import(uis);
-    
-    import 'bulma';
-    
-    <% for(var i = 0; i < scss.length; i++) { %>
-    import '<%= scss[i] %>';
-    <% } %>    
-    
-    appDefaultOptions.services = services;
-    appDefaultOptions.wsc = wsc;
-    
-    notCommon.startApp(() => new notApp(appDefaultOptions));

package/playground/app/front/rollup.!.js

@@ -1,70 +0,0 @@
-// Rollup plugins
-import babel from "@rollup/plugin-babel";
-import commonjs from "@rollup/plugin-commonjs";
-import svelte from "rollup-plugin-svelte";
-import resolve from "@rollup/plugin-node-resolve";
-import filesize from "rollup-plugin-filesize";
-import sizes from "rollup-plugin-sizes";
-import postcss from "rollup-plugin-postcss";
-import json from "@rollup/plugin-json";
-
-import { babelOn } from "./build.env.js";
-
-export default {
-    input: "<%= inputPath %>",
-    output: {
-        file: "<%= outputPath %>",
-        name: "<%= appName %>",
-        format: "iife",
-        sourcemap:
-            false && (process.env.NODE_ENV === "production" ? false : "inline"),
-    },
-    plugins: [
-        json(),
-        svelte({
-            emitCss: true,
-        }),
-        resolve({
-            browser: true,
-            preferBuiltins: true,
-            dedupe: (importee) =>
-                importee === "svelte" || importee.startsWith("svelte/"),
-        }),
-        commonjs({}),
-        postcss({
-            extract: true,
-            minimize: true,
-            use: [
-                [
-                    "sass",
-                    {
-                        includePaths: ["./src/styles/theme", "./node_modules"],
-                    },
-                ],
-            ],
-        }),
-        babelOn() &&
-            babel({
-                presets: [
-                    [
-                        "@babel/preset-env",
-                        {
-                            corejs: 3,
-                            modules: false,
-                            useBuiltIns: "usage",
-                            targets: "> 2.5%, not dead",
-                        },
-                    ],
-                ],
-                babelHelpers: "bundled",
-                plugins: [
-                    "@babel/plugin-proposal-class-properties",
-                    "@babel/plugin-proposal-private-methods",
-                    "@babel/transform-arrow-functions",
-                ],
-                exclude: ["node_modules/**", "build/**"],
-            }),
-        sizes(),
-        filesize(),
-    ],
-};

package/playground/app/front/src/admin/main/index.js

@@ -1,45 +0,0 @@
-import ncInit from "../../common/ncInit";
-
-let manifest = {
-    environment: "guest",
-    router: {
-        manifest: [],
-    },
-    crud: {
-        containerSelector: ".main-container",
-    },
-    modules: {
-        user: {
-            loginFormContainerSelector: ".main-container",
-            registerFormContainerSelector: ".main-container",
-        },
-    },
-    initController: ncInit,
-    menu: {
-        top: {
-            toggleSelector: ".navbar-burger",
-            sections: [],
-            items: [
-                {
-                    title: "Вход",
-                    url: "/login",
-                    priority: 10,
-                    showOnTouch: true,
-                    type: "button",
-                    place: "start",
-                } , {
-                    id: 'register',
-                    title: 'Регистрация',
-                    url: '/register',
-                    type:       'button',
-                    priority: 11,
-                    showOnTouch:true,
-				    place: 'start'
-                },
-            ],
-        },
-    },
-};
-
- 
-export { ncInit, manifest };

package/playground/app/front/src/client/main/index.js

@@ -1,45 +0,0 @@
-import ncInit from "../../common/ncInit";
-
-let manifest = {
-    environment: "guest",
-    router: {
-        manifest: [],
-    },
-    crud: {
-        containerSelector: ".main-container",
-    },
-    modules: {
-        user: {
-            loginFormContainerSelector: ".main-container",
-            registerFormContainerSelector: ".main-container",
-        },
-    },
-    initController: ncInit,
-    menu: {
-        top: {
-            toggleSelector: ".navbar-burger",
-            sections: [],
-            items: [
-                {
-                    title: "Вход",
-                    url: "/login",
-                    priority: 10,
-                    showOnTouch: true,
-                    type: "button",
-                    place: "start",
-                } , {
-                    id: 'register',
-                    title: 'Регистрация',
-                    url: '/register',
-                    type:       'button',
-                    priority: 11,
-                    showOnTouch:true,
-				    place: 'start'
-                },
-            ],
-        },
-    },
-};
-
- 
-export { ncInit, manifest };

package/playground/app/front/src/common/index.js

@@ -1,39 +0,0 @@
-
-import main from './ws.client.main.js';
-
-
-let manifest = {
-  brand: {
-		icon: {
-			src: '/img/icons/icon-w-64.png',
-			width: 48,
-			height: 28
-		},
-    title: 'notNodeApplication',
-		url: 	'/'
-	},
-  modules:{
-    
-    ws:{
-      clients:{
-        //options for ws client here
-        main: {
-          host: window.location.hostname,
-          path: 'websocket',
-          secure: true,
-          ssl: true
-        }
-      }
-    }
-    
-  }
-};
-
-const wsc = {
-  main
-};
-
-export {
-  manifest,
-  wsc
-};

package/playground/app/front/src/common/ncInit.js

@@ -1,18 +0,0 @@
-import { Frame } from 'not-bulma';
-
-const {
-    notSideMenu, notTopMenu, 
-    notController} = Frame;
-
-class ncInit extends notController {
-	constructor(app) {
-		super(app);
-		this.setModuleName('init');
-		this.log('init app');
-		notSideMenu.render(app);
-		notTopMenu.render(app);
-		return this;
-	}
-}
-
-export default ncInit;