gina 0.1.6-alpha.3 → 0.1.6-alpha.31

package/framework/v0.1.6-alpha.31/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js

@@ -0,0 +1,7 @@
+window.originalContext=window.jQuery;window.ginaToolbar=null;
+window.onGinaLoaded=function(b){if(!b)return!1;if(b.isFrameworkLoaded)return!0;var f=b.config={bundle:'{{ page.environment.bundle }}',env:'{{ page.environment.env }}',envIsDev:/^true$/.test('{{ page.environment.envIsDev }}')?!0:!1,scope:'{{ page.environment.scope }}',scopeIsLocal:/^true$/.test('{{ page.environment.scopeIsLocal }}')?!0:!1,scopeIsProduction:/^true$/.test('{{ page.environment.scopeIsProduction }}')?!0:!1,isProxyHost:/^true$/.test('{{ page.environment.isProxyHost }}')?!0:!1,hostname:'{{ page.environment.hostname }}',
+routing:JSON.parse(decodeURIComponent('{{ page.environment.routing }}')),reverseRouting:JSON.parse(decodeURIComponent('{{ page.environment.reverseRouting }}')),version:'{{ page.environment.version }}',webroot:'{{ page.environment.webroot }}',protocol:'{{ page.environment.protocol }}'};b.session={id:'{{ page.data.session.id }}',originalTimeout:'{{ page.data.session.timeout }}',createdAt:'{{ page.data.session.createdAt }}',lastModified:'{{ page.data.session.lastModified }}',expiresAt:null};b.session.__defineGetter__('timeout',
+function(){if(this.lastModified){this.lastModified&&'string'==typeof this.lastModified&&(this.lastModified=new Date(this.lastModified));this.createdAt&&'string'==typeof this.createdAt&&(this.createdAt=new Date(this.createdAt));this.originalTimeout&&'string'==typeof this.originalTimeout&&(this.originalTimeout=parseInt(this.originalTimeout));this.expiresAt=new Date((new Date(this.lastModified)).getTime()+this.originalTimeout);var c=this.expiresAt-new Date}else c=null;return c});b.session.timeout;b.config.getRouting=
+function(c){if('undefined'==typeof c)return b.config.routing;var g={},k=b.config.routing;c=new RegExp('\\@'+c+String.fromCharCode(36));for(var h in k)c.test(h)&&(g[h]=k[h]);return 0<g.count()?g:null};window.GINA_ENV='{{ page.environment.env }}';window.GINA_ENV_IS_DEV=/^true$/i.test('{{ page.environment.envIsDev }}')?!0:!1;if('undefined'!=typeof location.search&&/debug=/i.test(location.search)||!location.search&&/\?/.test(location.href)){var a=(' '+location.search).slice(1);!a&&/\?/.test(location.href)&&
+(a=location.href.match(/\?.*/),Array.isArray(a)&&0<a.length&&(a=a[0]));(a=a.match(/debug=(true|false)/))&&(window.GINA_ENV_IS_DEV=b.config.envIsDev=/^true$/i.test(a[0].split(/=/)[1])?!0:!1);a=a=null}b.isFrameworkLoaded=!0;b.setOptions(f);try{b.forms=JSON.parse(decodeURIComponent('{{ page.environment.forms }}'))}catch(c){throw c;}a=null;a=document.head.getElementsByTagName('link');for(var d=0,e=a.length,l=!1,m=RegExp('css/vendor/gina/gina.min.css');d<e;++d)if(m.test(a[d].href)){l=!0;break}m=e=d=a=
+null;l||(a=document.createElement('link'),a.href=f.webroot+'css/vendor/gina/gina.min.css',a.media='screen',a.rel='stylesheet',a.type='text/css',d=document.getElementsByTagName('head')[0],(e=d.getElementsByTagName('link'))&&'undefined'!=typeof e.length&&0<e.length?(console.debug('placed before'),d.insertBefore(a,e[0])):(console.debug('placed after'),d.appendChild(a)),d=e=null);/^true$/i.test(f.envIsDev)&&(f=window.require('gina/toolbar'),window.ginaToolbar=new f);return!0};

