stop using deprecated Buffer constructor in favor of Buffer.alloc/Buffer.from

lib/connection.js

@@ -5,6 +5,7 @@ var Promise                = require('./bluebird-configured');
 var NoKafkaConnectionError = require('./errors').NoKafkaConnectionError;
 var tls                    = require('tls');
 var _                      = require('lodash');
+var Buffer                 = require('safer-buffer').Buffer;
 
 function Connection(options) {
     this.options = _.defaults(options || {}, {
@@ -19,7 +20,7 @@ function Connection(options) {
     // internal state
     this.connected = false;
     this.closed = false; // raised if close() was called
-    this.buffer = new Buffer(this.options.initialBufferSize);
+    this.buffer = Buffer.alloc(this.options.initialBufferSize);
     this.offset = 0;
 
     this.queue = {};
@@ -115,7 +116,7 @@ Connection.prototype._disconnect = function (err) {
 };
 
 Connection.prototype._growBuffer = function (newLength) {
-    var _b = new Buffer(newLength);
+    var _b = Buffer.alloc(newLength);
     this.buffer.copy(_b, 0, 0, this.offset);
     this.buffer = _b;
 };
@@ -135,7 +136,7 @@ Connection.prototype.close = function () {
  * @return {Promise}      Promise resolved with a Kafka response message
  */
 Connection.prototype.send = function (correlationId, data, noresponse) {
-    var self = this, buffer = new Buffer(4 + data.length);
+    var self = this, buffer = Buffer.alloc(4 + data.length);
 
     buffer.writeInt32BE(data.length, 0);
     data.copy(buffer, 4);
@@ -199,7 +200,7 @@ Connection.prototype._receive = function (data) {
     correlationId = data.readInt32BE(4);
 
     if (this.queue.hasOwnProperty(correlationId)) {
-        this.queue[correlationId].resolve(new Buffer(data.slice(4, length + 4)));
+        this.queue[correlationId].resolve(Buffer.from(data.slice(4, length + 4)));
         delete this.queue[correlationId];
     }
 

lib/protocol/common.js

@@ -4,6 +4,7 @@ var Protocol = require('./index');
 var errors   = require('../errors');
 var crc32    = require('buffer-crc32');
 var _        = require('lodash');
+var Buffer   = require('safer-buffer').Buffer;
 
 /* jshint bitwise: false */
 
@@ -28,7 +29,7 @@ Protocol.define('bytes', {
             this.Int32BE(-1);
         } else {
             if (!Buffer.isBuffer(value)) {
-                value = new Buffer(_(value).toString(), 'utf8');
+                value = Buffer.from(_(value).toString(), 'utf8');
             }
             this
                 .Int32BE(value.length)
@@ -51,7 +52,7 @@ Protocol.define('string', {
         if (value === undefined || value === null) {
             this.Int16BE(-1);
         } else {
-            value = new Buffer(_(value).toString(), 'utf8');
+            value = Buffer.from(_(value).toString(), 'utf8');
             this
                 .Int16BE(value.length)
                 .raw(value);

lib/protocol/misc/compression.js

@@ -12,8 +12,9 @@ var Promise = require('bluebird');
 var snappy  = requireSafe('snappy');
 var zlib    = require('zlib');
 var _ = require('lodash');
+var Buffer = require('safer-buffer').Buffer;
 
-var SNAPPY_MAGIC_HEADER = new Buffer([-126, 83, 78, 65, 80, 80, 89, 0]); // '\x82SNAPPY\00'
+var SNAPPY_MAGIC_HEADER = Buffer.from([-126, 83, 78, 65, 80, 80, 89, 0]); // '\x82SNAPPY\00'
 /*var SNAPPY_BLOCK_SIZE = 32 * 1024;
 var SNAPPY_DEFAULT_VERSION = 1;
 var SNAPPY_MINIMUM_COMPATIBLE_VERSION = 1;*/

package.json

@@ -13,16 +13,17 @@
     "kafka"
   ],
   "dependencies": {
+    "@types/bluebird": "3.5.0",
+    "@types/lodash": "^4.14.55",
     "bin-protocol": "^3.0.4",
     "bluebird": "^3.3.3",
     "buffer-crc32": "^0.2.5",
     "hashring": "^3.2.0",
     "lodash": "=4.17.5",
     "murmur-hash-js": "^1.0.0",
     "nice-simple-logger": "^1.0.1",
-    "wrr-pool": "^1.0.3",
-    "@types/lodash": "^4.14.55",
-    "@types/bluebird": "3.5.0"
+    "safer-buffer": "^2.1.2",
+    "wrr-pool": "^1.0.3"
   },
   "devDependencies": {
     "chai": "^3.5.0",

test/07.compression.js

@@ -5,6 +5,7 @@
 var crc32   = require('buffer-crc32');
 var Promise = require('bluebird');
 var Kafka   = require('../lib/index');
+var Buffer  = require('safer-buffer').Buffer;
 
 describe('Compression', function () {
     describe('sync', function () {
@@ -76,7 +77,7 @@ describe('Compression', function () {
         });
 
         it('should send/receive with Snappy compression (>32kb)', function () {
-            var buf = new Buffer(90 * 1024), crc = crc32.signed(buf);
+            var buf = Buffer.alloc(90 * 1024), crc = crc32.signed(buf);
 
             dataHandlerSpy.reset();
 
@@ -214,7 +215,7 @@ describe('Compression', function () {
         });
 
         it('should send/receive with async Snappy compression (>32kb)', function () {
-            var buf = new Buffer(90 * 1024), crc = crc32.signed(buf);
+            var buf = Buffer.alloc(90 * 1024), crc = crc32.signed(buf);
 
             dataHandlerSpy.reset();
 
@@ -260,7 +261,7 @@ describe('Compression', function () {
         });
 
         it('should send/receive with async Gzip compression (>32kb)', function () {
-            var buf = new Buffer(90 * 1024), crc = crc32.signed(buf);
+            var buf = Buffer.alloc(90 * 1024), crc = crc32.signed(buf);
 
             dataHandlerSpy.reset();
 

test/08.connection.js

@@ -7,6 +7,7 @@ var fs = require('fs');
 var Promise = require('bluebird');
 var crc32   = require('buffer-crc32');
 var Kafka   = require('../lib/index');
+var Buffer  = require('safer-buffer').Buffer;
 
 describe('Connection', function () {
     var producer = new Kafka.Producer({ requiredAcks: 0, clientId: 'producer' });
@@ -32,7 +33,7 @@ describe('Connection', function () {
     });
 
     it('should be able to grow receive buffer', function () {
-        var buf = new Buffer(384 * 1024), crc = crc32.signed(buf);
+        var buf = Buffer.alloc(384 * 1024), crc = crc32.signed(buf);
 
         dataHandlerSpy.reset();