gina 0.1.1-alpha.157 → 0.1.1-alpha.159

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/config.js

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

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/connectors/couchbase/index.js

@@ -237,7 +237,7 @@ function Couchbase(conn, infos) {
                         , _mainCallback = null;
 
                     if ( params && params.length != args.length && !/function/.test(typeof(args[args.length-1])) ) {
-                        throw new Error('[ N1QL:' + entityName+'#'+name+'() ] arguments must match parameters length. Please refer to [ '+ source +' ]\nFound in param list: ('+ params.join(', ') +') !')
+                        throw new Error('[N1QL][ ' + entityName+'#'+name+'() ] arguments must match parameters length. Please refer to [ '+ source +' ]\nFound in param list: ('+ params.join(', ') +') !')
                     } else if ( /function/.test( typeof(args[args.length-1]) ) ) {
                         // to hande Nodejs Util.promisify
                         _mainCallback = args[args.length-1]
@@ -397,7 +397,7 @@ function Couchbase(conn, infos) {
                         // merge options
                         for (var qOpt in queryOptions) {
                             if ( typeof(query[ qOpt ]) == 'undefined' ) {
-                                console.warn('N1QL:'+entityName.toLowerCase()+ '#'+ name + ': `'+ qOpt +'` is not a valid queryOption. Ignorig...');
+                                console.warn('[N1QL]['+entityName.toLowerCase()+ '#'+ name + '] `'+ qOpt +'` is not a valid queryOption. Ignorig...');
                                 continue;
                             }
                             query[ qOpt ]( queryOptions[ qOpt ] );
@@ -690,11 +690,17 @@ function Couchbase(conn, infos) {
      *
      * Supported options
      *  - adhoc : [ true | false ]
-     *  // scan consistency level - default is 1
+     *  // scan consistency level - here, default is 3
      *  - consistency : [ 1 | 2 | 3 ] where 1 = NOT_BOUNDED, 2 = REQUEST_PLUS, 3 = STATEMENT_PLUS
+     *      not_bounded:
+     *          Executes the query immediately, without requiring any consistency for the query. If index-maintenance is running behind, out-of-date results may be returned.
+     *      at_plus:
+     *          Executes the query, requiring indexes first to be updated to the timestamp of the last update. If index-maintenance is running behind, the query waits for it to catch up.
+     *      request_plus:
+     *          Executes the query, requiring the indexes first to be updated to the timestamp of the current query-request. If index-maintenance is running behind, the query waits for it to catch up.
      *
      * @param {array} rec collection
-     * @param {object} [options] e.g: { consistency: 3 }
+     * @param {object} [options] e.g: { consistency: 2 }
      *
      */
     var bulkInsert = function(rec, options) {
@@ -726,7 +732,8 @@ function Couchbase(conn, infos) {
 
 
             var queryString = 'INSERT INTO '+ this.database +' (KEY, VALUE)';
-            for (var id in rec) {
+            var recCount = 0;
+            for (let id in rec) {
                 if ( typeof(rec[id].values) == 'undefined' )
                     throw new Error('rec["'+ id +'"].values not found ! Please inspect your record root: type must be an Array.');
 
@@ -736,6 +743,7 @@ function Couchbase(conn, infos) {
                 rec[id].values._collection  = this._collection;
 
                 queryString += '\t\nVALUES ("'+ id +'", '+ JSON.stringify(rec[id].values) +'),';
+                recCount++;
             }
 
             queryString = queryString.substr(0, queryString.length-1);
@@ -752,7 +760,7 @@ function Couchbase(conn, infos) {
                 // merge options
                 for (var qOpt in queryOptions) {
                     if ( typeof(query[ qOpt ]) == 'undefined' ) {
-                        console.warn('N1QL:'+entityName.toLowerCase()+ '#'+ name + ': `'+ qOpt +'` is not a valid queryOption. Ignorig...');
+                        console.warn('[N1QL]['+entityName.toLowerCase()+ '#'+ name + '] `'+ qOpt +'` is not a valid queryOption. Ignorig...');
                         continue;
                     }
                     query[ qOpt ]( queryOptions[ qOpt ] )
@@ -803,6 +811,11 @@ function Couchbase(conn, infos) {
                             }
 
                             self.emit(trigger, err, data.rows, data.meta);
+                            // Tempory fix
+                            // setTimeout(() => {
+                            //     self.emit(trigger, err, data.rows, data.meta);
+                            // }, (9+recCount) );
+
                         } catch (_err) {
                             console.error(_err.stack);
                         }
@@ -834,8 +847,9 @@ function Couchbase(conn, infos) {
                 onComplete : function(cb) {
                     self.once(trigger, function(err, data, meta){
                         if (envIsDev) {
-                            console.debug('[ bulkInsert triggerd ] '+ trigger);
+                            console.debug('[ bulkInsert triggerd ] '+ trigger + ' - Rec count: '+ recCount);
                         }
+
                         cb(err, data, meta)
                     })
                 }

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/connectors/couchbase/lib/connector.v4.js

@@ -209,18 +209,25 @@ function Connector(dbString) {
         dbString.bucketName = dbString.database;
 
         try {
+            console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] Trying to connect to bucket `'+ dbString.bucketName +'`');
             // if ( typeof(dbString.password) != 'undefined' && typeof(self.cluster.authenticate) == 'undefined' ) {
                 // conn = await self.cluster.openBucket(dbString.database, dbString.password, function onBucketOpened(bErr) {
                 conn = await couchbase.connect(dbString.protocol + dbString.host, dbString, function onBucketOpened(bErr, conn) {
                     if (bErr) {
+                        // console.emerg('[ CONNECTOR ][ ' + local.bundle +' ] Could not connect to couchbase @`'+ dbString.protocol + dbString.host +'`\n'+ (bErr.stack || bErr.message || bErr) + '\nCheck:\n - if couchbabse is running\n - if bucket `'+dbString.bucketName+'` exists\n - if you have permission to access couchabase' );
+                        var cErr = new Error('Could not connect to couchbase @`'+ dbString.protocol + dbString.host +'`\n'+ (bErr.stack || bErr.message || bErr) + '\nCheck:\n - if couchbabse is running\n - if bucket `'+dbString.bucketName+'` exists\n - if you have permission to access couchabase');
+
                         if ( typeof(cb) != 'undefined' ) {
-                            return cb(bErr)
+                            return cb(cErr)
                         }
-                        return self.emit('ready', bErr, null);
+                        // return self.emit('ready', bErr, null);
+                        self.instance   = {}
+                        return onError(cErr, cb)
                     }
                     conn.sdk        = sdk;
 
                     // open bucket
+                    console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] Connecting to bucket `'+ dbString.bucketName +'`');
                     var bucketConn = conn.bucket(dbString.bucketName);
                     bucketConn.sdk = sdk;
                     // Get a reference to the default collection, required only for older Couchbase server versions

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/controller/controller.js

@@ -1,7 +1,7 @@
 "use strict";
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -1590,7 +1590,7 @@ function SuperController(options) {
             //     // nothing to do
             //     ignoreWebRoot = false
             // } else
-            if (typeof(res) === 'string' || typeof(res) === 'number' || typeof(res) === 'boolean') {
+            if (typeof(res) === 'string' || typeof(res) === 'number' || typeof(res) === 'boolean') {
                 if ( /true|1/.test(res) ) {
                     ignoreWebRoot = true
                 } else if ( /false|0/.test(res) ) {
@@ -3799,6 +3799,9 @@ function SuperController(options) {
                 }
                 if ( !ext || /^(html|htm)$/i.test(ext) ) {
                     isHtmlContent = true;
+                    if (!ext) {
+                        ext = 'html'
+                    }
                 }
 
                 if (

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/dev/index.js

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

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/dev/lib/factory.js

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

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/gna.js

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

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/locales/index.js

@@ -1,6 +1,6 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -57,7 +57,7 @@ function Locales() {
 
         return regions
     }
-    
+
 
     return init()
 };

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/model/entity.js

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

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/model/index.js

@@ -1,6 +1,6 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -106,6 +106,7 @@ function Model(namespace, _config) {
         var bundle          = self.bundle;
         var model           = self.model;
         var modelDirName    = self.modelDirName;
+        var connectorPath   = null;
 
         // this is supposed to happen on load or for dev env; on reload, with a checksum
         var conf        = getConfigSync(bundle);
@@ -119,7 +120,7 @@ function Model(namespace, _config) {
             //TODO - More controls...
 
             //For now, I just need the F..ing entity name.
-            var connectorPath   = local.connectorPath = _(GINA_FRAMEWORK_DIR +'/core/connectors/'+ self.connector);
+            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) );
@@ -128,7 +129,7 @@ function Model(namespace, _config) {
                 new _(entitiesPath).mkdirSync();
             }
 
-            var connectorPath   = _(connectorPath + '/lib/connector.js');
+            connectorPath   = _(connectorPath + '/lib/connector.js');
             console.debug('[ MODEL ][ ' + model +' ] Loading connector: ' + connectorPath);
             //Getting Entities Manager.
             var exists = fs.existsSync(connectorPath);

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/model/template/entityFactory.js

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

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/model/template/index.js

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

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/plugins/index.js

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

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/plugins/lib/file/package.json

@@ -12,7 +12,7 @@
       "email": "contact@gina.io"
     }
   ],
-  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/plugins/lib/intl/package.json

@@ -12,7 +12,7 @@
       "email": "contact@gina.io"
     }
   ],
-  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/plugins/lib/storage/package.json

@@ -8,7 +8,7 @@
       "email": "contact@gina.io"
     }
   ],
-  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/plugins/lib/validator/package.json

@@ -12,7 +12,7 @@
       "email": "contact@gina.io"
     }
   ],
-  "copyright": "Copyright (c) 2009-2022 Rhinostone <contact@gina.io>",
+  "copyright": "Copyright (c) 2009-2023 Rhinostone <contact@gina.io>",
   "engines": {
     "node": ">=0.10.22"
   },

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/router.js

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

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/server.js

@@ -248,31 +248,32 @@ function Server(options) {
         //         "sample.app"
         //     ]
         // }
-        const isHandleByWildcardCert = function(endpoint, hv) {
-            var isAllowed = false;
-            const start = new Date(hv.validFrom).format('longIsoDateTime');
-            const end = new Date(hv.validTo).format('longIsoDateTime');
-            const today = new Date().format('longIsoDateTime');
-            const allowed = hv.validFor;
-
-            for (let i=0, len=allowed.length; i<len; ++i ) {
-                // skip if not a wildcard
-                if ( ! /^[*]\./.test(allowed[i]) ) continue;
-
-                let re = new RegExp( allowed[i].replace(/^[*]/, '')+'$' );
-                if ( ! re.test(endpoint) ) continue;
-
-                if ( today >= start && today < end) {
-                    isAllowed = true;
-                    break
-                }
-            }
-            return isAllowed;
-        }
 
-        if ( failed && Array.isArray(sslDetails.validFor) && isHandleByWildcardCert(endpoint, sslDetails) ) {
-            return;
-        }
+        // const isHandleByWildcardCert = function(endpoint, hv) {
+        //     var isAllowed = false;
+        //     const start = new Date(hv.validFrom).format('longIsoDateTime');
+        //     const end = new Date(hv.validTo).format('longIsoDateTime');
+        //     const today = new Date().format('longIsoDateTime');
+        //     const allowed = hv.validFor;
+
+        //     for (let i=0, len=allowed.length; i<len; ++i ) {
+        //         // skip if not a wildcard
+        //         if ( ! /^[*]\./.test(allowed[i]) ) continue;
+
+        //         let re = new RegExp( allowed[i].replace(/^[*]/, '')+'$' );
+        //         if ( ! re.test(endpoint) ) continue;
+
+        //         if ( today >= start && today < end) {
+        //             isAllowed = true;
+        //             break
+        //         }
+        //     }
+        //     return isAllowed;
+        // }
+
+        // if ( failed && Array.isArray(sslDetails.validFor) && isHandleByWildcardCert(endpoint, sslDetails) ) {
+        //     return;
+        // }
 
 
         if (failed) {

package/framework/{v0.1.1-alpha.157 → v0.1.1-alpha.159}/core/template/command/gina.tpl

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.