mongodb 2.2.36 → 3.0.2

package/lib/gridfs-stream/download.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var stream = require('stream'),
   util = require('util');
 
@@ -161,8 +163,7 @@ GridFSBucketReadStream.prototype.abort = function(callback) {
 
 function throwIfInitialized(self) {
   if (self.s.init) {
-    throw new Error('You cannot change options after the stream has entered' +
-      'flowing mode!');
+    throw new Error('You cannot change options after the stream has entered' + 'flowing mode!');
   }
 }
 
@@ -194,18 +195,15 @@ function doRead(_this) {
 
     var bytesRemaining = _this.s.file.length - _this.s.bytesRead;
     var expectedN = _this.s.expected++;
-    var expectedLength = Math.min(_this.s.file.chunkSize,
-      bytesRemaining);
+    var expectedLength = Math.min(_this.s.file.chunkSize, bytesRemaining);
 
     if (doc.n > expectedN) {
-      var errmsg = 'ChunkIsMissing: Got unexpected n: ' + doc.n +
-        ', expected: ' + expectedN;
+      var errmsg = 'ChunkIsMissing: Got unexpected n: ' + doc.n + ', expected: ' + expectedN;
       return __handleError(_this, new Error(errmsg));
     }
 
     if (doc.n < expectedN) {
-      errmsg = 'ExtraChunk: Got unexpected n: ' + doc.n +
-        ', expected: ' + expectedN;
+      errmsg = 'ExtraChunk: Got unexpected n: ' + doc.n + ', expected: ' + expectedN;
       return __handleError(_this, new Error(errmsg));
     }
 
@@ -217,8 +215,8 @@ function doRead(_this) {
         return __handleError(_this, new Error(errmsg));
       }
 
-      errmsg = 'ChunkIsWrongSize: Got unexpected length: ' +
-        buf.length + ', expected: ' + expectedLength;
+      errmsg =
+        'ChunkIsWrongSize: Got unexpected length: ' + buf.length + ', expected: ' + expectedLength;
       return __handleError(_this, new Error(errmsg));
     }
 
@@ -241,10 +239,8 @@ function doRead(_this) {
     }
 
     // If the remaining amount of data left is < chunkSize read the right amount of data
-    if (_this.s.options.end && (
-      (_this.s.options.end - _this.s.bytesToSkip) < buf.length
-    )) {
-      sliceEnd = (_this.s.options.end - _this.s.bytesToSkip);
+    if (_this.s.options.end && _this.s.options.end - _this.s.bytesToSkip < buf.length) {
+      sliceEnd = _this.s.options.end - _this.s.bytesToSkip;
     }
 
     if (sliceStart != null || sliceEnd != null) {
@@ -252,7 +248,7 @@ function doRead(_this) {
     }
 
     _this.push(buf);
-  })
+  });
 }
 
 /**
@@ -276,8 +272,7 @@ function init(self) {
       return __handleError(self, error);
     }
     if (!doc) {
-      var identifier = self.s.filter._id ?
-        self.s.filter._id.toString() : self.s.filter.filename;
+      var identifier = self.s.filter._id ? self.s.filter._id.toString() : self.s.filter.filename;
       var errmsg = 'FileNotFound: file ' + identifier + ' was not found';
       var err = new Error(errmsg);
       err.code = 'ENOENT';
@@ -306,10 +301,10 @@ function init(self) {
     // 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){
+    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};
+      if (skip > 0) {
+        filter['n'] = { $gte: skip };
       }
     }
     self.s.cursor = self.s.chunks.find(filter).sort({ n: 1 });
@@ -320,8 +315,7 @@ function init(self) {
 
     self.s.expectedEnd = Math.ceil(doc.length / doc.chunkSize);
     self.s.file = doc;
-    self.s.bytesToTrim = handleEndOption(self, doc, self.s.cursor,
-      self.s.options);
+    self.s.bytesToTrim = handleEndOption(self, doc, self.s.cursor, self.s.options);
     self.emit('file', doc);
   });
 }
@@ -342,7 +336,7 @@ function waitForFile(_this, callback) {
 
   _this.once('file', function() {
     callback();
-  })
+  });
 }
 
 /**
@@ -352,20 +346,30 @@ function waitForFile(_this, callback) {
 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 +')');
+      throw new Error(
+        'Stream start (' +
+          options.start +
+          ') must not be ' +
+          'more than the length of the file (' +
+          doc.length +
+          ')'
+      );
     }
     if (options.start < 0) {
-      throw new Error('Stream start (' + options.start + ') must not be ' +
-        'negative');
+      throw new Error('Stream start (' + options.start + ') must not be ' + 'negative');
     }
     if (options.end != null && options.end < options.start) {
-      throw new Error('Stream start (' + options.start + ') must not be ' +
-        'greater than stream end (' + options.end + ')');
+      throw new Error(
+        'Stream start (' +
+          options.start +
+          ') must not be ' +
+          'greater than stream end (' +
+          options.end +
+          ')'
+      );
     }
 
-    stream.s.bytesRead = Math.floor(options.start / doc.chunkSize) *
-      doc.chunkSize;
+    stream.s.bytesRead = Math.floor(options.start / doc.chunkSize) * doc.chunkSize;
     stream.s.expected = Math.floor(options.start / doc.chunkSize);
 
     return options.start - stream.s.bytesRead;
@@ -379,24 +383,26 @@ function handleStartOption(stream, doc, options) {
 function handleEndOption(stream, doc, cursor, options) {
   if (options && options.end != null) {
     if (options.end > doc.length) {
-      throw new Error('Stream end (' + options.end + ') must not be ' +
-        'more than the length of the file (' + doc.length +')')
+      throw new Error(
+        'Stream end (' +
+          options.end +
+          ') must not be ' +
+          'more than the length of the file (' +
+          doc.length +
+          ')'
+      );
     }
     if (options.start < 0) {
-      throw new Error('Stream end (' + options.end + ') must not be ' +
-        'negative');
+      throw new Error('Stream end (' + options.end + ') must not be ' + 'negative');
     }
 
-    var start = options.start != null ?
-      Math.floor(options.start / doc.chunkSize) :
-      0;
+    var start = options.start != null ? Math.floor(options.start / doc.chunkSize) : 0;
 
     cursor.limit(Math.ceil(options.end / doc.chunkSize) - start);
 
     stream.s.expectedEnd = Math.ceil(options.end / doc.chunkSize);
 
-    return (Math.ceil(options.end / doc.chunkSize) * doc.chunkSize) -
-      options.end;
+    return Math.ceil(options.end / doc.chunkSize) * doc.chunkSize - options.end;
   }
 }
 

package/lib/gridfs-stream/index.js

@@ -1,9 +1,12 @@
+'use strict';
+
 var Emitter = require('events').EventEmitter;
 var GridFSBucketReadStream = require('./download');
 var GridFSBucketWriteStream = require('./upload');
 var shallowClone = require('../utils').shallowClone;
 var toError = require('../utils').toError;
 var util = require('util');
+var executeOperation = require('../utils').executeOperation;
 
 var DEFAULT_GRIDFS_BUCKET_OPTIONS = {
   bucketName: 'fs',
@@ -48,8 +51,7 @@ function GridFSBucket(db, options) {
     _filesCollection: db.collection(options.bucketName + '.files'),
     checkedIndexes: false,
     calledOpenUploadStream: false,
-    promiseLibrary: db.s.promiseLibrary ||
-      (typeof global.Promise == 'function' ? global.Promise : require('es6-promise').Promise)
+    promiseLibrary: db.s.promiseLibrary || Promise
   };
 }
 
@@ -141,8 +143,13 @@ GridFSBucket.prototype.openDownloadStream = function(id, options) {
     end: options && options.end
   };
 
-  return new GridFSBucketReadStream(this.s._chunksCollection,
-    this.s._filesCollection, this.s.options.readPreference, filter, options);
+  return new GridFSBucketReadStream(
+    this.s._chunksCollection,
+    this.s._filesCollection,
+    this.s.options.readPreference,
+    filter,
+    options
+  );
 };
 
 /**
@@ -153,19 +160,8 @@ GridFSBucket.prototype.openDownloadStream = function(id, options) {
  */
 
 GridFSBucket.prototype.delete = function(id, callback) {
-  if (typeof callback === 'function') {
-    return _delete(this, id, callback);
-  }
-
-  var _this = this;
-  return new this.s.promiseLibrary(function(resolve, reject) {
-    _delete(_this, id, function(error, res) {
-      if (error) {
-        reject(error);
-      } else {
-        resolve(res);
-      }
-    });
+  return executeOperation(this.s.db.s.topology, _delete, [this, id, callback], {
+    skipSessions: true
   });
 };
 
@@ -271,8 +267,13 @@ GridFSBucket.prototype.openDownloadStreamByName = function(filename, options) {
     start: options && options.start,
     end: options && options.end
   };
-  return new GridFSBucketReadStream(this.s._chunksCollection,
-    this.s._filesCollection, this.s.options.readPreference, filter, options);
+  return new GridFSBucketReadStream(
+    this.s._chunksCollection,
+    this.s._filesCollection,
+    this.s.options.readPreference,
+    filter,
+    options
+  );
 };
 
 /**
@@ -284,19 +285,8 @@ GridFSBucket.prototype.openDownloadStreamByName = function(filename, options) {
  */
 
 GridFSBucket.prototype.rename = function(id, filename, callback) {
-  if (typeof callback === 'function') {
-    return _rename(this, id, filename, callback);
-  }
-
-  var _this = this;
-  return new this.s.promiseLibrary(function(resolve, reject) {
-    _rename(_this, id, filename, function(error, res) {
-      if (error) {
-        reject(error);
-      } else {
-        resolve(res);
-      }
-    });
+  return executeOperation(this.s.db.s.topology, _rename, [this, id, filename, callback], {
+    skipSessions: true
   });
 };
 
@@ -325,19 +315,8 @@ function _rename(_this, id, filename, callback) {
  */
 
 GridFSBucket.prototype.drop = function(callback) {
-  if (typeof callback === 'function') {
-    return _drop(this, callback);
-  }
-
-  var _this = this;
-  return new this.s.promiseLibrary(function(resolve, reject) {
-    _drop(_this, function(error, res) {
-      if (error) {
-        reject(error);
-      } else {
-        resolve(res);
-      }
-    });
+  return executeOperation(this.s.db.s.topology, _drop, [this, callback], {
+    skipSessions: true
   });
 };
 

package/lib/gridfs-stream/upload.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var core = require('mongodb-core');
 var crypto = require('crypto');
 var stream = require('stream');
@@ -108,21 +110,21 @@ GridFSBucketWriteStream.prototype.write = function(chunk, encoding, callback) {
 GridFSBucketWriteStream.prototype.abort = function(callback) {
   if (this.state.streamEnd) {
     var error = new Error('Cannot abort a stream that has already completed');
-    if (typeof callback == 'function') {
+    if (typeof callback === 'function') {
       return callback(error);
     }
     return this.state.promiseLibrary.reject(error);
   }
   if (this.state.aborted) {
     error = new Error('Cannot call abort() on a stream twice');
-    if (typeof callback == 'function') {
+    if (typeof callback === 'function') {
       return callback(error);
     }
     return this.state.promiseLibrary.reject(error);
   }
   this.state.aborted = true;
   this.chunks.deleteMany({ files_id: this.id }, function(error) {
-    if(typeof callback == 'function') callback(error);
+    if (typeof callback === 'function') callback(error);
   });
 };
 
@@ -139,10 +141,10 @@ GridFSBucketWriteStream.prototype.abort = function(callback) {
 
 GridFSBucketWriteStream.prototype.end = function(chunk, encoding, callback) {
   var _this = this;
-  if(typeof chunk == 'function') {
-    callback = chunk, chunk = null, encoding = null;
-  } else if(typeof encoding == 'function') {
-    callback = encoding, encoding = null;
+  if (typeof chunk === 'function') {
+    (callback = chunk), (chunk = null), (encoding = null);
+  } else if (typeof encoding === 'function') {
+    (callback = encoding), (encoding = null);
   }
 
   if (checkAborted(this, callback)) {
@@ -222,8 +224,7 @@ function checkChunksIndex(_this, callback) {
     indexes.forEach(function(index) {
       if (index.key) {
         var keys = Object.keys(index.key);
-        if (keys.length === 2 && index.key.files_id === 1 &&
-            index.key.n === 1) {
+        if (keys.length === 2 && index.key.files_id === 1 && index.key.n === 1) {
           hasChunksIndex = true;
         }
       }
@@ -254,16 +255,21 @@ function checkChunksIndex(_this, callback) {
  */
 
 function checkDone(_this, callback) {
-  if(_this.done) return true;
-  if (_this.state.streamEnd &&
-      _this.state.outstandingRequests === 0 &&
-      !_this.state.errored) {
+  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);
+    var filesDoc = createFilesDoc(
+      _this.id,
+      _this.length,
+      _this.chunkSizeBytes,
+      _this.md5.digest('hex'),
+      _this.filename,
+      _this.options.contentType,
+      _this.options.aliases,
+      _this.options.metadata
+    );
 
     if (checkAborted(_this, callback)) {
       return false;
@@ -315,8 +321,7 @@ function checkIndexes(_this, callback) {
       var hasFileIndex = false;
       indexes.forEach(function(index) {
         var keys = Object.keys(index.key);
-        if (keys.length === 2 && index.key.filename === 1 &&
-            index.key.uploadDate === 1) {
+        if (keys.length === 2 && index.key.filename === 1 && index.key.uploadDate === 1) {
           hasFileIndex = true;
         }
       });
@@ -346,8 +351,7 @@ function checkIndexes(_this, callback) {
  * @ignore
  */
 
-function createFilesDoc(_id, length, chunkSize, md5, filename, contentType,
-  aliases, metadata) {
+function createFilesDoc(_id, length, chunkSize, md5, filename, contentType, aliases, metadata) {
   var ret = {
     _id: _id,
     length: length,
@@ -381,8 +385,7 @@ function doWrite(_this, chunk, encoding, callback) {
     return false;
   }
 
-  var inputBuf = (Buffer.isBuffer(chunk)) ?
-    chunk : new Buffer(chunk, encoding);
+  var inputBuf = Buffer.isBuffer(chunk) ? chunk : new Buffer(chunk, encoding);
 
   _this.length += inputBuf.length;
 
@@ -407,8 +410,7 @@ function doWrite(_this, chunk, encoding, callback) {
   var outstandingRequests = 0;
   while (inputBufRemaining > 0) {
     var inputBufPos = inputBuf.length - inputBufRemaining;
-    inputBuf.copy(_this.bufToStore, _this.pos,
-      inputBufPos, inputBufPos + numToCopy);
+    inputBuf.copy(_this.bufToStore, _this.pos, inputBufPos, inputBufPos + numToCopy);
     _this.pos += numToCopy;
     spaceRemaining -= numToCopy;
     if (spaceRemaining === 0) {
@@ -427,7 +429,7 @@ function doWrite(_this, chunk, encoding, callback) {
         }
         --_this.state.outstandingRequests;
         --outstandingRequests;
-        
+
         if (!outstandingRequests) {
           _this.emit('drain', doc);
           callback && callback();
@@ -518,7 +520,7 @@ function writeRemnant(_this, callback) {
 
 function checkAborted(_this, callback) {
   if (_this.state.aborted) {
-    if(typeof callback == 'function') {
+    if (typeof callback === 'function') {
       callback(new Error('this stream has been aborted'));
     }
     return true;

package/lib/metadata.js

@@ -1,35 +1,38 @@
+'use strict';
+
 var f = require('util').format;
 
 var Define = function(name, object, stream) {
   this.name = name;
   this.object = object;
-  this.stream = typeof stream == 'boolean' ? stream : false;
+  this.stream = typeof stream === 'boolean' ? stream : false;
   this.instrumentations = {};
-}
+};
 
 Define.prototype.classMethod = function(name, options) {
   var keys = Object.keys(options).sort();
   var key = generateKey(keys, options);
 
   // Add a list of instrumentations
-  if(this.instrumentations[key] == null) {
+  if (this.instrumentations[key] == null) {
     this.instrumentations[key] = {
-      methods: [], options: options
-    }
+      methods: [],
+      options: options
+    };
   }
 
   // Push to list of method for this instrumentation
   this.instrumentations[key].methods.push(name);
-}
+};
 
 var generateKey = function(keys, options) {
   var parts = [];
-  for(var i = 0; i < keys.length; i++) {
+  for (var i = 0; i < keys.length; i++) {
     parts.push(f('%s=%s', keys[i], options[keys[i]]));
   }
 
   return parts.join();
-}
+};
 
 Define.prototype.staticMethod = function(name, options) {
   options.static = true;
@@ -37,28 +40,31 @@ Define.prototype.staticMethod = function(name, options) {
   var key = generateKey(keys, options);
 
   // Add a list of instrumentations
-  if(this.instrumentations[key] == null) {
+  if (this.instrumentations[key] == null) {
     this.instrumentations[key] = {
-      methods: [], options: options
-    }
+      methods: [],
+      options: options
+    };
   }
 
   // Push to list of method for this instrumentation
   this.instrumentations[key].methods.push(name);
-}
+};
 
 Define.prototype.generate = function() {
   // Generate the return object
   var object = {
-    name: this.name, obj: this.object, stream: this.stream,
+    name: this.name,
+    obj: this.object,
+    stream: this.stream,
     instrumentations: []
-  }
+  };
 
-  for(var name in this.instrumentations) {
+  for (var name in this.instrumentations) {
     object.instrumentations.push(this.instrumentations[name]);
   }
 
   return object;
-}
+};
 
 module.exports = Define;