mongodb 2.1.0-alpha → 2.1.2

package/lib/replset.js

@@ -6,11 +6,14 @@ var EventEmitter = require('events').EventEmitter
   , Server = require('./server')
   , Mongos = require('./mongos')
   , Cursor = require('./cursor')
+  , AggregationCursor = require('./aggregation_cursor')
+  , CommandCursor = require('./command_cursor')
   , ReadPreference = require('./read_preference')
   , MongoCR = require('mongodb-core').MongoCR
   , MongoError = require('mongodb-core').MongoError
   , ServerCapabilities = require('./topology_base').ServerCapabilities
   , Store = require('./topology_base').Store
+  , Define = require('./metadata')
   , CServer = require('mongodb-core').Server
   , CReplSet = require('mongodb-core').ReplSet
   , CoreReadPreference = require('mongodb-core').ReadPreference
@@ -19,7 +22,7 @@ var EventEmitter = require('events').EventEmitter
 /**
  * @fileOverview The **ReplSet** class is a class that represents a Replicaset topology and is
  * used to construct connections.
- * 
+ *
  * **ReplSet Should not be used, use MongoClient.connect**
  * @example
  * var Db = require('mongodb').Db,
@@ -44,20 +47,21 @@ var EventEmitter = require('events').EventEmitter
  * @param {booelan} [options.ha=true] Turn on high availability monitoring.
  * @param {number} [options.haInterval=5000] Time between each replicaset status check.
  * @param {string} options.replicaSet The name of the replicaset to connect to.
- * @param {number} [options.secondaryAcceptableLatencyMS=15] Sets the range of servers to pick when using NEAREST (lowest ping ms + the latency fence, ex: range of 1 to (1 + 15) ms) 
+ * @param {number} [options.secondaryAcceptableLatencyMS=15] Sets the range of servers to pick when using NEAREST (lowest ping ms + the latency fence, ex: range of 1 to (1 + 15) ms)
  * @param {boolean} [options.connectWithNoPrimary=false] Sets if the driver should connect even if no primary is available
  * @param {number} [options.poolSize=5] Number of connections in the connection pool for each server instance, set to 5 as default for legacy reasons.
- * @param {boolean} [options.ssl=false] Use ssl connection (needs to have a mongod server with ssl support) 
+ * @param {boolean} [options.ssl=false] Use ssl connection (needs to have a mongod server with ssl support)
+ * @param {boolean|function} [options.checkServerIdentity=true] Ensure we check server identify during SSL, set to false to disable checking. Only works for Node 0.12.x or higher. You can pass in a boolean or your own checkServerIdentity override function.
  * @param {object} [options.sslValidate=true] Validate mongod server certificate against ca (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {array} [options.sslCA=null] Array of valid certificates either as Buffers or Strings (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {(Buffer|string)} [options.sslCert=null] String or buffer containing the certificate we wish to present (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {(Buffer|string)} [options.sslKey=null] String or buffer containing the certificate private key we wish to present (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {(Buffer|string)} [options.sslPass=null] String or buffer containing the certificate password (needs to have a mongod server with ssl support, 2.4 or higher)
- * @param {object} [options.socketOptions=null] Socket options 
- * @param {boolean} [options.socketOptions.noDelay=true] TCP Socket NoDelay option. 
- * @param {number} [options.socketOptions.keepAlive=0] TCP KeepAlive on the socket with a X ms delay before start. 
- * @param {number} [options.socketOptions.connectTimeoutMS=0] TCP Connection timeout setting 
- * @param {number} [options.socketOptions.socketTimeoutMS=0] TCP Socket timeout setting 
+ * @param {object} [options.socketOptions=null] Socket options
+ * @param {boolean} [options.socketOptions.noDelay=true] TCP Socket NoDelay option.
+ * @param {number} [options.socketOptions.keepAlive=0] TCP KeepAlive on the socket with a X ms delay before start.
+ * @param {number} [options.socketOptions.connectTimeoutMS=10000] TCP Connection timeout setting
+ * @param {number} [options.socketOptions.socketTimeoutMS=0] TCP Socket timeout setting
  * @fires ReplSet#connect
  * @fires ReplSet#ha
  * @fires ReplSet#joined
@@ -70,7 +74,7 @@ var EventEmitter = require('events').EventEmitter
  * @fires ReplSet#parseError
  * @return {ReplSet} a ReplSet instance.
  */
