use read instead of on('data')

brianc · brianc · commit 2f77f87fd620 · 2013-04-17T13:27:30.000-05:00
diff --git a/lib/connection.js b/lib/connection.js
@@ -86,14 +86,13 @@ Connection.prototype.connect = function(port, host) {
 Connection.prototype.attachListeners = function(stream) {
   var self = this;
   var reader = new Readable();
-  reader.wrap(stream);
+  reader = reader.wrap(stream);
   reader.on('readable', function() {
-    self.setBuffer(reader.read());
-    var msg = self.parseMessage();
+    var msg = self.parseMessage(reader);
     while(msg) {
       self.emit('message', msg);
       self.emit(msg.name, msg);
-      msg = self.parseMessage();
+      msg = self.parseMessage(reader);
     }
   });
   reader.on('error', function(error) {
@@ -324,34 +323,39 @@ Connection.prototype.readSslResponse = function() {
   };
 };
 
-Connection.prototype.parseMessage =  function() {
-  var remaining = this.buffer.length - (this.offset);
-  if(remaining < 5) {
-    //cannot read id + length without at least 5 bytes
-    //just abort the read now
-    this.lastBuffer = this.buffer;
-    this.lastOffset = this.offset;
-    return false;
+Connection.prototype.parseMessage =  function(reader) {
+  //I want to get rid of this bit here...
+  if(!this.header) {
+    //try to read the 5 byte header
+    this.header = reader.read(5);
+    if(!this.header) {
+      return false;
+    }
   }
 
   //read message id code
-  var id = this.buffer[this.offset++];
+  var id = this.header[0];
   //read message length
-  var length = this.parseInt32();
-
-  if(remaining <= length) {
-    this.lastBuffer = this.buffer;
-    //rewind the last 5 bytes we read
-    this.lastOffset = this.offset-5;
-    return false;
+  var length = this.header.readInt32BE(1, true);
+
+  var bodyLength = length - 4;
+  //some packets have an empty body
+  if(bodyLength) {
+    var body = reader.read(bodyLength);
+    if(!body) {
+      return false;
+    }
+    //blow away header
+    this.buffer = body;
+    this.offset = 0;
   }
+  this.header = false;
 
   var msg = {
     length: length
   };
   switch(id)
   {
-
   case 0x52: //R
     msg.name = 'authenticationOk';
     return this.parseR(msg);
@@ -419,6 +423,7 @@ Connection.prototype.parseMessage =  function() {
   case 0x48: //H
     msg.name = 'copyOutResponse';
     return this.parseGH(msg);
+
   case 0x63: //c
     msg.name = 'copyDone';
     return  msg;
diff --git a/test/unit/test-helper.js b/test/unit/test-helper.js
@@ -15,6 +15,10 @@ p.write = function(packet) {
   this.packets.push(packet);
 };
 
+p.pause = function() {
+  
+};
+
 p.writable = true;
 
 createClient = function() {
