not-node 5.0.22 → 5.1.2

package/src/init/sequence.standart.js

@@ -1,60 +1,58 @@
-
-const initEnv = require('./env');
-const initDB = require('./db');
-const initExpress = require('./express');
-const initCompression = require('./compression');
-const initSecurity = require('./security');
-const initBodyparser = require('./bodyparser');
-const initMethodOverride = require('./methodoverride');
-const initFileupload = require('./fileupload');
-const initNotApp = require('./app');
-const initSessions = require('./sessions');
-const initTemplate = require('./template');
-const initCORS = require('./cors');
+const initEnv = require("./env");
+const initDB = require("./db");
+const initExpress = require("./express");
+const initCompression = require("./compression");
+const initSecurity = require("./security");
+const initBodyparser = require("./bodyparser");
+const initMethodOverride = require("./methodoverride");
+const initFileupload = require("./fileupload");
+const initNotApp = require("./app");
+const initSessions = require("./sessions");
+const initTemplate = require("./template");
+const initCORS = require("./cors");
 //const initCore = require('./core');
-const initMiddleware = require('./middleware');
-const initStatic = require('./static');
-const initRoutes = require('./routes');
-const initRateLimiter = require('./rateLimiter');
-const initModules = require('./modules');
-const initInformer = require('./informer');
-const initHTTP = require('./http');
-const initMonitoring = require('./monitoring');
+const initMiddleware = require("./middleware");
+const initStatic = require("./static");
+const initRoutes = require("./routes");
+const initRateLimiter = require("./rateLimiter");
+const initModules = require("./modules");
+const initInformer = require("./informer");
+const initHTTP = require("./http");
+const initMonitoring = require("./monitoring");
 
 module.exports = [
-  //creating set of variables derived from basic ones,
-  //such as various paths, server names and URIs
-  initEnv,
-  //DB access drivers
-  initDB,
-  //http(s) server
-  initExpress,
-  initRateLimiter,
-  //CSP security directives
-  initSecurity,
-  //gzip compression
-  initCompression,
-  initFileupload,
-  initBodyparser,
-  initMethodOverride,
-  //not-node core
-  initNotApp,
-  //init various resources like common object fields descriptions and locales
-  //initCore,
-  //user sessions
-  initSessions,
-  //template engine
-  initTemplate,
-  //CORS rules
-  initCORS,
-  //various not-* middleware from all sources
-  initMiddleware,
-  initStatic,
-  initRoutes,
-  initModules,
-  //messaging platform
-  initInformer,
-  initHTTP,
-  initMonitoring,
-
+    //creating set of variables derived from basic ones,
+    //such as various paths, server names and URIs
+    initEnv,
+    //DB access drivers
+    initDB,
+    //http(s) server
+    initExpress,
+    initRateLimiter,
+    //CSP security directives
+    initSecurity,
+    //gzip compression
+    initCompression,
+    initFileupload,
+    initBodyparser,
+    initMethodOverride,
+    //not-node core
+    initNotApp,
+    //init various resources like common object fields descriptions and locales
+    //initCore,
+    //user sessions
+    initSessions,
+    //template engine
+    initTemplate,
+    //CORS rules
+    initCORS,
+    //various not-* middleware from all sources
+    initMiddleware,
+    initStatic,
+    initRoutes,
+    initModules,
+    //messaging platform
+    initInformer,
+    initHTTP,
+    initMonitoring,
 ];

package/src/init/sessions/index.js