-var ReplSet = function(servers, options) {  
+var ReplSet = function(servers, options) {
   if(!(this instanceof ReplSet)) return new ReplSet(servers, options);
   options = options || {};
   var self = this;
@@ -78,7 +82,7 @@ var ReplSet = function(servers, options) {
   // Ensure all the instances are Server
   for(var i = 0; i < servers.length; i++) {
     if(!(servers[i] instanceof Server)) {
-      throw new MongoError("all seed list instances must be of the Server type");
+      throw MongoError.create({message: "all seed list instances must be of the Server type", driver:true});
     }
   }
 
@@ -105,7 +109,7 @@ var ReplSet = function(servers, options) {
   // Final options
   var finalOptions = shallowClone(options);
 
-  // Default values  
+  // Default values
   finalOptions.size = typeof options.poolSize == 'number' ? options.poolSize : 5;
   finalOptions.reconnect = typeof options.auto_reconnect == 'boolean' ? options.auto_reconnect : true;
   finalOptions.emitError = typeof options.emitError == 'boolean' ? options.emitError : true;
@@ -120,11 +124,11 @@ var ReplSet = function(servers, options) {
       this.connectTimeoutMS = options.socketOptions.connectTimeoutMS;
       finalOptions.connectionTimeout = options.socketOptions.connectTimeoutMS;
     }
-    
+
     if(options.socketOptions.socketTimeoutMS) {
       finalOptions.socketTimeout = options.socketOptions.socketTimeoutMS;
     }
-  } 
+  }
 
   // Get the name
   var replicaSet = options.replicaSet || options.rs_name;
@@ -178,6 +182,7 @@ var ReplSet = function(servers, options) {
   if(options.sslKey) finalOptions.key = options.sslKey;
   if(options.sslCert) finalOptions.cert = options.sslCert;
   if(options.sslPass) finalOptions.passphrase = options.sslPass;
+  if(options.checkServerIdentity) finalOptions.checkServerIdentity = options.checkServerIdentity;
 
   // Create the ReplSet
   var replset = new CReplSet(seedlist, finalOptions)
@@ -209,13 +214,13 @@ var ReplSet = function(servers, options) {
     // Options
     , options: options
   }
-  
+
   // Debug
   if(debug) {
     // Last ismaster
     Object.defineProperty(this, 'replset', {
       enumerable:true, get: function() { return replset; }
-    });    
+    });
   }
 
   // Last ismaster
@@ -224,9 +229,9 @@ var ReplSet = function(servers, options) {
   });
 
   // BSON property
