gina 0.1.1-alpha.156 → 0.1.1-alpha.158

package/framework/{v0.1.1-alpha.156 → v0.1.1-alpha.158}/lib/cmd/framework/init.js

@@ -2,6 +2,7 @@ var fs              = require('fs');
 var EventEmitter    = require('events').EventEmitter;
 var e               = new EventEmitter();
 const { execSync }  = require('child_process');
+const { arch } = require('os');
 
 var console         = lib.logger;
 var ginaPath        = getPath('gina').root;
@@ -66,6 +67,9 @@ function Initialize(opt) {
             require(path)(opt, cmd)
         } catch(err) {
             console.crit('Gina has some troubles with command [ ', process.argv.join(' ') + ' ]\n' + err.stack);
+            if (opt.client) {
+                opt.client.write('Gina has some troubles with command [ ', process.argv.join(' ') + ' ]\n' + err.stack);
+            }
             process.exit(-1);
         }
     }
@@ -162,7 +166,8 @@ function Initialize(opt) {
                 mainConfig[k] = ( typeof(data[k]) == 'object' ) ? JSON.clone(data[k]) : data[k];
             }
         }
-
+        // arch
+        mainConfig.archs = merge(mainConfig.archs, data.archs, true);
         // envs
         mainConfig.envs = merge(mainConfig.envs, data.envs, true);
         // scopes
@@ -229,6 +234,56 @@ function Initialize(opt) {
         setEnvVar('GINA_GLOBAL_MODE', defGlobalMode);
     }
 
+    /**
+     * Check arch
+     *
+     * */
+    self.checkArch = function() {
+
+        var procArch = process.arch;
+        // ignored for framework:set
+        var mainConfig = require( self.opt.homedir + '/main.json' );
+        //has registered arch ?
+        var arch   = getEnvVar('GINA_ARCH') || mainConfig['def_arch'][self.release] || null; // arch by default
+        if ( mainConfig.archs[self.release].indexOf(arch) < 0 ) {
+            console.error('Arch [ ' + arch + ' ] not registered. Gina is not support your `architecture` at this moment.');
+            process.exit(1);
+        }
+
+        var isUpdateNeeded = false;
+        if (arch != procArch) {
+            // updating arch
+            arch = procArch;
+            if ( mainConfig.archs[self.release].indexOf(arch) < 0 ) {
+                console.error('Arch [ ' + arch + ' ] not registered. Gina is not support your `architecture` at this moment.');
+                process.exit(1);
+            }
+
+            isUpdateNeeded = true;
+            mainConfig['def_arch'][self.release] = arch;
+        }
+
+
+        // has local scope ?
+        if (
+            isUpdateNeeded
+            ||
+            typeof(mainConfig['def_arch']) == 'undefined'
+            ||
+            typeof(mainConfig['def_arch']) != 'undefined'
+            && typeof(mainConfig['def_arch'][self.release]) != 'undefined'
+            && mainConfig.archs[self.release].indexOf(mainConfig['def_arch'][self.release]) < 0
+        ) {
+            var target = _(self.opt.homedir +'/main.json');
+            lib.generator.createFileFromDataSync(
+                mainConfig,
+                target
+            )
+        }
+
+        // scanning project
+    }
+
     /**
      * Checking ports
      *
@@ -334,6 +389,7 @@ function Initialize(opt) {
     }
 
 
+
     /**
      * Checking settings, defining constants
      * Also done during bin/cmd init() ... so if you change here ...
@@ -345,6 +401,7 @@ function Initialize(opt) {
             , version       = getEnvVar('GINA_VERSION')
             , prefix        = getEnvVar('GINA_PREFIX') || main['def_prefix'][self.release]
             , globalMode    = getEnvVar('GINA_GLOBAL_MODE') || main['def_global_mode'][self.release]
+            , arch          = getEnvVar('GINA_ARCH') || main['def_arch'][self.release]
             , env           = getEnvVar('GINA_ENV') || main['def_env'][self.release]
             , scope         = getEnvVar('GINA_SCOPE') || main['def_scope'][self.release]
             , settings      = requireJSON( _( getPath('gina').root + '/resources/home/settings.json', true ) )
@@ -405,6 +462,7 @@ function Initialize(opt) {
                 'prefix' : prefix,
                 'global_mode': globalMode,
                 'version' : version,
+                'arch' : arch,
                 'env' : env,
                 'env_is_dev' : (main['dev_env'][self.release] == env) ? true : false,
                 'dev_env' : main['dev_env'][self.release],
@@ -493,9 +551,6 @@ function Initialize(opt) {
 
     }
 
-
-
-
     self.checkIfCertificatesDir = function() {
         var certsDir = new _( getEnvVar('GINA_HOMEDIR') + '/certificates', true);
         var theRSARootCertsDir = new _(certsDir.toString() + '/RSARootCerts', true);
@@ -540,6 +595,55 @@ function Initialize(opt) {
         }
     }
 
+    /**
+     * Checking PIDs for cleanup
+     *
+     **/
+    self.checkRunningPids = function() {
+        console.debug('Checking PIDs for cleanup...');
+        if ( /true/.test(getEnvVar('GINA_IS_WIN32')) ) {
+            console.debug(' Skipping for windows...');
+        }
+        var runDirObj = new _( getEnvVar('GINA_RUNDIR'), true );
+        var runDir = runDirObj.toString();
+
+        if ( runDirObj.existsSync() ) {
+            console.debug('Run dir: ', runDir );
+            var files = fs.readdirSync(runDir);
+            for (let f in files) {
+                if ( /^\./.test(files[f]) ) {
+                    continue;
+                }
+                let filenameObj = new _( runDir +'/'+ files[f], true );
+                let filename = filenameObj.toString();
+                let pid = fs.readFileSync(filename).toString();
+                if (!pid) {
+                    filenameObj.rmSync();
+                    continue;
+                }
+                let isRunnung = true;
+                try {
+                    let found = execSync("ps -p "+ pid +" -o pid="); //.replace(/\n$/g, '') || null;
+                    if (!found) {
+                        isRunnung = false;
+                    }
+                } catch (err) {
+                    isRunnung = false;
+                }
+
+                if (!isRunnung) {
+                    filenameObj.rmSync();
+                    continue;
+                }
+
+
+                console.debug(' Running: '+ filename +' ['+ pid +'] ['+ isRunnung +']');
+            } // EO for (let f in files) {
+        } else {
+            console.warn('Run directory `'+ runDir +'` not found !')
+        }
+    }
+
     self.end = function() {
         defineDefault(process.gina)
     }

