gina 0.1.6-alpha.15 → 0.1.6-alpha.150

package/framework/{v0.1.6-alpha.15 → v0.1.6-alpha.150}/core/controller/controller.js

@@ -1,7 +1,7 @@
 "use strict";
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2025 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -10,14 +10,13 @@
 //Imports.
 var fs              = require('fs');
 const {promises: {readFile}} = require("fs");
+const exec          = require('child_process').exec;
 var util            = require('util');
 var promisify       = util.promisify;
 var EventEmitter    = require('events').EventEmitter;
-var zlib            = require('zlib');
 
-//var dns           = require('dns');
-// var tls = require('tls');
-// var crypto = require('crypto');
+const { Resolver } = require('node:dns').promises;
+const resolver = new Resolver();
 
 var lib             = require('./../../lib') || require.cache[require.resolve('./../../lib')];
 var merge           = lib.merge;
@@ -25,9 +24,10 @@ var inherits        = lib.inherits;
 var console         = lib.logger;
 var Collection      = lib.Collection;
 var routingLib      = lib.routing;
-var swig            = require('swig');
-// Swig 2
-// var swig            = require('./../deps/swig-client/swig-2.0.0.min.js');
+var Domain          = lib.Domain;
+var domainLib       = new Domain();
+var swig            = require('./../deps/swig-1.4.2');
+const { type }      = require('node:os');
 var SwigFilters     = lib.SwigFilters;
 var statusCodes     = requireJSON( _( getPath('gina').core + '/status.codes') );
 
