gina 0.1.6-alpha.7 → 0.1.6-alpha.71

package/framework/{v0.1.6-alpha.7 → v0.1.6-alpha.71}/lib/routing/src/main.js

@@ -16,7 +16,7 @@
 
 function Routing() {
 
-    var isGFFCtx    = ((typeof (module) !== 'undefined') && module.exports) ? false :  true;
+    var isGFFCtx    = ((typeof (module) !== 'undefined') && module.exports) ? false : true;
     var self        = {
         allowedMethods: ['get', 'post', 'put', 'delete'],
         reservedParams: ['controle', 'file','title', 'namespace', 'path'],
@@ -71,7 +71,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;
@@ -172,9 +172,11 @@ function Routing() {
             return foundRoute;
         }
 
+
         return await parseRouting(params, url, request, response, next);
     };
 
+
     /**
      * Check if rule has params
      *
@@ -842,14 +844,26 @@ 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');
+            // isProxyHost = ( _isProxyHost && /^true$/i.test(_isProxyHost) ) ? true : (( typeof(process.gina.PROXY_HOSTNAME) != 'undefined' ) ? true : false);
+
         }
 
         var env         = config.env || GINA_ENV  // by default, takes the current bundle
@@ -894,6 +908,13 @@ function Routing() {
         var msg     = null;
         route = checkRouteParams(route, params);
 
+        route.isProxyHost = isProxyHost;
+        if (isProxyHost) {
+            // route.proxy_hostname  = (isGFFCtx) ? window.location.protocol +'//'+ window.gina.config.hostname : (process.gina.PROXY_HOSTNAME||config.envConf._proxyHostname);
+            route.proxy_hostname  = (isGFFCtx) ? window.location.protocol +'//'+ document.location.hostname : (process.gina.PROXY_HOSTNAME||config.envConf._proxyHostname);
+            route.proxy_host      = route.proxy_hostname.replace(/^(https|http)\:\/\//, '');
+        }
+
         if ( /\,/.test(route.url) ) {
             if ( typeof(route.urlIndex) != 'undefined' ) {
                 urlIndex = route.urlIndex; // set by checkRouteParams(route, params)
@@ -963,11 +984,23 @@ function Routing() {
             }
 
             var wroot       = this.webroot || urlProps.webroot
-                , hostname  = this.hostname || urlProps.hostname
-                , path      = this.url
+                , hostname  = ''+this.hostname || ''+urlProps.hostname
+                , path      = ''+this.url
             ;
+            if (this.isProxyHost) {
+                hostname = ''+this.proxy_hostname;
+            }
+
+            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;
 
-            this.url = ( typeof(ignoreWebRoot) != 'undefined' && ignoreWebRoot == true ) ? path.replace(wroot, '/') : path;
 
             return hostname + this.url
         };
@@ -999,6 +1032,10 @@ function Routing() {
                 , url       = ( typeof(ignoreWebRoot) != 'undefined' && ignoreWebRoot == true ) ? path.replace(wroot, '/') : this.url || _this.url
             ;
 
+            if ( /^\//.test(url) ) {
+                url = hostname + url;
+            }
+
             var scheme = ( /^https/.test(hostname) ) ? 'https' : 'http';
 
             if (isGFFCtx) {
@@ -1081,6 +1118,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.
@@ -1111,12 +1149,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
      *
@@ -1211,6 +1250,9 @@ function Routing() {
                 params: {},
                 url: url
             };
+            if (bundle) {
+                request.bundle = bundle;
+            }
         } else {
 
             var gnaCtx      = getContext('gina');
@@ -1298,11 +1340,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;
 
@@ -1324,7 +1363,7 @@ function Routing() {
                     url == '#'
                     && /GET/i.test(method)
                     && isMethodProvidedByDefault
-                    || /^404\:/.test(url)
+                    || /^404\:/.test(url)
                 ) {
                     url = location.pathname;
                     urlHasChanged = true;

package/framework/{v0.1.6-alpha.7 → v0.1.6-alpha.71}/lib/session-store.js

@@ -23,14 +23,14 @@ function SessionStore(session) {
     try {
         connector         = conf.content.connectors[session.name].connector;
     } catch (err) {
-        throw new Error('SessionStore could not be loaded: Connector issue. Please check your bundle configuration @config/connectors.json\n'+ err.stack);
+        throw new Error('[SessionStore] Could not be loaded: Connector issue. Please check your bundle configuration @config/connectors.json\n'+ err.stack);
     }
 
     var connectorName = 'couchbase';
     var filename = _(connectorsPath + '/'+ connector +'/lib/session-store.js', true);
 
     if ( !fs.existsSync(filename) ) {
-        throw new Error('SessionStore could not be loaded: `'+ filename+'` is missing');
+        throw new Error('[SessionStore] Could not be loaded: `'+ filename+'` is missing');
     }
 
     return require(filename)(session, bundle)

package/framework/{v0.1.6-alpha.7 → v0.1.6-alpha.71}/lib/swig-filters/src/main.js

@@ -79,7 +79,13 @@ function SwigFilters(conf) {
 
     // Allows you to get a bundle web root
     self.getWebroot = function (input, obj) {
-        var url = null, prop = self.options.envObj.getConf(obj, options.conf.env);
+
+        var ctx  = SwigFilters.instance._options || self.options;
+
+        var url     = null
+            , prop  = self.options.envObj.getConf(obj, options.conf.env)
+            , isProxyHost  = ( ctx.isProxyHost && /^true$/i.test(ctx.isProxyHost) ) ? true : (( typeof(process.gina.PROXY_HOSTNAME) != 'undefined' ) ? true : false)
+        ;
         if ( isProxyHost ) {
             url = prop.server.scheme + '://'+ prop.host;
         } else {
@@ -136,12 +142,14 @@ function SwigFilters(conf) {
         var ctx  = SwigFilters.instance._options || self.options;
 
         var config              = null
+            , scheme            = null
             , hostname          = null
+            , requestPort       = null
             , wroot             = null
             , wrootRe           = null
             , isStandalone      = null
             , isMaster          = null
-            , isProxyHost       = ctx.isProxyHost
+            , isProxyHost       = ( ctx.isProxyHost && /^true$/i.test(ctx.isProxyHost) ) ? true : (( typeof(process.gina.PROXY_HOSTNAME) != 'undefined' ) ? true : false)
             , routingRules      = null
             , rule              = null
             , url               = NaN
@@ -149,6 +157,7 @@ function SwigFilters(conf) {
             , method            = 'GET'
         ;
 
+
         if (ctx.options.method != 'undefined') {
             method = ctx.options.method
         }
@@ -163,6 +172,7 @@ function SwigFilters(conf) {
             var r = route.split(/\@/);
             route = r[0].toLowerCase();
             base = config.bundle = r[1];
+            r = null;
         } else {
             if (
                 !/\@/.test(route)
@@ -171,7 +181,9 @@ function SwigFilters(conf) {
             ) {
                 base = config.bundle = ctx.options.conf.bundle;
             }
-            route = route.toLowerCase();
+            // eg.: "/assets/img/common/header@2x.png"
+            // Added comment on 2024-02-23
+            // route = route.toLowerCase();
         }
 
         // setting default config
@@ -196,11 +208,42 @@ function SwigFilters(conf) {
 
                     // retrieve hostname, webroot & routingRules
                     hostname        = config.hostname + config.server.webroot;
+
+                    scheme          = hostname.match(/^(https|http)/)[0];
+                    requestPort = (ctx.req.headers.port||ctx.req.headers[':port']||parseInt(process.gina.PROXY_PORT));
+                    var hostPort = config.hostname.match(/(\:d+\/|\:\d+)$/);
+                    hostPort = (hostPort) ? ~~(hostPort[0].replace(/\:/g, '')) : config.port[config.server.protocol][config.server.scheme];
+                    // Linking bundle B from bundle A wihtout proxy
+                    var isSpecialCase = (
+                            getContext('bundle') != config.bundle
+                            && requestPort != hostPort
+                            && ctx.req.headers[':host'] != process.gina.PROXY_HOST
+                    ) ? true : false;
+
+                    if (isSpecialCase) {
+                        hostname = config.hostname
+                        if (isProxyHost) {
+                            hostname = scheme + '://'+ (process.gina.PROXY_HOST||ctx.req.headers.host||ctx.req.headers[':host']);
+                        }
+                    }
+
                     // rewrite hostname vs ctx.req.headers.host
-                    if ( isProxyHost ) {
-                        hostname = hostname.replace(/\:\d+/, '');
+                    if (
+                        isProxyHost
+                        && !isSpecialCase
+                    ) {
+
+                        hostname    = scheme + '://'+ (process.gina.PROXY_HOST||ctx.req.headers.host||ctx.req.headers[':host']);
+
+                        if (
+                            !/^(80|443)$/.test(requestPort)
+                            && !new RegExp(requestPort+'$').test(hostname)
+                        ) {
+                            hostname += ':'+ requestPort;
+                        }
                     }
 
+
                     config.bundle   = base;
                     isStandalone    = (mainConf.bundles.length > 1) ? true : false;
                     isMaster        = (mainConf.bundles[0] === config.bundle) ? true : false;
@@ -208,6 +251,8 @@ function SwigFilters(conf) {
                 } else {
                     ctx.throwError(ctx.res, 500, new Error('bundle `'+ base +'` not found: Swig.getUrl() filter encountered a problem while trying to compile base `'+base+'` and route `'+route+'`').stack)
                 }
+            } else {
+                scheme = base.match(/^(https|http)/)[0];
             }
         }
 
@@ -218,8 +263,11 @@ function SwigFilters(conf) {
 
             if ( !wrootRe.test(route) ) {
                 route = config.server.webroot + route.substr(1);
-                hostname = hostname.replace(new RegExp( config.server.webroot +'$'), '')
-            } else {
+                hostname =   hostname.replace(new RegExp( config.server.webroot +'$'), '')
+            } else if (
+                config.server.webroot != '/'
+                && config.server.webroot != ''
+            ) {
                 route = route.substr(1)
             }
 
@@ -230,9 +278,16 @@ function SwigFilters(conf) {
         rule = route + '@' + config.bundle;
         //var ruleObj = getRouteDefinition(routingRules, rule, method);
         try {
-            url = routing.getRoute(route +'@'+ config.bundle, params).toUrl();
+            url = routing.getRoute(route +'@'+ config.bundle, params);
+            if (isProxyHost) {
+                url.proxy_hostname    = (isGFFCtx) ? window.location.protocol +'//'+ document.location.hostname : process.gina.PROXY_HOSTNAME;
+                url.proxy_host        = url.hostname.replace(/(https|http)\:\/\//, '');
+            }
+            url = url.toUrl();
+
         } catch (routingErr) {
-            url = '404:['+ ctx.req.method +']'+rule
+            url = '404:['+ ctx.req.method +']'+rule;
+            console.error('[swig-filter] Routing Exception on route "', rule, '" \n', 'isProxy: '+ isProxyHost +'\n', 'process.gina.PROXY_HOSTNAME: '+ process.gina.PROXY_HOSTNAME +'\n' , routingErr.stack);
         }
 
 

package/framework/v0.1.6-alpha.71/package.json

@@ -0,0 +1,12 @@
+{
+  "dependencies": {
+    "streamsearch": "^1.1.0",
+    "colors": "^1.4.0",
+    "engine.io": "^6.6.0",
+    "engine.io-client": "^6.6.2",
+    "requirejs": "2.3.7",
+    "ssl-checker": "^2.0.7",
+    "swig": "^1.4.2",
+    "uuid": "^7.0.3"
+  }
+}

package/package.json

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

package/utils/helper.js

@@ -367,6 +367,30 @@ function MainHelper(opt) {
         return tmp()
     }
 
+    /**
+     * getBundleStartingArgv
+     * Will get the bundle starting ARGV to allow live restart
+     *
+     * @param {string} bundle
+     * @param {string} project
+     *
+     * @returns {string} argv
+     * */
+    getBundleStartingArgv = function(bundle, project) {
+        bundle = bundle.replace(/(`|\s+)/g, '');
+        project = project.replace(/(`|\s+)/g, '');
+        var filename = _(getTmpDir() +'/'+ bundle +'@'+ project +'.argv', true);
+
+        var content = null;
+        if ( fs.existsSync(filename) ) {
+            delete require.cache[require.resolve(filename)];
+            content = ''+fs.readFileSync(filename);
+            content = content.replace(/\,/g, ' ');
+        }
+        // console.debug("@filename: ", filename, content);
+        return content
+    }
+
     /**
      * isWritableSync
      * Only used for `getUserHome()`

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

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

package/framework/v0.1.6-alpha.7/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.7/core/asset/plugin/dist/vendor/gina/css/gina.min.css","sourcesContent":[]}