gina 0.1.6-alpha.9 → 0.1.6-alpha.90

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2025 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -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];
             }
         }
 
@@ -217,10 +262,13 @@ function SwigFilters(conf) {
         if (/^\//.test(route)) {
 
             if ( !wrootRe.test(route) ) {
-                route = config.server.webroot + route.substr(1);
-                hostname = hostname.replace(new RegExp( config.server.webroot +'$'), '')
-            } else {
-                route = route.substr(1)
+                route = config.server.webroot + route.substring(1);
+                hostname =   hostname.replace(new RegExp( config.server.webroot +'$'), '')
+            } else if (
+                config.server.webroot != '/'
+                && config.server.webroot != ''
+            ) {
+                route = route.substring(1)
             }
 
             return hostname + route;
@@ -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);
         }
 
 
@@ -287,14 +342,14 @@ function SwigFilters(conf) {
         //     // to prevent having a folder.
         //     // eg.: {..., id: '/^\\s*$/'} => {..., id: ''} => /path/to/ becoming /path/to
         //     if ( /\/$/.test(url) && url != '/' )
-        //         url = url.substr(0, url.length-1);
+        //         url = url.substring(0, url.length-1);
 
         //     url = hostname + url;
 
         // } else {
 
         //     if ( typeof(routingRules['404@'+ config.bundle]) != 'undefined' && typeof(routingRules['404@'+ config.bundle].url) != 'undefined' ) {
-        //         //url = ( /^\//.test(routingRules['404@'+ config.bundle].url) ) ? hostname + routingRules['404@'+ config.bundle].url.substr(1) : hostname + routingRules['404@'+ config.bundle].url;
+        //         //url = ( /^\//.test(routingRules['404@'+ config.bundle].url) ) ? hostname + routingRules['404@'+ config.bundle].url.substring(1) : hostname + routingRules['404@'+ config.bundle].url;
         //         url = routingRules['404@'+ config.bundle].url.replace(wrootRe, '');
         //         if (hostname.length > 0) {
         //             url = url.replace(wrootRe, '');
@@ -303,7 +358,7 @@ function SwigFilters(conf) {
         //     } else {
         //         url = route;
         //         if (hostname.length > 0) {
-        //             url = url.substr(1);
+        //             url = url.substring(1);
         //         }
         //         url = hostname + url
         //     }

package/framework/{v0.1.6-alpha.9 → v0.1.6-alpha.90}/lib/validator.js

@@ -289,7 +289,7 @@ function Validator(data, errorLabels) {
                     if ( !(local.errors[this.name]) )
                         local.errors[this.name] = {};
 
-                    local.errors[this.name].toFloat = replace(this.error || local.errorLabels.toFloat, this)
+                    local.errors[this.name].toFloat = replace(this.error || local.errorLabels.toFloat, this)
                 }
             }
 
@@ -328,7 +328,7 @@ function Validator(data, errorLabels) {
                 if ( !(local.errors[this.name]) ) {
                     local.errors[this.name] = {};
                 }
-                local.errors[this.name].isFloat = replace(this.error || local.errorLabels.isFloat, this)
+                local.errors[this.name].isFloat = replace(this.error || local.errorLabels.isFloat, this)
             }
 
             return self[this.name]

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

@@ -0,0 +1,11 @@
+{
+  "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",
+    "uuid": "^7.0.3"
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.6-alpha.9",
+  "version": "0.1.6-alpha.90",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -39,7 +39,7 @@
       "url": "https://fdelaneau.com"
     }
   ],
-  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2025 Rhinostone <contact@gina.io>",
   "engine": {
     "node": ">= 0.10.0 <18"
   },
@@ -51,7 +51,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.6-alpha.9/core/gna",
+  "main": "./framework/v0.1.6-alpha.90/core/gna",
   "scripts": {
     "prepare": "node script/prepare_version.js",
     "postpublish": "node script/post_publish.js",

package/resources/package.json.template

@@ -39,7 +39,7 @@
       "url": "https://fdelaneau.com"
     }
   ],
-  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2025 Rhinostone <contact@gina.io>",
   "engine": [
     "node >=0.10.25"
   ],

package/script/post_install.js

@@ -2,7 +2,7 @@
 'use strict';
 /**
  * This file is part of the gina package.
- * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2025 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

package/script/pre_install.js

@@ -2,7 +2,7 @@
 
 /**
  * This file is part of the gina pkg.
- * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2025 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

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.9/VERSION

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

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