From 30fd138ae99f73e81eb5da4118034493ba60caae Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Tue, 13 Oct 2015 17:11:51 +0200 Subject: [PATCH 1/3] use bufferEqual instead of buffertools native modules are annoying --- examples/proxy/proxy.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/proxy/proxy.js b/examples/proxy/proxy.js index 14792d9..7e44b83 100644 --- a/examples/proxy/proxy.js +++ b/examples/proxy/proxy.js @@ -128,13 +128,13 @@ srv.on('login', function(client) { client.compressionThreshold = data.threshold; } }); - var buffertools = require('buffertools'); + var bufferEqual = require('buffer-equal'); targetClient.on('raw', function(buffer, meta) { if(client.state != states.PLAY || meta.state != states.PLAY) return; var packetData = targetClient.deserializer.parsePacketData(buffer).data; var packetBuff = client.serializer.createPacketBuffer(meta.name, packetData); - if(buffertools.compare(buffer, packetBuff) != 0) { + if(!bufferEqual(buffer, packetBuff)) { console.log("client<-server: Error in packet " + state + "." + meta.name); console.log(buffer.toString('hex')); console.log(packetBuff.toString('hex')); @@ -154,7 +154,7 @@ srv.on('login', function(client) { return; var packetData = client.deserializer.parsePacketData(buffer).data; var packetBuff = targetClient.serializer.createPacketBuffer(meta.name, packetData); - if(buffertools.compare(buffer, packetBuff) != 0) { + if(!bufferEqual(buffer, packetBuff)) { console.log("client->server: Error in packet " + state + "." + meta.name); console.log(buffer.toString('hex')); console.log(packetBuff.toString('hex')); From 0da2b1460701e9583f38bdb5b96abe8d2d17fa86 Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Tue, 13 Oct 2015 17:15:49 +0200 Subject: [PATCH 2/3] change dependency from buffertools to buffer-equal in proxy --- examples/proxy/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/proxy/package.json b/examples/proxy/package.json index 9e9949b..6fe7ed8 100644 --- a/examples/proxy/package.json +++ b/examples/proxy/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": true, "dependencies": { - "buffertools": "^2.1.2" + "buffer-equal": "0.0.1" }, "description": "A node-minecraft-protocol example" } From c288801ffb544d5c38f808b45c00b5e8e40c3772 Mon Sep 17 00:00:00 2001 From: Romain Beaumont Date: Tue, 13 Oct 2015 17:16:26 +0200 Subject: [PATCH 3/3] bump buffer-equal in nmp: 0.0.1 use node Buffer.equal when available --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ad5405b..a6539f5 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ }, "dependencies": { "babel-runtime": "^5.4.4", - "buffer-equal": "0.0.0", + "buffer-equal": "0.0.1", "lodash.reduce": "^3.1.2", "minecraft-data": "^0.13.0", "node-uuid": "~1.4.1",