gina 0.1.6-alpha.147 → 0.1.6-alpha.149

package/framework/{v0.1.6-alpha.147 → v0.1.6-alpha.149}/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js.map

@@ -1,8 +1,8 @@
 {
 "version":3,
-"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.147/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.149/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":9,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.147/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.6-alpha.149/core/asset/plugin/src/vendor/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","decodeURIComponent","version","count","routing","reverseRouting","rule","url","urls","split","r","rLen","length","prop","isProxyHost","__defineGetter__","_this","Date","parseInt","getTime","timeout","bundle","routes","re","RegExp","String","fromCharCode","route","location","search","href","slice","match","Array","isArray","matched","err","link","links","document","head","getElementsByTagName","i","len","found","cssPath","createElement","media","rel","type","headEls","existingLinks","insertBefore","appendChild","Toolbar"]
 }

package/framework/{v0.1.6-alpha.147 → v0.1.6-alpha.149}/core/connectors/couchbase/lib/connector.v3.js

@@ -1,8 +1,10 @@
-"use strict";
+// "use strict";
 var fs              = require('fs');
 var util            = require('util');
 var EventEmitter    = require('events').EventEmitter;
-var couchbase       = require('couchbase');
+const exec          = require('child_process').exec;
+uuid                = require('uuid');
+var couchbase       = require(getPath('project') +'/node_modules/couchbase');// jshint ignore:line
 var gina            = require('../../../../core/gna');
 var lib             = gina.lib;
 var console         = lib.logger;
@@ -10,10 +12,10 @@ var merge           = lib.merge;
 var modelUtil       = new lib.Model();
 
 //globalized
-N1qlQuery           = couchbase.N1qlQuery || null;
-N1qlStringQuery     = couchbase.N1qlStringQuery || null;
-ViewQuery           = couchbase.ViewQuery || null;
-uuid                = require('uuid');
+// N1qlQuery           = couchbase.N1qlQuery || null;
+// N1qlStringQuery     = couchbase.N1qlStringQuery || null;
+// ViewQuery           = couchbase.ViewQuery || null;
+// uuid                = require('uuid');
 
 
 /**
@@ -37,8 +39,13 @@ function Connector(dbString) {
             bundle: null,
             env: null,
             options: {
+                useRestApi: false,
+                useScopeAndCollections: true,
+                scope: '_default', // by default
+                collection: '_default', // by default
                 keepAlive: true,
-                pingInterval : "2m"
+                pingInterval : "2m",
+                configProfile: "wan"
             }
         }
         , sdk = {
@@ -46,19 +53,46 @@ function Connector(dbString) {
         }
     ;
 
+    /**
+     * arrayToValues
+     * Eg.: array like: ['a', 0.5, 'b', false]
+     * @param {array} arr
+     *
+     * @return {string} stringifyiedArray
+     */
+    var arrayToValues = function(arr) {
+        var val = '[';
+        for (let i=0, len=arr.length; i<len; i++) {
+            if ( /string/i.test( typeof(arr[i]) )) {
+                val += '"'+ arr[i] + '"'+',';
+                continue;
+            }
+            val += arr[i] +','
+        }
+
+        if ( typeof(arr.length) && arr.length > 0 ) {
+            val = val.substring(0, val.length-1);
+        }
+        val += ']';
+
+        return val;
+    };
+
     /**
      * connect
      *
      * @param {object} dbString
      * @callback cb
      * */
-    this.connect = function(dbString, cb) {
+    this.connect = async function(dbString, cb) {
         // Attention: the connection is lost 5 minutes once the bucket is opened.
         var conn        = null;
 
         var onError = function (err, next) {
             delete self.instance.reconnecting;
             self.instance.reconnected = self.instance.connected = false;
+            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
@@ -188,42 +222,135 @@ function Connector(dbString) {
                 }
             });
 
-
-            self.emit('ready', false, self.instance);
+            setTimeout(() => {
+                self.emit('ready', false, self.instance);
+            }, 300);
+            // self.emit('ready', false, self.instance);
         }
 
