binhend 2.0.8 → 2.1.1

package/package.json

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

package/src/api/loader.js

@@ -2,6 +2,7 @@ const { readdirSync, statSync } = require('fs');
 const { join, parse, resolve } = require('path');
 const { isUndefined } = require('../utils/typeOf');
 const { server } = require('../server');
+const { cors } = require('../cors');
 const express = require('express');
 const parseBasicAuthToken = require('../middleware/parseBasicAuthToken');
 
@@ -49,7 +50,8 @@ function loadRouter(dirPath) {
     return router;
 }
 
-function loadRoutes(dirPath) {
+function loadRoutes(dirPath, corsOptions) {
+    server.use(cors(corsOptions));
     const router = loadRouter(dirPath);
     server.use(router);
 }

package/src/binh.js

@@ -2,6 +2,7 @@
 const typeOf = require('./utils/typeOf');
 const security = require('./security');
 const createCSD = require('./csd');
+const cors = require('./cors');
 const { server } = require('./server');
 const { loadRouter, loadRoutes, mapRoutes, trycatch, Router, HttpError } = require('./api');
 const { ConfigLoader } = require('./configuration');
@@ -15,6 +16,7 @@ module.exports = {
     typeOf,
     security,
     createCSD,
+    cors,
     server,
     loadRouter, loadRoutes, mapRoutes, trycatch, Router, HttpError,
     ConfigLoader,

package/src/cors.js

@@ -0,0 +1,61 @@
+
+const { isArray, mustArray, mustNumber } = require('./utils/typeOf');
+
+const defaultOptions = {
+    origins: [],
+    credentials: true,
+    methods: ['GET', 'POST', 'PUT', 'DELETE'],
+    preflightContinue: false,
+    optionsSuccessStatus: 204, // No Content
+    exposedHeaders: [],
+    allowHeaders: ['Content-Type', 'Authorization'],
+    maxAge: 600 // seconds
+}
+
+function arrayToString(array) {
+    return isArray(array) ? array.join(',') : '';
+}
+
+function addHeader(response, key, value) {
+    if (value) response.header(key, value.toString());
+}
+
+module.exports = (options) => {
+    // Parse options
+    var { origins, credentials, methods, preflightContinue, optionsSuccessStatus, exposedHeaders, allowHeaders, maxAge } = Object.assign({}, defaultOptions, options);
+
+    const allowedOrigins = mustArray(origins);
+
+    // Create a new middleware
+    return function (req, res, next) {
+        const origin = req.headers.origin;
+
+        // Same-origin request, skip CORS
+        if (origin === undefined) return next();
+
+        // Verify allowed origins
+        const allowedOrigin = allowedOrigins.length === 0 || allowedOrigins.includes(origin) ? origin : '';
+        res.header('Access-Control-Allow-Origin', allowedOrigin);
+
+        if (!allowedOrigin) {
+            console.error(`Blocked by CORS: ${origin}`);
+            return res.sendStatus(403); // Forbidden
+        }
+
+        // Set CORS headers
+        addHeader(res, 'Access-Control-Allow-Credentials', !!credentials);
+        addHeader(res, 'Access-Control-Allow-Methods', arrayToString(methods));
+        addHeader(res, 'Access-Control-Expose-Headers', arrayToString(exposedHeaders));
+        addHeader(res, 'Access-Control-Allow-Headers', arrayToString(allowHeaders));
+
+        // Cache preflight response
+        addHeader(res, 'Access-Control-Max-Age', mustNumber(maxAge));
+
+        // Handle preflight OPTIONS request
+        if (req.method === 'OPTIONS' && !preflightContinue) {
+            return res.sendStatus(mustNumber(optionsSuccessStatus, 204));
+        }
+
+        return next();
+    }
+};

package/src/utils/typeOf.js

@@ -11,20 +11,22 @@ function isEmptyObject(input) {
     return isObject(input) && Object.keys(input).length === 0;
 }
 
-function isArray(input) {
-    return Array.isArray(input);
-}
+const { isArray } = Array;
 
 function isEmptyArray(input) {
     return isArray(input) && input.length === 0;
 }
 
+function mustArray(input, defaultOutput = []) {
+    return isArray(input) ? input : isArray(defaultOutput) ? defaultOutput : [defaultOutput];
+}
+
 function isFunction(input) {
     return typeof input === 'function';
 }
 
 function isString(input) {
-    return typeOf(input) === 'String';
+    return typeof input === 'string' || typeOf(input) === 'String';
 }
 
 function isEmptyString(input) {
@@ -32,7 +34,11 @@ function isEmptyString(input) {
 }
 
 function isNumber(input) {
-    return typeOf(input) === 'Number';
+    return typeof input === 'number' || typeOf(input) === 'Number';
+}
+
+function mustNumber(input, defaultValue) {
+    return isNumber(input) ? input : isNumber(defaultValue) ? defaultValue : 0;
 }
 
 function isBigInt(input) {
@@ -44,7 +50,7 @@ function isSymbol(input) {
 }
 
 function isBoolean(input) {
-    return typeOf(input) === 'Boolean';
+    return typeof input === 'boolean' || typeOf(input) === 'Boolean';
 }
 
 function isNull(input) {
@@ -65,12 +71,14 @@ module.exports = Object.assign(typeOf, {
     isEmptyObject,
     isArray,
     isEmptyArray,
+    mustArray,
     isFunction,
     isNull,
     isUndefined,
     isNullOrUndefined,
     isBoolean,
     isNumber,
+    mustNumber,
     isString,
     isEmptyString,
     isSymbol,