gina 0.1.6-alpha.11 → 0.1.6-alpha.111

package/framework/{v0.1.6-alpha.11 → v0.1.6-alpha.111}/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,12 +10,14 @@
 //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 zlib            = require('zlib'); // Included with NodeJS
 
-//var dns           = require('dns');
+const { Resolver } = require('node:dns').promises;
+const resolver = new Resolver();
 // var tls = require('tls');
 // var crypto = require('crypto');
 
@@ -25,9 +27,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,24 +71,19 @@ 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;
@@ -240,12 +238,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 +320,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,15 +348,124 @@ 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;
+            }
 
-            var routing = local.options.conf.routing = ctx.config.envConf.routing; // all routes
+            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;
+
+            }
             set('page.environment.routing', encodeRFC5987ValueChars(JSON.stringify(routing))); // export for GFF
             //reverseRouting
             var reverseRouting = local.options.conf.reverseRouting = ctx.config.envConf.reverseRouting; // all routes
@@ -354,9 +475,8 @@ function SuperController(options) {
             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 +546,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,11 +557,6 @@ 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;
@@ -451,7 +566,7 @@ function SuperController(options) {
             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) {
@@ -498,7 +613,7 @@ function SuperController(options) {
      *  Extend default filters
      *  - length
      *
-     * Avilable filters:
+     * Available filters:
      *  - getWebroot()
      *  - getUrl()
      *
@@ -839,12 +954,28 @@ function SuperController(options) {
                 return;
             }
 
+            var localRequestPort = local.req.headers.port || local.req.headers[':port'];
             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
+                && typeof(localRequestPort) != 'undefined'
+                &&  /^(80|443)$/.test(localRequestPort)
+                && localOptions.conf.server.scheme +'://'+ local.req.headers.host+':'+ localRequestPort != localOptions.conf.hostname.replace(/\:\d+$/, '') +':'+ localOptions.conf.server.port
+                ||
+                typeof(local.req.headers[':authority']) != 'undefined'
+                && localOptions.conf.server.scheme +'://'+ local.req.headers[':authority'] != localOptions.conf.hostname
+                ||
+                typeof(local.req.headers.host) != 'undefined'
+                && typeof(localRequestPort) != 'undefined'
+                && /^(80|443)$/.test(localRequestPort)
+                && local.req.headers.host == localOptions.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;
+
+
             // setup swig default filters
             var filters = SwigFilters({
                 options     : JSON.clone(localOptions),
@@ -883,6 +1014,7 @@ function SuperController(options) {
                 , XHRData               = null
                 , XHRView               = null
                 , isDeferModeEnabled    = null
+                , hasExternalsPlugins    = null
                 , viewInfos             = null
                 , filename              = null
                 , isWithSwigLayout      = null
@@ -898,7 +1030,9 @@ function SuperController(options) {
                 if (isWithoutLayout) {
                     data.page.view.layout = layoutPath;
                 }
-            } else { // without layout case
+            }
+            // without layout case
+            else {
 
                 // by default
                 layoutPath = localOptions.template.layout;
@@ -926,10 +1060,8 @@ function SuperController(options) {
                     self.throwError(err);
                     return;
                 }
-
             }
 
-
             var isLoadingPartial = false;
             try {
                 assets  = {assets:"${assets}"};
@@ -1023,6 +1155,7 @@ function SuperController(options) {
             // }
 
             isDeferModeEnabled = localOptions.template.javascriptsDeferEnabled || localOptions.conf.content.templates._common.javascriptsDeferEnabled || false;
+            hasExternalsPlugins = (localOptions.template.externalPlugins.length > 0) ? true : false;
 
             // iframe case - without HTML TAG
             if (!self.isXMLRequest() && !/\<html/.test(layout) ) {
@@ -1092,8 +1225,8 @@ function SuperController(options) {
                     + '{%- 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 #}'
+                    + '{%- include "'+ getPath('gina').core +'/asset/plugin/dist/vendor/gina/html/toolbar.html" with { gina: ginaDataInspector, user: userDataInspector } -%}'// jshint ignore:line
                 ;
 
 
@@ -1124,10 +1257,18 @@ function SuperController(options) {
                 if (isLoadingPartial) {
                     layout += '\t{{ page.view.scripts }}';
                 } else {
+                    // placed in the HEAD
                     if ( isDeferModeEnabled  ) {
                         layout = layout.replace(/\<\/head\>/i, '\t{{ page.view.scripts }}\n\t</head>');
-                    } else { // placed in the BODY
+                    }
+                    // placed in the BODY
+                    else {
                         layout = layout.replace(/\<\/body\>/i, '\t{{ page.view.scripts }}\n</body>');
+                        if (hasExternalsPlugins) {
+                            for (let i =0, len = localOptions.template.externalPlugins.length; i<len; i++) {
+                                layout = layout.replace(/\<\/head\>/i, '\t'+ localOptions.template.externalPlugins +'\n</head>');
+                            }
+                        }
                     }
                 }
 
@@ -1173,6 +1314,11 @@ function SuperController(options) {
                 //         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 (hasExternalsPlugins) {
+                //             for (let i =0, len = localOptions.template.externalPlugins.length; i<len; i++) {
+                //                 layout = layout.replace(/\<\/head\>/i, '\t'+ localOptions.template.externalPlugins +'\n</head>');
+                //             }
+                //         }
                 //     }
                 // }
 
@@ -1189,11 +1335,18 @@ function SuperController(options) {
                         layout += '\t'+ localOptions.template.ginaLoader +'\n';
                     }
                 } else {
+                    // placed in the HEAD
                     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
+                    }
+                    // placed in the BODY
+                    else {
                         layout = layout.replace(/\<\/body\>/i, '\t{{ page.view.scripts }}\n</body>');
+                        if (hasExternalsPlugins) {
+                            for (let i =0, len = localOptions.template.externalPlugins.length; i<len; i++) {
+                                layout = layout.replace(/\<\/head\>/i, '\t'+ localOptions.template.externalPlugins +'\n</head>');
+                            }
+                        }
                     }
                     // ginaLoader cannot be deferred
                     if ( !localOptions.template.javascriptsExcluded || localOptions.template.javascriptsExcluded != '**' ) {
@@ -1295,6 +1448,40 @@ function SuperController(options) {
                         ) {
                             layout = layout.replace('{"assets":"${assets}"}', assets );
                         }
+
+                        if ( !self.isCacheless() ) {
+                            var links = local.options.template.h2Links;
+                            for (let l in localOptions.template.assets) {
+                                let link = localOptions.template.assets[l]
+                                if (
+                                    /^_/.test(l)
+                                    || typeof(link.as) == 'undefined'
+                                    || typeof(link.as) != 'undefined'
+                                        && link.as != 'null'
+                                        && !link.isAvailable
+                                    || !link.as
+                                ) {
+                                    // ignoring
+                                    continue;
+                                }
+
+                                links += '<'+ l +'>; as='+ link.as +'; '
+                                if ( link.imagesrcset) {
+                                    links += 'imagesrcset='+ link.imagesrcset +'; ';
+                                }
+                                if ( link.imagesizes) {
+                                    links += 'imagesizes='+ link.imagesizes +'; ';
+                                }
+                                links += 'rel=preload,'
+
+                            }
+                            if ( /\,$/.test(links) ) {
+                                links = links.substring(0, links.length-1);
+                            }
+                            local.res.setHeader('link', links);
+                            links = null;
+                        }
+
                         assets = null;
 
                     } catch (err) {
@@ -1425,7 +1612,6 @@ function SuperController(options) {
                 }
             }
 
-
             // Internet Explorer override
             if ( /msie/i.test(request.headers['user-agent']) ) {
                 response.setHeader('content-type', 'text/plain' + '; charset='+ local.options.conf.encoding)
@@ -1433,58 +1619,57 @@ 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);
+            console.info(request.method +' ['+ response.statusCode +'] '+ request.url);
 
 
-                if ( local.options.isXMLRequest && self.isWithCredentials() )  {
+            if ( local.options.isXMLRequest && self.isWithCredentials() )  {
 
-                    // 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 ( 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 ) {
+                        next()
+                    }
+
+                    freeMemory([jsonObj, data, request, response, next]);
+                }, 200);
+
+                // force completion
+                return
+            }
+            // 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()
-                }
+            }
+            if ( next ) {
+                return next()
+            }
 
-                freeMemory([jsonObj, data, request, response, next]);
+            freeMemory([jsonObj, data, request, response, next]);
+
+            return;
 
-                return;
-            // }
         } catch (err) {
             return self.throwError(response, 500, err);
         }
@@ -1577,7 +1762,7 @@ function SuperController(options) {
 
                 ++_count;
                 if (k == len-1) {
-                    str = str.substr(0, str.length-1);
+                    str = str.substring(0, str.length-1);
                     str += "\"_content_\"";
                     for (let c = 0; c<_count; ++c) {
                         str += "}"
@@ -1619,22 +1804,35 @@ function SuperController(options) {
         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 ) {
+        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);
 
-        var cssStr = '', jsStr = '';
-
+        var cssStr      = ''
+            , jsStr     = ''
+        ;
         //Get css
         if( viewConf.stylesheets ) {
-            cssStr  = getNodeRes('css', viewConf.stylesheets, useWebroot, reURL)
+            // 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)
+            // 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;
         }
 
         set('page.view.stylesheets', cssStr);
@@ -1651,7 +1849,8 @@ function SuperController(options) {
      * @param {string} type
      * @param {string} resStr
      * @param {array} resArr
-     * @param {object} resObj
+     * @param {boolean} useWebroot
+     * @param {object} reURL - RegExp for webroot
      *
      * @returns {object} content
      *
@@ -1663,29 +1862,69 @@ function SuperController(options) {
             , 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.server.port
+                    ? 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;
+
+        if (isSpecialCase) {
+            hostname = local.options.conf.hostname
+        }
+
+
+        if (
+            isProxyHost
+            && !isSpecialCase
+        ) {
+
+            hostname    = scheme + '://'+ (local.req.headers.host||local.req.headers[':host']||process.gina.PROXY_HOST);
+
+            if (
+                !/^(80|443)$/.test(requestPort)
+                && !new RegExp(requestPort+'$').test(hostname)
+            ) {
+                hostname += ':'+ requestPort;
+            }
+        }
+
         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);
+                        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;
                     }
 
-                    if (obj.media)
+                    if (obj.media) {
                         str += '\n\t\t<link href="'+ obj.url +'" media="'+ obj.media +'" rel="'+ obj.rel +'" type="'+ obj.type +'">';
-                    else
+                    } else {
                         str += '\n\t\t<link href="'+ obj.url +'" rel="'+ obj.rel +'" type="'+ obj.type +'">';
+                    }
                 }
                 break;
 
@@ -1695,13 +1934,34 @@ function SuperController(options) {
                 for (; r < rLen; ++r) {
                     obj = resArr[r];
                     if (useWebroot && !reURL.test(obj.url) ) {
-                        obj.url = local.options.conf.server.webroot + obj.url.substr(1);
+                        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;
                     }
-                    str += '\n\t\t<script'+ deferMode +' type="'+ obj.type +'" src="'+ obj.url +'"></script>'
+
+
+                    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) +' .');
+                    }
+                    // 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>');
+                    }
+                    else {
+                        // normal case
+                        str += '\n\t\t<script'+ deferMode +' type="'+ obj.type +'" src="'+ obj.url +'"></script>';
+                    }
                 }
                 break;
         }
@@ -1797,7 +2057,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 +2155,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 +2178,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 +2275,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 +2359,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;
                 }
@@ -2326,7 +2607,7 @@ 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'));
@@ -2344,7 +2625,7 @@ function SuperController(options) {
         //defining port
         var port = url.match(/\:\d+\//) || null;
         if ( port != null ) {
-            port = port[0].substr(1, port[0].length-2);
+            port = port[0].substring(1, port[0].length-2);
             requestOptions.port = ~~port;
         }
 
@@ -2376,7 +2657,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)
         ;
@@ -2659,7 +2940,8 @@ function SuperController(options) {
         ) {
             return false
         }
-        self.isProcessingError = false; // by default
+        // by default
+        self.isProcessingError = false;
 
         var queryData           = {}
             , defaultOptions    = local.query.options
@@ -2669,14 +2951,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 +3027,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 +3054,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 +3072,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 +3097,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 +3325,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 +3334,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 +3398,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 +3492,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 +3569,8 @@ function SuperController(options) {
         delete options.queryData;
 
 
-
         const client = browser.connect(options.hostname, options);
 
-
         const {
             HTTP2_HEADER_PROTOCOL,
             HTTP2_HEADER_SCHEME,
@@ -3127,6 +3593,29 @@ function SuperController(options) {
             options.headers['content-type'] = local.req.headers['content-type']
         }
 
+        // 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'];
+            if ( xForwardedFor.split(", ").length > 1) {
+                console.debug('[ CONTROLLER ][ HTTP/2.0#query ] found more than one proxy !');
+                // keeping only the last in list
+                // xForwardedFor = xForwardedFor.split(', ').pop();
+                xForwardedFor += ", "+local.req.headers['x-real-ip'];
+                options.headers['x-forwarded-for'] = xForwardedFor;
+            }
+            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 +3623,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 +3647,7 @@ function SuperController(options) {
         }
 
 
+
         client.on('error', (error) => {
 
             console.error( '`'+ options[':path']+ '` : '+ error.stack||error.message);
@@ -3289,7 +3783,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 +3861,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 +3996,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 +4054,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;
     }
 
     /**
@@ -4002,7 +4500,7 @@ function SuperController(options) {
                 //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 +4726,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 +4804,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 +4887,7 @@ function SuperController(options) {
                 return next();
         }
 
-        if ( /http\/2/.test(protocol) ) {
+        if ( stream && /http\/2/.test(protocol) ) {
             return stream.end();
         }