package/framework/{v0.1.1-alpha.156 → v0.1.1-alpha.158}/lib/cmd/framework/restart.js

@@ -61,7 +61,11 @@ function Restart(opt, cmd) {
 
     var restart = function(opt, cmd) {
         stop();
-        start();
+        // if previous debug session
+        setTimeout(() => {
+            start(opt);
+        }, 100);
+
     }
 
     var stop = function() {
@@ -81,7 +85,7 @@ function Restart(opt, cmd) {
      * because of the `process.kill(..., 'SIGABRT')` used inside the orginal `start` script
      * or else, the restart script will be pending forever.
      */
-    var start = async function() {
+    var start = async function(opt) {
         console.debug('continue with start now');
         try {
             // var child = spawn('gina', ['start', '@'+self.version],

package/framework/{v0.1.1-alpha.156 → v0.1.1-alpha.158}/lib/cmd/framework/tail.js

@@ -14,6 +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`
+ * This will also will restart bundle in case of crach
  *
  * e.g.
  *  gina framework:tail
@@ -24,6 +25,8 @@ var LoggerHelper    = require( _(GINA_FRAMEWORK_DIR + '/lib/logger/src/helper.js
  *
  * */
 function Tail(opt, cmd) {
+
+    process.title = 'gina-tail';
     var self        = {};
     var nIntervId   = null;
     var mqPortFile  = _(getTmpDir() +'/mq-listener-v'+ GINA_VERSION +'.port', true);
@@ -182,10 +185,40 @@ function Tail(opt, cmd) {
                             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
+                                ||
+                                // 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)
                             ) {
-                                client.destroy();
-                                return end()
+
+                                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;
+                                    // }
+
+                                    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

package/framework/{v0.1.1-alpha.156 → v0.1.1-alpha.158}/lib/cmd/index.js

@@ -1,7 +1,7 @@
 'use strict';
 /**
  * Gina.Utils.cmd
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

package/framework/{v0.1.1-alpha.156 → v0.1.1-alpha.158}/lib/cmd/project/list.js

@@ -28,12 +28,12 @@ function List(opt, cmd){
             , str = ''
             , more = (process.argv[3] && /^(?:\-\-more$)/.test(process.argv[3])) ? true : false ;
 
-        for (var p in projects) {
+        for (let p in projects) {
             list.push(p)
         }
         list.sort();
 
-        for(var l=0; l<list.length; ++l) {
+        for(let l=0; l<list.length; ++l) {
             if ( fs.existsSync(projects[ list[l]].path) ) {
                 str += '[ ok ] '+ list[l];
                 if (more)
@@ -47,6 +47,20 @@ function List(opt, cmd){
             }
         }
         console.log(str.substr(0, str.length-2))
+        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()

package/framework/{v0.1.1-alpha.156 → v0.1.1-alpha.158}/lib/collection/package.json

@@ -7,7 +7,7 @@
     "name": "Maritn-Luther ETOUMAN",
     "email": "contact@gina.io"
   },
-  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },

package/framework/{v0.1.1-alpha.156 → v0.1.1-alpha.158}/lib/config.js

@@ -1,7 +1,7 @@
 /* Gina.Utils.Config
  *
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -201,6 +201,7 @@ function ConfigUtil() {
             utils : content.paths.utils
         };
         var gnaFolder = content.paths.root + '/.gna';
+        console.debug('Checking for `'+ gnaFolder +'` ...');
 
         // !! Not the project name
         self.project = content.project;

package/framework/{v0.1.1-alpha.156 → v0.1.1-alpha.158}/lib/cron/package.json

@@ -7,7 +7,7 @@
     "name": "Maritn-Luther ETOUMAN",
     "email": "contact@gina.io"
   },
-  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },

package/framework/{v0.1.1-alpha.156 → v0.1.1-alpha.158}/lib/generator/index.js

@@ -1,7 +1,7 @@
 /* Gina.Utils.Generator
  *
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

package/framework/{v0.1.1-alpha.156 → v0.1.1-alpha.158}/lib/index.js

@@ -1,6 +1,6 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

package/framework/{v0.1.1-alpha.156 → v0.1.1-alpha.158/lib/inherits}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/framework/{v0.1.1-alpha.156 → v0.1.1-alpha.158}/lib/inherits/package.json

@@ -20,7 +20,7 @@
     "name": "Rhinostone",
     "email": "contact@gina.io"
   },
-  "copyright" : "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
+  "copyright" : "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "main": "src/main",
   "scripts": {
     "test": "nodeunit test"

package/framework/{v0.1.1-alpha.156 → v0.1.1-alpha.158}/lib/inherits/src/main.js

@@ -1,7 +1,7 @@
 'use strict';
 /**
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

package/framework/{v0.1.1-alpha.156 → v0.1.1-alpha.158}/lib/logger/package.json

@@ -7,7 +7,7 @@
     "name": "Maritn-Luther ETOUMAN",
     "email": "contact@gina.io"
   },
-  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },

package/framework/{v0.1.1-alpha.156 → v0.1.1-alpha.158}/lib/logger/src/helper.js

@@ -1,6 +1,6 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

package/framework/{v0.1.1-alpha.156 → v0.1.1-alpha.158}/lib/logger/src/main.js

@@ -1,7 +1,7 @@
 'use strict';
 /**
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

package/framework/{v0.1.1-alpha.156 → v0.1.1-alpha.158}/lib/math/index.js

@@ -1,7 +1,7 @@
 //'use strict';
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -88,7 +88,7 @@ function MathHelper() {
     self.checkSum = async function(filename, algorithm, encoding, isCheckingFromData, cb) {
         var err = false, sum = null;
         isCheckingFromData = ( typeof(isCheckingFromData) != 'undefined' ) ? isCheckingFromData : false;
-        
+
         if ( !isCheckingFromData && /\./.test(filename) ) {
             fs.readFile(filename, async function (err, data) {
                 sum = await checkSum(data, algorithm, encoding);
@@ -124,10 +124,10 @@ function MathHelper() {
             }
             str = arr.sort().join(',');
         }
-        
+
         return str;
     };
-    
+
     /**
      * Check sum from file or form data
      *
@@ -140,11 +140,11 @@ function MathHelper() {
     self.checkSumSync = function(filename, algorithm, encoding) {
         var sum = null;
         try {
-            
+
             if ( typeof(filename) == 'object' ) {
-                filename = objectToString(filename);                
+                filename = objectToString(filename);
             }
-            
+
             if ( /(\.[a-z]{3})$/.test(filename) ) { // must be a string
                 // from filename
                 sum = checkSum( fs.readFileSync(filename), algorithm, encoding )