mongodb 2.2.26 → 2.2.30

package/HISTORY.md

@@ -1,3 +1,50 @@
+2.2.30 2017-07-07
+-----------------
+* Update mongodb-core to 2.2.14
+* MongoClient
+  * add `appname` to list of valid option names
+  * added test for passing appname as option
+* NODE-1052 ensure user options are applied while parsing connection string uris
+
+2.2.29 2017-06-19
+-----------------
+* Update mongodb-core to 2.1.13
+  * NODE-1039 ensure we force destroy server instances, forcing queue to be flushed.
+  *  Use actual server type in standalone SDAM events.
+* Allow multiple map calls (Issue #1521, https://github.com/Robbilie).
+* Clone insertMany options before mutating (Issue #1522, https://github.com/vkarpov15).
+* NODE-1034 Fix GridStore issue caused by Node 8.0.0 breaking backward compatible fs.read API.
+* NODE-1026, use  operator instead of skip function in order to avoid useless fetch stage.
+
+2.2.28 2017-06-02
+-----------------
+* Update mongodb-core to 2.1.12
+  * NODE-1019 Set keepAlive to 300 seconds or 1/2 of socketTimeout if socketTimeout < keepAlive.
+  * Minor fix to report the correct state on error.
+  * NODE-1020 'family' was added to options to provide high priority for ipv6 addresses (Issue #1518, https://github.com/firej).
+  * Fix require_optional loading of bson-ext.
+  * Ensure no errors are thrown by replset if topology is destroyed before it finished connecting.
+  * NODE-999 SDAM fixes for Mongos and single Server event emitting.
+  * NODE-1014 Set socketTimeout to default to 360 seconds.
+  * NODE-1019 Set keepAlive to 300 seconds or 1/2 of socketTimeout if socketTimeout < keepAlive.
+* Just handle Collection name errors distinctly from general callback errors avoiding double callbacks in Db.collection.
+* NODE-999 SDAM fixes for Mongos and single Server event emitting.
+* NODE-1000 Added guard condition for upload.js checkDone function in case of race condition caused by late arriving chunk write.
+
+2.2.27 2017-05-22
+-----------------
+* Updated mongodb-core to 2.1.11
+    * NODE-987 Clear out old intervalIds on when calling topologyMonitor.
+    * NODE-987 Moved filtering to pingServer method and added test case.
+    * Check for connection destroyed just before writing out and flush out operations correctly if it is (Issue #179, https://github.com/jmholzinger).
+    * NODE-989 Refactored Replicaset monitoring to correcly monitor newly added servers, Also extracted setTimeout and setInterval to use custom wrappers Timeout and Interval.
+* NODE-985 Deprecated Db.authenticate and Admin.authenticate and moved auth methods into authenticate.js to ensure MongoClient.connect does not print deprecation warnings.
+* NODE-988 Merged readConcern and hint correctly on collection(...).find(...).count()
+* Fix passing the readConcern option to MongoClient.connect (Issue #1514, https://github.com/bausmeier).
+* NODE-996 Propegate all events up to a MongoClient instance.
+* Allow saving doc with null `_id` (Issue #1517, https://github.com/vkarpov15).
+* NODE-993 Expose hasNext for command cursor and add docs for both CommandCursor and Aggregation Cursor.
+
 2.2.26 2017-04-18
 -----------------
 * Updated mongodb-core to 2.1.10

package/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/mongodb/node-mongodb-native.svg?branch=2.1)](http://travis-ci.org/mongodb/node-mongodb-native)
 [![Coverage Status](https://coveralls.io/repos/github/mongodb/node-mongodb-native/badge.svg?branch=2.1)](https://coveralls.io/github/mongodb/node-mongodb-native?branch=2.1)
-[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/mongodb/node-mongodb-native?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mongodb/node-mongodb-native?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 # Description
 

package/lib/admin.js

@@ -2,7 +2,9 @@
 
 var toError = require('./utils').toError,
   Define = require('./metadata'),
-  shallowClone = require('./utils').shallowClone;
+  shallowClone = require('./utils').shallowClone,
+  assign = require('./utils').assign,
+  authenticate = require('./authenticate');
 
 /**
  * @fileOverview The **Admin** class is an internal class that allows convenient access to
@@ -239,23 +241,23 @@ define.classMethod('ping', {callback: true, promise:true});
  * @param {string} [password] The password.
  * @param {Admin~resultCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed
+ * @deprecated This method will no longer be available in the next major release 3.x as MongoDB 3.6 will only allow auth against users in the admin db and will no longer allow multiple credentials on a socket. Please authenticate using MongoClient.connect with auth credentials.
  */
 Admin.prototype.authenticate = function(username, password, options, callback) {
-  var self = this;
-  if(typeof options == 'function') callback = options, options = {};
-  options = shallowClone(options);
-  options.authdb = 'admin';
-
-  // Execute using callback
-  if(typeof callback == 'function') return this.s.db.authenticate(username, password, options, callback);
+  console.warn("Admin.prototype.authenticate method will no longer be available in the next major release 3.x as MongoDB 3.6 will only allow auth against users in the admin db and will no longer allow multiple credentials on a socket. Please authenticate using MongoClient.connect with auth credentials.");
+  var finalArguments = [this.s.db];
+  if(typeof username == 'string') finalArguments.push(username);
+  if(typeof password == 'string') finalArguments.push(password);
+  if(typeof options == 'function') { 
+    finalArguments.push({ authdb: 'admin' });
+    finalArguments.push(options);
+  } else {
+    finalArguments.push(assign({}, options, { authdb: 'admin' }));
+  }
 
-  // Return a Promise
-  return new this.s.promiseLibrary(function(resolve, reject) {
-    self.s.db.authenticate(username, password, options, function(err, r) {
-      if(err) return reject(err);
-      resolve(r);
-    });
-  });
+  if(typeof callback == 'function') finalArguments.push(callback);
+  // Excute authenticate method
+  return authenticate.apply(this.s.db, finalArguments);
 }
 
 define.classMethod('authenticate', {callback: true, promise:true});

package/lib/aggregation_cursor.js

@@ -316,6 +316,7 @@ AggregationCursor.prototype.get = AggregationCursor.prototype.toArray;
 define.classMethod('toArray', {callback: true, promise:true});
 define.classMethod('each', {callback: true, promise:false});
 define.classMethod('forEach', {callback: true, promise:false});
+define.classMethod('hasNext', {callback: true, promise:true});
 define.classMethod('next', {callback: true, promise:true});
 define.classMethod('close', {callback: true, promise:true});
 define.classMethod('isClosed', {callback: false, promise:false, returns: [Boolean]});
@@ -331,6 +332,14 @@ define.classMethod('readBufferedDocuments', {callback: false, promise:false, ret
  * @return {Promise} returns Promise if no callback passed
  */
 
+/**
+ * Check if there is any document still available in the cursor
+ * @function AggregationCursor.prototype.hasNext
+ * @param {AggregationCursor~resultCallback} [callback] The result callback.
+ * @throws {MongoError}
+ * @return {Promise} returns Promise if no callback passed
+ */
+
 /**
  * The callback format for results
  * @callback AggregationCursor~toArrayResultCallback

package/lib/authenticate.js

@@ -0,0 +1,109 @@
+var shallowClone = require('./utils').shallowClone
+  , handleCallback = require('./utils').handleCallback
+  , MongoError = require('mongodb-core').MongoError;
+
+var authenticate = function(self, username, password, options, callback) {
+  // Did the user destroy the topology
+  if(self.serverConfig && self.serverConfig.isDestroyed()) return callback(new MongoError('topology was destroyed'));
+
+  // the default db to authenticate against is 'self'
+  // if authententicate is called from a retry context, it may be another one, like admin
+  var authdb = options.dbName ? options.dbName : self.databaseName;
+  authdb = self.authSource ? self.authSource : authdb;
+  authdb = options.authdb ? options.authdb : authdb;
+  authdb = options.authSource ? options.authSource : authdb;
+
+  // Callback
+  var _callback = function(err, result) {
+    if(self.listeners('authenticated').length > 0) {
+      self.emit('authenticated', err, result);
+    }
+
+    // Return to caller
+    handleCallback(callback, err, result);
+  }
+
+  // authMechanism
+  var authMechanism = options.authMechanism || '';
+  authMechanism = authMechanism.toUpperCase();
+
+  // If classic auth delegate to auth command
+  if(authMechanism == 'MONGODB-CR') {
+    self.s.topology.auth('mongocr', authdb, username, password, function(err) {
+      if(err) return handleCallback(callback, err, false);
+      _callback(null, true);
+    });
+  } else if(authMechanism == 'PLAIN') {
+    self.s.topology.auth('plain', authdb, username, password, function(err) {
+      if(err) return handleCallback(callback, err, false);
+      _callback(null, true);
+    });
+  } else if(authMechanism == 'MONGODB-X509') {
+    self.s.topology.auth('x509', authdb, username, password, function(err) {
+      if(err) return handleCallback(callback, err, false);
+      _callback(null, true);
+    });
+  } else if(authMechanism == 'SCRAM-SHA-1') {
+    self.s.topology.auth('scram-sha-1', authdb, username, password, function(err) {
+      if(err) return handleCallback(callback, err, false);
+      _callback(null, true);
+    });
+  } else if(authMechanism == 'GSSAPI') {
+    if(process.platform == 'win32') {
+      self.s.topology.auth('sspi', authdb, username, password, options, function(err) {
+        if(err) return handleCallback(callback, err, false);
+        _callback(null, true);
+      });
+    } else {
+      self.s.topology.auth('gssapi', authdb, username, password, options, function(err) {
+        if(err) return handleCallback(callback, err, false);
+        _callback(null, true);
+      });
+    }
+  } else if(authMechanism == 'DEFAULT') {
+    self.s.topology.auth('default', authdb, username, password, function(err) {
+      if(err) return handleCallback(callback, err, false);
+      _callback(null, true);
+    });
+  } else {
+    handleCallback(callback, MongoError.create({message: f("authentication mechanism %s not supported", options.authMechanism), driver:true}));
+  }
+}
+
+module.exports = function(self, username, password, options, callback) {
+  if(typeof options == 'function') callback = options, options = {};
+  // Shallow copy the options
+  options = shallowClone(options);
+
+  // Set default mechanism
+  if(!options.authMechanism) {
+    options.authMechanism = 'DEFAULT';
+  } else if(options.authMechanism != 'GSSAPI'
+    && options.authMechanism != 'DEFAULT'
+    && options.authMechanism != 'MONGODB-CR'
+    && options.authMechanism != 'MONGODB-X509'
+    && options.authMechanism != 'SCRAM-SHA-1'
+    && options.authMechanism != 'PLAIN') {
+      return handleCallback(callback, MongoError.create({message: "only DEFAULT, GSSAPI, PLAIN, MONGODB-X509, SCRAM-SHA-1 or MONGODB-CR is supported by authMechanism", driver:true}));
+  }
+
+  // If we have a callback fallback
+  if(typeof callback == 'function') return authenticate(self, username, password, options, function(err, r) {
+    // Support failed auth method
+    if(err && err.message && err.message.indexOf('saslStart') != -1) err.code = 59;
+    // Reject error
+    if(err) return callback(err, r);
+    callback(null, r);
+  });
+
+  // Return a promise
+  return new self.s.promiseLibrary(function(resolve, reject) {
+    authenticate(self, username, password, options, function(err, r) {
+      // Support failed auth method
+      if(err && err.message && err.message.indexOf('saslStart') != -1) err.code = 59;
+      // Reject error
+      if(err) return reject(err);
+      resolve(r);
+    });
+  });
+};

package/lib/collection.js

@@ -496,7 +496,7 @@ define.classMethod('insertOne', {callback: true, promise:true});
 Collection.prototype.insertMany = function(docs, options, callback) {
   var self = this;
   if(typeof options == 'function') callback = options, options = {};
-  options = options || {ordered:true};
+  options = options ? shallowClone(options) : {ordered:true};
   if(!Array.isArray(docs) && typeof callback == 'function') {
     return callback(MongoError.create({message: 'docs parameter must be an array of documents', driver:true }));
   } else if(!Array.isArray(docs)) {
@@ -736,7 +736,7 @@ var insertDocuments = function(self, docs, options, callback) {
   // Add _id if not specified
   if(forceServerObjectId !== true){
     for(var i = 0; i < docs.length; i++) {
-      if(docs[i]._id == null) docs[i]._id = self.s.pkFactory.createPk();
+      if(docs[i]._id === void 0) docs[i]._id = self.s.pkFactory.createPk();
     }
   }
 
@@ -2040,7 +2040,7 @@ var count = function(self, query, options, callback) {
   if(typeof skip == 'number') cmd.skip = skip;
   if(typeof limit == 'number') cmd.limit = limit;
   if(typeof maxTimeMS == 'number') cmd.maxTimeMS = maxTimeMS;
-  if(hint) options.hint = hint;
+  if(hint) cmd.hint = hint;
 
   options = shallowClone(options);
   // Ensure we have the right read preference inheritance

package/lib/command_cursor.js

@@ -131,7 +131,7 @@ var CommandCursor = function(bson, ns, cmd, options, topology, topologyOptions)
 inherits(CommandCursor, Readable);
 
 // Set the methods to inherit from prototype
-var methodsToInherit = ['_next', 'next', 'each', 'forEach', 'toArray'
+var methodsToInherit = ['_next', 'next', 'hasNext', 'each', 'forEach', 'toArray'
   , 'rewind', 'bufferedCount', 'readBufferedDocuments', 'close', 'isClosed', 'kill', 'setCursorBatchSize'
   , '_find', '_getmore', '_killcursor', 'isDead', 'explain', 'isNotified', 'isKilled'];
 
@@ -207,6 +207,7 @@ define.classMethod('toArray', {callback: true, promise:true});
 define.classMethod('each', {callback: true, promise:false});
 define.classMethod('forEach', {callback: true, promise:false});
 define.classMethod('next', {callback: true, promise:true});
+define.classMethod('hasNext', {callback: true, promise:true});
 define.classMethod('close', {callback: true, promise:true});
 define.classMethod('isClosed', {callback: false, promise:false, returns: [Boolean]});
 define.classMethod('rewind', {callback: false, promise:false});
@@ -221,6 +222,14 @@ define.classMethod('readBufferedDocuments', {callback: false, promise:false, ret
  * @return {Promise} returns Promise if no callback passed
  */
 
+/**
+ * Check if there is any document still available in the cursor
+ * @function CommandCursor.prototype.hasNext
+ * @param {CommandCursor~resultCallback} [callback] The result callback.
+ * @throws {MongoError}
+ * @return {Promise} returns Promise if no callback passed
+ */
+
 /**
  * The callback format for results
  * @callback CommandCursor~toArrayResultCallback

package/lib/cursor.js

@@ -941,6 +941,16 @@ var count = function(self, applySkipLimit, opts, callback) {
     'count': self.s.ns.substr(delimiter+1), 'query': self.s.cmd.query
   }
 
+  // Apply a readConcern if set
+  if(self.s.cmd.readConcern) {
+    command.readConcern = self.s.cmd.readConcern;
+  }
+
+  // Apply a hint if set
+  if(self.s.cmd.hint) {
+    command.hint = self.s.cmd.hint;
+  }
+
   if(typeof opts.maxTimeMS == 'number') {
     command.maxTimeMS = opts.maxTimeMS;
   } else if(self.s.cmd && typeof self.s.cmd.maxTimeMS == 'number') {
@@ -993,7 +1003,12 @@ define.classMethod('close', {callback: true, promise:true});
  * @return {Cursor}
  */
 Cursor.prototype.map = function(transform) {
-  this.cursorState.transforms = { doc: transform };
+  if(this.cursorState.transforms && this.cursorState.transforms.doc) {
+    var oldTransform = this.cursorState.transforms.doc;
+    this.cursorState.transforms.doc = function (doc) { return transform(oldTransform(doc)); };
+  } else {
+    this.cursorState.transforms = { doc: transform };
+  }
   return this;
 }
 

package/lib/db.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var EventEmitter = require('events').EventEmitter
+  , authenticate = require('./authenticate')
   , inherits = require('util').inherits
   , getSingleProperty = require('./utils').getSingleProperty
   , shallowClone = require('./utils').shallowClone
@@ -461,6 +462,7 @@ Db.prototype.collection = function(name, options, callback) {
       if(callback) callback(null, collection);
       return collection;
     } catch(err) {
+      // if(err instanceof MongoError && callback) return callback(err);
       if(callback) return callback(err);
       throw err;
     }
@@ -1469,74 +1471,6 @@ Db.prototype.removeUser = function(username, options, callback) {
   });
 };
 
-var authenticate = function(self, username, password, options, callback) {
-  // Did the user destroy the topology
-  if(self.serverConfig && self.serverConfig.isDestroyed()) return callback(new MongoError('topology was destroyed'));
-
-  // the default db to authenticate against is 'self'
-  // if authententicate is called from a retry context, it may be another one, like admin
-  var authdb = options.dbName ? options.dbName : self.databaseName;
-  authdb = self.authSource ? self.authSource : authdb;
-  authdb = options.authdb ? options.authdb : authdb;
-  authdb = options.authSource ? options.authSource : authdb;
-
-  // Callback
-  var _callback = function(err, result) {
-    if(self.listeners('authenticated').length > 0) {
-      self.emit('authenticated', err, result);
-    }
-
-    // Return to caller
-    handleCallback(callback, err, result);
-  }
-
-  // authMechanism
-  var authMechanism = options.authMechanism || '';
-  authMechanism = authMechanism.toUpperCase();
-
-  // If classic auth delegate to auth command
-  if(authMechanism == 'MONGODB-CR') {
-    self.s.topology.auth('mongocr', authdb, username, password, function(err) {
-      if(err) return handleCallback(callback, err, false);
-      _callback(null, true);
-    });
-  } else if(authMechanism == 'PLAIN') {
-    self.s.topology.auth('plain', authdb, username, password, function(err) {
-      if(err) return handleCallback(callback, err, false);
-      _callback(null, true);
-    });
-  } else if(authMechanism == 'MONGODB-X509') {
-    self.s.topology.auth('x509', authdb, username, password, function(err) {
-      if(err) return handleCallback(callback, err, false);
-      _callback(null, true);
-    });
-  } else if(authMechanism == 'SCRAM-SHA-1') {
-    self.s.topology.auth('scram-sha-1', authdb, username, password, function(err) {
-      if(err) return handleCallback(callback, err, false);
-      _callback(null, true);
-    });
-  } else if(authMechanism == 'GSSAPI') {
-    if(process.platform == 'win32') {
-      self.s.topology.auth('sspi', authdb, username, password, options, function(err) {
-        if(err) return handleCallback(callback, err, false);
-        _callback(null, true);
-      });
-    } else {
-      self.s.topology.auth('gssapi', authdb, username, password, options, function(err) {
-        if(err) return handleCallback(callback, err, false);
-        _callback(null, true);
-      });
-    }
-  } else if(authMechanism == 'DEFAULT') {
-    self.s.topology.auth('default', authdb, username, password, function(err) {
-      if(err) return handleCallback(callback, err, false);
-      _callback(null, true);
-    });
-  } else {
-    handleCallback(callback, MongoError.create({message: f("authentication mechanism %s not supported", options.authMechanism), driver:true}));
-  }
-}
-
 /**
  * Authenticate a user against the server.
  * @method
@@ -1546,44 +1480,11 @@ var authenticate = function(self, username, password, options, callback) {
  * @param {string} [options.authMechanism=MONGODB-CR] The authentication mechanism to use, GSSAPI, MONGODB-CR, MONGODB-X509, PLAIN
  * @param {Db~resultCallback} [callback] The command result callback
  * @return {Promise} returns Promise if no callback passed
+ * @deprecated This method will no longer be available in the next major release 3.x as MongoDB 3.6 will only allow auth against users in the admin db and will no longer allow multiple credentials on a socket. Please authenticate using MongoClient.connect with auth credentials.
  */
 Db.prototype.authenticate = function(username, password, options, callback) {
-  if(typeof options == 'function') callback = options, options = {};
-  var self = this;
-  // Shallow copy the options
-  options = shallowClone(options);
-
-  // Set default mechanism
-  if(!options.authMechanism) {
-    options.authMechanism = 'DEFAULT';
-  } else if(options.authMechanism != 'GSSAPI'
-    && options.authMechanism != 'DEFAULT'
-    && options.authMechanism != 'MONGODB-CR'
-    && options.authMechanism != 'MONGODB-X509'
-    && options.authMechanism != 'SCRAM-SHA-1'
-    && options.authMechanism != 'PLAIN') {
-      return handleCallback(callback, MongoError.create({message: "only DEFAULT, GSSAPI, PLAIN, MONGODB-X509, SCRAM-SHA-1 or MONGODB-CR is supported by authMechanism", driver:true}));
-  }
-
-  // If we have a callback fallback
-  if(typeof callback == 'function') return authenticate(self, username, password, options, function(err, r) {
-    // Support failed auth method
-    if(err && err.message && err.message.indexOf('saslStart') != -1) err.code = 59;
-    // Reject error
-    if(err) return callback(err, r);
-    callback(null, r);
-  });
-
-  // Return a promise
-  return new this.s.promiseLibrary(function(resolve, reject) {
-    authenticate(self, username, password, options, function(err, r) {
-      // Support failed auth method
-      if(err && err.message && err.message.indexOf('saslStart') != -1) err.code = 59;
-      // Reject error
-      if(err) return reject(err);
-      resolve(r);
-    });
-  });
+  console.warn("Db.prototype.authenticate method will no longer be available in the next major release 3.x as MongoDB 3.6 will only allow auth against users in the admin db and will no longer allow multiple credentials on a socket. Please authenticate using MongoClient.connect with auth credentials.");
+  return authenticate.apply(this, [this].concat(Array.prototype.slice.call(arguments)));
 };
 
 define.classMethod('authenticate', {callback: true, promise:true});

package/lib/gridfs/grid_store.js

@@ -427,20 +427,23 @@ var writeFile = function(self, file, callback) {
 
       // Write a chunk
       var writeChunk = function() {
-        fs.read(file, self.chunkSize, offset, 'binary', function(err, data, bytesRead) {
+        // Allocate the buffer
+        var _buffer = new Buffer(self.chunkSize);
+        // Read the file
+        fs.read(file, _buffer, 0, _buffer.length, offset, function(err, bytesRead, data) {
           if(err) return callback(err, self);
 
           offset = offset + bytesRead;
 
           // Create a new chunk for the data
           var chunk = new Chunk(self, {n:index++}, self.writeConcern);
-          chunk.write(data, function(err, chunk) {
+          chunk.write(data.slice(0, bytesRead), function(err, chunk) {
             if(err) return callback(err, self);
 
             chunk.save({}, function(err) {
               if(err) return callback(err, self);
 
-              self.position = self.position + data.length;
+              self.position = self.position + bytesRead;
 
               // Point to current chunk
               self.currentChunk = chunk;

package/lib/gridfs-stream/download.js

@@ -298,15 +298,27 @@ function init(self) {
       return;
     }
 
-    self.s.cursor = self.s.chunks.find({ files_id: doc._id }).sort({ n: 1 });
+    self.s.bytesToSkip = handleStartOption(self, doc, self.s.options);
+
+    var filter = { files_id: doc._id };
+
+    // Currently (MongoDB 3.4.4) skip function does not support the index,
+    // it needs to retrieve all the documents first and then skip them. (CS-25811)
+    // As work around we use $gte on the "n" field.
+    if (self.s.options && self.s.options.start != null){
+      var skip = Math.floor(self.s.options.start / doc.chunkSize);
+      if (skip > 0){
+        filter["n"] = {"$gte": skip};
+      }
+    }
+    self.s.cursor = self.s.chunks.find(filter).sort({ n: 1 });
+
     if (self.s.readPreference) {
       self.s.cursor.setReadPreference(self.s.readPreference);
     }
 
     self.s.expectedEnd = Math.ceil(doc.length / doc.chunkSize);
     self.s.file = doc;
-    self.s.bytesToSkip = handleStartOption(self, doc, self.s.cursor,
-      self.s.options);
     self.s.bytesToTrim = handleEndOption(self, doc, self.s.cursor,
       self.s.options);
     self.emit('file', doc);
@@ -336,11 +348,11 @@ function waitForFile(_this, callback) {
  * @ignore
  */
 
-function handleStartOption(stream, doc, cursor, options) {
+function handleStartOption(stream, doc, options) {
   if (options && options.start != null) {
     if (options.start > doc.length) {
       throw new Error('Stream start (' + options.start + ') must not be ' +
-        'more than the length of the file (' + doc.length +')')
+        'more than the length of the file (' + doc.length +')');
     }
     if (options.start < 0) {
       throw new Error('Stream start (' + options.start + ') must not be ' +
@@ -351,8 +363,6 @@ function handleStartOption(stream, doc, cursor, options) {
         'greater than stream end (' + options.end + ')');
     }
 
-    cursor.skip(Math.floor(options.start / doc.chunkSize));
-
     stream.s.bytesRead = Math.floor(options.start / doc.chunkSize) *
       doc.chunkSize;
     stream.s.expected = Math.floor(options.start / doc.chunkSize);

package/lib/gridfs-stream/upload.js

@@ -33,6 +33,8 @@ function GridFSBucketWriteStream(bucket, filename, options) {
   this.filename = filename;
   this.files = bucket.s._filesCollection;
   this.options = options;
+  // Signals the write is all done
+  this.done = false;
 
   this.id = options.id ? options.id : core.BSON.ObjectId();
   this.chunkSizeBytes = this.options.chunkSizeBytes;
@@ -252,9 +254,13 @@ function checkChunksIndex(_this, callback) {
  */
 
 function checkDone(_this, callback) {
+  if(_this.done) return true;
   if (_this.state.streamEnd &&
       _this.state.outstandingRequests === 0 &&
       !_this.state.errored) {
+    // Set done so we dont' trigger duplicate createFilesDoc
+    _this.done = true;
+    // Create a new files doc
     var filesDoc = createFilesDoc(_this.id, _this.length, _this.chunkSizeBytes,
       _this.md5.digest('hex'), _this.filename, _this.options.contentType,
       _this.options.aliases, _this.options.metadata);
@@ -421,6 +427,7 @@ function doWrite(_this, chunk, encoding, callback) {
         }
         --_this.state.outstandingRequests;
         --outstandingRequests;
+        
         if (!outstandingRequests) {
           _this.emit('drain', doc);
           callback && callback();