+        dbString.bucketName = dbString.database;
+
         try {
 
             // if ( typeof(dbString.password) != 'undefined' && typeof(self.cluster.authenticate) == 'undefined' ) {
-            //     conn = self.cluster.bucket(dbString.database, dbString.password);
+            //     conn = await self.cluster.openBucket(dbString.database, dbString.password, function onBucketOpened(bErr) {
+            //         if (bErr) {
+            //             cb(bErr)
+            //         } else {
+            //             conn.sdk        = sdk;
+            //             self.instance   = conn;
+            //             onConnect(cb);
+            //         }
+            //     });
             // } else {
-            //     conn = self.cluster.bucket(dbString.database);
+            //     conn = await self.cluster.openBucket(dbString.database, function onBucketOpened(bErr) {
+            //         if (bErr) {
+            //             cb(bErr)
+            //         } else {
+            //             conn.sdk        = sdk;
+            //             self.instance   = conn;
+            //             onConnect(cb);
+            //         }
+            //     });
             // }
 
-            // conn.sdk        = sdk;
-            // self.instance   = conn;
-            // onConnect(cb)
-            if ( typeof(dbString.password) != 'undefined' && typeof(self.cluster.authenticate) == 'undefined' ) {
-                conn = await self.cluster.openBucket(dbString.database, dbString.password, function onBucketOpened(bErr) {
-                    if (bErr) {
-                        cb(bErr)
-                    } else {
-                        conn.sdk        = sdk;
-                        self.instance   = conn;
-                        onConnect(cb);
+            console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.database +'] Trying to connect to bucket `'+ dbString.bucketName +'`');
+            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 couchbase' );
+                    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 couchbase');
+
+                    if ( typeof(cb) != 'undefined' ) {
+                        return cb(cErr)
                     }
-                });
-            } else {
-                conn = await self.cluster.openBucket(dbString.database, function onBucketOpened(bErr) {
-                    if (bErr) {
-                        cb(bErr)
-                    } else {
-                        conn.sdk        = sdk;
-                        self.instance   = conn;
-                        onConnect(cb);
+                    // return self.emit('ready', bErr, null);
+                    self.instance   = {}
+                    return onError(cErr, cb)
+                }
+                conn.sdk        = sdk;
+                conn.useRestApi = local.options.useRestApi;
+
+                // Default maxBuffer is 200KB (=> 1024 * 200)
+                // Setting it to 10MB - preventing: stdout maxBuffer length exceeded
+                var maxQueryBuffer = (1024 * 1024 * 10);
+                var body = null;
+                // When conn.useRestApi == true
+                conn.restQuery = function(trigger, statement, queryParams, onQueryCallback) {
+                    statement = statement.replace(/\'/g, '"');
+                    body = statement;
+                    body += '&args='+ arrayToValues(queryParams.parameters);
+                    // body += '&auto_execute=true'
+                    if ( typeof(queryParams.scanConsistency) != 'undefined' ) {
+                        body += '&scan_consistency='+ queryParams.scanConsistency
                     }
-                });
-            }
+                    body += '\'';
+                    // https://docs.couchbase.com/server/current/n1ql-rest-query/index.html#Request
+                    var cmd = [
+                        '$(which curl)',
+                        '-v http://'+ dbString.host.split(/\,/g)[0].trim() +':8093/query/service',
+                        // '-d \'statement='+ statement +'&args='+ arrayToValues(queryParams.parameters) +'&auto_execute=true\'',
+                        '-d \'statement='+ body,
+                        '-u '+ dbString.username +':'+ dbString.password
+                    ];
+                    exec(cmd.join(' '), { maxBuffer: maxQueryBuffer }, function onResult(resErr, resTxt, infos) {
+                        var error = null;
+                        if (resErr) {
+                            try {
+                                error = new Error('[CONNECTOR][' + local.bundle +'] query '+ trigger +' aborted\n'+ resErr.stack);
+                                console.error(error.stack);
+                                onQueryCallback(error);
+                            } catch (_err) {
+                                console.error(_err.stack);
+                            }
+                            return;
+                        }
+                        let res = JSON.parse(resTxt);
+                        let err = res.errors;
+                        let data = {
+                            rows: res.results,
+                            meta: {
+                                resquestId: res.requestID,
+                                status: res.status,
+                                metrics: res.metrics
+                            }
+                        };
+
+                        if (err) {
+                            try {
+                                error = new Error(err.msg);
+                                error.stack = trigger;
+                                onQueryCallback(error);
+                            } catch (_err) {
+                                console.error(_err.stack);
+                            }
+                            return;
+                        }
+                        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;
+                            console.error(_err.stack);
+                        }
+                    });
+                };
+
+                // open bucket
+                console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.database +'] Connecting to bucket `'+ dbString.bucketName +'`');
+                var bucketConn = conn.bucket(dbString.bucketName);
+                bucketConn.sdk = sdk;
+                bucketConn.useRestApi = local.options.useRestApi;
+                // Get a reference to the default collection, required only for older Couchbase server versions
+                // defaultCollection = bucketConn.defaultCollection();
+                // default scope
+                // default collection
+                self.instance   = bucketConn;
+                onConnect(cb);
+
+                // return bucketConn
+            });
 
         } catch (err) {
             console.error('[ CONNECTOR ][ ' + local.bundle +' ] '+ local.env +' ] couchbase could not connect to bucket `'+ dbString.database +'`\n'+ (err.stack || err.message || err) );
@@ -231,7 +358,8 @@ function Connector(dbString) {
         }
 
 
-        return conn
+        // return conn
+        return self.instance
     }
 
     /**
@@ -243,13 +371,16 @@ function Connector(dbString) {
      * */
     var init = function(dbString) {
 
-        var err = false;
         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
 
-            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);
@@ -257,94 +388,16 @@ 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);
-
-            self
-                .connect(dbString)
-                // .on('error', function(err){
-                //     if (!self.reconnecting)
-                //         console.emerg('[ CONNECTOR ][ ' + local.bundle +' ][ '+ dbString.database +' ] Handshake aborted ! PLease check that Couchbase is running.\n',  err.message);
-
-                //     if (err)
-                //         console.error(err.stack);
-                // })
-                // .once('connect', function () {
-                //     console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.connector +' ] connected...');
-                //     // intercepting conn event thru gina
-                //     gina.onError(function(err, req, res, next){
-                //         // (code)   message
-                //         // (16)     Generic network failure. Enable detailed error codes (via LCB_CNTL_DETAILED_ERRCODES, or via `detailed_errcodes` in the connection string) and/or enable logging to get more information
-                //         // (23)     Client-Side timeout exceeded for operation. Inspect network conditions or increase the timeout
-                //         //          cannot perform operations on a shutdown bucket
-                //         //          err instanceof CouchbaseError
-
-                //         if (!self.instance.connected) {
-                //             self.instance.reconnected = false;
-                //             self.instance.reconnecting = false;
-                //         }
-
-                //         if (
-                //             err instanceof couchbase.Error && err.code == 16 && !self.reconnected
-                //             //|| err instanceof couchbase.Error && err.code == 23 && !self.reconnecting
-                //             || /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...');
-                //             self.reconnecting = true;
-
-                //             setTimeout( function onRetry(){
-                //                 if ( typeof(next) != 'undefined' ) {
-                //                     self.connect(dbString, next)
-                //                 } else {
-                //                     self.connect(dbString)
-                //                 }
-                //             }, 5000)
-
-                //         } else if (err instanceof couchbase.Error && err.code == 23 && !self.reconnecting) {
-                //             self.instance.disconnect();
-                //             // express js patch
-                //             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);
-                //                 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);
-
-                //                 if ( typeof(err) == 'object' ) {
-                //                     res.end(JSON.stringify({
-                //                         status: 500,
-                //                         error: err.message,
-                //                         stack: err.stack
-                //                     }))
-                //                 } else {
-                //                     res.end(err)
-                //                 }
-
-                //                 res.headersSent = true;
-                //             } else {
-                //                 // express js patch
-                //                 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);
-                //                     return;
-                //                 }
-                //             }
-                //         }
-                //     })
-                // })
-
-        } catch (_err) {
-            console.error(_err.stack);
-            self.emit('ready', _err, null)
+            console.info('[CONNECTOR][' + local.bundle +'][' + dbString.connector +'][' + dbString.database +'] Connecting to couchbase cluster @'+ dbString.protocol + dbString.host);
+
+            self.connect(dbString)
+
+        } catch (err) {
+            console.error(err.stack);
+            self.emit('ready', err, null)
         }
     }
 

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

