gina 0.1.6-alpha.16 → 0.1.6-alpha.18

package/framework/{v0.1.6-alpha.16 → v0.1.6-alpha.18}/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.16/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.18/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,SAAY,iCAde,CAgB3B,QAAWC,IAAKC,CAAAA,KAAL,CAAWC,kBAAA,CAAmB,gCAAnB,CAAX,CAhBgB;AAkB3B,eAAkBF,IAAKC,CAAAA,KAAL,CAAWC,kBAAA,CAAmB,uCAAnB,CAAX,CAlBS,CAsB3BC,QAAU,gCAtBiB,CAwB3B,QAAY,gCAxBe,CA0B3B,SAAa,iCA1Bc,CAuD/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,CAA4C,QAAS,EAAG,CA9BpD,GA+BkBC,IA/Bb,CAAA,YAAL,CAAA,CA+BkBA,IA5Bb,CAAA,YAAL;AAA+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,CAA+B,QAAQ,CAACa,CAAD,CAAS,CAE5C,GAAuB,WAAvB,EAAK,MAAOA,EAAZ,CACI,MAAOb,EAAA,CAAA,MAAA,CAAA,OAGX;IAAIc,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,GACID,CACA,CADSD,QAASE,CAAAA,IAAKE,CAAAA,KAAd,CAAoB,MAApB,CACT,CAAIC,KAAMC,CAAAA,OAAN,CAAcL,CAAd,CAAJ,EAA6C,CAA7C,CAA6BA,CAAOM,CAAAA,MAApC;CACIN,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,KAjKyC,IA2JnCC,EAAY,CA3JuB,CA4JnCC,EAAYL,CAAML,CAAAA,MA5JiB,CA6JnCW,EAAY,CAAA,CA7JuB,CA8JnCvB,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,CAHU,IAKLM,EAAL,GACIP,CAsBA,CAtBkBE,QAASO,CAAAA,aAAT,CAAuB,MAAvB,CAsBlB,CArBAT,CAAKT,CAAAA,IAqBL,CArBkBtB,CAAA,CAAA,OAqBlB,CA7CcuC,8BA6Cd;AApBAR,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,CA5MkC;",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.16/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.18/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.16 → v0.1.6-alpha.18}/core/config.js

@@ -396,7 +396,8 @@ 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;
+                    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;
@@ -2390,7 +2391,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'

package/framework/{v0.1.6-alpha.16 → v0.1.6-alpha.18}/core/controller/controller.js

@@ -354,7 +354,39 @@ 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);
+            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);
+
+            // if ( !getContext('isProxyHost') ) {
+            //     setContext('isProxyHost', isProxyHost);
+            //     isProxyHost = null;
+            // }
+            var hostname = ctx.config.envConf[options.conf.bundle][process.env.NODE_ENV].hostname;
+            if ( getContext('isProxyHost') ) {
+                hostname = hostname.replace(/\:\d+$/, '');
+            }
+            // else {
+            //     hostname = hostname.replace(/\:\d+$/, '') +':'+ ctx.config.envConf[options.conf.bundle][process.env.NODE_ENV].server.port;
+            // }
+
+            set('page.environment.hostname', 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);
@@ -437,11 +469,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 +866,26 @@ 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'])
             ) ? true : false;
