gina 0.1.1-alpha.14 → 0.1.1-alpha.142

package/framework/{v0.1.1-alpha.14 → v0.1.1-alpha.142}/lib/cmd/view/add.js

@@ -18,13 +18,13 @@ function Add(opt, cmd) {
     ;
 
     var init = function() {
-        
+
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });
 
         // check CMD configuration
         if ( !isCmdConfigured() ) return false;
-        
+
         if ( isDefined('project', self.projectName) && self.bundles.length > 0) {
 
             addViews(0)
@@ -57,8 +57,8 @@ function Add(opt, cmd) {
             , f = 0;
 
         if (source == local.source && typeof(list) == 'undefined') {//root
-            var list = [];// root list
-            for (var l=0; l<files.length; ++l) {
+            list = [];// root list
+            for (let l=0; l<files.length; ++l) {
                 list[l] = _(local.source +'/'+ files[l])
             }
         }
@@ -132,6 +132,28 @@ function Add(opt, cmd) {
         }
     }
 
+    // var checkForNamespaces = function(src) {
+    //     var routingObj = null
+    //         , namespaces = {}
+    //     ;
+    //     try {
+    //         routingObj = require(_(src + '/config/routing.json', true));
+    //         // Looking for namespaces
+    //         for (let r in routing) {
+    //             if ( typeof(routing[r].namespace) != 'undefined' ) {
+    //                 namespaces[r] = {
+    //                     namespace : routing[r].namespace
+    //                 }
+    //             }
+    //         }
+    //     } catch (err) {
+    //         console.error(err.stack);
+    //         process.exit(1);
+    //     }
+
+    //     return (namespaces.count() > 0) ? namespaces : null
+    // }
+
     /**
      * Add bundles
      *
@@ -157,10 +179,13 @@ function Add(opt, cmd) {
             local.b         = b;
             local.env       = self.projects[self.projectName]['def_env'];
             local.root      = self.projects[self.projectName].path;
+            local.src       = _(self.bundlesLocation +'/'+ bundle, true);
 
             console.info('Adding view folder for: '+ local.bundle +'@'+ self.projectName);
-            
-            local.src = _(self.bundlesLocation +'/'+ bundle, true);
+
+            // local.namespaces = checkForNamespaces(local.src);
+
+
             addConfFile()
 
         } else {
@@ -182,7 +207,7 @@ function Add(opt, cmd) {
         var folder  = _(local.src + '/templates');
 
         if ( fs.existsSync(target) || fs.existsSync(folder) ) {
-            rl.setPrompt('Found templates for [ '+ local.bundle +'@'+ self.projectName +' ]. Do you want to override ? (yes|no) > ');
+            rl.setPrompt('Found templates for [ '+ local.bundle +'@'+ self.projectName +' ]. Do you want to override ? (yes|no) > \n');
             rl.prompt();
 
             rl.on('line', function(line) {
@@ -245,7 +270,7 @@ function Add(opt, cmd) {
             local.source        = _(targetPath +'/handlers', true);
             local.isInstalled   = false;
             browse(local.source);
-            
+
             console.log('['+ local.bundle +'@'+ self.projectName +'] templates installed with success !');
             folderPublic.cp(target + '/public', function(err, targetPath){
                 if (err) {
@@ -256,7 +281,7 @@ function Add(opt, cmd) {
                 ++local.b;
                 addViews(local.b)
             });
-            
+
         });
     }
 

package/framework/{v0.1.1-alpha.14 → v0.1.1-alpha.142}/lib/logger/src/containers/default/index.js

@@ -1,7 +1,5 @@
 'use strict';
 // Imports
-// const fs                  = require('fs');
-// const util                = require('util');
 
 function DefaultContainer(opt, loggers) {
     var self = {
@@ -12,6 +10,18 @@ function DefaultContainer(opt, loggers) {
     var format          = loggerHelper.format;
 
     function init() {
+
+        // process.on('gina#bundle-started', function onBundleStarted(mqPort, hostV4, group) {
+        //     onPayload(true);
+        // });
+        // process.on('gina#container-writting', function onBundleStarted(mqPort, hostV4, group) {
+        //     console.debug('[MQDefault] resuming ...');
+        //     if (group) {
+        //         console.info('[MQTail] Group `'+group+'` connected `'+ hostV4 +'` on port `'+ mqPort +'` :)');
+        //     }
+        //     onPayload(true);
+        // });
+
         onPayload();
         // ----------------------------Debug---------------------------------------
         var level = 'debug';
@@ -28,6 +38,7 @@ function DefaultContainer(opt, loggers) {
     }
 
     function onPayload() {
+
         process.on('logger#'+self.name, function onPayload(payload) {
 
             try {

package/framework/{v0.1.1-alpha.14 → v0.1.1-alpha.142}/lib/logger/src/containers/file/index.js

@@ -8,26 +8,74 @@ const net                 = require('net');
 // const delay = ms => new Promise(resolve => setTimeout(resolve, ms));
 // const { execSync }      = require('child_process');
 
+var helpers = null;
 
-const merge = require(__dirname + '/../../../../merge');
+const merge     = require(__dirname + '/../../../../merge');
 
 function FileContainer(opt, loggers) {
     var self = {
         // flow or container name/id
         name: 'file'
     };
+
     var mqId = 'MQ'+ self.name.substring(0,1).toLocaleUpperCase() + self.name.substring(1);
 
-    //var defaultOptions = ;
+    helpers         = require(__dirname +'/../../../../../helpers');
+
 
     var loggerHelper    = require(__dirname +'/../../helper.js')(opt, loggers);
     var format          = loggerHelper.format;
     var processProperties = null;
     var filenames   = {};
 
-    function init() {
+    function init(opt) {
+
+        // ---------- BO - hack for early calls
+        var isWin32         = (process.platform === 'win32') ? true : false;
+        var binPath         = __dirname +'/../../../../../../../';
+        var ginaPath        = (binPath.replace(/\\/g, '/')).replace('/bin', '');
+        ginaPath = (isWin32) ? ginaPath.replace(/\//g, '\\') : ginaPath;
+        // loading pack
+        var pack            = ginaPath + '/package.json';
+        pack = (isWin32) ? pack.replace(/\//g, '\\') : pack;
+        var packObj         = require(pack);
+        var version         = packObj.version;// jshint ignore:line
+        // var frameworkPath   = ginaPath + '/framework/v' + version;
+
+
+        var shortVersion = version.split('.');
+        shortVersion.splice(2);
+        shortVersion = shortVersion.join('.');
+
+        var settings = { mq_port: 8125, host_v4: '127.0.0.1' };
+        try {
+            settings = require( getUserHome() + '/.gina/' + shortVersion + '/settings.json');
+        } catch (err) {}
+
+        opt.mqPort = settings.mq_port;
+        opt.hostV4 = settings.host_v4;
+        // ---------- EO - hack for early calls
+
+        // handle server not started yet or server exited
+        // process.on('gina#mqlistener-started', function onGinaStarted(mqPort, hostV4, group) {
+        //     if (group) {
+        //         console.info('[MQFile] Group `'+group+'` connected `'+ hostV4 +'` on port `'+ mqPort +'` :)');
+        //     }
+        //     clearInterval(nIntervId);
+        //     nIntervId = null;
+        //     onPayload({mqPort: mqPort, hostV4: hostV4});
+        // });
+
+        process.on('gina#bundle-logging', function onBundleStarted(mqPort, hostV4, group) {
+            console.debug('[MQFile] resuming ...')
+            if (group) {
+                console.info('[MQFile] Group `'+group+'` connected `'+ hostV4 +'` on port `'+ mqPort +'` :)');
+            }
+            // only if tail not already running !! Or you will get duplicate logs
+            onPayload({mqPort: mqPort, hostV4: hostV4}, true);
+        });
 
-        onPayload();
+        onPayload(opt);
 
         // ----------------------------Debug---------------------------------------
         var level = 'debug';
@@ -75,22 +123,36 @@ function FileContainer(opt, loggers) {
         var projectName = bfnArr[1];
         var homeDir = getUserHome() || process.env[(process.platform == 'win32') ? 'USERPROFILE' : 'HOME'];// jshint ignore:line
         homeDir += '/.gina';
-        var project = requireJSON(_(homeDir +'/projects.json', true))[projectName];
+        var project = requireJSON(_(homeDir +'/projects.json', true))[projectName];// jshint ignore:line
         var projectPath = project.path;
-        console.info('write env: ', bundleName, process.env.NODE_ENV || getEnvVar('GINA_ENV'));
-        var envObj      = requireJSON(_(projectPath +'/env.json', true))[bundleName][process.env.NODE_ENV || getEnvVar('GINA_ENV')]
+        // console.debug('logger::file write env: ', bundleName, process.env.NODE_ENV, getEnvVar('GINA_ENV'), JSON.stringify(process.gina, null, 2) );// jshint ignore:line
+
+        var env         = process.env.NODE_ENV || getEnvVar('GINA_ENV');// jshint ignore:line
+        var Config      = require(getEnvVar('GINA_CORE') + '/config');
+        var conf = new Config({
+            env: env,
+            projectName: projectName,
+            executionPath: projectPath,
+            startingApp: bundleName,
+            ginaPath: getEnvVar('GINA_CORE')
+        }, true).getInstance(bundleName);
+
+        var envObj      = conf.envConf[bundleName][env];// jshint ignore:line
         var webroot     = ( !/\s+|\//.test(envObj.server && envObj.server.webroot) ) ? envObj.server.webroot +'.' : '';
         var hostname    = envObj.host;
-        var logDir      = getLogDir() || getEnvVar('GINA_LOGDIR');
+        var logDir      = getLogDir() || getEnvVar('GINA_LOGDIR');// jshint ignore:line
 
-        filenames[group].filename = _(logDir +'/'+ webroot + hostname +'.log', true);
+        filenames[group].filename = _(logDir +'/'+ webroot + hostname +'.log', true);// jshint ignore:line
         console.debug('Log group `'+ group +'` filename set to: ' + filenames[group].filename);
         process.stdout.write( format(opt.name, 'info', 'Log group `'+ group +'` filename set to: ' + filenames[group].filename) );
     }
 
-    function onPayload() {
-        var port = 8125;
+    function onPayload(opt, isResuming) {
+        // console.debug('mqFile options: ', JSON.stringify(opt, null, 2));
+        var port = opt.mqPort || getEnvVar('GINA_MQ_PORT') || 8125;// jshint ignore:line
+        var host = opt.hostV4 || getEnvVar('GINA_HOST_V4') || '127.0.0.1';// jshint ignore:line
         var clientOptions = {
+            host    : host,
             port    : port,
             request : 'writeToFile'
         }
@@ -104,7 +166,7 @@ function FileContainer(opt, loggers) {
 
         var delayedMessages = [];
         var resume = function(payload) {
-            process.stdout.write('['+ mqId +'] Resuming with group: '+ payload.group);
+            // process.stdout.write('['+ mqId +'] Resuming with group: '+ payload.group);
             var i = 0;
             while (i < delayedMessages.length) {
                 let pl = delayedMessages[i];
@@ -118,22 +180,45 @@ function FileContainer(opt, loggers) {
         }
 
 
+
+
         var client = net.createConnection(clientOptions, () => {
             // 'connect' listener.
-            console.info('['+ mqId +'] connected to server :) ', process.argv);
+            console.info('['+ mqId +'] connected to server :) on host: '+ host + ' & port: '+ port, process.argv);
             processProperties = loggerHelper.getProcessProperties();
             console.info('['+ mqId +'] process properties ', processProperties);
+
+            process.emit('gina#container-writting', host, port);
+
             // send request
             client.write( JSON.stringify(clientOptions) +'\r\n');
 
         });
+
+
         client.on('error', (data) => {
             var err = data.toString();
             process.stdout.write( format(opt.name, 'warn', '['+ mqId +'] ' + err) );
+
+            // allowing the framework to quit properly
+            if ( /write EPIPE|read ECONNRESET|connect ECONNREFUSED/i.test(err) ) {
+                process.exit(0)
+            }
+
+            // 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('['+ mqId +']  (data): ' + data.toString());
             payloads = data.toString();
 
@@ -185,6 +270,12 @@ function FileContainer(opt, loggers) {
                             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(  '['+ mqId +'] '+ pl.content +'\n' );
 
@@ -246,6 +337,6 @@ function FileContainer(opt, loggers) {
 
 
 
-    init();
+    init(opt);
 }
 module.exports = FileContainer;

package/framework/{v0.1.1-alpha.14 → v0.1.1-alpha.142}/lib/logger/src/containers/mq/index.js

@@ -15,10 +15,11 @@ function MqContainer(opt, loggers) {
     // TODO - get options like the `port` from: ~/.gina/user/extensions/logger/{container}/config.json
 
     var MQSpeaker       = require('./speaker.js');
-    opt = merge(opt, { port: 8125 });
+    opt = merge(opt, { mqPort: 8125, hostV4: '127.0.0.1' });
     var mqSpeaker       = new MQSpeaker(opt, loggers);
 
     function init() {
+
         onPayload()
 
         // ------------------------------------------------------------------------

package/framework/{v0.1.1-alpha.14 → v0.1.1-alpha.142}/lib/logger/src/containers/mq/listener.js

@@ -15,23 +15,23 @@ function MQListener(opt, cb) {
     // will be in memory until the framework is stopped
     // TODO - remove specific `bundle` or `CLI` config when the process is terminated
     var sharedConfig    = { loggers: {}};
-    var homedir         = getEnvVar('GINA_HOMEDIR');
+    var homedir         = getEnvVar('GINA_HOMEDIR');// jshint ignore:line
     var isLoggedByFile  = false; // by default
     var fileLogsList    = {};
 
 
     function init(opt, cb) {
         setup();
-        return startMQListener(opt.port, cb);
+        return startMQListener(opt, cb);
     }
 
     function setup() {
-        var mainConfigPath  = _(homedir +'/user/extensions/logger/default/config.json', true);
-        if ( !new _(mainConfigPath, true).existsSync() ) {
+        var mainConfigPath  = _(homedir +'/user/extensions/logger/default/config.json', true);// jshint ignore:line
+        if ( !new _(mainConfigPath, true).existsSync() ) {// jshint ignore:line
             //throw new Error('Required file not found: '+ mainConfigPath);
             return;
         }
-        var mainConfig = requireJSON(mainConfigPath);
+        var mainConfig = requireJSON(mainConfigPath);// jshint ignore:line
         if ( mainConfig.flows.indexOf('file') > -1 ) {
             isLoggedByFile = true;
         }
@@ -64,8 +64,8 @@ function MQListener(opt, cb) {
             file = name;
         }
         file += '.log';
-        var filename = _(GINA_LOGDIR +'/'+ file);
-        var filenameObj = new _(filename);
+        var filename = _(GINA_LOGDIR +'/'+ file);// jshint ignore:line
+        var filenameObj = new _(filename);// jshint ignore:line
         if ( !filenameObj.existsSync() ) {
             // create an empty file
             try {
@@ -81,10 +81,10 @@ function MQListener(opt, cb) {
             compress: true,
             count: 3
         };
-        var rotatorOptionsPath = _(homedir +'/user/extensions/logger/file/config.json', true);
-        if ( new _(rotatorOptionsPath).existsSync() ) {
+        var rotatorOptionsPath = _(homedir +'/user/extensions/logger/file/config.json', true);// jshint ignore:line
+        if ( new _(rotatorOptionsPath).existsSync() ) {// jshint ignore:line
             try {
-                rotatorOptions = merge( requireJSON(rotatorOptionsPath).logrotator, rotatorOptions );
+                rotatorOptions = merge( requireJSON(rotatorOptionsPath).logrotator, rotatorOptions );// jshint ignore:line
             } catch (userConfigErr) {
                 throw userConfigErr
             }
@@ -149,7 +149,9 @@ function MQListener(opt, cb) {
         sessions[sessionId].write( JSON.stringify(payload) +'\r\n');
     }
 
-    function startMQListener(port, cb) {
+    function startMQListener(opt, cb) {
+        var port = opt.port;
+        var host = opt.hostV4;
         // AbortController is a global object
         const controller = new AbortController();// jshint ignore:line
         var server = net.createServer( function(conn) {//'connection' listener
@@ -264,7 +266,7 @@ function MQListener(opt, cb) {
 
         server.on('error', function(err) {
             if (err.code === 'EADDRINUSE') {
-                console.warn('[MQListener] is already running on port [ '+ (err.port || port) +' ]');
+                console.warn('[MQListener] `'+ host +'` is already running on port [ '+ (err.port || port) +' ]');// jshint ignore:line
             } else {
                 console.emerg('[MQListener] Could not start', err.stack)
             }
@@ -283,12 +285,12 @@ function MQListener(opt, cb) {
         });
 
         server.listen({
-            host: '127.0.0.1',
+            host: host,
             port: port,
             signal: controller.signal
           }, function() {
             // Server started.
-            console.info('[MQListener] is waitting for speakers on port `'+ port +'`');
+            console.info('[MQListener] `'+ host +'`is waitting for speakers on port `'+ port +'`');
             if (cb) {
                 cb(false);
             }

package/framework/{v0.1.1-alpha.14 → v0.1.1-alpha.142}/lib/logger/src/containers/mq/speaker.js

@@ -14,14 +14,43 @@ function MQSpeaker(opt, loggers, cb) {
 
 
     function init(opt, cb) {
+
+        // ---------- BO - hack for early calls
+        var isWin32         = (process.platform === 'win32') ? true : false;
+        var binPath         = __dirname +'/../../../../../../../';
+        var ginaPath        = (binPath.replace(/\\/g, '/')).replace('/bin', '');
+        ginaPath = (isWin32) ? ginaPath.replace(/\//g, '\\') : ginaPath;
+        // loading pack
+        var pack            = ginaPath + '/package.json';
+        pack = (isWin32) ? pack.replace(/\//g, '\\') : pack;
+        var packObj         = require(pack);
+        var version         = packObj.version;// jshint ignore:line
+        // var frameworkPath   = ginaPath + '/framework/v' + version;
+
+
+        var shortVersion = version.split('.');
+        shortVersion.splice(2);
+        shortVersion = shortVersion.join('.');
+
+        var settings = { mq_port: 8125, host_v4: '127.0.0.1' };
+        try {
+            settings = require( getUserHome() + '/.gina/' + shortVersion + '/settings.json');
+        } catch (err) {}
+
+        opt.mqPort = settings.mq_port;
+        opt.hostV4 = settings.host_v4;
+        // ---------- EO - hack for early calls
+
         return startMQSpeaker(opt, cb);
     }
 
 
     function startMQSpeaker(opt, cb) {
-
+        var port = opt.mqPort || 8125;// jshint ignore:line
+        var host = opt.hostV4 || '127.0.0.1';// jshint ignore:line
         var clientOptions = {
-            port    : opt.port,
+            host    : host,
+            port    : port,
             request : 'report'
         };
         var client = net.createConnection(clientOptions, () => {
@@ -29,7 +58,7 @@ function MQSpeaker(opt, loggers, cb) {
             // send request
             client.write( JSON.stringify(clientOptions) +'\r\n');
 
-            console.info('[MQSpeaker] connected to server :) ');
+            console.info('[MQSpeaker] connected to server on host: '+ host +' & port: '+ port +' :) ');
 
             if (cb) {
                 cb(false, client)

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

@@ -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.14 → v0.1.1-alpha.142}/lib/logger/src/main.js

@@ -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);