gina 0.1.1-alpha.21 → 0.1.1-alpha.211

package/framework/{v0.1.1-alpha.21 → v0.1.1-alpha.211}/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;
@@ -227,13 +227,56 @@ function Server(options) {
                 })
             });
         } 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}`);
@@ -495,149 +538,149 @@ 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 parseCollection = function (collection, obj) {
 
-            var el      = {}
-                , value = null
-                , key   = null;
+    //     for(var i = 0, len = collection.length; i<len; ++i) {
+    //         obj[i] = parseObject(collection[i], obj);
+    //     }
 
-            for (var i = 0, len = arr.length; i < len; ++i) {
-                if (!arr[i]) continue;
+    //     return obj
+    // }
 
-                arr[i] = decodeURIComponent(arr[i]);
+    // var parseObject = function (tmp, obj) {
+    //     var el      = []
+    //         , key   = null
+    //     ;
 
-                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] );
-                        }
+    //     for (var o in tmp) {
 
+    //         el[0]   = o;
+    //         el[1]   = tmp[o];
 
-                    } 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]
+    //         }
+    //     }
 
-                        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
+    // }
 
-            return obj
-        }
+    // var parseBody = function(body) {
+    //     var obj = null, tmp = null, arr = null;
+    //     if ( /^(\{|\[|\%7B|\%5B)/.test(body) ) {
+    //         try {
+    //             obj = ( /^(\{|\%7B)/.test() ) ? {} : [];
+
+    //             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) {
+    // var parseLocalObj = function(obj, key, k, value) {
 
-        if ( typeof(obj[ key[k] ]) == 'undefined' ) {
-            obj[ key[k] ] = {};
-        }
+    //     if ( typeof(obj[ key[k] ]) == 'undefined' ) {
+    //         obj[ key[k] ] = {};
+    //     }
 
-        for (var prop in obj) {
+    //     for (var prop in obj) {
 
-            if (k == key.length-1) {
+    //         if (k == key.length-1) {
 
-                if (prop == key[k]) {
-                    obj[prop] = ( typeof(value) != 'undefined' ) ? value : '';
-                }
+    //             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] ] = {};
+    //         } else if ( key.indexOf(prop) > -1 ) {
+    //             ++k;
+    //             if ( !obj[prop][ key[k] ] )
+    //                 obj[prop][ key[k] ] = {};
 
 
-                parseLocalObj(obj[prop], key, k, value)
+    //             parseLocalObj(obj[prop], key, k, value)
 
-            }
-        }
+    //         }
+    //     }
 
-        return obj;
-    }
+    //     return obj;
+    // }
 
     var getAssetFilenameFromUrl = function(bundleConf, url) {
 
@@ -1071,7 +1114,6 @@ 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) {
@@ -1082,7 +1124,6 @@ function Server(options) {
         // 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 +1147,97 @@ 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.replace(/\{|\}/g, '');
+            //     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;
+            //     }
+
+            //     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;
+
+            //     return domain
+            // }
+
             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
                 }
+                var env = self.conf.env;
+
+                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;
 
-                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;
-
-                return domain
+                return name;
             }
 
-            var headerValue = null;
+            var headerValue = null, re = new RegExp('\{\s*(.*)\s*\}', 'g');
             for (var h in resHeaders) {
-                if (!response.headersSent) {
+                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,11 +1258,92 @@ 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 (
+            headers[':path'] == '/'
+            || headers[':path'] == this._options.conf.server.webroot
+        ) {
+
+            if (
+                this._options.conf.server.webroot != headers[':path']
+                && this._options.conf.server.webrootAutoredirect
+                || headers[':path'] == this._options.conf.server.webroot
+                    && this._options.conf.server.webrootAutoredirect
+            ) {
+                isWebroot = true
+            }
+        }
+
+        var url = (isWebroot) ? this._referrer : headers[':path'];
+
+        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) {
-            //header = merge({ ':status': 200 }, response.getHeaders());
-            stream.respond({ ':status': 200 });
-            stream.end();
+            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['content-length'] = fs.statSync(asset.filename).size;
+                stream.respondWithFile(
+                    asset.filename
+                    , header
+                    //, { onError }
+                );
+            } else {
+                stream.respond(header);
+                stream.end();
+            }
+
             return;
         }
 
@@ -1193,18 +1354,18 @@ function Server(options) {
             return;
         }
 
-        var header = null, isWebroot = false, pathname = null;
         if (
-            headers[':path'] == '/'
-            || headers[':path'] == this._options.conf.server.webroot
+            // headers[':path'] == '/'
+            // || headers[':path'] == this._options.conf.server.webroot
+            /^true$/i.test(isWebroot)
         ) {
 
-            if (
-                this._options.conf.server.webroot != headers[':path']
-                && this._options.conf.server.webrootAutoredirect
-                || headers[':path'] == this._options.conf.server.webroot
-                    && this._options.conf.server.webrootAutoredirect
-            ) {
+            // if (
+            //     this._options.conf.server.webroot != headers[':path']
+            //     && this._options.conf.server.webrootAutoredirect
+            //     || headers[':path'] == this._options.conf.server.webroot
+            //         && this._options.conf.server.webrootAutoredirect
+            // ) {
 
                 header = {
                     ':status': 301
@@ -1220,9 +1381,10 @@ function Server(options) {
                 stream.respond(header);
                 stream.end();
                 return;
-            } else {
-                isWebroot = true;
-            }
+            // }
+            // else {
+            //     isWebroot = true;
+            // }
         }
 
         if (
@@ -1235,21 +1397,19 @@ function Server(options) {
             header = {
                 ':status': 200
             };
-            var url = (isWebroot) ? this._referrer : headers[':path'];
-            var assets = this._options.template.assets;
+            // var assets = this._options.template.assets;
+            // var url = (isWebroot) ? this._referrer : headers[':path'];
             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
-            ;
+            // var conf = this._options.conf;
+            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);
 
@@ -1261,7 +1421,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 +1447,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 +1468,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 }
                 );
@@ -1382,6 +1546,7 @@ function Server(options) {
         var isFilenameDir   = null
             , dirname       = null
             , isBinary      = null
+            , isHandler     = null
             , hanlersPath   = null
         ;
 
@@ -1431,7 +1596,7 @@ function Server(options) {
                                 header['pragma'] = 'no-cache';
                                 header['expires'] = '0';
                             }
-                            request = checkPreflightRequest(request);
+                            request = checkPreflightRequest(request, response);
                             header  = completeHeaders(header, request, response);
 
                             if (!stream.destroyed) {
@@ -1441,7 +1606,7 @@ function Server(options) {
 
                         } else {
                             response.setHeader('location', request.url);
-                            request = checkPreflightRequest(request);
+                            request = checkPreflightRequest(request, response);
                             completeHeaders(null, request, response);
                             if (cacheless) {
                                 response.writeHead(301, {
@@ -1458,20 +1623,27 @@ function Server(options) {
                 }
 
 
-                if (cacheless)
+                if (cacheless) {
                     delete require.cache[require.resolve(filename)];
+                }
 
-
+                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;
-                    } else if (!response.headersSent) {
+                    }
+
+                    if (!response.headersSent) {
 
-                        isBinary = true;
+                        isBinary    = true;
+                        isHandler   = false;
 
                         try {
-                            contentType = getHead(response, filename);
+                            contentType = getContentTypeByFilename(filename);
 
                             // adding gina loader
                             if ( /text\/html/i.test(contentType) && self.isCacheless() ) {
@@ -1488,7 +1660,8 @@ function Server(options) {
                                 hanlersPath = bundleConf.handlersPath;
 
                                 if ( new RegExp('^'+ hanlersPath).test(filename) ) {
-                                    isBinary = false;
+                                    isBinary    = false;
+                                    isHandler   = true;
                                     file = '(gina.ready(function onGinaReady($){\n'+ file + '\n},window["originalContext"]));'
                                 }
                             }
@@ -1513,7 +1686,9 @@ function Server(options) {
                                         isAvailable: true,
                                         mime: contentType,
                                         url: request.url,
-                                        filename: filename
+                                        filename: filename,
+                                        isBinary: isBinary,
+                                        isHandler: isHandler
                                     }
                                 }
 
@@ -1577,7 +1752,7 @@ function Server(options) {
                                                 }
                                             }
 
-                                            contentType = getHead(response, 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';
@@ -1592,12 +1767,15 @@ function Server(options) {
                                                     isAvailable: (!/404\.html/.test(filename)) ? true : false,
                                                     mime: contentType,
                                                     url: request.url,
-                                                    filename: filename
+                                                    filename: filename,
+                                                    isBinary: isBinary,
+                                                    isHandler: isHandler
                                                 }
                                             }
 
                                             if (!fs.existsSync(filename)) return;
-                                            isBinary = ( /text\/html/i.test(contentType) ) ? false : true;
+                                            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] = {
@@ -1605,7 +1783,19 @@ function Server(options) {
                                                     isAvailable: true,
                                                     mime: contentType,
                                                     url: request.url,
-                                                    filename: filename
+                                                    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);
@@ -1729,21 +1919,23 @@ 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: {}
+            };
+            // 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-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;
 
             local.request = request;
 
@@ -1830,8 +2022,6 @@ function Server(options) {
             if (
                 staticProps.isStaticFilename && staticsArr.indexOf(request.url) > -1
                 || staticProps.isStaticFilename && staticsArr.indexOf( request.url.replace(request.url.substr(request.url.lastIndexOf('/')+1), '') ) > -1
-                //|| staticProps.isStaticFilename && staticsArr.indexOf(staticProps.firstLevel) > -1
-                // take ^/dir/sub/*
                 || staticProps.isStaticFilename && new RegExp('^'+ staticProps.firstLevel).test(request.url)
                 || /\/$/.test(request.url) && !isWebrootHandledByRouting && !/\/engine\.io\//.test(request.url)
             ) {
@@ -1845,7 +2035,7 @@ function Server(options) {
                     '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 +2113,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
@@ -2155,16 +2347,16 @@ 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
 
+
         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 +2385,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 +2424,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 +2434,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 +2475,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,7 +2492,7 @@ function Server(options) {
                         bodyStr = bodyStr.replace(/\"null\"/ig, null);
 
 
-                    obj = parseBody(decodeURIComponent(bodyStr));
+                    obj = formatDataFromString(decodeURIComponent(bodyStr));
 
                     request.query = merge(obj, inheritedDataObj);
                     delete obj;
@@ -2336,7 +2535,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 +2617,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'
         }
 
@@ -2531,13 +2730,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 +2761,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 +2805,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 +2815,7 @@ function Server(options) {
                         request.isXMLRequest = true;
                     }
                 }
+                response.setHeader('access-control-allow-headers', request.headers['access-control-request-headers']);
             }
         }
 
@@ -2632,9 +2832,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 +2857,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 +2888,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 +2899,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
@@ -2818,8 +3019,8 @@ function Server(options) {
         }
 
         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 ) {
@@ -2875,7 +3076,7 @@ function Server(options) {
                 //console.error('[ BUNDLE ][ '+self.appName+' ] '+ local.request.method +' [ '+code+' ] '+ local.request.url);
                 console.error(local.request.method +' [ '+code+' ] '+ local.request.url);
                 // 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 +3138,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;