-  Object.defineProperty(this, 'bson', { 
-    enumerable: true, get: function() { 
-      return replset.bson; 
+  Object.defineProperty(this, 'bson', {
+    enumerable: true, get: function() {
+      return replset.bson;
     }
   });
 
@@ -240,6 +245,8 @@ var ReplSet = function(servers, options) {
  */
 inherits(ReplSet, EventEmitter);
 
+var define = ReplSet.define = new Define('ReplSet', ReplSet, false);
+
 // Ensure the right read Preference object
 var translateReadPreference = function(options) {
   if(typeof options.readPreference == 'string') {
@@ -249,13 +256,15 @@ var translateReadPreference = function(options) {
       , options.readPreference.tags);
   }
 
-  return options;  
+  return options;
 }
 
 ReplSet.prototype.parserType = function() {
   return this.s.replset.parserType();
 }
 
+define.classMethod('parserType', {callback: false, promise:false, returns: [String]});
+
 // Connect method
 ReplSet.prototype.connect = function(db, _options, callback) {
   var self = this;
@@ -304,12 +313,12 @@ ReplSet.prototype.connect = function(db, _options, callback) {
 
     // Relay ha
     var relayHa = function(t, state) {
-      self.emit('ha', t, state);          
+      self.emit('ha', t, state);
 
       if(t == 'start') {
-        self.emit('ha_connect', t, state);          
+        self.emit('ha_connect', t, state);
       } else if(t == 'end') {
-        self.emit('ha_ismaster', t, state);          
+        self.emit('ha_ismaster', t, state);
       }
     }
 
@@ -318,24 +327,24 @@ ReplSet.prototype.connect = function(db, _options, callback) {
     self.s.replset.on('left', relay('left'));
     self.s.replset.on('ping', relay('ping'));
     self.s.replset.on('ha', relayHa);
-    
+
     self.s.replset.on('fullsetup', function(topology) {
       self.emit('fullsetup', null, self);
     });
-    
+
     self.s.replset.on('all', function(topology) {
       self.emit('all', null, self);
     });
 
     // Emit open event
-    self.emit('open', null, self);      
+    self.emit('open', null, self);
 
     // Return correctly
     try {
       callback(null, self);
-    } catch(err) { 
+    } catch(err) {
       process.nextTick(function() { throw err; })
-    }      
+    }
   }
 
   // Error handler
@@ -352,12 +361,12 @@ ReplSet.prototype.connect = function(db, _options, callback) {
       // Try to callback
       try {
         callback(err);
-      } catch(err) { 
+      } catch(err) {
         if(!self.s.replset.isConnected())
           process.nextTick(function() { throw err; })
       }
     }
-  }    
+  }
 
   // Set up listeners
   self.s.replset.once('timeout', connectErrorHandler('timeout'));
@@ -367,44 +376,62 @@ ReplSet.prototype.connect = function(db, _options, callback) {
 
   // Start connection
   self.s.replset.connect(_options);
-}  
+}
 
 // Server capabilities
 ReplSet.prototype.capabilities = function() {
   if(this.s.sCapabilities) return this.s.sCapabilities;
+  if(this.s.replset.lastIsMaster() == null) return null;
   this.s.sCapabilities = new ServerCapabilities(this.s.replset.lastIsMaster());
   return this.s.sCapabilities;
 }
 
+define.classMethod('capabilities', {callback: false, promise:false, returns: [ServerCapabilities]});
+
 // Command
 ReplSet.prototype.command = function(ns, cmd, options, callback) {
   options = translateReadPreference(options);
   this.s.replset.command(ns, cmd, options, callback);
 }
 
+define.classMethod('command', {callback: true, promise:false});
+
 // Insert
 ReplSet.prototype.insert = function(ns, ops, options, callback) {
   this.s.replset.insert(ns, ops, options, callback);
 }
 
+define.classMethod('insert', {callback: true, promise:false});
+
 // Update
 ReplSet.prototype.update = function(ns, ops, options, callback) {
   this.s.replset.update(ns, ops, options, callback);
 }
 
+define.classMethod('update', {callback: true, promise:false});
+
 // Remove
 ReplSet.prototype.remove = function(ns, ops, options, callback) {
   this.s.replset.remove(ns, ops, options, callback);
 }
 
+define.classMethod('remove', {callback: true, promise:false});
+
+// Destroyed
+ReplSet.prototype.isDestroyed = function() {
+  return this.s.replset.isDestroyed();
+}
+
 // IsConnected
 ReplSet.prototype.isConnected = function() {
   return this.s.replset.isConnected();
 }
 
+define.classMethod('isConnected', {callback: false, promise:false, returns: [Boolean]});
+
 ReplSet.prototype.setBSONParserType = function(type) {
   return this.s.replset.setBSONParserType(type);
-}  
+}
 
 // Insert
 ReplSet.prototype.cursor = function(ns, cmd, options) {
@@ -413,6 +440,8 @@ ReplSet.prototype.cursor = function(ns, cmd, options) {
   return this.s.replset.cursor(ns, cmd, options);
 }
 
+define.classMethod('cursor', {callback: false, promise:false, returns: [Cursor, AggregationCursor, CommandCursor]});
+
 ReplSet.prototype.lastIsMaster = function() {
   return this.s.replset.lastIsMaster();
 }
@@ -429,14 +458,18 @@ ReplSet.prototype.close = function(forceClosed) {
   var events = ['timeout', 'error', 'close', 'joined', 'left'];
   events.forEach(function(e) {
     self.removeAllListeners(e);
-  });        
+  });
 }
 
+define.classMethod('close', {callback: false, promise:false});
+
 ReplSet.prototype.auth = function() {
   var args = Array.prototype.slice.call(arguments, 0);
   this.s.replset.auth.apply(this.s.replset, args);
 }
 
+define.classMethod('auth', {callback: true, promise:false});
+
 /**
  * All raw connections
  * @method
@@ -444,7 +477,9 @@ ReplSet.prototype.auth = function() {
  */
 ReplSet.prototype.connections = function() {
   return this.s.replset.connections();
-}    
+}
+
+define.classMethod('connections', {callback: false, promise:false, returns:[Array]});
 
 /**
  * A replset connect event, used to verify that the connection is up and running
@@ -524,4 +559,4 @@ ReplSet.prototype.connections = function() {
  * @type {object}
  */
 
-module.exports = ReplSet;
+module.exports = ReplSet;

package/lib/server.js

@@ -4,9 +4,12 @@ var EventEmitter = require('events').EventEmitter
   , inherits = require('util').inherits
   , CServer = require('mongodb-core').Server
   , Cursor = require('./cursor')
