binhend 1.1.6 → 1.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "binhend",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "",
   "main": "index.js",
   "author": "Nguyen Duc Binh",

package/src/api.js

@@ -43,6 +43,7 @@ function APIs(rootpath) {
     const router = express.Router();
     router.use(express.urlencoded({ extended: false }));
     router.use(express.json());
+    router.use(parseAuthToken);
 
     setTimeout(function() {
         mapAPIs(rootpath, router);
@@ -51,6 +52,14 @@ function APIs(rootpath) {
     return router;
 }
 
+function parseAuthToken(request, response, next) {
+    var authString = request.headers['authorization'];
+    if (typeof authString === 'string' && authString.startsWith('Bearer ')) {
+        request.token = authString.split('Bearer ')[1];
+    }
+    next();
+}
+
 function Router(module) {
     var router = express.Router();
 
@@ -66,9 +75,33 @@ function Router(module) {
         module.exports = router;
     }
 
+    output.trycatch = trycatch;
+
     return output;
 }
 
+function trycatch(callback, onerror) {
+    return async function(request, response, next) {
+        try {
+            return await callback(request, response, next);
+        }
+        catch (error) {
+            if (onerror instanceof Function) onerror(error);
+            else {
+                var info = typeof error.info === 'string' ? { error: error.info } : error.info;
+                response.status(error.httpCode || 500).json(info || { error: 'Internal Server Error' });
+            }
+        }
+    }
+}
+
+function HttpError(httpCode, info) {
+    var error = new Error(info);
+    error.httpCode = httpCode;
+    error.info = info;
+    return error;
+};
+
 module.exports = {
-    APIs, Router
+    APIs, Router, HttpError
 };

package/src/binh.server.app.js

@@ -3,7 +3,7 @@ const os = require('os');
 const cluster = require('cluster');
 const path = require('path');
 const { Server } = require('./server');
-const { APIs, Router } = require('./api');
+const { APIs, Router, HttpError } = require('./api');
 
 const maxcpus = os.cpus().length;
 
@@ -15,6 +15,8 @@ function ServerApp(binh, Binh, configloader) {
         return Router(module);
     };
 
+    binh.HttpError = HttpError;
+
     Binh.api = function(apiPath) {
         pathAPI = path.join(rootpath, apiPath);
         return Binh;

package/src/server.js

@@ -8,6 +8,18 @@ function Server(options) {
     const WEB_DIRECTORY = options.web;
     const CORS = options.cors;
 
+    // Handle error of ExpressJS: URIError: Failed to decode param
+    // Error happens when add wrong '%' (e.i. invalid encoded URI component) into the request URL
+    server.use(function(req, res, next) {
+        try {
+            decodeURIComponent(req.path);
+            next();
+        }
+        catch(e) {
+            res.redirect('/');
+        }
+    });
+
     if (CORS instanceof Function) {
         server.use(CORS);
     }