binhend 2.1.30 → 2.1.32

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.30",
+  "version": "2.1.32",
   "description": "",
   "main": "index.js",
   "author": "Nguyen Duc Binh",

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) {

package/src/web/component.format.js

@@ -1,6 +1,6 @@
 const { config } = require('../configuration');
 const { readFileSync } = require('fs');
-const { parse } = require('path');
+const { parseFileName } = require('./filename-parser');
 const { scanNestedFiles, cloneFileIfNew, printError, makeFullDirPath, writeToFileIfNew } = require('./component.file');
 
 const PREFIX_CODE =
@@ -23,25 +23,25 @@ function generate(sourceRootPath, outputRootPath, callbackDone) {
         try {
             makeFullDirPath(fileOutputPath);
 
-            var fileExtension = parse(file.name).ext;
-    
-            if (fileExtension === '.css') {
+            var filename = parseFileName(file.name);
+
+            if (filename.ext === '.css') {
                 var cssModuleCode = 'binh.css(module);';
                 writeToFileIfNew(fileOutputPath + '.js', cssModuleCode);
                 // not return here, but wait for next "if" statement to be copied to build folder, then return there.
             }
 
-            if (fileExtension !== '.js' && fileExtension !== '.cjs' && fileExtension !== '.mjs') {
+            if (filename.ext !== '.js' && filename.ext !== '.cjs' && filename.ext !== '.mjs') {
                 // any files not JS (.css, .jpg, etc.) will be copied to build folder.
                 cloneFileIfNew(fileSourcePath, fileOutputPath);
                 return;
             }
 
             var fileContent = readFileSync(fileSourcePath, { encoding: 'utf8', flag: 'r' });
-            var formatCode = mapConfigValues(fileContent.trim()); // for .cjs (common js) and .mjs (module js) files, not build code but still bind config values
+            var formatCode = mapConfigValues(fileContent.trim()); // for .c.js files, not build code but still bind config values
 
-            if (fileExtension === '.js') {
-                // for .js files, build code and bind config values
+            if (filename.ext2 !== '.c.js') {
+                // except for .c.js files, build code and bind config values for other JS files (.js, .cjs, .mjs)
                 formatCode = PREFIX_CODE + formatCode + '\r\n\r\n;binh.final(module);';
             }
 

package/src/web/filename-parser.js

@@ -0,0 +1,24 @@
+
+
+const { parse } = require('path');
+
+function parseFileName(filename) {
+    const parsed = parse(filename);
+    const segments = parsed.base.split('.');
+
+    var ext2 = parsed.ext;
+
+    if (segments.length >= 3) {
+        // last two segments form the level 2 extension
+        ext2 = '.' + segments.slice(-2).join('.');
+    }
+
+    return {
+        ...parsed,
+        ext2,
+    };
+}
+
+module.exports = {
+    parseFileName
+};