+  , AggregationCursor = require('./aggregation_cursor')
+  , CommandCursor = require('./command_cursor')
   , f = require('util').format
   , ServerCapabilities = require('./topology_base').ServerCapabilities
   , Store = require('./topology_base').Store
+  , Define = require('./metadata')
   , MongoError = require('mongodb-core').MongoError
   , shallowClone = require('./utils').shallowClone;
 
@@ -37,6 +40,7 @@ var EventEmitter = require('events').EventEmitter
  * @param {number} [options.poolSize=5] Number of connections in the connection pool for each server instance, set to 5 as default for legacy reasons.
  * @param {boolean} [options.ssl=false] Use ssl connection (needs to have a mongod server with ssl support)
  * @param {object} [options.sslValidate=true] Validate mongod server certificate against ca (needs to have a mongod server with ssl support, 2.4 or higher)
+ * @param {boolean|function} [options.checkServerIdentity=true] Ensure we check server identify during SSL, set to false to disable checking. Only works for Node 0.12.x or higher. You can pass in a boolean or your own checkServerIdentity override function.
  * @param {array} [options.sslCA=null] Array of valid certificates either as Buffers or Strings (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {(Buffer|string)} [options.sslCert=null] String or buffer containing the certificate we wish to present (needs to have a mongod server with ssl support, 2.4 or higher)
  * @param {(Buffer|string)} [options.sslKey=null] String or buffer containing the certificate private key we wish to present (needs to have a mongod server with ssl support, 2.4 or higher)
@@ -79,7 +83,7 @@ var Server = function(host, port, options) {
       port = null;
     }
   } else if(port == null) {
-    throw new MongoError('port must be specified');
+    throw MongoError.create({message: 'port must be specified', driver:true});
   }
 
   // Clone options
