Merge pull request #115 from bwdeng/fix-mutiple-responses-parsing

Fix a bug when parsing multiple responses
tulios · Aug 18, 2018 · ade12dd · ade12dd
2 parents a1e6c4b + 74d452f
commit ade12dd
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 33 deletions.
diff --git a/src/network/connection.js b/src/network/connection.js
@@ -304,43 +304,43 @@ module.exports = class Connection {
 
     this.buffer = Buffer.concat([this.buffer, rawData])
 
-    // Not enough bytes to read the expected response size, keep buffering
-    if (Buffer.byteLength(this.buffer) <= Decoder.int32Size()) {
-      return
-    }
-
-    const data = Buffer.from(this.buffer)
-    const decoder = new Decoder(data)
-    const expectedResponseSize = decoder.readInt32()
+    // Process data if there are enough bytes to read the expected response size,
+    // otherwise keep buffering
+    while (Buffer.byteLength(this.buffer) > Decoder.int32Size()) {
+      const data = Buffer.from(this.buffer)
+      const decoder = new Decoder(data)
+      const expectedResponseSize = decoder.readInt32()
+
+      if (!decoder.canReadBytes(expectedResponseSize)) {
+        return
+      }
 
-    if (!decoder.canReadBytes(expectedResponseSize)) {
-      return
-    }
+      const response = new Decoder(decoder.readBytes(expectedResponseSize))
+      // Reset the buffer as the rest of the bytes
+      this.buffer = decoder.readAll()
 
-    // The full payload is loaded, erase the temporary buffer
-    this.buffer = Buffer.alloc(0)
+      if (this.authHandlers) {
+        return this.authHandlers.onSuccess(data.slice(0, Decoder.int32Size() + expectedResponseSize))
+      }
 
-    if (this.authHandlers) {
-      return this.authHandlers.onSuccess(data)
-    }
+      const correlationId = response.readInt32()
+      const payload = response.readAll()
 
-    const correlationId = decoder.readInt32()
-    const payload = decoder.readAll()
+      const entry = this.pendingQueue[correlationId]
+      delete this.pendingQueue[correlationId]
 
-    const entry = this.pendingQueue[correlationId]
-    delete this.pendingQueue[correlationId]
+      if (!entry) {
+        this.logDebug(`Response without match`, { correlationId })
+        return
+      }
 
-    if (!entry) {
-      this.logDebug(`Response without match`, { correlationId })
-      return
+      entry.resolve({
+        size: expectedResponseSize,
+        correlationId,
+        entry,
+        payload,
+      })
     }
-
-    entry.resolve({
-      size: expectedResponseSize,
-      correlationId,
-      entry,
-      payload,
-    })
   }
 
   /**

diff --git a/src/protocol/decoder.js b/src/protocol/decoder.js
@@ -90,9 +90,7 @@ module.exports = class Decoder {
     return Buffer.byteLength(this.buffer) - this.offset >= length
   }
 
-  readBytes() {
-    const byteLength = this.readInt32()
-
+  readBytes(byteLength = this.readInt32()) {
     if (byteLength === -1) {
       return null
     }