gina 0.1.1-alpha.98 → 0.1.2-alpha.1

package/bin/cli

@@ -1,17 +1,19 @@
 #!/usr/bin/env node
 'use strict';
 
-var fs          = require('fs');
-var net         = require('net');
-var util        = require('util');
-var os          = require("os");
-var promisify   = util.promisify;
+var fs              = require('fs');
+var net             = require('net');
+var util            = require('util');
+var os              = require('os');
+var promisify       = util.promisify;
 
 async function onExec() {
 
     // process.stdout.write('GINA CLI LOADED !! ' + JSON.stringify(process.argv, null, 2) + '\n');
 
     var isWin32         = (process.platform === 'win32') ? true : false;
+    var arch            = process.arch;
+    var platform        = process.platform;
     var binPath         = __dirname;
     var ginaPath        = (binPath.replace(/\\/g, '/')).replace('/bin', '');
     ginaPath = (isWin32) ? ginaPath.replace(/\//g, '\\') : ginaPath;
@@ -26,10 +28,16 @@ async function onExec() {
         , debugBrkEnabled   = false
         , isUpdateRequired  = false
         , params            = process.argv
+        , settings          = null
+        , hostname          = os.hostname() // by default
+        , hostV4            = null
+        , mqPort            = null
+        , settingsPath      = null
+        , err               = null
     ;
     try {
         var packObj         = require(pack);
-        var version         = getEnvVar('GINA_VERSION') || packObj.version;// jshint ignore:line
+        var version         = getEnvVar('GINA_VERSION') || packObj.version;// jshint ignore:line
         frameworkPath   = ginaPath + '/framework/v' + version;
         var generator   = require(frameworkPath + '/lib/generator');
 
@@ -38,8 +46,9 @@ async function onExec() {
 
         // catching debug|inspect arg
         //process.stdout.write('params '+ params.join(', ') + '\n');
+
         if ( params.length > 0 ) {
-            for (var p = 0, len = params.length; p < len; ++p) {
+            for (let p = 0, len = params.length; p < len; ++p) {
 
                 if ( /^\-\-port/.test(params[p]) ) {
                     let port = params[p].split(/\=/)[1];
@@ -48,6 +57,27 @@ async function onExec() {
                     continue;
                 }
 
+                if ( /^\-\-mq\-port/.test(params[p]) ) {
+                    let mqPort = params[p].split(/\=/)[1];
+                    setEnvVar('GINA_MQ_PORT', ~~mqPort);// jshint ignore:line
+                    isUpdateRequired = true;
+                    continue;
+                }
+
+                if ( /^\-\-host\-v4/.test(params[p]) ) {
+                    let host = params[p].split(/\=/)[1];
+                    setEnvVar('GINA_HOST_V4', host);// jshint ignore:line
+                    isUpdateRequired = true;
+                    continue;
+                }
+
+                if ( /^\-\-hostname/.test(params[p]) ) {
+                    hostname = params[p].split(/\=/)[1];
+                    setEnvVar('GINA_HOSTNAME', hostname);// jshint ignore:line
+                    isUpdateRequired = true;
+                    continue;
+                }
+
                 if ( /^\-\-debug(\_|\-)port/.test(params[p]) ) {
                     let port = params[p].split(/\=/)[1];
                     setEnvVar('GINA_DEBUG_PORT', ~~port);// jshint ignore:line
@@ -55,16 +85,17 @@ async function onExec() {
                     continue;
                 }
 
-                if ( /^\-\-(inspect|debug)/.test(params[p]) ) {
+                if ( /^\-\-(inspect|debug)/.test(params[p]) && !/^\-\-(inspect|debug)-gina/.test(params[p]) ) {
                     debugBrkEnabled = ( /\-brk/.test(params[p]) ) ? true : false;
                     debugPort       = params[p].split(/\=/)[1];
                     params.splice(p,1);
-                    break;
+                    continue;
                 }
             }
         }
 
 
+
         var shortVersion = version.split('.');
         shortVersion.splice(2);
         shortVersion = shortVersion.join('.');
@@ -76,9 +107,16 @@ async function onExec() {
         }
         home = getEnvVar('GINA_HOMEDIR');// jshint ignore:line
 
-        var settings = { 'log_level': 'info'}; // First time launch or reset
-        if ( new _( home +'/'+ shortVersion +'/settings.json', true ).existsSync() ) {
-            var settingsPath =  _( home +'/'+ shortVersion +'/settings.json', true );// jshint ignore:line
+        settings = { 'log_level': 'info' }; // First time launch or reset
+
+        var homeVersionDirObj = new _( home +'/'+ shortVersion, true );
+        if ( !homeVersionDirObj.existsSync() ) {
+            process.stdout.write('gina: Creating directory [ ' + homeVersionDirObj.toString() + ' ]\n');
+            homeVersionDirObj.mkdirSync();
+        }
+
+        settingsPath = _( homeVersionDirObj.toString() +'/settings.json', true );// jshint ignore:line
+        if ( new _(settingsPath).existsSync() ) {
             settings = requireJSON(settingsPath);// jshint ignore:line
         }
 
@@ -88,6 +126,34 @@ async function onExec() {
         setEnvVar('GINA_RUNDIR', settings['rundir']);// jshint ignore:line
         setEnvVar('GINA_LOGDIR', settings['logdir']);// jshint ignore:line
         setEnvVar('GINA_TMPDIR', settings['tmpdir']);// jshint ignore:line
+        setEnvVar('GINA_ENV', settings['env']);// jshint ignore:line
+        setEnvVar('GINA_SCOPE', settings['scope']);// jshint ignore:line
+
+        // prior to what settings says
+        if ( !settings['arch'] ) {
+            settings['arch'] = arch;
+            setEnvVar('GINA_ARCH', settings['arch']);// jshint ignore:line
+            isUpdateRequired = true;
+        }
+        if ( !settings['platform'] ) {
+            settings['platform'] = platform;
+            setEnvVar('GINA_PLATFORM', settings['platform']);// jshint ignore:line
+            isUpdateRequired = true;
+        }
+
+        if (hostname != settings['hostname'] /**&& !isUpdateRequired*/) {
+            setEnvVar('GINA_HOSTNAME', settings['hostname']);// jshint ignore:line
+            hostname = settings['hostname'];
+            isUpdateRequired = true;
+        }
+        hostV4 = getEnvVar('GINA_HOST_V4') || settings['host_v4'] || '127.0.0.1';// jshint ignore:line
+        mqPort = getEnvVar('GINA_MQ_PORT')|| settings['mq_port'] || 8125;// jshint ignore:line
+
+        if (!isUpdateRequired) {
+            setEnvVar('GINA_HOST_V4', settings['host_v4']);// jshint ignore:line
+            setEnvVar('GINA_MQ_PORT', settings['mq_port']);// jshint ignore:line
+            setEnvVar('GINA_HOSTNAME', settings['hostname']);// jshint ignore:line
+        }
 
         if ( typeof(packObj.config) != 'undefined' ) {
             if (typeof(packObj.config.prefix) != 'undefined' ) {
@@ -110,15 +176,16 @@ async function onExec() {
         if ( /(gina\/bin\/cli|gina\/\/bin\/gina)$/.test(process.argv[1]) ) {
 
             var MQListener = require(frameworkPath + '/lib/logger/src/containers/mq/listener.js');
-
-            var mqPort = 8125;
-            var mqListener = await new MQListener({ port: 8125 });
+            var mqListener = await new MQListener({ port: mqPort, host: hostV4 });
             // required for tail command
-            var mqPortFile = getTmpDir() + '/mq-listener-v'+ version +'.port';
+            var mqPortFile = getTmpDir() + '/mq-listener-v'+ version +'.port';// jshint ignore:line
             console.debug('Writting: '+ mqPortFile);
             fs.writeFileSync( mqPortFile, ''+mqPort );
             process.on('exit', function() {
-                fs.unlinkSync(mqPortFile);
+                if ( new _(mqPortFile).existsSync() ) {
+                    fs.unlinkSync(mqPortFile);
+                }
+
                 mqListener.close();
                 mqListener.unref();
             })
@@ -146,27 +213,37 @@ async function onExec() {
     if (!home) {
         console.error('No ' + ((isWin32) ? 'USERPROFILE' : 'HOME') + ' path found.');
         process.exit(1);
-    } else {
-        setEnvVar('GINA_HOMEDIR', home);// jshint ignore:line
-        setEnvVar('GINA_DIR', ginaPath);// jshint ignore:line
-        setEnvVar('GINA_FRAMEWORK_DIR', frameworkPath);// jshint ignore:line
-        setEnvVar('GINA_CORE', frameworkPath + '/core');// jshint ignore:line
     }
+
+    // setEnvVar('GINA_HOMEDIR', home);// jshint ignore:line
+    setEnvVar('GINA_DIR', ginaPath);// jshint ignore:line
+    setEnvVar('GINA_FRAMEWORK_DIR', frameworkPath);// jshint ignore:line
+    setEnvVar('GINA_CORE', frameworkPath + '/core');// jshint ignore:line
     setEnvVar('GINA_IS_WIN32', isWin32, true);// jshint ignore:line
 
-    if (isUpdateRequired) {
-        settings['port'] = getEnvVar('GINA_PORT') || null;// jshint ignore:line
-        settings['debug_port'] = getEnvVar('GINA_DEBUG_PORT') || null;// jshint ignore:line
-        console.debug('Updating debug settings: #'+  getEnvVar('GINA_DEBUG_PORT'));// jshint ignore:line
+    if (!settings) {
+        settings = requireJSON(settingsPath);// jshint ignore:line
+    }
+    if (isUpdateRequired && settings) {
+        console.debug('Updating debug settings ...');// jshint ignore:line
+        settings['arch'] = getEnvVar('GINA_ARCH') || settings['arch'] || null;// jshint ignore:line
+        settings['platform'] = getEnvVar('GINA_PLATFORM') || settings['platform'] || null;// jshint ignore:line
+        settings['port'] = getEnvVar('GINA_PORT') || settings['port'] || null;// jshint ignore:line
+        settings['debug_port'] = getEnvVar('GINA_DEBUG_PORT') || settings['debug_port'] || null;// jshint ignore:line
+
+        settings['mq_port'] = getEnvVar('GINA_MQ_PORT') || settings['mq_port'] || null;// jshint ignore:line
+        settings['host_v4'] = getEnvVar('GINA_HOST_V4') || settings['host_v4'] || null;// jshint ignore:line
+        settings['hostname'] = getEnvVar('GINA_HOSTNAME') || settings['hostname'] || null;// jshint ignore:line
         generator.createFileFromDataSync(settings, settingsPath);// jshint ignore:line
     }
 
 
     /**
      * Framework port
+     * To change it: gina framework:set --port=<port_number>
      * TODO - Add a port scanner & compare with ~/.gina/{shortVersion}/settings.json on `post_install`
      * */
-    var port = 8124;
+    var port = settings['port'] || 8124;
 
     // |-> framework/{version}/lib/cmd
     var allowedOffline = [
@@ -174,12 +251,12 @@ async function onExec() {
         'bundle:',
         'dev:',
         'env:',
+        'scope:',
         'framework:',
         'port:',
         'project:',
         'protocol:',
         'scheme:',
-        'scope:',
         'view:',
         '--', //options or other aliases.
         '-' //options or other aliases.
@@ -205,17 +282,25 @@ async function onExec() {
             && process.argv[2] === 'framework:start'
     ) {
 
-        //Start framework || launch online CMD.
-        require(binPath + '/cmd')({
-            binPath         : binPath,
-            ginaPath        : ginaPath,
-            frameworkPath   : frameworkPath,
-            homedir         : home,
-            port            : port,
-            debugPort       : debugPort,
-            debugBrkEnabled : debugBrkEnabled,
-            pack            : pack
-        });
+        try {
+            //Start framework || launch online CMD.
+            require(binPath + '/cmd')({
+                binPath         : binPath,
+                ginaPath        : ginaPath,
+                frameworkPath   : frameworkPath,
+                homedir         : home,
+                port            : port,
+                hostV4          : hostV4,
+                mqPort          : mqPort,
+                hostname        : hostname,
+                debugPort       : debugPort,
+                debugBrkEnabled : debugBrkEnabled,
+                pack            : pack
+            });
+        } catch (err) {
+            console.err(err)
+        }
+
 
 
     } else if (
@@ -232,6 +317,9 @@ async function onExec() {
             frameworkPath   : frameworkPath,
             homedir         : home,
             port            : port,
+            hostV4          : hostV4,
+            mqPort          : mqPort,
+            hostname        : hostname,
             debugPort       : debugPort,
             debugBrkEnabled : debugBrkEnabled,
             pack            : pack
@@ -242,11 +330,12 @@ async function onExec() {
     ) {
         // check allowedOffline ;)
         process.argv.splice(0,2);
-        console.error( '[ $ gina ' + process.argv.join(' ') + ' ] is not a valid command line' )
+        console.error( '[ $ gina ' + process.argv.join(' ') + ' ] is not a valid command line' );
+        process.exit(1)
     } else {
 
         //Connect to framework.
-        var client = net.connect({port: port},
+        var client = net.connect({port: port, host: hostV4},
             function() {
                 //Forwarding cmd.
                 // retieving debug infos

package/bin/cli-debug

@@ -8,6 +8,8 @@
  */
 const fs    = require('fs');
 const {exec} = require('child_process');
+const {execSync}   = require('child_process');
+const {spawn}   = require('child_process');
 const os    = require('os');
 
 var isWin32 = function() {
@@ -15,9 +17,9 @@ var isWin32 = function() {
 }
 
 var argv = process.argv.splice(2);
-argv = argv.join(' ');
+var argvStr = argv.join(' ');
 
-console.log('running: gina ' + argv );
+console.log('running: gina ' + argvStr );
 
 // fetching config
 var homeDir = (process.env[(isWin32()) ? 'USERPROFILE' : 'HOME'] );
@@ -30,9 +32,9 @@ version = version.splice(0, 2).join('.');
 var settings = require(homeDir + ((isWin32()) ? '\\' + version + '\\settings.json' : '/' + version +'/settings.json'));
 
 var debugPort = null;
-var params = argv.split(/\s+/g);
+var params = argvStr.split(/\s+/g);
 if ( params.length > 0 ) {
-    for (var p = 0, len = params.length; p < len; ++p) {
+    for (let p = 0, len = params.length; p < len; ++p) {
         if ( /^\-\-port/.test(params[p]) ) {
             setEnvVar('GINA_PORT', ~~params[p].split(/\=/)[1]);// jshint ignore:line
             continue;
@@ -41,20 +43,49 @@ if ( params.length > 0 ) {
             setEnvVar('GINA_DEBUG_PORT', ~~params[p].split(/\=/)[1]);// jshint ignore:line
             continue;
         }
-        if ( /^\-\-(inspect|debug)/.test(params[p]) ) {
-            debugPort = ~~params[p].split(/\=/)[1];
-            process.argv.splice(p,1);
+        if ( /^\-\-(inspect|debug)\-gina/.test(params[p]) ) {
+            debugPort = ~~params[p].split(/\=/)[1] || null;
+
+            argv.splice(argv.indexOf('--inspect-gina'), 1);
+            Array.prototype.splice.call(process.argv, argv.indexOf('--inspect-gina'), 1);
+            argvStr = argv.join(' ');
         }
     }
 }
 
-// gina defaullt debug port
+// gina default debug port
 debugPort = (debugPort != null) ? debugPort : '--inspect-brk=' + settings.debug_port;
-console.log('You should now start debug on port #'+ settings.debug_port);
-exec('node ' + debugPort +' '+ __dirname +'/cli ' + argv, (error, stdout, stderr) => {
-    if (error) {
-        console.error(`exec error: ${error}`);
-        return;
+
+// console.debug('OK ? ', 'node ' + debugPort +' '+ __dirname +'/cli ' + argvStr);
+// console.debug('\r\nDebugger attached.');
+console.log('\nYou should now start debug on port #'+ settings.debug_port +' before doing anything else ...');
+
+var nodeBin         = execSync('which node').toString().trim();
+var cliBin          = __dirname + '/cli';
+
+argv.splice(0, 0, debugPort);
+argv.splice(1, 0, cliBin);
+
+// console.debug('node ' + debugPort +' '+ __dirname +'/cli ' + argvStr);
+// console.debug('debugPort ', debugPort);
+// console.debug('argvStr ', argvStr);
+// console.debug('argv ', argv);
+
+var child = spawn(nodeBin, argv,
+    {
+        detached: true
     }
-    console.log(`${stdout}`);
-});
+);
+
+// set encoding
+child.stdout.setEncoding('utf8');
+child.stdout.on('data', function(data) {
+    process.stdout.write(data);
+});
+
+// when an exception is thrown, it is sent to the client
+child.stderr.setEncoding('utf8');
+child.stderr.on('data', function(data) {
+    process.stdout.write(data)
+});
+// exit is handle by the parent process

package/bin/cmd

@@ -10,9 +10,9 @@ function Cmd(opt, runOffine) {
 
     var local = {};
     var lib = {};
-    
+
     var init = function(opt, runOffine) {
-        
+
         local.port              = opt.port;
         local.debugPort         = opt.debugPort;
         local.debugBrkEnabled   = opt.debugBrkEnabled;
@@ -21,7 +21,11 @@ function Cmd(opt, runOffine) {
         local.ginaPath          = opt.ginaPath;
         local.homedir           = opt.homedir;
         local.frameworkPath     = opt.frameworkPath;
-        
+        local.hostname          = opt.hostname;
+        local.hostV4            = opt.hostV4;
+        local.mqPort            = opt.mqPort;
+        local.port              = opt.port;
+
         lib = require(local.frameworkPath + "/lib");
 
         checkIfSettings();
@@ -32,7 +36,7 @@ function Cmd(opt, runOffine) {
             launchFramework()
         }
     };
-    
+
 
     var launchFramework = function(){
 
@@ -62,14 +66,18 @@ function Cmd(opt, runOffine) {
                 //Launch.
                 lib.cmd.load({
                     isOnlineCommand : true,
-                    ginaPath : local.ginaPath,
-                    frameworkPath : local.frameworkPath,
-                    pack : local.pack,
-                    argv : argv,
-                    client : conn,
-                    homedir : local.homedir,
-                    debugPort : local.debugPort,
-                    debugBrkEnabled : local.debugBrkEnabled
+                    ginaPath        : local.ginaPath,
+                    frameworkPath   : local.frameworkPath,
+                    pack            : local.pack,
+                    argv            : argv,
+                    client          : conn,
+                    homedir         : local.homedir,
+                    port            : local.port,
+                    debugPort       : local.debugPort,
+                    debugBrkEnabled : local.debugBrkEnabled,
+                    hostname        : local.hostname,
+                    hostV4          : local.hostV4,
+                    mqPort          : local.mqPort
                 })
             })
         });
@@ -80,16 +88,22 @@ function Cmd(opt, runOffine) {
                 if (process.argv[2] == 'framework:start') {
                     var pid = null;
                     var port  = err.port || getEnvVar('GINA_PORT');// jshint ignore:line
-                    var runningProcs = requireJSON( _(getEnvVar('GINA_HOMEDIR') +'/procs.json', true) );// jshint ignore:line
-                    for (let i in runningProcs) {
-                        if (runningProcs[i].port == port) {
-                            pid = runningProcs[i].pid;
-                            break;
+                    var procsFile = _(getEnvVar('GINA_HOMEDIR') +'/procs.json', true);// jshint ignore:line
+                    if ( new _(procsFile).existsSync() ) {
+                        var runningProcs = requireJSON(procsFile);// jshint ignore:line
+                        for (let i in runningProcs) {
+                            if (runningProcs[i].port == port) {
+                                pid = runningProcs[i].pid;
+                                break;
+                            }
                         }
                     }
-                    
-                    
-                    console.warn('Framework already running: [ '+ pid+' ]');
+                    if (!pid) {
+                        console.warn('Framework already running on port`'+ opt.port +'`. Use `gina status` to get the PID to kill.');
+                        return;
+                    }
+
+                    console.warn('Framework already running on port `'+ opt.port +'`: [ '+ pid+' ]');
                 } else {
 
                 }
@@ -102,16 +116,20 @@ function Cmd(opt, runOffine) {
 
             //First time launch.
             lib.cmd.load({
-                ginaPath : local.ginaPath,
-                frameworkPath : local.frameworkPath,
-                pack : local.pack,
-                argv : process.argv,
-                client : process.stdout,
+                ginaPath        : local.ginaPath,
+                frameworkPath   : local.frameworkPath,
+                pack            : local.pack,
+                argv            : process.argv,
+                client          : process.stdout,
                 isFromFramework : true,
-                homedir : local.homedir,
-                debugPort : local.debugPort,
+                homedir         : local.homedir,
+                port            : local.port,
+                debugPort       : local.debugPort,
                 debugBrkEnabled : local.debugBrkEnabled,
-                task : {
+                hostname        : local.hostname,
+                hostV4          : local.hostV4,
+                mqPort          : local.mqPort,
+                task            : {
                     topic : "framework",
                     action : "start"
                 }
@@ -120,35 +138,39 @@ function Cmd(opt, runOffine) {
     };
 
     var launchCmd = function() {
-        
+
         var cmd         = process.argv[2].split(':')
             , topic     = cmd[0]
             , action    = cmd[1]
         ;
-                        
-        
+
+
         lib.cmd.load({
-            ginaPath : local.ginaPath,
-            frameworkPath : local.frameworkPath,
-            pack : local.pack,
-            argv : process.argv,
-            client : process.stdout,
+            ginaPath        : local.ginaPath,
+            frameworkPath   : local.frameworkPath,
+            pack            : local.pack,
+            argv            : process.argv,
+            client          : process.stdout,
             isFromFramework : true,
-            homedir : local.homedir,
-            debugPort : local.debugPort,
+            homedir         : local.homedir,
+            port            : local.port,
+            debugPort       : local.debugPort,
             debugBrkEnabled : local.debugBrkEnabled,
-            task : {
+            hostname        : local.hostname,
+            hostV4          : local.hostV4,
+            mqPort          : local.mqPort,
+            task            : {
                 topic : topic,
                 action : action
             }
-        })
+        });
     };
 
     var checkIfSettings = function() {
 
         var home        = getEnvVar('GINA_HOMEDIR');// jshint ignore:line
         var mainFile    = home + '/main.json';
-        
+
         if ( !fs.existsSync(mainFile) ) {
 
             var mainSrc = getEnvVar('GINA_DIR') + '/resources/home/main.json';// jshint ignore:line