package/framework/v0.1.6-alpha.31/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js.map

@@ -0,0 +1,8 @@
+{
+"version":3,
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.31/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"lineCount":7,
+"mappings":"AAeAA,MAAA,CAAA,eAAA,CAA8BA,MAAA,CAAA,MAC9BA,OAAA,CAAA,WAAA,CAA8B,IAE9BA;MAAA,CAAA,YAAA,CAA8B,QAAQ,CAACC,CAAD,CAAO,CAEzC,GAAI,CAACA,CAAL,CAEI,MAAO,CAAA,CAGX,IAAKA,CAAA,CAAA,iBAAL,CACI,MAAO,CAAA,CAGX,KAAIC,EAAUD,CAAA,CAAA,MAAVC,CAA2B,CAE3B,OAAU,+BAFiB,CAI3B,IAAY,4BAJe,CAM3B,SAAe,QAASC,CAAAA,IAAT,CAAc,iCAAd,CAAF,CAAuD,CAAA,CAAvD,CAA8D,CAAA,CANhD,CAQ3B,MAAc,8BARa,CAU3B,aAAmB,QAASA,CAAAA,IAAT,CAAc,qCAAd,CAAF,CAA2D,CAAA,CAA3D,CAAkE,CAAA,CAVxD,CAY3B,kBAAwB,QAASA,CAAAA,IAAT,CAAc,0CAAd,CAAF,CAAgE,CAAA,CAAhE,CAAuE,CAAA,CAZlE,CAc3B,YAAkB,QAASA,CAAAA,IAAT,CAAc,oCAAd,CAAF,CAA0D,CAAA,CAA1D,CAAiE,CAAA,CAdtD,CAgB3B,SAAY,iCAhBe;AAkB3B,QAAWC,IAAKC,CAAAA,KAAL,CAAWC,kBAAA,CAAmB,gCAAnB,CAAX,CAlBgB,CAoB3B,eAAkBF,IAAKC,CAAAA,KAAL,CAAWC,kBAAA,CAAmB,uCAAnB,CAAX,CApBS,CAwB3BC,QAAU,gCAxBiB,CA0B3B,QAAY,gCA1Be,CA4B3B,SAAa,iCA5Bc,CAyD/BN,EAAA,CAAA,OAAA,CAAkB,CAEd,GAA0B,4BAFZ,CAId,gBAA0B,iCAJZ,CAMd,UAA0B,mCANZ,CAQd,aAA0B,sCARZ,CAUd,UAA0B,IAVZ,CAalBA,EAAA,CAAA,OAAgBO,CAAAA,gBAAhB,CAAiC,SAAjC;AAA4C,QAAS,EAAG,CA9BpD,GA+BkBC,IA/Bb,CAAA,YAAL,CAAA,CA+BkBA,IA5Bb,CAAA,YAAL,EAA+D,QAA/D,EAA8B,MA4BZA,KA5BmB,CAAA,YAArC,GA4BkBA,IA3Bd,CAAA,YADJ,CAC4B,IAAIC,IAAJ,CA2BVD,IA3BmB,CAAA,YAAT,CAD5B,CA4BkBA,KAzBb,CAAA,SAAL,EAAyD,QAAzD,EAA2B,MAyBTA,KAzBgB,CAAA,SAAlC,GAyBkBA,IAxBd,CAAA,SADJ,CACyB,IAAIC,IAAJ,CAwBPD,IAxBgB,CAAA,SAAT,CADzB,CAyBkBA,KAtBb,CAAA,eAAL,EAAqE,QAArE,EAAiC,MAsBfA,KAtBsB,CAAA,eAAxC,GAsBkBA,IArBd,CAAA,eADJ,CAC+BE,QAAA,CAqBbF,IArBsB,CAAA,eAAT,CAD/B,CAsBkBA,KAnBlB,CAAA,SAAA,CAAqB,IAAIC,IAAJ,CAAyCE,CAAhC,IAAIF,IAAJ,CAmBZD,IAnBqB,CAAA,YAAT,CAAgCG,EAAAA,OAAhC,EAAT,CAmBHH,IAnBwD,CAAA,eAArD,CAErB,KAAA,EAiBkBA,IAjBX,CAAA,SAAP,CAA4B,IAAIC,IAdhC,CAAA,IACI,EAAA,CAAO,IA8BX,OAAO,EAD6C,CAAxD,CAIAT,EAAA,CAAA,OAAgBY,CAAAA,OAWhBZ,EAAA,CAAA,MAAA,CAAA,UAAA;AAA+B,QAAQ,CAACa,CAAD,CAAS,CAE5C,GAAuB,WAAvB,EAAK,MAAOA,EAAZ,CACI,MAAOb,EAAA,CAAA,MAAA,CAAA,OAGX,KAAIc,EAAc,EAAlB,CACIC,EAAcf,CAAA,CAAA,MAAA,CAAA,OACdgB,EAAAA,CAAK,IAAIC,MAAJ,CAAW,KAAX,CAAmBJ,CAAnB,CAA4BK,MAAOC,CAAAA,YAAP,CAAoB,EAApB,CAA5B,CAGT,KAAKC,IAAIA,CAAT,GAAkBL,EAAlB,CACSC,CAAGd,CAAAA,IAAH,CAAQkB,CAAR,CAAL,GACIN,CAAA,CAAOM,CAAP,CADJ,CACoBL,CAAA,CAAQK,CAAR,CADpB,CAKJ,OAA4B,EAArB,CAACN,CAAA,CAAA,KAAA,EAAD,CAA0BA,CAA1B,CAAmC,IAjBE,CAqBhDf,OAAA,CAAA,QAAA,CAAkC,4BAClCA,OAAA,CAAA,eAAA,CAAkC,SAAUG,CAAAA,IAAV,CAAe,iCAAf,CAAA,CAAoD,CAAA,CAApD,CAA0D,CAAA,CAC5F,IAC+B,WAD/B,EACI,MAAOmB,SAASC,CAAAA,MADpB,EAC8C,SAAWpB,CAAAA,IAAX,CAAgBmB,QAASC,CAAAA,MAAzB,CAD9C,EAGI,CAACD,QAASC,CAAAA,MAHd,EAGwB,IAAKpB,CAAAA,IAAL,CAAUmB,QAASE,CAAAA,IAAnB,CAHxB,CAIE,CAEE,IAAID,EAAiCE,CAAvB,GAAuBA,CAAjBH,QAASC,CAAAA,MAAQE,EAAAA,KAAxB,CAA8B,CAA9B,CACT,EAACF,CAAL,EAAe,IAAKpB,CAAAA,IAAL,CAAUmB,QAASE,CAAAA,IAAnB,CAAf;CACID,CACA,CADSD,QAASE,CAAAA,IAAKE,CAAAA,KAAd,CAAoB,MAApB,CACT,CAAIC,KAAMC,CAAAA,OAAN,CAAcL,CAAd,CAAJ,EAA6C,CAA7C,CAA6BA,CAAOM,CAAAA,MAApC,GACIN,CADJ,CACaA,CAAA,CAAO,CAAP,CADb,CAFJ,CAOA,EADIO,CACJ,CADcP,CAAOG,CAAAA,KAAP,CAAa,oBAAb,CACd,IACI1B,MAAA,CAAA,eADJ,CACgCC,CAAA,CAAA,MAAA,CAAA,QADhC,CAC+D,SAAUE,CAAAA,IAAV,CAAe2B,CAAA,CAAQ,CAAR,CAAWC,CAAAA,KAAX,CAAiB,GAAjB,CAAA,CAAuB,CAAvB,CAAf,CAAF,CAAgD,CAAA,CAAhD,CAAsD,CAAA,CADnH,CAIAR,EAAA,CADAO,CACA,CADU,IAbZ,CAiBF7B,CAAA,CAAA,iBAAA,CAAkC,CAAA,CAClCA,EAAA,CAAA,UAAA,CAAmBC,CAAnB,CAEA,IAAI,CACAD,CAAA,CAAA,KAAA,CAA8BG,IAAKC,CAAAA,KAAL,CAAWC,kBAAA,CAAmB,8BAAnB,CAAX,CAD9B,CAEF,MAAO0B,CAAP,CAAY,CACV,KAAMA,EAAN,CADU,CAMVC,CAAAA,CAAc,IAKdC,EAAAA,CAAcC,QAASC,CAAAA,IAAKC,CAAAA,oBAAd,CAAmC,MAAnC,CAOlB,KAnKyC,IA6JnCC,EAAY,CA7JuB,CA8JnCC,EAAYL,CAAML,CAAAA,MA9JiB,CA+JnCW,EAAY,CAAA,CA/JuB,CAgKnCvB,EAAgBC,MAAJ,CARAuB,8BAQA,CAGlB,CAAOH,CAAP,CAAWC,CAAX,CAAgB,EAAED,CAAlB,CACI,GAAKrB,CAAGd,CAAAA,IAAH,CAAQ+B,CAAA,CAAMI,CAAN,CAASd,CAAAA,IAAjB,CAAL,CAA8B,CAC1BgB,CAAA,CAAQ,CAAA,CACR,MAF0B,CAQlCvB,CAAA,CADAsB,CACA,CAFAD,CAEA,CAHAJ,CAGA;AAHU,IAKLM,EAAL,GACIP,CAsBA,CAtBkBE,QAASO,CAAAA,aAAT,CAAuB,MAAvB,CAsBlB,CArBAT,CAAKT,CAAAA,IAqBL,CArBkBtB,CAAA,CAAA,OAqBlB,CA7CcuC,8BA6Cd,CApBAR,CAAKU,CAAAA,KAoBL,CApBkB,QAoBlB,CAnBAV,CAAKW,CAAAA,GAmBL,CAnBkB,YAmBlB,CAlBAX,CAAKY,CAAAA,IAkBL,CAlBkB,UAkBlB,CAfIC,CAeJ,CAfcX,QAASE,CAAAA,oBAAT,CAA8B,MAA9B,CAAA,CAAsC,CAAtC,CAed,CAbA,CADIU,CACJ,CADoBD,CAAQT,CAAAA,oBAAR,CAA6B,MAA7B,CACpB,GAEuC,WAFvC,EAEO,MAAOU,EAAclB,CAAAA,MAF5B,EAG8B,CAH9B,CAGOkB,CAAclB,CAAAA,MAHrB,EAMImB,OAAQC,CAAAA,KAAR,CAAc,eAAd,CACA,CAAAH,CAAQI,CAAAA,YAAR,CAAqBjB,CAArB,CAA2Bc,CAAA,CAAc,CAAd,CAA3B,CAPJ,GASIC,OAAQC,CAAAA,KAAR,CAAc,cAAd,CACA,CAAAH,CAAQK,CAAAA,WAAR,CAAoBlB,CAApB,CAVJ,CAaA,CAAAa,CAAA,CADAC,CACA,CADgB,IAtBpB,CA2BK,UAAU5C,CAAAA,IAAV,CAAeD,CAAA,CAAA,QAAf,CAAL,GACQkD,CACJ,CAD0BpD,MAAA,CAAA,OAAA,CAAkB,cAAlB,CAC1B,CAAAA,MAAA,CAAA,WAAA,CAA0B,IAAIoD,CAFlC,CAKA,OAAO,CAAA,CA9MkC;",
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.31/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.3 → v0.1.6-alpha.31}/core/config.js

