Buffer support for LengthCodedString

felixge · felixge · commit de433142e70f · 2011-12-30T16:07:55.000+01:00
diff --git a/lib/protocol/types/LengthCodedBinary.js b/lib/protocol/types/LengthCodedBinary.js
@@ -25,23 +25,21 @@ var IEEE_754_BINARY_64_PRECISION = Math.pow(2, 53);
 module.exports = LengthCodedBinary;
 function LengthCodedBinary(value) {
   this.value  = value;
-
-  if (value === null || value <= 250) {
-    this.length = 1;
-  } else if (value <= BIT_16) {
-    this.length = 3;
-  } else if (value <= BIT_24) {
-    this.length = 4;
-  } else if (value < IEEE_754_BINARY_64_PRECISION) {
-    this.length = 9;
-  } else {
-    throw new Error(
-      'LengthCodedBinary.SizeExceeded: JS precision range exceeded, your ' +
-      'number is > 53 bit.'
-    );
-  }
+  this.length = LengthCodedBinary.byteLength(value);
 }
 
+LengthCodedBinary.byteLength = function(value) {
+  if (value === null || value <= 250) return 1;
+  if (value <= BIT_16) return 3;
+  if (value <= BIT_24) return 4;
+  if (value < IEEE_754_BINARY_64_PRECISION) return 9;
+
+  throw new Error(
+    'LengthCodedBinary.SizeExceeded: JS precision range exceeded, your ' +
+    'number is > 53 bit: "' + value + '"'
+  );
+};
+
 LengthCodedBinary.prototype.copy = function(buffer, offset) {
   // Optimization: Reduce property lookups
   var value = this.value;
diff --git a/lib/protocol/types/LengthCodedString.js b/lib/protocol/types/LengthCodedString.js
@@ -13,7 +13,9 @@ var LengthCodedBinary = require('./LengthCodedBinary');
 module.exports = LengthCodedString;
 function LengthCodedString(value) {
   this.value  = value;
-  this.length = Buffer.byteLength(value, 'utf-8');
+  this.length = (Buffer.isBuffer(value))
+    ? value.length
+    : Buffer.byteLength(value, 'utf-8');
 
   this._lengthCodedBinary = new LengthCodedBinary(this.length);
   this.length = this._lengthCodedBinary.length + this.length;
@@ -24,5 +26,9 @@ LengthCodedString.prototype.copy = function(buffer, offset) {
 
   offset += this._lengthCodedBinary.length;
 
-  buffer.write(this.value, offset, 'utf-8');
+  if (Buffer.isBuffer(this.value)) {
+    this.value.copy(buffer, offset);
+  } else {
+    buffer.write(this.value, offset, 'utf-8');
+  }
 };
diff --git a/test/unit/protocol/types/test-LengthCodedString.js b/test/unit/protocol/types/test-LengthCodedString.js
@@ -18,6 +18,15 @@ test('LengthCodedString', {
     assert.equal(lengthCodedInteger.length, 4);
   },
 
+  'Buffer "ab"': function() {
+    var lengthCodedInteger = new LengthCodedString(new Buffer('ab'));
+    var buffer             = new Buffer(lengthCodedInteger.length);
+
+    lengthCodedInteger.copy(buffer, 0);
+
+    assert.deepEqual(buffer, new Buffer([0x02, 0x61, 0x62]));
+  },
+
   'offset': function() {
     var lengthCodedInteger = new LengthCodedString('ab');
     var buffer             = new Buffer([0, 0, 0, 0]);