+
+
             // setup swig default filters
             var filters = SwigFilters({
                 options     : JSON.clone(localOptions),
@@ -1670,6 +1711,11 @@ function SuperController(options) {
                     ? local.options.conf.server.scheme +'://'+ requestHost + ':'+ local.options.conf.server.port
                     : local.options.conf.hostname
         ;
+
+        if ( getContext('isProxyHost') ) {
+            hostname = hostname.replace(/\:\d+$/, '');
+        }
+
         switch(type){
             case 'css':
                 for (; r < rLen; ++r) {
@@ -2015,8 +2061,30 @@ 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'])
+            ) ? true : false;
+
+
+
+            var hostname = (isProxyHost)
+                    ? ctx.config.envConf[bundle][env].hostname.replace(/\:\d+$/, '')
+                    : ctx.config.envConf[bundle][env].hostname;
 
             // if ( !/\:\d+$/.test(req.headers.host) )
             //     hostname = hostname.replace(/\:\d+$/, '');

package/framework/{v0.1.6-alpha.16 → v0.1.6-alpha.18}/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;

package/framework/{v0.1.6-alpha.16 → v0.1.6-alpha.18}/lib/cmd/bundle/add.js

@@ -368,7 +368,8 @@ function Add(opt, cmd) {
                 content[local.bundle] = {}
             }
             content[local.bundle][ self.envs[e] ] = {
-                "host" : local.bundle + "-{env}-{scope}-v{projectVersionMajor}.{rootDomain}"
+                "host_if_dns_resolution" : "{rootDomain}",
+                "host" : "localhost"
             };
 
         }

package/framework/{v0.1.6-alpha.16 → v0.1.6-alpha.18}/lib/cmd/framework/build.js

@@ -21,7 +21,7 @@ function Build(opt, cmd){
     var self    = {};
 
     var init = function(opt, cmd) {
-        console.debug('Building framework...');
+        console.log('Building framework, please wait ...');
 
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });

package/framework/{v0.1.6-alpha.16 → v0.1.6-alpha.18}/lib/cmd/protocol/list.js

@@ -13,12 +13,12 @@ var console = lib.logger;
  *
  * */
 function List(opt, cmd) {
-    
+
     // self will be pre filled if you call `new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled })`
     var self = {}, local = {};
 
-    var init = function() {      
-        //debugger;  
+    var init = function() {
+        //debugger;
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
 
@@ -56,7 +56,7 @@ function List(opt, cmd) {
 
 
     var listAllByProject = function() {
-        
+
         var protocols       = null
             , schemes       = null
             , projects      = self.projects
@@ -78,7 +78,7 @@ function List(opt, cmd) {
 
         p = 0;
         for (; p < list.length; ++p) {
-                           
+
             str += '------------------------------------\n\r';
             if (!projects[list[p]].exists) {
                 str += '?! '
@@ -87,61 +87,62 @@ function List(opt, cmd) {
             str += '------------------------------------\n\r';
             protocols = projects[list[p]].protocols;
             schemes = projects[list[p]].schemes;
-            
+
             if (!protocols) continue;
-            
+
             str += '      Protocol(s)        Scheme(s)\n\r';
-            
-            
+
+
             indexObj = {}; index = 2;
             i = 0; len = protocols.length;
             for (; i < len; ++i) {
-                protocolStr = '';               
-                if (self.defaultProtocol == protocols[i]) {
+                protocolStr = '';
+                if (projects[list[p]].def_protocol == protocols[i]) {
                     protocolStr += '[ * ] ' + protocols[i]
                 } else {
                     protocolStr += '[   ] ' + protocols[i]
-                }                
-                
+                }
+
                 if ( (index % 2) == 0 ){
                     indexObj[index] = protocolStr;
                     index += 2
                 }
             }
-            
-            
+
+
             index = 3;
             i = 0; len = schemes.length;
             for (; i < len; ++i) {
                 schemeStr = '';
-                if (self.defaultScheme == schemes[i]) {
+                if (projects[list[p]].def_scheme == schemes[i]) {
                     schemeStr += '           [ * ] ' + schemes[i]
                 } else {
                     schemeStr += '           [   ] ' + schemes[i]
                 }
-                      
+
                 if ( (index % 2) != 0 ){
                     indexObj[index] = schemeStr;
-                    index += 2               
-                }                   
+                    index += 2
+                }
             }
-            
+
             i = null;
             for (i in indexObj) {
                 str += indexObj[i];
                 if ( (~~i % 3) == 0 ){
                     str += '\n\r'
-                }                
-            }            
-            
+                }
+            }
+
             str += '\n\r'
         }
-        
-        console.log(str)
+
+        console.log(str);
+        end();
     }
 
     var listByBundle = function(bundleName) {
-        
+
         var protocols       = null
             , schemes       = null
             , bundles       = self.bundlesByProject[self.projectName]
@@ -155,7 +156,7 @@ function List(opt, cmd) {
             , indexObj      = null
             , index         = null
         ;
-        
+
         if ( typeof(bundleName) != 'undefined' ) {
             list.push(bundleName)
         } else {
@@ -165,44 +166,44 @@ function List(opt, cmd) {
             list.sort();
         }
 
-        
+
 
         p = 0;
         for (; p < list.length; ++p) {
-                        
-            
+
+
             str += '------------------------------------\n\r';
             if (!bundles[list[p]].exists) {
                 str += '?! '
             }
             str += list[p] + '\n\r';
             str += '------------------------------------\n\r';
-            
+
             protocols = bundles[list[p]].protocols;
-            schemes = bundles[list[p]].schemes;            
+            schemes = bundles[list[p]].schemes;
             if (!protocols || protocols.length == 0) continue;
-            
-            
+
+
             str += '      Protocol(s)        Scheme(s)\n\r';
-            
-            
+
+
             indexObj = {}; index = 2;
             i = 0; len = protocols.length;
             for (; i < len; ++i) {
-                protocolStr = '';               
+                protocolStr = '';
                 if (bundles[list[p]].def_protocol == protocols[i]) {
                     protocolStr += '[ * ] ' + protocols[i]
                 } else {
                     protocolStr += '[   ] ' + protocols[i]
-                }                
-                
+                }
+
                 if ( (index % 2) == 0 ){
                     indexObj[index] = protocolStr;
                     index += 2
                 }
             }
-            
-            
+
+
             index = 3;
             i = 0; len = schemes.length;
             for (; i < len; ++i) {
@@ -212,27 +213,47 @@ function List(opt, cmd) {
                 } else {
                     schemeStr += '           [   ] ' + schemes[i]
                 }
-                      
+
                 if ( (index % 2) != 0 ){
                     indexObj[index] = schemeStr;
-                    index += 2               
-                }                   
+                    index += 2
+                }
             }
-            
+
             i = null;
             for (i in indexObj) {
                 str += indexObj[i];
                 if ( (~~i % 3) == 0 ){
                     str += '\n\r'
-                }                
-            }            
-            
+                }
+            }
+
             str += '\n\r'
         }
-        
-        console.log(str)
+
+        console.log(str);
+        end();
     };
 
+    var end = function (output, type, messageOnly) {
+        var err = false;
+        if ( typeof(output) != 'undefined') {
+            if ( output instanceof Error ) {
+                err = output = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? output.message : (output.stack||output.message);
+            }
+            if ( typeof(type) != 'undefined' ) {
+                console[type](output);
+                if ( messageOnly && type != 'log') {
+                    console.log(output);
+                }
+            } else {
+                console.log(output);
+            }
+        }
+
+        process.exit( err ? 1:0 )
+    }
+
     init()
 };
 

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

@@ -842,10 +842,18 @@ function Routing() {
      * */
     self.getRoute = function(rule, params, urlIndex) {
 
-        var config = null;
+        var config = null, isProxyHost = null;
         if (isGFFCtx) {
+            if (
+                !window.location.port
+                && window.location.hostname == window.gina.config.hostname.replace(/^(https|http|wss|ws)\:\/\//, '').replace(/\:\d+$/, '')
+            ) {
+                isProxyHost = true;
+                window.gina.config.hostname = window.gina.config.hostname.replace(/^(https|http|wss|ws)\:\/\//, '').replace(/\:\d+$/, '')
+            }
             config = window.gina.config;
         } else {
+            isProxyHost = getContext('isProxyHost');
             config = getContext('gina').config;
             if ( typeof(getContext('argvFilename')) != 'undefined' ) {
                 config.getRouting = getContext('gina').Config.instance.getRouting;
@@ -894,6 +902,10 @@ function Routing() {
         var msg     = null;
         route = checkRouteParams(route, params);
 
+        if (isProxyHost) {
+            route.hostname = route.hostname.replace(/\:\d+/, '');
+        }
+
         if ( /\,/.test(route.url) ) {
             if ( typeof(route.urlIndex) != 'undefined' ) {
                 urlIndex = route.urlIndex; // set by checkRouteParams(route, params)
@@ -969,6 +981,7 @@ function Routing() {
 
             this.url = ( typeof(ignoreWebRoot) != 'undefined' && ignoreWebRoot == true ) ? path.replace(wroot, '/') : path;
 
+
             return hostname + this.url
         };
 
@@ -1081,6 +1094,7 @@ function Routing() {
         return route
     };
 
+    // TODO - Remove this : deprecated && not used
     var getFormatedRoute = function(route, url, hash) {
         // fix url in case of empty param value allowed by the routing rule
         // to prevent having a folder.

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

@@ -79,7 +79,9 @@ function SwigFilters(conf) {
 
     // Allows you to get a bundle web root
     self.getWebroot = function (input, obj) {
-        var url = null, prop = self.options.envObj.getConf(obj, options.conf.env);
+        var url     = null
+            , prop  = self.options.envObj.getConf(obj, options.conf.env)
+        ;
         if ( isProxyHost ) {
             url = prop.server.scheme + '://'+ prop.host;
         } else {
@@ -198,7 +200,10 @@ function SwigFilters(conf) {
                     hostname        = config.hostname + config.server.webroot;
                     // rewrite hostname vs ctx.req.headers.host
                     if ( isProxyHost ) {
-                        hostname = hostname.replace(/\:\d+/, '');
+                        hostname    = (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'])
+                        }
                     }
 
                     config.bundle   = base;
@@ -230,7 +235,11 @@ function SwigFilters(conf) {
         rule = route + '@' + config.bundle;
         //var ruleObj = getRouteDefinition(routingRules, rule, method);
         try {
-            url = routing.getRoute(route +'@'+ config.bundle, params).toUrl();
+            url = routing.getRoute(route +'@'+ config.bundle, params);
+            if (isProxyHost) {
+                url.hostname = (hostname) ? url.hostname.replace(/(https|http)\:\/\/.*/, '$1://'+hostname) : url.hostname;
+            }
+            url = url.toUrl();
         } catch (routingErr) {
             url = '404:['+ ctx.req.method +']'+rule
         }

package/package.json

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

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

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

package/framework/v0.1.6-alpha.16/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.16/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}