gina 0.1.6-alpha.2 → 0.1.6-alpha.20

package/README.md

@@ -136,22 +136,13 @@ A project is a collection of bundles (applicaitons or services). See it as a rep
 
 Let's create our first project and install Gina.
 
-```tty
-cd ~/Sites
-```
-
-
-``` tty
-mkdir myproject && cd myproject
-```
-
 
-Then you need to __initialize your project__
+We will __initialize our project__ under `~/Sites`
 
 > On Windows from the Windows CLI, you might need admin privileges.
 
 ```  tty
-gina project:add @myproject
+gina project:add @myproject --path=~/Sites/myproject
 ```
 
 If you need to remove this project later

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

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

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

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

package/framework/{v0.1.6-alpha.2 → v0.1.6-alpha.20}/core/asset/plugin/dist/vendor/gina/js/gina.js

@@ -7782,7 +7782,7 @@ function Routing() {
             urlProps.hostname = config.hostname;
             if ( typeof(bundle) != 'undefined' ) {
                 // get from webroot
-                _route = routing.getRoute('webroot@'+ bundle);
+                _route = this.getRoute('webroot@'+ bundle);
                 urlProps.hostname   = _route.hostname;
                 urlProps.host       = _route.host;
                 urlProps.webroot    = _route.webroot;
@@ -7883,9 +7883,11 @@ function Routing() {
             return foundRoute;
         }
 
+
         return await parseRouting(params, url, request, response, next);
     };
 
+
     /**
      * Check if rule has params
      *
@@ -8553,14 +8555,42 @@ function Routing() {
      * */
     self.getRoute = function(rule, params, urlIndex) {
 
-        var config = null;
+        var config = null, isProxyHost = false;
         if (isGFFCtx) {
+            if (
+                !window.location.port
+                && window.location.hostname == window.gina.config.hostname.replace(/^(https|http|wss|ws)\:\/\//, '').replace(/\:\d+$/, '')
+            ) {
+                isProxyHost = true;
+                window.gina.config.hostname = window.gina.config.hostname.replace(/^(https|http|wss|ws)\:\/\//, '').replace(/\:\d+$/, '')
+            }
             config = window.gina.config;
         } else {
+
             config = getContext('gina').config;
             if ( typeof(getContext('argvFilename')) != 'undefined' ) {
                 config.getRouting = getContext('gina').Config.instance.getRouting;
             }
+
+            isProxyHost = getContext('isProxyHost');
+            // Double check
+            if (
+                !isProxyHost
+                && typeof(process.env.PROXY_REQUEST_HOST) != 'undefined'
+                && process.env.PROXY_REQUEST_HOST === process.env.PROXY_HOST
+                ||
+                !isProxyHost
+                && typeof(process.env.PROXY_REQUEST_HOST) == 'undefined'
+                && typeof(process.env.PROXY_HOST) != 'undefined'
+            ) {
+                isProxyHost = true;
+            }
+            // isProxyHost = ( _isProxyHost && /^true$/i.test(_isProxyHost) ) ? true : (( typeof(process.env.PROXY_HOSTNAME) != 'undefined' ) ? true : false);
+
+
+
+
+
         }
 
         var env         = config.env || GINA_ENV  // by default, takes the current bundle
@@ -8605,6 +8635,13 @@ function Routing() {
         var msg     = null;
         route = checkRouteParams(route, params);
 
+        route.isProxyHost = isProxyHost;
+        if (isProxyHost) {
+            // route.hostname = route.hostname.replace(/\:\d+/, '');
+            route.hostname  = (isGFFCtx) ? window.location.protocol +'//'+ window.gina.config.hostname : config.envConf._proxyHostname || process.env.PROXY_HOSTNAME;
+            route.host      = route.hostname.replace(/^(https|http)\:\/\//, '');
+        }
+
         if ( /\,/.test(route.url) ) {
             if ( typeof(route.urlIndex) != 'undefined' ) {
                 urlIndex = route.urlIndex; // set by checkRouteParams(route, params)
@@ -8678,7 +8715,16 @@ function Routing() {
                 , path      = this.url
             ;
 
-            this.url = ( typeof(ignoreWebRoot) != 'undefined' && ignoreWebRoot == true ) ? path.replace(wroot, '/') : path;
+            this.url = (
+                    typeof(ignoreWebRoot) != 'undefined'
+                    && /^true$/i.test(ignoreWebRoot)
+                ) ? path.replace( new RegExp('^'+ wroot), '/') : path.replace( new RegExp('^('+wroot +'|\/$)'), wroot);
+
+            // this.url = (
+            //     typeof(ignoreWebRoot) != 'undefined'
+            //     && /^true$/i.test(ignoreWebRoot)
+            // ) ? path.replace( new RegExp('\/'+ wroot), '/') : path;
+
 
             return hostname + this.url
         };
@@ -8792,6 +8838,7 @@ function Routing() {
         return route
     };
 
+    // TODO - Remove this : deprecated && not used
     var getFormatedRoute = function(route, url, hash) {
         // fix url in case of empty param value allowed by the routing rule
         // to prevent having a folder.
@@ -8822,12 +8869,13 @@ function Routing() {
     /**
      * Get route by url
      * N.B.: this will only work with rules declared with `GET` method property
+     * ATTENTION !!! Not fully working for frontend because of unresolved promises !!!!
      *
      * @function getRouteByUrl
      *
      * @param {string} url e.g.: /webroot/some/url/path or http
      * @param {string} [bundle] targeted bundle
-     * @param {string} [method] request method (GET|PUT|PUT|DELETE) - GET is set by default
+     * @param {string} [method] 2nd or 3rd -  request method (GET|PUT|PUT|DELETE) - GET is set by default
      * @param {object} [request]
      * @param {boolean} [isOverridinMethod] // will replace request.method by the provided method - Used for redirections
      *
@@ -8922,6 +8970,9 @@ function Routing() {
                 params: {},
                 url: url
             };
+            if (bundle) {
+                request.bundle = bundle;
+            }
         } else {
 
             var gnaCtx      = getContext('gina');
@@ -9009,11 +9060,8 @@ function Routing() {
                 // normal case
                 //Parsing for the right url.
                 try {
-
                     isRoute = self.compareUrls(params, routing[name].url, request);
-
                     if (isRoute.past) {
-
                         route = JSON.clone(routing[name]);
                         route.name = name;
 
@@ -11260,6 +11308,13 @@ if ( ( typeof(module) !== 'undefined' ) && module.exports ) {
                             // } 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;
@@ -18752,6 +18807,8 @@ define( 'helpers/binding',[],function() { return BindingHelper });
 // nodejs dependencies
 if ( typeof(module) !== 'undefined' && module.exports) {
     var fs              = require('fs');
+    var os              = require('os');
+    var dns             = require('dns');
     var execSync        = require('child_process').execSync;
     var util            = require('util');
     var promisify       = util.promisify;
@@ -19028,6 +19085,59 @@ function Domain(options, cb) {
         loadPSL(self.options, cb);
     }
 
+    /**
+     * Usage : await domainInstance.getFQDN()
+     * @param {string} hostname (one that can be resolved)
+     *
+     * @return {string} fqdn
+     */
+    var getFQDN = async function(hostname) {
+        var host = (
+            typeof(hostname) != 'undefined'
+            && hostname != ''
+        ) ? hostname : os.hostname();
+        if ( /\./.test(host) ) {
+            return host
+        }
+
+        console.debug('[DOMAIN][getFQDN] UQDN: ' + host);
+        var ipObj       = null
+            , err       = null
+        ;
+        ipObj = await promisify(dns.lookup)(host, { hints: dns.ADDRCONFIG || dns.V4MAPPED })
+                    .then( function onIP(result) {
+                        console.debug('[DOMAIN][getFQDN] IP: ' + result.address);
+                        console.debug('[DOMAIN][getFQDN] FAMILY: ' + result.family);
+
+                        return result;
+                    })
+                    .catch( function onIPErr(_err) {
+                        err = _err;
+                    });
+        if (err) {
+            throw err;
+        }
+        host = await promisify(dns.lookupService)(ipObj.address, 0)
+                    .then( function onLookupService(result) {
+                        console.debug('[DOMAIN][getFQDN] FQDN: ' + result.hostname);
+                        console.debug('[DOMAIN][getFQDN] Service: ' + result.service);
+
+                        return result.hostname;
+                    })
+                    .catch( function onLookupServiceErr(err) {
+                        err = _err;
+                    });
+        if (err) {
+            throw err;
+        }
+
+        if ( !/\./.test(host) ) {
+            throw new Error('[DOMAIN][getFQDN] `'+ host +'` is not a FQDN !');
+        }
+
+        return host;
+    }
+
 
     /**
      * Load a json file and removing comments if found
@@ -19138,7 +19248,8 @@ function Domain(options, cb) {
     };
     // Backend proto only
     if (!isGFFCtx) {
-        _proto.updatePSL = updatePSL;
+        _proto.updatePSL    = updatePSL;
+        _proto.getFQDN      = getFQDN;
     }
     // Frontend only
     else {