gina 0.1.6-alpha.8 → 0.1.6-alpha.80

package/framework/{v0.1.6-alpha.8 → v0.1.6-alpha.80}/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,14 +450,15 @@ 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) {
             options.template = (routeHasViews) ? conf.content.templates[templateName] || conf.content.templates._common : undefined;
+            options.template.externalPlugins = [];
         }
 
         // Options need to be protected by a clone to allow overrides

package/framework/{v0.1.6-alpha.8 → v0.1.6-alpha.80}/core/server.isaac.js

@@ -150,25 +150,63 @@ function ServerEngineClass(options) {
 
     const onPath = function(path, cb, allowAll) {
 
-        var queryParams = null
-            , i         = null
-            , len       = null
-            , p         = null
-            , arr       = null
-            , a         = null
+        var queryParams     = null
+            , i             = null
+            , len           = null
+            , p             = null
+            , arr           = null
+            , a             = null
+            , isProxyHost   = null
+            , requestHost   = null
         ;
 
         // http2stream handle by the Router class & the SuperController class
         // See `${core}/router.js` & `${core}/controller/controller.js`
 
         server.on('request', (request, response) => {
+            // Proxy detection
+            isProxyHost = getContext('isProxyHost') || false;
+            requestHost = request.headers.host || request.headers[':authority'];
+            if (
+                !isProxyHost
+                && !/\:[0-9]+$/.test(requestHost)
+                ||
+                !isProxyHost
+                && request.headers['x-forwarded-host']
+            ) {
+                // Enable proxied mode
+                process.gina.PROXY_HOSTNAME = process.gina.PROXY_SCHEME +'://'+ requestHost;
+                process.gina.PROXY_HOST     = requestHost;
+                // For intera services communications - Eg.: Controller::query()
+                if (request.headers['x-forwarded-host']) {
+                    process.gina.PROXY_HOSTNAME = request.headers['x-forwarded-proto'] +'://'+ request.headers['x-forwarded-host'];
+                    process.gina.PROXY_HOST     = request.headers['x-forwarded-host'];
+                }
+                // Forcing context - also available for workers
+                setContext('isProxyHost', true);
+            }
+
+            // TODO - remove this after k8s test
+            // if (
+            //     // skip internal requests like healthcheck
+            //     !/^localhost:[0-9]+$/.test(requestHost)
+            //     && /^true$/.test(isProxyHost)
+            //     && /\:[0-9]+$/.test(requestHost)
+            //     && !hostnameRE.test(requestHost)
+            // ) {
+            //     // Restoring non-proxied mode
+            //     console.debug('[ SERVER ] proxy disabled: '+ process.gina.PROXY_SCHEME +'://'+ requestHost);
+            //     isProxyHost = false;
+            //     setContext('isProxyHost', isProxyHost);
+            // }
+
             // healthcheck
             // TODO - add a top level API : server.api.js (check, get ...)
             // TODO - on 90% RAM usage, redirect to `come back later then restart bundle`
             // TODO - check url against wroot : getContext() ?
             if ( /^get$/i.test(request.method) && /\_gina\/health\/check$/i.test(request.url) ) {
                 // server.toApi(reques, response)
-                // console.debug('[200] '+ request.url);
+                // console.debug('[ SERVER ][200] '+ request.url);
                 response.setHeader('content-type', 'application/json; charset=utf8' );
                 response.setHeader('x-powered-by', 'Gina/'+ GINA_VERSION );
                 return response.end('{"status":"ok"}');
@@ -178,7 +216,7 @@ function ServerEngineClass(options) {
             }
 
             if ( /engine.io/.test(request.url)) {
-                console.debug('io request');
+                console.debug('[ SERVER ] engine.io request');
             }
 
             if (/^\*$/.test(path) || path == request.url) {

package/framework/{v0.1.6-alpha.8 → v0.1.6-alpha.80}/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('./deps/busboy-1.6.0');
 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;
                     }
@@ -2067,11 +2090,14 @@ function Server(options) {
                         'method': 'POST',
                         'bundle' : self.appName
                     };
-                    var busboy = new Busboy({ headers: request.headers });
+                    var busboy = Busboy({ headers: request.headers });
 
                     // busboy.on('field', function(fieldname, val, fieldnameTruncated, valTruncated) {
                     //     console.log('Field [' + fieldname + ']: value: ' + inspect(val));
                     // });
+
+                    // Attention: on busboy upgrade, we needs to adapt `busboy/lib/types/multipart.js`
+                    // For this, check the emit method
                     busboy.on('file', function(fieldname, file, filename, encoding, mimetype, group) {
 
                         file._dataLen = 0;

package/framework/{v0.1.6-alpha.8 → v0.1.6-alpha.80}/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.8 → v0.1.6-alpha.80}/core/template/conf/templates.json

@@ -21,7 +21,8 @@
         "rel"       : "stylesheet",
         "type"      : "text/css",
         "url"       : "/css/vendor/gina/gina.min.css",
-        "isCommon"  : true
+        "isCommon"  : true,
+        "isExternalPlugin" : false
       }
     ],
     "javascriptsDeferEnabled": true, // will place scripts in defer mode in the head by default. If false, will place in the footer
@@ -30,7 +31,8 @@
         "name"      : "gina",
         "type"      : "text/javascript",
         "url"       : "/js/vendor/gina/gina.min.js",
-        "isCommon"  : true
+        "isCommon"  : true,
+        "isExternalPlugin" : false
       }
     ]
   }

package/framework/{v0.1.6-alpha.8 → v0.1.6-alpha.80}/helpers/context.js

@@ -326,17 +326,22 @@ function ContextHelper(contexts) {
             , confPath      = null
         ;
 
-        if ( typeof(ctxFilename) != 'undefined' ) {
-            ctx = JSON.parse(fs.readFileSync(_(ctxFilename, true)));
-            if (!ctx.gina) {
-                ctx.gina = {
-                    Config : require('./../core/config')
-                };
-
-                ctx.gina.config = merge(ctx.config, ctx.gina.Config);
-            }
-            for (let name in ctx) {
-                setContext(name, ctx[name], false)
+        if ( typeof(ctxFilename) != 'undefined'  ) {
+            var ctxFileObj = new _(ctxFilename, true);
+            if ( ctxFileObj.existsSync() ) {
+                ctx = JSON.parse(fs.readFileSync(_(ctxFilename, true)));
+                if (!ctx.gina) {
+                    ctx.gina = {
+                        Config : require('./../core/config')
+                    };
+
+                    ctx.gina.config = merge(ctx.config, ctx.gina.Config);
+                }
+                for (let name in ctx) {
+                    setContext(name, ctx[name], false)
+                }
+            } else {
+                ctx = self.contexts
             }
 
         } else {

package/framework/{v0.1.6-alpha.8 → v0.1.6-alpha.80}/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.8 → v0.1.6-alpha.80}/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.8 → v0.1.6-alpha.80}/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]) ) {
@@ -96,19 +96,23 @@ function Start(opt, cmd) {
         newNodeModulesContentArr = null;
 
         var pack = requireJSON(packagePath);
+        var scope = process.env.NODE_SCOPE || self.defaultScope;
 
         if (
             !projectArchFileObj.existsSync()
             ||
             !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()
@@ -117,9 +121,11 @@ function Start(opt, cmd) {
             && typeof(pack.dependencies) != 'object'
             && pack.dependencies.count() > 0
         ) {
-            isNodeModulesReinstallNeeded = true;
+            if (scope == "local")
+                isNodeModulesReinstallNeeded = true;
         }
 
+        opt.client.write('\nScope: '+ scope);
         opt.client.write('\nArch: '+ currentArch);
         // opt.client.write('\nprojectArchFile: '+ projectArchFile);
         opt.client.write('\nPlatform: '+ currentPlatform);
@@ -293,9 +299,12 @@ function Start(opt, cmd) {
                     params = [
                         // node arguments will be passed by gina
                         appPath,
-                        JSON.stringify(getContext()), //Passing context to child.
-                        self.projectName, // project name
-                        bundle// bundle name
+                        //Passing context to child.
+                        JSON.stringify(getContext()),
+                        // project name
+                        self.projectName,
+                        // bundle name
+                        bundle
                     ];
 
                     // injecting node arguments
@@ -314,6 +323,7 @@ function Start(opt, cmd) {
                         }
                     }
 
+                    // terminal.debug('Spawning '+ opt.argv[0] +' [with args] '+ params);
                     var child = spawn(opt.argv[0], params,
                         {
                             // cwd: bundleDir,
@@ -401,6 +411,7 @@ function Start(opt, cmd) {
 
                         // Expecting 2 flags (checkCaseCount) to free the child stdout !!
                         // terminal.debug('BO case count '+ checkCaseCount);
+                        // terminal.log('[debug] ', data);
                         var _matched =  data.match(checkCaseRe);
                         if ( _matched ) {
                             // terminal.warn('case count: '+ checkCaseCount +'\nMatched: '+ _matched.length + '\n'+ checkCaseRe +'\n-> '+ data + '<-\n');
@@ -605,7 +616,9 @@ function Start(opt, cmd) {
         }
 
         //Checking root.
-        if ( new _(d, true).existsSync() ) {
+        var dExists = new _(d, true).existsSync();
+        terminal.debug('[Checking bundle bootstrap] `'+ d +'`: '+ dExists);
+        if ( dExists ) {
             //checking bundle directory.
             fs.stat(p, function(err, stats) {
                 if (err) {

package/framework/{v0.1.6-alpha.8 → v0.1.6-alpha.80}/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.8 → v0.1.6-alpha.80}/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.8 → v0.1.6-alpha.80}/lib/cmd/framework/link-node-modules.js

@@ -83,15 +83,14 @@ var console         = lib.logger;
                 sourceObj.mkdirSync()
             }
             // link from homdir to project path
-
             var destination = _(self.projectLocation + '/node_modules', true);
-
+            console.debug('[ FRAMEWORK ][ link-node-modules ] Linking ['+ sourceObj.toString() +'] to [ '+ destination +' ] ');
             err = sourceObj.symlinkSync(destination);
             if (err instanceof Error) {
                 return end(err, 'error')
             }
 
-            return end('Node modules link updated to '+ sourceObj.toString())
+            return end('Node modules link updated from ['+ sourceObj.toString() +'] to ['+ sourceObj.toString() +']');
         }
 
         // nothing to do

package/framework/{v0.1.6-alpha.8 → v0.1.6-alpha.80}/lib/cmd/framework/link.js

@@ -103,6 +103,7 @@ var console        = lib.logger;
                 return end(err, 'error');
             }
 
+            console.debug('[ FRAMEWORK ][ link ] Linking ['+ source.toString() +'] to [ '+ destination.toString() +' ] ');
             err = source.symlinkSync(destination.toString());
 
             if (err instanceof Error) {