gina 0.1.6-alpha.8 → 0.1.6-alpha.80

package/framework/{v0.1.6-alpha.8 → v0.1.6-alpha.80}/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,16 +209,86 @@ 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;
 gna.scope = process.env.NODE_SCOPE = scope;
 gna.os.isWin32 = process.env.isWin32 = isWin32;
 gna.isAborting = false;
-//Cahceless is also defined in the main config : Config::isCacheless().
+//Cacheless is also defined in the main config : Config::isCacheless().
 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;
+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());
+        proxy       = new lib.Collection(proxyColl).findOne({ scope: process.env.NODE_SCOPE, env: process.env.NODE_ENV });
+        proxyColl   = null;
+    } 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) {
+    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+$/, '')
+        ;
+        proxyPort = gna.proxyHostname.match(/\:\d+\/$|\:\d+$/) || null;
+
+        if (proxyPort) {
+            proxyPort = parseInt(proxyPort[0].match(/\d+/));
+        } else {
+            foundScheme = gna.proxyHostname.match(/^(https|http)\:\/\//g)[0].replace(/\:\/\//g, '');
+        }
+    } 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';
@@ -443,12 +516,16 @@ gna.mount = process.mount = function(bundlesPath, source, target, type, callback
     }
     var tmpPath = getPath('project') + '/tmp';
     console.debug('tmp path: ', tmpPath);
