gina 0.1.6-alpha.15 → 0.1.6-alpha.151

package/framework/{v0.1.6-alpha.15 → v0.1.6-alpha.151}/core/config.js

@@ -1,7 +1,7 @@
 //"use strict";
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2025 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -70,9 +70,8 @@ function Config(opt, contextResetNeeded) {
      * Config Constructor
      * @constructor
      * */
-    var init =  async function(opt, contextResetNeeded) {
+    var init =  function(opt, contextResetNeeded) {
 
-        self.hostFQDN = await domainLib.getFQDN() || os.hostname();
 
         if ( !Config.initialized) {
             var env     = opt.env;
@@ -124,7 +123,7 @@ function Config(opt, contextResetNeeded) {
 
         self.env    = env;
         self.scope  = scope;
-        console.debug('[ config ] Loading conf...');
+        console.debug('[CONFIG] Loading conf...');
 
         // framework settings
         var filename = null, content = null;
@@ -156,6 +155,7 @@ function Config(opt, contextResetNeeded) {
                 // getting server core config
                 var statusCodes     = null
                     , mime          = null
+                    , encoding      = null
                 ;
 
                 try {
@@ -171,10 +171,16 @@ function Config(opt, contextResetNeeded) {
                     if ( typeof(mime['_comment']) != 'undefined' )
                         delete mime['_comment'];
 
+                    encoding  = fs.readFileSync(corePath + '/content.encoding').toString();
+                    encoding  = JSON.parse(encoding);
+                    if ( typeof(encoding['_comment']) != 'undefined' )
+                        delete encoding['_comment'];
+
                     self.envConf.core = {
                         statusCodes : statusCodes,
                         mime        : mime,
-                        locales     : locales
+                        locales     : locales,
+                        encoding    : encoding
                     };
 
                 } catch(err) {
@@ -342,7 +348,7 @@ function Config(opt, contextResetNeeded) {
         },
 
         set : function(env) {
-            this.current = env || this.template.defEnv;
+            this.current = env || process.env.NODE_ENV || this.template.defEnv;
         },
 
         /**
@@ -397,7 +403,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;
@@ -434,7 +443,7 @@ function Config(opt, contextResetNeeded) {
     this.Scope = {
         template : requireJSON( getEnvVar('GINA_FRAMEWORK_DIR') +'/core/template/conf/env.json'),
         set : function(scope) {
-            this.current = scope || this.template.defScope;
+            this.current = scope || process.env.NODE_SCOPE || this.template.defScope;
         },
 
         /**
@@ -556,9 +565,12 @@ function Config(opt, contextResetNeeded) {
         var isStandalone    = true,
             masterPort      = null,
             appPort         = null,
-            env             = self.Env.get(),
-            envIsDev        = ( /^true$/i.test(process.env.NODE_ENV_IS_DEV) ) ? true : false
-            scope           = self.Scope.get(),
+            // env             = self.Env.get(),
+            env             = (typeof(process.env.NODE_ENV) != 'undefined' ) ? process.env.NODE_ENV: self.Env.get(),
+            envIsDev        = ( /^true$/i.test(process.env.NODE_ENV_IS_DEV) ) ? true : false,
+            // scope           = self.Scope.get(),
+            scope           = (typeof(process.env.NODE_SCOPE) != 'undefined' ) ? process.env.NODE_SCOPE: self.Scope.get(),
+            scopeIsLocal    = ( /^true$/i.test(process.env.NODE_SCOPE_IS_LOCAL) ) ? true : false,
             appsPath        = '',
             modelsPath      = '',
             projectPath     = '',
@@ -566,6 +578,8 @@ function Config(opt, contextResetNeeded) {
             projectConf     = ctx.project,
             portsReverse    = ctx.portsReverse
         ;
+        console.debug('[CONFIG] Reading env: '+ env);
+        console.debug('[CONFIG] Reading scope: '+ scope);
 
         if (!self.projectName) {
             self.projectName = ctx.config.projectName
@@ -590,7 +604,7 @@ function Config(opt, contextResetNeeded) {
 
 
         // For each app.
-        var cacheless           = self.isCacheless()
+        var isCacheless         = self.isCacheless()
             , bundleSettings    = null
             , bundHasSettings   = true
             , bundlesPath       = getPath('bundles') // symlink handled
@@ -624,9 +638,14 @@ function Config(opt, contextResetNeeded) {
 
         for (let app in content) {
             //Checking if genuine app.
-            console.debug('Checking if application [ '+ app +' ] is registered ');
+            console.debug('[CONFIG] Checking if application [ '+ app +' ] is registered ');
+            if ( typeof(pkg[app]) == 'undefined' ) {
+                console.debug('[CONFIG] Skipping app [ '+ app +' ]; not registered ...');
+                continue;
+            }
 
             appPath = _(root +'/'+ pkg[app].link, true);
+            console.debug('[CONFIG] Checking appPath [ '+ appPath +' ] ');
             // cleanup symlinks
             let targetAppPathObj = new _(appPath, true);
             if ( targetAppPathObj.existsSync() ) {
@@ -635,9 +654,11 @@ function Config(opt, contextResetNeeded) {
             try {
                 if (envIsDev) {
                     targetAppPathObj = new _(root +'/'+ pkg[app].src, true);
+                    console.debug('[CONFIG][env:'+env+'][envIsDev:'+ envIsDev +'] Linking ['+ targetAppPathObj.toString() +'] to [ '+ appPath +' ] ');
                     targetAppPathObj.symlinkSync(appPath);
                 } else {
                     targetAppPathObj = new _(root +'/'+ pkg[app].releases[scope][env].target, true);
+                    console.debug('[CONFIG][env'+env+'][envIsDev:'+ envIsDev +'] Linking ['+ targetAppPathObj.toString() +'] to [ '+ appPath +' ] ');
                     targetAppPathObj.symlinkSync(appPath);
                 }
             } catch (releaseError) {
@@ -665,13 +686,13 @@ function Config(opt, contextResetNeeded) {
                     configFiles = fs.readdirSync(_(appPath + '/config'));
                 } catch (mountingError) {
                     //console.emerg('Dependency bundle config not found for `'+ app +'/'+ env +'`: trying to load on the fly from src');
-                    console.warn('Dependency bundle config not found for `'+ app +'/'+ env +'`: trying to load on the fly from src');
+                    console.warn('[CONFIG] Dependency bundle config not found for `'+ app +'/'+ env +'`: trying to load on the fly from src');
                     let appSrcPath = _(root +'/'+ pkg[app].src, true);
                     configFiles = fs.readdirSync(_(appSrcPath + '/config'));
                     setPath('bundles', _(appSrcPath, true));
                     appPath = appSrcPath;
                     newContent[app][env].bundlesPath = bundlesPath = appSrcPath.replace( new RegExp('/'+ app), '' );
-                    console.warn('Dependency bundle config loaded from '+ appSrcPath);
+                    console.warn('[CONFIG] Dependency bundle config loaded from '+ appSrcPath);
                 }
 
 
@@ -747,7 +768,7 @@ function Config(opt, contextResetNeeded) {
                     //Can't do anything without.
                     try {
 
-                        if (cacheless && exists) {
+                        if (isCacheless && exists) {
                             delete require.cache[require.resolve(_(filename, true))];
                         }
 
@@ -795,6 +816,7 @@ function Config(opt, contextResetNeeded) {
                 newContent[app][env] = merge(newContent[app][env], defaultSettings);
 
 
+
                 // setting protocol & port
                 if ( typeof(portsReverse[app+'@'+self.projectName]) == 'undefined' )
                     continue;
@@ -826,6 +848,7 @@ function Config(opt, contextResetNeeded) {
 
 
 
+
                 // just in case someone removes the settings.server.json
                 if ( typeof(newContent[app][env].server ) == 'undefined' ) {
                     newContent[app][env].server = {}
@@ -870,7 +893,7 @@ function Config(opt, contextResetNeeded) {
                 try {
                     appPort = portsReverse[app+'@'+self.projectName][env][ newContent[app][env].server.protocol ][ newContent[app][env].server.scheme ];
                 } catch (err) {
-                    console.emerg('[ config ][ settings.server.protocol ] Protocol or scheme settings inconsistency found in `'+ app +'/config/settings`. To fix this, try to run `gina project:import @'+ self.projectName +' --path='+  projectConf.path +'`\n\r'+ err.stack);
+                    console.emerg('[CONFIG][ settings.server.protocol ] Protocol or scheme settings inconsistency found in `'+ app +'/config/settings`. To fix this, try to run `gina project:import @'+ self.projectName +' --path='+  projectConf.path +'`\n\r'+ err.stack);
                     process.exit(1)
                 }
                 //I had to for this one...
@@ -913,25 +936,28 @@ function Config(opt, contextResetNeeded) {
                 // 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(self.hostFQDN).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)
-                    }
-                }
+                // console.debug('[CONFIG]['+ app +'][loadWithTemplate][FQDN] Setting Host FQDN from `'+ newContent[app][env].host +'` => `'+ self.hostFQDN);
+                let 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;
                 }
@@ -944,28 +970,42 @@ 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;
+                // }
 
+                if ( typeof(newContent[app][env].homedir) == 'undefined' ) {
+                    newContent[app][env].homedir = template.homedir;
+                }
+                if ( typeof(newContent[app][env].projectName) == 'undefined' ) {
+                    newContent[app][env].projectName = self.projectName;
+                }
+
+
+
+                // replacement for {bundle}@{project}
                 let reps = {
                     "frameworkDir"          : getEnvVar('GINA_FRAMEWORK_DIR'),
                     "executionPath"         : root,
+                    "projectName"           : self.projectName,
                     "projectPath"           : projectPath,
+                    "projectVersion"        : manifest.version,
+                    "projectVersionMajor"   : manifest.version.split(/\./g)[0],
+                    "homedir"               : newContent[app][env].homedir,
                     "bundlesPath"           : appsPath,
                     "modelsPath"            : modelsPath,
+                    "bundle"                : app,
+                    "env"                   : env,
+                    "scope"                 : scope,
+                    "logsPath"              : newContent[app][env].logsPath,
                     "tmpPath"               : newContent[app][env].tmpPath,
-                    "scope"                 : newContent[app][env].server.scope,
+                    "cachePath"             : newContent[app][env].cachePath,
                     "rootDomain"            : rootDomain,
-                    "projectVersion"        : manifest,
-                    "projectVersionMajor"   : manifest.version.split(/\./g)[0],
                     "host"                  : newContent[app][env].host,
                     "scheme"                : newContent[app][env].server.scheme,
-                    "env"                   : env,
-                    "scope"                 : scope,
-                    "bundle"                : app,
                     "version"               : version
                 };
 
-                // replacement for {bundle}@{project}
-
                 for (let _contant in process.gina) {
                     reps[_contant] = process.gina[_contant];
                 }
@@ -973,6 +1013,31 @@ function Config(opt, contextResetNeeded) {
                 bundleSettings = null;
                 //console.error("reps ", reps);
                 try {
+
+                    if (
+                        typeof(newContent[app][env].host) != 'undefined'
+                        && newContent[app][env].host != ''
+                    ) {
+                        // TODO - Override for kubernetes replicas: (os.hostname() + rootDomain) != newContent[app][env].host
+                        // eg.: public2-prod-v3-beta VS public-prod-v3-beta
+
+                        newContent[app][env].host = whisper(reps, newContent[app][env].host);
+                    }
+
+                    // if ( typeof(newContent[app][env].host_if_dns_resolution) != 'undefined' ) {
+                    //     newContent[app][env].host_if_dns_resolution = whisper(reps, newContent[app][env].host_if_dns_resolution);
+                    //     if ( newContent[app][env].host != newContent[app][env].host_if_dns_resolution ) {
+                    //         newContent[app][env].host = newContent[app][env].host_if_dns_resolution;
+                    //     }
+                    // }
+
+                    if (
+                        typeof(newContent[app][env].rootDomain) != 'undefined'
+                        && newContent[app][env].rootDomain != ''
+                    ) {
+                        newContent[app][env].rootDomain = whisper(reps, newContent[app][env].rootDomain);
+                    }
+
                     newContent = whisper(reps, newContent);
                 } catch(contentErr) {
                     console.emerg(contentErr.stack);
@@ -1193,13 +1258,13 @@ function Config(opt, contextResetNeeded) {
         }
 
         // environment
-        var cacheless       = self.isCacheless()
+        var isCacheless     = self.isCacheless()
             , isStandalone  = self.Host.isStandalone()
-            , env           = self.env || self.Env.get() // env
-            , scope         = self.scope || self.Scope.get() // scope
+            , env           = process.env.NODE_ENV || self.env || self.Env.get() // env
+            , scope         = process.env.NODE_SCOPE || self.scope || self.Scope.get() // scope
             , conf          = self.envConf // env conf
         ;
-        console.debug('[ CONFIG ] loading `'+ bundle +'/'+ env +'` configuration, please wait ...');
+        console.debug('[CONFIG] Loading `'+ bundle +'/'+ env +':'+ scope +'` configuration, please wait ...');
 
 
         self.setServerCoreConf(bundle, env, scope, conf.core);
@@ -1217,7 +1282,7 @@ function Config(opt, contextResetNeeded) {
 
         conf[bundle][env].projectName   = getContext('projectName');
         conf[bundle][env].allBundles    = bundles;
-        conf[bundle][env].cacheless     = cacheless;
+        conf[bundle][env].isCacheless   = isCacheless;
         conf[bundle][env].isStandalone  = isStandalone;
         conf[bundle][env].executionPath = getContext('paths').root;
 
@@ -1450,7 +1515,7 @@ function Config(opt, contextResetNeeded) {
 
             //Can't do anything without.
             try {
-                if (cacheless && exists) {
+                if (isCacheless && exists) {
                     delete require.cache[require.resolve(_(filename, true))];
                 }
 
@@ -1555,7 +1620,8 @@ function Config(opt, contextResetNeeded) {
             method: 'GET',
             param: {
                 control: 'getBundleStatus'
-            }
+            },
+            scopes: [ ''+ scope ]
         };
 
         // custom error page
@@ -1569,7 +1635,8 @@ function Config(opt, contextResetNeeded) {
                 control: 'renderCustomError',
                 // default data : will be fed on error
                 error: {}
-            }
+            },
+            scopes: [ ''+ scope ]
         };
 
         // creating default rule for auto redirect: / => /webroot
@@ -1589,6 +1656,7 @@ function Config(opt, contextResetNeeded) {
                     path: wroot,
                     code: 302
                 },
+                scopes: [ ''+ scope ],
                 bundle: bundle,
                 host: conf[bundle][env].host,
                 hostname: conf[bundle][env].server.scheme +'://'+ conf[bundle][env].host +':'+ conf[bundle][env].port[conf[bundle][env].server.protocol][conf[bundle][env].server.scheme],
@@ -1614,7 +1682,8 @@ function Config(opt, contextResetNeeded) {
                     "param": {
                         "control": "uploadToTmp",
                         "title": "Upload file"
-                    }
+                    },
+                    "scopes": [ ""+ scope ]
                 }
             }
 
@@ -1626,7 +1695,8 @@ function Config(opt, contextResetNeeded) {
                     "param": {
                         "control": "deleteFromTmp",
                         "title": "Delete uploaded file"
-                    }
+                    },
+                    "scopes": [ ""+ scope ]
                 }
             }
         }
@@ -1682,10 +1752,17 @@ 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;
             }
 
+            // default scope
+            if ( typeof(routing[rule].scopes) == 'undefined' || !routing[rule].scopes )
+                routing[rule].scopes = [ ""+ scope ];
 
             // default method
             if ( typeof(routing[rule].method) == 'undefined' || !routing[rule].method )
@@ -1762,7 +1839,7 @@ function Config(opt, contextResetNeeded) {
                     && typeof(routing[rule].param.path) != 'undefined'
                     && !routing[rule].param.ignoreWebRoot
             ) {
-                routing[rule].param.path = localWroot + ( /^\//.test(routing[rule].param.path) ) ? routing[rule].param.path.substr(1) : routing[rule].param.path
+                routing[rule].param.path = localWroot + ( /^\//.test(routing[rule].param.path) ) ? routing[rule].param.path.substring(1) : routing[rule].param.path
             }
 
 
@@ -1774,11 +1851,11 @@ function Config(opt, contextResetNeeded) {
                     urls = routing[rule].url.split(/\,/g);
                     r = 0; rLen = urls.length;
                     for (; r < rLen; ++r) {
-                        urls[r] = ( localHasWebRoot && urls[r].length > 1) ? localWroot + urls[r].substr(1) : ((localHasWebRoot && urls[r].length == 1) ? localWroot : urls[r]);
+                        urls[r] = ( localHasWebRoot && urls[r].length > 1) ? localWroot + urls[r].substring(1) : ((localHasWebRoot && urls[r].length == 1) ? localWroot : urls[r]);
                     }
                     routing[rule].url = urls.join(',');
                 } else {
-                    routing[rule].url = ( localHasWebRoot && routing[rule].url.length > 1) ? localWroot + routing[rule].url.substr(1) : ((localHasWebRoot && routing[rule].url.length == 1) ? localWroot : routing[rule].url);
+                    routing[rule].url = ( localHasWebRoot && routing[rule].url.length > 1) ? localWroot + routing[rule].url.substring(1) : ((localHasWebRoot && routing[rule].url.length == 1) ? localWroot : routing[rule].url);
                 }
             }
         }
@@ -1807,10 +1884,10 @@ function Config(opt, contextResetNeeded) {
         var reps = {
             "gina"              : getPath('gina').root,
             "frameworkDir"      : getEnvVar('GINA_FRAMEWORK_DIR'),
-            "scope"             : conf[bundle][env].server.scope,
-            "host"              : conf[bundle][env].host,
-            "env"               : env,
+            // "scope"             : conf[bundle][env].server.scope,
             "scope"             : scope,
+            "env"               : env,
+            "host"              : conf[bundle][env].host,
             "bundle"            : bundle,
             // "server.engine"     : conf[bundle][env].engine,
             // "server.protocol"   : conf[bundle][env].protocol,
@@ -1831,6 +1908,7 @@ function Config(opt, contextResetNeeded) {
             "sharedPath"        : conf[bundle][env].sharedPath,
             "logsPath"          : conf[bundle][env].logsPath,
             "tmpPath"           : conf[bundle][env].tmpPath,
+            "cachePath"         : conf[bundle][env].cachePath,
             "version"           : getContext('gina').version,
         };
 
@@ -1970,7 +2048,7 @@ function Config(opt, contextResetNeeded) {
                     for (let p in files['statics']) {
                         staticToPublicPath =  wroot + p.replace( new RegExp('^'+ wroot), '/');
 
-                        if ( !/\./.test(staticToPublicPath.substr(staticToPublicPath.lastIndexOf('/') )) && !/\/$/.test(staticToPublicPath) )
+                        if ( !/\./.test(staticToPublicPath.substring(staticToPublicPath.lastIndexOf('/') )) && !/\/$/.test(staticToPublicPath) )
                             staticToPublicPath += '/';
 
                         if ( publicResources.indexOf(staticToPublicPath) < 0 )
@@ -2001,12 +2079,16 @@ function Config(opt, contextResetNeeded) {
                         type    : 'text/css',
                         url     : '',
                         isCommon : false,
+                        // when set to true, allows the framework to load it before gina.min.css
+                        isExternalPlugin : false
                     },
                     js      = {
                         name    : '',
                         type    : 'text/javascript',
                         url     : '',
-                        isCommon : false
+                        isCommon : false,
+                        // when set to true, allows the framework to load it before gina.min.js
+                        isExternalPlugin : false
                     }
                 ;
 
@@ -2019,10 +2101,11 @@ function Config(opt, contextResetNeeded) {
                     , noneDefaultCss    = null
                     , reWebroot         = new RegExp('^'+conf[bundle][env].server.webroot)
                 ;
-                var t       = null
-                    , tLen  = null
-                    , tTmp  = null
-                    , url   = null
+                var t           = null
+                    , tLen      = null
+                    , tTmp      = null
+                    , url       = null
+                    , route     = null
                 ;
 
                 // formating _common def for javascripts & stylesheets
@@ -2041,8 +2124,8 @@ function Config(opt, contextResetNeeded) {
                         tLen    = tTmp.length;
                         noneDefaultJs = [];
                         for (; t < tLen; ++t) {
-                            noneDefaultJs[t]        = JSON.clone(js);
-                            url                     = tTmp[t];
+                            noneDefaultJs[t]            = JSON.clone(js);
+                            url                         = tTmp[t];
                             if ( typeof(url) == 'string') {
                                 noneDefaultJs[t].url    = url;
                                 noneDefaultJs[t].name   = url.substring(url.lastIndexOf('/')+1, url.lastIndexOf('.')).replace(/\W+/g, '-');
@@ -2060,11 +2143,11 @@ function Config(opt, contextResetNeeded) {
                         noneDefaultCss = [];
                         for (; t < tLen; ++t) {
                             noneDefaultCss[t]           = JSON.clone(css);
+                            noneDefaultCss[t].route     = section +'@'+ bundle;
                             url                         = tTmp[t];
                             if ( typeof(url) == 'string') {
                                 noneDefaultCss[t].url       = url;
                                 noneDefaultCss[t].name      = url.substring(url.lastIndexOf('/')+1, url.lastIndexOf('.')).replace(/\W+/g, '-');
-                                noneDefaultCss[t].isCommon  = ( /^_common$/.test(section) ) ? true : false;
                             } else {
                                 noneDefaultCss[t] = merge(url, noneDefaultCss[t]);
                             }
@@ -2091,6 +2174,7 @@ function Config(opt, contextResetNeeded) {
                         for (; t < tLen; ++t) {
                             noneDefaultJs[t]        = JSON.clone(js);
                             url                     = tTmp[t];
+                            noneDefaultJs[t].route  = section +'@'+ bundle;
                             if ( typeof(url) == 'string') {
                                 noneDefaultJs[t].url    = url;
                                 noneDefaultJs[t].name   = url.substring(url.lastIndexOf('/')+1, url.lastIndexOf('.')).replace(/\W+/g, '-');
@@ -2109,6 +2193,7 @@ function Config(opt, contextResetNeeded) {
                         for (; t < tLen; ++t) {
                             noneDefaultCss[t]           = JSON.clone(css);
                             url                         = tTmp[t];
+                            noneDefaultCss[t].route     = section +'@'+ bundle;
                             let re = new RegExp('\{\s*(.*)\s*\}', 'g');
                             if ( typeof(url) == 'string') {
                                 noneDefaultCss[t].url       = url.replace(re, originHostReplacement);
@@ -2131,7 +2216,6 @@ function Config(opt, contextResetNeeded) {
 
 
 
-
                     if (!files['templates'][section].javascriptsExcluded) {
                         // merging with common javascript def
                         // noneDefaultJs = merge.setKeyComparison('url')(files['templates']._common.javascripts, noneDefaultJs, true);
@@ -2171,6 +2255,8 @@ function Config(opt, contextResetNeeded) {
 
                         noneDefaultJs[t].type  = ( typeof(noneDefaultJs[t].type) != 'undefined' ) ? noneDefaultJs[t].type : js.type;
                         noneDefaultJs[t].isCommon  = ( typeof(noneDefaultJs[t].isCommon) != 'undefined' ) ? noneDefaultJs[t].isCommon : ( ( /^_common$/.test(section) ) ? true : false );
+                        noneDefaultJs[t].route  = ( typeof(noneDefaultJs[t].route) != 'undefined' ) ? noneDefaultJs[t].route : null;
+
                     }
                     // force css rechecking on `name` & `url`
                     t = 0;
@@ -2187,6 +2273,7 @@ function Config(opt, contextResetNeeded) {
                         noneDefaultCss[t].rel       = ( typeof(noneDefaultCss[t].rel) != 'undefined' ) ? noneDefaultCss[t].rel : css.rel;
                         noneDefaultCss[t].type      = ( typeof(noneDefaultCss[t].type) != 'undefined' ) ? noneDefaultCss[t].type : css.type;
                         noneDefaultCss[t].isCommon  = ( typeof(noneDefaultCss[t].isCommon) != 'undefined' ) ? noneDefaultCss[t].isCommon : ( ( /^_common$/.test(section) ) ? true : false );
+                        noneDefaultCss[t].route     = ( typeof(noneDefaultCss[t].route) != 'undefined' ) ? noneDefaultCss[t].route : null;
                     }
 
 
@@ -2360,7 +2447,7 @@ function Config(opt, contextResetNeeded) {
             loaderSrcPath = files['templates']._common.pluginLoader.replace(/(\{src\:|\}$)/g, '');
             try {
                 // will get a buffer
-                if (cacheless) {
+                if (isCacheless) {
                     delete require.cache[require.resolve(_(loaderSrcPath, true))]
                 }
                 // Attention - ginaLoader cannot be deferred !
@@ -2391,7 +2478,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'
@@ -2413,9 +2500,13 @@ function Config(opt, contextResetNeeded) {
         }
 
         conf[bundle][env].server.supportedRequestMethods = conf[bundle][env].content.settings.server.supportedRequestMethods;
+        conf[bundle][env].server.preferedCompressionEncodingOrder = conf[bundle][env].content.settings.server.preferedCompressionEncodingOrder;
         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;
@@ -2428,9 +2519,9 @@ function Config(opt, contextResetNeeded) {
 
 
     var loadForms = function(formsDir) {
-        var forms       = { rules: {}}
-            , cacheless = self.isCacheless()
-            , root      = ''
+        var forms           = { rules: {}}
+            , isCacheless   = self.isCacheless()
+            , root          = ''
         ;
 
         if ( new _(formsDir, true).existsSync() ) {
@@ -2461,7 +2552,7 @@ function Config(opt, contextResetNeeded) {
                             key = files[i].replace('.json', '').replace(/\-/g, '.');
                             try {
 
-                                if (cacheless) {
+                                if (isCacheless) {
                                     delete require.cache[require.resolve(_(filename, true))];
                                 }