binhend 1.1.4 → 1.1.6

package/example_api/index.js

@@ -7,6 +7,7 @@ new Binh()
     .global('config', binh.config)
     .config('config')
     .api('routes')
+    .cors()
     .port('PORT')
     .cluster.fork(0)
     .start(function(server, configs) {

package/package.json

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

package/src/binh.server.app.js

@@ -8,15 +8,20 @@ const { APIs, Router } = require('./api');
 const maxcpus = os.cpus().length;
 
 function ServerApp(binh, Binh, configloader) {
-    var forkcount = 0,
-        rootpath = Binh.getRootpath();
+    var rootpath = Binh.getRootpath(),
+        forkcount = 0, enabledCORS, pathAPI, portNumber;
 
     binh.router = function(module) {
         return Router(module);
     };
 
-    Binh.api = function(api_path) {
-        Binh.api.value = path.join(rootpath, api_path);
+    Binh.api = function(apiPath) {
+        pathAPI = path.join(rootpath, apiPath);
+        return Binh;
+    };
+
+    Binh.cors = function(input) {
+        enabledCORS = input instanceof Function ? input : (input === false ? false : true);
         return Binh;
     };
 
@@ -33,10 +38,10 @@ function ServerApp(binh, Binh, configloader) {
 
     Binh.port = function(port) {
         if (typeof port === 'number') {
-            Binh.port.value = port;
+            portNumber = port;
         }
         else if (typeof port === 'string') {
-            Binh.port.value = binh.config(port);
+            portNumber = binh.config(port);
         }
         return Binh;
     };
@@ -55,8 +60,9 @@ function ServerApp(binh, Binh, configloader) {
     function launch(callback) {
         configloader.done(function(configs) {
             new Server({
-                port: Binh.port.value,
-                api: APIs(Binh.api.value),
+                port: portNumber,
+                api: APIs(pathAPI),
+                cors: enabledCORS,
                 web: Binh.web.value,
                 callback: callback,
                 configs: configs

package/src/binh.web.builder.js

@@ -4,42 +4,42 @@ const path = require('path');
 const Component = require('./component');
 
 function WebBuilder(binh, Binh) {
-    binh.ui = function(amodule, component, htmltags, links) {
+    binh.ui = function(module, component, htmltags, links) {
         component.htmltags = htmltags;
         component.links = links;
-        binh.bundle('ui', amodule, component);
+        binh.bundle('ui', module, component);
     };
 
-    binh.service = function(amodule, component, links) {
+    binh.service = function(module, component, links) {
         component.links = links;
-        binh.bundle('service', amodule, component);
+        binh.bundle('service', module, component);
     };
 
-    binh.style = function(amodule, component) {
-        binh.bundle('style', amodule, component);
+    binh.style = function(module, component) {
+        binh.bundle('style', module, component);
     };
 
-    binh.css = function(amodule, cssFilename) {
-        var cssFilePath = cssFilename && path.join(amodule.path, cssFilename) || amodule.filename.replace(/.js$/, '');
+    binh.css = function(module, cssFilename) {
+        var cssFilePath = cssFilename && path.join(module.path, cssFilename) || module.filename.replace(/.js$/, '');
         var content = require('fs').readFileSync(cssFilePath, { encoding: 'utf8', flag: 'r' });
         content = content.replace(/\s+/g, ' ');
         var component = new Function(`return ${JSON.stringify(content)};`);
-        binh.bundle('style', amodule, component);
+        binh.bundle('style', module, component);
     };
 
-    binh.bundle = function(type, amodule, component) {
+    binh.bundle = function(type, module, component) {
         if (!(component instanceof Function)) return;
 
         component.type = type;
-        component.filename = amodule.filename;
+        component.filename = module.filename;
         component.constructor = Component;
-        component.module = amodule;
+        component.module = module;
         component.as = alias;
         component.vars = {};
 
-        amodule.exports = component;
+        module.exports = component;
 
-        amodule.children.forEach(function(child) {
+        module.children.forEach(function(child) {
             child = child.exports;
             if (child.constructor !== Component) return;
             if (child.alias) component.vars[child.filename] = child.alias;

package/src/code.js

@@ -125,15 +125,29 @@ function IIF(codes) {
 }
 
 function distinctValues(component, key) {
-    var arrays = [component[key]];
+    var arrays = [component[key]], ref = {};
+
+    ref[component.filename] = true;
 
     component.module.children.forEach(function(child) {
+        if (ref[child.filename]) return;
+        ref[child.filename] = true;
         arrays.push(child.exports[key]);
+        getArraysFromDeeperChildren(ref, arrays, child, key);
     });
 
     return uniquefy(arrays);
 }
 
+function getArraysFromDeeperChildren(ref, arrays, module, key) {
+    module.children.forEach(function(child) {
+        if (ref[child.filename]) return;
+        ref[child.filename] = true;
+        arrays.push(child.exports[key]);
+        getArraysFromDeeperChildren(ref, arrays, child, key);
+    });
+}
+
 function uniquefy(arrays) {
     var map = {};
 

package/src/cors.js

@@ -0,0 +1,17 @@
+
+function defaultCORS(req, res, next) {
+    res.header('Access-Control-Allow-Origin', req.get('Origin') || '*');
+    res.header('Access-Control-Allow-Credentials', 'true');
+    res.header('Access-Control-Allow-Methods', 'GET,HEAD,PUT,PATCH,POST,DELETE');
+    res.header('Access-Control-Expose-Headers', 'Content-Length');
+    res.header('Access-Control-Allow-Headers', 'Accept, Authorization, Content-Type, X-Requested-With, Range');
+    if (req.method === 'OPTIONS') {
+        return res.send(200);
+    } else {
+        return next();
+    }
+}
+
+module.exports = {
+    defaultCORS
+};

package/src/server.js

@@ -1,9 +1,19 @@
+
 const express = require('express');
+const { defaultCORS } = require('./cors');
 
 function Server(options) {
     const server = express();
     const PORT = options.port || 1300;
     const WEB_DIRECTORY = options.web;
+    const CORS = options.cors;
+
+    if (CORS instanceof Function) {
+        server.use(CORS);
+    }
+    else if (CORS === true) {
+        server.use(defaultCORS);
+    }
 
     if (WEB_DIRECTORY) {
         server.use(express.static(WEB_DIRECTORY));
@@ -16,7 +26,7 @@ function Server(options) {
     if (WEB_DIRECTORY) {
         server.get('/*', (req, res) => res.sendFile('index.html', { root: WEB_DIRECTORY }));
     }
-    
+
     server.listen(PORT, function() {
         console.log(`[NODE] Server is listening on http://localhost:${PORT}/`);