gina 0.1.1-alpha.16 → 0.1.1-alpha.161

package/framework/{v0.1.1-alpha.16 → v0.1.1-alpha.161}/core/connectors/couchbase/lib/connector.js

@@ -5,15 +5,17 @@ var utils           = gina.utils;
 var console         = utils.logger;
 
 var version = 2; // by default
-var dependencies = JSON.parse(fs.readFileSync(GINA_FRAMEWORK_DIR + '/package.json')).dependencies;
+// old - GINA_FRAMEWORK_DIR + '/package.json'
+var dependenciesPath = getPath('project') + '/package.json';// jshint ignore:line
+var dependencies = JSON.parse(fs.readFileSync(dependenciesPath)).dependencies;// jshint ignore:line
 if ( dependencies.couchbase ) {
-    version = JSON.parse(fs.readFileSync(GINA_FRAMEWORK_DIR + '/package.json')).dependencies.couchbase;
+    version = JSON.parse(fs.readFileSync(dependenciesPath)).dependencies.couchbase;// jshint ignore:line
     version = version.replace(/\^/, '').split(/\./)[0];
 }
-var filename = _(GINA_FRAMEWORK_DIR + '/core/connectors/couchbase/lib/connector.v'+ version +'.js', true);
+var filename = _(GINA_FRAMEWORK_DIR + '/core/connectors/couchbase/lib/connector.v'+ version +'.js', true);// jshint ignore:line
 if ( !fs.existsSync(filename) ) {
     console.warn('Couchbase connector file not found: ', filename);
-    filename = filename = _(GINA_FRAMEWORK_DIR + '/core/connectors/couchbase/lib/connector.v'+ version +'.js', true);
+    filename = filename = _(GINA_FRAMEWORK_DIR + '/core/connectors/couchbase/lib/connector.v'+ version +'.js', true);// jshint ignore:line
     console.warn('Couchbase connector will instead use: ', filename);
 }
 

package/framework/{v0.1.1-alpha.16 → v0.1.1-alpha.161}/core/connectors/couchbase/lib/connector.v2.js

@@ -13,10 +13,10 @@ var merge           = utils.merge;
 var modelUtil       = new utils.Model();
 
 //globalized
+uuid                = require('uuid');
 N1qlQuery           = couchbase.N1qlQuery || null;
 N1qlStringQuery     = couchbase.N1qlStringQuery || null;
 ViewQuery           = couchbase.ViewQuery || null;