@@ -1,24 +1,24 @@
-
-
-module.exports = class InitSessions{
-  /**
-  * Returns constructor of Session driver
-  * @param {Object} conf  configuration os session from application config
-  * @param {string} conf.driver  name of session storage engine
-  * @return {Object}          class constructor or undefined
-  **/
-  static getConstructor(conf){
-    switch(conf.driver){
-    case 'redis': return require('./redis.js');
-    case 'mongoose': return require('./mongoose.js');
-    default:      return require('./mongoose.js');
+module.exports = class InitSessions {
+    /**
+     * Returns constructor of Session driver
+     * @param {Object} conf  configuration os session from application config
+     * @param {string} conf.driver  name of session storage engine
+     * @return {Object}          class constructor or undefined
+     **/
+    static getConstructor(conf) {
+        switch (conf.driver) {
+            case "redis":
+                return require("./redis.js");
+            case "mongoose":
+                return require("./mongoose.js");
+            default:
+                return require("./mongoose.js");
+        }
     }
-  }
-
-  async run({master, config, options}) {
-    const conf = config.get('session');
-    const Constructor = InitSessions.getConstructor(conf);
-    await new Constructor().run({master, config, options, conf});
-  }
 
+    async run({ master, config, options }) {
+        const conf = config.get("session");
+        const Constructor = InitSessions.getConstructor(conf);
+        await new Constructor().run({ master, config, options, conf });
+    }
 };

package/src/init/sessions/mongoose.js

@@ -1,39 +1,52 @@
-const {notError} = require('not-error');
-const log = require('not-log')(module, 'not-node//init');
-const ADDS = require('../additional');
+const { notError } = require("not-error");
+const log = require("not-log")(module, "not-node//init");
+const ADDS = require("../additional");
 
-module.exports = class InitSessionsMongo{
-  static createStore({config, master, expressSession}){
-    const MongoDBStore = require('connect-mongodb-session')(expressSession);
-    const mongooseOptions = config.get('db.mongoose.options');
-    let store = new MongoDBStore({
-      uri: `mongodb://${mongooseOptions.user}:${mongooseOptions.pass}@${mongooseOptions.host}/${mongooseOptions.db}`,
-      databaseName: mongooseOptions.db,
-      collection: 'sessions'
-    });
-    store.on('connected', function () {
-      log.info('Sessions connected');
-    });
-    // Catch errors
-    store.on('error', function(error) {
-      master.getApp().report(new notError('User sessions storage connection failed', {}, error));
-    });
-    return store;
-  }
-
-  async run({config, options, master}) {
-    const expressSession = require('express-session');
-    log.info('Setting up user sessions handler(mongoose)...');
-    await ADDS.run('sessions.pre', {config, options, master});
-    master.getServer().use(expressSession({
-      secret: config.get('session:secret'),
-      key: config.get('session:key'),
-      cookie: config.get('session:cookie'),
-      resave: true,
-      saveUninitialized: true,
-      store: InitSessionsMongo.createStore({config,master, expressSession})
-    }));
-    await ADDS.run('sessions.post', {config, options, master});
-  }
+module.exports = class InitSessionsMongo {
+    static createStore({ config, master, expressSession }) {
+        const MongoDBStore = require("connect-mongodb-session")(expressSession);
+        const mongooseOptions = config.get("db.mongoose.options");
+        let store = new MongoDBStore({
+            uri: `mongodb://${mongooseOptions.user}:${mongooseOptions.pass}@${mongooseOptions.host}/${mongooseOptions.db}`,
+            databaseName: mongooseOptions.db,
+            collection: "sessions",
+        });
+        store.on("connected", function () {
+            log.info("Sessions connected");
+        });
+        // Catch errors
+        store.on("error", function (error) {
+            master
+                .getApp()
+                .report(
+                    new notError(
+                        "User sessions storage connection failed",
+                        {},
+                        error
+                    )
+                );
+        });
+        return store;
+    }
 
+    async run({ config, options, master }) {
+        const expressSession = require("express-session");
+        log.info("Setting up user sessions handler(mongoose)...");
+        await ADDS.run("sessions.pre", { config, options, master });
+        master.getServer().use(
+            expressSession({
+                secret: config.get("session:secret"),
+                key: config.get("session:key"),
+                cookie: config.get("session:cookie"),
+                resave: true,
+                saveUninitialized: true,
+                store: InitSessionsMongo.createStore({
+                    config,
+                    master,
+                    expressSession,
+                }),
+            })
+        );
+        await ADDS.run("sessions.post", { config, options, master });
+    }
 };

package/src/init/sessions/redis.js

@@ -1,30 +1,31 @@
-const log = require('not-log')(module, 'not-node//init');
-const ADDS = require('../additional');
+const log = require("not-log")(module, "not-node//init");
+const ADDS = require("../additional");
 
-const DEFAULT_CLIENT = 'ioredis';
-
-module.exports = class InitSessionsRedis{
-  async run({config, options, master}) {
-    log.info('Setting up user sessions handler(redis)...');
-    await ADDS.run('sessions.pre', {config, options, master});
-    const expressSession = require('express-session');
-    const storeClient = config.get('session.client', DEFAULT_CLIENT);
-    const redisClient = master.getEnv(`db.${storeClient}`);
-    const redisStore = require('connect-redis')(expressSession);
-    master.getServer().use(expressSession({
-      secret:             config.get('session.secret'),
-      key:                config.get('session.key'),
-      cookie:             config.get('session.cookie'),
-      resave:             false,
-      saveUninitialized:  true,
-      store: new redisStore({
-        host:             'localhost',
-        port:             6379,
-        client:           redisClient,
-        ttl:              86400
-      })
-    }));
-    await ADDS.run('sessions.post', {config, options, master});
-  }
+const DEFAULT_CLIENT = "ioredis";
 
+module.exports = class InitSessionsRedis {
+    async run({ config, options, master }) {
+        log.info("Setting up user sessions handler(redis)...");
+        await ADDS.run("sessions.pre", { config, options, master });
+        const expressSession = require("express-session");
+        const storeClient = config.get("session.client", DEFAULT_CLIENT);
+        const redisClient = master.getEnv(`db.${storeClient}`);
+        const redisStore = require("connect-redis")(expressSession);
+        master.getServer().use(
+            expressSession({
+                secret: config.get("session.secret"),
+                key: config.get("session.key"),
+                cookie: config.get("session.cookie"),
+                resave: false,
+                saveUninitialized: true,
+                store: new redisStore({
+                    host: "localhost",
+                    port: 6379,
+                    client: redisClient,
+                    ttl: 86400,
+                }),
+            })
+        );
+        await ADDS.run("sessions.post", { config, options, master });
+    }
 };

package/src/init/static.js

@@ -1,50 +1,63 @@
+const path = require("path");
 
-const path = require('path');
+const ADDS = require("./additional");
 
-const ADDS = require('./additional');
+const DEFAULT_ROLES = ["root", "admin", "client", "user", "guest"];
 
-const DEFAULT_ROLES = ['root', 'admin', 'client', 'user', 'guest'];
+module.exports = class InitStatic {
+    static serveStatic = require("serve-static");
 
-module.exports = class InitStatic{
-
-  static serveStatic = require('serve-static');
-
-  static getUserRole(req){
-    if(req.user && req.user.role){
-      return req.user.role;
-    }else{
-      return 'guest';
+    static getUserRole(req) {
+        if (req.user && req.user.role) {
+            return req.user.role;
+        } else {
+            return "guest";
+        }
     }
-  }
 
-  static selectVersion(config, req, ext){
-    const rolesPriority = config.get('user:roles:priority') || DEFAULT_ROLES;
-    const userRole = InitStatic.getUserRole(req);
-    const frontAppRoot = config.get('path:front');
-    for (let role of rolesPriority) {
-      if (userRole.indexOf(role) > -1) {
-        return path.join(frontAppRoot, `${role}.${ext}`);
-      }
+    static selectVersion(config, req, ext) {
+        const rolesPriority =
+            config.get("user:roles:priority") || DEFAULT_ROLES;
+        const userRole = InitStatic.getUserRole(req);
+        const frontAppRoot = config.get("path:front");
+        for (let role of rolesPriority) {
+            if (userRole.indexOf(role) > -1) {
+                return path.join(frontAppRoot, `${role}.${ext}`);
+            }
+        }
+        return path.join(frontAppRoot, `guest.${ext}`);
     }
-    return path.join(frontAppRoot, `guest.${ext}`);
-  }
 
-  static createStaticFrontServer(ext, {config, options/*, master*/}){
-    return (req, res, next) => {
-      try{
-        const frontApp = InitStatic.selectVersion(config, req, ext);
-        let pathTo = path.resolve(options.pathToApp, frontApp);
-        return InitStatic.serveStatic(pathTo)(req, res, next);
-      }catch(e){
-        next(e);
-      }
-    };
-  }
+    static createStaticFrontServer(ext, { config, options /*, master*/ }) {
+        return (req, res, next) => {
+            try {
+                const frontApp = InitStatic.selectVersion(config, req, ext);
+                let pathTo = path.resolve(options.pathToApp, frontApp);
+                return InitStatic.serveStatic(pathTo)(req, res, next);
+            } catch (e) {
+                next(e);
+            }
+        };
+    }
 
-  async run({config, options, master}) {
-    await ADDS.run('static.pre', { config, options, master });
-    master.getServer().use('/front/(:role).js', InitStatic.createStaticFrontServer('js', {config, options, master}));
-    master.getServer().use('/front/(:role).css', InitStatic.createStaticFrontServer('css', {config, options, master}));
-    await ADDS.run('static.post', { config, options, master });
-  }
+    async run({ config, options, master }) {
+        await ADDS.run("static.pre", { config, options, master });
+        master.getServer().use(
+            "/front/(:role).js",
+            InitStatic.createStaticFrontServer("js", {
+                config,
+                options,
+                master,
+            })
+        );
+        master.getServer().use(
+            "/front/(:role).css",
+            InitStatic.createStaticFrontServer("css", {
+                config,
+                options,
+                master,
+            })
+        );
+        await ADDS.run("static.post", { config, options, master });
+    }
 };

package/src/init/template.js

@@ -1,23 +1,23 @@
-const log = require('not-log')(module, 'not-node//init');
-const ADDS = require('./additional');
+const log = require("not-log")(module, "not-node//init");
+const ADDS = require("./additional");
 
 const DEFAULT = {
-  views: 'views',
-  engine: 'pug'
+    views: "views",
+    engine: "pug",
 };
 
-module.exports = class InitTemplate{
-  static loadConfig({config}){
-    let val = config.get('template');
-    return val || DEFAULT;
-  }
+module.exports = class InitTemplate {
+    static loadConfig({ config }) {
+        let val = config.get("template");
+        return val || DEFAULT;
+    }
 
-  async run({ config, options, master }) {
-    const input = InitTemplate.loadConfig({config});
-    log.info('Setting up template (' + input.engine + ') engine...');
-    await ADDS.run('template.pre', { config, options, master, input });
-    master.getServer().set('views', master.getAbsolutePath(input.views));
-    master.getServer().set('view engine', input.engine);
-    await ADDS.run('template.post', { config, options, master });
-  }
+    async run({ config, options, master }) {
+        const input = InitTemplate.loadConfig({ config });
+        log.info("Setting up template (" + input.engine + ") engine...");
+        await ADDS.run("template.pre", { config, options, master, input });
+        master.getServer().set("views", master.getAbsolutePath(input.views));
+        master.getServer().set("view engine", input.engine);
+        await ADDS.run("template.post", { config, options, master });
+    }
 };