decode int with type

Author: 余化

lib/v2/decoder.js

@@ -93,31 +93,31 @@ utils.addByteCodes(BYTE_CODES, [
  * @return {Number}
  * @api public
  */
-proto.readInt = function () {
+proto.readInt = function (withType) {
   var code = this.byteBuffer.get();
+  var val;
   // Compact int
   if (code >= 0x80 && code <= 0xbf) {
     // Integers between -16 and 47 can be encoded by a single octet in the range x80 to xbf.
     // value = code - 0x90
-    return code - 0x90;
-  }
-  if (code >= 0xc0 && code <= 0xcf) {
+    val = code - 0x90;
+  } else if (code >= 0xc0 && code <= 0xcf) {
     // Integers between -2048 and 2047 can be encoded in two octets with the leading byte in the range xc0 to xcf.
     // value = ((code - 0xc8) << 8) + b0;
-    return ((code - 0xc8) << 8) + this.byteBuffer.get();
-  }
-  if (code >= 0xd0 && code <= 0xd7) {
+    val = ((code - 0xc8) << 8) + this.byteBuffer.get();
+  } else if (code >= 0xd0 && code <= 0xd7) {
     // Integers between -262144 and 262143 can be encoded in three bytes with the leading byte in the range xd0 to xd7.
     // value = ((code - 0xd4) << 16) + (b1 << 8) + b0;
     var b1 = this.byteBuffer.get();
     var b0 = this.byteBuffer.get();
-    return ((code - 0xd4) << 16) + (b1 << 8) + b0;
-  }
-  if (code === 0x49) {
-    return this.byteBuffer.getInt();
+    val = ((code - 0xd4) << 16) + (b1 << 8) + b0;
+  } else if (code === 0x49) {
+    val = this.byteBuffer.getInt();
+  } else {
+    this.throwError('readInt', code);
   }
-
-  this.throwError('readInt', code);
+  
+  return this.handleType('int', val, withType);
 };
 
 utils.addByteCodes(BYTE_CODES, [

test/list.test.js

@@ -171,7 +171,7 @@ describe('list.test.js', function () {
       hessian.encode([1, 2, 'foo'], '2.0').should.eql(utils.bytes('v2/list/untyped_list'));
       hessian.encode([], '2.0').should.eql(utils.bytes('v2/list/untyped_[]'));
 
-      hessian.decode(utils.bytes('v2/list/untyped_list'), '2.0').should.eql([1, 2, 'foo']);
+      hessian.decode(utils.bytes('v2/list/untyped_list'), '2.0').should.eql([ { $: 1, $class: 'int' }, { $: 2, $class: 'int' }, 'foo' ]);
       hessian.decode(utils.bytes('v2/list/untyped_list'), '2.0', true).should.eql([1, 2, 'foo']);
       hessian.decode(utils.bytes('v2/list/untyped_list_8'), '2.0').should.eql(['1', '2', '3', '4', '5', '6', '7', '8']);
       hessian.decode(utils.bytes('v2/list/untyped_list_8'), '2.0', true).should.eql(['1', '2', '3', '4', '5', '6', '7', '8']);