-    if ( !fs.existsSync(tmpPath) ) {
-        new _(tmpPath).mkdirSync();
+    var tmpPathObj = new _(tmpPath);
+    if ( !tmpPathObj.existsSync() ) {
+        tmpPathObj.mkdirSync();
     }
+    tmpPathObj = null;
+    var sourceObj = new _(source);
+    var targetObj = new _(target);
 
-    var isSourceFound   = fs.existsSync(source)
-        , isTargetFound = fs.existsSync(target)
+    var isSourceFound   = sourceObj.existsSync()
+        , isTargetFound = targetObj.existsSync()
     ;
     console.debug('[ FRAMEWORK ][ MOUNT ] Source: ', source);
     console.debug('[ FRAMEWORK ][ MOUNT ] Checking before mounting ', target, isTargetFound, bundlesPath);
@@ -475,6 +552,7 @@ gna.mount = process.mount = function(bundlesPath, source, target, type, callback
             if (!destinationObj.existsSync()) {
                 destinationObj.mkdirSync();
             }
+            console.debug('[ FRAMEWORK ][ MOUNT ] Linking ['+ srcPathObj.toString() +'] to [ '+ _(source) +' ] ');
             srcPathObj.symlinkSync(_(source));
             isSourceFound = true;
         }
@@ -485,15 +563,16 @@ gna.mount = process.mount = function(bundlesPath, source, target, type, callback
         gna.lib.generator.createPathSync(bundlesPath, function onPathCreated(err){
             if (!err) {
                 try {
-                    var targetObj = new _(target);
+                    // var targetObj = new _(target);
                     if ( targetObj.existsSync() ) {
                         targetObj.rmSync();
                     }
-                    if ( type != undefined)
+                    console.debug('[ FRAMEWORK ][ MOUNT ] Linking ['+ source +'] to [ '+ target +' ] ');
+                    if ( type != undefined) {
                         fs.symlinkSync(source, target, type)
-                    else
+                    } else {
                         fs.symlinkSync(source, target);
-
+                    }
                     // symlink created
                     callback(false);
 
@@ -544,6 +623,7 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
          * */
         gna.onInitialize = process.onInitialize = function(callback) {
 
+            console.debug('[ FRAMEWORK ] Bootstrap Initialization... ');
             gna.initialized = true;
             e.once('init', function(instance, middleware, conf) {
 
@@ -557,22 +637,20 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
 
                         joinContext(conf.contexts);
                         gna.getConfig = function(name){
-                            // var tmp = '';
+                            var tmp = null;
                             if ( typeof(name) != 'undefined' ) {
                                 try {
                                     //Protect it.
-                                    // tmp = JSON.stringify(conf.content[name]);
-                                    // return JSON.parse(tmp)
-                                    return JSON.clone(conf.content[name])
+                                    tmp = JSON.clone(conf.content[name])
                                 } catch (err) {
                                     console.error('[ FRAMEWORK ] ', err.stack);
                                     return undefined
                                 }
                             } else {
-                                // tmp = JSON.stringify(conf);
-                                // return JSON.parse(tmp)
-                                return JSON.clone(conf)
+                                //Protect it.
+                                tmp = JSON.clone(conf)
                             }
+                            return tmp
                         };
                         try {
                             //configureMiddleware(instance, express); // no, no and no...
@@ -876,6 +954,7 @@ isBundleMounted(projects, bundlesPath, getContext('bundle'), function onBundleMo
                                     if (
                                         conf.server.scheme == 'https'
                                         && !/^true$/i.test(process.env.NODE_SCOPE_IS_PRODUCTION)
+                                        && !/^true$/i.test(isProxyHost)
                                     ) {
                                         try {
                                             await server.verifyCertificate(conf.host, conf.server.port);

package/framework/{v0.1.6-alpha.8 → v0.1.6-alpha.80}/core/model/index.js

@@ -54,8 +54,8 @@ function Model(namespace, _config) {
 
 
     var setup = function(namespace) {
-        if ( typeof(namespace) == 'undefined' || namespace == '') {
-            console.error('[ MODEL ][ '+ namespace +' ] MODEL:ERR:1 EEMPTY: Model namespace',  __stack);
+        if ( typeof(namespace) == 'undefined' || namespace == '') {
+            console.error('[MODEL]['+ namespace +'] MODEL:ERR:1 EEMPTY: Model namespace',  __stack);
         }
 
         var model, namespace = namespace.split(/\//g);
@@ -75,8 +75,8 @@ function Model(namespace, _config) {
         }
 
 
-        console.debug('[ MODEL ][ ' + model +' ] Bundle: '+ bundle);
-        //console.debug('[ MODEL ][ ' + model +' ] Model: '+ model);
+        console.debug('[MODEL][' + model +'] Bundle: '+ bundle);
+        //console.debug('[MODEL][' + model +'] Model: '+ model);
         self.name       = _connector;
         self.bundle     = bundle;
         self.model      = model;
@@ -115,29 +115,31 @@ function Model(namespace, _config) {
             _configuration = conf.connectors;
             self.connector = _configuration[self.name].connector;
 
-            console.debug('[ MODEL ][ ' + model +' ] About to scan: '+ conf.path);
+            console.debug('[MODEL][' + model +'] About to scan: '+ conf.path);
             //TODO - More controls...
 
             //For now, I just need the F..ing entity name.
             connectorPath       = local.connectorPath = _(GINA_FRAMEWORK_DIR +'/core/connectors/'+ self.connector);
             var modelPath       = local.modelPath = _(conf.path + '/' + modelDirName);
             var entitiesPath    = local.entitiesPath = _(modelPath + '/entities');
-            console.debug('[ MODEL ][ ' + model +' ] Scanning model entities: ', entitiesPath +' - Existing path ? '+ fs.existsSync(entitiesPath) );
+            console.debug('[MODEL][' + model +'] Scanning model entities: ', entitiesPath +' - Existing path ? '+ fs.existsSync(entitiesPath) );
             if (!fs.existsSync(entitiesPath)) {
                 //fs.mkdirSync(entitiesPath) // creating empty path
                 new _(entitiesPath).mkdirSync();
             }
 
             connectorPath   = _(connectorPath + '/lib/connector.js');
-            console.debug('[ MODEL ][ ' + model +' ] Loading connector: ' + connectorPath);
+            console.debug('[MODEL][' + model +'] Loading Connector: ' + connectorPath);
             //Getting Entities Manager.
             var exists = fs.existsSync(connectorPath);
             if (exists) {
-                if (cacheless)
+                if (cacheless) {
                     delete require.cache[require.resolve(_(connectorPath, true))];
+                }
 
+                console.debug('[MODEL][' + model +'] Using connector path: ' + _(connectorPath, true));
                 var Connector = require(_(connectorPath, true));
-
+                console.debug('[MODEL][' + model +'] Connecting ... ');
                 self.connect(
                     Connector,
                     function onConnect(err, conn) {
@@ -154,12 +156,12 @@ function Model(namespace, _config) {
             } else {//Means that no connector was found in models.
 
                 //finished.
-                self.emit('model#ready', new Error('[ MODEL ][ '+ model +' ] No connector found'), self.bundle, self.name, conn)
+                self.emit('model#ready', new Error('[MODEL]['+ model +'] No connector found'), self.bundle, self.name, conn)
             }
 
         } else {
-            console.warn('[ MODEL ][ ' + model +' ] no configuration found...');
-            self.emit('model#ready', new Error('[ MODEL ][ ' + model +' ] no configuration found for your model: ' + model), self.bundle, self.name, null)
+            console.warn('[MODEL][' + model +'] No configuration found...');
+            self.emit('model#ready', new Error('[MODEL][' + model +'] No configuration found for your model: ' + model), self.bundle, self.name, null)
         }
 
         return self
@@ -168,7 +170,7 @@ function Model(namespace, _config) {
 
     this.connect = function(Connector, callback) {
         if ( typeof(self.connectors[_connector]) == 'undefined' ) {
-            //console.debug('[ MODEL ] Need to create connector instance ...');
+            //console.debug('[MODEL] Need to create connector instance ...');
             self.connectors[_connector] = {};
             var connector = new Connector( self.getConfig(_connector) );
 
@@ -204,7 +206,10 @@ function Model(namespace, _config) {
         var i = i || 0;
 
         var configuration = null;
-        var env = null, conf = null, connectors = null;
+        var env             = null
+            , conf          = null
+            , connectors    = null
+        ;
         if ( typeof (_config) != 'undefined' ) {
             configuration = _config;
             env = _config.env;
@@ -215,21 +220,21 @@ function Model(namespace, _config) {
             env = configuration.Env.current;
             conf = configuration.Env.getConf(bundle, env);
         }
-        console.debug('[ MODEL ][ ' + _connector + ' ] env ', conf.env);
-        console.debug('[ MODEL ][ ' + _connector + ' ] configuration modelsPath ', conf.modelsPath);
-        console.debug('[ MODEL ][ ' + _connector + ' ] connectors ', connectors);
+        console.debug('[MODEL][' + _connector + '][getConfigSync] env ', conf.env);
+        console.debug('[MODEL][' + _connector + '][getConfigSync] configuration modelsPath ', conf.modelsPath);
+        console.debug('[MODEL][' + _connector + '][getConfigSync] connectors ', connectors);
 
         // try {
 
         //     var locals = _locals = configLib.getSync('gina', 'locals.json')
         // } catch (err) {
-        //     console.emerg('[ MODEL ][ ' + _connector +' ] Error while calling `Model::getConfigSync()` '+ err.stack||err.message);
+        //     console.emerg('[MODEL][' + _connector +'] Error while calling `Model::getConfigSync()` '+ err.stack||err.message);
         //     if ( i < 10) {
-        //         console.debug('[ MODEL ][ ' + _connector +' ] about to retry to load locals.json');
+        //         console.debug('[MODEL][' + _connector +'] About to retry to load locals.json');
         //         setTimeout(function(){
 
         //             i = i+1;
-        //             console.debug('[ MODEL ][ ' + _connector +' ] retry ('+i+') ...');
+        //             console.debug('[MODEL][' + _connector +'] Retry ('+i+') ...');
         //             return getConfigSync(bundle, i)
         //         }, 300)
 
@@ -245,13 +250,12 @@ function Model(namespace, _config) {
             // configuration object.
             var confObj = {
                 connectors  : connectors,
-                path        : conf.modelsPath/**,
-                locals      : locals*/
+                path        : conf.modelsPath
             };
 
             return confObj
         } else {
-            throw new Error('[ MODEL ][ ' + _connector +' ] Config not instantiated');
+            throw new Error('[MODEL][' + _connector +'][getConfigSync] Config not instantiated');
             return undefined
         }
     }
@@ -277,7 +281,7 @@ function Model(namespace, _config) {
             // entities == null when the database server has not started.
             if ( err ) {
                 console.error(err.stack||err.message)
-                //console.log('No entities found for [ '+ self.name +':'+ entityName +'].\n 1) Check if the database is started.\n2) Check if exists: /models/entities/'+ entityName);
+                //console.debug('No entities found for ['+ self.name +':'+ entityName +'].\n 1) Check if the database is started.\n2) Check if exists: /models/entities/'+ entityName);
             }
             callback(err, bundle, model, conn)
         });

package/framework/{v0.1.6-alpha.8 → v0.1.6-alpha.80}/core/plugins/lib/validator/src/form-validator.js

@@ -385,11 +385,12 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                         // system error
                         systemError = result.error;
                     }
-                    // Fixed on 2023-01-10
+                    // Fixed added on 2023-01-10
                     // We want `local.errorLabels['query']` before the generic|user defined `rule` error
                     var optionError = ( typeof(options['error']) != 'undefined' ) ? options['error'] : null;
                     errors['query'] = replace(systemError || _this['error'] || optionError || local.errorLabels['query'],  _this);
-                    console.debug('[1] query error detected !! ', result);
+
+                    console.debug('[1] query error detected !! ', result, errorFields, errors['query']);
                 }
 
                 if ( !errors['query'] && _this.value == '' ) {
@@ -459,6 +460,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
 
             var id = _this.target.id || _this.target.getAttribute('id');
             console.debug('prematurely completed event `'+ 'asyncCompleted.' + id +'`');
+
             return triggerEvent(gina, _this.target, 'asyncCompleted.' + id, self[_this['name']]);
         } // EO onResult
 
@@ -854,7 +856,7 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
                 isValid = condition;
             } else if (!isValid) {
                 var re = null, flags = null;
-                // Fixed on 2021-03-13: $variable now replaced with real value beafore validation
+                // Fixed added on 2021-03-13: $variable now replaced with real value beafore validation
                 if ( /[\!\=>\>\<a-z 0-9]+/i.test(condition) ) {
                     var variables = condition.match(/\${0}[-_,.\[\]a-z0-9]+/ig); // without space(s)
                     if (variables && variables.length > 0) {
@@ -1230,24 +1232,26 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
 
 
         self[el]['toFloat'] = function(decimals) {
-            if ( typeof(this.value) == 'string' ) {
-                this.value = this.value.replace(/\s+/g, '');
-                if ( /\,/.test(this.value) && !/\./.test(this.value) ) {
-                    this.value = this.value.replace(/\,/g,'.');
-                    //local.data[this.name] = this.value;
-                    // if (isGFFCtx) {
-                    //     //this.target.setAttribute('value', this.value);
-                    //     document.getElementById(this.target.id).value = this.value;
-                    //     //triggerEvent(gina, this.target, 'change', self[this['name']]);
-                    // }
-
-                } else {
-                    this.value = this.value.replace(/\,/g,'');
+            // Fixed on 2025-03-12
+            // In case we are dealing with a filtered value (swig::formatNumber())
+            var val                     = document.getElementById(this.target.getAttribute('id')).value || this.value
+                isFloatingWithCommas    = false
+            ;
+            if ( typeof(val) == 'string' ) {
+                val = val.replace(/\s+/g, '');
+                // Fixed on 2025-03-12
+                // thousand separator ?
+                if ( /\,/.test(val) && /\./.test(val) ) {
+                    val = val.replace(/\,/g,'');
+                }
+                else if ( /\,/.test(val) ) {
+                    val = val.replace(/\,/g,'.');
+                    isFloatingWithCommas = true;
                 }
             }
 
-            var val         = local.data[this.name] = this.value
-                , errors    = self[this['name']]['errors'] || {}
+            local.data[this.name] = val;
+            var errors    = self[this['name']]['errors'] || {}
                 , isValid   = true
             ;
 
@@ -1262,32 +1266,40 @@ function FormValidatorUtil(data, $fields, xhrOptions, fieldsSet) {
             } else {
                 if ( this['isNumber']().valid ) {
                     try {
-
                         if ( !Number.isFinite(val) ) {
-                            val = this.value = local.data[this.name] = new Number(parseFloat(val.match(/[0-9.,]+/g).join('').replace(/,/, '.')));// Number <> number
+                            // Number <> number
+                            val = new Number(parseFloat(val.match(/[0-9.,]+/g).join('').replace(/,/, '.')));
                         }
-                        if (isGFFCtx)
-                            this.target.setAttribute('value', val);
                     } catch(err) {
                         isValid = false;
-                        errors['toFloat'] = replace(this.error || local.errorLabels['toFloat'], this);
+                        errors['toFloat'] = replace(this.error || local.errorLabels['toFloat'], this);
                         this.valid = false;
                         if ( errors.count() > 0 )
                             this['errors'] = errors;
                     }
                 } else {
                     isValid = false;
-                    errors['toFloat'] = replace(this.error || local.errorLabels['toFloatNAN'], this)
+                    errors['toFloat'] = replace(this.error || local.errorLabels['toFloatNAN'], this)
                 }
             }
 
             if (this['decimals'] && val && !errors['toFloat']) {
-                this.value = local.data[this.name] = parseFloat(this.value.toFixed(this['decimals']));
+                val = parseFloat(val.toFixed(this['decimals']));
+            }
+
+            this.value = local.data[this.name] = val;
+            if (isGFFCtx) {
+                // restore original input format for display
+                if (isFloatingWithCommas) {
+                    val = (''+val).replace(/\./g,',');
+                }
+                this.target.setAttribute('value', val);
             }
 
             this.valid = isValid;
-            if ( errors.count() > 0 )
+            if ( errors.count() > 0 ) {
                 this['errors'] = errors;
+            }
 
             return self[this.name]
         }