Merge pull request #654 from JacksonTian/concat

Use Buffer.concat() instead of private concatBuffers method

Author: 3rd-Eden

lib/BufferUtil.fallback.js

@@ -4,7 +4,7 @@
  * MIT Licensed
  */
 
-module.exports.BufferUtil = {
+exports.BufferUtil = {
   merge: function(mergedBuffer, buffers) {
     var offset = 0;
     for (var i = 0, l = buffers.length; i < l; ++i) {

lib/Receiver.js

@@ -307,20 +307,6 @@ Receiver.prototype.unmask = function (mask, buf, binary) {
   return buf != null ? buf.toString('utf8') : '';
 };
 
-/**
- * Concatenates a list of buffers.
- *
- * @api private
- */
-
-Receiver.prototype.concatBuffers = function(buffers) {
-  var length = 0;
-  for (var i = 0, l = buffers.length; i < l; ++i) length += buffers[i].length;
-  var mergedBuffer = new Buffer(length);
-  bufferUtil.merge(mergedBuffer, buffers);
-  return mergedBuffer;
-};
-
 /**
  * Handles an error
  *
@@ -539,7 +525,7 @@ var opcodes = {
             self.currentMessageLength += buffer.length;
           }
           if (state.lastFragment) {
-            var messageBuffer = self.concatBuffers(self.currentMessage);
+            var messageBuffer = Buffer.concat(self.currentMessage);
             self.currentMessage = [];
             self.currentMessageLength = 0;
             if (!Validation.isValidUTF8(messageBuffer)) {
@@ -635,7 +621,7 @@ var opcodes = {
             self.currentMessageLength += buffer.length;
           }
           if (state.lastFragment) {
-            var messageBuffer = self.concatBuffers(self.currentMessage);
+            var messageBuffer = Buffer.concat(self.currentMessage);
             self.currentMessage = [];
             self.currentMessageLength = 0;
             self.onbinary(messageBuffer, {masked: state.masked, buffer: messageBuffer});

lib/Validation.fallback.js

@@ -3,10 +3,9 @@
  * Copyright(c) 2011 Einar Otto Stangvik <[email protected]>
  * MIT Licensed
  */
- 
-module.exports.Validation = {
+
+exports.Validation = {
   isValidUTF8: function(buffer) {
     return true;
   }
 };
-