gina 0.1.6-alpha.19 → 0.1.6-alpha.20

package/framework/{v0.1.6-alpha.19 → v0.1.6-alpha.20}/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js.map

@@ -1,8 +1,8 @@
 {
 "version":3,
-"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.19/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.20/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":7,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.19/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.20/core/asset/plugin/src/vendor/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","decodeURIComponent","version","__defineGetter__","_this","Date","parseInt","getTime","timeout","bundle","routes","routing","re","RegExp","String","fromCharCode","route","location","search","href","slice","match","Array","isArray","length","matched","split","err","link","links","document","head","getElementsByTagName","i","len","found","cssPath","createElement","media","rel","type","headEls","existingLinks","console","debug","insertBefore","appendChild","Toolbar"]
 }

package/framework/{v0.1.6-alpha.19 → v0.1.6-alpha.20}/core/controller/controller.js

@@ -343,40 +343,64 @@ function SuperController(options) {
             set('page.environment.scopeIsProduction', /^true$/i.test(process.env.NODE_SCOPE_IS_PRODUCTION) );
             set('page.environment.date.now', new Date().format("isoDateTime"));
 
-            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 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');
             set('page.environment.isProxyHost', isProxyHost);
+            var _config = ctx.config.envConf[options.conf.bundle][process.env.NODE_ENV];
             // by default
-            var hostname    = ctx.config.envConf[options.conf.bundle][process.env.NODE_ENV].hostname;
+            var hostname    = _config.hostname + _config.server.webroot;
             var scheme      = hostname.match(/^(https|http)/)[0];
-            if ( getContext('isProxyHost') ) {
+            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.env.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((local.req.headers.port||local.req.headers[':port'])) ) {
-                    hostname += ':'+ (local.req.headers.port||local.req.headers[':port'])
+
+                if (
+                    !/^(80|443)$/.test(requestPort)
+                    && !new RegExp(requestPort+'$').test(hostname)
+                ) {
+                    hostname += ':'+ requestPort;
                 }
                 // hostname = hostname.replace(/\:\d+$/, '');
             }
 
             set('page.environment.hostname', hostname);
-            set('page.environment.rootDomain', ctx.config.envConf[options.conf.bundle][process.env.NODE_ENV].rootDomain);
+            set('page.environment.rootDomain', _config.rootDomain);
             set('page.environment.webroot', options.conf.server.webroot);
 
             if ( typeof(ctx.config.envConf._isRoutingUpdateNeeded) == 'undefined') {
@@ -405,8 +429,12 @@ function SuperController(options) {
                         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']);
-                        if ( /!^(80|443)$/.test((local.req.headers.port||local.req.headers[':port'])) ) {
-                            local.options.conf.routing[r].hostname += ':'+ (local.req.headers.port||local.req.headers[':port'])
+                        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;
                     }
@@ -1698,7 +1726,11 @@ 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;
@@ -1749,19 +1781,64 @@ function SuperController(options) {
             , 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]
             // , hostname      = ( typeof(requestHost) != 'undefined' && local.options.conf.host != requestHost)
             //         ? local.options.conf.server.scheme +'://'+ requestHost + ':'+ local.options.conf.server.port
             //         : local.options.conf.hostname
         ;
-        if ( /!^(80|443)$/.test((local.req.headers.port||local.req.headers[':port'])) ) {
-            hostname += ':'+ (local.req.headers.port||local.req.headers[':port'])
+        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.env.PROXY_HOST
+        ) ? true : false;
+
+        if (isSpecialCase) {
+            hostname = local.options.conf.hostname
         }
 
-        if ( isProxyHost ) {
-            // hostname = hostname.replace(/\:\d+$/, '');
-            hostname += local.options.conf.server.webroot.replace(/\/$/g, '');
+
+        if (
+            isProxyHost
+            && !isSpecialCase
+        ) {
+
+            hostname    = scheme + '://'+ (local.req.headers.host||local.req.headers[':host']||process.env.PROXY_HOST);
+
+            if (
+                !/^(80|443)$/.test(requestPort)
+                && !new RegExp(requestPort+'$').test(hostname)
+            ) {
+                hostname += ':'+ requestPort;
+            }
+            // if (
+            //     !/^(80|443)$/.test(requestPort)
+            //     && !new RegExp(requestPort+'$').test(hostname)
+            // ) {
+            //     hostname += ':'+ requestPort
+            // }
+
+            // if ( isProxyHost ) {
+            //     // hostname = hostname.replace(/\:\d+$/, '');
+            //     hostname += local.options.conf.server.webroot.replace(/\/$/g, '');
+            // }
         }
 
+        // if (
+        //     !/^(80|443)$/.test(requestPort)
+        //     && !new RegExp(requestPort+'$').test(hostname)
+        // ) {
+        //     hostname += ':'+ requestPort
+        // }
+
+        // if ( isProxyHost ) {
+        //     // hostname = hostname.replace(/\:\d+$/, '');
+        //     hostname += local.options.conf.server.webroot.replace(/\/$/g, '');
+        // }
+
         switch(type){
             case 'css':
                 for (; r < rLen; ++r) {
@@ -2869,9 +2946,10 @@ function SuperController(options) {
             }
         }
 
-        var ctx         = getContext()
-            , protocol  = null
-            , scheme    = null
+        var ctx             = getContext()
+            , protocol      = null
+            , scheme        = null
+            , isProxyHost   = getContext('isProxyHost')
         ;
         // cleanup options.path
         if (/\:\/\//.test(options.path)) {
@@ -2904,9 +2982,14 @@ function SuperController(options) {
             var 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.host        = (isProxyHost) ? process.env.PROXY_HOST : ctx.gina.config.envConf[bundle][ctx.env].host.replace(/(.*)\:\/\//, '').replace(/\:\d+/, '');
+            options.hostname    = (isProxyHost) ? process.env.PROXY_HOSTNAME +':'+ parseInt(process.env.PROXY_PORT) : ctx.gina.config.envConf[bundle][ctx.env].hostname;
+            options.port        = (isProxyHost) ? parseInt(process.env.PROXY_PORT) : ctx.gina.config.envConf[bundle][ctx.env].server.port;
+
+            // 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.scheme      = ctx.gina.config.envConf[bundle][ctx.env].server.scheme;

package/framework/{v0.1.6-alpha.19 → v0.1.6-alpha.20}/core/gna.js

@@ -217,6 +217,48 @@ process.env.NODE_ENV_IS_DEV = (/^true$/i.test(isDev)) ? true : false;
 process.env.NODE_SCOPE_IS_LOCAL = (/^true$/i.test(isLocalScope)) ? true : false;
 process.env.NODE_SCOPE_IS_PRODUCTION = (/^true$/i.test(isProductionScope)) ? true : false;
 
+var proxyPathObj    = new _(projects[projectName].path + '/proxy.json', true);
+var proxy           = null;
+if ( proxyPathObj.existsSync() ) {
+    try {
+        var proxyColl   = requireJSON(proxyPathObj.toString());
+        proxy       = new lib.Collection(proxyColl).findOne({ scope: process.env.NODE_SCOPE, env: process.env.NODE_ENV });
+        proxyColl   = null;
+    } catch (proxyErr) {
+        console.error('[ FRAMEWORK ][ configurationError ] ', proxyErr.stack || proxyErr.message || proxyErr);
+    }
+
+    if (proxy) {
+        gna.proxyHostname   = process.env.PROXY_HOSTNAME    = proxy.hostname;
+        gna.proxyHost       = process.env.PROXY_HOST        = proxy.hostname
+                                                                    .replace(/^(https|http)\:\/\//g, '')
+                                                                    .replace(/\:\d+\/$|\:\d+$/, '')
+        ;
+        var proxyPort = gna.proxyHostname.match(/\:\d+\/$|\:\d+$/) || null;
+        if (proxyPort) {
+            proxyPort = parseInt(proxyPort[0].match(/\d+/));
+        } else {
+            var foundScheme = gna.proxyHostname.match(/^(https|http)\:\/\//g)[0].replace(/\:\/\//g, '');
+            switch (foundScheme) {
+                case 'https':
+                    proxyPort = 443;
+                    break;
+                case 'ftp':
+                    proxyPort = 21;
+                    break;
+                case 'sftp':
+                    proxyPort = 22;
+                    break;
+                default:
+                    proxyPort = 80;
+                    break;
+            }
+            foundScheme = null;
+        }
+        gna.proxyPort       = process.env.PROXY_PORT        = parseInt(proxyPort)
+    }
+}
+
 
 var bundlesPath = (isDev) ? projects[projectName]['path'] + '/src' : projects[projectName]['path'] + '/bundles';
 setPath('bundles', _(bundlesPath, true));

package/framework/{v0.1.6-alpha.19 → v0.1.6-alpha.20}/core/router.js

@@ -118,6 +118,114 @@ function Router(env, scope) {
         // }
         // return ;
 
+
+       var serverInstance   = self.getServerInstance();
+       var config               = null
+            , conf              = null
+            , bundle            = null
+            , env               = null
+            , scope             = null
+            , cacheless         = (/^true$/i.test(process.env.NODE_ENV_IS_DEV)) ? true : false
+       ;
+        try {
+            config      = new Config().getInstance();
+            if (!params.bundle) {
+                try {
+                    //params.bundle = config.bundle;
+                    //params.param = config.routing[config.reverseRouting[params.param.url]];
+                    var _rule = config.reverseRouting[params.param.url];
+                    params = merge(params, config.routing[_rule]);
+                    params.rule = _rule;
+                } catch(reverseRoutingError) {
+                    serverInstance.throwError(response, 500, reverseRoutingError);
+                    return;
+                }
+            }
+            bundle      = local.bundle = params.bundle;
+            env         = config.env;
+            scope       = config.scope;
+            conf        = config[bundle][env];
+        } catch (configErr) {
+            serverInstance.throwError(response, 500, new Error('syntax error(s) found in `'+ controllerFile +'` \nTrace: ') + (configErr.stack || configErr.message) );
+            return;
+        }
+
+        local.cacheless     = cacheless;
+        local.request       = request;
+        local.next          = next;
+        local.conf          = conf;
+        local.isStandalone  = conf.isStandalone;
+
+
+        /**
+         * Reverse proxy check
+         */
+        process.env.PROXY_REQUEST_HOST = request.headers.host || request.headers[':host'] || request.host;
+        var requestPort = request.headers.port || request.headers[':port'];
+        var isProxyHost = (
+            typeof(request.headers.host) != 'undefined'
+            && typeof(requestPort) != 'undefined'
+            &&  /^(80|443)$/.test(requestPort)
+            && conf.server.scheme +'://'+ request.headers.host +':'+ requestPort != conf.hostname.replace(/\:\d+$/, '') +':'+ conf.server.port
+            ||
+            typeof(request.headers[':authority']) != 'undefined'
+            && conf.server.scheme +'://'+ request.headers[':authority'] != conf.hostname
+            ||
+            typeof(request.headers.host) != 'undefined'
+            && typeof(requestPort) != 'undefined'
+            && /^(80|443)$/.test(requestPort)
+            && request.headers.host == conf.host
+            ||
+            typeof(request.headers['x-nginx-proxy']) != 'undefined'
+            && /^true$/i.test(request.headers['x-nginx-proxy'])
+        ) ? true : false;
+
+        if (
+            !isProxyHost
+            && typeof(process.env.PROXY_REQUEST_HOST) != 'undefined'
+            && process.env.PROXY_REQUEST_HOST === process.env.PROXY_HOST
+        ) {
+            isProxyHost = true;
+        }
+
+        setContext('isProxyHost', isProxyHost);
+
+        // var _config = ctx.config.envConf[conf.bundle][process.env.NODE_ENV];
+        // // by default
+        // var hostname    = _config.hostname + _config.server.webroot;
+        // var scheme      = hostname.match(/^(https|http)/)[0];
+        // requestPort = (request.headers.port||request.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
+        //         && request.headers[':host'] != process.env.PROXY_HOST
+        // ) ? true : false;
+
+        // if (isSpecialCase) {
+        //     hostname = _config.hostname;
+        // }
+
+        // if (
+        //     isProxyHost
+        //     && !isSpecialCase
+        // ) {
+        //     // rewrite hostname vs req.headers.host
+        //     hostname    = scheme + '://'+ (request.headers.host||request.headers[':host']);
+
+        //     if (
+        //         !/^(80|443)$/.test(requestPort)
+        //         && !new RegExp(requestPort+'$').test(hostname)
+        //     ) {
+        //         hostname += ':'+ requestPort;
+        //     }
+        // }
+
+
+
         /**
         * ExpressJS modules + HTTP2 fix
         * Hack required until `express-<plugin>` get support for http2 `express-session`
@@ -287,42 +395,6 @@ function Router(env, scope) {
         * EO Passport JS HTTP2 fix
         */
 
-       var serverInstance   = self.getServerInstance();
-       var config               = null
-            , conf              = null
-            , bundle            = null
-            , env               = null
-            , scope             = null
-            , cacheless         = (/^true$/i.test(process.env.NODE_ENV_IS_DEV)) ? true : false
-       ;
-        try {
-            config      = new Config().getInstance();
-            if (!params.bundle) {
-                try {
-                    //params.bundle = config.bundle;
-                    //params.param = config.routing[config.reverseRouting[params.param.url]];
-                    var _rule = config.reverseRouting[params.param.url];
-                    params = merge(params, config.routing[_rule]);
-                    params.rule = _rule;
-                } catch(reverseRoutingError) {
-                    serverInstance.throwError(response, 500, reverseRoutingError);
-                    return;
-                }
-            }
-            bundle      = local.bundle = params.bundle;
-            env         = config.env;
-            scope       = config.scope;
-            conf        = config[bundle][env];
-        } catch (configErr) {
-            serverInstance.throwError(response, 500, new Error('syntax error(s) found in `'+ controllerFile +'` \nTrace: ') + (configErr.stack || configErr.message) );
-            return;
-        }
-
-        local.cacheless     = cacheless;
-        local.request       = request;
-        local.next          = next;
-        local.conf          = conf;
-        local.isStandalone  = conf.isStandalone;
 
         if (cacheless) {
             refreshCoreDependencies();
@@ -419,10 +491,10 @@ function Router(env, scope) {
             rootPath        : conf.executionPath || null,
             executionPath   : conf.executionPath || null,
             //instance: self.serverInstance,
-            isUsingTemplate: local.isUsingTemplate,
-            cacheless: cacheless,
-            path: params.param.path || null, // user custom path : namespace should be ignored or left blank
-            assets: {}
+            isUsingTemplate : local.isUsingTemplate,
+            cacheless       : cacheless,
+            path            : params.param.path || null, // user custom path : namespace should be ignored or left blank
+            assets          : {}
         };
 
         if (routeHasViews) {

package/framework/{v0.1.6-alpha.19 → v0.1.6-alpha.20}/lib/routing/src/main.js

@@ -855,11 +855,31 @@ function Routing() {
             }
             config = window.gina.config;
         } else {
-            isProxyHost = getContext('isProxyHost');
+
             config = getContext('gina').config;
             if ( typeof(getContext('argvFilename')) != 'undefined' ) {
                 config.getRouting = getContext('gina').Config.instance.getRouting;
             }
+
+            isProxyHost = getContext('isProxyHost');
+            // Double check
+            if (
+                !isProxyHost
+                && typeof(process.env.PROXY_REQUEST_HOST) != 'undefined'
+                && process.env.PROXY_REQUEST_HOST === process.env.PROXY_HOST
+                ||
+                !isProxyHost
+                && typeof(process.env.PROXY_REQUEST_HOST) == 'undefined'
+                && typeof(process.env.PROXY_HOST) != 'undefined'
+            ) {
+                isProxyHost = true;
+            }
+            // isProxyHost = ( _isProxyHost && /^true$/i.test(_isProxyHost) ) ? true : (( typeof(process.env.PROXY_HOSTNAME) != 'undefined' ) ? true : false);
+
+
+
+
+
         }
 
         var env         = config.env || GINA_ENV  // by default, takes the current bundle
@@ -907,7 +927,7 @@ function Routing() {
         route.isProxyHost = isProxyHost;
         if (isProxyHost) {
             // route.hostname = route.hostname.replace(/\:\d+/, '');
-            route.hostname  = (isGFFCtx) ? window.location.protocol +'//'+ window.gina.config.hostname : config.envConf._proxyHostname;
+            route.hostname  = (isGFFCtx) ? window.location.protocol +'//'+ window.gina.config.hostname : config.envConf._proxyHostname || process.env.PROXY_HOSTNAME;
             route.host      = route.hostname.replace(/^(https|http)\:\/\//, '');
         }
 

package/framework/{v0.1.6-alpha.19 → v0.1.6-alpha.20}/lib/swig-filters/src/main.js

@@ -140,11 +140,12 @@ function SwigFilters(conf) {
         var config              = null
             , scheme            = null
             , hostname          = null
+            , requestPort       = null
             , wroot             = null
             , wrootRe           = null
             , isStandalone      = null
             , isMaster          = null
-            , isProxyHost       = ctx.isProxyHost
+            , isProxyHost       = ( ctx.isProxyHost && /^true$/i.test(ctx.isProxyHost) ) ? true : (( typeof(process.env.PROXY_HOSTNAME) != 'undefined' ) ? true : false)
             , routingRules      = null
             , rule              = null
             , url               = NaN
@@ -152,6 +153,13 @@ function SwigFilters(conf) {
             , method            = 'GET'
         ;
 
+        if (
+            typeof(process.env.PROXY_REQUEST_HOST) != 'undefined'
+            && process.env.PROXY_REQUEST_HOST === process.env.PROXY_HOST
+        ) {
+            isProxyHost = true;
+        }
+
         if (ctx.options.method != 'undefined') {
             method = ctx.options.method
         }
@@ -174,7 +182,9 @@ function SwigFilters(conf) {
             ) {
                 base = config.bundle = ctx.options.conf.bundle;
             }
-            route = route.toLowerCase();
+            // eg.: "/assets/img/common/header@2x.png"
+            // Added comment on 2024-02-23
+            // route = route.toLowerCase();
         }
 
         // setting default config
@@ -199,12 +209,35 @@ function SwigFilters(conf) {
 
                     // retrieve hostname, webroot & routingRules
                     hostname        = config.hostname + config.server.webroot;
+
                     scheme          = hostname.match(/^(https|http)/)[0];
+                    requestPort = (ctx.req.headers.port||ctx.req.headers[':port']||parseInt(process.env.PROXY_PORT));
+                    var hostPort = config.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
+                            && ctx.req.headers[':host'] != process.env.PROXY_HOST
+                    ) ? true : false;
+
+                    if (isSpecialCase) {
+                        hostname = config.hostname
+                    }
+
                     // rewrite hostname vs ctx.req.headers.host
-                    if ( isProxyHost ) {
-                        hostname    = scheme + '://'+ (ctx.req.headers.host||ctx.req.headers[':host']);
-                        if ( /!^(80|443)$/.test((ctx.req.headers.port||ctx.req.headers[':port'])) ) {
-                            hostname += ':'+ (ctx.req.headers.port||ctx.req.headers[':port'])
+                    if (
+                        isProxyHost
+                        && !isSpecialCase
+                    ) {
+
+                        hostname    = scheme + '://'+ (ctx.req.headers.host||ctx.req.headers[':host']||process.env.PROXY_HOST);
+
+                        if (
+                            !/^(80|443)$/.test(requestPort)
+                            && !new RegExp(requestPort+'$').test(hostname)
+                        ) {
+                            hostname += ':'+ requestPort;
                         }
                     }
 
@@ -228,8 +261,11 @@ function SwigFilters(conf) {
 
             if ( !wrootRe.test(route) ) {
                 route = config.server.webroot + route.substr(1);
-                hostname = hostname.replace(new RegExp( config.server.webroot +'$'), '')
-            } else {
+                hostname =   hostname.replace(new RegExp( config.server.webroot +'$'), '')
+            } else if (
+                config.server.webroot != '/'
+                && config.server.webroot != ''
+            ) {
                 route = route.substr(1)
             }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.6-alpha.19",
+  "version": "0.1.6-alpha.20",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -51,7 +51,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.6-alpha.19/core/gna",
+  "main": "./framework/v0.1.6-alpha.20/core/gna",
   "scripts": {
     "prepare": "node script/prepare_version.js",
     "postpublish": "node script/post_publish.js",

package/framework/v0.1.6-alpha.19/VERSION

@@ -1 +0,0 @@
-0.1.6-alpha.19

package/framework/v0.1.6-alpha.19/core/asset/plugin/dist/vendor/gina/css/gina.min.css.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.19/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}