gina 0.1.6-alpha.13 → 0.1.6-alpha.131

package/framework/{v0.1.6-alpha.13 → v0.1.6-alpha.131}/core/server.js

@@ -4,14 +4,15 @@ const fs            = require('fs');
 const os            = require('os');
 const path          = require('path');
 const EventEmitter  = require('events').EventEmitter;
-const Busboy        = require('./deps/busboy');
+const swig          = require('./deps/swig-1.4.2');
+const Busboy        = require('./deps/busboy-1.6.0');
 const Stream        = require('stream');
 const zlib          = require('zlib'); // gzip / deflate
 const util          = require('util');
 var https           = require('https');
 const sslChecker    = require('ssl-checker');
 
-const swig          = require( _(GINA_FRAMEWORK_DIR +'/node_modules/swig', true) );
+
 var Config          = require('./config');
 var Router          = require('./router');
 var lib             = require('./../lib');
@@ -21,6 +22,8 @@ var merge           = lib.merge;
 var Proc            = lib.Proc;
 var console         = lib.logger;
 var SwigFilters     = lib.SwigFilters;
+var Domain          = lib.Domain;
+var domainLib       = new Domain();
 
 function Server(options) {
 
@@ -48,7 +51,7 @@ function Server(options) {
         var swigOptions = {
             autoescape: ( typeof(conf.autoescape) != 'undefined') ? conf.autoescape: false,
             loader: swig.loaders.fs(dir),
-            cache: (conf.cacheless) ? false : 'memory'
+            cache: (conf.isCacheless) ? false : 'memory'
         };
 
         swig.setDefaults(swigOptions);
@@ -293,6 +296,24 @@ function Server(options) {
 
         if (failed) {
             if (sslDetails.daysRemaining > -1) {
+                var isProxyHost = getContext('isProxyHost');
+                if ( /^true$/i.test(isProxyHost) ) {
+                    console.warn("Host is behind a reverse proxy, skipping server.verifyCertificate(...) ");
+                    return;
+                }
+                var rootDomain = domainLib.getRootDomain(endpoint).value;
+                hasMatchedEntry = false;
+                for (let i in sslDetails.validFor) {
+                    if ( new RegExp(sslDetails.validFor[i].replace(/^\*\./, '') + '$').test(rootDomain) ) {
+                        hasMatchedEntry = true;
+                        break;
+                    }
+                }
+                if (!hasMatchedEntry) {
+                    console.warn(`[Certificate] "${endpoint}" : Root domain not matching your certificate. If you plan to run your service behind a revese proxy, please do not forget to add "proxy.json" at the root of your project while going to production.${'\n'} ${humanView}`);
+                    return;
+                }
+                // sslDetails.validFor
                 console.emerg(`[Certificate] ${endpoint} : It is like there is a problem with your CA certificate${'\n'} ${humanView}`);
                 return;
             }
@@ -331,7 +352,7 @@ function Server(options) {
             , serverCoreConf        = self.conf.core
             , routing               = {}
             , reverseRouting        = {}
-            , cacheless             = config.isCacheless()
+            , isCacheless           = config.isCacheless()
             , env                   = self.env
             , scope                 = self.scope
             , apps                  = conf.allBundles // conf.bundles
@@ -371,7 +392,7 @@ function Server(options) {
                     filename = main
                 }
 
-                if (cacheless) {
+                if (isCacheless) {
                     delete require.cache[require.resolve(_(filename, true))]
                 }
 
@@ -424,15 +445,15 @@ function Server(options) {
                         }
 
                         if (typeof(tmp[rule].url) != 'object') {
-                            if (tmp[rule].url.length > 1 && tmp[rule].url.substr(0,1) != '/') {
+                            if (tmp[rule].url.length > 1 && tmp[rule].url.substring(0,1) != '/') {
                                 tmp[rule].url = '/'+tmp[rule].url
                             }
-                            /** else if (tmp[rule].url.length > 1 && conf.envConf[apps[i]][env].server.webroot.substr(conf.envConf[apps[i]][env].server.webroot.length-1,1) == '/') {
-                                tmp[rule].url = tmp[rule].url.substr(1)
+                            /** else if (tmp[rule].url.length > 1 && conf.envConf[apps[i]][env].server.webroot.substring(conf.envConf[apps[i]][env].server.webroot.length-1,1) == '/') {
+                                tmp[rule].url = tmp[rule].url.substring(1)
                             }*/
                             else {
-                                if (wroot.substr(wroot.length-1,1) == '/') {
-                                    wroot = wroot.substr(wroot.length-1,1).replace('/', '')
+                                if (wroot.substring(wroot.length-1,1) == '/') {
+                                    wroot = wroot.substring(wroot.length-1,1).replace('/', '')
                                 }
                             }
 
@@ -448,8 +469,8 @@ function Server(options) {
                                     localWroot = '/'+ routing[rule].bundle;
                                     conf.envConf[tmp[rule].bundle][env].server.webroot = localWroot
                                 }
-                                if (localWroot.substr(localWroot.length-1,1) == '/') {
-                                    localWroot = localWroot.substr(localWroot.length-1,1).replace('/', '')
+                                if (localWroot.substring(localWroot.length-1,1) == '/') {
+                                    localWroot = localWroot.substring(localWroot.length-1,1).replace('/', '')
                                 }
                                 if ( typeof(tmp[rule].param.ignoreWebRoot) == 'undefined' || !tmp[rule].param.ignoreWebRoot )
                                     tmp[rule].url = localWroot + tmp[rule].url
@@ -463,11 +484,11 @@ function Server(options) {
                         } else {
 
                             for (var u=0; u<tmp[rule].url.length; ++u) {
-                                if (tmp[rule].url[u].length > 1 && tmp[rule].url[u].substr(0,1) != '/') {
+                                if (tmp[rule].url[u].length > 1 && tmp[rule].url[u].substring(0,1) != '/') {
                                     tmp[rule].url[u] = '/'+tmp[rule].url[u]
                                 } else {
-                                    if (wroot.substr(wroot.length-1,1) == '/') {
-                                        wroot = wroot.substr(wroot.length-1,1).replace('/', '')
+                                    if (wroot.substring(wroot.length-1,1) == '/') {
+                                        wroot = wroot.substring(wroot.length-1,1).replace('/', '')
                                     }
                                 }
                                 if ( typeof(tmp[rule].param.ignoreWebRoot) == 'undefined' || !tmp[rule].param.ignoreWebRoot )
@@ -584,7 +605,7 @@ function Server(options) {
         ) {
 
             // by default
-            path = url.replace(url.substr(url.lastIndexOf('/')+1), '');
+            path = url.replace(url.substring(url.lastIndexOf('/')+1), '');
             if ( typeof(altConf) != 'undefined' && altConf ) {
                 bundleConf = self.conf[altConf.split(/\@/)[1]][bundleConf.env];
                 backedupPath = path;
@@ -592,7 +613,7 @@ function Server(options) {
             }
 
 
-            // catch `statics.json` defined paths || bundleConf.staticResources.indexOf(url.replace(url.substr(url.lastIndexOf('/')+1), '')) > -1
+            // catch `statics.json` defined paths || bundleConf.staticResources.indexOf(url.replace(url.substring(url.lastIndexOf('/')+1), '')) > -1
             if (  bundleConf.staticResources.indexOf(path) > -1 || bundleConf.staticResources.indexOf(staticProps.firstLevel) > -1 ) {
                 if ( typeof(altConf) != 'undefined' && altConf && backedupPath ) {
                     filename = (bundleConf.staticResources.indexOf(path) > -1) ? bundleConf.content.statics[path] + url.replace(backedupPath, '/') : bundleConf.content.statics[staticProps.firstLevel] + url.replace(staticProps.firstLevel, '/');
@@ -631,8 +652,8 @@ function Server(options) {
      */
     var getAssets = function (bundleConf, layoutStr, swig, data) {
 
-        // layout search for <link|script|img>
-        var layoutAssets        = layoutStr.match(/<link .*?<\/link>|<link .*?(rel\=\"(stylesheet|icon|manifest|(.*)\-icon))(.*)|<script.*?<\/script>|<img .*?(.*)/g) || [];
+        // layout search for <link|source|script|img>
+        var layoutAssets        = layoutStr.match(/<link .*?<\/link>|<link .*?(rel\=\"(stylesheet|icon|manifest|(.*)\-icon))(.*)|<source .*?(type\=\"(image))(.*)|<script.*?<\/script>|<img .*?(.*)/g) || [];
 
         var assets      = {}
             , cssFiles  = []
@@ -652,63 +673,150 @@ function Server(options) {
         // layout assets
         i   = 0;
         len = layoutAssets.length;
-        var type            = null
-            , isAvailable   = null
-            , tag           = null
-            , properties    = null
-            , p             = 0
-            , pArr          = []
+        var type                    = null
+            , isAvailable           = null
+            , tag                   = null
+            , properties            = null
+            , p                     = 0
+            , pArr                  = []
+            , sourceTagSrcSetStr    = ''
         ;
         for (; i < len; ++i) {
 
             if (
-                !/(\<img|\<link|\<script)/g.test(layoutAssets[i])
-                || /\<img/.test(layoutAssets[i]) &&  /srcset/.test(layoutAssets[i]) // not able to handle this case for now
+                !/(\<img|\<link|\<source|\<script)/g.test(layoutAssets[i])
+                // ||
+                // not able to handle srcset case for now
+                /**
+                /\<img/.test(layoutAssets[i])
+                    &&  /srcset/.test(layoutAssets[i])*/
             ) {
                 continue;
             }
 
+            // https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/rel/preload
+            let asType = null;
+
             if ( /\<img/.test(layoutAssets[i]) ) {
                 type    = 'image';
                 tag     = 'img';
+                asType  = type;
             }
 
-            if ( /\<script/.test(layoutAssets[i]) ) {
-                type    = 'javascript';
-                tag     = 'script';
-            }
+
 
             if ( /\<link/.test(layoutAssets[i]) ) {
-                if ( /rel\=\"stylesheet/.test(layoutAssets[i]) ) {
-                    type    = 'stylesheet';
-                } else if ( /rel\=\"(icon|(.*)\-icon)/.test(layoutAssets[i]) ) {
-                    type    = 'image';
-                } else {
-                    type = 'file';
+                // if ( /rel\=\"stylesheet/.test(layoutAssets[i]) ) {
+                //     type    = 'stylesheet';
+                // } else if ( /rel\=\"(icon|(.*)\-icon)/.test(layoutAssets[i]) ) {
+                //     type    = 'image';
+                // } else {
+                //     type = 'file';
+                // }
+                type = layoutAssets[i].match(/rel=\"[-a-z 0-9]+\"/)[0] || null;
+                if (type) {
+                    type = type.replace(/^rel\=\"|"$/g, '');
+                }
+
+
+                switch (type) {
+                    case /stylesheet/.test(type):
+                        asType  = 'style';
+                        break;
+
+                    case /javascript/.test(type):
+                        asType  = 'script';
+                        break;
+
+                    default:
+                        asType  = null;
+                        if ( /icon/.test(type) ) {
+                            asType  = 'image';
+                            // ignoring all (fav)icons type: rel="*icon*" case
+                            continue;
+                        }
+                        if ( /font/.test(type) ) {
+                            asType  = 'font';
+                        }
+                        // if ( /manifest/.test(type) ) {
+                        //     asType  = 'webmanifest';
+                        // }
+                        break;
                 }
 
                 tag     = 'link';
             }
 
+            if ( /\<source/.test(layoutAssets[i]) ) {
+                if ( /type\=\"image/.test(layoutAssets[i]) ) {
+                    type    = 'image';
+                }
+
+                tag     = 'source';
+            }
+
+            if ( /\<script/.test(layoutAssets[i]) ) {
+                type    = 'javascript';
+                tag     = 'script';
+            }
+
             domain  = null;
+            let isEncodedContent = false;
+            // repsonsive images
+            // https://html.spec.whatwg.org/multipage/semantics.html#attr-link-imagesrcset
+            let srcset  = null;
+            // https://html.spec.whatwg.org/multipage/semantics.html#attr-link-imagesizes
+            let sizes   = null;
+            let urlArr  = null;
             try {
-                url     = layoutAssets[i].match(/(src|href)\=(\".*?\"|\'.*?\')/)[0];
+                urlArr  = layoutAssets[i].match(/(src|href|srcset)\=(\".*?\"|\'.*?\')/g);
+                for (let u=0, uLen=urlArr.length; u<uLen; u++) {
+                    if ( /data\:/.test(urlArr[u]) ) {
+                        isEncodedContent = true;
+                        break;
+                    }
+                    if ( /^srcset\=/.test(urlArr[u]) ) {
+                        srcset = urlArr[u]
+                                    .replace(/((src|href|srcset)\=\"|(src|href|srcset)\=\')/g, '')
+                                    .replace(/\"/g, '');
+                        if ( /source/i.test(tag) ) {
+                            sourceTagSrcSetStr += srcset + ','
+                        }
+                    }
+                    if ( /^(src|href)\=/.test(urlArr[u]) ) {
+                        url = urlArr[u]
+                                    .replace(/((src|href|srcset)\=\"|(src|href|srcset)\=\')/g, '')
+                                    .replace(/\"/g, '');
+                    }
+                }
+                if ( isEncodedContent ) { // ignoring "data:..."
+                    continue
+                }
+                // url = urlArr[0];
             } catch (err) {
-                console.warn('Problem with this asset ('+ i +'/'+ len +'): '+ layoutAssets[i].substr(0, 80) +'...');
+                console.warn('Problem with this asset ('+ i +'/'+ len +'): '+ layoutAssets[i].substring(0, 80) +'...');
                 continue;
             }
 
-
-            if ( /data\:/.test(url) ) { // ignoring "data:..."
-                continue
+            if ( /source/i.test(tag) ) {
+                continue;
             }
+
+
+            // if ( /data\:/.test(url) ) { // ignoring "data:..."
+            //     continue
+            // }
             //url = url.replace(/((src|href)\=\"|(src|href)\=\'|\"|\')/g, '');
-            url = url.replace(/((src|href)\=\"|(src|href)\=\')/g, '');
+            // url = url
+            //         .replace(/((src|href|srcset)\=\"|(src|href|srcset)\=\')/g, '')
+            //         .replace(/\"/g, '')
+            // ;
             if ( !/^\{\{/.test(url) ) {
                 url = url.replace(/(\"|\')/g, '');
             }
-            if (swig && /^\{\{/.test(url) )
+            if (swig && /^\{\{/.test(url) ) {
                 url = swig.compile(url, swig.getOptions())(data);
+            }
 
             if (!/(\:\/\/|^\/\/)/.test(url) ) {
                 filename = getAssetFilenameFromUrl(bundleConf, url);
@@ -728,7 +836,7 @@ function Server(options) {
             isAvailable =  ( /404/.test(filename) ) ? false : true;
             if ( isAvailable ) {
                 try {
-                    ext         = url.substr(url.lastIndexOf('.')).match(/(\.[A-Za-z0-9]+)/)[0];
+                    ext         = url.substring(url.lastIndexOf('.')).match(/(\.[A-Za-z0-9]+)/)[0];
                 } catch(err) {
 
                     console.warn('No extension found for `'+ filename +'`\n'+ err.stack );
@@ -739,15 +847,41 @@ function Server(options) {
 
             assets[key] = {
                 type        : type,
+                as          : asType,
                 url         : url,
                 ext         : ext,
-                mime        : (!ext) ? 'NA' : (bundleConf.server.coreConfiguration.mime[ext.substr(1)] || 'NA'),
+                mime        : (!ext) ? 'NA' : (bundleConf.server.coreConfiguration.mime[ext.substring(1)] || 'NA'),
                 filename    : ( /404/.test(filename) ) ? 'not found' : filename,
                 isAvailable : isAvailable
             };
 
-            if (domain)
+            //sourceTagSrcSetStr
+            if (sourceTagSrcSetStr.length > 0) {
+                assets[key]['imagesrcset'] = sourceTagSrcSetStr.substring(0, sourceTagSrcSetStr.length-1);
+                // reset
+                sourceTagSrcSetStr = '';
+            }
+
+            if (srcset) {
+                if ( typeof(assets[key]['imagesrcset']) != 'undefined' ) {
+                    assets[key]['imagesrcset'] += ', '+ srcset;
+                } else {
+                    assets[key]['imagesrcset'] = srcset;
+                }
+
+            }
+
+            if (sizes) {
+                if ( typeof(assets[key]['imagesizes']) != 'undefined' ) {
+                    assets[key]['imagesizes'] += ', '+ sizes;
+                } else {
+                    assets[key]['imagesizes'] = sizes;
+                }
+            }
+
+            if (domain) {
                 assets[key].domain = domain;
+            }
 
             if ( type == 'stylesheet' && !/not found/.test(assets[key].filename) ) {
                 cssFiles.push(assets[key].filename)
@@ -873,14 +1007,14 @@ function Server(options) {
                                 //key =  (( /404/.test(filename) ) ? '[404]' : '[200]') +' '+ url;
                                 key         = url;
                                 isAvailable =  ( /404/.test(filename) ) ? false : true;
-                                ext         = url.substr(url.lastIndexOf('.')).match(/(\.[A-Za-z0-9]+)/)[0];
+                                ext         = url.substring(url.lastIndexOf('.')).match(/(\.[A-Za-z0-9]+)/)[0];
                                 assets[key] = {
                                     referrer    : cssFiles[i],
                                     definition  : definition,
                                     type        : type,
                                     url         : url,
                                     ext         : ext,
-                                    mime        : bundleConf.server.coreConfiguration.mime[ext.substr(1)] || 'NA',
+                                    mime        : bundleConf.server.coreConfiguration.mime[ext.substring(1)] || 'NA',
                                     filename    : ( /404/.test(filename) ) ? 'not found' : filename
                                 };
 
@@ -997,8 +1131,10 @@ function Server(options) {
         if ( typeof(request.headers.origin) != 'undefined' ) {
             authority = request.headers.origin;
         } else if (request.headers.referer) {
-            referer = request.headers.referer.match(/^[https://|http://][a-z0-9-_.:/]+\//)[0];
-            referer = referer.substring(0, referer.length-1);
+            referer = request.headers.referer.match(/^[https://|http://][a-z0-9-_.:/]+\//);
+            if (Array.isArray(referer) && referer.length > 0) {
+                referer = referer[0].substring(0, referer.length-1);
+            }
         }
 
         // access-control-allow-origin settings
@@ -1035,8 +1171,8 @@ function Server(options) {
                     return name
                 }
 
-                var env     = self.conf.env
-                    , scope = self.conf.scope
+                var env     = self.conf.env || self.env
+                    , scope = self.conf.scope || self.scope
                 ;
 
                 for (let i=0, len=matched.length; i<len; ++i) {
@@ -1054,6 +1190,9 @@ function Server(options) {
                         project = arr[0];
                         env     = (arr[1]) ? arr[1] : env;
                     }
+                    if ( typeof(self.conf[bundle]) == 'undefined' ) {
+                        continue;
+                    }
                     scheme  = self.conf[bundle][env].server.scheme;
                     hostname  = ( !self.conf[bundle][env].hostname ) ? self.conf[bundle][env].server.scheme + '://' + self.conf[bundle][env].host + ':' + self.conf[bundle][env].server.port : self.conf[bundle][env].hostname;
                     name    = name.replace(oldHost, hostname);
@@ -1122,13 +1261,13 @@ function Server(options) {
     }
 
     this.onHttp2Stream = function(stream, headers, response) {
-        var header      = null
-            , isWebroot = false
-            , pathname  = null
-            , asset     = null
-            , assets    = this._options.template.assets
-            , conf      = this._options.conf
-            , cacheless = conf.cacheless
+        var header          = null
+            , isWebroot     = false
+            , pathname      = null
+            , asset         = null
+            , assets        = this._options.template.assets
+            , conf          = this._options.conf
+            , isCacheless   = conf.isCacheless
         ;
 
 
@@ -1157,7 +1296,17 @@ function Server(options) {
                             ) ? true: false
         ;
 
-        if (!stream.pushAllowed) {
+        if (!stream.pushAllowed ) {
+
+            // Fix added for static sites
+            if (
+                !assets[ url ]
+                ||
+                !assets[ url ].isBinary && !assets[ url ].isHandler
+            ) {
+                return;
+            }
+
             asset = {
                 url         : url,
                 filename    : assets[ url ].filename,
@@ -1203,6 +1352,7 @@ function Server(options) {
                     , header
                     //, { onError }
                 );
+
             } else {
                 stream.respond(header);
                 stream.end();
@@ -1227,7 +1377,7 @@ function Server(options) {
                 ':status': 301
             };
 
-            if (cacheless) {
+            if (isCacheless) {
                 header['cache-control'] = 'no-cache, no-store, must-revalidate';
                 header['pragma'] = 'no-cache';
                 header['expires'] = '0';
@@ -1300,7 +1450,7 @@ function Server(options) {
                     header['content-length'] = fs.statSync(assets[ url ].filename).size;
                 }
 
-                if (cacheless) {
+                if (isCacheless) {
                     // source maps integration for javascript & css
                     if ( /(.js|.css)$/.test(asset.filename) && fs.existsSync(asset.filename +'.map') ) {
                         //pathname = asset.filename +'.map';
@@ -1389,7 +1539,7 @@ function Server(options) {
             self._options.conf = bundleConf
         }
 
-        var cacheless       = bundleConf.cacheless;
+        var isCacheless       = bundleConf.isCacheless;
         // by default
         var filename        = bundleConf.publicPath + pathname;
         var isFilenameDir   = null
@@ -1417,7 +1567,6 @@ function Server(options) {
                 var key = pathname.replace(pathname.split('/').splice(-1), '');
                 for ( ; s < sLen; ++s ) {
                     if ( bundleConf.staticResources[s] == key ) {
-                    // if ( eval('/^' + bundleConf.staticResources[s].replace(/\//g,'\\/') +'/').test(pathname) ) {
                         filename = bundleConf.content.statics[ bundleConf.staticResources[s] ] +'/'+ pathname.replace(bundleConf.staticResources[s], '');
                         break;
                     }
@@ -1431,9 +1580,11 @@ function Server(options) {
 
 
         filename = decodeURIComponent(filename);
-        fs.exists(filename, function onStaticExists(exist) {
+        let filenameObj = new _(filename, true);
+        filenameObj.exists(function onStaticExists(exists) {
+        // fs.exists(filename, function onStaticExists(exists) {
 
-            if (!exist) {
+            if (!exists) {
                 return throwError(response, 404, 'Page not found: \n' + pathname, next);
             }
 
@@ -1446,48 +1597,49 @@ function Server(options) {
                 if ( !fs.existsSync(filename) ) {
                     throwError(response, 403, 'Forbidden: \n' + pathname, next);
                     return;
-                } else {
-                    var ext = 'html';
-                    if ( /http\/2/.test(protocol) ) {
-                        header = {
-                            ':status': 301,
-                            'location': request.url,
-                            'content-type': bundleConf.server.coreConfiguration.mime[ext]+'; charset='+ bundleConf.encoding
-                        };
+                }
 
-                        if (cacheless) {
-                            header['cache-control'] = 'no-cache, no-store, must-revalidate';
-                            header['pragma'] = 'no-cache';
-                            header['expires'] = '0';
-                        }
-                        request = checkPreflightRequest(request, response);
-                        header  = completeHeaders(header, request, response);
+                var ext = 'html';
+                if ( /http\/2/.test(protocol) ) {
+                    header = {
+                        ':status': 301,
+                        'location': request.url,
+                        'content-type': bundleConf.server.coreConfiguration.mime[ext]+'; charset='+ bundleConf.encoding
+                    };
 
-                        if (!stream.destroyed) {
-                            stream.respond(header);
-                            stream.end();
-                        }
+                    if (isCacheless) {
+                        header['cache-control'] = 'no-cache, no-store, must-revalidate';
+                        header['pragma'] = 'no-cache';
+                        header['expires'] = '0';
+                    }
+                    request = checkPreflightRequest(request, response);
+                    header  = completeHeaders(header, request, response);
 
-                    } else {
-                        response.setHeader('location', request.url);
-                        request = checkPreflightRequest(request, response);
-                        completeHeaders(null, request, response);
-                        if (cacheless) {
-                            response.writeHead(301, {
-                                'cache-control': 'no-cache, no-store, must-revalidate', // preventing browsers from using cache
-                                'pragma': 'no-cache',
-                                'expires': '0',
-                                'content-type': bundleConf.server.coreConfiguration.mime[ext]
-                            });
-                        }
-                        response.end()
+                    if (!stream.destroyed) {
+                        stream.respond(header);
+                        stream.end();
+                    }
+
+                } else {
+                    response.setHeader('location', request.url);
+                    request = checkPreflightRequest(request, response);
+                    completeHeaders(null, request, response);
+                    if (isCacheless) {
+                        response.writeHead(301, {
+                            'cache-control': 'no-cache, no-store, must-revalidate', // preventing browsers from using cache
+                            'pragma': 'no-cache',
+                            'expires': '0',
+                            'content-type': bundleConf.server.coreConfiguration.mime[ext]
+                        });
                     }
+                    response.end()
                 }
+
                 return;
             }
 
 
-            if (cacheless) {
+            if (isCacheless) {
                 delete require.cache[require.resolve(filename)];
             }
 
@@ -1537,8 +1689,12 @@ function Server(options) {
                             request.url = ( ext != null && typeof(ext[0]) != 'undefined' ) ? request.url : request.url + 'index.html';
 
                             self._responseHeaders         = response.getHeaders();
-                            if (!isBinary && typeof(self._options.template.assets[request.url]) == 'undefined')
+                            if (
+                                !isBinary
+                                && typeof(self._options.template.assets[request.url]) == 'undefined'
+                            ) {
                                 self._options.template.assets = getAssets(bundleConf, file);
+                            }
 
                             if (
                                 typeof(self._options.template.assets[request.url]) == 'undefined'
@@ -1603,7 +1759,7 @@ function Server(options) {
                                                         'location': request.url
                                                     };
 
-                                                    if (cacheless) {
+                                                    if (isCacheless) {
                                                         header['cache-control'] = 'no-cache, no-store, must-revalidate';
                                                         header['pragma'] = 'no-cache';
                                                         header['expires'] = '0';
@@ -1674,11 +1830,11 @@ function Server(options) {
                                 'content-type': contentType + '; charset='+ bundleConf.encoding
                             };
 
-                            if (cacheless) {
+                            if (isCacheless) {
                                 // source maps integration for javascript & css
                                 if ( /(.js|.css)$/.test(filename) && fs.existsSync(filename +'.map') && !/sourceMappingURL/.test(file) ) {
                                     //pathname = pathname +'.map';
-                                    pathname = webroot + pathname.substr(1) +'.map';
+                                    pathname = webroot + pathname.substring(1) +'.map';
                                     // serve without cache
                                     header['X-SourceMap'] = pathname;
                                     header['cache-control'] = 'no-cache, no-store, must-revalidate';
@@ -1708,11 +1864,11 @@ function Server(options) {
                                 response.setHeader('content-length', fs.statSync(filename).size);
                             }
 
-                            if (cacheless) {
+                            if (isCacheless) {
                                 // source maps integration for javascript & css
                                 if ( /(.js|.css)$/.test(filename) && fs.existsSync(filename +'.map') && !/sourceMappingURL/.test(file) ) {
                                     //pathname = pathname +'.map'
-                                    pathname = webroot + pathname.substr(1) +'.map';
+                                    pathname = webroot + pathname.substring(1) +'.map';
                                     response.setHeader("X-SourceMap", pathname)
                                 }
 
@@ -1753,7 +1909,8 @@ function Server(options) {
             });
 
 
-        })
+        });
+        filenameObj = null;
     }
 
 
@@ -1765,6 +1922,28 @@ function Server(options) {
         // catch all (request urls)
         self.instance.all('*', function onInstance(request, response, next) {
 
+            // Caching = [...]
+            // TODO - handle this through a middleware
+            /**
+            * var cacheIndex = ['/api/document/get/b47c4dd3-f7c4-44b2-b1fb-401948be1ca4'].indexOf(request.url)
+            * if ( cacheIndex > -1) {
+            *     // return caching[cacheIndex].content
+            * }
+            */
+
+            // Retrieving cached route
+            // var cachedUrls = ['/'];
+            // if (cachedUrls.indexOf(request.url) > -1) {
+            //     request.routing = JSON.parse('{"method":"GET","namespace":"home","url":"/","rule":"home@public","param":{"control":"home","file":"../home"},"middleware":["middlewares.maintenance.check"],"bundle":"public","isXMLRequest":false,"isWithCredentials":false}');
+            //     var headers = JSON.parse('{"x-powered-by":"Gina I/O - v0.1.6-alpha.94","access-control-allow-headers":"X-Requested-With, Content-Type","access-control-allow-methods":"GET","access-control-allow-credentials":true,"vary":"Origin","accept-language":"en-US,en;q=0.8,fr;q=0.6"}');
+            //     for (let h in headers) {
+            //         response.setHeader(h, headers[h]);
+            //     }
+
+            //     return local.router.route(request, response, next, request.routing);
+            // }
+
+
 
             request.setEncoding(self.conf[self.appName][self.env].encoding);
             // be carfull, if you are using jQuery + cross domain, you have to set the header manually in your $.ajax query -> headers: {'X-Requested-With': 'XMLHttpRequest'}
@@ -1864,7 +2043,7 @@ function Server(options) {
                 if ( typeof(ext) != 'undefined' &&  ext != null) {
                     ext = ext[0];
                     // if image with `@` found
-                    if ( /^image/i.test(self.conf[self.appName][self.env].server.coreConfiguration.mime[ext.substr(1)]) ) {
+                    if ( /^image/i.test(self.conf[self.appName][self.env].server.coreConfiguration.mime[ext.substring(1)]) ) {
                         isImage = true
                     }
                 }
@@ -1873,7 +2052,7 @@ function Server(options) {
                     // and must not be an email
                     && !/^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(request.url)
                     // and must be handled by mime.types
-                    &&  typeof(self.conf[self.appName][self.env].server.coreConfiguration.mime[ext.substr(1)]) != 'undefined'
+                    &&  typeof(self.conf[self.appName][self.env].server.coreConfiguration.mime[ext.substring(1)]) != 'undefined'
                     ||
                     ext != null
                     && isImage
@@ -1899,7 +2078,7 @@ function Server(options) {
 
             if (
                 staticProps.isStaticFilename && staticsArr.indexOf(request.url) > -1
-                || staticProps.isStaticFilename && staticsArr.indexOf( request.url.replace(request.url.substr(request.url.lastIndexOf('/')+1), '') ) > -1
+                || staticProps.isStaticFilename && staticsArr.indexOf( request.url.replace(request.url.substring(request.url.lastIndexOf('/')+1), '') ) > -1
                 || staticProps.isStaticFilename && new RegExp('^'+ staticProps.firstLevel).test(request.url)
                 || /\/$/.test(request.url) && !isWebrootHandledByRouting && !/\/engine\.io\//.test(request.url)
             ) {
@@ -2067,11 +2246,14 @@ function Server(options) {
                         'method': 'POST',
                         'bundle' : self.appName
                     };
-                    var busboy = new Busboy({ headers: request.headers });
+                    var busboy = Busboy({ headers: request.headers });
 
                     // busboy.on('field', function(fieldname, val, fieldnameTruncated, valTruncated) {
                     //     console.log('Field [' + fieldname + ']: value: ' + inspect(val));
                     // });
+
+                    // Attention: on busboy upgrade, we needs to adapt `busboy/lib/types/multipart.js`
+                    // For this, check the emit method
                     busboy.on('file', function(fieldname, file, filename, encoding, mimetype, group) {
 
                         file._dataLen = 0;
@@ -2087,7 +2269,7 @@ function Server(options) {
                                 && opt.groups[group].allowedExtensions != '*'
                             ) {
                                 var ext     = opt.groups[group].allowedExtensions;
-                                var fileExt = filename.substr(filename.lastIndexOf('.')+1)
+                                var fileExt = filename.substring(filename.lastIndexOf('.')+1)
                                 if ( !Array.isArray(ext) ) {
                                     ext = [ext]
                                 }
@@ -2243,12 +2425,12 @@ function Server(options) {
                     // get rid of encoding issues
                     try {
                         if ( !/multipart\/form-data;/.test(request.headers['content-type']) ) {
-                            if ( /application\/x\-www\-form\-urlencoded/.test(request.headers['content-type']) && /\+/.test(request.body) ) {
+                            if ( !/application\/x\-www\-form\-urlencoded/.test(request.headers['content-type']) && /\+/.test(request.body) ) {
                                 request.body = request.body.replace(/\+/g, ' ');
                             }
 
-                            if ( request.body.substr(0,1) == '?')
-                                request.body = request.body.substr(1);
+                            if ( request.body.substring(0,1) == '?')
+                                request.body = request.body.substring(1);
 
                             try {
                                 bodyStr = decodeURIComponent(request.body); // it is already a string for sure
@@ -2399,8 +2581,8 @@ function Server(options) {
                                 request.body = request.body.replace(/\+/g, ' ');
                             }
 
-                            if ( request.body.substr(0,1) == '?')
-                                request.body = request.body.substr(1);
+                            if ( request.body.substring(0,1) == '?')
+                                request.body = request.body.substring(1);
 
                             // false & true case
                             try {
@@ -2521,8 +2703,10 @@ function Server(options) {
 
         var config = new Config();
         config.setBundles(self.bundles);
-        var conf = config.getInstance(); // for all loaded bundles
-        if ( typeof(conf) != 'undefined') {//for cacheless mode
+        // for all loaded bundles
+        var conf = config.getInstance();
+        //for cacheless mode
+        if ( typeof(conf) != 'undefined') {
             self.conf = conf;
         }
 
@@ -2537,7 +2721,7 @@ function Server(options) {
                 if (self.bundles.indexOf(b) < 0) continue;
                 if ( typeof(conf[b][self.env].content) != 'undefined' && typeof(conf[b][self.env].content.statics) != 'undefined' && conf[b][self.env].content.statics.count() > 0 ) {
                     for (let s in conf[b][self.env].content.statics) {
-                        s = (s.substr(0,1) == '/') ? s.substr(1) : s;
+                        s = (s.substring(0,1) == '/') ? s.substring(1) : s;
                         if ( (new RegExp('^/'+s)).test(pathname) ) {
                             bundle = b;
                             break end
@@ -2572,18 +2756,18 @@ function Server(options) {
     }
 
     var onBundleConfigLoaded = function(bundle, options) {
-        var err         = options.err
-            , cacheless = options.config.isCacheless()
-            , pathname  = options.pathname
-            , req       = options.req
-            , res       = options.res
-            , config    = options.conf
-            , next      = options.next
-            , callback  = options.callback
+        var err             = options.err
+            , isCacheless   = options.config.isCacheless()
+            , pathname      = options.pathname
+            , req           = options.req
+            , res           = options.res
+            , config        = options.conf
+            , next          = options.next
+            , callback      = options.callback
         ;
 
         //Reloading assets & files.
-        // if (!cacheless) { // all but dev & debug
+        // if (!isCacheless) { // all but dev & debug
             callback(err, bundle, pathname, options.config, req, res, next)
         // } else {
         //     config.refresh(bundle, function(err, routing) {
@@ -2706,7 +2890,7 @@ function Server(options) {
             , isRoute           = {}
             , withViews         = hasViews(bundle)
             , router            = local.router
-            , cacheless         = config.isCacheless()
+            , isCacheless       = config.isCacheless()
             , wroot             = null
         ;
 
@@ -2736,6 +2920,11 @@ function Server(options) {
         var isMethodAllowed = null, hostname = null;
         out:
             for (let name in routing) {
+                // ignoring routes out of scope
+                if ( routing[name].scopes.indexOf(process.env.NODE_SCOPE) < 0 ) {
+                    continue;
+                }
+
                 if ( typeof(routing[name]['param']) == 'undefined' ) {
                     break;
                 }
@@ -2961,11 +3150,11 @@ function Server(options) {
                     , ext                   = null
                     , isHtmlContent         = false
                     , hasCustomErrorFile    = false
-                    , eCode                 = code.toString().substr(0,1) + 'xx'
+                    , eCode                 = code.toString().substring(0,1) + 'xx'
                 ;
-                var extArr = url.substr(url.lastIndexOf('.')).match(/(\.[A-Za-z0-9]+)/);
+                var extArr = url.substring(url.lastIndexOf('.')).match(/(\.[A-Za-z0-9]+)/);
                 if (extArr) {
-                    ext = extArr[0].substr(1);
+                    ext = extArr[0].substring(1);
                 }
                 if ( !ext || /^(html|htm)$/i.test(ext) ) {
                     isHtmlContent = true;