gina 0.1.1-alpha.16 → 0.1.1-alpha.160

package/framework/{v0.1.1-alpha.16 → v0.1.1-alpha.160}/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.
@@ -35,17 +35,27 @@
      * @param {boolean} skipFormating
      * */
     self.format = function(group, s, content, skipFormating) {
+
         if (
             s == 'catch'
             || typeof(skipFormating) != 'undefined' && /true/i.test(skipFormating)
         ) {
             return content
         }
+
         if (content != '') {
             var colors = null;
             try {
+                // hack for loggers['bundle@project'] not found in this context
+                // so we just clone gina's
+                if ( typeof(loggers[ group ]) == 'undefined' ) {
+                    loggers[ group ] = JSON.clone(loggers.gina);
+                }
                 colors = loggers[ group ].colors
             } catch(colorsErr) {
+                // Leave it just in case we need to detect bugs right from the log output
+                content += '\nNot able to define colors. Please check logger‘s group: `'+ group +'`\n';
+                process.stdout.write('--['+ s +'/'+ skipFormating +']-> '+content +'\n');
                 throw new Error('Not able to define colors. Please check logger‘s group: `'+ group +'`\n')
             }
 
@@ -73,6 +83,7 @@
             //process.stdout.write('colors '+ JSON.stringify(colors[colorCode], null, 2)  +'\n');
 
 
+
             if ( typeof(_color) != 'undefined' && _color) {
                 //process.stdout.write('colors code '+ JSON.stringify(colors, null, 2)  +'\n');
                 content = _color.open + opt.template + _color.close;
@@ -80,12 +91,20 @@
                 content = opt.template;
             }
 
+
+
             // formating output
             for (let p=0; p<patt.length; ++p) {
                 content = content.replace(new RegExp(patt[p], 'g'), repl[patt[p]])
             }
+
+
         }
 
+        // test only
+        // process.stdout.write('--['+ s +'/'+ skipFormating +']->'+content +'\n');
+
+
         // We should be using `\r` instead of `\n`
         // But it is not yet possible because of weird console.*() stdout when we are on the CLI or Framework side
         return content +'\n'

package/framework/{v0.1.1-alpha.16 → v0.1.1-alpha.160}/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.
@@ -266,7 +266,10 @@ function Logger() {
             return self;
         }
         ctx.initialized = true;
-
+        if (!homeDir) {
+            homeDir =  ( typeof(getUserHome) != 'undefined' ) ? getUserHome() : process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME'];// jshint ignore:line
+            homeDir += '/.gina';
+        }
         // user main options & flows options
         var extPath = _(homeDir +'/user/extensions/logger', true)
         var optionsPath = _(extPath +'/default/config.json', true);

package/framework/{v0.1.1-alpha.16 → v0.1.1-alpha.160}/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 )

package/framework/{v0.1.1-alpha.16 → v0.1.1-alpha.160}/lib/merge/package.json

@@ -8,7 +8,7 @@
       "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.16 → v0.1.1-alpha.160}/lib/model.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.
