binhend 2.1.29 → 2.1.31

package/demo.js

@@ -1,5 +1,6 @@
 
 const { HttpCodes, ConfigLoader, WebBuilder, HttpError, validation } = require('./index');
+const path = require('path');
 
 // var jsonPath = __dirname + '/jsconfig.json';
 // var cc = ConfigLoader.json(jsonPath);
@@ -11,4 +12,6 @@ const loader = new ConfigLoader(config);
 
 loader.object({ foo: '1', koo: '2', hoo: '3' }, { filter: ['koo', 'hoo'] });
 
-console.log('config', config);
+console.log('config', config);
+
+console.log(path.resolve(__dirname, './app.secret'));

package/package.json

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

package/src/configuration.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const path = require('path');
-const { isEmptyArray, isArray, isObject, mustString, isNullish, isEmptyString } = require('./utils/types');
+const { isEmptyArray, isArray, isObject, mustString, isNullish, isString } = require('./utils/types');
 
 // @ts-ignore
 function ConfigLoader(configObject, { rootPath } = {}) {
@@ -27,12 +27,6 @@ function ConfigLoader(configObject, { rootPath } = {}) {
         return this.object(cli(), options);
     };
 
-    this.json = (filepath, options = {}) => {
-        let filePath = path.resolve(rootPath, filepath);
-        let jsonObject = json(filePath);
-        return this.object(jsonObject, options);
-    };
-
     this.file = (filepath, options) => {
         let filePath = path.resolve(rootPath, filepath);
         return this.object(file(filePath, options?.encoding), options);
@@ -40,7 +34,6 @@ function ConfigLoader(configObject, { rootPath } = {}) {
 }
 
 ConfigLoader.cli = cli;
-ConfigLoader.json = json;
 ConfigLoader.file = file;
 ConfigLoader.require = require.main.require;
 
@@ -71,7 +64,7 @@ function assign(config, filtered, overwrite) {
 };
 
 function remap(object, use) {
-    if (isEmptyString(use)) return object;
+    if (!isString(use)) return object;
 
     for (var key in object) {
         const value = object[key];
@@ -83,33 +76,35 @@ function remap(object, use) {
     return object;
 };
 
-function json(path) {
-    try {
-        // return require.main.require(path);
-        return ConfigLoader.require(path);
-    }
-    catch (e) {
-        return failed(e, path);
-    }
-}
-
 function cli() {
     return processKeyValueStrings(process.argv);
 }
 
-function file(path, encoding) {
+function file(filepath, encoding) {
     encoding = encoding || 'utf8';
+
     try {
-        var source = fs.readFileSync(path, { encoding });
-        // @ts-ignore
-        source = source.replace(/\r\n?/mg, '\n');
-        // @ts-ignore
-        var lines = source.split('\n');
+        var fileExtension = path.parse(filepath).ext;
+
+        switch (fileExtension) {
+            case '.js':
+            case '.json':
+                return ConfigLoader.require(filepath);
+
+            default:
+                var source = fs.readFileSync(filepath, { encoding });
+                // @ts-ignore
+                source = source.replace(/\r\n?/mg, '\n');
+                // @ts-ignore
+                var lines = source.split('\n');
 
-        return processKeyValueStrings(lines);
+                return processKeyValueStrings(lines);
+        }
     }
-    catch (e) {
-        return failed(e, path);
+    catch (error) {
+        console.log(`[BINHEND] Failed loading config from: ${filepath}`);
+        console.log('[BINHEND] Details:', error);
+        return {};
     }
 }
 
@@ -146,10 +141,4 @@ function parseKeyValue(string) {
     return { key, value, success: true };
 }
 
-function failed(error, source) {
-    console.log(`[BINHEND] Failed loading config from: ${source}`);
-    console.log('[BINHEND] Details:', error);
-    return {};
-};
-
 module.exports = { ConfigLoader, config: {} };

package/src/middleware/cors.js

@@ -34,7 +34,10 @@ module.exports = (options) => {
         if (origin === undefined) return next();
 
         // Verify allowed origins
-        const allowedOrigin = allowedOrigins.length === 0 || allowedOrigins.includes(origin) ? origin : '';
+        const acceptLocalhost = allowedOrigins.includes('localhost') && /^https{0,1}:\/\/localhost:\d+$/.test(origin);
+        const acceptOrigin = acceptLocalhost || allowedOrigins.length === 0 || allowedOrigins.includes(origin);
+        const allowedOrigin = acceptOrigin ? origin : '';
+
         res.header('Access-Control-Allow-Origin', allowedOrigin);
 
         if (!allowedOrigin) {