gina 0.1.1-alpha.15 → 0.1.1-alpha.151

package/framework/{v0.1.1-alpha.15 → v0.1.1-alpha.151}/lib/cmd/framework/tail.js

@@ -1,169 +1,208 @@
 var fs          = require('fs');
+var os          = require("os");
 var util        = require('util');
 var net         = require('net');
 
+var EventEmitter    = require('events').EventEmitter;
+var e               = new EventEmitter();
+
 var CmdHelper       = require('./../helper');
 var console         = lib.logger;
 var LoggerHelper    = require( _(GINA_FRAMEWORK_DIR + '/lib/logger/src/helper.js', true) );
 
 /**
  * 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`
  *
  * e.g.
  *  gina framework:tail
  *  or
  *  gina tail
+ *  or
+ *  gina tail --keep-alive
  *
  * */
 function Tail(opt, cmd) {
     var self        = {};
     var nIntervId   = null;
-    var mqPortFile  = _(GINA_DIR +'/tmp/mq-listener-v'+ GINA_VERSION +'.port', true);
+    var mqPortFile  = _(getTmpDir() +'/mq-listener-v'+ GINA_VERSION +'.port', true);
 
     var init = function(opt, cmd) {
-        
+
         console.debug('Getting framework logs');
-        
+
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
-                        
+
         // check CMD configuration
         //if (!isCmdConfigured()) return false;
-        
+
         // handle server not started yet or server exited
         process.on('gina#mqlistener-started', function onGinaStarted(mqPort) {
             clearInterval(nIntervId);
             nIntervId = null;
-            opt.port = mqPort;
+            opt.mqPort = mqPort;
             tail(opt, cmd);
         });
-                
+
+        // process.on('gina#container-writting', function onGinaStarted(hostV4, mqPort, type) {
+        //     console.info('[MQTail] Container resumed writting on  `'+ hostV4 +'` on port `'+ mqPort +'` :)');
+        //     opt.mqPort = mqPort;
+        //     console.resumeReporting()
+        //     tail(opt, cmd);
+        // });
+
+
+
+
         // if (!self.name) {
         //     status(opt, cmd, 0);
         // } else {
             tail(opt, cmd);
-        // }        
+        // }
     }
-    
-        
-    var tail = function(opt, cmd) {
-        
-        var port = opt.port || 8125;
+
+
+    var tail = function(opt, cmd, isResuming) {
+
+        var port = opt.mqPort || GINA_MQ_PORT || 8125;
+        var host = opt.hostV4 || GINA_HOST_V4 || '127.0.0.1';
         var clientOptions = {
+            host    : host,
             port    : port,
-            request : 'tail' 
+            request : 'tail'
         }
         var loggerOptions   = console.getOptions();
         var loggers         = console.getLoggers();
         var loggerHelper    = LoggerHelper(loggerOptions, loggers);
         var format          = loggerHelper.format;
-        
+
         var delayedMessages = [];
         var resumeTail = function() {
             var i = 0;
             while (i < delayedMessages.length) {
                 let pl = delayedMessages[i];
-                
+
                 process.stdout.write( format(pl.group, pl.level, pl.content) );
                 i++;
             }
             delayedMessages = []
         }
-        
-        
+
+
+
+
+
         var client = net.createConnection(clientOptions, () => {
-            
+
+            e.emit('gina#mqtail-started', true);
+
             // 'connect' listener.
             console.resumeReporting();
-            console.info('[MQTail] connected to server :)');            
-            
+            // console.debug('[MQTail] connected with opt `'+ JSON.stringify(opt, null, 2) +'` :)');
+            console.info('[MQTail] Connected to server `'+ host +'` on port `'+ port +'` :)');
+
             // send request
             client.write( JSON.stringify(clientOptions) +'\r\n');
-            
+
         });
         client.on('error', (data) => {
             var err = data.toString();
             console.error('[MQTail] ' + err + ' - Gina might not be running');
-            console.info('[MQTail] waitting for `MQListener` to be started ...');
-            
-            var mqPort = null;            
-            nIntervId = setInterval(() => {
-                try {
-                    mqPort = ~~(fs.readFileSync(mqPortFile).toString());
-                    if (mqPort) {
-                        process.emit('gina#mqlistener-started', mqPort);
-                    }
-                } catch (fileErr) {}
-            }, 100);
+            console.info('[MQTail] Waitting for `MQListener` to be started ...');
+
+            // var mqPort = null;
+            // nIntervId = setInterval(() => {
+            //     try {
+            //         mqPort = ~~(fs.readFileSync(mqPortFile).toString());
+            //         if (mqPort) {
+            //             process.emit('gina#mqlistener-started', mqPort, host);
+            //         }
+            //     } catch (fileErr) {}
+            // }, 100);
         });
-        
+
         var payloads = null, i = null;
         client.on('data', (data) => {
-            //console.log('[MQTail]  (data): ' + data.toString());
+            // console.log('[MQTail]  (data): ' + data.toString());
             payloads = data.toString();
-                
+
             // from speakers & tail
             if ( /^(\{\"|\[\{\")/.test(payloads) ) {
                 payloads = payloads.split(/\r\n/g);
                 //console.log(payloads);
-                i = -1; 
-                while(i < payloads.length) { 
+                i = -1;
+                while(i < payloads.length) {
                     i++;
                     let payload = payloads[i];
-                    if ( 
+                    if (
                         /^\{/.test(payload) && /\}$/.test(payload)
-                        || /^\[\{/.test(payload) && /\}\]$/.test(payload) 
+                        || /^\[\{/.test(payload) && /\}\]$/.test(payload)
                     ) {
                         let pl = null;
                         try {
                             pl = JSON.parse(payload);
                         } catch(plErr) {
-                            process.stdout.write( '[MQTail] (exception) '+ payload +'\n' );
+                            process.stdout.write( '[MQTail] (Exception) '+ payload +'\n' );
                             continue;
-                        }                
-                            
-                        
-                        if (!pl.content) {                            
+                        }
+
+
+                        if (!pl.content) {
                             // only for debug
                             // process.stdout.write( '[MQTail] (undefined content) '+ JSON.stringify(pl, null) +'\n' );
-                            
+
                             // updating logger context since it can run on different processes
                             if ( pl.sessionId && !clientOptions.sessionId ) {
                                 clientOptions.sessionId = pl.sessionId;
                                 // acknowledging
                                 client.write( JSON.stringify(clientOptions) +'\r\n');
                             }
-                            
+
                             if (pl.loggers) {
                                 loggers = merge(loggers, pl.loggers);
                                 if (delayedMessages.length > 0) {
                                     resumeTail()
                                 }
-                            }                            
+                            }
                             continue;
                         }
-                        
+
+                        // resuming logging from another process
+                        // we do not want to print twice in this case since another logger server is already running
+                        // if (isResuming) {
+                        //     return
+                        // }
+
                         // only for debug
-                        //process.stdout.write(  '[MQTail] '+ pl.content +'\n' );
-                        
-                        try {                            
+                        // process.stdout.write(  '[MQTail] '+ pl.content +'\n' );
+
+                        try {
                             process.stdout.write( format(pl.group, pl.level, pl.content) );
+                            if (
+                                /(exiting|Got exit code)(.*)(SIGKILL|SIGTERM|SIGINT)/.test(pl.content)
+                                && opt.argv.indexOf('--keep-alive') < 0
+                            ) {
+                                client.destroy();
+                                return end()
+                            }
                         } catch (writeErr) {
                             // means that the related MQSpeaker is not connected yet
                             // this can happen during `bundle:start` configuration
                             // we'll then delay the output until MQSpeaker is ready
                             delayedMessages.push(pl);
                         }
-                        
-                    }                        
-                }                
+
+                    }
+                }
             }
-            
+
         });
         client.on('end', () => {
-            console.warn('[MQTail] disconnected from server');
-            console.info('[MQTail] waitting for `MQListener` to be started ...');
-            var mqPort = null;            
+            console.warn('[MQTail] Disconnected from server');
+            console.info('[MQTail] Waitting for `MQListener` to be started ...');
+            var mqPort = null;
             nIntervId = setInterval(() => {
                 try {
                     mqPort = ~~(fs.readFileSync(mqPortFile).toString());
@@ -175,9 +214,22 @@ function Tail(opt, cmd) {
         });
         // setInterval(() => {}, 1 << 30);
     }
-    
 
-    init(opt, cmd);    
+    var end = function (err, type, messageOnly) {
+        if ( typeof(err) != 'undefined') {
+            var out = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? err.message : (err.stack||err.message);
+            if ( typeof(type) != 'undefined' ) {
+                console[type](out)
+            } else {
+                console.error(out);
+            }
+        }
+
+        process.kill(process.pid, 'SIGINT')
+    }
+
+
+    init(opt, cmd);
 }
 
 module.exports = Tail;

package/framework/{v0.1.1-alpha.15 → v0.1.1-alpha.151}/lib/cmd/framework/version.js

@@ -31,11 +31,20 @@ function Version(opt){
             console.error(msg.basic[5])
         }
 
-        // end();
+        end();
     };
 
-    var end = function(err) {
-        process.exit( err ? -1:0 )
+    var end = function (err, type, messageOnly) {
+        if ( typeof(err) != 'undefined') {
+            var out = ( typeof(messageOnly) != 'undefined' && /^true$/i.test(messageOnly) ) ? err.message : (err.stack||err.message);
+            if ( typeof(type) != 'undefined' ) {
+                console[type](out)
+            } else {
+                console.error(out);
+            }
+        }
+
+        process.exit( err ? 1:0 )
     }
 
     init(opt)

package/framework/{v0.1.1-alpha.15 → v0.1.1-alpha.151}/lib/cmd/helper.js

@@ -1,6 +1,8 @@
+const { execSync } = require('child_process');
 var fs          = require('fs');
 var console     = lib.logger;
 var merge       = lib.merge;
+var Collection  = lib.Collection;
 var helpers     = require( getPath('gina').helpers);
 /**
  * CmdHelper
@@ -44,6 +46,7 @@ function CmdHelper(cmd, client, debug) {
         // global projects collection {collection}
         projects : null, // defined by filterArgs()
         projectsPath : _(GINA_HOMEDIR + '/projects.json'), // ~/.gina/project.json
+        projectsList : [], // Array of project names, asc sorted
         // current project path
         projectPath : null, // local project/manifest.json - defined by filterArgs()
         projectConfigPath: null, // path to .gina/project.json
@@ -148,7 +151,7 @@ function CmdHelper(cmd, client, debug) {
             }
         }
 
-        //console.log('nodeParams ', cmd.nodeParams)
+        // console.debug('nodeParams ', cmd.nodeParams)
     }
 
     /**
@@ -187,6 +190,14 @@ function CmdHelper(cmd, client, debug) {
             }
 
             cmd.projects    = requireJSON( cmd.projectConfigPath );
+            var pIndex      = 0;
+            for (let p in cmd.projects) {
+                if ( new _(cmd.projects[p].path).existsSync() ) {
+                    cmd.projectsList[pIndex] = p;
+                    pIndex++
+                }
+            }
+            cmd.projectsList.sort();
 
             // bundles passed to the CMD
             cmd.bundles = ( typeof(cmd.bundles) == 'undefined' ) ? [] : cmd.bundles;
@@ -330,7 +341,7 @@ function CmdHelper(cmd, client, debug) {
 
                         cmd.projectName = folder;
                         cmd.projectLocation = _(process.cwd(), true);
-                    } else if (!/\:help$/.test(cmd.task)) {
+                    } else if (!/\:help$/.test(cmd.task) && !/port\:reset$/.test(cmd.task) ) {
 
                         errMsg = 'No project name found: make sure it starts with `@` as `@<project_name>`';
                         console.error(errMsg);
@@ -340,7 +351,7 @@ function CmdHelper(cmd, client, debug) {
                 }
             }
 
-            // only when adding a project
+            // Additional project checking & actions
             if (cmd.projectName != null) {
                 // valid name but not in projects and task != :add, :remove or :import
                 if ( typeof(cmd.projects[cmd.projectName]) == 'undefined' && !/\:(add|import|remove)$/.test(cmd.task) ) {
@@ -367,7 +378,8 @@ function CmdHelper(cmd, client, debug) {
 
 
             loadAssets();
-            cmd.configured = true;
+            // cmd.configured = true;
+            var err = null;
 
             return true; // completed configuration
 
@@ -423,6 +435,10 @@ function CmdHelper(cmd, client, debug) {
             //&& !cmd.params['force']
         ) { // ignore when adding project
 
+            if (!cmd.projectPath) {
+                cmd.projectPath =  _(cmd.projects[cmd.projectName].path + '/manifest.json', true);
+
+            }
 
             if ( typeof(require.cache[cmd.projectPath]) != 'undefined') {
                 delete require.cache[require.resolve(cmd.projectPath)]
@@ -540,6 +556,39 @@ function CmdHelper(cmd, client, debug) {
                     }
                 }
             }
+
+            cmd.configured = true;
+
+            // detect node_modules vs platform
+            // if (
+            //     cmd.projectName != null
+            //     && /^true$/i.test(GINA_GLOBAL_MODE)
+            //     && !/\:(link|link-node-modules)$/.test(cmd.task)
+            //     && !/(project\:add)$/.test(cmd.task)
+            // ) {
+            //     console.debug('Running: gina link-node-modules @'+cmd.projectName);
+            //     err = execSync('gina link-node-modules @'+cmd.projectName); // +' --inspect-gina'
+            //     console.debug(err.toString());
+            //     if (err instanceof Error) {
+            //         console.error(err.message || err.stack);
+            //         return exit(err.message || err.stack);
+            //     }
+            // }
+
+            // linking gina
+            if (
+                cmd.projectName != null
+                && /^true$/i.test(GINA_GLOBAL_MODE)
+                && !/\:(link|link-node-modules)$/.test(cmd.task)
+                && !/(project\:add)$/.test(cmd.task)
+            ) {
+                console.debug('Running: gina link @'+cmd.projectName);
+                err = execSync('gina link @'+cmd.projectName);// +' --inspect-gina'
+                if (err instanceof Error) {
+                    console.error(err.message || err.stack);
+                    return exit(err.message || err.stack);
+                }
+            }
         }
 
         //console.debug('[ ConfigAssetsLoaderHelper ] Loaded portsData\n'+ JSON.stringify(cmd.portsData, null, 4));
@@ -1034,7 +1083,7 @@ function CmdHelper(cmd, client, debug) {
                     let scheme = allProjectSchemes[s];
                     // skipping none `https` schemes for `http/2`
                     if ( /^http\/2/.test(protocol) && scheme != 'https' ) {
-                        console.debug('skipping none `https` schemes for `http/2`');
+                        // console.debug('skipping none `https` schemes for `http/2`');
                         continue;
                     }
                     if ( typeof(ports[protocol][scheme]) == 'undefined' ) {
@@ -1129,6 +1178,26 @@ function CmdHelper(cmd, client, debug) {
         }
     }
 
+    orderBundles = function(bundles) {
+        var bList = [], i = 0;
+        for (let b in bundles) {
+            bList[i] = bundles[b];
+            bList[i].name = b;
+            i++;
+        }
+
+        bList = new Collection(bList)
+            .orderBy({name: 'asc'})
+            .toRaw();
+
+        var newBundles = {}
+        for (let i = 0, len = bList.length; i < len; i++) {
+            newBundles[ bList[i].name ] = bList[i]
+        }
+
+        return newBundles;
+    }
+
 
     exit = function(errorMessage) {
         // CMD Client exit

package/framework/{v0.1.1-alpha.15 → v0.1.1-alpha.151}/lib/cmd/index.js

@@ -37,7 +37,7 @@ cmd.setOption = function(option) {
             cmd.option[option[i].name] = option[i].content
         }
     } else {
-        cmd.option[options.name] = option.content
+        cmd.option[options.name] = option.content// jshint ignore:line
     }
 }
 
@@ -46,8 +46,8 @@ cmd.getString = function() {
         .toString()
         .replace(/,/g,' ')
         .replace(/node\s/g, 'gina ');
-        //.replace(/node/g, 'gina');    
-    
+        //.replace(/node/g, 'gina');
+
     var cmdArr = cmd.split('/');
     cmd = cmdArr[cmdArr.length-1];
     return cmd
@@ -71,14 +71,14 @@ cmd.getOptions = function() {
 
 
 cmd.onExec = function(client, isFromFramework, opt) {
-    
-    var console = lib.logger;
+
+    var console = lib.logger;// jshint ignore:line
     cmd.option = opt;
-        
-    var Proc = require( getPath('gina').lib + '/proc');
+
+    var Proc = require( getPath('gina').lib + '/proc');// jshint ignore:line
     var self = {};
 
-    cmd.msg = require( _(__dirname + '/framework/msg.json') );
+    cmd.msg = require( _(__dirname + '/framework/msg.json') );// jshint ignore:line
     self.isFromFramework = opt.isFromFramework || isFromFramework || false;
     self.isOnlineCommand = opt.isOnlineCommand || false;
 
@@ -93,38 +93,38 @@ cmd.onExec = function(client, isFromFramework, opt) {
 
     var init = null;
     if (self.isFromFramework) {
-        
+
         init = require('./framework/init')(opt);
         //Framework CMD.
         if (opt.task.action == 'start') {
-            // Current version of the framework by default 
+            // Current version of the framework by default
             // But can be overriden with argument: @{version_number}
             // eg.: gina stop @1.0.0
-            self.version = getEnvVar('GINA_VERSION');
+            self.version = getEnvVar('GINA_VERSION');// jshint ignore:line
             // checkcking version number
             if ( typeof(opt.argv[3]) != 'undefined' && /^@/.test(opt.argv[3]) ) {
                 var err = null;
-                var version = opt.argv[3].replace(/\@/, '');            
+                var version = opt.argv[3].replace(/\@/, '');
                 var shortVersion = version.split('.').splice(0,2).join('.');
                 if ( !/^\d\.\d/.test(shortVersion) ) {
                     err = new Error('Wrong version: '+ version);
                     console.log(err.message);
                     return;
                 }
-                var availableVersions = requireJSON(_(getEnvVar('GINA_HOMEDIR') +'/main.json', true)).frameworks[shortVersion];
+                var availableVersions = requireJSON(_(getEnvVar('GINA_HOMEDIR') +'/main.json', true)).frameworks[shortVersion];// jshint ignore:line
                 if ( availableVersions.indexOf(version) < 0 ) {
                     err = new Error('Version not installed: '+ version);
                     console.log(err.message);
                     return;
                 }
-                
+
                 self.version = version;
             }
-            
+
             init.onComplete( function done(err, run){
                 console.debug('loading task `',  opt.task.topic +':'+ opt.task.action, '`');
-                
-                //Setting master process with its own PID file.                
+
+                //Setting master process with its own PID file.
                 cmd.proc = new Proc('gina-v' + self.version, process);
                 cmd.proc.setMaster(process.pid);
 
@@ -142,7 +142,7 @@ cmd.onExec = function(client, isFromFramework, opt) {
                 })
             })
         } else { // Offline CMD
-            init.onComplete( function done(err, run, opt){                
+            init.onComplete( function done(err, run, opt){
                 run(opt)
             })
         }
@@ -154,11 +154,11 @@ cmd.onExec = function(client, isFromFramework, opt) {
         }
         opt.task.topic  = arr[0];
         opt.task.action = arr[1];
-        
+
         console.debug('[ FRAMEWORK ] is starting online CLI '+ arr[0] +':'+arr[1]);
-        
+
         init = require('./framework/init')(opt);
-        init.onListen( function done(err, run, opt){            
+        init.onListen( function done(err, run, opt){
             run(opt, cmd)
         })