From 8a6a9c00e91cf18dde41cd85c925d4c4ee2088c6 Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Mon, 18 May 2015 18:24:10 +0200 Subject: [PATCH] fix compressPacketBuffer : it was not compressing anything until now, also fix a problem in newStylePacket to handle the correct dataSize --- src/client.js | 4 ++-- src/protocol.js | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client.js b/src/client.js index b4f4787..08d7092 100644 --- a/src/client.js +++ b/src/client.js @@ -185,7 +185,7 @@ Client.prototype.write = function(packetId, params) { compressPacketBuffer(buffer, finishWriting); } else if(this.compressionThreshold >= -1) { debug("New-styling packet"); - newStylePacket(buffer, finishWriting); + newStylePacket(buffer, 0, finishWriting); } else { debug("Old-styling packet"); oldStylePacket(buffer, finishWriting); @@ -207,7 +207,7 @@ Client.prototype.writeRaw = function(buffer) { if(this.compressionThreshold >= 0 && buffer.length >= this.compressionThreshold) { compressPacketBuffer(buffer, finishWriting); } else if(this.compressionThreshold >= -1) { - newStylePacket(buffer, finishWriting); + newStylePacket(buffer, 0, finishWriting); } else { oldStylePacket(buffer, finishWriting); } diff --git a/src/protocol.js b/src/protocol.js index d031fc8..f0ce3b2 100644 --- a/src/protocol.js +++ b/src/protocol.js @@ -139,7 +139,7 @@ function compressPacketBuffer(buffer, callback) { if(err) callback(err); else - newStylePacket(buffer, callback); + newStylePacket(buf, buffer.length, callback); }); } @@ -150,13 +150,13 @@ function oldStylePacket(buffer, callback) { callback(null, packet); } -function newStylePacket(buffer, callback) { - var sizeOfDataLength = utils.varint[2](0); +function newStylePacket(buffer, dataSize, callback) { + var sizeOfDataLength = utils.varint[2](dataSize); var sizeOfLength = utils.varint[2](buffer.length + sizeOfDataLength); var size = sizeOfLength + sizeOfDataLength + buffer.length; var packet = new Buffer(size); var cursor = utils.varint[1](size - sizeOfLength, packet, 0); - cursor = utils.varint[1](0, packet, cursor); + cursor = utils.varint[1](dataSize, packet, cursor); utils.buffer[1](buffer, packet, cursor); callback(null, packet); }