binhend 1.1.7 → 1.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "binhend",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "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,32 @@ 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) return onerror(error);
+            var message = error instanceof HttpError && error.message || 'Internal Server Error';
+            response.status(error.code || 500).json({ error: message });
+        }
+    }
+}
+
+class HttpError extends Error {
+    constructor(code, message) {
+        super(message);
+        this.name = 'HttpError';
+        this.code = code;
+    }
+}
+
 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;