binhend 1.0.1 → 1.0.3

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "binhend",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "",
   "main": "index.js",
   "author": "Nguyen Duc Binh",
   "license": "UNLICENSED",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "example": "node example"
+    "example": "node example PORT=5555"
   },
   "dependencies": {
     "express": "^4.17.1"

package/src/api.js

@@ -44,12 +44,12 @@ function mapAPIs(dirpath, router) {
 }
 
 function APIs(rootpath) {
+    if (rootpath == undefined) return;
+
     const router = express.Router();
     router.use(express.urlencoded({ extended: false }));
     router.use(express.json());
 
-    rootpath = rootpath || join(__dirname, 'routes');
-
     setTimeout(function() {
         mapAPIs(rootpath, router);
     });

package/src/binh.js

@@ -15,12 +15,23 @@ function generateId() {
     crypto.randomUUID({ disableEntropyCache: true });
 }
 
+function defaultConfigLoader(loader) {
+    loader.object(process.env);
+
+    try {
+        loader.file('.env');
+    }
+    catch(e) {}
+
+    loader.cli();
+}
+
 function Binh() {
     var _this = this,
         forkcount = 0,
         rootpath = require.main.path;
 
-    var config = {}, loadConfigs = null, configloader = new ConfigLoader(config);
+    var config = {}, loadConfigs = null, groupLoadConfigs = [], configloader = new ConfigLoader(config);
 
     var binh = function(module_path) {
         return module_path == undefined ? module.exports : require(`${rootpath}/${module_path}`);
@@ -32,12 +43,15 @@ function Binh() {
 
     binh.config.reload = function() {
         return new Promise(function(resolve) {
-            if (loadConfigs instanceof Function) {
-                var loader = new ConfigLoader(config);
-                loadConfigs(loader);
-                loader.done(resolve);
-            }
-            else resolve(config);
+            var loader = new ConfigLoader(config);
+
+            groupLoadConfigs.forEach(function(loadConfigs) {
+                if (loadConfigs instanceof Function) {
+                    loadConfigs(loader);
+                }
+            });
+            
+            loader.done(resolve);
         });
     };
 
@@ -55,25 +69,31 @@ function Binh() {
     this.id = function(id) {
         binh.id = id == undefined ? generateId() : JSON.stringify(id);
         return this;
-    }
+    };
 
     this.global = function(name, target) {
         global[name] = target;
         return this;
-    }
+    };
 
     this.config = function(module) {
         if (module instanceof Function) {
             loadConfigs = module;
-            module(configloader);
+            loadConfigs(configloader);
         }
         else if (typeof module === 'string') {
             loadConfigs = binh(module);
             loadConfigs(configloader);
         }
+        else {
+            loadConfigs = defaultConfigLoader;
+            loadConfigs(configloader);
+        }
+
+        groupLoadConfigs.push(loadConfigs);
 
         return this;
-    }
+    };
 
     this.cluster = {
         fork: function(number) {
@@ -116,7 +136,7 @@ function Binh() {
         configloader.done(function(configs) {
             new Server({
                 port: _this.port.value,
-                api: new APIs(_this.api.value),
+                api: APIs(_this.api.value),
                 callback: callback,
                 configs: configs
             });

package/src/server.js

@@ -4,7 +4,7 @@ function Server(options) {
     const server = express();
     const PORT = options.port || 1300;
     
-    if (options.api) {
+    if (options.api instanceof Function) {
         server.use(options.api);
     }