@@ -195,10 +199,14 @@ var Server = function(host, port, options) {
 
 inherits(Server, EventEmitter);
 
+var define = Server.define = new Define('Server', Server, false);
+
 Server.prototype.parserType = function() {
   return this.s.server.parserType();
 }
 
+define.classMethod('parserType', {callback: false, promise:false, returns: [String]});
+
 // Connect
 Server.prototype.connect = function(db, _options, callback) {
   var self = this;
@@ -271,6 +279,7 @@ Server.prototype.connect = function(db, _options, callback) {
     try {
       callback(null, self);
     } catch(err) {
+      console.log(err.stack)
       process.nextTick(function() { throw err; })
     }
   }
@@ -297,41 +306,60 @@ Server.prototype.connect = function(db, _options, callback) {
 // Server capabilities
 Server.prototype.capabilities = function() {
   if(this.s.sCapabilities) return this.s.sCapabilities;
+  if(this.s.server.lastIsMaster() == null) return null;
   this.s.sCapabilities = new ServerCapabilities(this.s.server.lastIsMaster());
   return this.s.sCapabilities;
 }
 
+define.classMethod('capabilities', {callback: false, promise:false, returns: [ServerCapabilities]});
+
 // Command
 Server.prototype.command = function(ns, cmd, options, callback) {
   this.s.server.command(ns, cmd, options, callback);
 }
 
+define.classMethod('command', {callback: true, promise:false});
+
 // Insert
 Server.prototype.insert = function(ns, ops, options, callback) {
   this.s.server.insert(ns, ops, options, callback);
 }
 
+define.classMethod('insert', {callback: true, promise:false});
+
 // Update
 Server.prototype.update = function(ns, ops, options, callback) {
   this.s.server.update(ns, ops, options, callback);
 }
 
+define.classMethod('update', {callback: true, promise:false});
+
 // Remove
 Server.prototype.remove = function(ns, ops, options, callback) {
   this.s.server.remove(ns, ops, options, callback);
 }
 
+define.classMethod('remove', {callback: true, promise:false});
+
 // IsConnected
 Server.prototype.isConnected = function() {
   return this.s.server.isConnected();
 }
 
+Server.prototype.isDestroyed = function() {
+  return this.s.server.isDestroyed(); 
+}
+
+define.classMethod('isConnected', {callback: false, promise:false, returns: [Boolean]});
+
 // Insert
 Server.prototype.cursor = function(ns, cmd, options) {
   options.disconnectHandler = this.s.store;
   return this.s.server.cursor(ns, cmd, options);
 }
 
+define.classMethod('cursor', {callback: false, promise:false, returns: [Cursor, AggregationCursor, CommandCursor]});
+
 Server.prototype.setBSONParserType = function(type) {
   return this.s.server.setBSONParserType(type);
 }
@@ -349,11 +377,15 @@ Server.prototype.close = function(forceClosed) {
   }
 }
 
+define.classMethod('close', {callback: false, promise:false});
+
 Server.prototype.auth = function() {
   var args = Array.prototype.slice.call(arguments, 0);
   this.s.server.auth.apply(this.s.server, args);
 }
 
+define.classMethod('auth', {callback: true, promise:false});
+
 /**
  * All raw connections
  * @method
@@ -363,6 +395,8 @@ Server.prototype.connections = function() {
   return this.s.server.connections();
 }
 
+define.classMethod('connections', {callback: false, promise:false, returns:[Array]});
+
 /**
  * Server connect event
  *

package/lib/topology_base.js

@@ -22,12 +22,18 @@ var Store = function(topology, storeOptions) {
 }
 
 Store.prototype.add = function(opType, ns, ops, options, callback) {
-  if(this.s.storeOptions.force) return callback(new MongoError("db closed by application"));
-  if(this.s.storeOptions.bufferMaxEntries == 0) return callback(new MongoError(f("no connection available for operation and number of stored operation > %s", this.s.storeOptions.bufferMaxEntries)));
+  if(this.s.storeOptions.force) {
+    return callback(MongoError.create({message: "db closed by application", driver:true}));
+  }
+
+  if(this.s.storeOptions.bufferMaxEntries == 0) {
+    return callback(MongoError.create({message: f("no connection available for operation and number of stored operation > %s", this.s.storeOptions.bufferMaxEntries), driver:true }));
+  }
+
   if(this.s.storeOptions.bufferMaxEntries > 0 && this.s.storedOps.length > this.s.storeOptions.bufferMaxEntries) {
     while(this.s.storedOps.length > 0) {
       var op = this.s.storedOps.shift();
-      op.c(new MongoError(f("no connection available for operation and number of stored operation > %s", this.s.storeOptions.bufferMaxEntries)));
+      op.c(MongoError.create({message: f("no connection available for operation and number of stored operation > %s", this.s.storeOptions.bufferMaxEntries), driver:true }));
     }
 
     return;
@@ -37,12 +43,18 @@ Store.prototype.add = function(opType, ns, ops, options, callback) {
 }
 
 Store.prototype.addObjectAndMethod = function(opType, object, method, params, callback) {
-  if(this.s.storeOptions.force) return callback(new MongoError("db closed by application"));
-  if(this.s.storeOptions.bufferMaxEntries == 0) return callback(new MongoError(f("no connection available for operation and number of stored operation > %s", this.s.storeOptions.bufferMaxEntries)));
+  if(this.s.storeOptions.force) {
+    return callback(MongoError.create({message: "db closed by application", driver:true }));
+  }
+
+  if(this.s.storeOptions.bufferMaxEntries == 0) {
+    return callback(MongoError.create({message: f("no connection available for operation and number of stored operation > %s", this.s.storeOptions.bufferMaxEntries), driver:true }));
+  }
+
   if(this.s.storeOptions.bufferMaxEntries > 0 && this.s.storedOps.length > this.s.storeOptions.bufferMaxEntries) {
     while(this.s.storedOps.length > 0) {
       var op = this.s.storedOps.shift();
-      op.c(new MongoError(f("no connection available for operation and number of stored operation > %s", this.s.storeOptions.bufferMaxEntries)));
+      op.c(MongoError.create({message: f("no connection available for operation and number of stored operation > %s", this.s.storeOptions.bufferMaxEntries), driver:true }));
     }
 
     return;
@@ -53,7 +65,7 @@ Store.prototype.addObjectAndMethod = function(opType, object, method, params, ca
 
 Store.prototype.flush = function() {
   while(this.s.storedOps.length > 0) {
-    this.s.storedOps.shift().c(new MongoError(f("no connection available for operation")));
+    this.s.storedOps.shift().c(MongoError.create({message: f("no connection available for operation"), driver:true }));
   }
 }
 
@@ -72,7 +84,7 @@ Store.prototype.execute = function() {
     } else {
       this.s.topology[op.t](op.n, op.o, op.op, op.c);
     }
-  }    
+  }
 }
 
 Store.prototype.all = function() {
@@ -85,7 +97,7 @@ var ServerCapabilities = function(ismaster) {
     Object.defineProperty(object, name, {
         enumerable: true
       , get: function () { return value; }
-    });  
+    });
   }
 
   // Capabilities
@@ -137,4 +149,4 @@ var ServerCapabilities = function(ismaster) {
 }
 
 exports.Store = Store;
-exports.ServerCapabilities = ServerCapabilities;
+exports.ServerCapabilities = ServerCapabilities;