From 3c61f24991b7868a9629dab93d4326f2ea45c32b Mon Sep 17 00:00:00 2001
From: Romain Beaumont <romain.rom1@gmail.com>
Date: Sat, 23 May 2015 01:10:58 +0200
Subject: [PATCH] remove write callback knowing when the packet has been sent
 is not an useful information : the fact that it's sent doesn't mean it is
 received and what we usually want is that the packets are in the proper order
 no when they are sent

---
 src/client.js |  8 ++------
 src/index.js  | 44 ++++++++++++++++----------------------------
 src/ping.js   |  5 +----
 3 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/src/client.js b/src/client.js
index 36ad6d9..acaf743 100644
--- a/src/client.js
+++ b/src/client.js
@@ -168,11 +168,7 @@ Client.prototype.setCompressionThreshold = function(threshold) {
   }
 }
 
-function noop(err) {
-  if(err) throw err;
-}
-
-Client.prototype.write = function(packetId, params, cb = noop) {
+Client.prototype.write = function(packetId, params) {
   if(Array.isArray(packetId)) {
     if(packetId[0] !== this.state)
       return false;
@@ -183,7 +179,7 @@ Client.prototype.write = function(packetId, params, cb = noop) {
   var packetName = protocol.packetNames[this.state][this.isServer ? "toClient" : "toServer"][packetId];
   debug("writing packetId " + this.state + "." + packetName + " (0x" + packetId.toString(16) + ")");
   debug(params);
-  this.serializer.write({ packetId, params }, cb);
+  this.serializer.write({ packetId, params });
 };
 
 Client.prototype.writeRaw = function(buffer) {
diff --git a/src/index.js b/src/index.js
index c3aab91..7cb07e8 100644
--- a/src/index.js
+++ b/src/index.js
@@ -125,11 +125,8 @@ function createServer(options) {
       }
 
       client.once([states.STATUS, 0x01], function(packet) {
-        client.write(0x01, {time: packet.time},function(err){
-          if(err)
-            throw err;
-          client.end();
-        });
+        client.write(0x01, {time: packet.time});
+        client.end();
       });
       client.write(0x00, {response: JSON.stringify(response)});
     }
@@ -215,22 +212,19 @@ function createServer(options) {
       }
       //client.write('compress', { threshold: 256 }); // Default threshold is 256
       //client.compressionThreshold = 256;
-      client.write(0x02, {uuid: client.uuid, username: client.username},function(err){
-        if(err)
-          throw err;
-        client.state = states.PLAY;
-        loggedIn = true;
-        startKeepAlive();
+      client.write(0x02, {uuid: client.uuid, username: client.username});
+      client.state = states.PLAY;
+      loggedIn = true;
+      startKeepAlive();
 
-        clearTimeout(loginKickTimer);
-        loginKickTimer = null;
+      clearTimeout(loginKickTimer);
+      loginKickTimer = null;
 
-        server.playerCount += 1;
-        client.once('end', function() {
-          server.playerCount -= 1;
-        });
-        server.emit('login', client);
+      server.playerCount += 1;
+      client.once('end', function() {
+        server.playerCount -= 1;
       });
+      server.emit('login', client);
     }
   });
   server.listen(port, host);
@@ -301,13 +295,10 @@ function createClient(options) {
       serverHost: host,
       serverPort: port,
       nextState: 2
-    },function(err){
-      if(err)
-        throw err;
-      client.state = states.LOGIN;
-      client.write(0x00, {
-        username: client.username
-      });
+    });
+    client.state = states.LOGIN;
+    client.write(0x00, {
+      username: client.username
     });
   }
 
@@ -366,9 +357,6 @@ function createClient(options) {
         client.write(0x01, {
           sharedSecret: encryptedSharedSecretBuffer,
           verifyToken: encryptedVerifyTokenBuffer,
-        },function(err){
-          if(err)
-            throw err;
         });
         client.setEncryption(sharedSecret);
       }
diff --git a/src/ping.js b/src/ping.js
index 93604b5..a1fe989 100644
--- a/src/ping.js
+++ b/src/ping.js
@@ -37,11 +37,8 @@ function ping(options, cb) {
       serverHost: host,
       serverPort: port,
       nextState: 1
-    },function(err){
-      if(err)
-        throw err;
-      client.state = states.STATUS;
     });
+    client.state = states.STATUS;
   });
 
   client.connect(port, host);