gina 0.1.6-alpha.5 → 0.1.6-alpha.50

package/framework/{v0.1.6-alpha.5 → v0.1.6-alpha.50}/core/gna.js

@@ -212,10 +212,58 @@ gna.env = process.env.NODE_ENV = env;
 gna.scope = process.env.NODE_SCOPE = scope;
 gna.os.isWin32 = process.env.isWin32 = isWin32;
 gna.isAborting = false;
-//Cahceless is also defined in the main config : Config::isCacheless().
+//Cacheless is also defined in the main config : Config::isCacheless().
 process.env.NODE_ENV_IS_DEV = (/^true$/i.test(isDev)) ? true : false;
 process.env.NODE_SCOPE_IS_LOCAL = (/^true$/i.test(isLocalScope)) ? true : false;
 process.env.NODE_SCOPE_IS_PRODUCTION = (/^true$/i.test(isProductionScope)) ? true : false;
+// Proxy check
+var proxyPathObj    = new _(projects[projectName].path + '/proxy.json', true);
+var proxy           = null;
+if ( proxyPathObj.existsSync() ) {
+    try {
+        var proxyColl   = requireJSON(proxyPathObj.toString());
+        proxy       = new lib.Collection(proxyColl).findOne({ scope: process.env.NODE_SCOPE, env: process.env.NODE_ENV });
+        proxyColl   = null;
+    } catch (proxyErr) {
+        console.error('[ FRAMEWORK ][ configurationError ] ', proxyErr.stack || proxyErr.message || proxyErr);
+    }
+
+    if (proxy) {
+        gna.proxyHostname   = process.gina.PROXY_HOSTNAME    = proxy.hostname;
+        gna.proxyHost       = process.gina.PROXY_HOST        = proxy.hostname
+                                                                    .replace(/^(https|http)\:\/\//g, '')
+                                                                    .replace(/\:\d+\/$|\:\d+$/, '')
+        ;
+        var proxyPort = gna.proxyHostname.match(/\:\d+\/$|\:\d+$/) || null;
+        if (proxyPort) {
+            proxyPort = parseInt(proxyPort[0].match(/\d+/));
+        } else {
+            var foundScheme = gna.proxyHostname.match(/^(https|http)\:\/\//g)[0].replace(/\:\/\//g, '');
+            switch (foundScheme) {
+                case 'https':
+                    proxyPort = 443;
+                    break;
+                case 'ftp':
+                    proxyPort = 21;
+                    break;
+                case 'sftp':
+                    proxyPort = 22;
+                    break;
+                default:
+                    proxyPort = 80;
+                    break;
+            }
+            foundScheme = null;
+        }
+        gna.proxyPort       = process.gina.PROXY_PORT        = parseInt(proxyPort);
+
+        var isProxyHost = (
+            typeof(process.gina.PROXY_HOSTNAME) != 'undefined'
+        ) ? true : false;
+        // Forcing context - also available for workers
+        setContext('isProxyHost', isProxyHost);
+    }
+}
 
 
 var bundlesPath = (isDev) ? projects[projectName]['path'] + '/src' : projects[projectName]['path'] + '/bundles';
@@ -443,12 +491,16 @@ gna.mount = process.mount = function(bundlesPath, source, target, type, callback
     }
     var tmpPath = getPath('project') + '/tmp';
     console.debug('tmp path: ', tmpPath);
-    if ( !fs.existsSync(tmpPath) ) {
-        new _(tmpPath).mkdirSync();
+    var tmpPathObj = new _(tmpPath);
+    if ( !tmpPathObj.existsSync() ) {
+        tmpPathObj.mkdirSync();
     }
+    tmpPathObj = null;
+    var sourceObj = new _(source);
+    var targetObj = new _(target);
 
-    var isSourceFound   = fs.existsSync(source)
-        , isTargetFound = fs.existsSync(target)
+    var isSourceFound   = sourceObj.existsSync()
+        , isTargetFound = targetObj.existsSync()
     ;
     console.debug('[ FRAMEWORK ][ MOUNT ] Source: ', source);
     console.debug('[ FRAMEWORK ][ MOUNT ] Checking before mounting ', target, isTargetFound, bundlesPath);
@@ -485,15 +537,15 @@ gna.mount = process.mount = function(bundlesPath, source, target, type, callback
         gna.lib.generator.createPathSync(bundlesPath, function onPathCreated(err){
             if (!err) {
                 try {
-                    var targetObj = new _(target);
+                    // var targetObj = new _(target);
                     if ( targetObj.existsSync() ) {
                         targetObj.rmSync();
                     }
-                    if ( type != undefined)
+                    if ( type != undefined) {
                         fs.symlinkSync(source, target, type)
-                    else
+                    } else {
                         fs.symlinkSync(source, target);
-
+                    }
                     // symlink created
                     callback(false);
 
@@ -557,22 +609,20 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
 
                         joinContext(conf.contexts);
                         gna.getConfig = function(name){
-                            // var tmp = '';
+                            var tmp = null;
                             if ( typeof(name) != 'undefined' ) {
                                 try {
                                     //Protect it.
-                                    // tmp = JSON.stringify(conf.content[name]);
-                                    // return JSON.parse(tmp)
-                                    return JSON.clone(conf.content[name])
+                                    tmp = JSON.clone(conf.content[name])
                                 } catch (err) {
                                     console.error('[ FRAMEWORK ] ', err.stack);
                                     return undefined
                                 }
                             } else {
-                                // tmp = JSON.stringify(conf);
-                                // return JSON.parse(tmp)
-                                return JSON.clone(conf)
+                                //Protect it.
+                                tmp = JSON.clone(conf)
                             }
+                            return tmp
                         };
                         try {
                             //configureMiddleware(instance, express); // no, no and no...
@@ -876,6 +926,7 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
                                     if (
                                         conf.server.scheme == 'https'
                                         && !/^true$/i.test(process.env.NODE_SCOPE_IS_PRODUCTION)
+                                        && !/^true$/i.test(isProxyHost)
                                     ) {
                                         try {
                                             await server.verifyCertificate(conf.host, conf.server.port);

package/framework/{v0.1.6-alpha.5 → v0.1.6-alpha.50}/core/plugins/lib/validator/src/main.js

@@ -1276,6 +1276,13 @@
                             // } else { // external - need to remove `X-Requested-With` from `options.headers`
                                 result.location = (!/^http/.test(result.location) && !/^\//.test(result.location) ) ? location.protocol +'//' + result.location : result.location;
                             //}
+                            // isProxyHost ?
+                            if (
+                                result.location.replace(/^http(.*)\:\d+/, '$1').replace(/^\:\/\//, '').split(/\//g)[0] == gina.config.hostname
+                                && gina.config.hostname == window.location.host
+                            ) {
+                                result.location = location.protocol  + result.location.replace(/^http(.*)\:\d+/, '$1').replace(/^\:/, '')
+                            }
 
                             return setTimeout(() => {
                                 window.location.href = result.location;

package/framework/{v0.1.6-alpha.5 → v0.1.6-alpha.50}/core/router.js

@@ -118,6 +118,73 @@ function Router(env, scope) {
         // }
         // return ;
 
+
+       var serverInstance   = self.getServerInstance();
+       var config               = null
+            , conf              = null
+            , bundle            = null
+            , env               = null
+            , scope             = null
+            , cacheless         = (/^true$/i.test(process.env.NODE_ENV_IS_DEV)) ? true : false
+       ;
+        try {
+            config      = new Config().getInstance();
+            if (!params.bundle) {
+                try {
+                    //params.bundle = config.bundle;
+                    //params.param = config.routing[config.reverseRouting[params.param.url]];
+                    var _rule = config.reverseRouting[params.param.url];
+                    params = merge(params, config.routing[_rule]);
+                    params.rule = _rule;
+                } catch(reverseRoutingError) {
+                    serverInstance.throwError(response, 500, reverseRoutingError);
+                    return;
+                }
+            }
+            bundle      = local.bundle = params.bundle;
+            env         = config.env;
+            scope       = config.scope;
+            conf        = config[bundle][env];
+        } catch (configErr) {
+            serverInstance.throwError(response, 500, new Error('syntax error(s) found in `'+ controllerFile +'` \nTrace: ') + (configErr.stack || configErr.message) );
+            return;
+        }
+
+        local.cacheless     = cacheless;
+        local.request       = request;
+        local.next          = next;
+        local.conf          = conf;
+        local.isStandalone  = conf.isStandalone;
+
+
+        /**
+         * Reverse proxy check
+         */
+        var requestPort = request.headers.port || request.headers[':port'];
+        var isProxyHost = (
+            typeof(request.headers.host) != 'undefined'
+            && typeof(requestPort) != 'undefined'
+            &&  /^(80|443)$/.test(requestPort)
+            && conf.server.scheme +'://'+ request.headers.host +':'+ requestPort != conf.hostname.replace(/\:\d+$/, '') +':'+ conf.server.port
+            ||
+            typeof(request.headers[':authority']) != 'undefined'
+            && conf.server.scheme +'://'+ request.headers[':authority'] != conf.hostname
+            ||
+            typeof(request.headers.host) != 'undefined'
+            && typeof(requestPort) != 'undefined'
+            && /^(80|443)$/.test(requestPort)
+            && request.headers.host == conf.host
+            ||
+            typeof(request.headers['x-nginx-proxy']) != 'undefined'
+            && /^true$/i.test(request.headers['x-nginx-proxy'])
+            ||
+            typeof(process.gina.PROXY_HOSTNAME) != 'undefined'
+        ) ? true : false;
+
+        setContext('isProxyHost', isProxyHost);
+
+
+
         /**
         * ExpressJS modules + HTTP2 fix
         * Hack required until `express-<plugin>` get support for http2 `express-session`
@@ -140,6 +207,9 @@ function Router(env, scope) {
             ||
             typeof(request.session) != 'undefined'
             && typeof(request.isAuthenticated) == 'undefined'
+            ||
+            typeof(request.session) != 'undefined'
+            && typeof(request.session.passport) != 'undefined'
        ) {
             request.isAuthenticated = function() {
                 var property = 'user';
@@ -284,42 +354,6 @@ function Router(env, scope) {
         * EO Passport JS HTTP2 fix
         */
 
-       var serverInstance   = self.getServerInstance();
-       var config               = null
-            , conf              = null
-            , bundle            = null
-            , env               = null
-            , scope             = null
-            , cacheless         = (/^true$/i.test(process.env.NODE_ENV_IS_DEV)) ? true : false
-       ;
-        try {
-            config      = new Config().getInstance();
-            if (!params.bundle) {
-                try {
-                    //params.bundle = config.bundle;
-                    //params.param = config.routing[config.reverseRouting[params.param.url]];
-                    var _rule = config.reverseRouting[params.param.url];
-                    params = merge(params, config.routing[_rule]);
-                    params.rule = _rule;
-                } catch(reverseRoutingError) {
-                    serverInstance.throwError(response, 500, reverseRoutingError);
-                    return;
-                }
-            }
-            bundle      = local.bundle = params.bundle;
-            env         = config.env;
-            scope       = config.scope;
-            conf        = config[bundle][env];
-        } catch (configErr) {
-            serverInstance.throwError(response, 500, new Error('syntax error(s) found in `'+ controllerFile +'` \nTrace: ') + (configErr.stack || configErr.message) );
-            return;
-        }
-
-        local.cacheless     = cacheless;
-        local.request       = request;
-        local.next          = next;
-        local.conf          = conf;
-        local.isStandalone  = conf.isStandalone;
 
         if (cacheless) {
             refreshCoreDependencies();
@@ -416,10 +450,10 @@ function Router(env, scope) {
             rootPath        : conf.executionPath || null,
             executionPath   : conf.executionPath || null,
             //instance: self.serverInstance,
-            isUsingTemplate: local.isUsingTemplate,
-            cacheless: cacheless,
-            path: params.param.path || null, // user custom path : namespace should be ignored or left blank
-            assets: {}
+            isUsingTemplate : local.isUsingTemplate,
+            cacheless       : cacheless,
+            path            : params.param.path || null, // user custom path : namespace should be ignored or left blank
+            assets          : {}
         };
 
         if (routeHasViews) {

package/framework/{v0.1.6-alpha.5 → v0.1.6-alpha.50}/core/server.js

@@ -4,7 +4,8 @@ const fs            = require('fs');
 const os            = require('os');
 const path          = require('path');
 const EventEmitter  = require('events').EventEmitter;
-const Busboy        = require('./deps/busboy');
+// const Busboy        = require('./deps/busboy-0.2.14');
+const Busboy        = require('busboy');
 const Stream        = require('stream');
 const zlib          = require('zlib'); // gzip / deflate
 const util          = require('util');
@@ -21,6 +22,8 @@ var merge           = lib.merge;
 var Proc            = lib.Proc;
 var console         = lib.logger;
 var SwigFilters     = lib.SwigFilters;
+var Domain          = lib.Domain;
+var domainLib       = new Domain();
 
 function Server(options) {
 
@@ -293,6 +296,24 @@ function Server(options) {
 
         if (failed) {
             if (sslDetails.daysRemaining > -1) {
+                var isProxyHost = getContext('isProxyHost');
+                if ( /^true$/i.test(isProxyHost) ) {
+                    console.warn("Host is behind a reverse proxy, skipping server.verifyCertificate(...) ");
+                    return;
+                }
+                var rootDomain = domainLib.getRootDomain(endpoint).value;
+                hasMatchedEntry = false;
+                for (let i in sslDetails.validFor) {
+                    if ( new RegExp(sslDetails.validFor[i].replace(/^\*\./, '') + '$').test(rootDomain) ) {
+                        hasMatchedEntry = true;
+                        break;
+                    }
+                }
+                if (!hasMatchedEntry) {
+                    console.warn(`[Certificate] "${endpoint}" : Root domain not matching your certificate. If you plan to run your service behind a revese proxy, please do not forget to add "proxy.json" at the root of your project while going to production.${'\n'} ${humanView}`);
+                    return;
+                }
+                // sslDetails.validFor
                 console.emerg(`[Certificate] ${endpoint} : It is like there is a problem with your CA certificate${'\n'} ${humanView}`);
                 return;
             }
@@ -1035,8 +1056,8 @@ function Server(options) {
                     return name
                 }
 
-                var env     = self.conf.env
-                    , scope = self.conf.scope
+                var env     = self.conf.env || self.env
+                    , scope = self.conf.scope || self.scope
                 ;
 
                 for (let i=0, len=matched.length; i<len; ++i) {
@@ -1054,6 +1075,9 @@ function Server(options) {
                         project = arr[0];
                         env     = (arr[1]) ? arr[1] : env;
                     }
+                    if ( typeof(self.conf[bundle]) == 'undefined' ) {
+                        continue;
+                    }
                     scheme  = self.conf[bundle][env].server.scheme;
                     hostname  = ( !self.conf[bundle][env].hostname ) ? self.conf[bundle][env].server.scheme + '://' + self.conf[bundle][env].host + ':' + self.conf[bundle][env].server.port : self.conf[bundle][env].hostname;
                     name    = name.replace(oldHost, hostname);
@@ -1417,7 +1441,6 @@ function Server(options) {
                 var key = pathname.replace(pathname.split('/').splice(-1), '');
                 for ( ; s < sLen; ++s ) {
                     if ( bundleConf.staticResources[s] == key ) {
-                    // if ( eval('/^' + bundleConf.staticResources[s].replace(/\//g,'\\/') +'/').test(pathname) ) {
                         filename = bundleConf.content.statics[ bundleConf.staticResources[s] ] +'/'+ pathname.replace(bundleConf.staticResources[s], '');
                         break;
                     }

package/framework/{v0.1.6-alpha.5 → v0.1.6-alpha.50}/core/template/boilerplate/bundle/controllers/setup.js

@@ -53,7 +53,7 @@ function SetupClass(req, res, next){
     /**
      * Sample of a swig filter to render markdown content
      * To activate this code, you will need :
-     * 1) to install `marked` dependency : npm install marked --save
+     * 1) to install `marked` dependency : npm install marked@4.0.10 --save
      * 2) uncomment imports on the top of this script
      * 3) uncomment the following filter definition
      */
@@ -64,7 +64,7 @@ function SetupClass(req, res, next){
     //     tables      : false,
     //     breaks      : true, // Enable GFM line breaks. This option requires the gfm option to be true.
     //     pedantic    : false, // Conform to obscure parts of markdown.pl as much as possible. Don't fix any of the original markdown bugs or poor behavior.
-    //     // deprecated since version 0.7.0
+    //     // deprecated since version 0.7.0 - "sanitize-html": "^2.7.0" or DOMPurify
     //     // sanitize    : false, // Sanitize the output. Ignore any HTML that has been input.
     //     smartLists  : true, // Use smarter list behavior than the original markdown. May eventually be default with the old behavior moved into pedantic.
     //     smartypants : false // Use "smart" typograhic punctuation for things like quotes and dashes.

package/framework/{v0.1.6-alpha.5 → v0.1.6-alpha.50}/helpers/path.js

@@ -423,7 +423,9 @@ function PathHelper() {
                 fs.mkdirSync(path, permission);
                 mkdirSync(self, permission, pathArr, i, path)
             } catch (err) {
-                console.debug(err.stack); // always keep trace of the original stack
+                if ( typeof(console.debug) != 'undefined' ) {
+                    console.debug(err.stack); // always keep trace of the original stack
+                }
                 throw new Error(err.message)
             }
         };
@@ -479,7 +481,7 @@ function PathHelper() {
                             if (p == path  && typeof(callback) != 'undefined' && typeof(self.created) == 'undefined' ) {
                                 if (typeof(callback) != 'undefined') {
                                     callback(err, path)
-                                } else {
+                                } else if ( typeof(console.debug) != 'undefined' ) {
                                     console.debug("no callback defined for mkdir ", path)
                                 }
                             }
@@ -881,7 +883,9 @@ function PathHelper() {
                     if (err) {
                         console.error(err.stack)
                     }
-                    console.debug('cp() completed copy to: ', method);
+                    if ( typeof(console.debug) != 'undefined' ) {
+                        console.debug('cp() completed copy to: ', method);
+                    }
                     callback(err, destination, method)
                 })
             }
@@ -1163,10 +1167,14 @@ function PathHelper() {
     }
 
     var mv = function(self, target) {
-        console.debug("starting mv/copy from ", self.value, " to ", target);
+        if ( typeof(console.debug) != 'undefined' ) {
+            console.debug("starting mv/copy from ", self.value, " to ", target);
+        }
         cp(self.value, target)
             .onComplete(function onCpMv(err) {
-                console.debug("cp done... now unlinking source ", self.value);
+                if ( typeof(console.debug) != 'undefined' ) {
+                    console.debug("cp done... now unlinking source ", self.value);
+                }
                 if (err) {
                     e.emit('mv#complete', err);
                     return;
@@ -1174,7 +1182,9 @@ function PathHelper() {
 
 
                 rm(self.value).onComplete( function(err, path){
-                    console.debug('rm() complete');
+                    if ( typeof(console.debug) != 'undefined' ) {
+                        console.debug('rm() complete');
+                    }
                     e.emit('mv#complete', err, path)
                 })
             })
@@ -1237,7 +1247,9 @@ function PathHelper() {
                     ++l;
                     removeFoldersSync(list, l, i)
                 } catch(err) {
-                    console.debug(err.stack); // always keep trace of the original stack
+                    if ( typeof(console.debug) != 'undefined' ) {
+                        console.debug(err.stack); // always keep trace of the original stack
+                    }
                     throw new Error(err.message)
                 }
             } else {
@@ -1246,7 +1258,9 @@ function PathHelper() {
                     fs.rmdirSync(list[l][i]);
                     removeFoldersSync(list, l, i)
                 } catch(err) {
-                    console.debug(err.stack); // always keep trace of the original stack
+                    if ( typeof(console.debug) != 'undefined' ) {
+                        console.debug(err.stack); // always keep trace of the original stack
+                    }
                     throw new Error(err.message)
                 }
             }
@@ -1257,7 +1271,9 @@ function PathHelper() {
         try {
             fs.unlinkSync(filename)
         } catch (err) {
-            console.debug(err.stack); // always keep trace of the original stack
+            if ( typeof(console.debug) != 'undefined' ) {
+                console.debug(err.stack); // always keep trace of the original stack
+            }
             throw new Error(err.message)
         }
     }

package/framework/{v0.1.6-alpha.5 → v0.1.6-alpha.50}/lib/cmd/bundle/add.js

@@ -368,7 +368,8 @@ function Add(opt, cmd) {
                 content[local.bundle] = {}
             }
             content[local.bundle][ self.envs[e] ] = {
-                "host" : local.bundle + "-{env}-{scope}-v{projectVersionMajor}.{rootDomain}"
+                "host_if_dns_resolution" : "{rootDomain}",
+                "host" : "localhost"
             };
 
         }

package/framework/{v0.1.6-alpha.5 → v0.1.6-alpha.50}/lib/cmd/bundle/start.js

@@ -84,7 +84,7 @@ function Start(opt, cmd) {
         var projectArchFile = projectArchFileObj.toString();
         var projectPlatformFileObj = new _(gnaPath +'/platform', true);
         var projectPlatformFile = projectPlatformFileObj.toString();
-        var nodeModulesContentArr = ( nodeModulesPathObj.existsSync() ) ? fs.readdirSync(nodeModulesPathObj.toString()) : [];
+        var nodeModulesContentArr = ( nodeModulesPathObj.existsSync() && !nodeModulesPathObj.isSymlinkSync() ) ? fs.readdirSync(nodeModulesPathObj.toString()) : [];
         var newNodeModulesContentArr = [], n = 0;
         for (let f in nodeModulesContentArr) {
             if (/^\./.test(nodeModulesContentArr[f]) ) {
@@ -102,13 +102,16 @@ function Start(opt, cmd) {
             ||
             !projectPlatformFileObj.existsSync()
             ||
-            projectArchFileObj.existsSync() && fs.readFileSync(projectArchFile).toString() != currentArch
+            projectArchFileObj.existsSync()
+            && fs.readFileSync(projectArchFile).toString() != currentArch
             ||
-            projectPlatformFileObj.existsSync() && fs.readFileSync(projectPlatformFile).toString() != currentPlatform
+            projectPlatformFileObj.existsSync()
+            && fs.readFileSync(projectPlatformFile).toString() != currentPlatform
             ||
             !nodeModulesPathObj.existsSync()
             ||
             nodeModulesPathObj.existsSync()
+            && !nodeModulesPathObj.isSymlinkSync()
             && !nodeModulesContentArr.length
             ||
             nodeModulesPathObj.existsSync()

package/framework/{v0.1.6-alpha.5 → v0.1.6-alpha.50}/lib/cmd/framework/build.js

@@ -21,7 +21,7 @@ function Build(opt, cmd){
     var self    = {};
 
     var init = function(opt, cmd) {
-        console.debug('Building framework...');
+        console.log('Building framework, please wait ...');
 
         // import CMD helpers
         new CmdHelper(self, opt.client, { port: opt.debugPort, brkEnabled: opt.debugBrkEnabled });

package/framework/{v0.1.6-alpha.5 → v0.1.6-alpha.50}/lib/cmd/framework/init.js

@@ -291,6 +291,20 @@ function Initialize(opt) {
     self.checkArch = function(done) {
 
         var currentArch = process.arch;
+        switch (process.arch) {
+            case 'x64':
+                currentArch = 'amd64'
+                break;
+            case 'armv7l':
+                currentArch = 'armhf'
+                break;
+            case 'x86':
+                currentArch = 'i386'
+                break;
+            default:
+                break;
+        }
+
         var currentPlatform = process.platform;
         // ignored for framework:set
         var mainConfig = require( self.opt.homedir + '/main.json' );
@@ -493,6 +507,10 @@ function Initialize(opt) {
              * make sure to complete : self.checkIfMain()
              */
 
+            // Check GINA_HOST_V4 for changes in case of k8s environement
+            // Get current host IP, compare with getEnvVar('GINA_HOST_V4')
+            // IF changed: setEnvVar('GINA_HOST_V4', new_host_v4)
+
             var dic = {
                 'prefix' : prefix,
                 'global_mode': globalMode,

package/framework/{v0.1.6-alpha.5 → v0.1.6-alpha.50}/lib/cmd/framework/tail.js

@@ -13,7 +13,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`
+ * tail from exiting, you should use `--follow`
  * This will also will restart bundle in case of crach
  *
  * e.g.
@@ -21,7 +21,7 @@ var LoggerHelper    = require( _(GINA_FRAMEWORK_DIR + '/lib/logger/src/helper.js
  *  or
  *  gina tail
  *  or
- *  gina tail --keep-alive
+ *  gina tail --follow
  *
  * */
 function Tail(opt, cmd) {
@@ -117,7 +117,7 @@ function Tail(opt, cmd) {
 
         client.on('error', (data) => {
             var err = data.toString();
-            console.error('[MQTail] ' + err + ' - Gina might not be running');
+            console.error('[MQTail] ' + err + ' - Gina might not be running, or host IP has changed.');
             console.info('[MQTail] Waitting for `MQListener` to be started ...');
 
             // var mqPort = null;
@@ -218,7 +218,7 @@ function Tail(opt, cmd) {
                                     project= bundleDesc[2];
                                 } // else, must be `gina` (the framework)
 
-                                if (opt.argv.indexOf('--keep-alive') < 0) {
+                                if (opt.argv.indexOf('--follow') < 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) ) {
@@ -233,7 +233,7 @@ function Tail(opt, cmd) {
                                 }
                                 // TODO - restart bundle if not starting or restarting
                                 else if (
-                                    opt.argv.indexOf('--keep-alive') > -1
+                                    opt.argv.indexOf('--follow') > -1
                                     && ! /(SIGKILL|SIGTERM|SIGINT)/.test(pl.content)
                                 ) {
                                     // only for debug

package/framework/{v0.1.6-alpha.5 → v0.1.6-alpha.50}/lib/cmd/framework/version.js

@@ -5,13 +5,27 @@ var console = lib.logger;
 function Version(opt){
 
     var init = function(opt){
+        var arch = process.arch;
+        switch (process.arch) {
+            case 'x64':
+                arch = 'amd64'
+                break;
+            case 'armv7l':
+                arch = 'armhf'
+                break;
+            case 'x86':
+                arch = 'i386'
+                break;
+            default:
+                break;
+        }
         var vers = "",
             short = ( typeof(process.argv[3]) != 'undefined') ? process.argv[3]: false,
             msg = require('./msg.json'),
             version = {
                 "number"        : GINA_VERSION,
                 "platform"      : process.platform,
-                "arch"          : process.arch,
+                "arch"          : arch,
                 "middleware"    : fs.readFileSync(_( opt.frameworkPath + '/MIDDLEWARE')).toString() || 'none',
                 "copyright"     : require(opt.pack).copyright
             };