Merge pull request #46 from Nibbler999/iojs-3.0

Fix iojs 3.0 Buffer.buffer issue

Author: rauchg

lib/index.js

@@ -60,13 +60,9 @@ exports.encodePacket = function (packet, supportsBinary, utf8encode, callback) {
     utf8encode = null;
   }
 
-  var data = (packet.data === undefined)
-    ? undefined
-    : packet.data.buffer || packet.data;
-
-  if (Buffer.isBuffer(data)) {
+  if (Buffer.isBuffer(packet.data)) {
     return encodeBuffer(packet, supportsBinary, callback);
-  } else if (data instanceof ArrayBuffer) {
+  } else if (packet.data && (packet.data.buffer || packet.data) instanceof ArrayBuffer) {
     return encodeArrayBuffer(packet, supportsBinary, callback);
   }
 
@@ -97,9 +93,8 @@ function encodeBuffer(packet, supportsBinary, callback) {
 }
 
 function encodeArrayBuffer(packet, supportsBinary, callback) {
-  var data = (packet.data === undefined)
-    ? undefined
-    : packet.data.buffer || packet.data;
+
+  var data = packet.data.buffer || packet.data;
 
   if (!supportsBinary) {
     return exports.encodeBase64Packet(packet, callback);
@@ -123,11 +118,11 @@ function encodeArrayBuffer(packet, supportsBinary, callback) {
  */
 
 exports.encodeBase64Packet = function(packet, callback){
-  var data = packet.data.buffer || packet.data;
-  if (data instanceof ArrayBuffer) {
-    var buf = new Buffer(data.byteLength);
+
+  if (!Buffer.isBuffer(packet.data)) {
+    var buf = new Buffer(packet.data.byteLength);
     for (var i = 0; i < buf.length; i++) {
-      buf[i] = data[i];
+      buf[i] = packet.data[i];
     }
     packet.data = buf;
   }