miolo 0.0.9 → 0.0.13

package/lib/config/defaults.js

@@ -198,7 +198,10 @@ module.exports = {
     //                   // auth=> done(null, user) noauth=> done(null, false, {message: ''}) err=> done(error, null)
     //  url_login : '/login',
     //  url_logout: '/logout',
-    //  url_logout_redirect: '/
+    //  url_login_redirect: undefined
+    //  url_logout_redirect: '/'
     //}
-  }
+  },
+  middlewares: [// (ctx) => {}
+  ]
 };

package/lib/logger/index.js

@@ -24,8 +24,8 @@ var init_logger = (config, emailer) => {
     silly: _farrapaColors.gray,
     debug: _farrapaColors.magenta,
     verbose: _farrapaColors.cyan,
-    info: _farrapaColors.blue,
-    warn: _farrapaColors.yellow,
+    info: _farrapaColors.yellow,
+    warn: _farrapaColors.red_light,
     error: _farrapaColors.red
   };
   var myFormat = printf(info => {

package/lib/server/index.js

@@ -15,6 +15,8 @@ var _logger = require("../logger");
 
 var _cron = require("./engines/cron");
 
+var _conn = require("../db/conn");
+
 var _context = require("./middleware/context");
 
 var _body = require("./middleware/body");
@@ -23,7 +25,7 @@ var _catcher = require("./middleware/catcher");
 
 var _static = require("./middleware/static");
 
-var _conn = require("../db/conn");
+var _extra = require("./middleware/extra");
 
 var _request = require("./middleware/request");
 
@@ -112,7 +114,14 @@ function _miolo() {
     } // Socket.io
     // const io= init_socket(logger)
     // io.attach(app)
-    // Middleware for html render
+    // extra middlewares
+
+
+    var extra_middlewares = config === null || config === void 0 ? void 0 : config.middlewares;
+
+    if (extra_middlewares) {
+      (0, _extra.init_extra_middlewares)(app, extra_middlewares);
+    } // Middleware for html render
 
 
     if (render == undefined || render.html != undefined) {

package/lib/server/middleware/auth/passport.js

@@ -40,14 +40,16 @@ var init_passport_auth_middleware = (app, options) => {
     local_auth_user,
     url_login,
     url_logout,
+    url_login_redirect,
     url_logout_redirect
   } = options; //const local_options = {}
+  // fallback funcs
 
   var get_user_id_f = get_user_id || def_get_user_id;
   var find_user_by_id_f = find_user_by_id || def_find_user_by_id;
   var local_auth_user_f = local_auth_user || def_local_auth_user;
   var url_login_f = url_login || '/login';
-  var url_logout_f = url_logout || '/logout';
+  var url_logout_f = url_logout || '/logout'; // init passport
 
   var serialize_user = (user, done) => {
     process.nextTick(function () {
@@ -68,20 +70,10 @@ var init_passport_auth_middleware = (app, options) => {
   passport.deserializeUser(deserialize_user);
   passport.use(local_strategy);
   app.use(passport.initialize());
-  app.use(passport.session());
-  var login_router = new Router();
-  /*login_router.post(url_login_f, passport.authenticate('local', {
-    successRedirect: '/',
-    failureRedirect: '/', // /login
-    //failureMessage: true
-  }))*/
+  app.use(passport.session()); // handle auth routes
 
-  login_router.post(url_login_f, function (ctx, next) {
+  var handleLogIn = (ctx, next) => {
     return passport.authenticate('local', function (err, user, info, status) {
-      // console.log('[PASS AUTH] Error', err)
-      // console.log('[PASS AUTH] User', user)
-      // console.log('[PASS AUTH] Info', info)
-      // console.log('[PASS AUTH] Status', status)
       if (user === false) {
         ctx.body = {
           success: false,
@@ -97,14 +89,23 @@ var init_passport_auth_middleware = (app, options) => {
           user: user,
           authenticated: true
         };
+
+        if (url_login_redirect != undefined) {
+          ctx.redirect(url_login_redirect);
+        }
+
         return ctx.login(user);
       }
     })(ctx);
-  });
-  login_router.post(url_logout_f, /*#__PURE__*/function () {
+  };
+
+  var handleLogOut = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(function* (ctx) {
       if (ctx.isAuthenticated()) {
         ctx.logout();
+        ctx.body = {
+          success: true
+        };
 
         if (url_logout_redirect != undefined) {
           ctx.redirect(url_logout_redirect);
@@ -117,10 +118,16 @@ var init_passport_auth_middleware = (app, options) => {
       }
     });
 
-    return function (_x) {
+    return function handleLogOut(_x) {
       return _ref.apply(this, arguments);
     };
-  }());
+  }(); // Init the router
+
+
+  var login_router = new Router();
+  login_router.post(url_login_f, handleLogIn);
+  login_router.get(url_logout_f, handleLogOut);
+  login_router.post(url_logout_f, handleLogOut);
   app.use(login_router.routes());
 };
 

package/lib/server/middleware/{catcher.js → catcher/index.js}

@@ -13,6 +13,8 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  * Middleware for catching errors thrown in routes
  * @param ctx
  */
+var _ONLY_WARN = [401];
+
 function init_catcher_middleware(app, logger) {
   function catcher_middleware(_x) {
     return _catcher_middleware.apply(this, arguments);
@@ -20,18 +22,23 @@ function init_catcher_middleware(app, logger) {
 
   function _catcher_middleware() {
     _catcher_middleware = _asyncToGenerator(function* (err) {
-      if (!err) return;
-      logger.error(err);
+      if (!err) return; // Get HTML status code
+
       var status = err.status || 400;
       var type = this.accepts(['text', 'json', 'html']);
 
       if (!type) {
         status = 406;
         err.message = 'Unsupported type';
-      }
-
-      if (typeof status != 'number') {
+      } else if (typeof status != 'number') {
         status = 500;
+      } // Log the error depending on the status
+
+
+      if (_ONLY_WARN.indexOf(status) >= 0) {
+        logger.warn("".concat(this.method, " ").concat(this.url, " - ").concat(status, ": ").concat(err.message));
+      } else {
+        logger.error(err);
       } // Nothing we can do here other than delegate to the app-level handler and log.
 
 
@@ -39,7 +46,8 @@ function init_catcher_middleware(app, logger) {
         logger.debug('headers were already sent, returning early');
         err.headerSent = true;
         return;
-      }
+      } // Prepare response a bit
+
 
       this.type = 'json';
       this.status = status;

package/lib/server/middleware/extra.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.init_extra_middlewares = void 0;
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+var init_extra_middlewares = (app, middlewares) => {
+  if (middlewares == undefined || middlewares.length == 0) {
+    return;
+  }
+
+  middlewares.map(midw => {
+    function extra_middleware(_x, _x2) {
+      return _extra_middleware.apply(this, arguments);
+    }
+
+    function _extra_middleware() {
+      _extra_middleware = _asyncToGenerator(function* (ctx, next) {
+        midw(ctx);
+        yield next();
+      });
+      return _extra_middleware.apply(this, arguments);
+    }
+
+    app.use(extra_middleware);
+  });
+};
+
+exports.init_extra_middlewares = init_extra_middlewares;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miolo",
-  "version": "0.0.9",
+  "version": "0.0.13",
   "description": "miolo",
   "main": "lib/index.js",
   "author": "Afialapis <info@afialapis.com>",

package/src/config/defaults.js

@@ -196,9 +196,12 @@ module.exports= {
     //                   // auth=> done(null, user) noauth=> done(null, false, {message: ''}) err=> done(error, null)
     //  url_login : '/login',
     //  url_logout: '/logout',
-    //  url_logout_redirect: '/
+    //  url_login_redirect: undefined
+    //  url_logout_redirect: '/'
     //}
-  }
-
+  },
+  middlewares: [
+    // (ctx) => {}
+  ]
 };
 

package/src/logger/index.js

@@ -1,4 +1,4 @@
-import { red, blue, cyan, magenta, yellow, gray } from 'farrapa-colors'
+import { red, cyan, magenta, yellow, gray, red_light } from 'farrapa-colors'
 /* https://github.com/winstonjs/winston/issues/925 */
 /* https://github.com/winstonjs/winston/issues/287 */
 const { createLogger, format, transports } = require('winston')
@@ -10,8 +10,8 @@ const init_logger = (config, emailer) => {
     silly  : gray,
     debug  : magenta,
     verbose: cyan,
-    info   : blue,
-    warn   : yellow,
+    info   : yellow,
+    warn   : red_light,
     error  : red
   }
 

package/src/server/index.js

@@ -5,17 +5,19 @@ import { init_logger } from 'src/logger'
 import { init_cron } from './engines/cron'
 // import {init_socket} from './engines/socket'
 
+import { init_db_connection } from 'src/db/conn'
+
 import { init_context_middleware } from './middleware/context'
 import { init_body_middleware } from './middleware/body'
 import { init_catcher_middleware } from './middleware/catcher'
 import { init_static_middleware } from './middleware/static'
-
-import { init_db_connection } from 'src/db/conn'
+import { init_extra_middlewares } from './middleware/extra'
 
 import { init_request_middleware } from './middleware/request'
 import { init_session_middleware } from './middleware/session'
 import { init_route_robots } from './routes/robots'
 import { init_route_catch_js_error} from './routes/catch_js_error'
+
 import { init_route_html_render} from './routes/html_render'
 
 async function miolo(sconfig, render, callback) {
@@ -34,6 +36,7 @@ async function miolo(sconfig, render, callback) {
 
   // Assign miolo stuff to ctx
   init_context_middleware(app, config, logger, emailer, conn)
+
   // Compress and body parser
   init_body_middleware(app)
 
@@ -82,6 +85,12 @@ async function miolo(sconfig, render, callback) {
   // const io= init_socket(logger)
   // io.attach(app)
 
+  // extra middlewares
+  const extra_middlewares= config?.middlewares
+  if (extra_middlewares) {
+    init_extra_middlewares(app, extra_middlewares)
+  }
+
   // Middleware for html render
   if (render==undefined || render.html!=undefined) {
     init_route_html_render(app, render?.html)

package/src/server/middleware/auth/passport.js

@@ -25,18 +25,18 @@ const def_local_auth_user = (username, password, done) => {
 
 const init_passport_auth_middleware = ( app, options ) => {
   const {get_user_id, find_user_by_id, local_auth_user, 
-         url_login, url_logout, url_logout_redirect} = options
+         url_login, url_logout, url_login_redirect, url_logout_redirect} = options
 
   //const local_options = {}
 
+  // fallback funcs
   const get_user_id_f = get_user_id || def_get_user_id
   const find_user_by_id_f = find_user_by_id || def_find_user_by_id
   const local_auth_user_f = local_auth_user || def_local_auth_user
   const url_login_f = url_login || '/login'
   const url_logout_f = url_logout || '/logout'
-
-
   
+  // init passport
   const serialize_user = (user, done) => {
     process.nextTick(function() {
       get_user_id_f(user, done)
@@ -53,7 +53,6 @@ const init_passport_auth_middleware = ( app, options ) => {
     (username, password, done) => {
       local_auth_user_f(username, password, done)
   })
-
   
   passport.serializeUser(serialize_user)
   passport.deserializeUser(deserialize_user)
@@ -61,22 +60,11 @@ const init_passport_auth_middleware = ( app, options ) => {
 
   app.use(passport.initialize())
   app.use(passport.session())
-
-
-  const login_router = new Router()
-  /*login_router.post(url_login_f, passport.authenticate('local', {
-    successRedirect: '/',
-    failureRedirect: '/', // /login
-    //failureMessage: true
-  }))*/
   
-  login_router.post(url_login_f, function(ctx, next) {
 
+  // handle auth routes
+  const handleLogIn = (ctx, next) => {
     return passport.authenticate('local', function(err, user, info, status) {
-      // console.log('[PASS AUTH] Error', err)
-      // console.log('[PASS AUTH] User', user)
-      // console.log('[PASS AUTH] Info', info)
-      // console.log('[PASS AUTH] Status', status)
       if (user === false) {
         ctx.body = { 
           success: false,
@@ -92,14 +80,21 @@ const init_passport_auth_middleware = ( app, options ) => {
           user : user,
           authenticated: true
         }
+        if (url_login_redirect!=undefined) {
+          ctx.redirect(url_login_redirect)
+        }
+
         return ctx.login(user)
       }
     })(ctx)
-  })
+  }
 
-  login_router.post(url_logout_f, async (ctx) => {
+  const handleLogOut = async (ctx) => {
     if (ctx.isAuthenticated()) {
       ctx.logout()
+      ctx.body = { 
+        success: true 
+      }      
       if (url_logout_redirect!=undefined) {
         ctx.redirect(url_logout_redirect)
       }
@@ -109,7 +104,13 @@ const init_passport_auth_middleware = ( app, options ) => {
       }
       ctx.throw(401)
     }
-  })
+  }
+  
+  // Init the router
+  const login_router = new Router()
+  login_router.post(url_login_f,  handleLogIn)
+  login_router.get (url_logout_f, handleLogOut)
+  login_router.post(url_logout_f, handleLogOut)
   
   app.use(login_router.routes())
 }

package/src/server/middleware/{catcher.js → catcher/index.js}

@@ -3,24 +3,30 @@
  * @param ctx
  */
 
+const _ONLY_WARN= [401]
+
 function init_catcher_middleware(app, logger) {
   
   async function catcher_middleware(err) {
 
     if (!err) return
 
-    logger.error(err)
-
+    // Get HTML status code
     let status = err.status || 400
-
     const type = this.accepts(['text', 'json', 'html'])
     if (!type) {
       status = 406;
       err.message = 'Unsupported type'
+    } else  if (typeof status != 'number') {
+      status = 500
     }
 
-    if (typeof status != 'number') {
-      status = 500
+    // Log the error depending on the status
+
+    if (_ONLY_WARN.indexOf(status)>=0) {
+      logger.warn(`${this.method} ${this.url} - ${status}: ${err.message}`)
+    } else {
+      logger.error(err)
     }
 
     // Nothing we can do here other than delegate to the app-level handler and log.
@@ -30,9 +36,9 @@ function init_catcher_middleware(app, logger) {
       return
     }
 
+    // Prepare response a bit
     this.type = 'json'
     this.status = status
-
     this.body = JSON.stringify(this.body || '', null, 2)
     this.length = Buffer.byteLength(this.body)
     this.res.end(this.body)

package/src/server/middleware/extra.js

@@ -0,0 +1,18 @@
+
+const init_extra_middlewares = ( app, middlewares  ) => {
+  if (middlewares==undefined || middlewares.length==0) {
+    return
+  }
+
+  middlewares.map(midw => {
+
+    async function extra_middleware(ctx, next) {
+      midw(ctx) 
+      await next()
+    }
+  
+    app.use(extra_middleware)
+  })
+}
+
+export { init_extra_middlewares }