not-node 6.1.2 → 6.1.3

package/playground/app/server/index.js

@@ -1,20 +0,0 @@
-const env = process.env.NODE_ENV || 'development';
-const path = require('path');
-
-require('dotenv').config({ path: path.resolve(__dirname, '../../../.env')});
-
-const configPath = path.join(__dirname, 'config');
-const configModule = require('not-config');
-
-//инициализируем доступ к логам
-const log = require('not-log')(module, 'init');
-log.info('Environment', env, configPath);
-
-//иницилизируем доступ к настройкам
-const configLoaded = configModule.init(configPath);
-if (configLoaded !== false){
-	log.info('Config loaded: ', configPath);
-	require('./app.js')();
-}else{
-	log.error('Config not loaded: ', configPath);
-}

package/playground/app/server/routes/index.js

@@ -1,34 +0,0 @@
-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(
-        "/",
-        (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/playground/app/server/routes/site.js

@@ -1,71 +0,0 @@
-const
-	notError = require('not-error').notError,
-	notNode = require('not-node');
-
-const METAS_OVERRIDES = {
-    title: 			"notNodeApplication",
-    desription: "notNodeApplication",
-};
-
-function getMetas(req, res){
-  const styler = notNode.notMetasStyler.get();
-  return {...styler(req, res), ...METAS_OVERRIDES};
-}
-
-module.exports.index = function (req, res, next) {
-	notNode.Application.logger.debug('index '+ notNode.Auth.getIP(req) + ' : ' + req.originalUrl);
-  if (req.originalUrl.indexOf('/api/') == 0) {
-    return next();
-  }	
-  notNode.notHeadersStyler.get()(req, res)
-  const layout = 'index';  
-  try {
-    const metas = getMetas(req, res);
-    res.render(layout, metas, (err, html) => {
-      if (err) {
-        notNode.Application.logger.error(['rendering error', err]);
-        notNode.Application.report(new notError('rendering error', {
-          ...metas,
-          session: req.session.id
-        }, err));
-        res.status(500).end();
-      } else {
-        res.status(200).send(html).end();
-      }
-    });
-  } catch (e) {
-    let err = new notError('Index page generation error', {}, e);
-    notNode.Application.logger.error(err);
-    notNode.Application.report(err);
-		res.status(500).end();
-  }
-};
-
-module.exports.dashboard = (req, res, next) => {
-  try {
-		notNode.Application.logger.debug(notNode.Auth.getIP(req), 'dashboard');
-			if (req.originalUrl.indexOf('/api/') == 0) {
-	      return next();
-	    }
-	    const layout = 'dashboard';
-	    const metas = getMetas(req, res);
-	    res.render(layout, metas, (err, html) => {
-	      if (err) {
-	        notNode.Application.logger.error(['rendering error', err]);
-	        notNode.Application.report(new notError('rendering error', {
-	          ...metas,
-	          session: req.session.id
-	        }, err));
-	        res.status(500).end();
-	      } else {
-	        res.status(200).send(html).end();
-	      }
-	    });
-
-  } catch (e) {
-    let err = new notError('Dashboard page generation error', {}, e);
-    notNode.Application.logger.error(err);
-    notNode.Application.report(err);
-		res.status(500).end();
-  }
-}

package/playground/app/server/views/admin/foot.pug

@@ -1 +0,0 @@
-script(src=host+"/front/root.js")

package/playground/app/server/views/admin/head.pug

@@ -1,7 +0,0 @@
-meta(charset="utf-8")
-meta(http-equiv="x-ua-compatible" content="ie=edge")
-meta(name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no")
-link(rel="manifest" href="/site.webmanifest")
-link(rel="apple-touch-icon" href="/icon.png")
-link(rel="stylesheet" href="css/style.css")
-link(rel="stylesheet" href=host+"/front/root.css")

package/playground/app/server/views/admin/menu.pug

@@ -1,2 +0,0 @@
-nav( class="col-md-2 d-none d-md-block bg-light sidebar")
-	div(class="sidebar-sticky" id="mainMenu")

package/playground/app/server/views/admin.pug

@@ -1,19 +0,0 @@
-doctype html
-html.no-js(lang="ru-RU")
-  head
-    title Administration system
-    meta(name="keywords" content="")
-    meta(name="description" content="")
-    meta(name="author" content="")
-    include admin/head.pug
-  body
-    nav(class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0")
-      a(class="navbar-brand col-sm-3 col-md-2 mr-0" href="/dashboard") 
-      ul(class="navbar-nav px-3")
-        li(class="nav-item text-nowrap")
-          a(class="nav-link" n-href="/logout") Logout
-    div.container-fluid
-      div.row
-        include admin/menu.pug
-        main(role="main" class="col-md-9 ml-sm-auto col-lg-10 pt-3 px-4 main-container")
-    include admin/foot.pug

package/playground/app/server/views/dashboard.pug

@@ -1,20 +0,0 @@
-doctype html
-html.no-js(lang="")
-  head
-    meta(charset="utf-8")
-    meta(http-equiv="x-ua-compatible" content="ie=edge")
-    title= title
-    meta(name="description" content=description)
-    meta(name="viewport" content="width=device-width, initial-scale=1")
-    link(rel="apple-touch-icon" href="apple-touch-icon.png")
-    link(rel="stylesheet" href=host+"/assets/font-awasome-5.13.1-all.min.css")
-    link(rel="stylesheet" href=host+"/front/"+role+".css")
-  body
-    nav(id="top-menu" class="navbar is-success" role="navigation" aria-label="dropdown navigation")
-    aside(class="menu main-menu" id="side-menu")
-    main
-      section(class="section main-container")
-        footer(class="footer")
-          div(class="content has-text-centered")
-            p footer
-    script(src="/front/"+role+".js")

package/playground/app/server/views/index.pug

@@ -1,15 +0,0 @@
-doctype html
-html.no-js(lang="")
-  head
-
-  include ./parts/header.pug
- 
-  body
-    section(class="hero is-success is-fullheight")
-      include ./parts/menu.pug
-      div(class="hero-body")
-        div(class="container has-text-centered")
-          h1(class="title") Hello world
-          h2(class="subtitle") and so it begins
-    include ./parts/overview.pug
-    script(src=host+"/front/"+role+".js")

package/playground/app/server/views/parts/header.android.pug

@@ -1,6 +0,0 @@
-<!-- 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/playground/app/server/views/parts/header.ios.pug

@@ -1,5 +0,0 @@
-<!-- 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/playground/app/server/views/parts/header.pug

@@ -1,18 +0,0 @@
-meta(charset="utf-8")
-meta(http-equiv="x-ua-compatible" content="ie=edge")
-meta(name="viewport" content="width=device-width, initial-scale=1")
-title= title
-link(rel="icon" type="image/png" href="/img/icons/icon-64.png")
-link(rel="manifest" href="/manifest.json")
-link(rel="canonical" href=canonical)
-
-meta(name="description" content=description)
-meta(name="application-name" content=title)
-meta(name="author" content="" )
-meta(name="referrer" content="strict-origin")
-meta(itemprop="name" content=title)
-meta(itemprop="description" content=description)
-meta(itemprop="image" content="./img/icons/icon-128.png")
-
-include ./header.ios.pug
-include ./header.android.pug

package/playground/app/server/views/parts/menu.pug

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

package/playground/app/server/views/parts/overview.pug

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

package/playground/app/server/ws/auth.js

@@ -1,41 +0,0 @@
-const Log = require("not-log")(module, "WS::Auth");
-const notNode = require("not-node");
-const ObjectId = require("mongoose").Types.ObjectId;
-
-function isRoot(token) {
-    return token.role ? token.role.indexOf("root") > -1 : false;
-}
-
-function isAuth(_id) {
-    try {
-        return !!ObjectId(_id);
-    } catch (e) {
-        return false;
-    }
-}
-
-module.exports = ({ serviceData, cred }) => {
-    //Log.log(serviceData, cred);
-    const [model, action] = serviceData.name.split("//");
-    //Log.log(model, action);
-    let user = {
-        auth: isAuth(cred._id),
-        role: cred.role,
-        root: isRoot(cred),
-        username: cred.username,
-        email: cred.email,
-        emailConfirmed: cred.emailConfirmed,
-    };
-    //Log.log(user);
-    let actionManifest = notNode.Application.getActionManifestForUser(
-        model,
-        action,
-        user
-    );
-    Log.log(model, action, user.username, user.role, !!actionManifest);
-    if (actionManifest) {
-        return true;
-    } else {
-        return false;
-    }
-};

package/playground/app/server/ws/index.js

@@ -1,84 +0,0 @@
-const jwt = require("jsonwebtoken"),
-    config = require("not-config").createReader(),
-    log = require("not-log")(module, "WS"),
-    authRoute = require("./auth.js");
-
-const { notWSMessenger } = require("not-ws");
-const { notRequestError, notValidationError } = require("not-error");
-
-const mainValidators = {
-    credentials(credentials, serviceData) {
-        try {
-            log.log(serviceData.type, serviceData.name);
-            let cred = jwt.verify(
-                credentials,
-                config.get("modules:user:secret")
-            );
-            if (cred) {
-                return authRoute({ serviceData, cred });
-            } else {
-                return false;
-            }
-        } catch (e) {
-            log.error(e);
-            return false;
-        }
-    },
-};
-
-function wrapError(data, serviceData, error) {
-    if (error instanceof notRequestError) {
-        return {
-            status: "error",
-            message: error.getResult().message,
-            errors: error.getResult().errors,
-        };
-    } else if (error instanceof notValidationError) {
-        return {
-            status: "error",
-            message: error.message,
-            errors: error.getFieldsErrors(),
-        };
-    } else {
-        return {
-            status: "error",
-            message: error.message,
-        };
-    }
-}
-
-function wrapOk(result) {
-    return {
-        status: "ok",
-        result,
-    };
-}
-
-module.exports = {
-    servers: {
-        main: {
-            logger: log,
-            jwt: {
-                key: config.get("modules:user:secret"),
-            },
-            getMessenger() {
-                return new notWSMessenger({
-                    logger: log,
-                    secure: true,
-                    validateTypeAndName: false,
-                    validators: mainValidators,
-                    wrap: {
-                        ok: wrapOk,
-                        error: wrapError,
-                    },
-                    types: {
-                        request: [],
-                        response: [],
-                        event: [],
-                        __service: [],
-                    },
-                });
-            },
-        },
-    },
-};

package/playground/bin/build.sh

@@ -1,8 +0,0 @@
-#!/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/playground/package.json

@@ -1,85 +0,0 @@
-{
-    "name": "not-node-application",
-	"version": "0.0.1",
-	"description": "notNodeApplication",
-	"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",
-		"cover": "nyc npm test",
-		"build:dev:guest:watch": "watch 'npm run build:dev:guest' ./app/front/src --interval=5",
-		"build": "./node_modules/.bin/not-builder --config='./project.manifest.json'",
-		"build:dev": "npm run development",
-		"build:dev:guest": "./node_modules/.bin/not-builder --config='./project.manifest.json' --role=guest  --environment=development",
-		"build:dev:user": "./node_modules/.bin/not-builder --config='./project.manifest.json' --role=user  --environment=development",
-		"build:dev:client": "./node_modules/.bin/not-builder --config='./project.manifest.json' --role=client  --environment=development",
-		"build:dev:admin": "./node_modules/.bin/not-builder --config='./project.manifest.json' --role=admin  --environment=development",
-		"build:dev:root": "./node_modules/.bin/not-builder --config='./project.manifest.json' --role=root  --environment=development",
-		"archive": "./bin/archive.sh",
-		"production": "./node_modules/.bin/not-builder --config='./project.manifest.json' --environment=production",
-		"development": "./node_modules/.bin/not-builder --config='./project.manifest.json' --environment=development",
-		"stage": "./node_modules/.bin/not-builder --config='./project.manifest.json' --environment=stage",
-		"update": "ncu -u -x escape-string-regexp && npm i",
-		"urd:dev": "npm run update && npm run build:dev && pm2 restart not-node-application.dev"
-	},
-	"dependencies": {
-        "redis": "*",
-		"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",
-        "@babel/polyfill": "^7.12.1",
-		"@babel/preset-env": "^7.18.9",
-		"@babel/plugin-syntax-class-properties": "^7.12.13",
-		"@rollup/plugin-babel": "^5.3.1",
-		"@rollup/plugin-commonjs": "^22.0.1",
-		"@rollup/plugin-node-resolve": "^13.3.0",
-        "@rollup/plugin-json": "^4.1.0",
-		"babel-core": "*",
-		"babel-polyfill": "*",
-		"babel-preset-es2015-rollup": "*",
-		"babel-runtime": "*",
-		"chai": "^4.3.6",
-		"eslint": "^8.20.0",
-		"ink-docstrap": "^1.3.2",
-		"jsdoc": "^3.6.11",
-		"mocha": "^10.0.0",
-		"ndb": "^1.1.5",		
-		"nyc": "^15.1.0",
-		"rollup": "^2.77.2",
-        "rollup-plugin-postcss": "^4.0.2",
-		"rollup-plugin-sass": "^1.2.13",
-		"rollup-plugin-svelte": "^7.1.0",
-		"rollup-plugin-eslint": "^7.0.0",
-		"rollup-plugin-filesize": "^9.1.2",
-		"rollup-plugin-sizes": "^1.0.4",
-		"rollup-watch": "*",
-		"should": "^13.2.3",
-		"svelte": "*",
-		"yargs": "^17.5.1"
-	}
-}

package/playground/project.manifest.json

@@ -1,37 +0,0 @@
-{
-	"name": "notNodeApplication",
-	"targets": {
-		"server": {
-			"name": "notNodeApplication",
-			"roles": ["root","admin","client","user","guest"],
-			"builder": "server",
-			"root": "app/front/",
-			"src": "app/front/",
-			"build": "app/front/build/",
-			"index": "app/front/index.!.js",
-			"rollup": "app/front/rollup.!.js",
-			"modules": {
-				"serverModulesDir": "app/server/modules",
-				"frontModulesDir": "app/front/src",
-				"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": {},
-                    "not-store": {},
-                    "not-dbdump": {},
-                    "not-user": {},
-                    "not-error": {}
-                    					
-				}
-			}
-		}
-	}
-}