gina 0.1.5-alpha.2 → 0.1.6-alpha.10

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.10}/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.5-alpha.2/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.10/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":7,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.5-alpha.2/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.10/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.5-alpha.2 → v0.1.6-alpha.10}/core/config.js

@@ -377,7 +377,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]);
@@ -543,7 +544,7 @@ function Config(opt, contextResetNeeded) {
      * @param {String} template Path of the template to merge with
      * @returns {Oject} JSON of the merged config
      **/
-    var loadWithTemplate = function(userConf, template, callback) {
+    var loadWithTemplate = async function(userConf, template, callback) {
 
         var content     = userConf,
             //if nothing to merge.
@@ -554,6 +555,7 @@ function Config(opt, contextResetNeeded) {
             masterPort      = null,
             appPort         = null,
             env             = self.Env.get(),
+            envIsDev        = ( /^true$/i.test(process.env.NODE_ENV_IS_DEV) ) ? true : false
             scope           = self.Scope.get(),
             appsPath        = '',
             modelsPath      = '',
@@ -574,7 +576,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]
@@ -622,7 +624,28 @@ function Config(opt, contextResetNeeded) {
             //Checking if genuine app.
             console.debug('Checking if application [ '+ app +' ] is registered ');
 
-            appPath = _(bundlesPath + '/' + app);
+            appPath = _(root +'/'+ pkg[app].link, true);
+            // cleanup symlinks
+            let targetAppPathObj = new _(appPath, true);
+            if ( targetAppPathObj.existsSync() ) {
+                targetAppPathObj.rmSync()
+            }
+            try {
+                if (envIsDev) {
+                    targetAppPathObj = new _(root +'/'+ pkg[app].src, true);
+                    targetAppPathObj.symlinkSync(appPath);
+                } else {
+                    targetAppPathObj = new _(root +'/'+ pkg[app].releases[scope][env].target, true);
+                    targetAppPathObj.symlinkSync(appPath);
+                }
+            } catch (releaseError) {
+                console.error('[ releaseError ] ', releaseError);
+                let _releaseError = new Error('[ releaseError ] path: '+ targetAppPathObj.toString() );
+                return callback(_releaseError);
+            }
+            targetAppPathObj = null;
+
+
 
 
 
@@ -780,9 +803,10 @@ function Config(opt, contextResetNeeded) {
                     p = _(pkg[app].src);
                     content[app][env]['bundlesPath'] = "{executionPath}/"+ p.replace('/' + app, '');
                 } else {
-                    p = ( typeof(pkg[app].link) != 'undefined' ) ? _(pkg[app].link) : _(pkg[app].releases[env].target);
+                    p = ( typeof(pkg[app].link) != 'undefined' ) ? _(pkg[app].link) : _(pkg[app].releases[scope][env].target);
                     content[app][env]['bundlesPath'] = "{executionPath}/"+ p.replace('/' + app, '');
                 }
+                p = null;
 
                 appsPath = (typeof(content[app][env]['bundlesPath']) != 'undefined')
                     ? content[app][env].bundlesPath
@@ -887,6 +911,28 @@ function Config(opt, contextResetNeeded) {
                 // Defining root domain (TLD or SLD)
                 // by default
                 var rootDomain = domainLib.getRootDomain(os.hostname()).value;
+                var currentHostFQDN = await domainLib.getFQDN() || os.hostname();
+                if (
+                    // typeof(newContent[app][env].host) == 'undefined'
+                    // ||
+                    // typeof(newContent[app][env].host) != 'undefined'
+                    // && newContent[app][env].host == ''
+                    // ||
+                    // typeof(newContent[app][env].host) != 'undefined'
+                    // && newContent[app][env].host == 'auto'
+                    typeof(newContent[app][env].host) != 'undefined'
+                    && newContent[app][env].host != currentHostFQDN
+                ) {
+                    console.debug('[CONFIG][loadWithTemplate] Auto HOST MODE ON: retrieving current host FQDN.');
+                    // Get fqdn (equivalent of `hostname --fqdn` command line)
+                    try {
+                        newContent[app][env].host = currentHostFQDN;
+                        console.debug('[CONFIG][loadWithTemplate] FQDN Host set as `'+ currentHostFQDN +'`');
+                    } catch (fqdnErr) {
+                        console.emerg('[ config ][ 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;
@@ -1177,12 +1223,22 @@ function Config(opt, contextResetNeeded) {
         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
@@ -1290,7 +1346,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;
@@ -1616,8 +1676,11 @@ 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];
@@ -1677,16 +1740,29 @@ 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
             }

package/framework/{v0.1.5-alpha.2 → v0.1.6-alpha.10}/core/controller/controller.js

@@ -1659,10 +1659,16 @@ function SuperController(options) {
      * */
     var getNodeRes = function(type, resArr, useWebroot, reURL) {
 
-        var r       = 0
-            , rLen  = resArr.length
-            , obj   = null
-            , str   = ''
+        var r               = 0
+            , rLen          = resArr.length
+            , obj           = null
+            , str           = ''
+            , requestHost   = ( /http\/2/.test(local.options.conf.server.protocol) )
+                    ? local.req.headers[':host']
+                    : local.req.headers.host
+            , hostname      = ( typeof(requestHost) != 'undefined' && local.options.conf.host != requestHost)
+                    ? local.options.conf.server.scheme +'://'+ requestHost + ':'+ local.options.conf.server.port
+                    : local.options.conf.hostname
         ;
         switch(type){
             case 'css':
@@ -1673,7 +1679,7 @@ function SuperController(options) {
                     }
                     // TODO - add support for cdn
                     if (!/\:\/\//.test(obj.url) ) {
-                        obj.url = local.options.conf.hostname + obj.url;
+                        obj.url = hostname + obj.url;
                     }
 
                     if (obj.media)
@@ -1693,7 +1699,7 @@ function SuperController(options) {
                     }
                     // TODO - add support for cdn
                     if (!/\:\/\//.test(obj.url) ) {
-                        obj.url = local.options.conf.hostname + obj.url;
+                        obj.url = hostname + obj.url;
                     }
                     str += '\n\t\t<script'+ deferMode +' type="'+ obj.type +'" src="'+ obj.url +'"></script>'
                 }