@@ -68,29 +68,26 @@ function SuperController(options) {
     var init = function() {
 
         if ( typeof(SuperController.initialized) != 'undefined' ) {
-            return getInstance()
-        } else {
-
-            SuperController.instance = self;
-
-
-            if (local.options) {
-                SuperController.instance._options = local.options;
-            }
-
-            SuperController.initialized = true;
+            return getInstance();
+        }
 
+        SuperController.instance = self;
+        if (local.options) {
+            SuperController.instance._options = local.options;
         }
+
+        SuperController.initialized = true;
     }
 
     var getInstance = function() {
         local.options = SuperController.instance._options = options;
-        // 2022-03-07 Fix for none-developpement environnements (without cache)
+        // Fixed on 2022-03-07 for none-developpement environnements (without cache)
         self._options = local.options;
 
         return SuperController.instance;
     }
 
+
     var hasViews = function() {
         return ( typeof(local.options.template) != 'undefined' ) ? true : false;
     }
@@ -195,12 +192,12 @@ function SuperController(options) {
         return (/^true$/i.test(process.env.NODE_SCOPE_IS_PRODUCTION)) ? true : false;
     }
 
+
     this.setOptions = function(req, res, next, options) {
         local.options = SuperController.instance._options = options;
         local.options.renderingStack = (local.options.renderingStack) ? local.options.renderingStack : [];
         local.options.isRenderingCustomError = (local.options.isRenderingCustomError) ? local.options.isRenderingCustomError : false;
 
-
         // N.B.: Avoid setting `page` properties as much as possible from the routing.json
         // It will be easier for the framework if set from the controller.
         //
@@ -240,12 +237,12 @@ function SuperController(options) {
 
                         if ( /^:/.test(value) ) {
                             str = 'page.view.params.'+ key + '.';
-                            set(str.substr(0, str.length-1), req.params[value.substr(1)]);
+                            set(str.substring(0, str.length-1), req.params[value.substring(1)]);
                         } else if (/^(file|title)$/.test(key)) {
                             str = 'page.view.'+ key + '.';
-                            set(str.substr(0, str.length-1), value);
+                            set(str.substring(0, str.length-1), value);
                         } else {
-                            set(str.substr(0, str.length-1), value)
+                            set(str.substring(0, str.length-1), value)
                         }
 
                         str = 'page.'
@@ -322,10 +319,24 @@ function SuperController(options) {
 
             var ctx = getContext('gina');
             // new declaration && overrides
+            var arch = process.arch;
+            switch (process.arch) {
+                case 'x64':
+                    arch = 'amd64'
+                    break;
+                case 'armv7l':
+                    arch = 'armhf'
+                    break;
+                case 'x86':
+                    arch = 'i386'
+                    break;
+                default:
+                    break;
+            }
             var version = {
                 "number"        : ctx.version,
                 "platform"      : process.platform,
-                "arch"          : process.arch,
+                "arch"          : arch,
                 "nodejs"        : process.versions.node,
                 "middleware"    : ctx.middleware
             };
@@ -336,27 +347,139 @@ function SuperController(options) {
             set('page.environment.gina pid', GINA_PID);
             set('page.environment.nodejs', version.nodejs +' '+ version.platform +' '+ version.arch);
             set('page.environment.engine', options.conf.server.engine);//version.middleware
+            set('page.environment.uvThreadpoolSize', process.env.UV_THREADPOOL_SIZE);
             set('page.environment.env', process.env.NODE_ENV);
-            set('page.environment.envIsDev', self.isCacheless());
+            set('page.environment.envIsDev', /^true$/i.test(process.env.NODE_ENV_IS_DEV) );
             set('page.environment.scope', process.env.NODE_SCOPE);
             set('page.environment.scopeIsLocal', /^true$/i.test(process.env.NODE_SCOPE_IS_LOCAL) );
             set('page.environment.scopeIsProduction', /^true$/i.test(process.env.NODE_SCOPE_IS_PRODUCTION) );
             set('page.environment.date.now', new Date().format("isoDateTime"));
+            set('page.environment.isCacheless', self.isCacheless());
+
+            // var requestPort = req.headers.port || req.headers[':port'];
+            // var isProxyHost = (
+            //     typeof(req.headers.host) != 'undefined'
+            //     && typeof(requestPort) != 'undefined'
+            //     &&  /^(80|443)$/.test(requestPort)
+            //     && local.options.conf.server.scheme +'://'+ req.headers.host +':'+ requestPort != local.options.conf.hostname.replace(/\:\d+$/, '') +':'+ local.options.conf.server.port
+            //     ||
+            //     typeof(req.headers[':authority']) != 'undefined'
+            //     && local.options.conf.server.scheme +'://'+ req.headers[':authority'] != local.options.conf.hostname
+            //     ||
+            //     typeof(req.headers.host) != 'undefined'
+            //     && typeof(requestPort) != 'undefined'
+            //     && /^(80|443)$/.test(requestPort)
+            //     && req.headers.host == local.options.conf.host
+            //     ||
+            //     typeof(req.headers['x-nginx-proxy']) != 'undefined'
+            //     && /^true$/i.test(req.headers['x-nginx-proxy'])
+            // ) ? true : false;
+            // setContext('isProxyHost', isProxyHost);
+            var isProxyHost = getContext('isProxyHost') || false;
+            set('page.environment.isProxyHost', isProxyHost);
+            if ( /^true$/.test(isProxyHost) ) {
+                set('page.environment.proxyHost', process.gina.PROXY_HOST);
+                set('page.environment.proxyHostname', process.gina.PROXY_HOSTNAME);
+            }
+
+            var _config = ctx.config.envConf[options.conf.bundle][process.env.NODE_ENV];
+            // by default
+            var hostname    = _config.hostname + _config.server.webroot;
+            var scheme      = hostname.match(/^(https|http)/)[0];
+            var requestPort = (local.req.headers.port||local.req.headers[':port']);
+
+            var hostPort = hostname.match(/(\:d+\/|\:\d+)$/);
+            hostPort = (hostPort) ? ~~(hostPort[0].replace(/\:/g, '')) : _config.port[_config.server.protocol][_config.server.scheme];
+            // Linking bundle B from bundle A wihtout proxy
+            var isSpecialCase = (
+                    getContext('bundle') != _config.bundle
+                    && requestPort != hostPort
+                    && local.req.headers[':host'] != process.gina.PROXY_HOST
+            ) ? true : false;
+
+            if (isSpecialCase) {
+                hostname = _config.hostname;
+            }
+
+            // if (
+            //     isProxyHost
+            //     && !isSpecialCase
+            // ) {
+            //     // Rewrite hostname vs req.headers.host
+            //     hostname    = scheme + '://'+ (local.req.headers.host||local.req.headers[':host']);
+
+            //     if (
+            //         !/^(80|443)$/.test(requestPort)
+            //         && !new RegExp(requestPort+'$').test(hostname)
+            //     ) {
+            //         hostname += ':'+ requestPort;
+            //     }
+            // }
+
+            set('page.environment.hostname', hostname);
+            // Updating _config.rootDomain - 2024/04/15
+            // _config.rootDomain = domainLib.getRootDomain(hostname).value;
+
+
+            set('page.environment.rootDomain', _config.rootDomain);
+            set('page.environment.webroot', options.conf.server.webroot);
+
+            if ( typeof(ctx.config.envConf._isRoutingUpdateNeeded) == 'undefined') {
+                ctx.config.envConf._isRoutingUpdateNeeded = false;
+            }
+
+            if (
+                typeof(ctx.config.envConf._proxyHostname) == 'undefined'
+                ||
+                hostname != ctx.config.envConf._proxyHostname
+            ) {
+                ctx.config.envConf._proxyHostname = (isProxyHost) ? hostname : null;
+                ctx.config.envConf._isRoutingUpdateNeeded = true;
+            }
+
+            if ( typeof(ctx.config.envConf._routingCloned) == 'undefined' ) {
+                ctx.config.envConf._routingCloned = JSON.clone(ctx.config.envConf.routing);
+            }
+
+            var routing = local.options.conf.routing = ctx.config.envConf._routingCloned; // all routes
+            if ( /^true$/i.test(ctx.config.envConf._isRoutingUpdateNeeded) ) {
+
+                for (let r in ctx.config.envConf.routing) {
+                    if ( isProxyHost ) {
+                        local.options.conf.routing[r].host = hostname.replace(/^(https|http)\:\/\//, '');
+                        local.options.conf.routing[r].hostname = hostname;
+                        let scheme = hostname.match(/^(https|http)/)[0];
+                        local.options.conf.routing[r].hostname    = scheme + '://'+ (local.req.headers.host||local.req.headers[':host']);
+                        let requestPort = (local.req.headers.port||local.req.headers[':port']);
+                        if (
+                            !/^(80|443)$/.test(requestPort)
+                            && !new RegExp(requestPort+'$').test(local.options.conf.routing[r].hostname)
+                        ) {
+                            local.options.conf.routing[r].hostname += ':'+ requestPort
+                        }
+                        continue;
+                    }
+                    local.options.conf.routing[r].host = ctx.config.envConf.routing[r].host;
+                    local.options.conf.routing[r].hostname = ctx.config.envConf.routing[r].hostname;
+                }
+                ctx.config.envConf._isRoutingUpdateNeeded = false;
 
+            }
+            // Adding 289 KB of datas in the page when including routing & reverseRouting
+            // set('page.environment.routing', encodeRFC5987ValueChars(JSON.stringify(routing))); // export for GFF
+            set('page.environment.routing',encodeRFC5987ValueChars('{}'));
 
-            var routing = local.options.conf.routing = ctx.config.envConf.routing; // all routes
-            set('page.environment.routing', encodeRFC5987ValueChars(JSON.stringify(routing))); // export for GFF
-            //reverseRouting
+            //// reverseRouting
             var reverseRouting = local.options.conf.reverseRouting = ctx.config.envConf.reverseRouting; // all routes
-            set('page.environment.reverseRouting', encodeRFC5987ValueChars(JSON.stringify(reverseRouting))); // export for GFF
+            // set('page.environment.reverseRouting', encodeRFC5987ValueChars(JSON.stringify(reverseRouting))); // export for GFF
+            set('page.environment.reverseRouting',encodeRFC5987ValueChars('{}'));
 
             var forms = local.options.conf.forms = options.conf.content.forms // all forms
             set('page.environment.forms', encodeRFC5987ValueChars(JSON.stringify(forms))); // export for GFF
             set('page.forms', options.conf.content.forms);
 
-            set('page.environment.hostname', ctx.config.envConf[options.conf.bundle][process.env.NODE_ENV].hostname);
-            set('page.environment.rootDomain', ctx.config.envConf[options.conf.bundle][process.env.NODE_ENV].rootDomain);
-            set('page.environment.webroot', options.conf.server.webroot);
+
+
             set('page.environment.bundle', options.conf.bundle);
             set('page.environment.project', options.conf.projectName);
             set('page.environment.protocol', options.conf.server.protocol);
@@ -426,7 +549,7 @@ function SuperController(options) {
             // user locale
             options.conf.locale = new Collection(userLocales).findOne({ short: userCountryCode }) || {};
 
-            //set('page.date.now', new Date().format("isoDateTime"));
+            // current date
             if ( typeof(options.conf.locale) == 'undefined' || !options.conf.locale ) {
                 options.conf.locale = {}
             }
@@ -437,21 +560,16 @@ function SuperController(options) {
             set('page.view.lang', userCulture);
         }
 
-        if ( !getContext('isProxyHost') ) {
-            var isProxyHost = ( typeof(req.headers.host) != 'undefined' && local.options.conf.server.scheme +'://'+ req.headers.host != local.options.conf.hostname || typeof(req.headers[':authority']) != 'undefined' && local.options.conf.server.scheme +'://'+ req.headers[':authority'] != local.options.conf.hostname  ) ? true : false;
-            setContext('isProxyHost', isProxyHost);
-            isProxyHost = null;
-        }
 
         //TODO - detect when to use swig
         var dir = null;
         if (local.options.template || self.templates) {
-            dir = local.options.template.templates || self.templates;
+            dir = local.options.template.html || self.templates;
 
             var swigOptions = {
                 autoescape  : ( typeof(local.options.autoescape) != 'undefined') ? local.options.autoescape : false,
                 // `memory` is no working yet ... advanced rendering setup required
-                // cache       : (local.options.cacheless) ? false : 'memory'
+                // cache       : (local.options.isCacheless) ? false : 'memory'
                 cache       : false
             };
             if (dir) {
@@ -470,6 +588,7 @@ function SuperController(options) {
             swig.setDefaultTZOffset(defaultTZOffset);
             defaultTZOffset = null;
 
+
             self.engine = swig;
 
             dir = null;
@@ -480,867 +599,319 @@ function SuperController(options) {
         freeMemory([action, rule, ext, isWithoutLayout, namespace, ctx, version, routing, reverseRouting, forms, parameters, acceptLanguage, userCulture, userCultureCode, userLangCode, userCountryCode, locales, userLocales], false);
     }
 
-    this.renderWithoutLayout = function (data, displayToolbar) {
+    var parseDataObject = function(o, obj, override) {
 
-        // preventing multiple call of self.renderWithoutLayout() when controller is rendering from another required controller
-        if (local.options.renderingStack.length > 1) {
-            return false;
+        for (let i in o) {
+            if ( o[i] !== null && typeof(o[i]) == 'object' || override && o[i] !== null && typeof(o[i]) == 'object' ) {
+                parseDataObject(o[i], obj);
+            } else if (o[i] == '_content_'){
+                o[i] = obj
+            }
         }
 
-        local.options.isWithoutLayout = true;
-
-        self.render(data, displayToolbar);
+        return o
     }
 
     /**
-     * Render HTML templates : Swig is the default template engine
-     *
-     *  Extend default filters
-     *  - length
-     *
-     * Avilable filters:
-     *  - getWebroot()
-     *  - getUrl()
-     *
-     *  N.B.: Filters can be extended through your `<project>/src/<bundle>/controllers/setup.js`
+     * Set data
      *
+     * @param {string} nave -  variable name to set
+     * @param {string|object} value - value to set
+     * @param {boolean} [override]
      *
-     * @param {object} userData
-     * @param {boolean} [displayToolbar]
-     * @param {object} [errOptions]
      * @returns {void}
      * */
-    this.render = async function(userData, displayToolbar, errOptions) {
-        var err = null;
-        var isRenderingCustomError = (
-                                    typeof(userData.isRenderingCustomError) != 'undefined'
-                                    && /^true$/i.test(userData.isRenderingCustomError)
-                                ) ? true : false;
-        if (isRenderingCustomError)
-            delete userData.isRenderingCustomError;
-
-        var localOptions = (errOptions) ? errOptions : local.options;
-        localOptions.renderingStack.push( self.name );
-        // preventing multiple call of self.render() when controller is rendering from another required controller
-        if ( localOptions.renderingStack.length > 1 && !isRenderingCustomError ) {
-            return false;
-        }
+    var set = function(name, value, override) {
 
+        var override = ( typeof(override) != 'undefined' ) ? override : false;
 
-        var data                = null
-            , layout            = null
-            , template          = null
-            , file              = null
-            , path              = null
-            , plugin            = null
-            // By default
-            , isWithoutLayout   = (localOptions.isWithoutLayout) ? true : false
-        ;
+        if ( typeof(name) == 'string' && /\./.test(name) ) {
+            var keys        = name.split(/\./g)
+                , newObj    = {}
+                , str       = '{'
+                , _count    = 0;
 
-        try {
-            data = getData();
-            // Display session
-            if (
-                typeof(local.req.session) != 'undefined'
-            ) {
-                if ( typeof(data.page.data) == 'undefined' ) {
-                    data.page.data = {};
-                }
+            for (let k = 0, len = keys.length; k<len; ++k) {
+                str +=  "\""+ keys.splice(0,1)[0] + "\":{";
 
-                if ( typeof(local.req.session.cookie._expires) != 'undefined' ) {
-                    var dateEnd = local.req.session.cookie._expires;
-                    var dateStart = ( typeof(local.req.session.lastModified) != 'undefined')
-                                    ? new Date(local.req.session.lastModified)
-                                    : new Date()
-                    ;
-                    var elapsed = dateEnd - dateStart;
-                    // var expiresAt =
-                    if ( typeof(data.page.data.session) == 'undefined' ) {
-                        data.page.data.session = {
-                            id          : local.req.session.id,
-                            lastModified: local.req.session.lastModified
-                        };
+                ++_count;
+                if (k == len-1) {
+                    str = str.substring(0, str.length-1);
+                    str += "\"_content_\"";
+                    for (let c = 0; c<_count; ++c) {
+                        str += "}"
                     }
-                    // In milliseconds
-                    data.page.data.session.createdAt    = local.req.session.createdAt;
-                    data.page.data.session.expiresAt    = dateEnd.format('isoDateTime');
-                    data.page.data.session.timeout      = elapsed;
-
-                    dateEnd     = null;
-                    dateStart   = null;
-                    elapsed     = null;
                 }
             }
 
-            // in case `local.req.routing.param.file` has been changed on the fly
-            if (
-                local.req.routing.param.file
-                && local.req.routing.param.file != data.page.view.file
-            ) {
-                data.page.view.file = local.req.routing.param.file;
-            }
-            if (
-                local.req.routing.param.ext
-                && local.req.routing.param.ext != data.page.view.ext
-            ) {
-                data.page.view.ext = local.req.routing.param.ext;
-            }
-            file = (isRenderingCustomError) ? localOptions.file : data.page.view.file;
-            // making path thru [namespace &] file
-            if ( typeof(localOptions.namespace) != 'undefined' && localOptions.namespace ) {
-                // excepted for custom paths
-                var fileNamingConvention = file.replace(localOptions.namespace+'-', '');
-                if ( !/^(\.|\/|\\)/.test(file) && file != fileNamingConvention ) {
-                    var _ext = data.page.view.ext;
-
-                    console.warn('file `'+ file +'` used in routing `'+ localOptions.rule +'` does not respect gina naming convention ! You should rename the file `'+ file + _ext +'` to `'+ ''+ fileNamingConvention + _ext +'`');
-                    console.warn('The reason you are getting this message is because your filename begeins with `<namespace>-`\n If you don\‘t want to rename, use template path like ./../'+ localOptions.namespace +'/'+file);
-                    file = ''+ file.replace(localOptions.namespace+'-', '');
-                }
-                fileNamingConvention = null;
-                _ext = null;
-
-
-                // means that rule name === namespace -> pointing to root namespace dir
-                if (!file || file === localOptions.namespace) {
-                    file = 'index'
-                }
-                path = (isRenderingCustomError) ? _(file) : _(localOptions.template.html +'/'+ localOptions.namespace + '/' + file)
-            } else {
-                if ( localOptions.path && !/(\?|\#)/.test(localOptions.path) ) {
-                    path = _(localOptions.path);
-                    var re = new RegExp( data.page.view.ext+'$');
-                    if ( data.page.view.ext && re.test(data.page.view.file) ) {
-                        data.page.view.path = path.replace('/'+ data.page.view.file, '');
+            newObj = parseDataObject(JSON.parse(str), value, override);
+            local.userData = merge(local.userData, newObj);
 
-                        path            = path.replace(re, '');
-                        data.page.view.file  = data.page.view.file.replace(re, '');
+            freeMemory([name, value, keys, newObj, str, _count], false);
 
-                    } else {
-                        data.page.view.path = path.replace('/'+ data.page.view.file, '');
-                    }
-                    re = null;
-                } else {
-                     path = (!isRenderingCustomError && !/^(\.|\/|\\)/.test(file))
-                            ? _(localOptions.template.html +'/'+ file)
-                            : file
-                }
-            }
+        } else if ( typeof(local.userData[name]) == 'undefined' ) {
+            local.userData[name] = value.replace(/\\/g, '');
+            freeMemory([name, value], false)
+        }
+    }
 
-            if (data.page.view.ext && !new RegExp(data.page.view.ext+ '$').test(file) ) {
-                path += data.page.view.ext
-            }
+    /**
+     * Get data
+     *
+     * @param {String} variable Data name to set
+     * @returns {Object | String} data Data object or String
+     * */
+    var get = function(variable) {
+        return local.userData[variable]
+    }
 
-            data.page.view.path = path;
-        } catch (dataErr) {
-            return self.throwError(dataErr);
+    /**
+     * Set resources
+     *
+     * @param {object} template - template configuration
+     * */
+    var setResources = function(viewConf) {
+        if (!viewConf) {
+            return self.throwError(500, new Error('No views configuration found. Did you try to add views before using Controller::render(...) ? Try to run: gina view:add '+ options.conf.bundle +' @'+ options.conf.projectName));
         }
 
-        // isWithoutLayout from content
-        var pageContentObj  = new _(data.page.view.path);
-        var _templateContent = fs.readFileSync(path).toString() || null;
-        var hasLayoutInPath = /\{\%(\s+extends|extends)/.test(_templateContent) || false;
-        var layoutPath      = null;
-
+        var authority = ( typeof(local.req.headers['x-forwarded-proto']) != 'undefined' ) ? local.req.headers['x-forwarded-proto'] : local.options.conf.server.scheme;
+        authority += '://'+ local.req.headers.host;
+        var useWebroot = false;
         if (
-            !isWithoutLayout
-            && !isRenderingCustomError
-            && pageContentObj.existsSync()
-            && !hasLayoutInPath
+            !/^\/$/.test(local.options.conf.server.webroot)
+            && local.options.conf.server.webroot.length > 0
+            // && local.options.conf.hostname.replace(/\:\d+$/, '') == authority
         ) {
-            isWithoutLayout = true;
-        }
-        pageContentObj = null;
-
-        // Retrieve layoutPath from content
-        if (hasLayoutInPath && _templateContent) {
-            var extendFound = _templateContent.match(/\{\%(\s+extends|extends)(.*)\%}/);
-            if (extendFound && Array.isArray(extendFound)) {
-                var extendPath = null;
-                try {
-                    // localOptions.template.templates +'/'+
-                    layoutPath = extendFound[0].match(/(\"|\')(.*)(\"|\')/)[0].replace(/(\"|\')/g, '');
-                    data.page.view.layout = layoutPath;
-                    layoutPath = localOptions.template.templates +'/'+ layoutPath;
-                    localOptions.template.layout = layoutPath;
-                } catch (extendErr) {
-                    // nothing to do
-                }
-                extendPath = null;
-            }
-            extendFound = null;
+            useWebroot = true
         }
-        hasLayoutInPath     = null;
-        _templateContent    = null;
+        authority = null;
 
-        localOptions.debugMode = ( typeof(displayToolbar) == 'undefined' ) ? undefined : ( (/true/i.test(displayToolbar)) ? true : false ); // only active for dev env
+        var reURL = new RegExp('^'+ local.options.conf.server.webroot);
 
-        // specific override
-        if (
-            self.isCacheless()
-            && typeof(local.req[ local.req.method.toLowerCase() ]) != 'undefined'
-            && typeof(local.req[ local.req.method.toLowerCase() ].debug) != 'undefined'
-        ) {
-            if ( !/^(true|false)$/i.test(local.req[ local.req.method.toLowerCase() ].debug) ) {
-                console.warn('Detected wrong value for `debug`: '+ local.req[ local.req.method.toLowerCase() ].debug);
-                console.warn('Switching `debug` to `true` as `cacheless` mode is enabled');
-                local.req[ local.req.method.toLowerCase() ].debug = true;
-            }
-            localOptions.debugMode = ( /^true$/i.test(local.req[ local.req.method.toLowerCase() ].debug) ) ? true : false;
-        } else if (
-            self.isCacheless()
-            && hasViews()
-            && !isWithoutLayout
-            && localOptions.debugMode == undefined
-        ) {
-            localOptions.debugMode = true;
-        } else if ( localOptions.debugMode == undefined  ) {
-            localOptions.debugMode = self.isCacheless()
+        var cssStr      = ''
+            , jsStr     = ''
+        ;
+        //Get css
+        if( viewConf.stylesheets ) {
+            // cssStr  = getNodeRes('css', viewConf.stylesheets, useWebroot, reURL);
+            // Fixed on 2025-03-08: ordered by route, making sure that _common could all be loaded first
+            var cssColl = new Collection(viewConf.stylesheets).orderBy({route: 'asc'})
+            cssStr   = getNodeRes('css', cssColl, useWebroot, reURL);
+            cssColl = null;
+        }
+        //Get js
+        if( viewConf.javascripts ) {
+            // jsStr   = getNodeRes('js', viewConf.javascripts, useWebroot, reURL);
+            // Fixed on 2025-03-08: ordered by route, making sure that _common could all be loaded first
+            var jsColl = new Collection(viewConf.javascripts).orderBy({route: 'asc'})
+            jsStr   = getNodeRes('js', jsColl, useWebroot, reURL);
+            jsColl = null;
         }
 
-        try {
-
-            if (!userData) {
-                userData = { page: { view: {}}}
-            } else if ( userData && !userData['page']) {
+        set('page.view.stylesheets', cssStr);
+        set('page.view.scripts', jsStr);
 
-                if ( typeof(data['page']['data']) == 'undefined' )
-                    data['page']['data'] = userData;
-                else
-                    data['page']['data'] = (isRenderingCustomError) ? userData : merge( userData, data['page']['data'] );
-            } else {
-                data = (isRenderingCustomError) ? userData : merge(userData, data)
-            }
+        reURL   = null;
+        cssStr  = null;
+        jsStr   = null;
+    }
 
-            template = localOptions.rule.replace('\@'+ localOptions.bundle, '');
-            var localTemplateConf = localOptions.template;
-            if ( isWithoutLayout ) {
-                localTemplateConf = JSON.clone(localOptions.template);
-                localTemplateConf.javascripts = new Collection(localTemplateConf.javascripts).find({ isCommon: false}, { isCommon: true, name: 'gina' });
-                localTemplateConf.stylesheets = new Collection(localTemplateConf.stylesheets).find({ isCommon: false}, { isCommon: true, name: 'gina' });
-            }
-            setResources(localTemplateConf);
-            // localTemplateConf = null;
+    /**
+     * Get node resources
+     *
+     * @param {string} type
+     * @param {string} resStr
+     * @param {array} resArr
+     * @param {boolean} useWebroot
+     * @param {object} reURL - RegExp for webroot
+     *
+     * @returns {object} content
+     *
+     * @private
+     * */
+    var getNodeRes = function(type, resArr, useWebroot, reURL) {
 
-            // Allowing file & ext override
-            if (
-                typeof(local.req.routing.param.file) != 'undefined'
-                && data.page.view.file !== local.req.routing.param.file
-            ) {
-                data.page.view.file = localOptions.file = local.req.routing.param.file
-            }
-            if (
-                typeof(local.req.routing.param.ext) != 'undefined'
-                && data.page.view.ext !== local.req.routing.param.ext
-            ) {
-                data.page.view.ext = localOptions.template.ext = local.req.routing.param.ext
-            }
+        var r               = 0
+            , rLen          = resArr.length
+            , obj           = null
+            , str           = ''
+            , isProxyHost   = getContext('isProxyHost')
+            , requestHost   = ( /http\/2/.test(local.options.conf.server.protocol) )
+                    ? local.req.headers[':host']
+                    : local.req.headers.host
+            , hostname      = ( typeof(requestHost) != 'undefined' && local.options.conf.host != requestHost)
+                    ? local.options.conf.server.scheme +'://'+ requestHost
+                    : local.options.conf.hostname
+            , scheme = hostname.match(/^(https|http)/)[0]
+        ;
+        var requestPort = (local.req.headers.port||local.req.headers[':port']);
+        var hostPort = local.options.conf.hostname.match(/(\:d+\/|\:\d+)$/);
+        hostPort = (hostPort) ? ~~(hostPort[0].replace(/\:/g, '')) : local.options.conf.port[local.options.conf.server.protocol][local.options.conf.server.scheme];
+        // Linking bundle B from bundle A wihtout proxy
+        var isSpecialCase = (
+                getContext('bundle') != local.options.conf.bundle
+                && requestPort != hostPort
+                && local.req.headers[':host'] != process.gina.PROXY_HOST
+        ) ? true : false;
 
-            // file = (isRenderingCustomError) ? localOptions.file : data.page.view.file;
+        if (isSpecialCase) {
+            hostname = local.options.conf.hostname
+        }
 
-            // pre-compiling variables
-            data = merge(data, getData()); // needed !!
 
-            if  (typeof(data.page.data) == 'undefined' ) {
-                data.page.data = {}
-            }
+        if (
+            isProxyHost
+            && !isSpecialCase
+        ) {
 
+            hostname    = scheme + '://'+ (local.req.headers.host||local.req.headers[':host']||process.gina.PROXY_HOST);
 
             if (
-                !local.options.isRenderingCustomError
-                && typeof(data.page.data.status) != 'undefined'
-                && !/^2/.test(data.page.data.status)
-                && typeof(data.page.data.error) != 'undefined'
+                !/^(80|443)$/.test(requestPort)
+                && !new RegExp(requestPort+'$').test(hostname)
             ) {
-                // var statusCode = localOptions.conf.server.coreConfiguration.statusCodes;
-                var errorObject = {
-                    status: data.page.data.status,
-                    //errors: msg.error || msg.errors || msg,
-                    error: statusCodes[data.page.data.status] || msg.error || msg,
-                    message: data.page.data.message || data.page.data.error,
-                    stack: data.page.data.stack
-                };
-                if ( typeof(data.page.data.session) != 'undefined' ) {
-                    errorObject.session = data.page.data.session;
-                }
-
-                return self.throwError(errorObject);
+                hostname += ':'+ requestPort;
             }
+        }
 
-            // // making path thru [namespace &] file
-            // if ( typeof(localOptions.namespace) != 'undefined' && localOptions.namespace ) {
-            //     // excepted for custom paths
-            //     var fileNamingConvention = file.replace(localOptions.namespace+'-', '');
-            //     if ( !/^(\.|\/|\\)/.test(file) && file != fileNamingConvention ) {
-            //         var _ext = data.page.view.ext;
+        switch(type){
+            case 'css':
+                for (; r < rLen; ++r) {
+                    obj = resArr[r];
+                    if (useWebroot && !reURL.test(obj.url) ) {
+                        obj.url = local.options.conf.server.webroot + obj.url.substring(1);
+                    }
+                    // HTTP2 Push via Link
+                    if (
+                        /http\/2/.test(local.options.conf.server.protocol)
+                        && !self.isCacheless()
+                    ) {
+                        local.options.template.h2Links += '<'+ obj.url +'>; as=style; rel=preload,'
+                    }
+                    // TODO - add support for cdn
+                    if (!/\:\/\//.test(obj.url) ) {
+                        obj.url = hostname + obj.url;
+                    }
 
-            //         console.warn('file `'+ file +'` used in routing `'+ localOptions.rule +'` does not respect gina naming convention ! You should rename the file `'+ file + _ext +'` to `'+ ''+ fileNamingConvention + _ext +'`');
-            //         console.warn('The reason you are getting this message is because your filename begeins with `<namespace>-`\n If you don\‘t want to rename, use template path like ./../'+ localOptions.namespace +'/'+file);
-            //         file = ''+ file.replace(localOptions.namespace+'-', '');
-            //     }
+                    if (obj.media) {
+                        str += '\n\t\t<link href="'+ obj.url +'" media="'+ obj.media +'" rel="'+ obj.rel +'" type="'+ obj.type +'">';
+                    } else {
+                        str += '\n\t\t<link href="'+ obj.url +'" rel="'+ obj.rel +'" type="'+ obj.type +'">';
+                    }
+                }
+                break;
 
+            case 'js':
+                var deferMode = (local.options.template.javascriptsDeferEnabled) ? ' defer' : '';
 
-            //     // means that rule name === namespace -> pointing to root namespace dir
-            //     if (!file || file === localOptions.namespace) {
-            //         file = 'index'
-            //     }
-            //     path = (isRenderingCustomError) ? _(file) : _(localOptions.template.html +'/'+ localOptions.namespace + '/' + file)
-            // } else {
-            //     if ( localOptions.path && !/(\?|\#)/.test(localOptions.path) ) {
-            //         path = _(localOptions.path);
-            //         var re = new RegExp( data.page.view.ext+'$');
-            //         if ( data.page.view.ext && re.test(data.page.view.file) ) {
-            //             data.page.view.path = path.replace('/'+ data.page.view.file, '');
-
-            //             path            = path.replace(re, '');
-            //             data.page.view.file  = data.page.view.file.replace(re, '');
-
-            //         } else {
-            //             data.page.view.path = path.replace('/'+ data.page.view.file, '');
-            //         }
-
-            //     } else {
-            //          path = (!isRenderingCustomError && !/^(\.|\/|\\)/.test(file))
-            //                 ? _(localOptions.template.html +'/'+ file)
-            //                 : file
-            //     }
-            // }
+                for (; r < rLen; ++r) {
+                    obj = resArr[r];
+                    if (useWebroot && !reURL.test(obj.url) ) {
+                        obj.url = local.options.conf.server.webroot + obj.url.substring(1);
+                    }
+                    // HTTP2 Push via Link
+                    if (
+                        /http\/2/.test(local.options.conf.server.protocol)
+                        && !self.isCacheless()
+                    ) {
+                        local.options.template.h2Links += '<'+ obj.url +'>; as=script; rel=preload,'
+                    }
+                    // TODO - add support for cdn
+                    if (!/\:\/\//.test(obj.url) ) {
+                        obj.url = hostname + obj.url;
+                    }
 
-            // if (data.page.view.ext && !new RegExp(data.page.view.ext+ '$').test(file) /** && hasViews() && fs.existsSync(_(path + data.page.view.ext, true))*/ ) {
-            //     path += data.page.view.ext
-            // }
-
-            // data.page.view.path = path;
-
-            var dic = {}, msg = '';
-            for (let d in data.page) {
-                dic['page.'+d] = data.page[d]
-            }
-
-
-
-            // please, do not start with a slashe when including...
-            // ex.:
-            //      /html/inc/_partial.html (BAD)
-            //      html/inc/_partial.html (GOOD)
-            //      ./html/namespace/page.html (GOOD)
-
-            if ( !fs.existsSync(path) ) {
-                msg = 'could not open "'+ path +'"' +
-                            '\n1) The requested file does not exists in your templates/html (check your template directory). Can you find: '+path +
-                            '\n2) Check the following rule in your `'+localOptions.conf.bundlePath+'/config/routing.json` and look around `param` to make sure that nothing is wrong with your file declaration: '+
-                            '\n' + options.rule +':'+ JSON.stringify(options.conf.content.routing[options.rule], null, 4) +
-                            '\n3) At this point, if you still have problems trying to run this portion of code, you can contact us telling us how to reproduce the bug.'
-                            //'\n\r[ stack trace ] '
-                            ;
-                err = new ApiError(msg, 500);
-                console.error(err.stack);
-                self.throwError(err);
-                return;
-            }
-
-            var isProxyHost = (
-                typeof(local.req.headers.host) != 'undefined'
-                    && localOptions.conf.server.scheme +'://'+ local.req.headers.host != localOptions.conf.hostname
-                || typeof(local.req.headers[':authority']) != 'undefined'
-                    && localOptions.conf.server.scheme +'://'+ local.req.headers[':authority'] != localOptions.conf.hostname
-            ) ? true : false;
-            // setup swig default filters
-            var filters = SwigFilters({
-                options     : JSON.clone(localOptions),
-                isProxyHost : isProxyHost,
-                throwError  : self.throwError,
-                req         : local.req,
-                res         : local.res
-            });
-
-            try {
-
-                // Extends default `length` filter
-                swig.setFilter('length', filters.length);
-
-
-
-                // Allows you to get a bundle web root
-                swig.setFilter('getWebroot', filters.getWebroot);
-
-                swig.setFilter('getUrl', filters.getUrl);
-
-            } catch (err) {
-                // [ martin ]
-                // i sent an email to [ paul@paularmstrongdesigns.com ] on 2014/08 to see if there is:
-                // a way of retrieving swig compilation stack traces
-                //var stack = __stack.splice(1).toString().split(',').join('\n');
-                // -> no response...
-                self.throwError(local.res, 500, new Error('template compilation exception encoutered: [ '+path+' ]\n'+(err.stack||err.message)));
-                return;
-            }
-
-
-
-            var  assets                 = null
-                , mapping               = null
-                , XHRData               = null
-                , XHRView               = null
-                , isDeferModeEnabled    = null
-                , viewInfos             = null
-                , filename              = null
-                , isWithSwigLayout      = null
-                , isUsingGinaLayout     = (!isWithoutLayout && typeof(localOptions.template.layout) != 'undefined' && fs.existsSync(local.options.template.layout)) ? true : false
-            ;
-
-            if ( isWithoutLayout || isUsingGinaLayout ) {
-                layoutPath = (isWithoutLayout) ? localOptions.template.noLayout : localOptions.template.layout;
-                // user layout override
-                if ( isUsingGinaLayout && !isWithoutLayout ) {
-                    layoutPath = localOptions.template.layout;
-                }
-                if (isWithoutLayout) {
-                    data.page.view.layout = layoutPath;
-                }
-            } else { // without layout case
-
-                // by default
-                layoutPath = localOptions.template.layout;
-                if ( !/^\//.test(layoutPath)) {
-                    layoutPath = localOptions.template.templates +'/'+ layoutPath;
-                }
-                // default layout
-                if (
-                    !isWithoutLayout  && !fs.existsSync(layoutPath) && layoutPath == localOptions.template.templates +'/index.html'
-                ) {
-                    console.warn('Layout '+ local.options.template.layout +' not found, replacing with `nolayout`: '+ localOptions.template.noLayout);
-                    layoutPath = localOptions.template.noLayout
-                    isWithoutLayout = true;
-                    data.page.view.layout = layoutPath;
-                }
-                // user defiend layout
-                else if ( !isWithoutLayout && !fs.existsSync(layoutPath) ) {
-                    isWithSwigLayout = true;
-                    layoutPath = localOptions.template.noLayout;
-                    data.page.view.layout = layoutPath;
-                }
-                // layout defiendd but not found
-                else if (!fs.existsSync(layoutPath) ) {
-                    err = new ApiError(options.bundle +' SuperController exception while trying to load your layout `'+ layoutPath +'`.\nIt seems like you have defined a layout, but gina could not locate the file.\nFor more informations, check your `config/templates.json` declaration around `'+ local.options.rule.replace(/\@(.*)/g, '') +'`', 500);
-                    self.throwError(err);
-                    return;
-                }
-
-            }
-
-
-            var isLoadingPartial = false;
-            try {
-                assets  = {assets:"${assets}"};
-
-                /**
-                 * retrieve template & layout
-                 * */
-                var tpl = null;
-                // tpl = fs.readFileSync(path).toString();
-                // layout = fs.readFileSync(layoutPath).toString();
-
-                await Promise.all([
-                        readFile(layoutPath),
-                        readFile(path)
-                    ])
-                    .then(([_layout, _tpl]) => {
-                        layout  = _layout.toString();
-                        tpl     = _tpl.toString();
-                    })
-                    .catch(error => {
-                        console.error(error.message);
-                        return;
-                    });
-
-
-                // mappin conf
-                mapping = { filename: path };
-                if (isRenderingCustomError) {
-                    // TODO - Test if there is a block call `gina-error` in the layout & replace block name from tpl
-
-                    if ( !/\{\%(\s+extends|extends)/.test(tpl) ) {
-                        tpl = "\n{% extends '"+ layoutPath +"' %}\n" + tpl;
-                    }
-                    if (!/\{\% block content/.test(tpl)) {
-                        // TODO - test if lyout has <body>
-                        tpl = '{% block content %}<p>If you view this message you didn’t define a content block in your template.</p>{% endblock %}' + tpl;
-                    }
-
-                    tpl = tpl.replace(/\{\{ page\.content \}\}/g, '');
-                }
-
-                if ( isWithoutLayout || isWithSwigLayout) {
-                    layout = tpl;
-                } else if (isUsingGinaLayout) {
-                    mapping = { filename: path };
-                    if ( /(\{\{|\{\{\s+)page\.content/.test(layout) ) {
-
-                        if ( /\{\%(\s+extends|extends)/.test(tpl) ) {
-                            err = new Error('You cannot use at the same time `page.content` in your layout `'+ layoutPath +'` while calling `extends` from your page or content `'+ path +'`. You have to choose one or the other');
-                            self.throwError(local.res, 500, err);
-                            return
-                        }
-                        layout = layout.replace('{{ page.content }}', tpl);
-                    } else {
-                        layout = layout.replace(/\<\/body\>/i, '\t'+tpl+'\n</body>');
-                    }
-
-                } else {
-                    tpl = tpl.replace('{{ page.view.layout }}', data.page.view.layout);
-                    if (/\<\/body\>/i.test(layout)) {
-                        layout = layout.replace(/\<\/body\>/i, '\t'+tpl+'\n</body>');
-                    }
-                        else {
-                        layout += tpl;
-                    }
-                }
-
-                // precompilation needed in case of `extends` or in order to display the toolbar
-                if ( hasViews() && self.isCacheless() || /\{\%(\s+extends|extends)/.test(layout) ) {
-                    layout = swig.compile(layout, mapping)(data);
-                }
-                //dic['page.content'] = layout;
-
-                tpl = null;
-
-            } catch(err) {
-                err.stack = 'Exception, bad syntax or undefined data found: start investigating in '+ mapping.filename +'\n' + err.stack;
-                return self.throwError(local.res, 500, err);
-            }
-            mapping = null;
-            filename = null;
-
-            isLoadingPartial = (
-                !/\<html/i.test(layout)
-                || !/\<head/i.test(layout)
-                || !/\<body/i.test(layout)
-            ) ? true : false;
-
-            // if (isLoadingPartial) {
-            //     console.warn('----------------> loading partial `'+ path);
-            // }
-
-            isDeferModeEnabled = localOptions.template.javascriptsDeferEnabled || localOptions.conf.content.templates._common.javascriptsDeferEnabled || false;
-
-            // iframe case - without HTML TAG
-            if (!self.isXMLRequest() && !/\<html/.test(layout) ) {
-                layout = '<html>\n\t<head></head>\n\t<body class="gina-iframe-body">\n\t\t'+ layout +'\n\t</body>\n</html>';
-            }
-
-            // adding stylesheets
-            if (!isWithoutLayout && data.page.view.stylesheets && !/\{\{\s+(page\.view\.stylesheets)\s+\}\}/.test(layout) ) {
-                layout = layout.replace(/\<\/head\>/i, '\n\t{{ page.view.stylesheets }}\n</head>')
-            }
-
-            if (hasViews() && isWithoutLayout) {
-                // $.getScript(...)
-                //var isProxyHost = ( typeof(local.req.headers.host) != 'undefined' && localOptions.conf.server.scheme +'://'+ local.req.headers.host != localOptions.conf.hostname || typeof(local.req.headers[':authority']) != 'undefined' && localOptions.conf.server.scheme +'://'+ local.req.headers[':authority'] != localOptions.conf.hostname  ) ? true : false;
-                //var hostname = (isProxyHost) ? localOptions.conf.hostname.replace(/\:\d+$/, '') : localOptions.conf.hostname;
-
-
-
-                var scripts = data.page.view.scripts;
-                scripts = scripts.replace(/\s+\<script/g, '\n<script');
-
-                if (!isProxyHost) {
-                    var webroot = data.page.environment.webroot;
-                    scripts = scripts.replace(/src\=\"\/(.*)\"/g, 'src="'+ webroot +'$1"');
-                    //stylesheets = stylesheets.replace(/href\=\"\/(.*)\"/g, 'href="'+ webroot +'$1"')
-                    webroot = null;
-                }
-
-                // iframe case - without HTML TAG
-                if (self.isXMLRequest() || !/\<html/.test(layout) ) {
-                    layout += scripts;
-                    //layout += stylesheets;
-                }
-
-            }
-
-            // adding plugins
-            // means that we don't want GFF context or we already have it loaded
-            viewInfos = JSON.clone(data.page.view);
-            if ( !isWithoutLayout )
-                    viewInfos.assets = assets;
-
-            if (
-                hasViews() && self.isCacheless() && !isWithoutLayout
-                && localOptions.debugMode
-                ||
-                hasViews() && self.isCacheless() && !isWithoutLayout
-                && typeof(localOptions.debugMode) == 'undefined'
-                ||
-                hasViews() && localOptions.debugMode
-            ) {
-
-                layout = ''
-                    // + '{%- set ginaDataInspector                    = JSON.clone(page) -%}'
-                    + '{%- set ginaDataInspector                    = JSON.clone(page) -%}'
-                    // + '{%- set ginaDataInspector                    = { view: {}, environment: { routing: {}}} -%}'
-                    + '{%- set ginaDataInspector.view.assets        = {} -%}'
-                    + '{%- set ginaDataInspector.view.scripts       = "ignored-by-toolbar" -%}'
-                    + '{%- set ginaDataInspector.view.stylesheets   = "ignored-by-toolbar" -%}'
-                    + layout
-                ;
-
-                plugin = '\t'
-                    + '{# Gina Toolbar #}'
-                    + '{%- set userDataInspector                    = JSON.clone(page) -%}'
-                    // + '{%- set userDataInspector                    = { view: {}, environment: { routing: {}}} -%}'
-                    + '{%- set userDataInspector.view.scripts       = "ignored-by-toolbar"  -%}'
-                    + '{%- set userDataInspector.view.stylesheets   = "ignored-by-toolbar"  -%}'
-                    + '{%- set userDataInspector.view.assets        = '+ JSON.stringify(assets) +' -%}'
-                    + '{%- include "'+ getPath('gina').core +'/asset/plugin/dist/vendor/gina/html/toolbar.html" with { gina: ginaDataInspector, user: userDataInspector } -%}'// jshint ignore:line
-                    + '{# END Gina Toolbar #}'
-                ;
-
-
-                if (isWithoutLayout && localOptions.debugMode || localOptions.debugMode ) {
-
-                    if (self.isXMLRequest()) {
-                        XHRData = '\t<input type="hidden" id="gina-without-layout-xhr-data" value="'+ encodeRFC5987ValueChars(JSON.stringify(data.page.data)) +'">\n\r';
-                        XHRView = '\n<input type="hidden" id="gina-without-layout-xhr-view" value="'+ encodeRFC5987ValueChars(JSON.stringify(viewInfos)) +'">';
-                        if ( /<\/body>/i.test(layout) ) {
-                            layout = layout.replace(/<\/body>/i, XHRData + XHRView + '\n\t</body>');
-                        } else {
-                            // Popin case
-                            // Fix added on 2023-01-25
-                            layout += XHRData + XHRView + '\n\t'
-                        }
-                    }
-
-
-                }
-
-                if (self.isCacheless() || localOptions.debugMode ) {
-                    layout = layout.replace(/<\/body>/i, plugin + '\n\t</body>');
-                }
-
-                // adding javascripts
-                layout.replace('{{ page.view.scripts }}', '');
-                // placed in the HEAD excepted when rendering a partial or when `isDeferModeEnabled` == true
-                if (isLoadingPartial) {
-                    layout += '\t{{ page.view.scripts }}';
-                } else {
-                    if ( isDeferModeEnabled  ) {
-                        layout = layout.replace(/\<\/head\>/i, '\t{{ page.view.scripts }}\n\t</head>');
-                    } else { // placed in the BODY
-                        layout = layout.replace(/\<\/body\>/i, '\t{{ page.view.scripts }}\n</body>');
-                    }
-                }
-
-                // ginaLoader cannot be deferred
-                if ( !localOptions.template.javascriptsExcluded || localOptions.template.javascriptsExcluded != '**' ) {
-                    layout = layout.replace(/\<\/head\>/i, '\t'+ localOptions.template.ginaLoader +'\n</head>');
-                }
-
-            } else if ( hasViews() && self.isCacheless() && self.isXMLRequest() ) {
 
-                if (isWithoutLayout) {
-                    delete data.page.view.scripts;
-                    delete data.page.view.stylesheets;
-                }
-                // means that we don't want GFF context or we already have it loaded
-                // viewInfos = JSON.clone(data.page.view);
-                // if ( !isWithoutLayout )
-                //     viewInfos.assets = assets;
-
-
-                XHRData = '\n<input type="hidden" id="gina-without-layout-xhr-data" value="'+ encodeRFC5987ValueChars(JSON.stringify(data.page.data)) +'">';
-                XHRView = '\n<input type="hidden" id="gina-without-layout-xhr-view" value="'+ encodeRFC5987ValueChars(JSON.stringify(viewInfos)) +'">';
-                if ( /<\/body>/i.test(layout) ) {
-                    layout = layout.replace(/<\/body>/i, XHRData + XHRView + '\n\t</body>');
-                } else {
-                    // Popin case
-                    // Fix added on 2023-01-25
-                    layout += XHRData + XHRView + '\n\t'
-                }
-
-                // layout += XHRData + XHRView;
-
-            } else { // other envs like prod ...
-
-                // adding javascripts
-                // cleanup first
-                layout.replace('{{ page.view.scripts }}', '');
-                // placed in the HEAD excepted when rendering a partial or when `isDeferModeEnabled` == true
-                // if (isLoadingPartial) {
-                //     layout += '\t{{ page.view.scripts }}';
-                // } else {
-                //     if ( isDeferModeEnabled  ) {
-                //         layout = layout.replace(/\<\/head\>/i, '\t{{ page.view.scripts }}\n\t</head>');
-                //     } else { // placed in the BODY
-                //         layout = layout.replace(/\<\/body\>/i, '\t{{ page.view.scripts }}\n</body>');
-                //     }
-                // }
-
-                // // ginaLoader cannot be deferred
-                // if ( !localOptions.template.javascriptsExcluded || localOptions.template.javascriptsExcluded != '**' ) {
-                //     layout = layout.replace(/\<\/head\>/i, '\t'+ localOptions.template.ginaLoader +'\n</head>');
-                // }
-
-                // adding javascripts
-                layout.replace('{{ page.view.scripts }}', '');
-                if (isLoadingPartial) {
-                    layout += '\t{{ page.view.scripts }}\n';
-                    if ( !localOptions.template.javascriptsExcluded || localOptions.template.javascriptsExcluded != '**' ) {
-                        layout += '\t'+ localOptions.template.ginaLoader +'\n';
-                    }
-                } else {
-                    if ( isDeferModeEnabled && /\<\/head\>/i.test(layout) ) { // placed in the HEAD
-                        layout = layout.replace(/\<\/head\>/i, '\t{{ page.view.scripts }}\n\t</head>');
-
-                    } else { // placed in the BODY
-                        layout = layout.replace(/\<\/body\>/i, '\t{{ page.view.scripts }}\n</body>');
+                    if ( /\/jquery\.(.*)\.(min\.js|js)$/i.test(obj.url) ) {
+                        console.warn('jQuery Plugin found in templates.json !\nIf you want to load it before [gina.min.js], you should declare it at the top of your handler using requireJS or add property "isExternalPlugin: true" in your templates.json, under: '+ (obj.route || local.req.routing.rule) +' .');
                     }
-                    // ginaLoader cannot be deferred
-                    if ( !localOptions.template.javascriptsExcluded || localOptions.template.javascriptsExcluded != '**' ) {
-                        layout = layout.replace(/\<\/head\>/i, '\t'+ localOptions.template.ginaLoader +'\n</head>');
+                    // Allow jQuery & other external plugins to be loaded in the HEAD section before gina
+                    if (
+                        obj.isExternalPlugin
+                    ) {
+                        local.options.template.externalPlugins.splice(1, 0, '\n\t\t<script'+ deferMode +' type="'+ obj.type +'" src="'+ obj.url +'"></script>');
                     }
-                }
-            }
-
-
-            layout = whisper(dic, layout, /\{{ ([a-zA-Z.]+) \}}/g );
-            dic['page.content'] = layout;
-            /**
-            // special case for template without layout in debug mode - dev only
-            if ( hasViews() && localOptions.debugMode && self.isCacheless() && !/\{\# Gina Toolbar \#\}/.test(layout) ) {
-                try {
-
-                    layout = layout.replace(/<\/body>/i, plugin + '\n\t</body>');
-                    layout = whisper(dic, layout, /\{{ ([a-zA-Z.]+) \}}/g );
-                    //swig.invalidateCache();
-                    layout = swig.compile(layout, mapping)(swigData);
-
-
-                } catch (err) {
-                    filename = localOptions.template.html;
-                    filename += ( typeof(data.page.view.namespace) != 'undefined' && data.page.view.namespace != '' && new RegExp('^' + data.page.view.namespace +'-').test(data.page.view.file) ) ? '/' + data.page.view.namespace + data.page.view.file.split(data.page.view.namespace +'-').join('/') + ( (data.page.view.ext != '') ? data.page.view.ext: '' ) : '/' + data.page.view.file+ ( (data.page.view.ext != '') ? data.page.view.ext: '' );
-                    self.throwError(local.res, 500, new Error('Compilation error encountered while trying to process template `'+ filename + '`\n'+(err.stack||err.message)));
-                    return;
-                }
-            }
-            else if (hasViews() && localOptions.debugMode && self.isCacheless()) {
-                try {
-                    //layout = whisper(dic, layout, /\{{ ([a-zA-Z.]+) \}}/g );
-                    layout = swig.compile(layout, mapping)(swigData);
-                } catch (err) {
-                    filename = localOptions.template.html;
-                    filename += ( typeof(data.page.view.namespace) != 'undefined' && data.page.view.namespace != '' && new RegExp('^' + data.page.view.namespace +'-').test(data.page.view.file) ) ? '/' + data.page.view.namespace + data.page.view.file.split(data.page.view.namespace +'-').join('/') + ( (data.page.view.ext != '') ? data.page.view.ext: '' ) : '/' + data.page.view.file+ ( (data.page.view.ext != '') ? data.page.view.ext: '' );
-                    self.throwError(local.res, 500, new Error('Compilation error encountered while trying to process template `'+ filename + '`\n'+(err.stack||err.message)));
-                    return;
-                }
-            }
-            */
-
-
-            // if ( !local.res.headersSent ) {
-            if ( !headersSent() ) {
-                local.res.statusCode = ( typeof(localOptions.conf.server.coreConfiguration.statusCodes[data.page.data.status])  != 'undefined' ) ? data.page.data.status : 200; // by default
-                //catching errors
-                if (
-                    typeof(data.page.data.errno) != 'undefined' && /^2/.test(data.page.data.status) && typeof(localOptions.conf.server.coreConfiguration.statusCodes[data.page.data.status]) != 'undefined'
-                    || typeof(data.page.data.status) != 'undefined' && !/^2/.test(data.page.data.status) && typeof(localOptions.conf.server.coreConfiguration.statusCodes[data.page.data.status]) != 'undefined'
-                ) {
-
-                    try {
-                        local.res.statusMessage = localOptions.conf.server.coreConfiguration.statusCodes[data.page.data.status];
-                    } catch (err){
-                        local.res.statusCode    = 500;
-                        local.res.statusMessage = err.stack||err.message||localOptions.conf.server.coreConfiguration.statusCodes[local.res.statusCode];
+                    else {
+                        // normal case
+                        str += '\n\t\t<script'+ deferMode +' type="'+ obj.type +'" src="'+ obj.url +'"></script>';
                     }
                 }
-
-                local.res.setHeader('content-type', localOptions.conf.server.coreConfiguration.mime['html'] + '; charset='+ localOptions.conf.encoding );
-
-                try {
-
-                    // escape special chars
-                    var blacklistRe = new RegExp('[\<\>]', 'g');
-                    // DO NOT REPLACE IT BY JSON.clone() !!!!
-
-                    data.page.data = JSON.parse(JSON.stringify(data.page.data).replace(blacklistRe, '\$&'));
-                    blacklistRe = null;
-                } catch (err) {
-                    filename = localOptions.template.html;
-                    filename += ( typeof(data.page.view.namespace) != 'undefined' && data.page.view.namespace != '' && new RegExp('^' + data.page.view.namespace +'-').test(data.page.view.file) ) ? '/' + data.page.view.namespace + data.page.view.file.split(data.page.view.namespace +'-').join('/') + ( (data.page.view.ext != '') ? data.page.view.ext: '' ) : '/' + data.page.view.file+ ( (data.page.view.ext != '') ? data.page.view.ext: '' );
-                    self.throwError(local.res, 500, new Error('Controller::render(...) compilation error encountered while trying to process template `'+ filename + '`\n' + (err.stack||err.message||err) ));
-                    filename = null;
-                    blacklistRe = null;
-                    return;
-                }
+                break;
+        }
+        r       = null;
+        rLen    = null;
+        obj     = null;
 
 
+        return str;
+    }
 
-                // Only available for http/2.0 for now
-                if ( !self.isXMLRequest() && /http\/2/.test(localOptions.conf.server.protocol) ) {
-                    var assets = null;
-                    try {
-                        // TODO - button in toolbar to empty url assets cache
-                        if ( /**  self.isCacheless() ||*/ typeof(localOptions.template.assets) == 'undefined' || typeof(localOptions.template.assets[local.req.url]) == 'undefined' ) {
-                            // assets string -> object
-                            //assets = self.serverInstance.getAssets(localOptions.conf, layout.toString(), swig, data);
-                            assets = self.serverInstance.getAssets(localOptions.conf, layout, swig, data);
-                            localOptions.template.assets = JSON.parse(assets);
-                        }
+    /**
+     * TODO -  SuperController.setMeta()
+     * */
+    // this.setMeta = function(metaName, metacontent) {
+    //
+    // }
 
-                        //  only for toolbar - TODO hasToolbar()
-                        if (
-                            self.isCacheless() && hasViews() && !isWithoutLayout
-                            || hasViews() && localOptions.debugMode
-                            || self.isCacheless() && hasViews() && self.isXMLRequest()
-                        ) {
-                            layout = layout.replace('{"assets":"${assets}"}', assets );
-                        }
-                        assets = null;
 
-                    } catch (err) {
-                        assets = null;
-                        self.throwError(local.res, 500, new Error('Controller::render(...) calling getAssets(...) \n' + (err.stack||err.message||err) ));
-                        return;
-                    }
-                }
 
-                // Last compilation before rendering
-                // Now we can use `data` instead of `swigData`
-                layout = swig.compile(layout, mapping)(data);
+    var isValidURL = function(url){
+        // var re = /(http|ftp|https|sftp):\/\/[\w-]+(\.[\w-]+)+([\w.,@?^=%&amp;:\/~+#-]*[\w@?^=%&amp;\/~+#-])?/;
+        return (/(http|ftp|https|sftp):\/\/[\w-]+(\.[\w-]+)+([\w.,@?^=%&amp;:\/~+#-]*[\w@?^=%&amp;\/~+#-])?/.test(url)) ? true : false;
+    }
 
-                if ( !headersSent() ) {
-                    if ( local.options.isRenderingCustomError ) {
-                        local.options.isRenderingCustomError = false;
-                    }
+    this.renderWithoutLayout = function (data, displayToolbar) {
 
-                    local.res.end(layout);
-                    layout = null;
-                }
+        // preventing multiple call of self.renderWithoutLayout() when controller is rendering from another required controller
+        if (local.options.renderingStack.length > 1) {
+            return false;
+        }
 
-                console.info(local.req.method +' ['+local.res.statusCode +'] '+ local.req.url);
+        local.options.isWithoutLayout = true;
 
-                if ( typeof(local.next) != 'undefined' ) {
-                    return local.next();
-                }
-                return;
-            }
+        self.render(data, displayToolbar);
+    }
 
 
-            if ( typeof(local.req.params.errorObject) != 'undefined' ) {
-                return self.throwError(local.req.params.errorObject);
-            }
-            local.res.end('Unexpected controller error while trying to render.');
+    var getData = function() {
+        return refToObj( local.userData )
+    }
 
-            if (typeof(local.next) != 'undefined') {
-                return local.next();
-            }
+    if  (this.isCacheless() ) {
+        delete require.cache[require.resolve( _(__dirname + '/controller.renderv1', true))];
+        delete require.cache[require.resolve( _(__dirname + '/controller.renderSwig', true))];
+    }
 
-            return;
+    /**
+     * Render HTML templates : Swig is the default template engine
+     *
+     *  Extend default filters
+     *  - length
+     *
+     * Available filters:
+     *  - getWebroot()
+     *  - getUrl()
+     *
+     *  N.B.: Filters can be extended through your `<project>/src/<bundle>/controllers/setup.js`
+     *
+     *
+     * @param {object} userData
+     * @param {boolean} [displayToolbar]
+     * @param {object} [errOptions]
+     * @returns {void}
+     * */
+    this.render = require( _(__dirname + '/controller.renderSwig', true) )({
+        self        : self,
+        local       : local,
+        getData     : getData,
+        hasViews    : hasViews,
+        setResources: setResources,
+        swig        : swig,
+        SwigFilters : SwigFilters,
+        headersSent : headersSent
+    }); //(userData, displayToolbar, errOptions)
 
-        } catch (err) {
-            return self.throwError(local.res, 500, err);
-        }
-    }
 
 
     this.isXMLRequest = function() {
@@ -1418,14 +989,25 @@ function SuperController(options) {
 
                 try {
                     response.statusCode    = jsonObj.status;
-                    response.statusMessage = local.options.conf.server.coreConfiguration.statusCodes[jsonObj.status];
+                    // HTTP/2 (RFC7540 8.1.2.4):
+                    // This standard for HTTP/2 explicitly states that status messages are not supported.
+                    // In HTTP/2, the status is conveyed solely by the numerical status code (e.g., 200, 404, 500),
+                    // and there is no field for a human-readable status message.
+                    if ( !/http\/2/.test(local.options.conf.server.protocol) ) {
+                        response.statusMessage = local.options.conf.server.coreConfiguration.statusCodes[jsonObj.status];
+                    }
                 } catch (err){
                     response.statusCode    = 500;
-                    response.statusMessage = err.stack;
+                    // HTTP/2 (RFC7540 8.1.2.4):
+                    // This standard for HTTP/2 explicitly states that status messages are not supported.
+                    // In HTTP/2, the status is conveyed solely by the numerical status code (e.g., 200, 404, 500),
+                    // and there is no field for a human-readable status message.
+                    if ( !/http\/2/.test(local.options.conf.server.protocol) ) {
+                        response.statusMessage = err.stack;
+                    }
                 }
             }
 
-
             // Internet Explorer override
             if ( /msie/i.test(request.headers['user-agent']) ) {
                 response.setHeader('content-type', 'text/plain' + '; charset='+ local.options.conf.encoding)
@@ -1433,302 +1015,113 @@ function SuperController(options) {
                 response.setHeader('content-type', local.options.conf.server.coreConfiguration.mime['json'] + '; charset='+ local.options.conf.encoding)
             }
 
-            // if ( !headersSent(response) ) {
-                console.info(request.method +' ['+ response.statusCode +'] '+ request.url);
-
-
-                if ( local.options.isXMLRequest && self.isWithCredentials() )  {
+            console.info(request.method +' ['+ response.statusCode +'] '+ request.url);
 
-                    // content length must be the right size !
-                    var len = Buffer.byteLength(data, 'utf8') || 0;
-                    if ( !headersSent(response) ) {
-                        response.setHeader("content-length", len);
-                    }
-
-                    response.write(data);
 
-                    // required to close connection
-                    setTimeout(function () {
-                        response.end();
-                        try {
-                            response.headersSent = true;
-                        } catch(err) {
-                            // Ignoring warning
-                            //console.warn(err);
-                        }
+            if ( local.options.isXMLRequest && self.isWithCredentials() )  {
 
-                        if ( next ) {
-                            next()
-                        }
+                // content length must be the right size !
+                var len = Buffer.byteLength(data, 'utf8') || 0;
+                if ( !headersSent(response) ) {
+                    response.setHeader("content-length", len);
+                }
 
-                        freeMemory([jsonObj, data, request, response, next]);
-                    }, 200);
+                response.write(data);
 
-                    // force completion
-                    return
-                }
-                // normal case
-                response.end(JSON.stringify(jsonObj));
-                if (!headersSent(response)) {
+                // required to close connection
+                setTimeout(function () {
+                    response.end();
                     try {
                         response.headersSent = true;
                     } catch(err) {
                         // Ignoring warning
                         //console.warn(err);
                     }
-                }
-                if ( next ) {
-                    return next()
-                }
-
-                freeMemory([jsonObj, data, request, response, next]);
-
-                return;
-            // }
-        } catch (err) {
-            return self.throwError(response, 500, err);
-        }
-    }
-
-
-    this.renderTEXT = function(content) {
-
-        // preventing multiple call of self.renderTEXT() when controller is rendering from another required controller
-        if (local.options.renderingStack.length > 1) {
-            return false
-        }
-        if ( self.isProcessingError ) {
-           return;
-        }
-
-        var request     = local.req;
-        var response    = local.res;
-        var next        = local.next || null;
-        // var stream      = null;
-        // if ( /http\/2/.test(local.options.conf.server.protocol) ) {
-        //     stream = response.stream;
-        // }
-
-        // Added on 2023-06-12
-        if ( headersSent(response) ) {
-            freeMemory([content, request, response, next]);
-            return;
-        }
-
-        if ( typeof(content) != "string" ) {
-            content = content.toString();
-        }
 
-        // if (typeof(options) != "undefined" && typeof(options.charset) !="undefined") {
-        //     response.setHeader("charset", options.charset);
-        // }
-        if ( !response.getHeaders()['content-type'] ) {
-            response.setHeader('content-type', 'text/plain' + '; charset='+ local.options.conf.encoding);
-        }
-
-        if ( !headersSent() ) {
-            console.info(request.method +' ['+response.statusCode +'] '+ request.url);
-            response.end(content);
-            try {
-                response.headersSent = true
-            } catch(err) {
-                // Ignoring warning
-                //console.warn(err);
-            }
-
-            freeMemory([jsonObj, data, request, response, next]);
-        }
-    }
+                    if ( next ) {
+                        next()
+                    }
 
-    var parseDataObject = function(o, obj, override) {
+                    freeMemory([jsonObj, data, request, response, next]);
+                }, 200);
 
-        for (let i in o) {
-            if ( o[i] !== null && typeof(o[i]) == 'object' || override && o[i] !== null && typeof(o[i]) == 'object' ) {
-                parseDataObject(o[i], obj);
-            } else if (o[i] == '_content_'){
-                o[i] = obj
+                // force completion
+                return
             }
-        }
-
-        return o
-    }
-
-    /**
-     * Set data
-     *
-     * @param {string} nave -  variable name to set
-     * @param {string|object} value - value to set
-     * @param {boolean} [override]
-     *
-     * @returns {void}
-     * */
-    var set = function(name, value, override) {
-
-        var override = ( typeof(override) != 'undefined' ) ? override : false;
-
-        if ( typeof(name) == 'string' && /\./.test(name) ) {
-            var keys        = name.split(/\./g)
-                , newObj    = {}
-                , str       = '{'
-                , _count    = 0;
-
-            for (let k = 0, len = keys.length; k<len; ++k) {
-                str +=  "\""+ keys.splice(0,1)[0] + "\":{";
-
-                ++_count;
-                if (k == len-1) {
-                    str = str.substr(0, str.length-1);
-                    str += "\"_content_\"";
-                    for (let c = 0; c<_count; ++c) {
-                        str += "}"
-                    }
+            // normal case
+            response.end(JSON.stringify(jsonObj));
+            if (!headersSent(response)) {
+                try {
+                    response.headersSent = true;
+                } catch(err) {
+                    // Ignoring warning
+                    //console.warn(err);
                 }
             }
+            if ( next ) {
+                return next()
+            }
 
-            newObj = parseDataObject(JSON.parse(str), value, override);
-            local.userData = merge(local.userData, newObj);
-
-            freeMemory([name, value, keys, newObj, str, _count], false);
-
-        } else if ( typeof(local.userData[name]) == 'undefined' ) {
-            local.userData[name] = value.replace(/\\/g, '');
-            freeMemory([name, value], false)
-        }
-    }
-
-    /**
-     * Get data
-     *
-     * @param {String} variable Data name to set
-     * @returns {Object | String} data Data object or String
-     * */
-    var get = function(variable) {
-        return local.userData[variable]
-    }
-
-    /**
-     * Set resources
-     *
-     * @param {object} template - template configuration
-     * */
-    var setResources = function(viewConf) {
-        if (!viewConf) {
-            return self.throwError(500, new Error('No views configuration found. Did you try to add views before using Controller::render(...) ? Try to run: gina view:add '+ options.conf.bundle +' @'+ options.conf.projectName));
-        }
-
-        var authority = ( typeof(local.req.headers['x-forwarded-proto']) != 'undefined' ) ? local.req.headers['x-forwarded-proto'] : local.options.conf.server.scheme;
-        authority += '://'+ local.req.headers.host;
-        var useWebroot = false;
-        if ( !/^\/$/.test(local.options.conf.server.webroot) && local.options.conf.server.webroot.length > 0 && local.options.conf.hostname.replace(/\:\d+$/, '') == authority ) {
-            useWebroot = true
-        }
-        authority = null;
-
-        var reURL = new RegExp('^'+ local.options.conf.server.webroot);
+            freeMemory([jsonObj, data, request, response, next]);
 
-        var cssStr = '', jsStr = '';
+            return;
 
-        //Get css
-        if( viewConf.stylesheets ) {
-            cssStr  = getNodeRes('css', viewConf.stylesheets, useWebroot, reURL)
-        }
-        //Get js
-        if( viewConf.javascripts ) {
-            jsStr   = getNodeRes('js', viewConf.javascripts, useWebroot, reURL)
+        } catch (err) {
+            return self.throwError(response, 500, err);
         }
-
-        set('page.view.stylesheets', cssStr);
-        set('page.view.scripts', jsStr);
-
-        reURL   = null;
-        cssStr  = null;
-        jsStr   = null;
     }
 
-    /**
-     * Get node resources
-     *
-     * @param {string} type
-     * @param {string} resStr
-     * @param {array} resArr
-     * @param {object} resObj
-     *
-     * @returns {object} content
-     *
-     * @private
-     * */
-    var getNodeRes = function(type, resArr, useWebroot, reURL) {
 
-        var r               = 0
-            , rLen          = resArr.length
-            , obj           = null
-            , str           = ''
-            , requestHost   = ( /http\/2/.test(local.options.conf.server.protocol) )
-                    ? local.req.headers[':host']
-                    : local.req.headers.host
-            , hostname      = ( typeof(requestHost) != 'undefined' && local.options.conf.host != requestHost)
-                    ? local.options.conf.server.scheme +'://'+ requestHost + ':'+ local.options.conf.server.port
-                    : local.options.conf.hostname
-        ;
-        switch(type){
-            case 'css':
-                for (; r < rLen; ++r) {
-                    obj = resArr[r];
-                    if (useWebroot && !reURL.test(obj.url) ) {
-                        obj.url = local.options.conf.server.webroot + obj.url.substr(1);
-                    }
-                    // TODO - add support for cdn
-                    if (!/\:\/\//.test(obj.url) ) {
-                        obj.url = hostname + obj.url;
-                    }
+    this.renderTEXT = function(content) {
 
-                    if (obj.media)
-                        str += '\n\t\t<link href="'+ obj.url +'" media="'+ obj.media +'" rel="'+ obj.rel +'" type="'+ obj.type +'">';
-                    else
-                        str += '\n\t\t<link href="'+ obj.url +'" rel="'+ obj.rel +'" type="'+ obj.type +'">';
-                }
-                break;
+        // preventing multiple call of self.renderTEXT() when controller is rendering from another required controller
+        if (local.options.renderingStack.length > 1) {
+            return false
+        }
+        if ( self.isProcessingError ) {
+           return;
+        }
 
-            case 'js':
-                var deferMode = (local.options.template.javascriptsDeferEnabled) ? ' defer' : '';
+        var request     = local.req;
+        var response    = local.res;
+        var next        = local.next || null;
+        // var stream      = null;
+        // if ( /http\/2/.test(local.options.conf.server.protocol) ) {
+        //     stream = response.stream;
+        // }
 
-                for (; r < rLen; ++r) {
-                    obj = resArr[r];
-                    if (useWebroot && !reURL.test(obj.url) ) {
-                        obj.url = local.options.conf.server.webroot + obj.url.substr(1);
-                    }
-                    // TODO - add support for cdn
-                    if (!/\:\/\//.test(obj.url) ) {
-                        obj.url = hostname + obj.url;
-                    }
-                    str += '\n\t\t<script'+ deferMode +' type="'+ obj.type +'" src="'+ obj.url +'"></script>'
-                }
-                break;
+        // Added on 2023-06-12
+        if ( headersSent(response) ) {
+            freeMemory([content, request, response, next]);
+            return;
         }
-        r       = null;
-        rLen    = null;
-        obj     = null;
 
+        if ( typeof(content) != "string" ) {
+            content = content.toString();
+        }
 
-        return str;
-    }
+        // if (typeof(options) != "undefined" && typeof(options.charset) !="undefined") {
+        //     response.setHeader("charset", options.charset);
+        // }
+        if ( !response.getHeaders()['content-type'] ) {
+            response.setHeader('content-type', 'text/plain' + '; charset='+ local.options.conf.encoding);
+        }
 
-    /**
-     * TODO -  SuperController.setMeta()
-     * */
-    // this.setMeta = function(metaName, metacontent) {
-    //
-    // }
+        if ( !headersSent() ) {
+            console.info(request.method +' ['+response.statusCode +'] '+ request.url);
+            response.end(content);
+            try {
+                response.headersSent = true
+            } catch(err) {
+                // Ignoring warning
+                //console.warn(err);
+            }
 
-    var getData = function() {
-        return refToObj( local.userData )
+            freeMemory([content, request, response, next]);
+        }
     }
 
 
-    var isValidURL = function(url){
-        // var re = /(http|ftp|https|sftp):\/\/[\w-]+(\.[\w-]+)+([\w.,@?^=%&amp;:\/~+#-]*[\w@?^=%&amp;\/~+#-])?/;
-        return (/(http|ftp|https|sftp):\/\/[\w-]+(\.[\w-]+)+([\w.,@?^=%&amp;:\/~+#-]*[\w@?^=%&amp;\/~+#-])?/.test(url)) ? true : false;
-    }
 
     /**
      * Set method - Override current method
@@ -1797,7 +1190,7 @@ function SuperController(options) {
 
         if (
             staticProps.isStaticFilename && staticsArr.indexOf(url) > -1
-            || staticProps.isStaticFilename && staticsArr.indexOf( url.replace(url.substr(url.lastIndexOf('/')+1), '') ) > -1
+            || staticProps.isStaticFilename && staticsArr.indexOf( url.replace(url.substring(url.lastIndexOf('/')+1), '') ) > -1
             || staticProps.isStaticFilename && staticsArr.indexOf(staticProps.firstLevel) > -1
         ) {
             staticProps = null;
@@ -1895,9 +1288,9 @@ function SuperController(options) {
             //     ignoreWebRoot = false
             // } else
             if (typeof(res) === 'string' || typeof(res) === 'number' || typeof(res) === 'boolean') {
-                if ( /true|1/.test(res) ) {
+                if ( /^(true|1)$/i.test(res) ) {
                     ignoreWebRoot = true
-                } else if ( /false|0/.test(res) ) {
+                } else if ( /^(false|0)$/i.test(res) ) {
                     ignoreWebRoot = false
                 } else {
                     res = local.res;
@@ -1918,13 +1311,13 @@ function SuperController(options) {
 
             }
 
-            if ( req.substr(0,1) === '/') { // is relative (not checking if the URI is defined in the routing.json)
-                // if (wroot.substr(wroot.length-1,1) == '/') {
-                //     wroot = wroot.substr(wroot.length-1,1).replace('/', '')
+            if ( req.substring(0,1) === '/') { // is relative (not checking if the URI is defined in the routing.json)
+                // if (wroot.substring(wroot.length-1,1) == '/') {
+                //     wroot = wroot.substring(wroot.length-1,1).replace('/', '')
                 // }
 
                 if ( /^\//.test(req) && !ignoreWebRoot )
-                    req = req.substr(1);
+                    req = req.substring(1);
 
                 rte             = ( ignoreWebRoot != null && ignoreWebRoot  ) ? req : wroot + req;
                 // cleaning url in case of ?param=value
@@ -2015,11 +1408,32 @@ function SuperController(options) {
 
         if ( !self.forward404Unless(condition, req, res) ) { // forward to 404 if bad route
 
-            var isProxyHost = ( typeof(local.req.headers.host) != 'undefined' && local.options.conf.server.scheme +'://'+ local.req.headers.host != local.options.conf.hostname || typeof(local.req.headers[':authority']) != 'undefined' && local.options.conf.server.scheme +'://'+ local.req.headers[':authority'] != local.options.conf.hostname  ) ? true : false;
-            var hostname = (isProxyHost) ? ctx.config.envConf[bundle][env].hostname.replace(/\:\d+$/, '') : ctx.config.envConf[bundle][env].hostname;
+            var localRequestPort = local.req.headers.port || local.req.headers[':port'];
+            var isProxyHost = (
+                typeof(local.req.headers.host) != 'undefined'
+                && typeof(localRequestPort) != 'undefined'
+                &&  /^(80|443)$/.test(localRequestPort)
+                && local.options.conf.server.scheme +'://'+ local.req.headers.host +':'+ localRequestPort != local.options.conf.hostname.replace(/\:\d+$/, '') +':'+ local.options.conf.server.port
+                ||
+                typeof(local.req.headers[':authority']) != 'undefined'
+                && local.options.conf.server.scheme +'://'+ local.req.headers[':authority'] != local.options.conf.hostname
+                ||
+                typeof(local.req.headers.host) != 'undefined'
+                && typeof(localRequestPort) != 'undefined'
+                && /^(80|443)$/.test(localRequestPort)
+                && req.headers.host == local.options.conf.host
+                ||
+                typeof(local.req.headers['x-nginx-proxy']) != 'undefined'
+                && /^true$/i.test(local.req.headers['x-nginx-proxy'])
+                ||
+                typeof(process.gina.PROXY_HOSTNAME) != 'undefined'
+            ) ? true : false;
+
+            // var isProxyHost = getContext('isProxyHost');
+            var hostname = (isProxyHost)
+                    ? process.gina.PROXY_HOSTNAME
+                    : ctx.config.envConf[bundle][env].hostname;
 
-            // if ( !/\:\d+$/.test(req.headers.host) )
-            //     hostname = hostname.replace(/\:\d+$/, '');
 
             if (route) { // will go with route first
 
@@ -2078,7 +1492,7 @@ function SuperController(options) {
                     originalMethod && !/GET/i.test(originalMethod)
                 ) { // trying to redirect using the wrong method ?
 
-                    console.warn(new Error('Your are trying to redirect using the wrong method: `'+ req.method+'`.\nThis can often occur while redirecting from a controller to another controller or from a bundle to another.\nA redirection is not permitted in this scenario.\nD\'ont panic :)\nSwitching request method to `GET` method instead.\n').message);
+                    console.warn(new Error('Your are trying to redirect using the wrong method: `'+ req.method+'`.\nThis can often occur while redirecting from a controller to another controller or from a bundle to another.\nA redirection is not permitted in this scenario.\nDon\'t panic :)\nSwitching request method to `GET` method instead.\n').message);
                     method = local.req.method = self.setRequestMethod('GET', conf);
                     code = 303;
                 }
@@ -2287,9 +1701,8 @@ function SuperController(options) {
      * @param {string} url - eg.: https://upload.wikimedia.org/wikipedia/fr/2/2f/Firefox_Old_Logo.png
      * @param {object} [options]
      *
-     *
      * */
-    this.downloadFromURL = function(url, options) {
+    this.downloadFromURL = function(url, options, cb) {
 
         var defaultOptions = {
             // file name i  you want to rename the file
@@ -2326,15 +1739,13 @@ function SuperController(options) {
 
         if ( /\:\/\//.test(url) ) {
             scheme = url.match(/^\w+\:/)[0];
-            scheme = scheme.substr(0, scheme.length-1);
+            scheme = scheme.substring(0, scheme.length-1);
 
             if ( !/^http/.test(scheme) ) {
                 self.throwError(local.res, 500, new Error('[ '+ scheme +' ] Scheme not supported. Ref.: `http` or `https` only'));
                 return;
             }
 
-
-
         } else { // by default
             scheme = 'http';
         }
@@ -2342,9 +1753,10 @@ function SuperController(options) {
         requestOptions.scheme = scheme +':';
 
         //defining port
+        // console.debug('[ CONTROLLER ][ HTTP/2.0#downloadFromURL ] defining port from: ', url);
         var port = url.match(/\:\d+\//) || null;
         if ( port != null ) {
-            port = port[0].substr(1, port[0].length-2);
+            port = port[0].match(/\d+/)[0];
             requestOptions.port = ~~port;
         }
 
@@ -2376,7 +1788,7 @@ function SuperController(options) {
             opt.contentDisposition += '; filename=' + filename;
         }
 
-        var ext             = filename.match(/\.\w+$/)[0].substr(1)
+        var ext             = filename.match(/\.\w+$/)[0].substring(1)
             , contentType   = null
             , tmp           = _(GINA_TMPDIR +'/'+ filename, true)
         ;
@@ -2394,11 +1806,32 @@ function SuperController(options) {
         requestOptions.headers['content-type'] = contentType;
         requestOptions.headers['content-disposition'] = opt.contentDisposition;
 
+        if (
+            typeof(local.req.headers['x-client-ip']) != 'undefined'
+            && local.req.headers['x-client-ip'] != requestOptions.headers['x-client-ip']
+        ) {
+            requestOptions.headers['x-client-ip'] = local.req.headers['x-client-ip']
+        }
+
+        if (
+            typeof(local.req.headers['x-ingress-ip']) != 'undefined'
+            && local.req.headers['x-ingress-ip'] != requestOptions.headers['x-ingress-ip']
+        ) {
+            requestOptions.headers['x-ingress-ip'] = local.req.headers['x-ingress-ip']
+        }
+
+        if (
+            typeof(local.req.headers['x-forwarded-for']) != 'undefined'
+            && local.req.headers['x-forwarded-for'] != requestOptions.headers['x-forwarded-for']
+        ) {
+            requestOptions.headers['x-forwarded-for'] = local.req.headers['x-forwarded-for']
+        }
+
         var browser = require(''+ scheme);
-        //console.debug('requestOptions: \n', JSON.stringify(requestOptions, null, 4));
+        // console.debug('requestOptions: \n', JSON.stringify(requestOptions, null, 2));
 
         browser
-            .get(requestOptions, function(response) {
+            .get(requestOptions, async function(response) {
 
                 local.res.setHeader('content-type', contentType + '; charset='+ local.options.conf.encoding);
                 local.res.setHeader('content-disposition', opt.contentDisposition);
@@ -2410,9 +1843,15 @@ function SuperController(options) {
                 // local.res.setHeader('pragma', 'must-revalidate');
 
 
-                response.pipe(local.res);
+                await response.pipe(local.res);
+                if ( typeof(cb) != 'undefined' ) {
+                    cb(false)
+                }
             })
             .on('error', function onDownloadError(err) {
+                if ( typeof(cb) != 'undefined' ) {
+                    return cb(err)
+                }
                 self.throwError(local.res, 500, err);
             });
 
@@ -2659,7 +2098,8 @@ function SuperController(options) {
         ) {
             return false
         }
-        self.isProcessingError = false; // by default
+        // by default
+        self.isProcessingError = false;
 
         var queryData           = {}
             , defaultOptions    = local.query.options
@@ -2669,14 +2109,14 @@ function SuperController(options) {
 
         // options must be used as a copy in case of multiple calls of self.query(options, ...)
         options = merge(JSON.clone(options), defaultOptions);
-        // options = merge(options, defaultOptions);
 
-        for (var o in options) {//cleaning
+        for (let o in options) {//cleaning
             if ( typeof(options[o]) == 'undefined' || options[o] == undefined) {
                 delete options[o]
             }
         }
 
+
         if (self.isCacheless() || self.isLocalScope() ) {
             options.rejectUnauthorized = false;
         }
@@ -2745,14 +2185,17 @@ function SuperController(options) {
         if ( local.req != null && typeof(local.req.ginaHeaders) != 'undefined' ) {
             // gina form headers
             for (let h in local.req.ginaHeaders.form) {
-                let k = h.substr(0,1).toUpperCase() + h.substr(1);
+                let k = h.substring(0,1).toUpperCase() + h.substring(1);
                 options.headers['X-Gina-Form-' +  k ] = local.req.ginaHeaders.form[h];
             }
         }
 
-        var ctx         = getContext()
-            , protocol  = null
-            , scheme    = null
+        var ctx             = getContext()
+            , protocol      = null
+            , scheme        = null
+            , isProxyHost   = getContext('isProxyHost')
+            , bundle        = null
+            , webroot       = options.webroot || ctx.gina.config.envConf[ctx.bundle][ctx.env].server.webroot;// bundle servers's webroot by default
         ;
         // cleanup options.path
         if (/\:\/\//.test(options.path)) {
@@ -2769,11 +2212,16 @@ function SuperController(options) {
                                 .replace(':'+port, '');
         }
 
+        // if ( typeof(options.protocol) == 'undefined' ) {
+        //     options.protocol = ctx.gina.config.envConf[ctx.bundle][ctx.env].server.protocol;
+        // }
+
         // retrieve protocol & scheme: if empty, take the bundles protocol
         protocol    = options.protocol || ctx.gina.config.envConf[ctx.bundle][ctx.env].server.protocol;// bundle servers's protocol by default
         protocol    = protocol.match(/[.a-z 0-9]+/ig)[0];
         scheme      = options.scheme || ctx.gina.config.envConf[ctx.bundle][ctx.env].server.scheme;// bundle servers's scheme by default
         scheme      = scheme.match(/[a-z 0-9]+/ig)[0];
+
         // retrieve credentials
         if ( typeof(options.ca) == 'undefined' || ! options.ca ) {
             options.ca  = ctx.gina.config.envConf[ctx.bundle][ctx.env].server.credentials.ca;
@@ -2782,24 +2230,18 @@ function SuperController(options) {
         //retrieving dynamic host, hostname & port
         if ( /\@/.test(options.hostname) ) {
 
-            var bundle = ( options.hostname.replace(/(.*)\:\/\//, '') ).split(/\@/)[0];
-
+            bundle              = ( options.hostname.replace(/(.*)\:\/\//, '') ).split(/\@/)[0];
             // No shorcut possible because conf.hostname might differ from user inputs
             options.host        = ctx.gina.config.envConf[bundle][ctx.env].host.replace(/(.*)\:\/\//, '').replace(/\:\d+/, '');
             options.hostname    = ctx.gina.config.envConf[bundle][ctx.env].hostname;
             options.port        = ctx.gina.config.envConf[bundle][ctx.env].server.port;
-
-            options.protocol    = ctx.gina.config.envConf[bundle][ctx.env].server.protocol;
+            options.protocol    = options.protocol ||  ctx.gina.config.envConf[bundle][ctx.env].server.protocol;
             options.scheme      = ctx.gina.config.envConf[bundle][ctx.env].server.scheme;
 
             // retrieve credentials
             if ( typeof(options.ca) == 'undefined' || ! options.ca ) {
                 options.ca = ctx.gina.config.envConf[bundle][ctx.env].server.credentials.ca;
             }
-
-            // might be != from the bundle requesting
-            //options.protocol    = ctx.gina.config.envConf[bundle][ctx.env].content.settings.server.protocol || ctx.gina.config.envConf[bundle][ctx.env].server.protocol;
-            //options.scheme    = ctx.gina.config.envConf[bundle][ctx.env].content.settings.server.scheme || ctx.gina.config.envConf[bundle][ctx.env].server.scheme;
         }
 
         if ( typeof(options.protocol) == 'undefined' ) {
@@ -2813,45 +2255,224 @@ function SuperController(options) {
 
 
         // reformating scheme
-        if( !/\:$/.test(options.scheme) )
+        if( !/\:$/.test(options.scheme) ) {
             options.scheme += ':';
+        }
+
+        if (isProxyHost) {
+            // X-Forwarded-Host
+            options.headers['x-forwarded-host'] = process.gina.PROXY_HOST;
+            // X-Forwarded-Proto
+            options.headers['x-forwarded-proto'] = process.gina.PROXY_SCHEME;
+        }
+
+        if ( ctx.gina.config.envConf[ctx.bundle][ctx.env].server.resolvers.length > 0 ) {
+            var resolversColl = new Collection(ctx.gina.config.envConf[ctx.bundle][ctx.env].server.resolvers);
+            options.nameservers = resolversColl.findOne({ scope: process.env.NODE_SCOPE}).nameservers;
+            resolversColl = null;
+        }
 
         try {
             options.queryData = queryData;
+
+            bundle = null;
+
+            // TODO - Add preferred communication method option: cCurl or HTTP
+            // return handleCurlRequest(options, callback);
+
             var protocolVersion = ~~options.protocol.match(/\/(.*)$/)[1].replace(/\.\d+/, '');
             var httpLib =  options.protocol.match(/^(.*)\//)[1] + ( (protocolVersion >= 2) ? protocolVersion : '' );
             if ( !/http2/.test(httpLib) && /https/.test(options.scheme) ) {
                 httpLib += 's';
             }
-
             browser = require(''+ httpLib);
-
             if ( /http2/.test(httpLib) ) {
                 return handleHTTP2ClientRequest(browser, options, callback);
             } else {
                 return handleHTTP1ClientRequest(browser, options, callback);
             }
 
-
         } catch(err) {
             if (callback) {
                 return callback(err)
             }
             self.emit('query#complete', err)
         }
+    }
+
+    var handleCurlRequest = async function(opt, callback) {
+
+
+        var body = null;
+        // https://docs.couchbase.com/server/current/n1ql-rest-query/index.html#Request
+        var cmd = [
+            '$(which curl)'
+        ];
+
+        if (!opt.rejectUnauthorized) {
+            // (SSL) This option explicitly allows curl to perform "insecure" SSL connections and transfers
+            // same as --insecure
+            cmd.splice(1,0,'-k');
+        }
+
+        // method
+        if ( !/get/i.test(opt.method) ) {
+            cmd.splice(1,0,'-X '+ opt.method.toUpperCase() );
+        }
+
+
+        if ( /(post|put)/i.test(opt.method) && opt.queryData.length > 0) {
+            cmd.push('-d '+ opt.queryData );
+            body = Buffer.from(opt.queryData);
+            opt.headers['content-length'] = body.length;
+        } else if (
+            /get/i.test(opt.method)
+            && typeof(opt.headers['content-length']) != 'undefined'
+        ) {
+            delete opt.headers['content-length'];
+        }
+
+        if ( opt.headers.count() > 0) {
+            for (let h in opt.headers) {
+                cmd.splice(1,0,'-H "'+ h +': '+ opt.headers[h] +'"');
+            }
+        }
+
+        // resolvers
+        if (opt.nameservers) {
+            resolver.setServers(opt.nameservers);
+            await resolver
+                .resolve4(opt.host)
+                .catch( function onResolverErr(e) {
+                    var infos = local.options, controllerName = infos.controller.substring(infos.controller.lastIndexOf('/'));
+                    var msg = 'Could not resolve with these `settings.server.resolvers`:\n'+ opt.nameservers.toString() +'\n' + e.stack+ '\nController Query Exception while catching back.\nBundle: '+ infos.bundle +'\nController File: /controllers'+ controllerName +'\nControl: this.'+ infos.control +'(...)\n\r';
+                    var exception = new Error(msg);
+                    exception.status = 500;
+                    return self.throwError(exception);
+                })
+                .then( function onResolved(ips) {
+                    if ( typeof(ips) == 'undefined' || !Array.isArray(ips) || !ips.length ) {
+                        var infos = local.options, controllerName = infos.controller.substring(infos.controller.lastIndexOf('/'));
+                        var e = new Error('`Unable to resolve ${opt.host}`');
+                        var msg = 'Please check`settings.server.resolvers`:\n'+ opt.nameservers.toString() +'\n'+ e.stack + 'Controller Query Exception while catching back.\nBundle: '+ infos.bundle +'\nController File: /controllers'+ controllerName +'\nControl: this.'+ infos.control +'(...)\n\r';
+                        var exception = new Error(msg);
+                        exception.status = 500;
+                        return self.throwError(exception);
+                    }
+                    for (let i=0, len=ips.length; i<len; i++) {
+                        // e.g.: --resolve www.example.com:443:127.0.0.1
+                        cmd.push('--resolve '+ opt.host +':'+ opt.port +':'+ ips[i]);
+                    }
+                });
+        }
+
+
 
+
+        cmd.push('-v "'+ opt.hostname + opt.path +'"');
+
+        // Default maxBuffer is 200KB (=> 1024 * 200)
+        // Setting it to 10MB - preventing: stdout maxBuffer length exceeded
+        var maxBuffer = (1024 * 1024 * 10);
+        exec(cmd.join(' '), { maxBuffer: maxBuffer }, function onResult(err, dataStr, infos) {
+            var error = null;
+            if (err) {
+                try {
+                    // by default
+                    error = new Error('[ CONTROLLER ][ CURL#query ] request aborted\n'+ err.stack);
+                    if (
+                        typeof(err.message) != 'undefined'
+                        && /Failed to connect/i.test(err.message)
+                    ) {
+                        var port = getContext('gina').ports[opt.protocol][opt.scheme.replace(/\:/, '')][ opt.port ];
+                        error.accessPoint = port;
+                        error.message = 'Could not connect to [ ' + error.accessPoint + ' ].\nThe `'+port.split(/\@/)[0]+'` bundle is offline or unreachable.\n';
+                    }
+                    console.error(error.stack);
+                    if ( typeof(callback) != 'undefined' ) {
+                        callback(error)
+                    } else {
+                        self.emit('query#complete', error)
+                    }
+                } catch (e) {
+                    // console.error(e.stack);
+                    var infos = local.options, controllerName = infos.controller.substring(infos.controller.lastIndexOf('/'));
+                    var msg = 'Controller Query Exception while catching back.\nBundle: '+ infos.bundle +'\nController File: /controllers'+ controllerName +'\nControl: this.'+ infos.control +'(...)\n\r' + e.stack;
+                    var exception = new Error(msg);
+                    exception.status = 500;
+                    self.throwError(exception);
+                }
+                return;
+            }
+
+
+            try {
+                let data = JSON.parse(dataStr);
+                if ( typeof(data) == 'undefined' ) {
+                    data = {}
+                }
+                if ( typeof(callback) != 'undefined' ) {
+                    callback(err, data)
+                } else {
+                    self.emit('query#complete', err, data)
+                }
+            } catch (e) {
+                // _err.stack = '[ CONTROLLER ][ CURL#query ] onCallbackError: '+ e.stack;
+                // console.error(e.stack);
+                var infos = local.options, controllerName = infos.controller.substring(infos.controller.lastIndexOf('/'));
+                var msg = 'Controller Query Exception while catching back.\nBundle: '+ infos.bundle +'\nController File: /controllers'+ controllerName +'\nControl: this.'+ infos.control +'(...)\n\r' + e.stack;
+                var exception = new Error(msg);
+                exception.status = 500;
+                self.throwError(exception);
+                return;
+            }
+        });
     }
 
+    var handleHTTP1ClientRequestv2 = function (browser, options, callback) {
+        var agent = new browser.Agent({ keepAlive: true });
+        var options = {
+            host: options.host,
+            port: options.port,
+            path: options.path,
+            method: 'GET',
+            agent: agent
+        };
+
+        var req = browser.request(options, function(res) {
+            var str = "";
+            var err = false;
+            res.on('data', function (chunk) {
+                str += chunk;
+            });
+            res.on('end', function () {
+                // done
+                return callback( err, data );
+            });
+        });
+        req.write('');
+        req.end();
+        req.on('error', function(error) {
+            err = error
+        });
+    };
+
     var handleHTTP1ClientRequest = function(browser, options, callback) {
 
         var altOpt = JSON.clone(options);
+        // var credentials = self.getConfig('settings').server.credentials;
+        // options.ca = credentials.ca;
+        // options.encKey = credentials.privateKey;
+        // options.encCert = credentials.certificate;
+
 
         altOpt.protocol = options.scheme;
         altOpt.hostname = options.host;
         altOpt.port     = options.port;
+        altOpt.maxSockets = options.maxSockets || 1;
         if ( typeof(altOpt.encKey) != 'undefined' ) {
             try {
-                altOpt.encKey = fs.readFileSync(options.encKey);
+                altOpt.encKey = fs.readFileSync(altOpt.encKey);
             } catch(err) {
                 self.emit('query#complete', err);
             }
@@ -2862,7 +2483,7 @@ function SuperController(options) {
 
         if ( typeof(altOpt.encCert) != 'undefined' ) {
             try {
-                altOpt.encCert = fs.readFileSync(options.encCert);
+                altOpt.encCert = fs.readFileSync(altOpt.encCert);
             } catch(err) {
                 self.emit('query#complete', err);
             }
@@ -2871,6 +2492,11 @@ function SuperController(options) {
             console.warn('[ CONTROLLER ][ HTTP/1.0#query ] options.encCert not found !');
         }
 
+
+        delete altOpt.ca;
+        delete altOpt.encKey;
+        delete altOpt.encCert;
+
         altOpt.agent = new browser.Agent(altOpt);
 
         var req = browser.request(altOpt, function(res) {
@@ -2930,7 +2556,7 @@ function SuperController(options) {
                             return;
                         }
                     } catch (e) {
-                        var infos = local.options, controllerName = infos.controller.substr(infos.controller.lastIndexOf('/'));
+                        var infos = local.options, controllerName = infos.controller.substring(infos.controller.lastIndexOf('/'));
                         var msg = 'Controller Query Exception while catching back.\nBundle: '+ infos.bundle +'\nController File: /controllers'+ controllerName +'\nControl: this.'+ infos.control +'(...)\n\r' + e.stack;
                         var exception = new Error(msg);
                         exception.status = 500;
@@ -3024,7 +2650,7 @@ function SuperController(options) {
                             cb(err, data)
                         }
                     } catch (e) {
-                        var infos = local.options, controllerName = infos.controller.substr(infos.controller.lastIndexOf('/'));
+                        var infos = local.options, controllerName = infos.controller.substring(infos.controller.lastIndexOf('/'));
                         var msg = 'Controller Query Exception while catching back.\nBundle: '+ infos.bundle +'\nController File: /controllers'+ controllerName +'\nControl: this.'+ infos.control +'(...)\n\r' + e.stack;
                         var exception = new Error(msg);
                         exception.status = 500;
@@ -3101,10 +2727,8 @@ function SuperController(options) {
         delete options.queryData;
 
 
-
         const client = browser.connect(options.hostname, options);
 
-
         const {
             HTTP2_HEADER_PROTOCOL,
             HTTP2_HEADER_SCHEME,
@@ -3127,6 +2751,32 @@ function SuperController(options) {
             options.headers['content-type'] = local.req.headers['content-type']
         }
 
+        if ( typeof(local.req.headers['x-client-ip']) != 'undefined' && local.req.headers['x-client-ip'] != options.headers['x-client-ip'] ) {
+            options.headers['x-client-ip'] = local.req.headers['x-client-ip']
+        }
+
+        if ( typeof(local.req.headers['x-ingress-ip']) != 'undefined' && local.req.headers['x-ingress-ip'] != options.headers['x-ingress-ip'] ) {
+            options.headers['x-ingress-ip'] = local.req.headers['x-ingress-ip']
+        }
+
+        // x-forwarded-for check
+        // console.debug('[ CONTROLLER ][ HTTP/2.0#query ] checking x-forwarded-for');
+        if (
+            // Previous proxies
+            typeof(local.req.headers['x-forwarded-for']) != 'undefined'
+            && local.req.headers['x-forwarded-for'] != ""
+            // current proxy
+            && typeof(local.req.headers['x-real-ip']) != 'undefined'
+        ) {
+            // console.debug('[ CONTROLLER ][ HTTP/2.0#query ] options.headers', JSON.stringify(options.headers, null, 2));
+            // console.debug('[ CONTROLLER ][ HTTP/2.0#query ] local.req.headers', JSON.stringify(local.req.headers, null, 2));
+            var xForwardedFor = "" + local.req.headers['x-forwarded-for'];
+            // Adding the current PI to the list
+            xForwardedFor += ", "+local.req.headers['x-real-ip'];
+            xForwardedFor = null;
+            // console.debug('[ CONTROLLER ][ HTTP/2.0#query ] options.headers["x-forwarded-for"]', options.headers['x-forwarded-for']);
+        }
+
         var headers = merge({
             [HTTP2_HEADER_METHOD]: options[':method'],
             [HTTP2_HEADER_PATH]: options[':path']
@@ -3134,7 +2784,11 @@ function SuperController(options) {
 
         // merging with user options
         for (var o in options) {
-            if (!/^\:/.test(o) && !/headers/.test(o) && typeof(headers[o]) == 'undefined' ) {
+            if (
+                !/^\:/.test(o)
+                && !/headers/.test(o)
+                && typeof(headers[o]) == 'undefined'
+            ) {
                 headers[o] = options[o]
             }
         }
@@ -3154,6 +2808,7 @@ function SuperController(options) {
         }
 
 
+
         client.on('error', (error) => {
 
             console.error( '`'+ options[':path']+ '` : '+ error.stack||error.message);
@@ -3289,7 +2944,7 @@ function SuperController(options) {
                         }
 
                     } catch (e) {
-                        var infos = local.options, controllerName = infos.controller.substr(infos.controller.lastIndexOf('/'));
+                        var infos = local.options, controllerName = infos.controller.substring(infos.controller.lastIndexOf('/'));
                         var msg = 'Controller Query Exception while catching back.\nBundle: '+ infos.bundle +'\nController File: /controllers'+ controllerName +'\nControl: this.'+ infos.control +'(...)\n\r' + e.stack;
                         var exception = new Error(msg);
                         exception.status = 500;
@@ -3367,7 +3022,7 @@ function SuperController(options) {
                             cb(err, data)
                         }
                     } catch (e) {
-                        var infos = local.options, controllerName = infos.controller.substr(infos.controller.lastIndexOf('/'));
+                        var infos = local.options, controllerName = infos.controller.substring(infos.controller.lastIndexOf('/'));
                         var msg = 'Controller Query Exception while catching back.\nBundle: '+ infos.bundle +'\nController File: /controllers'+ controllerName +'\nControl: this.'+ infos.control +'(...)\n\r' + e.stack;
                         var exception = new Error(msg);
                         exception.status = 500;
@@ -3502,11 +3157,11 @@ function SuperController(options) {
             project = route.param.project;
         } // TODO - add support for project pointer : getContext('gina').projects[project]
         if (/\@(.*)$/.test(route.param.url)) {
-            var targetedBundle = route.param.url.substr(route.param.url.lastIndexOf('@')+1);
+            var targetedBundle = route.param.url.substring(route.param.url.lastIndexOf('@')+1);
             hostname    = targetedBundle +'@'+ project;
             port        = hostname;
             var webroot = getContext('gina').config.envConf[targetedBundle][local.options.conf.env].server.webroot;
-            path        = (/\/$/.test(webroot)) ? webroot.substr(0, webroot.length-1) : webroot;
+            path        = (/\/$/.test(webroot)) ? webroot.substring(0, webroot.length-1) : webroot;
         } else {
             hostname    = route.param.hostname;
             port        = route.param.port;
@@ -3560,24 +3215,28 @@ function SuperController(options) {
      *
      * */
     this.getConfig = function(name) {
+        var tmp = null;
         if ( typeof(name) != 'undefined' ) {
             try {
-                // needs to be read only
-                //config = JSON.clone(local.options.conf.content[name]);
-                //config = Object.freeze(local.options.conf.content[name]);
-                //Object.seal(local.options.conf.content[name]);
-                //Object.freeze(local.options.conf.content[name]);
-                // if ( self.isCacheless() ) {
-                // }
-                return JSON.clone(local.options.conf.content[name]);
+                // Needs to be read only
+                tmp = JSON.clone(local.options.conf.content[name]);
             } catch (err) {
                 return undefined;
             }
         } else {
-            // config = JSON.stringify(local.options.conf);
-            // return JSON.parse(config)
-            return JSON.clone(local.options.conf);
+            tmp = JSON.clone(local.options.conf);
+        }
+
+        if (
+            getContext('isProxyHost')
+            && typeof(tmp.hostname) != 'undefined'
+        ) {
+            tmp.hostname    = process.gina.PROXY_HOSTNAME;
+            tmp.host        = process.gina.PROXY_HOST;
+            // tmp.hostname    = getContext('gina').config.envConf._proxyHostname
+            // tmp.host        = tmp.hostname.replace(/^(https|http)\:\/\//, '');
         }
+        return tmp;
     }
 
     /**
@@ -3687,45 +3346,64 @@ function SuperController(options) {
         return rules;
     }
 
-    this.push = function(payload) {
+    this.push = function(payload, option, callback) {
 
         var req = local.req, res = local.res;
         var method  = req.method.toLowerCase();
         // if no session defined, will push to all active clients
+        // resuming current session
         var sessionId = ( typeof(req[method].sessionID) != 'undefined' ) ? req[method].sessionID : null;
-
-        // resume current session
+        // retrieve section if existing
+        var section = ( typeof(req[method].section) != 'undefined' ) ? req[method].section : null;
 
         if (!payload) {
             payload     = null;
             if ( typeof(req[method]) != 'undefined' && typeof(req[method].payload) != 'undefined' ) {
                 if ( typeof(payload) == 'string' ) {
-                    payload = decodeURIComponent(req[method].payload)
+                    payload = decodeURIComponent(req[method].payload);
+                    payload = JSON.parse(payload);
+                    if ( section && typeof(payload.section) == 'undefined' ) {
+                      payload.section = section
+                    }
+                    payload = JSON.stringify(payload)
                 } else {
+                    if ( section && typeof(req[method].payload.section) == 'undefined' ) {
+                      req[method].payload.section = section
+                    }
                     payload =  JSON.stringify(req[method].payload)
                 }
             }
         } else if ( typeof(payload) == 'object' ) {
+            if ( section && typeof(payload.section) == 'undefined' ) {
+              payload.section = section
+            }
             payload = JSON.stringify(payload)
         }
 
         try {
             var clients = null;
-            if (sessionId) {
-                clients = self.serverInstance.eio.getClientsBySessionId(sessionId);
-                if (clients)
-                    clients.send(payload);
-            }
+            clients = self.serverInstance.eio.clients;
+            if ( clients ) {
+                for (let s in clients) {
+                    if ( !clients[s].constructor.name == 'Socket' ) {
+                        continue;
+                    }
 
-            // send to all clients if no specific sessionId defined
-            if (!sessionId) {
-                clients = self.serverInstance.eio.clients;
-                for (var id in clients) {
-                    clients[id].send(payload)
+                    if (
+                        // session filter
+                        sessionId
+                        && typeof(clients[s].sessionId) != 'undefined'
+                        && clients[s].sessionId == sessionId
+                        ||
+                        // send to all clients if no specific sessionId defined
+                        !sessionId
+                    ) {
+                        clients[s].sendPacket("message", payload, options, callback);
+                    }
                 }
             }
 
-            res.end();
+            // res.end();
         } catch(err) {
             self.throwError(err);
             return;
@@ -3999,10 +3677,9 @@ function SuperController(options) {
                 //rootPath        : self.executionPath,
                 // We don't want to keep original conf untouched
                 //conf            : JSON.clone(conf),
-                //instance: self.serverInstance,
                 //template: (routeHasViews) ? bundleConf.content.templates[templateName] : undefined,
                 //isUsingTemplate: local.isUsingTemplate,
-                //cacheless: cacheless,
+                //isCacheless: isCacheless,
                 path: null //, // user custom path : namespace should be ignored | left blank
                 //assets: {}
             };
@@ -4228,11 +3905,11 @@ function SuperController(options) {
                     , ext                   = null
                     , isHtmlContent         = false
                     , hasCustomErrorFile    = false
-                    , eCode                 = code.toString().substr(0,1) + 'xx'
+                    , eCode                 = code.toString().substring(0,1) + 'xx'
                 ;
-                var extArr = url.substr(url.lastIndexOf('.')).match(/(\.[A-Za-z0-9]+)/);
+                var extArr = url.substring(url.lastIndexOf('.')).match(/(\.[A-Za-z0-9]+)/);
                 if (extArr) {
-                    ext = extArr[0].substr(1);
+                    ext = extArr[0].substring(1);
                 }
                 if ( !ext || /^(html|htm)$/i.test(ext) ) {
                     isHtmlContent = true;
@@ -4306,8 +3983,7 @@ function SuperController(options) {
 
                         local.req.routing = routeObj;
                         local.req.params.errorObject = errorObject;
-                        self.renderCustomError(local.req, res, local.next);
-                        return;
+                        return self.renderCustomError(local.req, res, local.next);
                     }
 
                 }
@@ -4390,7 +4066,7 @@ function SuperController(options) {
                 return next();
         }
 
-        if ( /http\/2/.test(protocol) ) {
+        if ( stream && /http\/2/.test(protocol) ) {
             return stream.end();
         }