@@ -102,7 +102,7 @@ function ModelUtil() {
     * */
     this.setModelEntity = function(bundle, model, name, module) {
         var cacheless   = (process.env.NODE_ENV_IS_DEV == 'false') ? false : true;
-        
+
         if (arguments.length > 1) {
             if (!self.entities) {
                 self.entities = {}
@@ -209,7 +209,7 @@ function ModelUtil() {
     this.loadAllModels = function(bundles, configuration, env, cb) {
 
         var loadModel = function(b, bundles, configuration, env, cb) {
-            
+
             var modelObject     = getContext('modelUtil').entities[bundles[b]] // to check if already laoded
                 , bundle        = bundles[b]
                 , len           = bundles.length
@@ -223,7 +223,7 @@ function ModelUtil() {
                 var mObj = {};
 
                 var models = connectors;
-                
+
                 if ( !models || typeof(models) == 'undefined' ) {
                     console.warn('no models attached to connector '+ connector);
                 }
@@ -383,7 +383,7 @@ function ModelUtil() {
             for (var bundle in self.models) {
 
                 for (var name in self.models[bundle]) { //name as connector name
-                    
+
                     self.models[bundle][name] = {};
 
                     if ( typeof(self.models[bundle][name]['_connection']) == 'undefined' ) {
@@ -451,7 +451,7 @@ function ModelUtil() {
      * @returns {object} model - Model entities
      * */
     getModel = function(bundle, model) {
-        
+
         var ctx       = getContext();
 
         if (arguments.length == 1 || !bundle) {
@@ -528,13 +528,13 @@ function ModelUtil() {
             }
         }
 
-        // if ( 
-        //     typeof(ctx.modelUtil.models) != 'undefined' 
+        // if (
+        //     typeof(ctx.modelUtil.models) != 'undefined'
         //     && typeof(ctx.modelUtil.models) != 'undefined'
         //     && typeof(ctx.modelUtil.models[bundle]) != 'undefined'
         //     && typeof(ctx.modelUtil.models[bundle][model]) != 'undefined'
         // ) {
-            
+
         // } else {
             self.models = ModelUtil.instance.models
         // }

package/framework/{v0.1.1-alpha.16 → v0.1.1-alpha.160}/lib/proc.js

@@ -1,7 +1,7 @@
 /* Gina.utils.Proc
  *
  * 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.
@@ -93,7 +93,7 @@ function Proc(bundle, proc, usePidFile){
         return (self.master) ? true : false;
     };
 
-    
+
     /**
      * Going to force restart by third party (kill 9).
      *
@@ -121,7 +121,7 @@ function Proc(bundle, proc, usePidFile){
             console.debug('[ PROC ] Bundle [ '+ bundle +' ] already running or [ '+env+' ] port is use by another process');
             dismiss(process.pid);
         }
-        
+
         callback(false);
     };
 
@@ -141,13 +141,13 @@ function Proc(bundle, proc, usePidFile){
 
 
         if ( typeof(PID) != 'undefined' && typeof(PID) == 'number' ) {
-            
+
             console.debug('[ PROC ] Setting listeners for ', PID, ':', bundle);
 
             proc.dismiss = dismiss;
             proc.isMaster = isMaster;
 
-                        
+
             proc.on('SIGTERM', function(code){
                 if ( typeof(code) == 'undefined')
                     code = 0;
@@ -155,36 +155,58 @@ function Proc(bundle, proc, usePidFile){
                 proc.exit(code);
             });
 
+            proc.on('SIGABRT', function(code){
+                if ( typeof(code) == 'undefined')
+                    code = 0;
+                // will handle `dismiss()`
+                proc.exit(code);
+            });
+
+
             proc.on('SIGINT', function(code){
 
                 if (code == undefined)
                     code = 0;
 
-                console.info('[ PROC ] Got exit code. Now killing: ', code);
+                console.warn('[ PROC ] Got exit code. Now killing: ', code);
                 // will handle `dismiss()`
                 proc.exit(code);
             });
 
-            //Will prevent the server from stopping.
+            // proc.on('heapOutOfMemory', function(err) {
+            //     console.emerg('[ FRAMEWORK ][ caughtException ][ '+err.code+' ] ', err.stack);
+            // });
+
+            //Will prevent the server from stopping, exepted for `heap out of memory`.
             proc.on('uncaughtException', function(err) {
-                
+
                 if ( /ERR\_HTTP\_HEADERS\_SENT/.test(err.stack) ) {
                     console.error('[ SERVER ][ HTTP UNCAUGHT EXCEPTION ]', err.stack);
                     return false;
                 }
-                
+
                 if ( /ERR\_HTTP2/.test(err.stack) ) {
                     console.warn('[ SERVER ][ HTTP2 UNCAUGHT EXCEPTION ]', err.stack);
                     return false;
                 }
-                
-                console.emerg('[ FRAMEWORK ][ uncaughtException ] ', err.stack);
 
                 //console.debug("[ PROC ] @=>", self.args);
                 var bundle = self.bundle;
                 var pid = self.getPidByBundleName(bundle);
+                // Do not dissmis the framework
+                if ( /^gina\-v/.test(bundle) ) {
+                    if ( err.code == 'EPIPE' ) {
+                        proc.stdout.write(err.stack);
+                        return;
+                    }
+                    console.warn('[ FRAMEWORK ][ uncaughtException ] ', err.stack);
+                    return;
+                }
 
-                dismiss(pid, 'SIGKILL');
+                console.emerg('[ FRAMEWORK ][ uncaughtException ][ '+err.code+' ] ', err.stack);
+
+
+                dismiss(pid, 'SIGTERM');
 
 
                 // TODO - Wake up buddy !.
@@ -204,19 +226,21 @@ function Proc(bundle, proc, usePidFile){
                 // var bundle = self.bundle;
                 // var env =  process.env.NODE_ENV || 'prod';
                 // var pid = self.getPidByBundleName(bundle);
-                
-                var currentProcess = process.list[process.list.count()-1];
-                if ( typeof(currentProcess) != 'undefined' ) {
-                    console.debug('Removing `currentProcess.pid`: ', currentProcess.pid);
-                    dismiss(currentProcess.pid, "SIGKILL")
-                }
+
+
+                // var currentProcess = process.list[process.list.count()-1];
+                // if ( typeof(currentProcess) != 'undefined' ) {
+                //     console.debug('Removing `currentProcess.pid`: ', currentProcess.pid);
+                //     dismiss(currentProcess.pid, "SIGKILL")
+                // }
+                console.debug('Dismissing ['+ this.pid+'] with [SIGTERM]');
+                dismiss(this.pid, "SIGTERM")
             });
 
             proc.on('SIGHUP', function(code){
                 console.debug('[ FRAMEWORK ] Hanging up ! Code: '+ code +'\n'+ process.argv);
 
                 var bundle = self.bundle;
-                // var env =  process.env.NODE_ENV || 'prod';
                 var pid = self.getPidByBundleName(bundle);
 
                 dismiss(process.pid, "SIGINT");
@@ -235,15 +259,16 @@ function Proc(bundle, proc, usePidFile){
         ;
         try {
             //console.debug('[ PROC ] => '+ JSON.stringify(process.list, null, 4));
-            
+
             for (let p in process.list) {
                 if ( typeof(process.list[p]) == 'undefined' || process.list[p] == null )
                     continue;
-                    
+
                 if ( process.list[p].pid == pid &&  !/^gina\-/.test(process.list[p].name) ) {
                     index       = p;
-                    
+
                     try {
+                        // console.debug('removePidFileSync: ['+ process.list[p].pid +']');
                         removePidFileSync(process.list[p].pid);
                         if ( typeof(process.isMinion) == 'undefined' ) {
                             mountPath   =  _(getPath('mountPath') + '/' + process.list[p].name);
@@ -252,11 +277,11 @@ function Proc(bundle, proc, usePidFile){
                         }
                         // soft kill..
                         process.kill(pid, signal);
-                    } catch (err) {                        
+                    } catch (err) {
                         console.warn('[ PROC ] Could not unmount process file `'+process.list[p].name+'`\n'+ err.stack);
                     }
-                    
-                    
+
+
                 } else if ( process.list[p].pid == pid && /^gina\-/.test(process.list[p].name) ) {
                     index       = p;
                     removePidFileSync(process.list[p].pid);
@@ -271,20 +296,23 @@ function Proc(bundle, proc, usePidFile){
         if (index != null)
             delete process.list[index];
 
+        console.debug('[ PROC ] Received '+ signal +' signal to end process [ '+ pid +' ]');
         // handles only signals that cannot be cannot be caught or ignored
-        if ( /(SIGKILL|SIGSTOP)/i.test(signal) ) {
+        if ( /^(SIGKILL|SIGSTOP|SIGABRT)$/i.test(signal) ) {
             removePidFileSync(pid);
         }
-
-        console.debug('[ PROC ] Received '+ signal +' signal to end process [ '+ pid +' ]');
     };
-    
+
     var removePidFileSync = function(pid) {
         var files = fs.readdirSync( GINA_RUNDIR );
         var pidPath = null;
         for ( let i=0, len=files.length; i<len; i++) {
+            let file = files[i];
+            if (!/\.pid$/.test(file)) {
+                continue;
+            }
             let id = fs.readFileSync( _(GINA_RUNDIR +'/'+ files[i], true) ).toString().trim();
-            if (id == pid) {
+            if (~~id == pid) {
                 pidPath = _(GINA_RUNDIR +'/'+ files[i], true);
                 break;
             }
@@ -321,7 +349,7 @@ function Proc(bundle, proc, usePidFile){
                 //     e.emit('proc#registered', file);
                 // }
                 file += '.pid';
-                
+
                 console.debug('[ PROC ] Now saving `'+file+'`');
                 var fileStream = fs.createWriteStream(path + file);
                 fileStream.once('open', function(fd) {
@@ -338,20 +366,20 @@ function Proc(bundle, proc, usePidFile){
             e.emit('proc#complete-'+self.PID, new Error('encountered troubles while trying to save Process [ '+ proc.title +' ] pid file'))
         }
     };
-    
+
     var saveRunningProc = function(bundle) {
-        
+
         var runningProcsPath = _(GINA_HOMEDIR + '/procs.json', true)
             , runningProcsPathObj = new _(runningProcsPath)
             , runningProcs = {}
             , proc  = self.proc
-            , PID   = self.PID 
+            , PID   = self.PID
         ;
-        
+
         if ( runningProcsPathObj.existsSync() ) {
             runningProcs = requireJSON(runningProcsPath);
         }
-        
+
         if ( typeof(runningProcs[bundle]) == 'undefined' ) {
             runningProcs[bundle] = {}
         }
@@ -359,15 +387,15 @@ function Proc(bundle, proc, usePidFile){
         runningProcs[bundle].title      = proc.title;
         runningProcs[bundle].version    = GINA_VERSION;
         runningProcs[bundle].port       = ~~GINA_PORT;
-        
+
         var argvStr = process.argv.join(',');
         if ( /\-\-fake\-daemon\-pid/.test(argvStr) ) {
             runningProcs[bundle].fakeDaemonPid = ~~(argvStr.match(/\-\-fake\-daemon\-pid\=\d+/)[0].split(/\=/)[1])
         }
-        
+
         generator.createFileFromDataSync( JSON.stringify(runningProcs, null, 2), runningProcsPath);
     }
-    
+
     var removeRunningProc = function(pid) {
         var runningProcsPath = _(GINA_HOMEDIR + '/procs.json', true)
             , runningProcsPathObj = new _(runningProcsPath)
@@ -433,7 +461,7 @@ function Proc(bundle, proc, usePidFile){
     };
 
     self.register = function(bundle, pid) {
-        
+
         var processCollection = new Collection(process.list);
         var existingProcess = processCollection.findOne({ name: bundle, pid: pid });
         // cleanup if found;
@@ -443,8 +471,8 @@ function Proc(bundle, proc, usePidFile){
             console.debug('[ PROC ] Don\'t pannic ...');
             existingProcess = null;
         }
-        
-        
+
+
         if ( /^gina\-/.test(bundle) || !/^gina\-/.test(bundle) && self.bundles.indexOf(bundle) < 0 ) {
             console.debug('[ PROC ] Now registering `'+bundle+'` with PID `'+ pid +'`');
             var list = {};
@@ -458,7 +486,7 @@ function Proc(bundle, proc, usePidFile){
                 else if (/^gina\-/.test(bundle)) {
                     saveRunningProc(bundle)
                 }
-                
+
                 list['pid']     = pid;
                 list['name']    = bundle;
                 process.list.push(list);//Running bundles.
@@ -466,10 +494,10 @@ function Proc(bundle, proc, usePidFile){
                 process.pids[bundle] = pid;
 
                 list = null;
-                
+
                 //isBundleMounted(projects, bundlesPath, getContext('bundle'));
             };
-            
+
             var isReplacementNeeded = false, path = _(pathObj.toUnixStyle(), true);
             if ( self.usePidFile && !pathObj.existsSync() ) {
                 try {
@@ -481,7 +509,7 @@ function Proc(bundle, proc, usePidFile){
                 }
             }
 
-            if (self.usePidFile) {                
+            if (self.usePidFile) {
                 // save file
                 if (!isReplacementNeeded) {
                     self.PID    = self.proc.pid;
@@ -492,7 +520,7 @@ function Proc(bundle, proc, usePidFile){
                     save(bundle, self.PID, self.proc);
                 }
             }
-            
+
             processRegistration()
         }
     };

package/framework/{v0.1.1-alpha.16 → v0.1.1-alpha.160}/lib/routing/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"
   },