gina 0.1.6-alpha.16 → 0.1.6-alpha.161

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

@@ -1,10 +1,11 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2026 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+const { execSync }  = require('child_process');
 
 
 /**
@@ -33,17 +34,38 @@ function SwigFilters(conf) {
 
     var isGFFCtx    = ((typeof (module) !== 'undefined') && module.exports) ? false : true;
 
+    // Setting up requirements - Gina toolbox
+    // var ginaPath = execSync("which gina")
+    //                             .toString()
+    //                             .replace(/(\n|\r|\t)/g, '')
+    //                             .replace(/\/bin\/gina/, '');
+
+    // var help    = require(ginaPath + '/utils/helper.js');
+    // var pack    = ginaPath + '/package.json';
+    // pack = (isWin32()) ? pack.replace(/\//g, '\\') : pack;
+    // pack = require(pack);
+
+    // var frameworkPath   = ginaPath +'/framework/v'+ pack.version;
+    // var helpers         = require(frameworkPath +'/helpers');
+    // var lib             = require(frameworkPath +'/lib');
+
+    // var merge   = lib.merge;
+    // var rouging = lib.routing;
+
+
     if ( typeof(merge) == 'undefined' ) {
-        var merge = null;
+        merge = null;
     }
     if ( !merge || typeof(merge) != 'function' ) {
         merge = require(_(GINA_FRAMEWORK_DIR+"/lib/merge", true));
+        // merge = lib.merge;
     }
     if ( typeof(routing) == 'undefined' ) {
-        var routing = null;
+        routing = null;
     }
     if ( !routing || typeof(routing) != 'function' ) {
         routing = require(_(GINA_FRAMEWORK_DIR+"/lib/routing", true));
+        // routing = lib.routing;
     }
 
     var self = { options: conf };
@@ -79,7 +101,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 +164,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) != 'undefined' && typeof(process.gina.PROXY_HOSTNAME) != 'undefined' ) ? true : false)
             , routingRules      = null
             , rule              = null
             , url               = NaN
@@ -149,6 +179,7 @@ function SwigFilters(conf) {
             , method            = 'GET'
         ;
 
+
         if (ctx.options.method != 'undefined') {
             method = ctx.options.method
         }
@@ -163,6 +194,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 +203,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 +230,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 +273,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,100 +284,33 @@ 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;
         }
 
-        // rules are now unique per bundle : rule@bundle
+        // rules are now unique per bundle : route@bundle
         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);
         }
 
-
-        // var ruleObj = routingRules[rule];
-        // if ( typeof(ruleObj) != 'undefined' && ruleObj != null ) { //found
-
-        //     url = ruleObj.url;
-
-        //     if ( typeof(ruleObj.requirements) != 'undefined' ) {
-        //         var urls    = null
-        //             , i     = 0
-        //             , len   = null
-        //             , p     = null
-        //         ;
-
-        //         for (p in ruleObj.requirements) {
-
-        //             if ( /\,/.test(url) ) {
-        //                 urls = url.split(/\,/g);
-        //                 i = 0; len = urls.length;
-        //                 for (; i< len; ++i) {
-        //                     if ( params && /:/.test(urls[i]) ) {
-        //                         urlStr = urls[i].replace(new RegExp(':'+p+'(\\W|$)', 'g'), params[p]+'$1');
-        //                         break
-        //                     }
-        //                 }
-
-        //                 url = (urlStr != null) ? urlStr : urls[0];
-        //             } else {
-        //                 try {
-        //                     url = url.replace(new RegExp(':'+p+'(\\W|$)', 'g'), params[p]+'$1')
-        //                 } catch (err) {
-        //                     ctx.throwError(ctx.res, 500, new Error('template compilation exception encoutered: [ '+ url +' ]\nsounds like you are having troubles with the following call `{{ "'+route+'" | getUrl() }}` where `'+p+'` parameter is expected according to your `routing.json`'  +'\n'+ (err.stack||err.message)));
-        //                 }
-        //             }
-        //         }
-        //     } else {
-        //         if ( /\,/.test(url) ) {
-        //             url = url.split(/\,/g)[0] || null; // just taking the default one: using the first element unless it is empty.
-        //             if (!url) {
-        //                 ctx.throwError(ctx.res, 500, new Error('please check your `routing.json` at the defined rule `'+ rule +'` : `url` attribute cannot be empty').stack)
-        //             }
-        //         }
-        //     }
-
-
-        //     if (hostname.length > 0) {
-        //         url = url.replace(wrootRe, '');
-        //     }
-
-        //     // fix url in case of empty param value allowed by the routing rule
-        //     // 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 = 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 = routingRules['404@'+ config.bundle].url.replace(wrootRe, '');
-        //         if (hostname.length > 0) {
-        //             url = url.replace(wrootRe, '');
-        //         }
-        //         url = hostname + url;
-        //     } else {
-        //         url = route;
-        //         if (hostname.length > 0) {
-        //             url = url.substr(1);
-        //         }
-        //         url = hostname + url
-        //     }
-
-        //     return '404:['+ ctx.req.method +']'+rule
-        // }
-
         return url
     }
 
@@ -335,6 +335,12 @@ function SwigFilters(conf) {
 }
 
 if ((typeof (module) !== 'undefined') && module.exports) {
+
+    // Loading logger
+    if ( typeof(console.err) == 'undefined' ) {
+        console = require('../../logger');
+    }
+
     // Publish as node.js module
     module.exports = SwigFilters
 } else if (typeof (define) === 'function' && define.amd) {

package/framework/{v0.1.6-alpha.16 → v0.1.6-alpha.161}/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.161/package.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.6-alpha.16",
+  "version": "0.1.6-alpha.161",
   "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-2026 Rhinostone <contact@gina.io>",
   "engine": {
     "node": ">= 0.10.0 <18"
   },
@@ -51,7 +51,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.6-alpha.16/core/gna",
+  "main": "./framework/v0.1.6-alpha.161/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-2026 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-2026 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -105,13 +105,13 @@ function PostInstall() {
         self.isResetNeeded      = ( typeof(process.env.npm_config_reset) != 'undefined' && /^(true|false)$/i.test(process.env.npm_config_reset) )
                                     ? (/^true$/i.test(process.env.npm_config_reset) ? true: false)
                                     : false;
-        self.defaultPrefix      = execSync('npm config get prefix').toString().replace(/\n$/g, '');
+        self.defaultPrefix      = execSync('$(which npm) config get prefix').toString().replace(/\n$/g, '');
         // var pkg = null;
         // try {
         //     if (self.isGlobalInstall) {
-        //         pkg = execSync('npm list -g gina --long --json').toString().replace(/\n$/g, '');
+        //         pkg = execSync('$(which npm) list -g gina --long --json').toString().replace(/\n$/g, '');
         //     } else {
-        //         pkg = execSync('npm list gina --long --json').toString().replace(/\n$/g, '');
+        //         pkg = execSync('$(which npm) list gina --long --json').toString().replace(/\n$/g, '');
         //     }
         // } catch(err) {
         //     throw err

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-2026 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -47,7 +47,7 @@ function PreInstall() {
         self.isResetNeeded      = ( typeof(process.env.npm_config_reset) != 'undefined' && /^(true|false)$/i.test(process.env.npm_config_reset) )
                                     ? (/^true$/i.test(process.env.npm_config_reset) ? true: false)
                                     : false;
-        self.defaultPrefix      = execSync('npm config get prefix').toString().replace(/\n$/g, '');
+        self.defaultPrefix      = execSync('$(which npm) config get prefix').toString().replace(/\n$/g, '');
 
 
         // `process.env.npm_config_prefix` is only retrieved on `npm install gina`
@@ -163,7 +163,7 @@ function PreInstall() {
 
         self.gina = __dirname +'/..';
         // tying to figure out if gina is already install the given prefix
-        // var hasFoundGina = execSync('npm list -g gina --long --json').toString().replace(/\n$/g, '');
+        // var hasFoundGina = execSync('$(which npm) list -g gina --long --json').toString().replace(/\n$/g, '');
         var hasFoundGina = pkg;
         try {
             hasFoundGina = JSON.parse(hasFoundGina);

package/utils/helper.js

@@ -39,7 +39,7 @@ function MainHelper(opt) {
 
             try {
                 pkg = packObj;
-                self.defaultPrefix = ( typeof(packObj.config) != 'undefined' && typeof(packObj.config.prefix) != 'undefined' ) ? packObj.config.prefix : execSync('npm config get prefix').toString().replace(/\n$/g, '');
+                self.defaultPrefix = ( typeof(packObj.config) != 'undefined' && typeof(packObj.config.prefix) != 'undefined' ) ? packObj.config.prefix : execSync('$(which npm) config get prefix').toString().replace(/\n$/g, '');
                 self.defaultPrefix = self.defaultPrefix.replace(/^\~/, getUserHome());
                 prefix = getEnvVar('GINA_PREFIX') || self.defaultPrefix;
                 self.optionalPrefix = pkg.config.optionalPrefix.replace(/^\~/, getUserHome());
@@ -47,7 +47,7 @@ function MainHelper(opt) {
                 console.warn('MainHelper::Init() Execption: '+ err.stack);
                 console.debug('Trying alternative config');
                 try {
-                    self.defaultPrefix = execSync('npm config get prefix').toString().replace(/\n$/g, '');
+                    self.defaultPrefix = execSync('$(which npm) config get prefix').toString().replace(/\n$/g, '');
                     prefix = getEnvVar('GINA_PREFIX') || self.defaultPrefix;
                     cmd = 'npm list gina --long --json --prefix='+ prefix;
                     if (self.isGlobalInstall) {
@@ -100,9 +100,9 @@ function MainHelper(opt) {
 
                 evar[0] = evar[0].toUpperCase();
                 if (
-                    evar[0].substr(0, 5) !== 'GINA_' &&
-                    evar[0].substr(0, 7) !== 'VENDOR_' &&
-                    evar[0].substr(0, 5) !== 'USER_'
+                    evar[0].substring(0, 5) !== 'GINA_' &&
+                    evar[0].substring(0, 7) !== 'VENDOR_' &&
+                    evar[0].substring(0, 5) !== 'USER_'
                     ) {
                     evar[0] = 'GINA_' + evar[0]
                 }
@@ -135,9 +135,9 @@ function MainHelper(opt) {
         //Cleaning the rest.
         for (let e in process.env) {
             if (
-                e.substr(0, 5) === 'GINA_' || // 6?
-                e.substr(0, 7) === 'VENDOR_' ||
-                e.substr(0, 5) === 'USER_'
+                e.substring(0, 5) === 'GINA_' || // 6?
+                e.substring(0, 7) === 'VENDOR_' ||
+                e.substring(0, 5) === 'USER_'
                 ) {
                 process['gina'][e] = process.env[e];
                 delete process.env[e]
@@ -189,7 +189,7 @@ function MainHelper(opt) {
             return logDir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || self.prefix || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || self.prefix || self.defaultPrefix || execSync('$(which npm) config get prefix').toString().replace(/\n$/g, '');
 
         if ( isWin32() ) {
             logDir = process.env.LOG ||
@@ -265,7 +265,7 @@ function MainHelper(opt) {
             return runDir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || self.prefix || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || self.prefix || self.defaultPrefix || execSync('$(which npm) config get prefix').toString().replace(/\n$/g, '');
 
         runDir = (isWin32()) ? getUserHome() + '\\.gina\\run' : prefix + '/var/lock';
 
@@ -330,7 +330,7 @@ function MainHelper(opt) {
             return dir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || self.prefix  || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || self.prefix  || self.defaultPrefix || execSync('$(which npm) config get prefix').toString().replace(/\n$/g, '');
 
         // support for node 0.10.x & 0.11.x
         var tmp = (os.tmpdir) ? os.tmpdir : function() {
@@ -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()`
@@ -450,9 +474,9 @@ function MainHelper(opt) {
         ;
 
         if (
-            key.substr(0, 5) !== 'GINA_' &&
-            key.substr(0, 7) !== 'VENDOR_' &&
-            key.substr(0, 5) !== 'USER_'
+            key.substring(0, 5) !== 'GINA_' &&
+            key.substring(0, 7) !== 'VENDOR_' &&
+            key.substring(0, 5) !== 'USER_'
             ) {
             key = 'USER_' + key
         }

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

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

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