gina 0.1.1-alpha.16 → 0.1.1-alpha.161

package/framework/{v0.1.1-alpha.16 → v0.1.1-alpha.161}/lib/cmd/framework/stop.js

@@ -13,12 +13,12 @@ var console     = lib.logger;
  *  or
  *  gina stop
  *  or
- *  gina stop @1.0.0 
+ *  gina stop @1.0.0
  *
  * */
 function Stop(opt, cmd) {
     var self    = {
-        // 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
         version: GINA_VERSION,
@@ -26,21 +26,21 @@ function Stop(opt, cmd) {
         // This is required if you don't use gina (gina/bin/cli) as a daemon
         fakeDeamonPid: false
     };
-    
 
-    var init = function(opt, cmd) {        
+
+    var init = function(opt, cmd) {
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
-        
+
         // check CMD configuration
         //if (!isCmdConfigured()) return false;
-        
+
         var err = null;
         var argv = opt.argv;
-        for (let i = 0, len = argv.length; i < len; i++) {            
+        for (let i = 0, len = argv.length; i < len; i++) {
             // checkcking version number
             if ( /^\@/.test(argv[i]) ) {
-                let version = argv[i].replace(/\@/, '');            
+                let version = argv[i].replace(/\@/, '');
                 let shortVersion = version.split('.').splice(0,2).join('.');
                 if ( !/^\d\.\d/.test(shortVersion) ) {
                     err = new Error('Wrong version: '+ version);
@@ -53,24 +53,24 @@ function Stop(opt, cmd) {
                     console.log(err.message);
                     break;
                 }
-                
+
                 self.version = version;
                 continue;
             }
         }
-        
+
         if ( err ) {
             return;
         }
         console.debug('Stopping framework v'+ self.version);
-        
+
         // if (!self.name) {
         //     stop(opt, cmd, 0);
         // } else {
             stop(opt, cmd);
-        // }        
+        // }
     }
-    
+
     var stop = function(opt, cmd) {
         var pidFiles = null, err = null;
         try {
@@ -78,23 +78,25 @@ function Stop(opt, cmd) {
         } catch (fileError) {
             throw fileError
         }
-        
+
         var runningVersions = [];
         for (let i=0, len=pidFiles.length; i<len; i++) {
             let file = pidFiles[i];
             if ( !/^gina\-/.test(file) ) {
                 continue;
             }
-            let pid = fs.readFileSync(_(GINA_RUNDIR +'/'+ file)).toString().trim() || null;
+            let pid = fs.readFileSync(_(GINA_RUNDIR +'/'+ file, true)).toString().trim() || null;
+            new _(GINA_RUNDIR +'/'+ file, true).rmSync();
+
             runningVersions.push({
                 title   : file.replace(/\.pid$/, ''),
                 pid     : ~~pid
             });
         }
         var pid = null, fakeDaemonPid = null;
-        if ( runningVersions.length > 0 ) {
+        if ( runningVersions.length > 0 && new _(GINA_HOMEDIR +'/procs.json', true).existsSync() ) {
             // retrieve running pid vs running version
-            var runningProcs = requireJSON(_(GINA_HOMEDIR +'/procs.json', true));            
+            var runningProcs = requireJSON(_(GINA_HOMEDIR +'/procs.json', true));
             for (let name in runningProcs) {
                 if (runningProcs[name].version == self.version) {
                     pid = runningProcs[name].pid;
@@ -112,7 +114,7 @@ function Stop(opt, cmd) {
                 } catch (fakeDaemonErr) {
                     // this only means that it does not exists or has already been killed
                 }
-                
+
             }
             if (pid) {
                 for (let i=0, len=runningVersions.length; i<len; i++) {
@@ -122,12 +124,12 @@ function Stop(opt, cmd) {
                         break;
                     }
                 }
-                
+
                 console.log('Gina v'+ self.version + ' has been stopped');
                 return
-            }   
+            }
         }
-        
+
         // Double check in case of a bug ...
         if ( !isWin32() ) {
             var out  = null;
@@ -138,20 +140,34 @@ function Stop(opt, cmd) {
                 if ( out && typeof(out) == 'string' && out.trim().length > 0) {
                     pid = out.trim();
                     console.debug('Found unlinked process ['+ pid +']\nNow trying to kill it ...');
-                    
-                    process.kill(pid, 'SIGTERM');
+
+                    process.kill(pid, 'SIGKILL');
                     console.log('Gina v'+ self.version + ' has been stopped');
-                    return   
+                    return
                 }
             } catch(execErr) {
                 // Silence is golden ...
                 throw execErr
-            }            
+            }
         }
-        
-        console.log('Gina v'+ self.version + ' is not running');        
+
+        console.log('Gina v'+ self.version + ' is not running');
+        end()
     }
-    
+
+    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, cmd)
 }

package/framework/v0.1.1-alpha.161/lib/cmd/framework/tail.js

@@ -0,0 +1,271 @@
+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`
+ * This will also will restart bundle in case of crach
+ *
+ * e.g.
+ *  gina framework:tail
+ *  or
+ *  gina tail
+ *  or
+ *  gina tail --keep-alive
+ *
+ * */
+function Tail(opt, cmd) {
+
+    process.title = 'gina-tail';
+    var self        = {};
+    var nIntervId   = null;
+    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.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, 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'
+        }
+        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.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, host);
+            //         }
+            //     } catch (fileErr) {}
+            // }, 100);
+        });
+
+        var payloads = null, i = null;
+        client.on('data', (data) => {
+            // 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++;
+                    let payload = payloads[i];
+                    if (
+                        /^\{/.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' );
+                            continue;
+                        }
+
+
+                        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( format(pl.group, pl.level, pl.content) );
+                            if (
+                                /(exiting|Got exit code)(.*)(SIGKILL|SIGTERM|SIGINT)/.test(pl.content)
+                                ||
+                                // killed by terminal signal or activity monitor
+                                // Received SIGTERM or Received SIGINT)
+                                /(SIGTERM|SIGINT)/.test(pl.content)
+                                ||
+                                /JavaScript heap out of memory/.test(pl.content)
+                            ) {
+
+                                let bundleDesc = pl.content.match(/\`(.*)\@(.*\`)/);
+                                let bundle = null;
+                                let project = null;
+                                if ( Array.isArray(bundleDesc) && bundleDesc.length > 0) {
+                                    bundle = bundleDesc[1];
+                                    project= bundleDesc[2];
+                                } // else, must be `gina` (the framework)
+
+                                if (opt.argv.indexOf('--keep-alive') < 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) ) {
+                                    //     return;
+                                    // }
+                                    // Bundles only !
+                                    if (bundle) {
+                                        process.stdout.write('[MQTail] Not keeping alive bundle `'+ bundle +'`\n');
+                                        client.destroy();
+                                        return end()
+                                    }
+                                }
+                                // TODO - restart bundle if not starting or restarting
+                                else if (
+                                    opt.argv.indexOf('--keep-alive') > -1
+                                    && ! /(SIGKILL|SIGTERM|SIGINT)/.test(pl.content)
+                                ) {
+                                    // only for debug
+                                    process.stdout.write('[MQTail] '+ JSON.stringify(payloads, null, 2) +'\n' );
+                                }
+                            }
+                        } 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;
+            nIntervId = setInterval(() => {
+                try {
+                    mqPort = ~~(fs.readFileSync(mqPortFile).toString());
+                    if (mqPort) {
+                        process.emit('gina#mqlistener-started', mqPort);
+                    }
+                } catch (fileErr) {}
+            }, 100);
+        });
+        // setInterval(() => {}, 1 << 30);
+    }
+
+    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.16 → v0.1.1-alpha.161}/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.16 → v0.1.1-alpha.161}/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