gina 0.1.6-alpha.7 → 0.1.6-alpha.71

package/framework/{v0.1.6-alpha.7 → v0.1.6-alpha.71}/lib/cmd/framework/tail.js

@@ -2,6 +2,7 @@ var fs          = require('fs');
 var os          = require("os");
 var util        = require('util');
 var net         = require('net');
+var execSync    = require('child_process').execSync;
 
 var EventEmitter    = require('events').EventEmitter;
 var e               = new EventEmitter();
@@ -13,7 +14,7 @@ var LoggerHelper    = require( _(GINA_FRAMEWORK_DIR + '/lib/logger/src/helper.js
 /**
  * Framework tail
  * By default, tail will exit when a bundle is exiting. If you want to prevent
- * tail from exiting, you should use `--keep-alive`
+ * tail from exiting, you should use `--follow`
  * This will also will restart bundle in case of crach
  *
  * e.g.
@@ -21,7 +22,7 @@ var LoggerHelper    = require( _(GINA_FRAMEWORK_DIR + '/lib/logger/src/helper.js
  *  or
  *  gina tail
  *  or
- *  gina tail --keep-alive
+ *  gina tail --follow
  *
  * */
 function Tail(opt, cmd) {
@@ -30,6 +31,8 @@ function Tail(opt, cmd) {
     var self        = {};
     var nIntervId   = null;
     var mqPortFile  = _(getTmpDir() +'/mq-listener-v'+ GINA_VERSION +'.port', true);
+    // To allow auto restart on: JavaScript heap out of memory
+    var cmdUsedToStart = null;
 
 
     var init = function(opt, cmd) {
@@ -117,7 +120,7 @@ function Tail(opt, cmd) {
 
         client.on('error', (data) => {
             var err = data.toString();
-            console.error('[MQTail] ' + err + ' - Gina might not be running');
+            console.error('[MQTail] ' + err + ' - Gina might not be running, or host IP has changed.');
             console.info('[MQTail] Waitting for `MQListener` to be started ...');
 
             // var mqPort = null;
@@ -194,12 +197,15 @@ function Tail(opt, cmd) {
                         // }
 
                         // only for debug
-                        // process.stdout.write(  '[MQTail] '+ pl.content +'\n' );
+                        // process.stdout.write(  '[MQTail-debug] '+ pl.content +'\n' );
 
 
 
                         try {
+                            // Main output
                             process.stdout.write( format(pl.group, pl.level, pl.content) );
+
+
                             if (
                                 /(exiting|Got exit code)(.*)(SIGKILL|SIGTERM|SIGINT|SIGABRT)/.test(pl.content)
                                 ||
@@ -218,7 +224,7 @@ function Tail(opt, cmd) {
                                     project= bundleDesc[2];
                                 } // else, must be `gina` (the framework)
 
-                                if (opt.argv.indexOf('--keep-alive') < 0) {
+                                if (opt.argv.indexOf('--follow') < 0) {
                                     // TODO - exits only if no other bundle is runing in the project
                                     // let projectStatus = execSync("gina project:status @"+project);
                                     // if ( /is\ running/.test(projectStatus) ) {
@@ -233,16 +239,27 @@ function Tail(opt, cmd) {
                                 }
                                 // TODO - restart bundle if not starting or restarting
                                 else if (
-                                    opt.argv.indexOf('--keep-alive') > -1
+                                    opt.argv.indexOf('--follow') > -1
                                     && ! /(SIGKILL|SIGTERM|SIGINT)/.test(pl.content)
                                 ) {
-                                    // only for debug
-                                    process.stdout.write('[MQTail]['+ bundle +'] bundle is going offline !\n' );
+
+                                    // process.stdout.write('[MQTail]['+ bundle +'] TMP: '+ getTmpDir());
+                                    // restart the bundle: looking into payloads[0].content
+                                    if (bundle && project) {
+                                        // ?? only for debug
+                                        cmdUsedToStart = getBundleStartingArgv(bundle, project);
+                                        if (cmdUsedToStart) {
+                                            process.stdout.write('[MQTail]['+ bundle +'@'+ project +'] restarting with argv: '+ cmdUsedToStart +'\n' );
+                                            execSync(cmdUsedToStart);
+                                        }
+                                        process.stdout.write('[MQTail]['+ bundle +'@'+ project +'] bundle is going offline !\n' );
+
+                                        cmdUsedToStart = null;
+                                        break; // stop displaying ..
+                                    }
+
                                     process.stdout.write('[MQTail] '+ JSON.stringify(payloads, null, 2) +'\n' );
-                                    // restart the bundle: look into payloads[0].content
-                                    // if (project && bundle) {
 
-                                    // }
                                 }
                             }
 

package/framework/{v0.1.6-alpha.7 → v0.1.6-alpha.71}/lib/cmd/framework/version.js

@@ -5,13 +5,27 @@ var console = lib.logger;
 function Version(opt){
 
     var init = function(opt){
+        var arch = process.arch;
+        switch (process.arch) {
+            case 'x64':
+                arch = 'amd64'
+                break;
+            case 'armv7l':
+                arch = 'armhf'
+                break;
+            case 'x86':
+                arch = 'i386'
+                break;
+            default:
+                break;
+        }
         var vers = "",
             short = ( typeof(process.argv[3]) != 'undefined') ? process.argv[3]: false,
             msg = require('./msg.json'),
             version = {
                 "number"        : GINA_VERSION,
                 "platform"      : process.platform,
-                "arch"          : process.arch,
+                "arch"          : arch,
                 "middleware"    : fs.readFileSync(_( opt.frameworkPath + '/MIDDLEWARE')).toString() || 'none',
                 "copyright"     : require(opt.pack).copyright
             };

package/framework/{v0.1.6-alpha.7 → v0.1.6-alpha.71}/lib/cmd/helper.js

@@ -524,7 +524,7 @@ function CmdHelper(cmd, client, debug) {
                                     ) ? _(cmd.projects[cmd.projectName].homedir, true)
                                     : _(getUserHome() +'/.'+ cmd.projectName, true);
             var projectHomedirObject = new _(cmd.projectHomedir, true);
-            console.debug('Creating project homedir');
+            console.debug('Checking project homedir: '+ projectHomedirObject.toString());
             if (projectHomedirObject.existsSync() && !projectHomedirObject.isDirectory() ) {
                 throw new Error('Found ' + projectHomedirObject.toString() + ': but it appears to be a symbolik link !');
             } else if (!projectHomedirObject.existsSync() ) {
@@ -557,6 +557,7 @@ function CmdHelper(cmd, client, debug) {
                 bundlesLinkPathObj.rmSync();
             }
             if (!bundlesLinkPathObj.existsSync()) {
+                console.debug('[ FRAMEWORK ][ CmdHelper ] Linking ['+ projectBundlesPathObj.toString() +'] to [ '+ bundlesLinkPathObj.toString() +' ] ');
                 projectBundlesPathObj.symlinkSync(bundlesLinkPathObj.toString());
             }
             projectBundlesPathObj = null;
@@ -579,6 +580,7 @@ function CmdHelper(cmd, client, debug) {
                 releaseLinkPathObj.rmSync();
             }
             if (!releaseLinkPathObj.existsSync()) {
+                console.debug('[ FRAMEWORK ][ CmdHelper ] Linking ['+ projectReleasesPathObj.toString() +'] to [ '+ releaseLinkPathObj.toString() +' ] ');
                 projectReleasesPathObj.symlinkSync(releaseLinkPathObj.toString());
             }
 
@@ -602,6 +604,7 @@ function CmdHelper(cmd, client, debug) {
                 logLinkPathObj.rmSync();
             }
             if (!logLinkPathObj.existsSync()) {
+                console.debug('[ FRAMEWORK ][ CmdHelper ] Linking ['+ projectLogsPathObj.toString() +'] to [ '+ logLinkPathObj.toString() +' ] ');
                 projectLogsPathObj.symlinkSync(logLinkPathObj.toString());
             }
             projectLogsPathObj = null;
@@ -624,6 +627,7 @@ function CmdHelper(cmd, client, debug) {
                 tmpLinkPathObj.rmSync();
             }
             if (!tmpLinkPathObj.existsSync()) {
+                console.debug('[ FRAMEWORK ][ CmdHelper ] Linking ['+ projectTmpPathObj.toString() +'] to [ '+ tmpLinkPathObj.toString() +' ] ');
                 projectTmpPathObj.symlinkSync(tmpLinkPathObj.toString());
             }
             projectTmpPathObj = null;
@@ -848,7 +852,7 @@ function CmdHelper(cmd, client, debug) {
             cmd.configured = true;
 
 
-            // linking gina
+            // linking node-modules & gina
             if (
                 cmd.projectName != null
                 && /^true$/i.test(GINA_GLOBAL_MODE)

package/framework/{v0.1.6-alpha.7 → v0.1.6-alpha.71}/lib/cmd/project/add.js

@@ -661,8 +661,9 @@ function Add(opt, cmd) {
 
 
             var version = '0.0.1';
-            var scopes  = self.projects[self.projectName].scopes;
-            var envs    = self.projects[self.projectName].envs;
+            var scopes  = self.projects[self.projectName].scopes || self.scopes || self.mainConfig['scopes'][ GINA_SHORT_VERSION ];
+            var envs    = self.projects[self.projectName].envs || self.envs || self.mainConfig['envs'][ GINA_SHORT_VERSION ];
+
             data.bundles[local.bundle] = {
                 "_comment"  : "Your comment goes here.",
                 "version"   : version,

package/framework/{v0.1.6-alpha.7 → v0.1.6-alpha.71}/lib/cmd/project/build.js

@@ -27,7 +27,7 @@ var console     = lib.logger;
             return end( new Error('No bundle found in your project `'+ self.projectName +'`') );
         }
 
-        console.debug('Building project `'+ self.projectName +'`');
+        console.debug('[build] Building project `'+ self.projectName +'`');
         buildBundle(0);
     }
 
@@ -84,7 +84,7 @@ var console     = lib.logger;
             return end(err)
         }
 
-        console.debug('Building bundle `'+ bundle + '@'+ self.projectName + '`');
+        console.debug('[build] Building bundle `'+ bundle + '@'+ self.projectName + '`');
         buildEnv(self.defaultScope, b, e);
 
     }
@@ -110,7 +110,7 @@ var console     = lib.logger;
             , srcPath       = _(self.bundlesLocation +'/'+ bundle, true)
         ;
 
-        console.debug('Building bundle env `'+ env +'` for `'+ bundle + '@'+ self.projectName + '`');
+        console.debug('[build] Building bundle env `'+ env +'` for `'+ bundle + '@'+ self.projectName + '`');
 
         // cleanup
         if (release.existsSync()) {
@@ -124,7 +124,7 @@ var console     = lib.logger;
             // creating internal node_modules symlink
             var internalNodeModulesPathObj = new _( self.projectLocation +'/node_modules', true);
             if (internalNodeModulesPathObj.existsSync() ) {
-                console.debug('Linking node_modules to from `'+ internalNodeModulesPathObj.toString() +'` to `'+ destination +'/node_modules' +'`');
+                console.debug('[build] Linking node_modules to from `'+ internalNodeModulesPathObj.toString() +'` to `'+ _(destination +'/node_modules', true) +'`');
                 internalNodeModulesPathObj.symlinkSync(_(destination +'/node_modules', true));
             }
             internalNodeModulesPathObj = null;

package/framework/{v0.1.6-alpha.7 → v0.1.6-alpha.71}/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.7 → v0.1.6-alpha.71}/lib/collection/src/main.js

@@ -1210,6 +1210,13 @@ function Collection(content, options) {
 
 
                     if ( typeof(a) == 'string' && a != '' ||  typeof(b) == 'string' ) {
+                        // Fixed on 2025-03-08: allowed to compare with one of the fields being NULL or not defined
+                        if ( typeof(a) == 'undefined' || a == null) {
+                            a = ''; // cast to string
+                        }
+                        if ( typeof(b) == 'undefined' || b == null) {
+                            b = ''; // cast to string
+                        }
 
                         if ( typeof(a) == 'number' ) {
                             a = ''+a; // cast to string
@@ -1218,6 +1225,7 @@ function Collection(content, options) {
                             b = ''+b; // cast to string
                         }
 
+
                         return a.localeCompare(b, undefined, {sensitivity: 'case', caseFirst: 'upper'})
                     }
 

package/framework/v0.1.6-alpha.71/lib/domain/exemples/backend.js

@@ -0,0 +1,12 @@
+var myBundle        = require('gina');
+// gina lib samples
+var lib             = myBundle.lib;
+var Domain          = lib.Domain;
+
+var conf        = myBundle.getConfig();
+var isProxyHost = getContext('isProxyHost');
+var rootDomain = ( /^true$/i.test(isProxyHost) )
+    ? process.gina.PROXY_HOST || new Domain().getRootDomain(os.hostname()).value
+    : new Domain().getRootDomain(conf.host).value;
+
+// => mydomain.tld

package/framework/{v0.1.6-alpha.7 → v0.1.6-alpha.71}/lib/domain/src/main.js

@@ -6,9 +6,12 @@
  * file that was distributed with this source code.
  */
 
+
 // nodejs dependencies
 if ( typeof(module) !== 'undefined' && module.exports) {
     var fs              = require('fs');
+    var os              = require('os');
+    var dns             = require('dns');
     var execSync        = require('child_process').execSync;
     var util            = require('util');
     var promisify       = util.promisify;
@@ -285,6 +288,59 @@ function Domain(options, cb) {
         loadPSL(self.options, cb);
     }
 
+    /**
+     * Usage : await domainInstance.getFQDN()
+     * @param {string} hostname (one that can be resolved)
+     *
+     * @return {string} fqdn
+     */
+    var getFQDN = async function(hostname) {
+        var host = (
+            typeof(hostname) != 'undefined'
+            && hostname != ''
+        ) ? hostname : os.hostname();
+        if ( /\./.test(host) ) {
+            return host
+        }
+
+        console.debug('[DOMAIN][getFQDN] FQDN: ' + host);
+        var ipObj       = null
+            , err       = null
+        ;
+        ipObj = await promisify(dns.lookup)(host, { hints: dns.ADDRCONFIG || dns.V4MAPPED })
+                    .then( function onIP(result) {
+                        console.debug('[DOMAIN][getFQDN] IP: ' + result.address);
+                        console.debug('[DOMAIN][getFQDN] FAMILY: ' + result.family);
+
+                        return result;
+                    })
+                    .catch( function onIPErr(_err) {
+                        err = _err;
+                    });
+        if (err) {
+            throw err;
+        }
+        host = await promisify(dns.lookupService)(ipObj.address, 0)
+                    .then( function onLookupService(result) {
+                        console.debug('[DOMAIN][getFQDN] FQDN: ' + result.hostname);
+                        console.debug('[DOMAIN][getFQDN] Service: ' + result.service);
+
+                        return result.hostname;
+                    })
+                    .catch( function onLookupServiceErr(err) {
+                        err = _err;
+                    });
+        if (err) {
+            throw err;
+        }
+
+        if ( !/\./.test(host) ) {
+            throw new Error('[DOMAIN][getFQDN] `'+ host +'` is not a FQDN !');
+        }
+
+        return host;
+    }
+
 
     /**
      * Load a json file and removing comments if found
@@ -296,6 +352,7 @@ function Domain(options, cb) {
         if ( typeof(jsonFormat) == 'undefined' ) {
             jsonFormat = false
         }
+        urlOrHostname = urlOrHostname.trim();
         var isSLD = false
             , isRegisteredTldOrSld = false
             , rootDomain = urlOrHostname.replace(/^(.*)\:\/\/|\/(.*)/g, '')
@@ -395,7 +452,8 @@ function Domain(options, cb) {
     };
     // Backend proto only
     if (!isGFFCtx) {
-        _proto.updatePSL = updatePSL;
+        _proto.updatePSL    = updatePSL;
+        _proto.getFQDN      = getFQDN;
     }
     // Frontend only
     else {

package/framework/{v0.1.6-alpha.7 → v0.1.6-alpha.71}/lib/merge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge",
-  "version": "1.0.0",
+  "version": "1.2.1",
   "description": "Merge util",
   "authors": [
     {

package/framework/{v0.1.6-alpha.7 → v0.1.6-alpha.71}/lib/model.js

@@ -30,7 +30,7 @@ function ModelUtil() {
     var init = function() {
 
         if ( !ModelUtil.instance && !getContext('modelUtil') ) {
-            self.models             = self.models || {}; // used when getModel(modelName) is called
+            self.models             = self.models || {}; // used when getModel(modelName) is called
             self.entities           = {};
             self.entitiesCollection = {}; // used when getEntity(entityName) is called - handles entity relations
             self.files              = {};