gina 0.1.1-alpha.15 → 0.1.1-alpha.150

package/bin/cli-debug

@@ -3,7 +3,7 @@
 /**
  * Mainly used to debug framework CMD lib - default port should be #5858 by default
  * To modify the debug port :
- * 
+ *
  * $ gina framework:set --debug-port=<your new debug port>
  */
 const fs    = require('fs');
@@ -34,16 +34,16 @@ var params = argv.split(/\s+/g);
 if ( params.length > 0 ) {
     for (var p = 0, len = params.length; p < len; ++p) {
         if ( /^\-\-port/.test(params[p]) ) {
-            setEnvVar('GINA_PORT', ~~params[p].split(/\=/)[1]);
+            setEnvVar('GINA_PORT', ~~params[p].split(/\=/)[1]);// jshint ignore:line
             continue;
         }
         if ( /^\-\-debug(\_|\-)port/.test(params[p]) ) {
-            setEnvVar('GINA_DEBUG_PORT', ~~params[p].split(/\=/)[1]);
+            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);   
+            process.argv.splice(p,1);
         }
     }
 }

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(){
 
@@ -68,8 +72,12 @@ function Cmd(opt, runOffine) {
                     argv : argv,
                     client : conn,
                     homedir : local.homedir,
+                    port : local.port,
                     debugPort : local.debugPort,
-                    debugBrkEnabled : local.debugBrkEnabled
+                    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 {
 
                 }
@@ -109,8 +123,12 @@ function Cmd(opt, runOffine) {
                 client : process.stdout,
                 isFromFramework : true,
                 homedir : local.homedir,
+                port : local.port,
                 debugPort : local.debugPort,
                 debugBrkEnabled : local.debugBrkEnabled,
+                hostname: local.hostname,
+                hostV4: local.hostV4,
+                mqPort: local.mqPort,
                 task : {
                     topic : "framework",
                     action : "start"
@@ -120,13 +138,13 @@ 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,
@@ -135,20 +153,24 @@ function Cmd(opt, runOffine) {
             client : process.stdout,
             isFromFramework : true,
             homedir : local.homedir,
+            port: local.port,
             debugPort : local.debugPort,
             debugBrkEnabled : local.debugBrkEnabled,
+            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

package/bin/gina

@@ -2,27 +2,27 @@
 'use strict';
 /**
  * Fake Daemon
- * 
+ *
  * For service production script, you should use `./bin/cli` instead of `./bin/gina`
- * 
+ *
  * Usage:
  * $ gina <topic>:<task> <arguments>
- * 
+ *
  * eg.:
  * Start the server
  * $ gina start
  * or
  * $ gina framework:start
- *  
+ *
  * Start & debug the server (only)
  * $ gina start --inspect-gina
- * 
+ *
  * Stop the server
  * $ gina stop
- * 
+ *
  * Start a bundle
- * $ gina bundle:start demo @myproject
- * 
+ * $ gina bundle:start demo @myproject --max-old-space-size=2048
+ *
  * For zsh, if we want to hide all outputs
  * $ gina start  >&/dev/null &!
  */
@@ -33,47 +33,49 @@ const {execSync}   = require('child_process');
 var restartPid = null;
 
 function runAsSubProcess() {
-    
+
     var argv            =  Array.from(process.argv);
     var nodeBin         = execSync('which node').toString().trim();
     var cliBin          = __dirname + '/cli';
     var fakeDaemonPid   = '--fake-daemon-pid='+ process.pid;
-    
+
     if ( argv.indexOf('--inspect-gina') > -1 ) {
         cliBin  = __dirname + '/cli-debug';
         argv.splice(argv.indexOf('--inspect-gina'), 1);
         // removing `--inspect-gina`
         Array.prototype.splice.call(process.argv, argv.indexOf('--inspect-gina'), 1);
     }
-    
+
     argv.splice(0, 0, cliBin);
     argv.splice(argv.length, 0, fakeDaemonPid);
-    
+
     // overriding process.argv which is used in `./cli`
     Array.prototype.splice.call(process.argv, 0, 0, nodeBin);
     Array.prototype.splice.call(process.argv, 0, 0, cliBin);
     Array.prototype.splice.call(process.argv, process.argv.length, 0, fakeDaemonPid);
-    
+
+
+
     var child = spawn(nodeBin, argv,
         {
             detached: true
         }
     );
     var pid = null;
-        
+
     // set encoding
     child.stdout.setEncoding('utf8');
     child.stdout.on('data', function(data) {
-        
+
         // Uncomment if you want all the noise to debug
         // TODO - Allow if `GINA_ENV_IS_DEV` == true
         // check `~/.gina/{shortVersion}/settings.json`
         process.stdout.write(data);
-                
+
         /**
          * Filter messages from Logger
          */
-        
+
         // Normal case
         if ( new RegExp('Framework ready for connections','gmi').test(data) ) {
             console.info('Gina server started with PID `'+ child.pid +'`');
@@ -85,12 +87,16 @@ function runAsSubProcess() {
             // Do not use `process.exit(0)` right away or the framework PID file will be removed
             // after bundle:start, and only God knows whatever shit is going to happen
             // Make a pause until the CLI tels otherwise (process.kill(cmd.pid, 'SIGCONT');)
-            process.kill(process.pid, 'SIGSTOP');
+            // Docker considerations: All signals except for SIGKILL and SIGSTOP can be intercepted by the process.
+            // Ref.: https://medium.com/@gchudnov/trapping-signals-in-docker-containers-7a57fdda7d86
+
+            // process.kill(process.pid, 'SIGSTOP');
+            // Docker fix - 2022-08-20
             process.exit(0);
         }
-        
-        // If framework is already running        
-        if ( new RegExp('Framework already running','gmi').test(data) ) {   
+
+        // If framework is already running
+        if ( new RegExp('Framework already running','gmi').test(data) ) {
             pid = ''+data.match(/\[\s+\d+\s+\]/);
             if (pid && pid.length > 0) {
                 if (Array.isArray(pid) ) {
@@ -98,21 +104,21 @@ function runAsSubProcess() {
                 } else {
                     pid = pid.replace(/\[|\]|\s+/g, '');
                 }
-                
+
                 console.info('Gina server is already running with PID `'+ pid +'`');
             } else {
                 console.info('Gina server is already running');
             }
-            
+
             process.exit(0);
-        }        
-         
+        }
+
     });
-    
+
     //when an exception is thrown, it is sent to the client
     child.stderr.setEncoding('utf8');
     var error = null;
-    child.stderr.on('data', function(err) {  
+    child.stderr.on('data', function(err) {
         error = err.toString();
         if (/Debugger listening|Debugger attached|Warning|address already in use/i.test(error)) {
             console.warn(error);
@@ -120,14 +126,14 @@ function runAsSubProcess() {
         }
         console.error(error);
     });
-    
+
     //  TODO - Remove this, we should be able to check the logs in case of troubles
-    child.on('exit', function(code, signal) {                   
+    child.on('exit', function(code, signal) {
         // handles only signals that cannot be cannot be caught or ignored
         // ref.: `framework/<version>/lib/proc.js`
         if (/(SIGKILL|SIGSTOP)/i.test(signal)) {
             console.emerg('[' + this.pid + '] exiting with signal: ', signal);
-        }        
+        }
     });
 }
 
@@ -148,15 +154,15 @@ function runCMD() {
             r = i;
             break;
         }
-    
-    }    
-    if (restartPid) {       
+
+    }
+    if (restartPid) {
         console.debug('removing `--restart-pid`: '+ restartPid);
         // removing `--restart-pid`
         Array.prototype.splice.call(process.argv, r, 1);
     }
     // EO - filter restartPid
-    
+
     if ( /^(start|framework:start)$/.test(argv[2]) ) {
         try {
             // Filter args

package/framework/v0.1.1-alpha.150/VERSION

@@ -0,0 +1 @@
+0.1.1-alpha.150