gina 0.1.6-alpha.60 → 0.1.6-alpha.61

package/framework/{v0.1.6-alpha.60 → v0.1.6-alpha.61}/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js.map

@@ -1,8 +1,8 @@
 {
 "version":3,
-"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.60/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.61/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":8,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.60/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.61/core/asset/plugin/src/vendor/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","decodeURIComponent","version","isProxyHost","__defineGetter__","_this","Date","parseInt","getTime","timeout","bundle","routes","routing","re","RegExp","String","fromCharCode","route","location","search","href","slice","match","Array","isArray","length","matched","split","err","link","links","document","head","getElementsByTagName","i","len","found","cssPath","createElement","media","rel","type","headEls","existingLinks","console","debug","insertBefore","appendChild","Toolbar"]
 }

package/framework/{v0.1.6-alpha.60 → v0.1.6-alpha.61}/core/gna.js

@@ -125,6 +125,8 @@ if (process.argv.length >= 3 /**&& /gina$/.test(process.argv[1])*/ ) {
         projectName = tmp[3];
         setContext('projectName', projectName);
         setContext('bundle', tmp[4]);
+        process.env.NODE_BUNDLE = tmp[4];
+        process.env.NODE_PROJECT = projectName;
 
         var obj = ctxObj.envVars;
         var evar = '';
@@ -185,8 +187,9 @@ if ( typeof(getEnvVar) == 'undefined') {
 }
 
 // console.debug('[ FRAMEWORK ] GINA_HOMEDIR [' + (GINA_HOMEDIR||null) +'] vs getEnvVar(GINA_HOMEDIR) [' + getEnvVar('GINA_HOMEDIR') +']' );
-var projects    = require( _(GINA_HOMEDIR + '/projects.json') );
-var root        = projects[projectName].path;
+var reversePorts    = require( _(GINA_HOMEDIR + '/ports.reverse.json') );
+var projects        = require( _(GINA_HOMEDIR + '/projects.json') );
+var root            = projects[projectName].path;
 
 gna.executionPath = root;
 setPath('project', root);
@@ -206,6 +209,8 @@ var env                     = (typeof(process.env.NODE_ENV) != 'undefined' && pr
     , scope                 = (typeof(process.env.NODE_SCOPE) != 'undefined' && process.env.NODE_SCOPE) ? process.env.NODE_SCOPE : projects[projectName]['def_scope']
     , isLocalScope          = (scope === projects[projectName]['local_scope']) ? true : false
     , isProductionScope     = (scope === projects[projectName]['production_scope']) ? true : false
+    , port                  = reversePorts[process.env.NODE_BUNDLE +'@'+ process.env.NODE_PROJECT][env][projects[projectName]['def_protocol']][projects[projectName]['def_scheme']]
+    , scheme                = projects[projectName]['def_scheme']
 ;
 
 gna.env = process.env.NODE_ENV = env;
@@ -216,9 +221,11 @@ gna.isAborting = false;
 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
+process.env.NODE_PORT = parseInt(port);
+// Proxy check thru proxy.json [Optional]
 var proxyPathObj    = new _(projects[projectName].path + '/proxy.json', true);
 var proxy           = null;
+var proxyPort       = null;
 if ( proxyPathObj.existsSync() ) {
     try {
         var proxyColl   = requireJSON(proxyPathObj.toString());
@@ -227,45 +234,63 @@ if ( proxyPathObj.existsSync() ) {
     } catch (proxyErr) {
         console.error('[ FRAMEWORK ][ configurationError ] ', proxyErr.stack || proxyErr.message || proxyErr);
     }
+} else { // default proxy
+    proxy = {};
+    proxy.id = scope +"_"+ env;
+    proxy.scope = scope;
+    proxy.env = env;
+    // "https://my.domain.tld"
+    proxy.hostname = null ;
+    proxyPort = process.gina.PROXY_PORT = port;
+}
 
-    if (proxy) {
+if (proxy) {
+    var foundScheme = null;
+    if (proxy.hostname) {
         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;
+        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;
+            foundScheme = gna.proxyHostname.match(/^(https|http)\:\/\//g)[0].replace(/\:\/\//g, '');
         }
-        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);
+    } else {
+        foundScheme = scheme;
     }
+    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);
+    gna.proxyScheme     = process.gina.PROXY_SCHEME      = scheme;
+
+    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';
 setPath('bundles', _(bundlesPath, true));
 

package/framework/{v0.1.6-alpha.60 → v0.1.6-alpha.61}/core/server.isaac.js

@@ -150,18 +150,40 @@ 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');
+            requestHost = request.headers.host || request.headers[':authority'];
+            if ( !/\:[0-9]+$/.test(requestHost) ) {
+                // Enable proxied mode
+                process.gina.PROXY_HOSTNAME = process.gina.PROXY_SCHEME +'://'+ requestHost;
+                process.gina.PROXY_HOST     = requestHost;
+                // Forcing context - also available for workers
+                setContext('isProxyHost', true);
+            }
+            if (
+                /^true$/.test(isProxyHost)
+                && /\:[0-9]+$/.test(requestHost)
+            ) {
+                // Restoring non-proxied mode
+                isProxyHost = false;
+                delete process.gina.PROXY_HOSTNAME;
+                delete process.gina.PROXY_HOST;
+                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`

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

@@ -299,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.6-alpha.60",
+  "version": "0.1.6-alpha.61",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -51,7 +51,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.6-alpha.60/core/gna",
+  "main": "./framework/v0.1.6-alpha.61/core/gna",
   "scripts": {
     "prepare": "node script/prepare_version.js",
     "postpublish": "node script/post_publish.js",

package/framework/v0.1.6-alpha.60/VERSION

@@ -1 +0,0 @@
-0.1.6-alpha.60

package/framework/v0.1.6-alpha.60/core/asset/plugin/dist/vendor/gina/css/gina.min.css.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.60/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}