gina 0.1.1-alpha.98 → 0.1.2-alpha.1

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/core/server.js

@@ -15,7 +15,7 @@ const swig          = require( _(GINA_FRAMEWORK_DIR +'/node_modules/swig', true)
 var Config          = require('./config');
 var Router          = require('./router');
 var lib             = require('./../lib');
-var routingUtils    = lib.routing;
+var routingLib      = lib.routing;
 var inherits        = lib.inherits;
 var merge           = lib.merge;
 var Proc            = lib.Proc;
@@ -55,10 +55,7 @@ function Server(options) {
 
         var filters = SwigFilters({
             options     : conf,
-            isProxyHost : getContext('isProxyHost'),
-            // throwError  : self.throwError,
-            // req         : local.req,
-            // res         : local.res
+            isProxyHost : getContext('isProxyHost')
         });
 
         try {
@@ -91,8 +88,9 @@ function Server(options) {
         //Starting app.
         self.appName        = options.bundle;
         self.env            = options.env;
+        self.scope          = options.scope;
         self.version        = options.version;
-        local.router        = new Router(self.env);
+        local.router        = new Router(self.env, self.scope);
 
         //True => multiple bundles sharing the same server (port).
         self.isStandalone   = options.isStandalone;
@@ -109,10 +107,10 @@ function Server(options) {
             self.conf[self.appName][self.env].executionPath = options.conf[self.appName][self.env].executionPath = self.executionPath;
         } else {
 
-            //console.log("Running mode not handled yet..", self.appName, " VS ", self.bundles);
+            //console.debug("Running mode not handled yet..", self.appName, " VS ", self.bundles);
             //Load all conf for the related apps & env.
             var apps = self.bundles;
-            for (var i=0; i<apps.length; ++i) {
+            for (let i=0; i<apps.length; ++i) {
                 self.conf[apps[i]] = {};
                 self.conf[apps[i]][self.env] = options.conf[apps[i]][self.env];
                 self.conf[apps[i]][self.env].bundlesPath = options.conf[apps[i]][self.env].bundlesPath;
@@ -141,7 +139,8 @@ function Server(options) {
 
             serverOpt = merge({
                         bundle  : self.appName,
-                        env     : self.env
+                        env     : self.env,
+                        scope   : self.scope
                     },
                     serverOpt,
                     {
@@ -155,11 +154,12 @@ function Server(options) {
             console.debug('[ BUNDLE ][ server ][ init ] Initializing [ '+ self.appName +' ] server with `'+ serverOpt.engine +'`engine');
 
             // controlling one last time protocol & ports
-            var ctx         = getContext('gina'),
-            projectConf     = ctx.project,
-            //protocols       = projectConf.protocols,
-            // TODO - check if the user prefered protocol is register in projectConf
-            portsReverse    = ctx.portsReverse;
+            var ctx             = getContext('gina')
+                , projectConf   = ctx.project
+                // TODO - check if the user prefered protocol is register in projectConf
+                , protocols       = projectConf.protocols
+                , portsReverse    = ctx.portsReverse
+            ;
 
             // locking port & protocol so it can't be changed by the user's settings
             self.conf[self.appName][self.env].server.protocol = serverOpt.protocol;
@@ -194,15 +194,28 @@ function Server(options) {
             self.emit('configured', false, engine.instance, engine.middleware, self.conf[self.appName][self.env]);
 
         } catch (err) {
-
             console.emerg('[ BUNDLE ] [ '+ self.appName +' ] ServerEngine ' + err.stack)
             process.exit(1)
         }
     }
-
+    /**
+     * Check if env is running cacheless
+     * */
     this.isCacheless = function() {
         return (/^true$/i.test(process.env.NODE_ENV_IS_DEV)) ? true : false
     }
+    /**
+     * Check if the project scope is set for local
+     * */
+    this.isLocalScope = function() {
+        return (/^true$/i.test(process.env.NODE_SCOPE_IS_LOCAL)) ? true : false;
+    }
+    /**
+     * Check if the project scope is set for production
+     * */
+    this.isProductionScope = function() {
+        return (/^true$/i.test(process.env.NODE_SCOPE_IS_PRODUCTION)) ? true : false;
+    }
 
     this.onConfigured = function(callback) {
         self.once('configured', function(err, instance, middleware, conf) {
@@ -221,19 +234,63 @@ function Server(options) {
                 method: 'GET',
                 // rejectUnauthorized: true,
                 port: port || 443,
+                path: "/_gina/health/check",
                 ca: fs.readFileSync(self.conf[self.appName][self.env].content.settings.server.credentials.ca),
                 agent: new https.Agent({
                     maxCachedSessions: 0
                 })
             });
         } catch (err) {
-            console.emerg(sslDetails +'\n'+ err.stack);
-            return;
+            if (!sslDetails) {
+                throw new Error('DNS issue ? Did you check your `/etc/hosts` or your DNS configuration ?\n'+ err.stack);
+            }
+            throw new Error(sslDetails +'\n'+ err.stack);
         }
 
 
         const failed  = !sslDetails.valid;
         const humanView = JSON.stringify(sslDetails, null, '  ');
+
+        // Wildcard exception - See https://github.com/dyaa/ssl-checker/issues/381
+        // Date of the test: 2022-12-18T00:00:00.000Z
+        // container-87546.dev.sample.app -> not valid when it should return true.
+        // {
+        //     "daysRemaining": 290,
+        //     "valid": false,
+        //     "validFrom": "2022-10-03T00:00:00.000Z",
+        //     "validTo": "2023-10-03T23:59:59.000Z",
+        //     "validFor": [
+        //         "*.sample.app",
+        //         "sample.app"
+        //     ]
+        // }
+
+        const isHandleByWildcardCert = function(endpoint, hv) {
+            var isAllowed = false;
+            const start = new Date(hv.validFrom).format('longIsoDateTime');
+            const end = new Date(hv.validTo).format('longIsoDateTime');
+            const today = new Date().format('longIsoDateTime');
+            const allowed = hv.validFor;
+
+            for (let i=0, len=allowed.length; i<len; ++i ) {
+                // skip if not a wildcard
+                if ( ! /^[*]\./.test(allowed[i]) ) continue;
+
+                let re = new RegExp( allowed[i].replace(/^[*]/, '')+'$' );
+                if ( ! re.test(endpoint) ) continue;
+
+                if ( today >= start && today < end) {
+                    isAllowed = true;
+                    break
+                }
+            }
+            return isAllowed;
+        }
+        if ( failed && Array.isArray(sslDetails.validFor) && isHandleByWildcardCert(endpoint, sslDetails) ) {
+            return;
+        }
+
+
         if (failed) {
             if (sslDetails.daysRemaining > -1) {
                 console.emerg(`[Certificate] ${endpoint} : It is like there is a problem with your CA certificate${'\n'} ${humanView}`);
@@ -257,7 +314,7 @@ function Server(options) {
             router.setServerInstance(instance);
         }
 
-        onRequest()
+        return onRequest()
     }
 
 
@@ -276,7 +333,8 @@ function Server(options) {
             , reverseRouting        = {}
             , cacheless             = config.isCacheless()
             , env                   = self.env
-            , apps                  = conf.allBundles//conf.bundles
+            , scope                 = self.scope
+            , apps                  = conf.allBundles // conf.bundles
             , filename              = ''
             , appName               = ''
             , tmp                   = {}
@@ -290,22 +348,23 @@ function Server(options) {
             , webrootAutoredirect   = null
             , localWroot            = null
             , originalRules         = []
-            , oRuleCount            = 0;
+            , oRuleCount            = 0
+        ;
 
         //Standalone or shared instance mode. It doesn't matter.
         for (; i<apps.length; ++i) {
-            config.setServerCoreConf(apps[i], self.env, serverCoreConf);
+            config.setServerCoreConf(apps[i], env, scope, serverCoreConf);
 
-            var appPath = _(conf.envConf[apps[i]][self.env].bundlesPath+ '/' + apps[i]);
+            var appPath = _(conf.envConf[apps[i]][env].bundlesPath+ '/' + apps[i]);
             appName     =  apps[i];
 
             //Specific case.
             if (!self.isStandalone && i == 0) appName = apps[i];
 
             try {
-                main        = _(appPath + '/config/' + conf.envConf[apps[i]][self.env].configFiles.routing);
+                main        = _(appPath + '/config/' + conf.envConf[apps[i]][env].configFiles.routing);
                 filename    = main;//by default
-                filename    = conf.envConf[apps[i]][self.env].configFiles.routing.replace(/.json/, '.' +env + '.json');
+                filename    = conf.envConf[apps[i]][env].configFiles.routing.replace(/.json/, '.' +env + '.json');
                 filename    = _(appPath + '/config/' + filename);
                 //Can't do a thing without.
                 if ( !fs.existsSync(filename) ) {
@@ -331,12 +390,12 @@ function Server(options) {
 
                 try {
 
-                    wroot               = conf.envConf[apps[i]][self.env].server.webroot;
-                    webrootAutoredirect = conf.envConf[apps[i]][self.env].server.webrootAutoredirect;
+                    wroot               = conf.envConf[apps[i]][env].server.webroot;
+                    webrootAutoredirect = conf.envConf[apps[i]][env].server.webrootAutoredirect;
                     // renaming rule for standalone setup
                     if ( self.isStandalone && apps[i] != self.appName && wroot == '/') {
                         wroot = '/'+ apps[i];
-                        conf.envConf[apps[i]][self.env].server.webroot = wroot
+                        conf.envConf[apps[i]][env].server.webroot = wroot
                     }
 
                     if (wroot.length >1) {
@@ -367,9 +426,11 @@ function Server(options) {
                         if (typeof(tmp[rule].url) != 'object') {
                             if (tmp[rule].url.length > 1 && tmp[rule].url.substr(0,1) != '/') {
                                 tmp[rule].url = '/'+tmp[rule].url
-                            }/** else if (tmp[rule].url.length > 1 && conf.envConf[apps[i]][self.env].server.webroot.substr(conf.envConf[apps[i]][self.env].server.webroot.length-1,1) == '/') {
+                            }
+                            /** 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 {
+                            }*/
+                            else {
                                 if (wroot.substr(wroot.length-1,1) == '/') {
                                     wroot = wroot.substr(wroot.length-1,1).replace('/', '')
                                 }
@@ -381,11 +442,11 @@ function Server(options) {
                                 originalRules[oRuleCount] = ( self.isStandalone && tmp[rule] && apps[i] != self.appName) ? apps[i] + '-' + rule : rule;
                                 ++oRuleCount;
 
-                                localWroot = conf.envConf[tmp[rule].bundle][self.env].server.webroot;
+                                localWroot = conf.envConf[tmp[rule].bundle][env].server.webroot;
                                 // standalone setup
                                 if ( self.isStandalone && tmp[rule].bundle != self.appName && localWroot == '/') {
                                     localWroot = '/'+ routing[rule].bundle;
-                                    conf.envConf[tmp[rule].bundle][self.env].server.webroot = localWroot
+                                    conf.envConf[tmp[rule].bundle][env].server.webroot = localWroot
                                 }
                                 if (localWroot.substr(localWroot.length-1,1) == '/') {
                                     localWroot = localWroot.substr(localWroot.length-1,1).replace('/', '')
@@ -420,7 +481,7 @@ function Server(options) {
                             // This is only an issue when it comes to the frontend dev
                             // views.routeNameAsFilenameEnabled is set to true by default
                             // IF [ false ] the action is used as filename
-                            if ( !conf.envConf[apps[i]][self.env].content.templates['_common'].routeNameAsFilenameEnabled && tmp[rule].param.bundle != 'framework') {
+                            if ( !conf.envConf[apps[i]][env].content.templates['_common'].routeNameAsFilenameEnabled && tmp[rule].param.bundle != 'framework') {
                                 var tmpRouting = [];
                                 for (var r = 0, len = tmp[rule].param.file.length; r < len; ++r) {
                                     if (/[A-Z]/.test(tmp[rule].param.file.charAt(r))) {
@@ -431,6 +492,7 @@ function Server(options) {
                                         ++r
                                     }
                                 }
+                                tmpRouting = null;
                             }
                         }
 
@@ -455,7 +517,9 @@ function Server(options) {
             routing = merge(routing, ((self.isStandalone && apps[i] != self.appName ) ? standaloneTmp : tmp), true);
             // originalRule is used to facilitate cross bundles (hypertext)linking
             for (let r = 0, len = originalRules.length; r < len; r++) { // for each rule ( originalRules[r] )
-                routing[originalRules[r]].originalRule = (routing[originalRules[r]].bundle === self.appName ) ?  config.getOriginalRule(originalRules[r], routing) : config.getOriginalRule(routing[originalRules[r]].bundle +'-'+ originalRules[r], routing)
+                routing[originalRules[r]].originalRule = (routing[originalRules[r]].bundle === self.appName )
+                    ?  config.getOriginalRule(originalRules[r], routing)
+                    : config.getOriginalRule(routing[originalRules[r]].bundle +'-'+ originalRules[r], routing)
             }
 
             // reverse routing
@@ -469,8 +533,8 @@ function Server(options) {
                 }
             }
 
-            config.setRouting(apps[i], self.env, routing);
-            config.setReverseRouting(apps[i], self.env, reverseRouting);
+            config.setRouting(apps[i], env, scope, routing);
+            config.setReverseRouting(apps[i], env, scope, reverseRouting);
 
             if (apps[i] == self.appName) {
                 self.routing        = routing;
@@ -484,7 +548,9 @@ function Server(options) {
     }
 
     var hasViews = function(bundle) {
-        var _hasViews = false, conf = new Config().getInstance(bundle);
+        var _hasViews   = false
+            , conf      = new Config().getInstance(bundle)
+        ;
         if (typeof(local.hasViews[bundle]) != 'undefined') {
             _hasViews = local.hasViews[bundle];
         } else {
@@ -495,149 +561,6 @@ function Server(options) {
         return _hasViews
     }
 
-    var parseCollection = function (collection, obj) {
-
-        for(var i = 0, len = collection.length; i<len; ++i) {
-            obj[i] = parseObject(collection[i], obj);
-        }
-
-        return obj
-    }
-
-    var parseObject = function (tmp, obj) {
-        var el      = []
-            , key   = null
-        ;
-
-        for (var o in tmp) {
-
-            el[0]   = o;
-            el[1]   = tmp[o];
-
-            if ( /^(.*)\[(.*)\]/.test(el[0]) ) { // some[field] ?
-                key = el[0].replace(/\]/g, '').split(/\[/g);
-                obj = parseLocalObj(obj, key, 0, el[1])
-            } else {
-                obj[ el[0] ] = el[1]
-            }
-        }
-
-        return obj
-    }
-
-    var parseBody = function(body) {
-        var obj = null, tmp = null, arr = null;
-        if ( /^(\{|\[|\%7B|\%5B)/.test(body) ) {
-            try {
-                obj = {};
-
-                if ( /^(\%7B|\%5B)/.test(body) ) {
-                    tmp = JSON.parse(decodeURIComponent(body))
-                } else {
-                    tmp = JSON.parse(body)
-                }
-
-                if ( Array.isArray(tmp) ) {
-                    obj = parseCollection(tmp, obj)
-                } else {
-                    obj = parseObject(tmp, obj)
-                }
-
-                return obj
-            } catch (err) {
-                console.error('[365] could not parse body:\n' + body)
-            }
-
-        } else {
-            obj = {};
-            arr = body.split(/&/g);
-            if ( /(\"false\"|\"true\"|\"on\")/.test(body) )
-                body = body.replace(/\"false\"/g, false).replace(/\"true\"/g, true).replace(/\"on\"/g, true);
-
-
-            var el      = {}
-                , value = null
-                , key   = null;
-
-            for (var i = 0, len = arr.length; i < len; ++i) {
-                if (!arr[i]) continue;
-
-                arr[i] = decodeURIComponent(arr[i]);
-
-                if ( /^\{/.test(arr[i]) || /\=\{/.test(arr[i]) || /\=\[/.test(arr[i]) ) {
-                    //if ( /^\{/.test(arr[i]) ) { // is a json string
-                    try {
-                        if (/^\{/.test(arr[i])) {
-                            obj = JSON.parse(arr[i]);
-                            break;
-                        } else {
-                            el = arr[i].match(/\=(.*)/);
-                            el[0] =  arr[i].split(/\=/)[0];
-                            obj[ el[0] ] = JSON.parse( el[1] );
-                        }
-
-
-                    } catch (err) {
-                        console.error('[parseBody#1] could not parse body:\n' + arr[i])
-                    }
-                } else {
-                    el = arr[i].split(/=/);
-                    if ( /\{\}\"\:/.test(el[1]) ) { //might be a json
-                        try {
-                            el[1] = JSON.parse(el[1])
-                        } catch (err) {
-                            console.error('[parseBody#2] could not parse body:\n' + el[1])
-                        }
-                    }
-
-                    if ( typeof(el[1]) == 'string' && !/\[object /.test(el[1])) {
-                        key     = null;
-                        el[0]   = decodeURIComponent(el[0]);
-                        el[1]   = decodeURIComponent(el[1]);
-
-                        if ( /^(.*)\[(.*)\]/.test(el[0]) ) { // some[field] ?
-                            key = el[0].replace(/\]/g, '').split(/\[/g);
-                            obj = parseLocalObj(obj, key, 0, el[1])
-                        } else {
-                            obj[ el[0] ] = el[1]
-                        }
-                    }
-                }
-            }
-
-            return obj
-        }
-
-
-    }
-
-    var parseLocalObj = function(obj, key, k, value) {
-
-        if ( typeof(obj[ key[k] ]) == 'undefined' ) {
-            obj[ key[k] ] = {};
-        }
-
-        for (var prop in obj) {
-
-            if (k == key.length-1) {
-
-                if (prop == key[k]) {
-                    obj[prop] = ( typeof(value) != 'undefined' ) ? value : '';
-                }
-
-            } else if ( key.indexOf(prop) > -1 ) {
-                ++k;
-                if ( !obj[prop][ key[k] ] )
-                    obj[prop][ key[k] ] = {};
-
-
-                parseLocalObj(obj[prop], key, k, value)
-
-            }
-        }
-
-        return obj;
-    }
 
     var getAssetFilenameFromUrl = function(bundleConf, url) {
 
@@ -887,13 +810,13 @@ function Server(options) {
 
             // parsing css files
             i = 0, len = cssFiles.length;
-            var cssContent = null
-                , hasUrls   = null
-                , definition = null
-                , defName   = null
-                , d = null
-                , dLen = null
-                , cssMatched = null
+            var cssContent      = null
+                , hasUrls       = null
+                , definition    = null
+                , defName       = null
+                , d             = null
+                , dLen          = null
+                , cssMatched    = null
             ;
             var cssArr = null, classNames = null, assetsInClassFound = {};
             for (; i < len; ++i) {
@@ -1053,7 +976,7 @@ function Server(options) {
             , conf          = self.conf[self.appName][self.env]
         ;
 
-        if ( typeof(responseHeaders) == 'undefined' || !responseHeaders) {
+        if ( typeof(responseHeaders) == 'undefined' || !responseHeaders) {
             responseHeaders = {};
         }
 
@@ -1061,7 +984,7 @@ function Server(options) {
         resHeaders  = JSON.clone(conf.server.response.header);
         if ( typeof(request.routing) == 'undefined' ) {
             request.routing = {
-                'url': request.url,
+                'url'   : request.url,
                 'method': request.method
             }
         }
@@ -1071,18 +994,17 @@ function Server(options) {
         // Should not override main server.response.header.methods
         resHeaders['access-control-allow-methods'] = request.routing.method.replace(/(\,\s+|\,)/g, ', ').toUpperCase();
 
-
         if ( typeof(request.headers.origin) != 'undefined' ) {
             authority = request.headers.origin;
         } else if (request.headers.referer) {
-            referer = request.headers.referer.match(/[^http://|^https://|][a-z0-9-_.:]+\//)[0];
-            referer = request.headers.referer.match(/^(http|https)\:\/\/?/)[0] + referer.substring(0, referer.length-1);
+            referer = request.headers.referer.match(/^[https://|http://][a-z0-9-_.:/]+\//)[0];
+            referer = referer.substring(0, referer.length-1);
         }
 
         // access-control-allow-origin settings
         if ( resHeaders.count() > 0 ) {
+
             // authority by default if no Access Control Allow Origin set
-            //authority = ( typeof(referer) != 'undefined') ? conf.server.scheme +'://'+ request.headers.referer.match(/:\/\/(.[^\/]+)(.*)/)[1] : (request.headers[':scheme'] +'://'+request.headers[':authority'] || conf.server.scheme +'://'+request.headers.host || null);
             if (!authority) {
                 if (!referer) {
                     if ( /http\/2/.test(conf.server.protocol) ) {
@@ -1106,58 +1028,80 @@ function Server(options) {
             re = new RegExp(authority);
             allowedOrigin = ( typeof(conf.server.response.header['access-control-allow-origin']) != 'undefined' && conf.server.response.header['access-control-allow-origin'] != '' ) ? conf.server.response.header['access-control-allow-origin'] : authority;
             var found = null, origin = null, origins = null; // to handles multiple origins
+
             var originHostReplacement = function(name) {
-                name = name.split(/\@/);
-                var bundle      = name[0]
-                    , project   = name[1]
-                    , arr       = null
-                    , domain    = null
-                ;
-                var env     = conf.env; // current env by default
-                if ( /\//.test(name[1]) ) {
-                    arr     = name[1].split(/\//);
-                    project = arr[0];
-                    env     = (arr[1]) ? arr[1] : env;
+                var matched = name.match(/{([-_A-z]+?@[-_A-z]+?)}/g);
+                if (!matched || !Array.isArray(matched) || Array.isArray(matched) && matched.length == 0 ) {
+                    return name
                 }
 
-                domain      = ( !/^http/.test(self.conf[bundle][env].hostname) || /^\/\//.test(self.conf[bundle][env].hostname) ) ? scheme +'://'+ self.conf[bundle][env].hostname.replace(/^\/\//, '') : self.conf[bundle][env].hostname;
-                sameOrigin  = (domain == self.conf[bundle][env].hostname) ? self.conf[bundle][env].hostname : false;
+                var env     = self.conf.env
+                    , scope = self.conf.scope
+                ;
+
+                for (let i=0, len=matched.length; i<len; ++i) {
+                    let oldHost = matched[i];
+                    let newHost = matched[i].replace(/\{|\}|\s+/g, '');
+                    newHost = newHost.split(/\@/);
+                    let bundle      = newHost[0]
+                        , project   = newHost[1]
+                        , arr       = null
+                        , hostname  = null
+                        , scheme    = null
+                    ;
+                    if ( /\//.test(newHost[1]) ) {
+                        arr     = newHost[1].split(/\//);
+                        project = arr[0];
+                        env     = (arr[1]) ? arr[1] : env;
+                    }
+                    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);
+                }
+                matched = null;
+                env = null;
 
-                return domain
+                return name;
             }
 
-            var headerValue = null;
-            for (var h in resHeaders) {
-                if (!response.headersSent) {
+            var headerValue = null, re = new RegExp('\{\s*(.*)\s*\}', 'g');
+            for (let h in resHeaders) {
+                if (
+                    !response.headersSent
+                ) {
                     // handles multiple origins
                     if ( /access\-control\-allow\-origin/i.test(h) ) { // re.test(resHeaders[h]
                         if (sameOrigin) {
                             origin = sameOrigin
                         } else {
                             if ( /\,/.test(allowedOrigin) ) {
-                                origins = allowedOrigin.replace(/\s+/g, '').replace(/([a-z0-9_-]+\@[a-z0-9_-]+|[a-z0-9_-]+\@[a-z0-9_-]+\/[a-z0-9_-]+\@[a-z0-9_-]+)/ig, originHostReplacement).split(/\,/g);
+                                origins = allowedOrigin.replace(/\s+/g, '').replace(re, originHostReplacement).split(/\,/g);
 
                                 found = ( origins.indexOf(authority) > -1 ) ? origins[origins.indexOf(authority)] : false;
                                 if ( found != false ) {
                                     origin = found
                                 }
                             } else {
-                                origin = allowedOrigin
+                                origin = allowedOrigin.replace(/\s+/g, '').replace(re, originHostReplacement);
                             }
                         }
 
                         if (origin || sameOrigin) {
-                            if (!origin && sameOrigin)
+                            if (!origin && sameOrigin) {
                                 origin = sameOrigin;
+                            }
 
-
-                            response.setHeader(h, origin);
+                            try {
+                                response.setHeader(h, origin);
+                            } catch (headerError) {
+                                console.error(headerError)
+                            }
                         }
                         sameOrigin = false;
                     } else {
                         headerValue = resHeaders[h];
                         try {
-                            response.setHeader(h, headerValue)
+                            response.setHeader(h, headerValue);
                         } catch (headerError) {
                             console.error(headerError)
                         }
@@ -1178,22 +1122,16 @@ 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
+        ;
 
-        if (!stream.pushAllowed) {
-            //header = merge({ ':status': 200 }, response.getHeaders());
-            stream.respond({ ':status': 200 });
-            stream.end();
-            return;
-        }
-
-        if (stream.headersSent) return;
 
-        if ( !this._options.template ) {
-            throwError({stream: stream}, 500, 'Internal server error\n' + headers[':path'] + '\nNo template found');
-            return;
-        }
-
-        var header = null, isWebroot = false, pathname = null;
         if (
             headers[':path'] == '/'
             || headers[':path'] == this._options.conf.server.webroot
@@ -1205,24 +1143,100 @@ function Server(options) {
                 || headers[':path'] == this._options.conf.server.webroot
                     && this._options.conf.server.webrootAutoredirect
             ) {
+                isWebroot = true
+            }
+        }
 
-                header = {
-                    ':status': 301
-                };
+        var url = (isWebroot) ? this._referrer : headers[':path'];
 
-                if (cacheless) {
-                    header['cache-control'] = 'no-cache, no-store, must-revalidate';
-                    header['pragma'] = 'no-cache';
-                    header['expires'] = '0';
+        var hanlersPath     = conf.handlersPath
+            , isHandler     = (
+                                typeof(assets[ url ]) != 'undefined'
+                                && typeof(assets[ url ].filename) != 'undefined'
+                                && new RegExp('^'+ hanlersPath).test(assets[ url ].filename)
+                            ) ? true: false
+        ;
+
+        if (!stream.pushAllowed) {
+            asset = {
+                url         : url,
+                filename    : assets[ url ].filename,
+                file        : null,
+                isAvailable : assets[ url ].isAvailable,
+                mime        : assets[ url ].mime,
+                encoding    : conf.encoding,
+                isBinary    : assets[ url ].isBinary,
+                isHandler   : assets[ url ].isHandler
+            };
+            header = merge({ ':status': 200 }, response.getHeaders());
+            header['content-type'] = ( !/charset/.test(asset.mime ) ) ? asset.mime + '; charset='+ asset.encoding : asset.mime;
+            header = completeHeaders(header, local.request, response);
+            if (asset.isBinary || asset.isHandler ) {
+
+
+                if (asset.isHandler) {
+                    // adding handler `gina.ready(...)` wrapper
+                    var file = null;
+                    if ( !fs.existsSync(asset.filename) ) {
+                        throwError({stream: stream}, 404, 'Page not found: \n' + headers[':path']);
+                        return;
+                    }
+
+                    if (!assets[ url ].file) {
+                        file      = fs.readFileSync(asset.filename, asset.encoding).toString();
+                        file      = '(gina.ready(function onGinaReady($){\n'+ file + '\n},window["originalContext"]));';
+                        this._options.template.assets[ headers[':path'] ].file = file;
+                    } else {
+                        file = assets[ url ].file;
+                    }
+
+                    // header['content-length'] = fs.statSync(file).size;
+                    stream.respond(header);
+                    stream.end(file);
+
+                    return;
                 }
-                header['location'] = this._options.conf.server.webroot;
 
+                header['content-length'] = fs.statSync(asset.filename).size;
+                stream.respondWithFile(
+                    asset.filename
+                    , header
+                    //, { onError }
+                );
+            } else {
                 stream.respond(header);
                 stream.end();
-                return;
-            } else {
-                isWebroot = true;
             }
+
+            return;
+        }
+
+        if (stream.headersSent) return;
+
+        if ( !this._options.template ) {
+            throwError({stream: stream}, 500, 'Internal server error\n' + headers[':path'] + '\nNo template found');
+            return;
+        }
+
+        if (
+            // headers[':path'] == '/'
+            // || headers[':path'] == this._options.conf.server.webroot
+            /^true$/i.test(isWebroot)
+        ) {
+            header = {
+                ':status': 301
+            };
+
+            if (cacheless) {
+                header['cache-control'] = 'no-cache, no-store, must-revalidate';
+                header['pragma'] = 'no-cache';
+                header['expires'] = '0';
+            }
+            header['location'] = this._options.conf.server.webroot;
+
+            stream.respond(header);
+            stream.end();
+            return;
         }
 
         if (
@@ -1235,25 +1249,20 @@ function Server(options) {
             header = {
                 ':status': 200
             };
-            var url = (isWebroot) ? this._referrer : headers[':path'];
-            var assets = this._options.template.assets;
             var responseHeaders = ( typeof(this._responseHeaders) != 'undefined') ? this._responseHeaders : null;
-            var conf = this._options.conf;
-            var asset = {
-                    url         : url,
-                    filename    : assets[ url ].filename,
-                    file        : null,
-                    isAvailable : assets[ url ].isAvailable,
-                    mime        : assets[ url ].mime,
-                    encoding    : conf.encoding,
-                    isHandler   : false
-                }
-                , cacheless = conf.cacheless
-            ;
+            asset = {
+                url         : url,
+                filename    : assets[ url ].filename,
+                file        : null,
+                isAvailable : assets[ url ].isAvailable,
+                mime        : assets[ url ].mime,
+                encoding    : conf.encoding,
+                isHandler   : isHandler
+            };
 
             console.debug('h2 pushing: '+ headers[':path'] + ' -> '+ asset.filename);
 
-            // adding handler `gina.ready(...)` wrapper
+            // Adding handler `gina.ready(...)` wrapper
             if ( new RegExp('^'+ conf.handlersPath).test(asset.filename) ) {
 
                 if ( !fs.existsSync(asset.filename) ) {
@@ -1261,7 +1270,7 @@ function Server(options) {
                     return;
                 }
 
-                asset.isHandler = true;
+                asset.isHandler = this._options.template.assets[ headers[':path'] ].isHandler  = true;
                 asset.file      = fs.readFileSync(asset.filename, asset.encoding).toString();
                 asset.file      = '(gina.ready(function onGinaReady($){\n'+ asset.file + '\n},window["originalContext"]));';
 
@@ -1287,6 +1296,9 @@ function Server(options) {
 
 
                 header['content-type'] = ( !/charset/.test(asset.mime ) ) ? asset.mime + '; charset='+ asset.encoding : asset.mime;
+                if (assets[ url ].isBinary) {
+                    header['content-length'] = fs.statSync(assets[ url ].filename).size;
+                }
 
                 if (cacheless) {
                     // source maps integration for javascript & css
@@ -1305,8 +1317,9 @@ function Server(options) {
                     header = merge(header, responseHeaders);
                 }
                 header = completeHeaders(header, local.request, response);
+                var pushedFile = (/index.html$/.test(headers[':path']) && /\/$/.test(asset.filename) ) ? asset.filename +'index.html': asset.filename;
                 pushStream.respondWithFile(
-                    asset.filename
+                    pushedFile
                     , header
                     //, { onError }
                 );
@@ -1328,7 +1341,7 @@ function Server(options) {
 
         var protocol    = 'http/'+ local.request.httpVersion; // inheriting request protocol version by default
         var bundleConf  = self.conf[self.appName][self.env];
-        // switching protocol to h2 when possible
+        // Switching protocol to h2 when possible
         if ( /http\/2/.test(bundleConf.server.protocol) && response.stream ) {
             protocol    = bundleConf.server.protocol;
         }
@@ -1382,6 +1395,7 @@ function Server(options) {
         var isFilenameDir   = null
             , dirname       = null
             , isBinary      = null
+            , isHandler     = null
             , hanlersPath   = null
         ;
 
@@ -1392,313 +1406,353 @@ function Server(options) {
         } else {
             var s = 0, sLen = bundleConf.staticResources.length;
             for ( ; s < sLen; ++s ) {
-                //if ( new RegExp('^'+ bundleConf.staticResources[s]).test(pathname) ) {
                 if ( eval('/^' + bundleConf.staticResources[s].replace(/\//g,'\\/') +'/').test(pathname) ) {
                     filename = bundleConf.content.statics[ bundleConf.staticResources[s] ] +'/'+ pathname.replace(bundleConf.staticResources[s], '');
                     break;
                 }
             }
+
+            // try local
+            if ( !fs.existsSync(filename) ) {
+                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;
+                    }
+                }
+                key = null;
+            }
+            s       = null;
+            sLen    = null;
+
         }
 
+
         filename = decodeURIComponent(filename);
         fs.exists(filename, function onStaticExists(exist) {
 
             if (!exist) {
-                throwError(response, 404, 'Page not found: \n' + pathname, next);
-                return;
-            } else {
+                return throwError(response, 404, 'Page not found: \n' + pathname, next);
+            }
 
-                isFilenameDir = fs.statSync(filename).isDirectory();
-                if ( isFilenameDir ) {
-                    dirname = request.url;
-                    filename += 'index.html';
-                    request.url += 'index.html';
+            isFilenameDir = fs.statSync(filename).isDirectory();
+            if ( isFilenameDir ) {
+                dirname = request.url;
+                filename += 'index.html';
+                request.url += 'index.html';
 
-                    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 ( !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);
-                            header  = completeHeaders(header, request, response);
+                        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);
 
-                            if (!stream.destroyed) {
-                                stream.respond(header);
-                                stream.end();
-                            }
+                        if (!stream.destroyed) {
+                            stream.respond(header);
+                            stream.end();
+                        }
 
-                        } else {
-                            response.setHeader('location', request.url);
-                            request = checkPreflightRequest(request);
-                            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()
+                    } 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()
                     }
-                    return;
                 }
+                return;
+            }
 
 
-                if (cacheless)
-                    delete require.cache[require.resolve(filename)];
-
+            if (cacheless) {
+                delete require.cache[require.resolve(filename)];
+            }
 
-                fs.readFile(filename, bundleConf.encoding, function onStaticFileRead(err, file) {
-                    if (err) {
-                        throwError(response, 404, 'Page not found: \n' + pathname, next);
-                        return;
-                    } else if (!response.headersSent) {
+            if (response.headersSent) {
+                // May be sent by http/2 push
+                return
+            }
+            fs.readFile(filename, bundleConf.encoding, function onStaticFileRead(err, file) {
+                if (err) {
+                    throwError(response, 404, 'Page not found: \n' + pathname, next);
+                    return;
+                }
 
-                        isBinary = true;
+                if (!response.headersSent) {
 
-                        try {
-                            contentType = getHead(response, filename);
-
-                            // adding gina loader
-                            if ( /text\/html/i.test(contentType) && self.isCacheless() ) {
-                                isBinary = false;
-                                // javascriptsDeferEnabled
-                                if  (bundleConf.content.templates._common.javascriptsDeferEnabled ) {
-                                    file = file.replace(/\<\/head\>/i, '\t'+ bundleConf.content.templates._common.ginaLoader +'\n</head>');
-                                } else {
-                                    file = file.replace(/\<\/body\>/i, '\t'+ bundleConf.content.templates._common.ginaLoader +'\n</body>');
-                                }
+                    isBinary    = true;
+                    isHandler   = false;
 
+                    try {
+                        contentType = getContentTypeByFilename(filename);
+
+                        // adding gina loader
+                        if ( /text\/html/i.test(contentType) && self.isCacheless() ) {
+                            isBinary = false;
+                            // javascriptsDeferEnabled
+                            if  (bundleConf.content.templates._common.javascriptsDeferEnabled ) {
+                                file = file.replace(/\<\/head\>/i, '\t'+ bundleConf.content.templates._common.ginaLoader +'\n</head>');
                             } else {
-                                // adding handler `gina.ready(...)` wrapper
-                                hanlersPath = bundleConf.handlersPath;
-
-                                if ( new RegExp('^'+ hanlersPath).test(filename) ) {
-                                    isBinary = false;
-                                    file = '(gina.ready(function onGinaReady($){\n'+ file + '\n},window["originalContext"]));'
-                                }
+                                file = file.replace(/\<\/body\>/i, '\t'+ bundleConf.content.templates._common.ginaLoader +'\n</body>');
                             }
 
-                            if ( /http\/2/.test(protocol) ) {
-                                self._isStatic      = true;
-                                self._referrer      = request.url;
-                                var ext = request.url.match(/\.([A-Za-z0-9]+)$/);
-                                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')
-                                    self._options.template.assets = getAssets(bundleConf, file);
-
-                                if (
-                                    typeof(self._options.template.assets[request.url]) == 'undefined'
-                                    || isBinary
-                                ) {
-
-                                    self._options.template.assets[request.url] = {
-                                        ext: ( ext != null && typeof(ext[0]) != 'undefined' ) ? ext[0] : null,
-                                        isAvailable: true,
-                                        mime: contentType,
-                                        url: request.url,
-                                        filename: filename
-                                    }
-                                }
+                        } else {
+                            // adding handler `gina.ready(...)` wrapper
+                            hanlersPath = bundleConf.handlersPath;
 
-                                self.instance._isXMLRequest    = request.isXMLRequest;
-                                self.instance._getAssetFilenameFromUrl = getAssetFilenameFromUrl;
+                            if ( new RegExp('^'+ hanlersPath).test(filename) ) {
+                                isBinary    = false;
+                                isHandler   = true;
+                                file = '(gina.ready(function onGinaReady($){\n'+ file + '\n},window["originalContext"]));'
+                            }
+                        }
 
-                                var isPathMatchingUrl = null;
-                                if ( !self.instance._http2streamEventInitalized ) {
-                                    self.instance._http2streamEventInitalized = true;
-                                    self.instance.on('stream', function onHttp2Strem(stream, headers) {
+                        if ( /http\/2/.test(protocol) ) {
+                            self._isStatic      = true;
+                            self._referrer      = request.url;
+                            var ext = request.url.match(/\.([A-Za-z0-9]+)$/);
+                            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')
+                                self._options.template.assets = getAssets(bundleConf, file);
+
+                            if (
+                                typeof(self._options.template.assets[request.url]) == 'undefined'
+                                || isBinary
+                            ) {
 
-                                        if (!self._isStatic) return;
+                                self._options.template.assets[request.url] = {
+                                    ext: ( ext != null && typeof(ext[0]) != 'undefined' ) ? ext[0] : null,
+                                    isAvailable: true,
+                                    mime: contentType,
+                                    url: request.url,
+                                    filename: filename,
+                                    isBinary: isBinary,
+                                    isHandler: isHandler
+                                }
+                            }
 
-                                        if (!this._isXMLRequest) {
-                                            isPathMatchingUrl = true;
-                                            if (headers[':path'] != request.url) {
-                                                request.url         = headers[':path'];
-                                                isPathMatchingUrl   = false;
-                                            }
+                            self.instance._isXMLRequest    = request.isXMLRequest;
+                            self.instance._getAssetFilenameFromUrl = getAssetFilenameFromUrl;
 
-                                            // for new requests
-                                            if (!isPathMatchingUrl) {
-                                                pathname        = ( webroot.length > 1 && re.test(request.url) ) ? request.url.replace(re, '/') : request.url;
-                                                isFilenameDir   = (webroot == request.url) ? true: false;
+                            var isPathMatchingUrl = null;
+                            if ( !self.instance._http2streamEventInitalized ) {
+                                self.instance._http2streamEventInitalized = true;
+                                self.instance.on('stream', function onHttp2Strem(stream, headers) {
 
-                                                if ( !isFilenameDir && !/404\.html/.test(filename) && fs.existsSync(filename) )
-                                                    isFilenameDir = fs.statSync(filename).isDirectory();
-                                                if (!isFilenameDir) {
-                                                    filename = this._getAssetFilenameFromUrl(bundleConf, pathname);
-                                                }
+                                    if (!self._isStatic) return;
 
-                                                if ( !isFilenameDir && !fs.existsSync(filename) ) {
-                                                    throwError(response, 404, 'Page not found: \n' + pathname, next);
-                                                    return;
-                                                }
+                                    if (!this._isXMLRequest) {
+                                        isPathMatchingUrl = true;
+                                        if (headers[':path'] != request.url) {
+                                            request.url         = headers[':path'];
+                                            isPathMatchingUrl   = false;
+                                        }
 
+                                        // for new requests
+                                        if (!isPathMatchingUrl) {
+                                            pathname        = ( webroot.length > 1 && re.test(request.url) ) ? request.url.replace(re, '/') : request.url;
+                                            isFilenameDir   = (webroot == request.url) ? true: false;
 
-                                                if ( isFilenameDir ) {
-                                                    dirname = bundleConf.publicPath + pathname;
-                                                    filename =  dirname + 'index.html';
-                                                    request.url += 'index.html';
-                                                    if ( !fs.existsSync(filename) ) {
-                                                        throwError(response, 403, 'Forbidden: \n' + pathname, next);
-                                                        return;
-                                                    } else {
-                                                        header = {
-                                                            ':status': 301,
-                                                            'location': request.url
-                                                        };
+                                            if ( !isFilenameDir && !/404\.html/.test(filename) && fs.existsSync(filename) )
+                                                isFilenameDir = fs.statSync(filename).isDirectory();
+                                            if (!isFilenameDir) {
+                                                filename = this._getAssetFilenameFromUrl(bundleConf, pathname);
+                                            }
 
-                                                        if (cacheless) {
-                                                            header['cache-control'] = 'no-cache, no-store, must-revalidate';
-                                                            header['pragma'] = 'no-cache';
-                                                            header['expires'] = '0';
-                                                        }
+                                            if ( !isFilenameDir && !fs.existsSync(filename) ) {
+                                                throwError(response, 404, 'Page not found: \n' + pathname, next);
+                                                return;
+                                            }
 
 
-                                                        stream.respond(header);
-                                                        stream.end();
+                                            if ( isFilenameDir ) {
+                                                dirname = bundleConf.publicPath + pathname;
+                                                filename =  dirname + 'index.html';
+                                                request.url += 'index.html';
+                                                if ( !fs.existsSync(filename) ) {
+                                                    throwError(response, 403, 'Forbidden: \n' + pathname, next);
+                                                    return;
+                                                } else {
+                                                    header = {
+                                                        ':status': 301,
+                                                        'location': request.url
+                                                    };
+
+                                                    if (cacheless) {
+                                                        header['cache-control'] = 'no-cache, no-store, must-revalidate';
+                                                        header['pragma'] = 'no-cache';
+                                                        header['expires'] = '0';
                                                     }
-                                                }
-                                            }
 
-                                            contentType = getHead(response, filename);
-                                            contentType = contentType +'; charset='+ bundleConf.encoding;
-                                            ext = request.url.match(/\.([A-Za-z0-9]+)$/);
-                                            request.url = ( ext != null && typeof(ext[0]) != 'undefined' ) ? request.url : request.url + 'index.html';
-                                            if (
-                                                !isPathMatchingUrl
-                                                && typeof(self._options.template.assets[request.url]) == 'undefined'
-                                            ) {
-
-                                                self._options.template.assets[request.url] = {
-                                                    ext: ( ext != null && typeof(ext[0]) != 'undefined' ) ? ext[0] : null,
-                                                    //isAvailable: true,
-                                                    isAvailable: (!/404\.html/.test(filename)) ? true : false,
-                                                    mime: contentType,
-                                                    url: request.url,
-                                                    filename: filename
+
+                                                    stream.respond(header);
+                                                    stream.end();
                                                 }
                                             }
+                                        }
 
-                                            if (!fs.existsSync(filename)) return;
-                                            isBinary = ( /text\/html/i.test(contentType) ) ? false : true;
-                                            if ( isBinary ) {
-                                                // override
-                                                self._options.template.assets[request.url] = {
-                                                    ext: ( ext != null && typeof(ext[0]) != 'undefined' ) ? ext[0] : null,
-                                                    isAvailable: true,
-                                                    mime: contentType,
-                                                    url: request.url,
-                                                    filename: filename
-                                                }
+                                        contentType = getContentTypeByFilename(filename);
+                                        contentType = contentType +'; charset='+ bundleConf.encoding;
+                                        ext = request.url.match(/\.([A-Za-z0-9]+)$/);
+                                        request.url = ( ext != null && typeof(ext[0]) != 'undefined' ) ? request.url : request.url + 'index.html';
+                                        if (
+                                            !isPathMatchingUrl
+                                            && typeof(self._options.template.assets[request.url]) == 'undefined'
+                                        ) {
+
+                                            self._options.template.assets[request.url] = {
+                                                ext: ( ext != null && typeof(ext[0]) != 'undefined' ) ? ext[0] : null,
+                                                //isAvailable: true,
+                                                isAvailable: (!/404\.html/.test(filename)) ? true : false,
+                                                mime: contentType,
+                                                url: request.url,
+                                                filename: filename,
+                                                isBinary: isBinary,
+                                                isHandler: isHandler
                                             }
-                                            self.onHttp2Stream(stream, headers, response);
                                         }
 
-                                    }); // EO self.instance.on('stream' ..
-                                }
+                                        if (!fs.existsSync(filename)) return;
+                                        isBinary    = ( /text\/html/i.test(contentType) ) ? false : true;
+                                        isHandler   = ( new RegExp('^'+ bundleConf.handlersPath).test(filename) ) ? true : false;
+                                        if ( isBinary ) {
+                                            // override
+                                            self._options.template.assets[request.url] = {
+                                                ext: ( ext != null && typeof(ext[0]) != 'undefined' ) ? ext[0] : null,
+                                                isAvailable: true,
+                                                mime: contentType,
+                                                url: request.url,
+                                                filename: filename,
+                                                isBinary: isBinary,
+                                                isHandler: isHandler
+                                            }
+                                        }
 
+                                        if ( isHandler ) {
+                                            // adding handler `gina.ready(...)` wrapper
+                                            var file = null;
+                                            if (!self._options.template.assets[request.url].file) {
+                                                file      = fs.readFileSync(filename, bundleConf.encoding).toString();
+                                                file      = '(gina.ready(function onGinaReady($){\n'+ file + '\n},window["originalContext"]));';
+                                                self._options.template.assets[request.url].file = file;
+                                            }
+                                        }
+                                        self.onHttp2Stream(stream, headers, response);
+                                    }
 
-                                header = {
-                                    ':status': 200,
-                                    'content-type': contentType + '; charset='+ bundleConf.encoding
-                                };
+                                }); // EO self.instance.on('stream' ..
+                            }
 
-                                if (cacheless) {
-                                    // 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';
-                                        // serve without cache
-                                        header['X-SourceMap'] = pathname;
-                                        header['cache-control'] = 'no-cache, no-store, must-revalidate';
-                                        header['pragma'] = 'no-cache';
-                                        header['expires'] = '0';
-                                    }
-                                }
 
-                                header  = completeHeaders(header, request, response);
-                                if (isBinary) {
-                                    stream.respondWithFile(filename, header)
-                                } else {
-                                    stream.respond(header);
-                                    stream.end(file);
-                                }
-                                // Fixed on march 15 2021 by removing the return
-                                // Could be the cause why the push is pending
-                                //return;
-                            } else {
+                            header = {
+                                ':status': 200,
+                                'content-type': contentType + '; charset='+ bundleConf.encoding
+                            };
 
-                                completeHeaders(null, request, response);
-                                response.setHeader('content-type', contentType +'; charset='+ bundleConf.encoding);
-                                // if (/\.(woff|woff2)$/i.test(filename) )  {
-                                //     response.setHeader("Transfer-Encoding", 'Identity')
-                                // }
-                                if (isBinary) {
-                                    response.setHeader('content-length', fs.statSync(filename).size);
+                            if (cacheless) {
+                                // 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';
+                                    // serve without cache
+                                    header['X-SourceMap'] = pathname;
+                                    header['cache-control'] = 'no-cache, no-store, must-revalidate';
+                                    header['pragma'] = 'no-cache';
+                                    header['expires'] = '0';
                                 }
+                            }
 
-                                if (cacheless) {
-                                    // 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';
-                                        response.setHeader("X-SourceMap", pathname)
-                                    }
+                            header  = completeHeaders(header, request, response);
+                            if (isBinary) {
+                                stream.respondWithFile(filename, header)
+                            } else {
+                                stream.respond(header);
+                                stream.end(file);
+                            }
+                            // Fixed on march 15 2021 by removing the return
+                            // Could be the cause why the push is pending
+                            //return;
+                        } else {
 
-                                    // serve without cache
-                                    response.writeHead(200, {
-                                        'cache-control': 'no-cache, no-store, must-revalidate', // preventing browsers from caching it
-                                        'pragma': 'no-cache',
-                                        'expires': '0'
-                                    });
+                            completeHeaders(null, request, response);
+                            response.setHeader('content-type', contentType +'; charset='+ bundleConf.encoding);
+                            // if (/\.(woff|woff2)$/i.test(filename) )  {
+                            //     response.setHeader("Transfer-Encoding", 'Identity')
+                            // }
+                            if (isBinary) {
+                                response.setHeader('content-length', fs.statSync(filename).size);
+                            }
 
-                                } else {
-                                    response.writeHead(200)
+                            if (cacheless) {
+                                // 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';
+                                    response.setHeader("X-SourceMap", pathname)
                                 }
 
+                                // serve without cache
+                                response.writeHead(200, {
+                                    'cache-control': 'no-cache, no-store, must-revalidate', // preventing browsers from caching it
+                                    'pragma': 'no-cache',
+                                    'expires': '0'
+                                });
 
-                                if (isBinary) { // images, javascript, pdf ....
-                                    fs.createReadStream(filename)
-                                        .on('end', function onResponse(){
-                                            console.info(request.method +' [200] '+ pathname);
-                                        })
-                                        .pipe(response);
-                                } else {
-                                    response.write(file, bundleConf.encoding);
-                                    response.end();
-                                    console.info(request.method +' [200] '+ pathname);
-                                }
+                            } else {
+                                response.writeHead(200)
+                            }
 
-                                return;
+
+                            if (isBinary) { // images, javascript, pdf ....
+                                fs.createReadStream(filename)
+                                    .on('end', function onResponse(){
+                                        console.info(request.method +' [200] '+ pathname);
+                                    })
+                                    .pipe(response);
+                            } else {
+                                response.write(file, bundleConf.encoding);
+                                response.end();
+                                console.info(request.method +' [200] '+ pathname);
                             }
 
-                        } catch(err) {
-                            throwError(response, 500, err.stack);
                             return;
                         }
+
+                    } catch(err) {
+                        throwError(response, 500, err.stack);
+                        return;
                     }
+                }
+
+                return
+            });
 
-                    return
-                });
 
-            }
         })
     }
 
@@ -1729,21 +1783,31 @@ function Server(options) {
              * */
             request.isWithCredentials  = ( request.headers['access-control-allow-credentials'] && request.headers['access-control-allow-credentials'] == true ) ? true : false;
             /**
-             * Intercept gina headers
+             * Intercept gina headers for:
+             *  - form valdiation
+             *  - form security
              */
-            if ( typeof(request.headers['x-gina-form-id']) != 'undefined' ) {
-                var ginaHeaders = {
-                    form: {
-                        id: request.headers['x-gina-form-id']
-                    }
-                };
-                if ( typeof(request.headers['x-gina-form-rule']) != 'undefined' ) {
-                    var rule = request.headers['x-gina-form-rule'].split(/\@/);
-                    ginaHeaders.form.rule = rule[0];
-                    ginaHeaders.form.bundle = rule[1];
-                }
-                request.ginaHeaders = ginaHeaders;
+            var ginaHeaders = {
+                form: {},
+                popin: {}
+            };
+            // if (/x\-gina\-form\-id/i.test(request.headers['access-control-request-headers']) ) {
+            if ( typeof(request.headers['x-gina-form-rule']) != 'undefined' ) {
+                ginaHeaders.form.id = request.headers['x-gina-form-id'];
             }
+            if ( typeof(request.headers['x-gina-popin-id']) != 'undefined' ) {
+                ginaHeaders.popin.id = request.headers['x-gina-popin-id'];
+            }
+            if ( typeof(request.headers['x-gina-popin-name']) != 'undefined' ) {
+                ginaHeaders.popin.name = request.headers['x-gina-popin-name'];
+            }
+            if ( typeof(request.headers['x-gina-form-rule']) != 'undefined' ) {
+                var rule = request.headers['x-gina-form-rule'].split(/\@/);
+                ginaHeaders.form.rule = rule[0];
+                ginaHeaders.form.bundle = rule[1];
+                rule = null;
+            }
+            request.ginaHeaders = ginaHeaders;
 
             local.request = request;
 
@@ -1779,7 +1843,9 @@ function Server(options) {
                     if ( urls.indexOf('/') > -1 ) {
                         isWebrootHandledByRouting = true;
                     }
+                    urls = null;
                 }
+                routing = null;
             }
 
             // priority to statics - this portion of code has been duplicated to SuperController : see `isStaticRoute` method
@@ -1815,6 +1881,9 @@ function Server(options) {
                 ) {
                     staticProps.isStaticFilename = true
                 }
+
+                ext = null;
+                isImage = null;
             }
 
 
@@ -1825,27 +1894,25 @@ function Server(options) {
                 if ( matchedFirstInUrl && matchedFirstInUrl.length > 0 ) {
                     staticProps.firstLevel = self.conf[self.appName][self.env].server.webroot + matchedFirstInUrl[0]
                 }
+                matchedFirstInUrl = null;
             }
 
             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(staticProps.firstLevel) > -1
-                // take ^/dir/sub/*
                 || staticProps.isStaticFilename && new RegExp('^'+ staticProps.firstLevel).test(request.url)
                 || /\/$/.test(request.url) && !isWebrootHandledByRouting && !/\/engine\.io\//.test(request.url)
             ) {
                 self._isStatic  = true;
 
-
                 self._referrer  = request.url;
                 // by default - used in `composeHeadersMiddleware`: see Default Global Middlewares (gna.js)
                 request.routing = {
-                    'url': request.url,
-                    'method': 'GET',
-                    'bundle' : self.appName
+                    'url'       : request.url,
+                    'method'    : 'GET',
+                    'bundle'    : self.appName
                 };
-                request = checkPreflightRequest(request);
+                request = checkPreflightRequest(request, response);
                 local.request = request; // update request
                 // filtered to handle only html for now
                 if ( /text\/html/.test(request.headers['accept'])
@@ -1923,6 +1990,8 @@ function Server(options) {
                      *  - https://developers.google.com/web/updates/2012/06/How-to-convert-ArrayBuffer-to-and-from-String
                      *  - https://jsperf.com/arraybuffer-string-conversion/4
                      *
+                     * TODO - Test with audio content
+                     *
                      * @param {string} str
                      *
                      * @returns {array} buffer
@@ -1955,7 +2024,7 @@ function Server(options) {
                         //var buf = new ArrayBuffer(str.length * 2); // 2 bytes for each char when using Uint16Array(buf)
                         //var buf = new ArrayBuffer(str.length); // Uint8Array
                         //var bufView = new Uint8Array(buf);
-                        for (var i = 0, strLen = str.length; i < strLen; i++) {
+                        for (let i = 0, strLen = str.length; i < strLen; i++) {
                             bufView[i] = str.charCodeAt(i);
                         }
 
@@ -2155,16 +2224,17 @@ function Server(options) {
 
         });//EO this.instance
 
-
         self.instance.listen(self.conf[self.appName][self.env].server.port);//By Default 3100
-        self.instance.timeout = (1000 * 300); // e.g.: 1000x60 => 60 sec
+        // Timeout in milliseconds - e.g.: (1000x60)x2 => 2 min
+        self.instance.timeout = 0; // zero for unlimited
+
 
         self.emit('started', self.conf[self.appName][self.env], true);
     }
 
     var processRequestData = function(request, response, next) {
 
-        var bodyStr = null, obj = null;
+        var bodyStr = null, obj = null, exception = null;
         // to compare with /core/controller/controller.js -> getParams()
         switch( request.method.toLowerCase() ) {
             case 'post':
@@ -2193,7 +2263,13 @@ function Server(options) {
                                 bodyStr = bodyStr.replace(/\"null\"/ig, null);
 
                             try {
-                                obj = parseBody(bodyStr);
+                                // obj = parseBody(bodyStr);
+                                obj = formatDataFromString(bodyStr);
+                                if ( !obj) {
+                                    exception = new Error('Could not convert POST::BODY_STRING to POST::OBJECT. Possible JSON error in `bodyStr`');
+                                    throwError(response, 500, exception, next);
+                                    return;
+                                }
                                 request.post = obj;
                                 isPostSet = true;
                             } catch (err) {
@@ -2226,7 +2302,8 @@ function Server(options) {
                     if (request.body.count() == 0 && typeof(request.query) != 'string' && request.query.count() > 0 ) {
                         request.body = request.query
                     }
-                    bodyStr = JSON.stringify(request.body);
+                    // 2023-01-31: fixed `request.body` might not be an `object`
+                    bodyStr = ( typeof(request.body) == 'object') ? JSON.stringify(request.body) : request.body;
                     // false & true case
                     if ( /(\"false\"|\"true\"|\"on\")/.test(bodyStr) )
                         bodyStr = bodyStr.replace(/\"false\"/g, false).replace(/\"true\"/g, true).replace(/\"on\"/g, true);
@@ -2235,7 +2312,7 @@ function Server(options) {
                 }
 
                 try {
-                    if ( obj.count() > 0 ) {
+                    if ( typeof(obj) == 'object' && obj.count() > 0 ) {
                         // still need this to allow compatibility with express & connect middlewares
                         request.body = request.post = obj;
                     }
@@ -2276,7 +2353,7 @@ function Server(options) {
 
 
                         if ( typeof(request.query.inheritedData) == 'string' ) {
-                            inheritedDataObj = parseBody(decodeURIComponent(request.query.inheritedData));
+                            inheritedDataObj = formatDataFromString(decodeURIComponent(request.query.inheritedData));
                         } else {
                             inheritedDataObj = JSON.clone(request.query.inheritedData);
                         }
@@ -2293,10 +2370,12 @@ function Server(options) {
                         bodyStr = bodyStr.replace(/\"null\"/ig, null);
 
 
-                    obj = parseBody(decodeURIComponent(bodyStr));
+                    obj = formatDataFromString(decodeURIComponent(bodyStr));
 
                     request.query = merge(obj, inheritedDataObj);
-                    delete obj;
+                    // delete obj;
+                    obj = null;
+                    inheritedDataObj = null;
 
                     request.get = request.query;
                 }
@@ -2336,7 +2415,7 @@ function Server(options) {
                             if ( /(\"null\")/i.test(bodyStr) )
                                 bodyStr = bodyStr.replace(/\"null\"/ig, null);
 
-                            obj = parseBody(bodyStr);
+                            obj = formatDataFromString(bodyStr);
 
                             if ( typeof(obj) != 'undefined' && obj.count() == 0 && bodyStr.length > 1 ) {
                                 try {
@@ -2418,21 +2497,21 @@ function Server(options) {
         })
     }
 
-    var getHead = function(response, file) {
+    var getContentTypeByFilename = function(filename) {
         try {
-            var s       = file.split(/\./);
+            var s       = filename.split(/\./);
             var ext     = s[s.length-1];
             var type    = null;
             var mime    = self.conf[self.appName][self.env].server.coreConfiguration.mime;
 
-            if( typeof(mime[ext]) != 'undefined' ) {
+            if ( typeof(mime[ext]) != 'undefined' ) {
                 type = mime[ext];
             } else {
-                console.warn('[ '+file+' ] extension: `'+s[2]+'` not supported by gina: `core/mime.types`. Replacing with `plain/text` ')
+                console.warn('[ '+filename+' ] extension: `'+s[2]+'` not supported by gina: `core/mime.types`. Pathname must be a directory. Replacing with `plain/text` ')
             }
-            return type || 'plain/text'
+            return type || 'plain/text';
         } catch (err) {
-            console.error('Error while trying to getHead('+ file +') extention. Replacing with `plain/text` '+ err.stack);
+            console.error('Error while trying to getContentTypeByFilename('+ filename +') extention. Replacing with `plain/text` '+ err.stack);
             return 'plain/text'
         }
 
@@ -2454,10 +2533,10 @@ function Server(options) {
         if (self.isStandalone) {
 
         end:
-            for (var b in conf) {
+            for (let b in conf) {
                 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 (var s in conf[b][self.env].content.statics) {
+                    for (let s in conf[b][self.env].content.statics) {
                         s = (s.substr(0,1) == '/') ? s.substr(1) : s;
                         if ( (new RegExp('^/'+s)).test(pathname) ) {
                             bundle = b;
@@ -2500,7 +2579,8 @@ function Server(options) {
             , res       = options.res
             , config    = options.conf
             , next      = options.next
-            , callback  = options.callback;
+            , callback  = options.callback
+        ;
 
         //Reloading assets & files.
         // if (!cacheless) { // all but dev & debug
@@ -2531,13 +2611,13 @@ function Server(options) {
         }
 
         expressMiddlewares[nextMiddleware._index](nextMiddleware._request, nextMiddleware._response, function onNextMiddleware(err, request, response) {
-            ++nextMiddleware._index;
 
             if (err) {
                 throwError(nextMiddleware._response, 500, (err.stack||err.message||err), nextMiddleware._next, nextMiddleware._nextAction);
                 return;
             }
 
+            ++nextMiddleware._index;
             if (request)
                 nextMiddleware._request  = request;
 
@@ -2562,7 +2642,7 @@ function Server(options) {
         });
     };
 
-    var checkPreflightRequest = function(request) {
+    var checkPreflightRequest = function(request, response) {
         var config = self.conf[self.appName][self.env];
         // by default, if not set in `${projectPath}/env.json`
         var corsMethod = 'GET, POST, HEAD';
@@ -2606,7 +2686,7 @@ function Server(options) {
             } else {
                 request.method = method
             }
-            accessControlRequestHeaders = ( typeof(request.headers['access-control-request-headers']) != 'undefined' ) ? request.headers['access-control-request-headers'] : '';
+            accessControlRequestHeaders = ( typeof(request.headers['access-control-request-headers']) != 'undefined' ) ? request.headers['access-control-request-headers'].replace(/\s+/, '').split(/\,/g) : '';
             if ( typeof(request.headers['access-control-request-credentials']) != 'undefined' && typeof(serverResponseHeaders['access-control-allow-credentials']) != 'undefined' ) {
                 request.isWithCredentials = true;
             }
@@ -2616,6 +2696,7 @@ function Server(options) {
                         request.isXMLRequest = true;
                     }
                 }
+                response.setHeader('access-control-allow-headers', request.headers['access-control-request-headers']);
             }
         }
 
@@ -2632,9 +2713,9 @@ function Server(options) {
             , wroot             = null
         ;
 
-        //matched = routingUtils.getRouteByUrl(req.url, bundle, (req.method||req[':method']), req);
+        //matched = routingLib.getRouteByUrl(req.url, bundle, (req.method||req[':method']), req);
 
-        req = checkPreflightRequest(req);
+        req = checkPreflightRequest(req, res);
         var params      = {}
             , _routing  = {}
             , method    = ( /http\/2/.test(self.conf[self.appName][self.env].server.protocol) ) ? req.headers[':method'] : req.method
@@ -2657,9 +2738,10 @@ function Server(options) {
         }
         var isMethodAllowed = null, hostname = null;
         out:
-            for (var name in routing) {
-                if (typeof(routing[name]['param']) == 'undefined')
+            for (let name in routing) {
+                if ( typeof(routing[name]['param']) == 'undefined' ) {
                     break;
+                }
 
                 // updating hostname
                 // if (
@@ -2687,7 +2769,7 @@ function Server(options) {
                     method              : method,
                     requirements        : routing[name].requirements,
                     namespace           : routing[name].namespace || undefined,
-                    url                 : unescape(pathname), /// avoid %20
+                    url                 : decodeURI(pathname), /// avoid %20
                     rule                : routing[name].originalRule || name,
                     param               : JSON.clone(routing[name].param),
                     middleware          : JSON.clone(routing[name].middleware),
@@ -2698,7 +2780,7 @@ function Server(options) {
 
                 //Parsing for the right url.
                 try {
-                    isRoute = await routingUtils.compareUrls(params, routing[name].url, req, res, next);
+                    isRoute = await routingLib.compareUrls(params, routing[name].url, req, res, next);
                 } catch (err) {
                     var msg = 'Internal server error.\nRule [ '+name+' ] needs your attention.\n';
                     // TODO - Refactor `ApiError`to handle the following param
@@ -2724,51 +2806,51 @@ function Server(options) {
                             throwError(res, 405, 'Method Not Allowed.\n'+ ' `'+req.url+'` is expecting `' + _routing.method.toUpperCase() +'` method but got `'+ req.method.toUpperCase() +'` instead');
                             break;
                         }
-                    }// else {
+                    }
 
-                        // handling GET method exception - if no param found
-                        var methods = ['get', 'delete'], method = req.method.toLowerCase();
-                        var p = null;
-                        if (
-                            methods.indexOf(method) > -1 && typeof(req.query) != 'undefined' && req.query.count() == 0
-                            || methods.indexOf(method) > -1 && typeof(req.query) == 'undefined' && typeof(req.params) != 'undefined' && req.params.count() > 1
-                        ) {
-                            //req.params = parseObject(req.params);
-                            p = 0;
-                            for (let parameter in req.params) {
-                                if (p > 0) {
-                                    // false & true case
-                                    if ( /^(false|true|on)$/.test( req.params[parameter] ) && typeof(req.params[parameter]) == 'string' )
-                                        req.params[parameter] = ( /^(true|on)$/.test( req.params[parameter] ) ) ? true : false;
-
-                                    req[method][parameter] = req.params[parameter]
-                                }
-                                ++p
+                    // handling GET method exception - if no param found
+                    var methods = ['get', 'delete'], method = req.method.toLowerCase();
+                    var p = null;
+                    if (
+                        methods.indexOf(method) > -1 && typeof(req.query) != 'undefined' && req.query.count() == 0
+                        || methods.indexOf(method) > -1 && typeof(req.query) == 'undefined' && typeof(req.params) != 'undefined' && req.params.count() > 1
+                    ) {
+                        //req.params = parseObject(req.params);
+                        p = 0;
+                        for (let parameter in req.params) {
+                            if (p > 0) {
+                                // false & true case
+                                if ( /^(false|true|on)$/.test( req.params[parameter] ) && typeof(req.params[parameter]) == 'string' )
+                                    req.params[parameter] = ( /^(true|on)$/.test( req.params[parameter] ) ) ? true : false;
+
+                                req[method][parameter] = req.params[parameter]
                             }
+                            ++p
+                        }
 
-                        } else if ( method == 'put' ) { // merging req.params with req.put (passed through URI)
-                            p = 0;
-                            for (let parameter in req.params) {
-                                if (p > 0) {
-                                    // false & true case
-                                    if ( /^(false|true|on)$/.test( req.params[parameter] ) && typeof(req.params[parameter]) == 'string' )
-                                        req.params[parameter] = ( /^(true|on)$/.test( req.params[parameter] ) ) ? true : false;
+                    } else if ( method == 'put' ) { // merging req.params with req.put (passed through URI)
+                        p = 0;
+                        for (let parameter in req.params) {
+                            if (p > 0) {
+                                // false & true case
+                                if ( /^(false|true|on)$/.test( req.params[parameter] ) && typeof(req.params[parameter]) == 'string' )
+                                    req.params[parameter] = ( /^(true|on)$/.test( req.params[parameter] ) ) ? true : false;
 
-                                    req[method][parameter] = req.params[parameter]
-                                }
-                                ++p
+                                req[method][parameter] = req.params[parameter]
                             }
+                            ++p
                         }
+                    }
 
 
-                        // onRouting Event ???
-                        if (isRoute.past) {
-                            matched = true;
-                            isRoute = {};
+                    // onRouting Event ???
+                    if (isRoute.past) {
+                        matched = true;
+                        isRoute = {};
+
+                        break;
+                    }
 
-                            break;
-                        }
-                    //}
                 }
             }
 
@@ -2783,15 +2865,15 @@ function Server(options) {
                 nextMiddleware._next         = next;
                 nextMiddleware._nextAction   = 'route'
 
-                nextMiddleware()
-            } else {
-                router._server = self.instance;
-                router.route(req, res, next, req.routing)
+                return nextMiddleware()
             }
-        } else {
-            throwError(res, 404, 'Page not found: \n' + pathname, next);
-            return;
+
+            router._server = self.instance;
+
+            return router.route(req, res, next, req.routing);
         }
+
+        return throwError(res, 404, 'Page not found: \n' + pathname, next);
     }
 
 
@@ -2810,16 +2892,16 @@ function Server(options) {
 
         if ( typeof(msg) != 'object' ) {
             err = {
-                code: code,
-                message: msg
+                code    : code,
+                message : msg
             }
         } else {
             err = JSON.clone(msg);
         }
 
         if (!res.headersSent) {
-            res.headersSent = true;
-            local.request = checkPreflightRequest(local.request);
+            // res.headersSent = true;
+            local.request = checkPreflightRequest(local.request, local.response);
             // updated filter on controller.js : 2020/09/25
             //if (isXMLRequest || !withViews || !isUsingTemplate ) {
             if (isXMLRequest || !withViews || !isUsingTemplate || withViews && !isUsingTemplate ) {
@@ -2864,8 +2946,8 @@ function Server(options) {
 
                 } else {
                     res.end(JSON.stringify({
-                        status: code,
-                        error: msg
+                        status  : code,
+                        error   : msg
                     }));
                 }
                 return;
@@ -2873,9 +2955,10 @@ function Server(options) {
             } else {
 
                 //console.error('[ BUNDLE ][ '+self.appName+' ] '+ local.request.method +' [ '+code+' ] '+ local.request.url);
-                console.error(local.request.method +' [ '+code+' ] '+ local.request.url);
+                // console.error(local.request.method +' [ '+code+' ] '+ local.request.url);
+                console.error('[ BUNDLE ][ '+self.appName+' ] '+ local.request.method +' [ '+code+' ] \n'+ msg);
                 // intercept none HTML mime types
-                var url                     = unescape(local.request.url) /// avoid %20
+                var url                     = decodeURI(local.request.url) /// avoid %20
                     , ext                   = null
                     , isHtmlContent         = false
                     , hasCustomErrorFile    = false
@@ -2937,7 +3020,7 @@ function Server(options) {
                     }
 
                     var eRule = 'custom-error-page@'+ self.appName;
-                    var routeObj = routingUtils.getRoute(eRule);
+                    var routeObj = routingLib.getRoute(eRule);
                     routeObj.rule = eRule;
                     routeObj.url = url;
                     routeObj.param.title = ( typeof(eData.title) != 'undefined' ) ? eData.title : 'Error ' + eData.status;
@@ -2947,30 +3030,36 @@ function Server(options) {
 
                     local.request.routing = routeObj;
 
-                    // if ( /^isaac/.test(self.engine) && self.instance._expressMiddlewares.length > 0) {
-                    //     nextMiddleware._index        = 0;
-                    //     nextMiddleware._count        = self.instance._expressMiddlewares.length-1;
-                    //     nextMiddleware._request      = local.request;
-                    //     nextMiddleware._response     = res;
-                    //     nextMiddleware._next         = next;
-                    //     nextMiddleware._nextAction   = 'route'
-
-                    //     nextMiddleware()
-                    // } else {
+                    var hasMiddlewareException = null;
+                    for (let i=0, len = __stack.length; i<len; i++) {
+                        let c = __stack[i].getFunctionName() || null;
+                        if ( /processMiddlewares/.test(c) ) {
+                            hasMiddlewareException = true;
+                            break;
+                        }
+                    }
+                    if ( !hasMiddlewareException ) {
                         var router = local.router;
                         if ( typeof(router._server) == 'undefined' ) {
                             router._server = self.instance;
                         }
                         router.route(local.request, res, next, local.request.routing);
-                    // }
 
-                    return;
+                        return;
+                    }
+                    hasMiddlewareException = null;
+                    // TODO - Instead of setting `hasCustomErrorFile` to false, compile custom error page with:
+                    // JSON.stringify({
+                    //     status  : code,
+                    //     error   : msg
+                    // })
+                    hasCustomErrorFile = false;
                 }
 
                 if ( /http\/2/.test(protocol) && stream ) {
                     header = {
-                        ':status': code,
-                        'content-type': bundleConf.server.coreConfiguration.mime[ext]+'; charset='+ bundleConf.encoding
+                        ':status'       : code,
+                        'content-type'  : bundleConf.server.coreConfiguration.mime[ext]+'; charset='+ bundleConf.encoding
                     };
                 } else {
                     res.writeHead(code, { 'content-type': bundleConf.server.coreConfiguration.mime[ext]+'; charset='+ bundleConf.encoding });
@@ -2984,7 +3073,10 @@ function Server(options) {
                     if ( isHtmlContent && !hasCustomErrorFile ) {
                         stream.end('<html><body><pre><h1>Error '+ code +'.</h1><pre>'+ msg + '</pre></body></html>');
                     } else {
-                        stream.end();
+                        stream.end(JSON.stringify({
+                            status  : code,
+                            error   : msg
+                        }));
                     }
 
                     // }
@@ -2992,7 +3084,10 @@ function Server(options) {
                     if ( isHtmlContent && !hasCustomErrorFile ) {
                         res.end('<html><body><pre><h1>Error '+ code +'.</h1><pre>'+ msg + '</pre></body><html>');
                     } else {
-                        res.end()
+                        res.end(JSON.stringify({
+                            status  : code,
+                            error   : msg
+                        }))
                     }
                 }
                 return;