@@ -72,6 +72,7 @@ function Config(opt, contextResetNeeded) {
      * */
     var init =  function(opt, contextResetNeeded) {
 
+
         if ( !Config.initialized) {
             var env     = opt.env;
             var scope   = opt.scope;
@@ -395,7 +396,10 @@ function Config(opt, contextResetNeeded) {
                     var protocol    = self.envConf[self.startingApp][env].content.settings.server.protocol || self.envConf[self.startingApp][env].server.protocol;
                     var scheme      = self.envConf[self.startingApp][env].content.settings.server.scheme || self.envConf[self.startingApp][env].server.scheme;
 
-                    self.envConf[self.startingApp][env].hostname = scheme + '://' + self.envConf[self.startingApp][env].host + ':' + self.envConf[self.startingApp][env].server.port;
+                    var hostname    = scheme + '://' + self.envConf[self.startingApp][env].host + ':' + self.envConf[self.startingApp][env].server.port;
+                    var isProxyHost = getContext('isProxyHost');
+
+                    self.envConf[self.startingApp][env].hostname = hostname;
 
                     self.envConf[bundle][env].hostname = self.envConf[self.startingApp][env].hostname;
                     self.envConf[bundle][env].content.routing = self.envConf[self.startingApp][env].content.routing;
@@ -910,7 +914,25 @@ function Config(opt, contextResetNeeded) {
                 // Variables replace. Compare with gina/core/template/conf/env.json.
                 // Defining root domain (TLD or SLD)
                 // by default
+                // var hostFQDN = await domainLib.getFQDN() || os.hostname();
+                // console.debug('[CONFIG]['+ app +'][loadWithTemplate][FQDN] Setting Host FQDN from `'+ newContent[app][env].host +'` => `'+ self.hostFQDN);
                 var rootDomain = domainLib.getRootDomain(os.hostname()).value;
+                // if (
+                //     typeof(newContent[app][env].host) != 'undefined'
+                //     && self.startingApp == app
+                //     && new RegExp('^'+ app + '-').test(newContent[app][env].host)
+                //     && newContent[app][env].host != hostFQDN
+                // ) {
+                //     console.debug('[CONFIG]['+ app +'][loadWithTemplate] Auto HOST MODE ON: retrieving current host FQDN.');
+                //     // Get fqdn (equivalent of `hostname --fqdn` command line)
+                //     try {
+                //         newContent[app][env].host = hostFQDN;
+                //         console.info('[CONFIG]['+ app +'][loadWithTemplate][FQDN] Host set as `'+ self.hostFQDN +'`');
+                //     } catch (fqdnErr) {
+                //         console.emerg('[CONFIG]['+ app +'][loadWithTemplate][FQDN] Check you `/etc/hosts` or check your hostname by running `hostname --fqdn` \n\r'+ fqdnErr.stack);
+                //         process.exit(1)
+                //     }
+                // }
                 // if overrided by the project `manifest.json`: meaning all bundles belong to the same TLD or SLD
                 if ( typeof(manifest.rootDomain) != 'undefined' ) {
                     rootDomain = manifest.rootDomain;
@@ -924,6 +946,9 @@ function Config(opt, contextResetNeeded) {
                     rootDomain = domainLib.getRootDomain(newContent[app][env].host).value;
                 }
                 newContent[app][env].rootDomain = rootDomain;
+                if ( /^true$/i.test( getContext('isProxyHost') ) ) {
+                    newContent[app][env].rootDomain = rootDomain = domainLib.getRootDomain(process.gina.PROXY_HOST).value;
+                }
 
                 let reps = {
                     "frameworkDir"          : getEnvVar('GINA_FRAMEWORK_DIR'),
@@ -1662,6 +1687,10 @@ function Config(opt, contextResetNeeded) {
             ) {
                 routing[rule].host      = conf[routing[rule].bundle][env].host
                 routing[rule].hostname  = conf[routing[rule].bundle][env].server.scheme +'://'+ routing[rule].host +':'+ conf[routing[rule].bundle][env].port[conf[routing[rule].bundle][env].server.protocol][conf[routing[rule].bundle][env].server.scheme];
+                if ( /^true$/i.test( getContext('isProxyHost') ) ) {
+                    routing[rule].host = process.gina.PROXY_HOST
+                    routing[rule].hostname = process.gina.PROXY_HOSTNAME
+                }
                 // default webroot
                 routing[rule].webroot   = localWroot;
             }
@@ -2371,7 +2400,7 @@ function Config(opt, contextResetNeeded) {
         conf[bundle][env].env       = env;
         conf[bundle][env].scope     = scope;
 
-        // this setting is replace on http requests by the value extracted form the request header
+        // this setting is replaced on http requests by the value extracted form the request header
         if (
             typeof(conf[bundle][env].content.settings) != 'undefined'
             && typeof(conf[bundle][env].content.settings.server) != 'undefined'
@@ -2395,7 +2424,10 @@ function Config(opt, contextResetNeeded) {
         conf[bundle][env].server.supportedRequestMethods = conf[bundle][env].content.settings.server.supportedRequestMethods;
         conf[bundle][env].hostname = scheme + '://' + conf[bundle][env].host + ':' + conf[bundle][env].server.port;
 
-
+        if ( /^true$/i.test( getContext('isProxyHost') ) ) {
+            conf[bundle][env].host = process.gina.PROXY_HOST
+            conf[bundle][env].hostname = process.gina.PROXY_HOSTNAME
+        }
         self.envConf[bundle][env] = conf[bundle][env];
 
         ++b;

package/framework/{v0.1.6-alpha.3 → v0.1.6-alpha.31}/core/controller/controller.js

@@ -25,6 +25,8 @@ var inherits        = lib.inherits;
 var console         = lib.logger;
 var Collection      = lib.Collection;
 var routingLib      = lib.routing;
+var Domain          = lib.Domain;
+var domainLib       = new Domain();
 var swig            = require('swig');
 // Swig 2
 // var swig            = require('./../deps/swig-client/swig-2.0.0.min.js');
@@ -343,8 +345,110 @@ 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 isProxyHost = getContext('isProxyHost') || false;
+            set('page.environment.isProxyHost', isProxyHost);
+            var _config = ctx.config.envConf[options.conf.bundle][process.env.NODE_ENV];
+            // by default
+            var hostname    = _config.hostname + _config.server.webroot;
+            var scheme      = hostname.match(/^(https|http)/)[0];
+            var requestPort = (local.req.headers.port||local.req.headers[':port']);
+
+            var hostPort = hostname.match(/(\:d+\/|\:\d+)$/);
+            hostPort = (hostPort) ? ~~(hostPort[0].replace(/\:/g, '')) : _config.port[_config.server.protocol][_config.server.scheme];
+            // Linking bundle B from bundle A wihtout proxy
+            var isSpecialCase = (
+                    getContext('bundle') != _config.bundle
+                    && requestPort != hostPort
+                    && local.req.headers[':host'] != process.gina.PROXY_HOST
+            ) ? true : false;
+
+            if (isSpecialCase) {
+                hostname = _config.hostname;
+            }
+
+            if (
+                isProxyHost
+                && !isSpecialCase
+            ) {
+                // Rewrite hostname vs req.headers.host
+                hostname    = scheme + '://'+ (local.req.headers.host||local.req.headers[':host']);
+
+                if (
+                    !/^(80|443)$/.test(requestPort)
+                    && !new RegExp(requestPort+'$').test(hostname)
+                ) {
+                    hostname += ':'+ requestPort;
+                }
+            }
+
+            set('page.environment.hostname', hostname);
+            // Updating _config.rootDomain - 2024/04/15
+            // _config.rootDomain = domainLib.getRootDomain(hostname).value;
+
+
+            set('page.environment.rootDomain', _config.rootDomain);
+            set('page.environment.webroot', options.conf.server.webroot);
+
+            if ( typeof(ctx.config.envConf._isRoutingUpdateNeeded) == 'undefined') {
+                ctx.config.envConf._isRoutingUpdateNeeded = false;
+            }
+
+            if (
+                typeof(ctx.config.envConf._proxyHostname) == 'undefined'
+                ||
+                hostname != ctx.config.envConf._proxyHostname
+            ) {
+                ctx.config.envConf._proxyHostname = (isProxyHost) ? hostname : null;
+                ctx.config.envConf._isRoutingUpdateNeeded = true;
+            }
+
+            if ( typeof(ctx.config.envConf._routingCloned) == 'undefined' ) {
+                ctx.config.envConf._routingCloned = JSON.clone(ctx.config.envConf.routing);
+            }
+
+            var routing = local.options.conf.routing = ctx.config.envConf._routingCloned; // all routes
+            if ( /^true$/i.test(ctx.config.envConf._isRoutingUpdateNeeded) ) {
+
+                for (let r in ctx.config.envConf.routing) {
+                    if ( isProxyHost ) {
+                        local.options.conf.routing[r].host = hostname.replace(/^(https|http)\:\/\//, '');
+                        local.options.conf.routing[r].hostname = hostname;
+                        let scheme = hostname.match(/^(https|http)/)[0];
+                        local.options.conf.routing[r].hostname    = scheme + '://'+ (local.req.headers.host||local.req.headers[':host']);
+                        let requestPort = (local.req.headers.port||local.req.headers[':port']);
+                        if (
+                            !/^(80|443)$/.test(requestPort)
+                            && !new RegExp(requestPort+'$').test(local.options.conf.routing[r].hostname)
+                        ) {
+                            local.options.conf.routing[r].hostname += ':'+ requestPort
+                        }
+                        continue;
+                    }
+                    local.options.conf.routing[r].host = ctx.config.envConf.routing[r].host;
+                    local.options.conf.routing[r].hostname = ctx.config.envConf.routing[r].hostname;
+                }
+                ctx.config.envConf._isRoutingUpdateNeeded = false;
 
-            var routing = local.options.conf.routing = ctx.config.envConf.routing; // all routes
+            }
             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 +458,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);
@@ -437,11 +540,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;
@@ -839,12 +937,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),
@@ -1619,7 +1733,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;
@@ -1663,13 +1781,45 @@ 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) {
@@ -1895,9 +2045,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;
@@ -2015,8 +2165,37 @@ 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 hostname = (isProxyHost)
+                    ? process.gina.PROXY_HOSTNAME
+                    : ctx.config.envConf[bundle][env].hostname;
+
+            // var hostname = (isProxyHost)
+            //         ? ctx.config.envConf._proxyHostname
+            //         : ctx.config.envConf[bundle][env].hostname;
+
 
             // if ( !/\:\d+$/.test(req.headers.host) )
             //     hostname = hostname.replace(/\:\d+$/, '');
@@ -2078,7 +2257,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;
                 }
@@ -2750,9 +2929,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)) {
@@ -2785,6 +2965,7 @@ 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;
@@ -2797,6 +2978,14 @@ function SuperController(options) {
                 options.ca = ctx.gina.config.envConf[bundle][ctx.env].server.credentials.ca;
             }
 
+            // if (
+            //     /^true$/i.test(isProxyHost)
+            //     && typeof(options.hostname) != 'undefined'
+            // ) {
+            //     options.hostname    = process.gina.PROXY_HOSTNAME;
+            //     options.host        = process.gina.PROXY_HOST;
+            //     options.port        = process.gina.PROXY_PORT;
+            // }
             // 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;
@@ -3560,24 +3749,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;
     }
 
     /**

package/framework/{v0.1.6-alpha.3 → v0.1.6-alpha.31}/core/gna.js

@@ -212,10 +212,58 @@ gna.env = process.env.NODE_ENV = env;
 gna.scope = process.env.NODE_SCOPE = scope;
 gna.os.isWin32 = process.env.isWin32 = isWin32;
 gna.isAborting = false;
-//Cahceless is also defined in the main config : Config::isCacheless().
+//Cacheless is also defined in the main config : Config::isCacheless().
 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;
+// Proxy check
+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.gina.PROXY_HOSTNAME    = proxy.hostname;
+        gna.proxyHost       = process.gina.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.gina.PROXY_PORT        = parseInt(proxyPort);
+
+        var isProxyHost = (
+            typeof(process.gina.PROXY_HOSTNAME) != 'undefined'
+        ) ? true : false;
+        // Forcing context - also available for workers
+        setContext('isProxyHost', isProxyHost);
+    }
+}
 
 
 var bundlesPath = (isDev) ? projects[projectName]['path'] + '/src' : projects[projectName]['path'] + '/bundles';
@@ -463,7 +511,12 @@ gna.mount = process.mount = function(bundlesPath, source, target, type, callback
 
     // hack to test none-dev env without building: in case you did not build your bundle, but you have the src available
     if (!isSourceFound && !isDev) {
-        var srcPathObj = new _( root +'/'+ gna.project.bundles[gna.core.startingApp].src);
+        var srcPathObj = null;
+        try {
+            srcPathObj = new _( root +'/'+ gna.project.bundles[gna.core.startingApp].src);
+        } catch (buildError) {
+            return callback( new Error('Built not found for your selected scope !'));
+        }
         if ( srcPathObj.existsSync() ) {
             var d =(d = _(source).split(/\//g)).splice(0, d.length-1).join('/');
             var destinationObj = new _(d);
@@ -552,22 +605,20 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
 
                         joinContext(conf.contexts);
                         gna.getConfig = function(name){
-                            // var tmp = '';
+                            var tmp = null;
                             if ( typeof(name) != 'undefined' ) {
                                 try {
                                     //Protect it.
-                                    // tmp = JSON.stringify(conf.content[name]);
-                                    // return JSON.parse(tmp)
-                                    return JSON.clone(conf.content[name])
+                                    tmp = JSON.clone(conf.content[name])
                                 } catch (err) {
                                     console.error('[ FRAMEWORK ] ', err.stack);
                                     return undefined
                                 }
                             } else {
-                                // tmp = JSON.stringify(conf);
-                                // return JSON.parse(tmp)
-                                return JSON.clone(conf)
+                                //Protect it.
+                                tmp = JSON.clone(conf)
                             }
+                            return tmp
                         };
                         try {
                             //configureMiddleware(instance, express); // no, no and no...
@@ -871,6 +922,7 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
                                     if (
                                         conf.server.scheme == 'https'
                                         && !/^true$/i.test(process.env.NODE_SCOPE_IS_PRODUCTION)
+                                        && !/^true$/i.test(isProxyHost)
                                     ) {
                                         try {
                                             await server.verifyCertificate(conf.host, conf.server.port);

package/framework/{v0.1.6-alpha.3 → v0.1.6-alpha.31}/core/plugins/lib/validator/src/main.js

@@ -1276,6 +1276,13 @@
                             // } else { // external - need to remove `X-Requested-With` from `options.headers`
                                 result.location = (!/^http/.test(result.location) && !/^\//.test(result.location) ) ? location.protocol +'//' + result.location : result.location;
                             //}
+                            // isProxyHost ?
+                            if (
+                                result.location.replace(/^http(.*)\:\d+/, '$1').replace(/^\:\/\//, '').split(/\//g)[0] == gina.config.hostname
+                                && gina.config.hostname == window.location.host
+                            ) {
+                                result.location = location.protocol  + result.location.replace(/^http(.*)\:\d+/, '$1').replace(/^\:/, '')
+                            }
 
                             return setTimeout(() => {
                                 window.location.href = result.location;