@@ -239,118 +239,102 @@ function Connector(dbString) {
 
         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 couchbase' );
-                        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 couchbase');
-
-                        if ( typeof(cb) != 'undefined' ) {
-                            return cb(cErr)
-                        }
-                        // return self.emit('ready', bErr, null);
-                        self.instance   = {}
-                        return onError(cErr, cb)
+            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 couchbase' );
+                    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 couchbase');
+
+                    if ( typeof(cb) != 'undefined' ) {
+                        return cb(cErr)
                     }
-                    conn.sdk        = sdk;
-                    conn.useRestApi = local.options.useRestApi;
-
-                    // Default maxBuffer is 200KB (=> 1024 * 200)
-                    // Setting it to 10MB - preventing: stdout maxBuffer length exceeded
-                    var maxQueryBuffer = (1024 * 1024 * 10);
-                    var body = null;
-                    // When conn.useRestApi == true
-                    conn.restQuery = function(trigger, statement, queryParams, onQueryCallback) {
-                        statement = statement.replace(/\'/g, '"');
-                        body = statement;
-                        body += '&args='+ arrayToValues(queryParams.parameters);
-                        // body += '&auto_execute=true'
-                        if ( typeof(queryParams.scanConsistency) != 'undefined' ) {
-                            body += '&scan_consistency='+ queryParams.scanConsistency
-                        }
-                        body += '\'';
-                        // https://docs.couchbase.com/server/current/n1ql-rest-query/index.html#Request
-                        var cmd = [
-                            '$(which curl)',
-                            '-v http://'+ dbString.host.split(/\,/g)[0].trim() +':8093/query/service',
-                            // '-d \'statement='+ statement +'&args='+ arrayToValues(queryParams.parameters) +'&auto_execute=true\'',
-                            '-d \'statement='+ body,
-                            '-u '+ dbString.username +':'+ dbString.password
-                        ];
-                        exec(cmd.join(' '), { maxBuffer: maxQueryBuffer }, function onResult(resErr, resTxt, infos) {
-                            var error = null;
-                            if (resErr) {
-                                try {
-                                    error = new Error('[CONNECTOR][' + local.bundle +'] query '+ trigger +' aborted\n'+ resErr.stack);
-                                    console.error(error.stack);
-                                    onQueryCallback(error);
-                                } catch (_err) {
-                                    console.error(_err.stack);
-                                }
-                                return;
+                    // return self.emit('ready', bErr, null);
+                    self.instance   = {}
+                    return onError(cErr, cb)
+                }
+                conn.sdk        = sdk;
+                conn.useRestApi = local.options.useRestApi;
+
+                // Default maxBuffer is 200KB (=> 1024 * 200)
+                // Setting it to 10MB - preventing: stdout maxBuffer length exceeded
+                var maxQueryBuffer = (1024 * 1024 * 10);
+                var body = null;
+                // When conn.useRestApi == true
+                conn.restQuery = function(trigger, statement, queryParams, onQueryCallback) {
+                    statement = statement.replace(/\'/g, '"');
+                    body = statement;
+                    body += '&args='+ arrayToValues(queryParams.parameters);
+                    // body += '&auto_execute=true'
+                    if ( typeof(queryParams.scanConsistency) != 'undefined' ) {
+                        body += '&scan_consistency='+ queryParams.scanConsistency
+                    }
+                    body += '\'';
+                    // https://docs.couchbase.com/server/current/n1ql-rest-query/index.html#Request
+                    var cmd = [
+                        '$(which curl)',
+                        '-v http://'+ dbString.host.split(/\,/g)[0].trim() +':8093/query/service',
+                        // '-d \'statement='+ statement +'&args='+ arrayToValues(queryParams.parameters) +'&auto_execute=true\'',
+                        '-d \'statement='+ body,
+                        '-u '+ dbString.username +':'+ dbString.password
+                    ];
+                    exec(cmd.join(' '), { maxBuffer: maxQueryBuffer }, function onResult(resErr, resTxt, infos) {
+                        var error = null;
+                        if (resErr) {
+                            try {
+                                error = new Error('[CONNECTOR][' + local.bundle +'] query '+ trigger +' aborted\n'+ resErr.stack);
+                                console.error(error.stack);
+                                onQueryCallback(error);
+                            } catch (_err) {
+                                console.error(_err.stack);
                             }
-                            let res = JSON.parse(resTxt);
-                            let err = res.errors;
-                            let data = {
-                                rows: res.results,
-                                meta: {
-                                    resquestId: res.requestID,
-                                    status: res.status,
-                                    metrics: res.metrics
-                                }
-                            };
-
-                            if (err) {
-                                try {
-                                    error = new Error(err.msg);
-                                    error.stack = trigger;
-                                    onQueryCallback(error);
-                                } catch (_err) {
-                                    console.error(_err.stack);
-                                }
-                                return;
+                            return;
+                        }
+                        let res = JSON.parse(resTxt);
+                        let err = res.errors;
+                        let data = {
+                            rows: res.results,
+                            meta: {
+                                resquestId: res.requestID,
+                                status: res.status,
+                                metrics: res.metrics
                             }
+                        };
+
+                        if (err) {
                             try {
-                                if ( typeof(data) == 'undefined' ) {
-                                    data = { rows: []}
-                                }
-                                onQueryCallback(false, data.rows, data.meta);
+                                error = new Error(err.msg);
+                                error.stack = trigger;
+                                onQueryCallback(error);
                             } 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;
                                 console.error(_err.stack);
                             }
-                        });
-                    };
-
-                    // open bucket
-                    console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.database +'] Connecting to bucket `'+ dbString.bucketName +'`');
-                    var bucketConn = conn.bucket(dbString.bucketName);
-                    bucketConn.sdk = sdk;
-                    bucketConn.useRestApi = local.options.useRestApi;
-                    // Get a reference to the default collection, required only for older Couchbase server versions
-                    // defaultCollection = bucketConn.defaultCollection();
-                    // default scope
-                    // default collection
-                    self.instance   = bucketConn;
-                    onConnect(cb);
-
-                    // return bucketConn
-                });
-
-                // return conn
-            // } else {
-            //     // conn = await self.cluster.openBucket(dbString.database, function onBucketOpened(bErr) {
-            //     self.cluster = conn =
-            //         if (bErr) {
-            //             cb(bErr)
-            //         } else {
-            //             conn.sdk        = sdk;
-            //             self.instance   = conn;
-            //             onConnect(cb);
-            //         }
-            //     });
-            // }
+                            return;
+                        }
+                        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;
+                            console.error(_err.stack);
+                        }
+                    });
+                };
+
+                // open bucket
+                console.debug('[CONNECTOR][' + local.bundle +'][' + dbString.database +'] Connecting to bucket `'+ dbString.bucketName +'`');
+                var bucketConn = conn.bucket(dbString.bucketName);
+                bucketConn.sdk = sdk;
+                bucketConn.useRestApi = local.options.useRestApi;
+                // Get a reference to the default collection, required only for older Couchbase server versions
+                // defaultCollection = bucketConn.defaultCollection();
+                // default scope
+                // default collection
+                self.instance   = bucketConn;
+                onConnect(cb);
+
+                // return bucketConn
+            });
 
         } catch (err) {
             console.error('[CONNECTOR][' + local.bundle +']['+ local.env +'] Couchbase could not connect to bucket `'+ dbString.database +'`\n'+ (err.stack || err.message || err) );