-uuid                = require('uuid');
 
 
 /**
@@ -42,13 +42,13 @@ function Connector(dbString) {
             options: {
                 keepAlive: true,
                 pingInterval : "2m"
-            }            
+            }
         }
         , sdk = {
             version: 2
         }
     ;
-    
+
     /**
      * connect
      *
@@ -58,34 +58,34 @@ function Connector(dbString) {
     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.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...');
             self.instance.reconnecting = true;
-            
+
             setTimeout( function onRetry(){
                 if ( typeof(next) != 'undefined' ) {
                     self.connect(dbString, next);
                 } else {
                     self.connect(dbString);
                 }
-            }, 5000);   
-            
+            }, 5000);
+
         };
-        
+
         // once
         var onConnect = function onConnect(cb){
-            console.debug('[ CONNECTOR ][ ' + local.bundle +' ] couchbase is alive !!'); 
+            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;
-            
+
             // updating context
             var ctx = getContext()
                 , bundle = ctx.bundle
@@ -104,7 +104,7 @@ function Connector(dbString) {
                 if ( typeof(cb) != 'undefined' ) { // this portition is not working yet on Mac OS X
                     console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ '+ env +' ] connected to couchbase !!');
 
-                    
+
                     modelUtil.setConnection(bundle, name, self.instance);
 
                     if ( fs.existsSync(modelsPath) ) {
@@ -119,7 +119,7 @@ function Connector(dbString) {
                         cb(new Error('[ CONNECTOR ][ ' + local.bundle +' ][ '+ env +' ] '+ modelsPath+ ' not found') )
                     }
 
-                } else {                                      
+                } else {
                     console.debug('[ CONNECTOR ][ ' + local.bundle +' ][ '+ env +' ] connection to bucket `'+ name +'` is being kept alive ...');
                 }
             });
@@ -135,7 +135,7 @@ function Connector(dbString) {
                     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
@@ -144,14 +144,14 @@ function Connector(dbString) {
                     // 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)                            
+                    }, 5000)
 
                 } else if (err instanceof couchbase.Error && err.code == 23 && !self.reconnecting) {
                     self.instance.disconnect();
@@ -167,7 +167,7 @@ function Connector(dbString) {
                     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,
@@ -177,7 +177,7 @@ function Connector(dbString) {
                         } else {
                             res.end(err)
                         }
-                        
+
                         res.headersSent = true;
                     } else {
                         // express js patch
@@ -187,24 +187,24 @@ function Connector(dbString) {
                             console.error('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
                             return;
                         }
-                    }                            
+                    }
                 }
             });
-            
-                              
-            self.emit('ready', false, self.instance);  
+
+
+            self.emit('ready', false, self.instance);
         };
-        
+
         try {
-            //console.debug('[ CONNECTOR ][ ' + local.bundle +' ] Now creating instance for '+ dbString.database +'...');            
-            if ( typeof(dbString.password) != 'undefined' && typeof(self.cluster.authenticate) == 'undefined' ) {                
+            //console.debug('[ CONNECTOR ][ ' + local.bundle +' ] Now creating instance for '+ dbString.database +'...');
+            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); 
+                        onConnect(cb);
                     }
                 });
             } else {
@@ -222,13 +222,13 @@ function Connector(dbString) {
                     }
                 });
             }
-                        
-            
+
+
         } catch (err) {
             console.error('[ CONNECTOR ][ ' + local.bundle +' ] couchbase could not connect to bucket `'+ dbString.database +'`\n'+ (err.stack || err.message || err) );
             onError(err, cb)
         }
-            
+
         return conn;
     };
 
@@ -248,7 +248,7 @@ function Connector(dbString) {
             local.bundle    = getConfig().bundle;
 
             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);
                 // version 5.x
@@ -257,15 +257,15 @@ function Connector(dbString) {
             } catch(_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);                    
-                   
+                //         console.emerg('[ CONNECTOR ][ ' + local.bundle +' ][ '+ dbString.database +' ] Handshake aborted ! PLease check that Couchbase is running.\n',  err.message);
+
                 //     if (err)
                 //         console.error(err.stack);
                 // })
@@ -283,7 +283,7 @@ function Connector(dbString) {
                 //             self.reconnected = false;
                 //             self.reconnecting = false;
                 //         }
-                        
+
                 //         if (
                 //             err instanceof couchbase.Error && err.code == 16 && !self.reconnected
                 //             //|| err instanceof couchbase.Error && err.code == 23 && !self.reconnecting
@@ -292,14 +292,14 @@ function Connector(dbString) {
                 //             // 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)                            
+                //             }, 5000)
 
                 //         } else if (err instanceof couchbase.Error && err.code == 23 && !self.reconnecting) {
                 //             self.instance.disconnect();
@@ -315,7 +315,7 @@ function Connector(dbString) {
                 //             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,
@@ -325,7 +325,7 @@ function Connector(dbString) {
                 //                 } else {
                 //                     res.end(err)
                 //                 }
-                                
+
                 //                 res.headersSent = true;
                 //             } else {
                 //                 // express js patch
@@ -335,7 +335,7 @@ function Connector(dbString) {
                 //                     console.error('[ CONNECTOR ][ ' + local.bundle +' ][ ' + dbString.database +' ] gina fatal error ('+ err.code +'): ' + (err.message||err) + '\nstack: '+ err.stack);
                 //                     return;
                 //                 }
-                //             }                            
+                //             }
                 //         }
                 //     })
                 // })
@@ -346,7 +346,7 @@ function Connector(dbString) {
         }
     };
 
-    
+
     /**
      * ping
      * Heartbeat to keep connection alive
@@ -392,10 +392,10 @@ function Connector(dbString) {
             }
 
             self.pingId = setInterval(function onTimeout(){
-                
+
                 if (!self.instance.connected) {
                     console.debug('[ CONNECTOR ][ ' + local.bundle +' ] connecting to couchbase');
-                    
+
                     self.instance.reconnected = false;
                     self.instance.reconnecting = true;
                     if ( typeof(next) != 'undefined' ) {
@@ -403,11 +403,11 @@ function Connector(dbString) {
                     } else {
                         self.connect(dbString);
                     }
-                    
-                } else {                    
+
+                } else {
                     self.ping(options.pingInterval, cb, ncb);
                 }
-                                
+
             }, interval);
             ncb(cb);
         } else {