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

package/framework/{v0.1.6-alpha.9 → v0.1.6-alpha.90}/core/connectors/couchbase/index.js

@@ -7,6 +7,8 @@ const { version } = require('os');
 // Use couchbase module from the user's project dependencies if not found
 var couchbasePath   = _(getPath('project') +'/node_modules/couchbase');
 var couchbase       = require(couchbasePath);
+// globalized
+// N1qlQuery           = couchbase.N1qlQuery;
 
 var lib             = require('./../../../lib') || require.cache[require.resolve('./../../../lib')];
 var inherits        = lib.inherits;
@@ -32,7 +34,7 @@ function Couchbase(conn, infos) {
      * */
     var init = function(conn, infos) {
         // load on startup
-        var cacheless           = (process.env.NODE_ENV_IS_DEV == 'false') ? false : true;
+        var isCacheless         = (process.env.NODE_ENV_IS_DEV == 'false') ? false : true;
         var path                = getPath('bundle') + '/models/'+ infos.database +'/entities'
             , n1qlDefault       = __dirname + '/lib'
             , files             = fs.readdirSync(path)
@@ -46,7 +48,7 @@ function Couchbase(conn, infos) {
 
         // superEntity
         filename = getPath('gina').core + '/model/entity.js';
-        if (cacheless)
+        if (isCacheless)
             delete require.cache[require.resolve(_(filename, true))]; //EntitySuperClass
 
         EntitySuperClass = require(_(filename, true));
@@ -58,12 +60,12 @@ function Couchbase(conn, infos) {
 
             if ( ! /^\./.test(files[f]) || f == len-1 ) {
 
-                if (cacheless && files[f] != 'n1ql.js') {
+                if (isCacheless && files[f] != 'n1ql.js') {
                     delete require.cache[require.resolve(_(path + '/' +files[f], true))];//child
                 }
 
                 entityName      = files[f].replace(/.js/, '');
-                className       = entityName.substr(0,1).toUpperCase() + entityName.substr(1);
+                className       = entityName.substring(0,1).toUpperCase() + entityName.substring(1);
 
                 if ( files[f] == 'n1ql.js' ) {
                     Entity = require(_(n1qlDefault + '/' +files[f], true));
@@ -185,6 +187,8 @@ function Couchbase(conn, infos) {
         var arr             = source.split(/\//g)
             , name          = altMethodName || arr[arr.length-1].replace(/\.sql/, '') || null
             , comments      = ''
+            , optionsArr    = null
+            , options       = null
             , queryString   = null
             , includes      = null
             , queryStatement= null // this is the usable queryString
@@ -216,7 +220,7 @@ function Couchbase(conn, infos) {
 
                     ) {
                         let dir = new _(source).toUnixStyle();
-                        dir = dir.substr(0, dir.lastIndexOf('/')) + '/'
+                        dir = dir.substring(0, dir.lastIndexOf('/')) + '/'
                         filename = _(dir + filename.replace(/^\.\//, ''), true);
                     }
                     // remove @include calls
@@ -224,6 +228,13 @@ function Couchbase(conn, infos) {
                     queryString = queryString.replace(includes[i], fs.readFileSync( filename ).toString() );
                 }
             }
+
+            optionsArr = queryString.match(/\@options \{(.*)\}/gm);
+            if (optionsArr) {
+                eval('options='+optionsArr[0].replace(/\@options\ /, ''));
+            }
+            optionsArr = null;
+
             paramTypes = queryString.match(/\@param \{(.*)\}/gm);
             if ( paramTypes && Array.isArray(paramTypes) ) {
                 for (let t=0, tLen = paramTypes.length; t<tLen; t++) {
@@ -282,7 +293,7 @@ function Couchbase(conn, infos) {
 
                     entities[entityName] = inherits(EntityN1qlClass, EntitySuperClass);
 
-                    entities[entityName].prototype.name           = entityName.substr(0,1).toUpperCase() + entityName.substr(1);
+                    entities[entityName].prototype.name           = entityName.substring(0,1).toUpperCase() + entityName.substring(1);
                     entities[entityName].prototype.model          = infos.model;
                     entities[entityName].prototype.bundle         = infos.bundle;
                     entities[entityName].prototype._collection    = entityName;
@@ -393,8 +404,12 @@ function Couchbase(conn, infos) {
                         }
                         // EO - patch
                     }
+                    queryStatement = queryStatement.replace(/^\s+/, '');
 
-                    var query = null, execQuery = null, _collection = null;
+                    var query           = null
+                        , execQuery     = null
+                        , _collection   = null
+                    ;
                     // adhoc option: @param {boolean} options.adhoc [ true | false ]
                     // default is set to false
                     //queryOptions.adhoc = false;
@@ -407,14 +422,14 @@ function Couchbase(conn, infos) {
                     //  number      : 1
                     //  description : This is the default (for single-statement requests).
                     //
-                    // Request plus
+                    // Request plus (Recommended for insert,read right after)
                     //  code        : REQUEST_PLUS
                     //  number      : 2
                     //  description : This implements strong consistency per request.
                     //                Update cycle every «20ms for memdb & 200ms for forestdb»
                     //
-                    // Statement plus
-                    //  code        : STATEMENT_PLUS
+                    // Statement plus (Not available on SDKv4)
+                    //  code        : STATEMENT_PLUS or AT_PLUS
                     //  number      : 3
                     //  description : This implements strong consistency per statement.
                     //                Update cycle every «20ms for memdb & 200ms for forestdb»
@@ -427,16 +442,61 @@ function Couchbase(conn, infos) {
                     var queryOptions = {
                         // Do not turn off the adhoc flag for each query since
                         // only a finite number of query plans (currently 5000) can be stored in the SDK
-                        adhoc: false, // false to use plan optimization, but need a statement `name param` or `num param`
-                        consistency: 1 // NOT_BOUNDED, but STATEMENT_PLUS is set by default for insert & update
+                        // false to use plan optimization, but need a statement `name param` or `num param`
+                        adhoc: false
                     };
 
+                    // NOT_BOUNDED, but REQUEST_PLUS should be set for SELECT operation following an INSERT or an UPDATE
+                    // starting from SDK v3
+                    var userConsistencyOpt = null;
+                    if ( sdkVersion > 2 ) {
+                        queryOptions.scanConsistency = couchbase.QueryScanConsistency.NotBounded;
+                        if (options && typeof(options.consistency) != 'undefined') {
+                            // request_plus -> RequestPlus
+                            userConsistencyOpt = options.consistency.replace(/(^[a-z]{0,1}|_[a-z]{0,1})/g, str => str.toUpperCase().replace(/\_/, ''));
+                            if ( typeof(couchbase.QueryScanConsistency[userConsistencyOpt]) != 'undefined' ) {
+                                queryOptions.scanConsistency = couchbase.QueryScanConsistency[userConsistencyOpt];
+                            } else {
+                                console.warn('couchbase.QueryScanConsistency['+ userConsistencyOpt +'] option is being ignore: might not be a real option or the optoins is not handled by your SDK.\nFound on: '+ queryStatement );
+                            }
+
+                            for (let o in options) {
+                                if (o == 'consistency') continue;
+                                queryOptions[o] = options[o];
+                            }
+                        }
+                    }
+                    // v2
+                    else {
+                        queryOptions.consistency = N1qlQuery.Consistency.NOT_BOUNDED;
+                        if (options && typeof(options.consistency) != 'undefined') {
+                            // request_plus -> REQUEST_PLUS
+                            userConsistencyOpt = options.consistency.toUpperCase();
+                            if ( typeof(N1qlQuery.Consistency[userConsistencyOpt]) != 'undefined' ) {
+                                queryOptions.consistency = N1qlQuery.Consistency[userConsistencyOpt];
+                            } else {
+                                console.warn('N1qlQuery.Consistency['+ userConsistencyOpt +'] option is being ignore: might not be a real option or the optoins is not handled by your SDK.\nFound on: '+ queryStatement );
+                            }
 
-                    if ( /^(insert|update)/i.test(statement) ) {
-                        queryOptions.adhoc = true;
-                        queryOptions.consistency = 3; // STATEMENT_PLUS
+                            for (let o in options) {
+                                if (o == 'consistency') continue;
+                                queryOptions[o] = options[o];
+                            }
+                        }
                     }
 
+
+                    // if ( /^(insert\ into|update)/i.test(queryStatement) ) {
+                    //     queryOptions.adhoc = true;
+                    //     if ( sdkVersion > 2 ) {
+                    //         queryOptions.scanConsistency = couchbase.QueryScanConsistency.RequestPlus;
+                    //     }
+                    //     // v2
+                    //     else {
+                    //         queryOptions.consistency = N1qlQuery.Consistency.REQUEST_PLUS;
+                    //     }
+                    // }
+
                     if ( sdkVersion > 2 ) { // starting from SDK v3
                         // _collection = queryStatement.match(/\_collection(\s+\=|=)(.*)(\'|\")/);
                         // if (_collection.length > 0) {
@@ -458,7 +518,7 @@ function Couchbase(conn, infos) {
 
                     } else { // version 2
                         // prepared statement
-                        query = N1qlQuery.fromString(queryStatement.replace(/^\s+/, ''));
+                        query = N1qlQuery.fromString(queryStatement);
                         // query options
                         // @param {object} options
                         // @param {string} options.sample
@@ -546,6 +606,14 @@ function Couchbase(conn, infos) {
                             err.stack   = '[ '+source+' ]\n'+ err.stack;
                         }
 
+                        if (err) {
+                            if ( typeof(self.emit) != 'undefined' ) {
+                                self.emit(trigger, err);
+                            } else { // Promise case
+                                throw new Error('[ Couchbase ][ onQueryCallback Exception] '+ trigger + '\n'+ err.stack)
+                            }
+                        }
+
                         // handle return type
                         if ( returnType && returnType == 'boolean' ) {
                             // CASE #1
@@ -615,7 +683,7 @@ function Couchbase(conn, infos) {
 
                     self._isRegisteredFromProto = false;
                     // `register()` is only used for v2
-                    var register = function (trigger, queryParams, onQueryCallback, cb) {
+                    var register = async function (trigger, queryParams, onQueryCallback, cb) {
                         // // JUNE 2021 patch
                         // // Adding support for FTS since it is not implemented in sdkVersion 2:
                         // // variables not replaced by value
@@ -666,6 +734,9 @@ function Couchbase(conn, infos) {
                                     })
                                     .then( function onResult(data, meta) {
                                         try {
+                                            if ( typeof(data) == 'undefined' ) {
+                                                data = { rows: []}
+                                            }
                                             onQueryCallback(false, data.rows, data.meta);
                                         } catch (_err) {
                                             _err.stack = '[ ' + trigger + '] onQueryCallbackError: \n\t- Did you leave any bad comments ?\n\t- Did you try to run your query ?\r\n'+ query +'\r\n'+ _err.stack;
@@ -792,10 +863,10 @@ function Couchbase(conn, infos) {
             var sdkVersion  = conn.sdk.version || 2;
             // by default
             var queryOptions = {
-                adhoc: true,
-                consistency: 3
+                adhoc: true
             };
 
+
             if ( typeof(options) != 'undefined' ) {
                 queryOptions = merge(options, queryOptions)
             }
@@ -822,18 +893,17 @@ function Couchbase(conn, infos) {
                 recCount++;
             }
 
-            queryString = queryString.substr(0, queryString.length-1);
+            queryString = queryString.substring(0, queryString.length-1);
             queryString += '\nRETURNING '+ this.database +'.*;';
 
 
             var query = null;
             if ( sdkVersion > 2) { // starting SDK v3
                 query = queryString;
-                // queryOptions.parameters = queryParams;
             } else {
                 // prepared statement
                 query = N1qlQuery.fromString(queryString);
-                query.consistency(queryOptions.consistency);
+                query.consistency(N1qlQuery.Consistency.REQUEST_PLUS);
                 // merge options
                 for (var qOpt in queryOptions) {
                     if ( typeof(query[ qOpt ]) == 'undefined' ) {

package/framework/{v0.1.6-alpha.9 → v0.1.6-alpha.90}/core/connectors/couchbase/lib/connector.v4.js

@@ -70,10 +70,12 @@ function Connector(dbString) {
         var onError = function (err, next) {
             delete self.instance.reconnecting;
             self.instance.reconnected = self.instance.connected = false;
-            console.error('[ CONNECTOR ][ ' + local.bundle +' ] couchbase could not be reached !!\n'+ ( err.stack || err.message || err ) );
+            console.debug('[CONNECTOR][' + local.bundle +'] Scope is: '+ process.env.NODE_SCOPE );
+            console.debug('[CONNECTOR][' + local.bundle +'] Env is: '+ process.env.NODE_ENV );
+            console.error('[CONNECTOR][' + local.bundle +'] Couchbase could not be reached !!\n'+ ( err.stack || err.message || err ) );
 
             // reconnecting
-            console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] trying to reconnect in a few secs...');
+            console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.database +'] Trying to reconnect in a few secs...');
             self.instance.reconnecting = true;
 
             setTimeout( function onRetry(){
@@ -88,8 +90,8 @@ function Connector(dbString) {
 
         // once
         var onConnect = function onConnect(cb){
-            console.debug('[ CONNECTOR ][ ' + local.bundle +' ] couchbase is alive !!');
-            console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.connector +' ] now connected...');
+            console.debug('[CONNECTOR][' + local.bundle +'] Couchbase is alive !!');
+            console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.connector +'] Now connected...');
 
             self.instance.reconnected  = self.instance.connected   = true;
             var options = local.options;
@@ -110,7 +112,7 @@ function Connector(dbString) {
                 local.env       = env;
 
                 if ( typeof(cb) != 'undefined' ) { // this portition is not working yet on Mac OS X
-                    console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ '+ env +' ] connected to couchbase !!');
+                    console.debug('[CONNECTOR][' + local.bundle +']['+ env +'] Connected to couchbase !!');
 
 
                     modelUtil.setConnection(bundle, name, self.instance);
@@ -124,11 +126,11 @@ function Connector(dbString) {
                                 cb(err)
                             })
                     } else {
-                        cb(new Error('[ CONNECTOR ][ ' + local.bundle +' ][ '+ env +' ] '+ modelsPath+ ' not found') )
+                        cb(new Error('[CONNECTOR][' + local.bundle +']['+ env +'] '+ modelsPath+ ' not found') )
                     }
 
                 } else {
-                    console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ '+ env +' ] connection to bucket `'+ name +'` is being kept alive ...');
+                    console.debug('[CONNECTOR][' + local.bundle +']['+ env +'] Connection to bucket `'+ name +'` is being kept alive ...');
                 }
             });
             // intercepting conn event thru gina
@@ -150,7 +152,7 @@ function Connector(dbString) {
                     || /cannot perform operations on a shutdown bucket/.test(err.message ) && !self.reconnecting && !self.reconnected
                 ) {
                     // reconnecting
-                    console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] trying to reconnect in 5 secs...');
+                    console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.database +'] Trying to reconnect in 5 secs...');
                     self.reconnecting = true;
 
                     setTimeout( function onRetry(){
@@ -167,14 +169,14 @@ function Connector(dbString) {
                     if (typeof(next) != 'undefined') {
                         next(err); // might just be a "false" error: `err` is replaced with cb() caller `data`
                     } else {
-                        console.error('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
+                        console.error('[CONNECTOR][' + local.bundle +'][' + dbString.database +'] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
                         return;
                     }
                 } else {
 
                     if (err && err instanceof Error) {
 
-                        console.error('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
+                        console.error('[CONNECTOR][' + local.bundle +'][' + dbString.database +'] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
 
                         if ( typeof(err) == 'object' ) {
                             res.end(JSON.stringify({
@@ -192,7 +194,7 @@ function Connector(dbString) {
                         if (typeof(next) != 'undefined') {
                             next(err); // might just be a "false" error: `err` is replaced with cb() caller `data`
                         } else {
-                            console.error('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
+                            console.error('[CONNECTOR][' + local.bundle +'][' + dbString.database +'] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
                             return;
                         }
                     }
@@ -209,13 +211,13 @@ function Connector(dbString) {
         dbString.bucketName = dbString.database;
 
         try {
-            console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] Trying to connect to bucket `'+ dbString.bucketName +'`');
+            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');
+                        // 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('[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');
 
                         if ( typeof(cb) != 'undefined' ) {
                             return cb(cErr)
@@ -227,7 +229,7 @@ function Connector(dbString) {
                     conn.sdk        = sdk;
 
                     // open bucket
-                    console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] Connecting to bucket `'+ dbString.bucketName +'`');
+                    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
@@ -255,7 +257,7 @@ function Connector(dbString) {
             // }
 
         } catch (err) {
-            console.error('[ CONNECTOR ][ ' + local.bundle +' ] '+ local.env +' ] couchbase could not connect to bucket `'+ dbString.database +'`\n'+ (err.stack || err.message || err) );
+            console.error('[CONNECTOR][' + local.bundle +']['+ local.env +'] Couchbase could not connect to bucket `'+ dbString.database +'`\n'+ (err.stack || err.message || err) );
             onError(err, cb)
         }
 
@@ -273,11 +275,15 @@ function Connector(dbString) {
      * */
     var init = function(dbString) {
         try {
+            local.bundle    = getConfig().bundle;// jshint ignore:line
+            console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.connector +'][' + dbString.database +'] Checking dbString.host: '+ dbString.host);
+            // console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.connector +'][' + dbString.database +'] dbString:\n'+ JSON.stringify(dbString, null, 2));
+            // console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.connector +'][' + dbString.database +'] local.options:\n'+ JSON.stringify(local.options, null, 2));
             dbString        = merge(dbString, local.options);
             local.options   = dbString;
-            local.bundle    = getConfig().bundle;// jshint ignore:line
 
-            console.info('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.connector +' ][ ' + dbString.database +' ] authenticating to couchbase cluster @'+ dbString.protocol + dbString.host);
+
+            console.info('[CONNECTOR][' + local.bundle +'][' + dbString.connector +'][' + dbString.database +'] authenticating to couchbase cluster @'+ dbString.protocol + dbString.host);
 
             try {
                 self.cluster = new couchbase.Cluster(dbString.protocol + dbString.host);
@@ -285,10 +291,10 @@ function Connector(dbString) {
                 if ( typeof(self.cluster.authenticate) != 'undefined' )
                     self.cluster.authenticate(dbString.username, dbString.password);
             } catch(_err) {
-                console.error('[ CONNECTOR ][ ' + local.bundle +' ] could not authenticate to couchbase @`'+ dbString.protocol + dbString.host +'`\n'+ (_err.stack || _err.message || _err) );
+                console.error('[CONNECTOR][' + local.bundle +'] Could not authenticate to couchbase @`'+ dbString.protocol + dbString.host +'`\n'+ (_err.stack || _err.message || _err) );
             }
 
-            console.info('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.connector +' ][ ' + dbString.database +' ] connecting to couchbase cluster @'+ dbString.protocol + dbString.host);
+            console.info('[CONNECTOR][' + local.bundle +'][' + dbString.connector +'][' + dbString.database +'] Connecting to couchbase cluster @'+ dbString.protocol + dbString.host);
 
             self.connect(dbString)
 
@@ -347,7 +353,7 @@ function Connector(dbString) {
             self.pingId = setInterval(function onTimeout(){
 
                 if (!self.instance.connected) {
-                    console.debug('[ CONNECTOR ][ ' + local.bundle +' ] connecting to couchbase');
+                    console.debug('[CONNECTOR][' + local.bundle +'] Connecting to couchbase');
 
                     self.instance.reconnected = false;
                     self.instance.reconnecting = true;
@@ -365,7 +371,7 @@ function Connector(dbString) {
 
             ncb(cb)
         } else {
-            console.debug('[ CONNECTOR ][ ' + local.bundle +' ] sent ping to couchbase ...');
+            console.debug('[CONNECTOR][' + local.bundle +'] Sent ping to couchbase ...');
             self.ping(interval, cb, ncb);
         }
     }