Merge pull request #381 from sidorares/buffer-api-deprecations

replace deprecated Buffer apis with new API

Author: sidorares

.travis.yml

@@ -6,9 +6,9 @@ before_script:
 node_js:
   - '0.10'
   - '0.12'
-  - '4.4'
+  - '4.5'
   - '5.12'
-  - '6.3'
+  - '6.4'
 
 
 script:

examples/pass-sha.js

@@ -1,7 +1,7 @@
 var mysql = require('../index.js').createConnection({
   user: 'testuser',
   //password: 'testpassword'
-  passwordSha1: Buffer('8bb6118f8fd6935ad0876a3be34a717d32708ffd', 'hex')
+  passwordSha1: Buffer.from('8bb6118f8fd6935ad0876a3be34a717d32708ffd', 'hex')
 });
 mysql.execute("select ?+1 as qqq, ? as rrr, ? as yyy", [1, null, 3], function(err, rows, fields) {
   console.log(err, rows, fields);

lib/auth_41.js

@@ -23,6 +23,7 @@ server stores sha1(sha1(password)) ( hash_stag2)
 */
 
 var crypto = require('crypto');
+var Buffer = require('safe-buffer').Buffer;
 
 function sha1 (msg, msg1, msg2) {
   var hash = crypto.createHash('sha1');
@@ -40,14 +41,14 @@ function sha1 (msg, msg1, msg2) {
 
 function xor (a, b) {
   if (!Buffer.isBuffer(a)) {
-    a = new Buffer(a, 'binary');
+    a = Buffer.from(a, 'binary');
   }
 
   if (!Buffer.isBuffer(b)) {
-    b = new Buffer(b, 'binary');
+    b = Buffer.from(b, 'binary');
   }
 
-  var result = new Buffer(a.length);
+  var result = Buffer.allocUnsafe(a.length);
 
   for (var i = 0; i < a.length; i++) {
     result[i] = (a[i] ^ b[i]);
@@ -58,7 +59,7 @@ function xor (a, b) {
 function token (password, scramble1, scramble2) {
   // TODO: use buffers (not sure why strings here)
   if (!password) {
-    return new Buffer(0);
+    return Buffer.alloc(0);
   }
   var stage1 = sha1(password);
   return module.exports.calculateTokenFromPasswordSha(stage1, scramble1, scramble2);

lib/commands/ping.js

@@ -1,5 +1,7 @@
-var Command = require('./command');
 var util = require('util');
+var Buffer = require('safe-buffer').Buffer;
+
+var Command = require('./command');
 var CommandCode = require('../constants/commands');
 var Packet = require('../packets/packet');
 
@@ -15,7 +17,7 @@ function Ping (callback)
 util.inherits(Ping, Command);
 
 Ping.prototype.start = function (packet, connection) {
-  var ping = new Packet(0, new Buffer([1, 0, 0, 0, CommandCode.PING]), 0, 5);
+  var ping = new Packet(0, Buffer.from([1, 0, 0, 0, CommandCode.PING]), 0, 5);
   connection.writePacket(ping);
   return Ping.prototype.pingResponse;
 };

lib/commands/query.js

@@ -1,5 +1,6 @@
 var fs = require('fs');
 var util = require('util');
+var Buffer = require('safe-buffer').Buffer;
 
 var Readable = require('readable-stream');
 
@@ -8,7 +9,7 @@ var Packets = require('../packets/index.js');
 var compileParser = require('../compile_text_parser.js');
 var ServerStatus = require('../constants/server_status.js');
 
-var EmptyPacket = new Packets.Packet(0, new Buffer(4), 0, 4);
+var EmptyPacket = new Packets.Packet(0, Buffer.allocUnsafe(4), 0, 4);
 
 function Query (options, callback)
 {
@@ -126,7 +127,7 @@ Query.prototype._streamLocalInfile = function (connection) {
     command._localStream.resume();
   });
   this._localStream.on('data', function (data) {
-    var dataWithHeader = new Buffer(data.length + 4);
+    var dataWithHeader = Buffer.allocUnsafe(data.length + 4);
     data.copy(dataWithHeader, 4);
     connection.writePacket(new Packets.Packet(0, dataWithHeader, 0, dataWithHeader.length));
   });

lib/commands/quit.js

@@ -1,4 +1,6 @@
 var util = require('util');
+var Buffer = require('safe-buffer').Buffer;
+
 var Command = require('./command.js');
 var CommandCode = require('../constants/commands.js');
 var Packet = require('../packets/packet.js');
@@ -12,7 +14,7 @@ util.inherits(Quit, Command);
 
 Quit.prototype.start = function (packet, connection) {
   connection._closing = true;
-  var quit = new Packet(0, new Buffer([1, 0, 0, 0, CommandCode.QUIT]), 0, 5);
+  var quit = new Packet(0, Buffer.from([1, 0, 0, 0, CommandCode.QUIT]), 0, 5);
   if (this.done) {
     this.done();
   }

lib/compressed_protocol.js

@@ -1,3 +1,5 @@
+var Buffer = require('safe-buffer').Buffer;
+
 // connection mixins
 // implementation of http://dev.mysql.com/doc/internals/en/compression.html
 
@@ -64,7 +66,7 @@ function writeCompressedPacket (packet) {
   }
 
   var packetLen = packet.length();
-  var compressHeader = new Buffer(7);
+  var compressHeader = Buffer.allocUnsafe(7);
 
   connection.deflateQueue.push(function (task) {
     zlib.deflate(packet.buffer, function (err, compressed) {

lib/packet_parser.js

@@ -1,3 +1,4 @@
+var Buffer = require('safe-buffer').Buffer;
 var Packet = require('./packets/packet.js');
 
 function PacketParser (onPacket, packetHeaderLength)
@@ -69,7 +70,7 @@ PacketParser.prototype.executePayload = function executePayload (chunk) {
   var remainingPayload = this.length - this.bufferLength + this.packetHeaderLength - 3;
 
   if (end - start >= remainingPayload) { // last chunk for payload
-    var payload = new Buffer(this.length + this.packetHeaderLength);
+    var payload = Buffer.allocUnsafe(this.length + this.packetHeaderLength);
     var offset = 3;
     for (var i = 0; i < this.buffer.length; ++i) {
       this.buffer[i].copy(payload, offset);

lib/packets/auth_switch_request.js

@@ -1,6 +1,7 @@
 // http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::AuthSwitchRequest
 
 var Packet = require('../packets/packet');
+var Buffer = require('safe-buffer').Buffer;
 
 function AuthSwitchRequest (opts)
 {
@@ -11,7 +12,7 @@ function AuthSwitchRequest (opts)
 AuthSwitchRequest.prototype.toPacket = function ()
 {
   var length = 6 + this.pluginName.length + this.pluginData.length;
-  var buffer = new Buffer(length);
+  var buffer = Buffer.allocUnsafe(length);
   var packet = new Packet(0, buffer, 0, length);
   packet.offset = 4;
   packet.writeInt8(0xfe);

lib/packets/auth_switch_request_more_data.js

@@ -1,5 +1,5 @@
 // http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::AuthSwitchRequest
-
+var Buffer = require('safe-buffer').Buffer;
 var Packet = require('../packets/packet');
 
 function AuthSwitchRequestMoreData (data)
@@ -10,7 +10,7 @@ function AuthSwitchRequestMoreData (data)
 AuthSwitchRequestMoreData.prototype.toPacket = function ()
 {
   var length = 5 + this.data.length;
-  var buffer = new Buffer(length);
+  var buffer = Buffer.allocUnsafe(length);
   var packet = new Packet(0, buffer, 0, length);
   packet.offset = 4;
   packet.writeInt8(0x01);