gina 0.1.6-alpha.1 → 0.1.6-alpha.100

package/framework/{v0.1.6-alpha.1 → v0.1.6-alpha.100}/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.
@@ -72,6 +72,7 @@ function Config(opt, contextResetNeeded) {
      * */
     var init =  function(opt, contextResetNeeded) {
 
+
         if ( !Config.initialized) {
             var env     = opt.env;
             var scope   = opt.scope;
@@ -122,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;
@@ -340,7 +341,7 @@ function Config(opt, contextResetNeeded) {
         },
 
         set : function(env) {
-            this.current = env || this.template.defEnv;
+            this.current = env || process.env.NODE_ENV || this.template.defEnv;
         },
 
         /**
@@ -377,7 +378,8 @@ function Config(opt, contextResetNeeded) {
                         , a         = file.replace('.js', '').split('/')
                         , i         = a.length-1
                         , bundles   = getContext('gina').config.bundles
-                        , index     = 0;
+                        , index     = 0
+                    ;
 
                     for (; i >= 0; --i) {
                         index = bundles.indexOf(a[i]);
@@ -394,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;
@@ -431,7 +436,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;
         },
 
         /**
@@ -553,8 +558,12 @@ function Config(opt, contextResetNeeded) {
         var isStandalone    = true,
             masterPort      = null,
             appPort         = null,
-            env             = self.Env.get(),
-            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     = '',
@@ -562,6 +571,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
@@ -574,7 +585,7 @@ function Config(opt, contextResetNeeded) {
             , pkg       = null
         ;
         try {
-            manifest = require(_(root + '/manifest.json', true));
+            manifest = requireJSON(_(root + '/manifest.json', true));
             pkg = manifest.bundles;
             // by default but may be overriden
             masterPort = portsReverse[self.startingApp+'@'+self.projectName][env][projectConf.def_protocol][projectConf.def_scheme]
@@ -586,7 +597,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
@@ -620,9 +631,37 @@ 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() ) {
+                targetAppPathObj.rmSync()
+            }
+            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) {
+                console.error('[ releaseError ] ', releaseError);
+                let _releaseError = new Error('[ releaseError ] path: '+ targetAppPathObj.toString() );
+                return callback(_releaseError);
+            }
+            targetAppPathObj = null;
+
 
-            appPath = _(bundlesPath + '/' + app);
 
 
 
@@ -640,13 +679,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);
                 }
 
 
@@ -722,7 +761,7 @@ function Config(opt, contextResetNeeded) {
                     //Can't do anything without.
                     try {
 
-                        if (cacheless && exists) {
+                        if (isCacheless && exists) {
                             delete require.cache[require.resolve(_(filename, true))];
                         }
 
@@ -770,6 +809,7 @@ function Config(opt, contextResetNeeded) {
                 newContent[app][env] = merge(newContent[app][env], defaultSettings);
 
 
+
                 // setting protocol & port
                 if ( typeof(portsReverse[app+'@'+self.projectName]) == 'undefined' )
                     continue;
@@ -801,6 +841,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 = {}
@@ -845,7 +886,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...
@@ -887,8 +928,29 @@ function Config(opt, contextResetNeeded) {
                 // Variables replace. Compare with gina/core/template/conf/env.json.
                 // Defining root domain (TLD or SLD)
                 // by default
-                var rootDomain = domainLib.getRootDomain(os.hostname()).value;
+                // var hostFQDN = await domainLib.getFQDN() || os.hostname();
+                // 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;
                 }
@@ -901,28 +963,40 @@ 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,
                     "tmpPath"               : newContent[app][env].tmpPath,
-                    "scope"                 : newContent[app][env].server.scope,
                     "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];
                 }
@@ -930,6 +1004,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);
@@ -1150,13 +1249,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);
@@ -1174,16 +1273,26 @@ 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;
 
-        if ( self.task == 'run' && !self.isCacheless() ) {
-            appPath = _(conf[bundle][env].bundlesPath + '/' + bundle)
-        } else { //getting src path instead
-            appPath = _(conf[bundle][env].sources + '/' + bundle);
-            conf[bundle][env].bundlesPath = conf[bundle][env].sources;
-        }
+        // By default
+        appPath = _(conf[bundle][env].bundlesPath + '/' + bundle);
+
+        // var appPathObj = new _(conf[bundle][env].releases +'/'+ bundle +'/'+ scope +'/'+ env +'/'+ conf[bundle][env].projectVersion, true);
+        // if (!appPathObj.existsSync() || self.isCacheless() ) {
+        //     //getting src path instead
+        //     appPath = _(conf[bundle][env].sources + '/' + bundle);
+        //     conf[bundle][env].bundlesPath = conf[bundle][env].sources;
+        // }
+
+        // if ( self.task == 'run' && !self.isCacheless() ) {
+        //     appPath = _(conf[bundle][env].bundlesPath + '/' + bundle)
+        // } else {
+        //     appPath = _(conf[bundle][env].sources + '/' + bundle);
+        //     conf[bundle][env].bundlesPath = conf[bundle][env].sources;
+        // }
 
 
         // bundle web root
@@ -1291,7 +1400,11 @@ function Config(opt, contextResetNeeded) {
             for (let e = 0, eLen = allEnvs.length; e < eLen; e++) {
                 // *.dev.json or *.global.json
                 let re = new RegExp('\.('+ allEnvs[e] +'|global)\.json$');
-                if ( re.test(fName) && allEnvs[e] != env ) {
+                if (
+                    re.test(fName)
+                    // 2023-07-28 - Fixed this by commenting the rest of the test to avoid routing.global.json to be included in list
+                    //&& allEnvs[e] != env
+                ) {
                     // we should skip it
                     skipIt = true;
                     break;
@@ -1393,7 +1506,7 @@ function Config(opt, contextResetNeeded) {
 
             //Can't do anything without.
             try {
-                if (cacheless && exists) {
+                if (isCacheless && exists) {
                     delete require.cache[require.resolve(_(filename, true))];
                 }
 
@@ -1498,7 +1611,8 @@ function Config(opt, contextResetNeeded) {
             method: 'GET',
             param: {
                 control: 'getBundleStatus'
-            }
+            },
+            scopes: [ ''+ scope ]
         };
 
         // custom error page
@@ -1512,7 +1626,8 @@ function Config(opt, contextResetNeeded) {
                 control: 'renderCustomError',
                 // default data : will be fed on error
                 error: {}
-            }
+            },
+            scopes: [ ''+ scope ]
         };
 
         // creating default rule for auto redirect: / => /webroot
@@ -1532,6 +1647,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],
@@ -1557,7 +1673,8 @@ function Config(opt, contextResetNeeded) {
                     "param": {
                         "control": "uploadToTmp",
                         "title": "Upload file"
-                    }
+                    },
+                    "scopes": [ ""+ scope ]
                 }
             }
 
@@ -1569,7 +1686,8 @@ function Config(opt, contextResetNeeded) {
                     "param": {
                         "control": "deleteFromTmp",
                         "title": "Delete uploaded file"
-                    }
+                    },
+                    "scopes": [ ""+ scope ]
                 }
             }
         }
@@ -1617,15 +1735,25 @@ function Config(opt, contextResetNeeded) {
 
             // default hostname
             if (
-                typeof(routing[rule].hostname) == 'undefined' && !/^redirect$/.test(routing[rule].param.control)
-                || !routing[rule].hostname && !/^redirect$/.test(routing[rule].param.control)
+                typeof(routing[rule].hostname) == 'undefined'
+                    && !/^redirect$/.test(routing[rule].param.control)
+                ||
+                !routing[rule].hostname
+                    && !/^redirect$/.test(routing[rule].param.control)
             ) {
                 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 )
@@ -1678,18 +1806,31 @@ function Config(opt, contextResetNeeded) {
             // route file
             if (!routing[rule].param) continue;
             //routing[rule].param.file = ( typeof(routing[rule].param) != 'undefined' && typeof(routing[rule].param.file) != 'undefined' ) ? routing[rule].param.file: file; // get template file
-            if ( typeof(routing[rule].param) != 'undefined' && typeof(routing[rule].param.file) != 'undefined' && /delete/i.test(routing[rule].method )) {
+            if (
+                typeof(routing[rule].param) != 'undefined'
+                && typeof(routing[rule].param.file) != 'undefined'
+                && /delete/i.test(routing[rule].method )
+            ) {
                 console.warn('`DELETE` method result should not be rendered into a file');
-            } else if ( typeof(routing[rule].param) != 'undefined' && typeof(routing[rule].param.file) == 'undefined' /**&& !/delete/i.test(routing[rule].method)*/) {
+            } else if (
+                typeof(routing[rule].param) != 'undefined'
+                && typeof(routing[rule].param.file) == 'undefined'
+                /**&& !/delete/i.test(routing[rule].method)*/
+            ) {
                 routing[rule].param.file = file
             }
 
             // by default, method is inherited from the request.method
             if (
-                localHasWebRoot && typeof(routing[rule].param.path) != 'undefined' && typeof(routing[rule].param.ignoreWebRoot) == 'undefined'
-                || localHasWebRoot && typeof(routing[rule].param.path) != 'undefined' && !routing[rule].param.ignoreWebRoot
+                localHasWebRoot
+                    && typeof(routing[rule].param.path) != 'undefined'
+                    && typeof(routing[rule].param.ignoreWebRoot) == 'undefined'
+                ||
+                localHasWebRoot
+                    && 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
             }
 
 
@@ -1701,11 +1842,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);
                 }
             }
         }
@@ -1734,10 +1875,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,
@@ -1897,7 +2038,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 )
@@ -1928,12 +2069,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
                     }
                 ;
 
@@ -1946,10 +2091,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
@@ -1968,8 +2114,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, '-');
@@ -1987,11 +2133,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]);
                             }
@@ -2018,6 +2164,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, '-');
@@ -2036,6 +2183,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);
@@ -2058,7 +2206,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);
@@ -2098,6 +2245,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;
@@ -2114,6 +2263,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;
                     }
 
 
@@ -2287,7 +2437,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 !
@@ -2318,7 +2468,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'
@@ -2342,7 +2492,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;
@@ -2355,9 +2508,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() ) {
@@ -2388,7 +2541,7 @@ function Config(opt, contextResetNeeded) {
                             key = files[i].replace('.json', '').replace(/\-/g, '.');
                             try {
 
-                                if (cacheless) {
+                                if (isCacheless) {
                                     delete require.cache[require.resolve(_(filename, true))];
                                 }