binhend 1.0.0 → 1.0.2

package/example/config.js

@@ -0,0 +1,4 @@
+
+module.exports = function(loader) {
+    loader.object({ PORT: 1400 });
+};

package/example/index.js

@@ -4,13 +4,11 @@ const { Binh } = require('../src/binh');
 
 new Binh()
     .id()
-    .rootpath(__dirname)
-    .config(function(loader) {
-        loader.object({ PORT: 1400 });
-    })
+    .global('config', binh.config)
+    .config('config')
     .api('routes')
-    .cluster.fork(-100)
-    .port(binh.config('PORT'))
+    .port('PORT')
+    .cluster.fork(0)
     .start(function(server, configs) {
         console.log('### START >>> configs:', configs);
-    });
+    });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "binhend",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "",
   "main": "index.js",
   "author": "Nguyen Duc Binh",
@@ -12,8 +12,6 @@
   "dependencies": {
     "express": "^4.17.1"
   },
-  "devDependencies": {
-  },
   "engines": {
     "node": ">= 16.17.1"
   }

package/src/api.js

@@ -44,13 +44,15 @@ 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');
-
-    mapAPIs(rootpath, router);
+    setTimeout(function() {
+        mapAPIs(rootpath, router);
+    });
     
     return router;
 }

package/src/binh.js

@@ -18,14 +18,14 @@ function generateId() {
 function Binh() {
     var _this = this,
         forkcount = 0,
-        rootpath = '';
+        rootpath = require.main.path;
+
+    var config = {}, loadConfigs = null, configloader = new ConfigLoader(config);
 
     var binh = function(module_path) {
         return module_path == undefined ? module.exports : require(`${rootpath}/${module_path}`);
     };
 
-    var config = {}, loadConfigs = null, configloader = new ConfigLoader(config);
-
     binh.config = function(key) {
         return typeof key === 'string' ? config[key] : config;
     };
@@ -48,7 +48,7 @@ function Binh() {
     global.binh = binh;
 
     this.rootpath = function(path) {
-        rootpath = typeof path === 'string' ? path : '';
+        rootpath = typeof path === 'string' ? path : require.main.path;
         return this;
     };
 
@@ -57,11 +57,21 @@ function Binh() {
         return this;
     }
 
-    this.config = function(callback) {
-        if (callback instanceof Function) {
-            loadConfigs = callback;
-            callback(configloader);
+    this.global = function(name, target) {
+        global[name] = target;
+        return this;
+    }
+
+    this.config = function(module) {
+        if (module instanceof Function) {
+            loadConfigs = module;
+            module(configloader);
         }
+        else if (typeof module === 'string') {
+            loadConfigs = binh(module);
+            loadConfigs(configloader);
+        }
+
         return this;
     }
 
@@ -77,12 +87,17 @@ function Binh() {
     };
 
     this.api = function(api_path) {
-        this.api.value = new APIs(`${rootpath}/${api_path}`);
+        this.api.value =`${rootpath}/${api_path}`;
         return this;
     };
 
     this.port = function(port) {
-        this.port.value = port;
+        if (typeof port === 'number') {
+            this.port.value = port;
+        }
+        else if (typeof port === 'string') {
+            this.port.value = config[port];
+        }
         return this;
     };
 
@@ -99,14 +114,12 @@ function Binh() {
 
     function launch(callback) {
         configloader.done(function(configs) {
-            var server = new Server({
+            new Server({
                 port: _this.port.value,
-                api: _this.api.value
+                api: APIs(_this.api.value),
+                callback: callback,
+                configs: configs
             });
-
-            if (callback instanceof Function) {
-                callback(server, configs);
-            }
         });
     }
 

package/src/server.js

@@ -4,12 +4,16 @@ function Server(options) {
     const server = express();
     const PORT = options.port || 1300;
     
-    if (options.api) {
+    if (options.api instanceof Function) {
         server.use(options.api);
     }
     
     server.listen(PORT, function() {
         console.log(`[NODE] Server is listening on http://localhost:${PORT}/`);
+
+        if (options.callback instanceof Function) {
+            options.callback(server, options.configs);
+        }
     });
 
     return server;