binhend 2.1.23 → 2.1.25

package/package.json

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

package/src/configuration.js

@@ -1,11 +1,12 @@
 const fs = require('fs');
 const path = require('path');
-const { isEmptyArray, isArray, isObject } = require('./utils/types');
+const { isEmptyArray, isArray, isObject, mustString } = require('./utils/types');
 
 // @ts-ignore
-function ConfigLoader(configObject, { module } = {}) {
+function ConfigLoader(configObject, { rootPath } = {}) {
     const configs = configObject || {};
-    const rootPath = module?.path || require.main.path;
+
+    rootPath = mustString(rootPath) || require.main.path;
 
     this.getConfigs = () => {
         return configs;
@@ -22,8 +23,8 @@ function ConfigLoader(configObject, { module } = {}) {
             var filtered = isArray(filters) ? filter(object, filters) : object;
             Object.assign(config, filtered);
         }
-        catch(e) {
-            return failed(e, object);
+        catch (error) {
+            return failed(error, object);
         }
 
         return this;
@@ -46,7 +47,7 @@ function ConfigLoader(configObject, { module } = {}) {
 
 function filter(object, filterKeys) {
     if (!isObject(object) || isEmptyArray(filterKeys)) return {};
-    
+
     var filtered = {};
 
     filterKeys.forEach((field) => {
@@ -62,7 +63,7 @@ function json(path) {
     try {
         return require.main.require(path);
     }
-    catch(e) {
+    catch (e) {
         return failed(e, path);
     }
 }
@@ -82,7 +83,7 @@ function file(path, encoding) {
 
         return processKeyValueStrings(lines);
     }
-    catch(e) {
+    catch (e) {
         return failed(e, path);
     }
 }
@@ -96,7 +97,7 @@ function processKeyValueStrings(strings) {
 
     var regex_is_comment = /^#/;
 
-    strings.forEach(function(string) {
+    strings.forEach(function (string) {
         if (regex_is_comment.test(string.trim())) return;
 
         var parsed = parseKeyValue(string);

package/src/https.js

@@ -1,91 +1,92 @@
-// @ts-nocheck
 
 const https = require('https');
 
 function HTTPS(url) {
     this.url = url;
     this.parameters = [];
+};
 
-    this.get = function(callback) {
-        return this.request('GET', callback);
-    }
-    
-    this.post = function(callback) {
-        return this.request('POST', callback);
-    }
-    
-    this.request = function(method, callback) {
-        var URL = this.url + this.parameters.join('/') + (this.queries || '');
-    
-        var options = {
-            method,
-            headers: this.headers
-        };
-    
-        var req = https.request(URL, options, function(res) {
-            res.setEncoding('utf8');
-    
-            var data = '';
-    
-            res.on('data', (chunk) => {
-                data += chunk;
-            });
-    
-            res.on('end', () => {
-                var response;
-                
-                try {
-                    response = JSON.parse(data);
-                }
-                catch(error) {
-                    response = data;
-                }
-    
-                if (callback instanceof Function) {
-                    callback(response);
-                }
-            });
+HTTPS.prototype.get = function(callback) {
+    return this.request('GET', callback);
+}
+
+HTTPS.prototype.post = function(callback) {
+    return this.request('POST', callback);
+}
+
+HTTPS.prototype.request = function(method, callback) {
+
+    var URL = this.url + this.parameters.join('/') + (this.queries || '');
+
+    var options = {
+        method,
+        headers: this.headers
+    };
+
+    var req = https.request(URL, options, function(res) {
+        res.setEncoding('utf8');
+
+        var data = '';
+
+        res.on('data', (chunk) => {
+            data += chunk;
         });
-    
-        req.on("error", (err) => {
-            console.log("HTTPS request encounters error:" + err.message);
+
+        res.on('end', () => {
+            var response;
+            
+            try {
+                response = JSON.parse(data);
+            }
+            catch(error) {
+                response = data;
+            }
+
+            if (callback instanceof Function) {
+                callback(response);
+            }
         });
-    
-        if (this.payload) {
-            req.write(JSON.stringify(this.payload));
-        }
-    
-        req.end();
-    
-        return this;
-    }
-    
-    this.header = function(map) {
-        this.headers = map;
-        return this;
-    }
-    
-    this.body = function(map) {
-        this.payload = JSON.stringify(map);
-        return this;
+    });
+
+    req.on('error', (err) => {
+        console.error(`[BINHEND][HTTPS] Error request: ${method} ${URL}`);
+        console.error(`[BINHEND][HTTPS] --- Error message: ${err.message}`);
+    });
+
+    if (this.payload) {
+        req.write(JSON.stringify(this.payload));
     }
-    
-    this.parameter = function(array) {
-        if (array instanceof Array) {
-            var last_char = this.url[this.url.length - 1];
-            this.parameters = (last_char === '/' ? [] : ['']).concat(array);
-        }
-        return this;
+
+    req.end();
+
+    return this;
+}
+
+HTTPS.prototype.header = function(map) {
+    this.headers = map;
+    return this;
+}
+
+HTTPS.prototype.body = function(map) {
+    this.payload = JSON.stringify(map);
+    return this;
+}
+
+HTTPS.prototype.parameter = function(array) {
+    if (array instanceof Array) {
+        var lastChar = this.url[this.url.length - 1];
+        this.parameters = (lastChar === '/' ? [] : ['']).concat(array);
     }
-    
-    this.query = function(map) {
-        var query_string = '';
-        for (var key in map) {
-            query_string += key + '=' + map[key] + '&';
-        }
-        this.queries = '?' + query_string;
-        return this;
+    return this;
+}
+
+HTTPS.prototype.query = function(map) {
+    var queryString = '';
+    for (var key in map) {
+        queryString += key + '=' + map[key] + '&';
     }
-};
+    this.queries = '?' + queryString;
+    return this;
+}
 
 module.exports = { HTTPS };

package/src/middleware/cors.js

@@ -53,7 +53,8 @@ module.exports = (options) => {
 
         // Handle preflight OPTIONS request
         if (req.method === 'OPTIONS' && !preflightContinue) {
-            return res.sendStatus(mustNumber(optionsSuccessStatus, 204));
+            var statusCode = mustNumber(optionsSuccessStatus) || 204; // 204 - No Content
+            return res.sendStatus(statusCode);
         }
 
         return next();

package/src/web/component.format.js

@@ -30,16 +30,22 @@ function generate(sourceRootPath, outputRootPath, callbackDone) {
                 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 !== '.mjs') {
+
+            if (fileExtension !== '.js' && fileExtension !== '.cjs' && fileExtension !== '.mjs') {
                 // any files not JS (.css, .jpg, etc.) will be copied to build folder.
-                return cloneFileIfNew(fileSourcePath, fileOutputPath);
+                cloneFileIfNew(fileSourcePath, fileOutputPath);
+                return;
             }
 
-            var content = readFileSync(fileSourcePath, { encoding: 'utf8', flag: 'r' });
-            var code = PREFIX_CODE + mapConfigValues(content.trim()) + '\r\n\r\n;binh.final(module);';
+            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
+
+            if (fileExtension === '.js') {
+                // for .js files, build code and bind config values
+                formatCode = PREFIX_CODE + formatCode + '\r\n\r\n;binh.final(module);';
+            }
 
-            writeToFileIfNew(fileOutputPath, code);
+            writeToFileIfNew(fileOutputPath, formatCode);
         }
         catch (error) {
             printError('Failed formatting file:', fileSourcePath, error);