fix(buffer): replace deprecated Buffer constructor

Replace Buffer constructor with buffer.alloc and buffer.from

Fixes Node-1461

Author: Sophie Saskin

lib/binary.js

@@ -38,7 +38,7 @@ class Binary {
       if (typeof buffer === 'string') {
         // Different ways of writing the length of the string for the different types
         if (typeof Buffer !== 'undefined') {
-          this.buffer = new Buffer(buffer);
+          this.buffer = Buffer.from(buffer);
         } else if (typeof Uint8Array !== 'undefined' || Array.isArray(buffer)) {
           this.buffer = writeStringToArray(buffer);
         } else {
@@ -50,7 +50,7 @@ class Binary {
       this.position = buffer.length;
     } else {
       if (typeof Buffer !== 'undefined') {
-        this.buffer = new Buffer(Binary.BUFFER_SIZE);
+        this.buffer = Buffer.alloc(Binary.BUFFER_SIZE);
       } else if (typeof Uint8Array !== 'undefined') {
         this.buffer = new Uint8Array(new ArrayBuffer(Binary.BUFFER_SIZE));
       } else {
@@ -87,7 +87,7 @@ class Binary {
     } else {
       if (typeof Buffer !== 'undefined' && Buffer.isBuffer(this.buffer)) {
         // Create additional overflow buffer
-        let buffer = new Buffer(Binary.BUFFER_SIZE + this.buffer.length);
+        let buffer = Buffer.alloc(Binary.BUFFER_SIZE + this.buffer.length);
         // Combine the two buffers together
         this.buffer.copy(buffer, 0, 0, this.buffer.length);
         this.buffer = buffer;
@@ -130,7 +130,7 @@ class Binary {
       let buffer = null;
       // If we are in node.js
       if (typeof Buffer !== 'undefined' && Buffer.isBuffer(this.buffer)) {
-        buffer = new Buffer(this.buffer.length + string.length);
+        buffer = Buffer.alloc(this.buffer.length + string.length);
         this.buffer.copy(buffer, 0, 0, this.buffer.length);
       } else if (isUint8Array(this.buffer)) {
         // Create a new buffer

lib/bson.js

@@ -31,7 +31,7 @@ const ensureBuffer = require('./ensure_buffer');
 const MAXSIZE = 1024 * 1024 * 17;
 
 // Current Internal Temporary Serialization Buffer
-let buffer = new Buffer(MAXSIZE);
+let buffer = Buffer.alloc(MAXSIZE);
 
 /**
  * Sets the size of the internal serialization buffer.
@@ -41,7 +41,7 @@ let buffer = new Buffer(MAXSIZE);
 function setInternalBufferSize(size) {
   // Resize the internal serialization buffer if needed
   if (buffer.length < size) {
-    buffer = new Buffer(size);
+    buffer = Buffer.alloc(size);
   }
 }
 
@@ -68,7 +68,7 @@ function serialize(object, options) {
 
   // Resize the internal serialization buffer if needed
   if (buffer.length < minInternalBufferSize) {
-    buffer = new Buffer(minInternalBufferSize);
+    buffer = Buffer.alloc(minInternalBufferSize);
   }
 
   // Attempt to serialize
@@ -84,7 +84,7 @@ function serialize(object, options) {
   );
 
   // Create the final buffer
-  const finishedBuffer = new Buffer(serializationIndex);
+  const finishedBuffer = Buffer.alloc(serializationIndex);
 
   // Copy into the finished buffer
   buffer.copy(finishedBuffer, 0, 0, finishedBuffer.length);

lib/decimal128.js

@@ -253,9 +253,9 @@ Decimal128.fromString = function(string) {
   // Check if user passed Infinity or NaN
   if (!isDigit(string[index]) && string[index] !== '.') {
     if (string[index] === 'i' || string[index] === 'I') {
-      return new Decimal128(new Buffer(isNegative ? INF_NEGATIVE_BUFFER : INF_POSITIVE_BUFFER));
+      return new Decimal128(Buffer.from(isNegative ? INF_NEGATIVE_BUFFER : INF_POSITIVE_BUFFER));
     } else if (string[index] === 'N') {
-      return new Decimal128(new Buffer(NAN_BUFFER));
+      return new Decimal128(Buffer.from(NAN_BUFFER));
     }
   }
 
@@ -298,7 +298,7 @@ Decimal128.fromString = function(string) {
     const match = string.substr(++index).match(EXPONENT_REGEX);
 
     // No digits read
-    if (!match || !match[2]) return new Decimal128(new Buffer(NAN_BUFFER));
+    if (!match || !match[2]) return new Decimal128(Buffer.from(NAN_BUFFER));
 
     // Get exponent
     exponent = parseInt(match[0], 10);
@@ -308,7 +308,7 @@ Decimal128.fromString = function(string) {
   }
 
   // Return not a number
-  if (string[index]) return new Decimal128(new Buffer(NAN_BUFFER));
+  if (string[index]) return new Decimal128(Buffer.from(NAN_BUFFER));
 
   // Done reading input
   // Find first non-zero digit in digits
@@ -437,7 +437,7 @@ Decimal128.fromString = function(string) {
               digits[dIdx] = 1;
             } else {
               return new Decimal128(
-                new Buffer(isNegative ? INF_NEGATIVE_BUFFER : INF_POSITIVE_BUFFER)
+                Buffer.from(isNegative ? INF_NEGATIVE_BUFFER : INF_POSITIVE_BUFFER)
               );
             }
           }
@@ -519,7 +519,7 @@ Decimal128.fromString = function(string) {
   }
 
   // Encode into a buffer
-  const buffer = new Buffer(16);
+  const buffer = Buffer.alloc(16);
   index = 0;
 
   // Encode the low 64 bits of the decimal

lib/ensure_buffer.js

@@ -16,7 +16,7 @@ module.exports = function ensureBuffer(potentialBuffer) {
   }
 
   if (potentialBuffer instanceof Uint8Array) {
-    return new Buffer(potentialBuffer.buffer);
+    return Buffer.from(potentialBuffer.buffer);
   }
 
   throw new TypeError('Must use either Buffer or Uint8Array');

lib/objectid.js

@@ -76,7 +76,7 @@ class ObjectId {
         'Argument passed in must be a single String of 12 bytes or a string of 24 hex characters'
       );
     } else if (valid && typeof id === 'string' && id.length === 24 && hasBufferType) {
-      return new ObjectId(new Buffer(id, 'hex'));
+      return new ObjectId(Buffer.from(id, 'hex'));
     } else if (valid && typeof id === 'string' && id.length === 24) {
       return ObjectId.createFromHexString(id);
     } else if (id != null && id.length === 12) {
@@ -167,7 +167,7 @@ class ObjectId {
         : process.pid) % 0xffff;
     const inc = this.get_inc();
     // Buffer used
-    const buffer = new Buffer(12);
+    const buffer = Buffer.alloc(12);
     // Encode time
     buffer[3] = time & 0xff;
     buffer[2] = (time >> 8) & 0xff;
@@ -278,7 +278,7 @@ class ObjectId {
    * @return {ObjectId} return the created ObjectId
    */
   static createFromTime(time) {
-    const buffer = new Buffer([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+    const buffer = Buffer.from([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
     // Encode time into first 4 bytes
     buffer[3] = time & 0xff;
     buffer[2] = (time >> 8) & 0xff;
@@ -304,7 +304,7 @@ class ObjectId {
     }
 
     // Use Buffer.from method if available
-    if (hasBufferType) return new ObjectId(new Buffer(string, 'hex'));
+    if (hasBufferType) return new ObjectId(Buffer.from(string, 'hex'));
 
     // Calculate lengths
     const array = new _Buffer(12);

lib/parser/deserializer.js

@@ -144,7 +144,7 @@ function deserializeObject(buffer, index, options, isArray) {
       object[name] = s;
       index = index + stringSize;
     } else if (elementType === constants.BSON_DATA_OID) {
-      const oid = new Buffer(12);
+      const oid = Buffer.alloc(12);
       buffer.copy(oid, 0, index, index + 12);
       object[name] = new ObjectId(oid);
       index = index + 12;
@@ -249,7 +249,7 @@ function deserializeObject(buffer, index, options, isArray) {
       }
     } else if (elementType === constants.BSON_DATA_DECIMAL128) {
       // Buffer to contain the decimal bytes
-      const bytes = new Buffer(16);
+      const bytes = Buffer.alloc(16);
       // Copy the next 16 bytes into the bytes buffer
       buffer.copy(bytes, 0, index, index + 16);
       // Update index
@@ -552,7 +552,7 @@ function deserializeObject(buffer, index, options, isArray) {
       index = index + stringSize;
 
       // Read the oid
-      const oidBuffer = new Buffer(12);
+      const oidBuffer = Buffer.alloc(12);
       buffer.copy(oidBuffer, 0, index, index + 12);
       const oid = new ObjectId(oidBuffer);