Merge pull request #47 from node-modules/fix-inner-class

fix: skip innerClass ref field like this$\d

Author: fengmk2

lib/v1/decoder.js

@@ -412,10 +412,13 @@ proto.readObject = function (withType) {
   while (label !== 'z') {
     this.byteBuffer.position(this.byteBuffer.position() - 1);
     key = this.read();
+    var value = this.read(withType);
+    label = this.byteBuffer.getChar();
     // property name will auto transfer to a String type.
     debug('read object prop: %j with type: %s', key, withType);
-    result.$[key] = this.read(withType);
-    label = this.byteBuffer.getChar();
+    if (!/^this\$\d+$/.test(key)) {
+      result.$[key] = value;
+    }
   }
   debug('read object finish');
 

lib/v2/decoder.js

@@ -560,7 +560,6 @@ proto._readObjectDefinition = function () {
 proto.readObject = function (withType) {
   var code = this.byteBuffer.get();
   var ref;
-
   if (code === 0x43) {
     // C(x43) type fields-length(writeInt) fields-names(writeString) o ref fields-values(write)
     this._readObjectDefinition();
@@ -572,7 +571,7 @@ proto.readObject = function (withType) {
   } else {
     this.throwError('readObject', code);
   }
-
+  
   var cls = this.classes[ref];
   debug('readObject %s, ref: %s', cls.name, ref);
 
@@ -585,7 +584,10 @@ proto.readObject = function (withType) {
   var fields = cls.fields;
   for (var i = 0; i < fields.length; i++) {
     var name = fields[i];
-    result.$[name] = this.read(withType);
+    var value = this.read(withType);
+    if (!/^this\$\d+$/.test(name)) {
+      result.$[name] = value;
+    }
   }
 
   if (/Exception$/.test(cls.name)) {

test/decode.circular.test.js

@@ -0,0 +1,37 @@
+/**!
+ * hessian.js - test/decode.circular.test.js
+ *
+ * Copyright(c) 2015
+ *
+ * Authors:
+ *   tangyao <tangyao@alipay.com> (http://tangyao.me/)
+ */
+
+'use strict';
+
+/**
+ * Module dependencies.
+ */
+
+var should = require('should');
+var hessian = require('../');
+var utils = require('./utils');
+
+describe('test/decode.circular.test.js', function () {
+
+  it('v1 decode()', function () {
+    var data = new Buffer([77, 116, 0, 49, 99, 111, 109, 46, 97, 108, 105, 112, 97, 121, 46, 99, 111, 110, 102, 105, 103, 115, 101, 114, 118, 101, 114, 46, 99, 111, 110, 102, 114, 101, 103, 95, 116, 101, 115, 116, 46, 79, 110, 108, 105, 110, 101, 77, 111, 100, 117, 108, 101, 83, 0, 6, 109, 111, 100, 117, 108, 101, 83, 0, 1, 97, 83, 0, 4, 100, 101, 115, 99, 83, 0, 1, 98, 83, 0, 8, 118, 101, 114, 115, 105, 111, 110, 115, 86, 108, 0, 0, 0, 1, 77, 116, 0, 57, 99, 111, 109, 46, 97, 108, 105, 112, 97, 121, 46, 99, 111, 110, 102, 105, 103, 115, 101, 114, 118, 101, 114, 46, 99, 111, 110, 102, 114, 101, 103, 95, 116, 101, 115, 116, 46, 79, 110, 108, 105, 110, 101, 77, 111, 100, 117, 108, 101, 36, 86, 101, 114, 115, 105, 111, 110, 83, 0, 7, 118, 101, 114, 115, 105, 111, 110, 83, 0, 1, 99, 83, 0, 6, 97, 115, 115, 101, 116, 115, 86, 108, 0, 0, 0, 1, 83, 0, 1, 105, 122, 83, 0, 6, 116, 104, 105, 115, 36, 48, 82, 0, 0, 0, 0, 122, 122, 122]);
+    var rs = hessian.decode(data);
+    JSON.stringify(rs).should.eql('{"module":"a","desc":"b","versions":[{"version":"c","assets":["i"]}]}');
+  });
+  
+
+  it('v2 decode()', function () {
+    var javabuf = utils.bytes('v2/object/ConnectionRequest');
+    var connreq1 = hessian.decode(javabuf, '2.0');
+    connreq1.should.have.keys('ctx');
+    connreq1.ctx.should.have.keys('id');
+    JSON.stringify(connreq1).should.eql('{"ctx":{"id":101}}');
+  });
+
+});

test/object.test.js

@@ -60,29 +60,32 @@ describe('object.test.js', function () {
     it('should decode and encode ConnectionRequest', function () {
       var javabuf = utils.bytes('v1/object/ConnectionRequest');
       var connreq = hessian.decode(javabuf, '1.0', true);
-
       var jsconnreq = {
         $class: 'hessian.ConnectionRequest',
         $: {
           ctx: {
             $class: 'hessian.ConnectionRequest$RequestContext',
             $: {
-              id: 101,
-              'this$0': null
+              id: {
+                $class: 'int',
+                $: 101
+              },
+              // 'this$0': null
             }
           }
         }
       };
 
-      jsconnreq.$.ctx.$.this$0 = jsconnreq;
-
+      // jsconnreq.$.ctx.$.this$0 = jsconnreq;
+      connreq.should.eql(jsconnreq);
       var jsbuf = hessian.encode(connreq, '1.0');
       var jsbuf2 = hessian.encode(jsconnreq, '1.0');
-      jsbuf2.should.length(javabuf.length);
-      jsbuf2.should.eql(javabuf);
+      // because of skip field this$0, the length of course not eql.
+      // jsbuf2.should.length(javabuf.length);
+      // jsbuf2.should.eql(javabuf);
 
-      jsbuf.should.length(javabuf.length);
-      jsbuf.should.eql(javabuf);
+      // jsbuf.should.length(javabuf.length);
+      // jsbuf.should.eql(javabuf);
 
       var jsbuf2Again = hessian.encode(jsconnreq, '1.0');
       jsbuf2Again.should.eql(jsbuf2);
@@ -389,7 +392,7 @@ describe('object.test.js', function () {
       var javabuf = utils.bytes('v2/object/ConnectionRequest');
       var connreq1 = hessian.decode(javabuf, '2.0');
       connreq1.should.have.keys('ctx');
-      connreq1.ctx.should.have.keys('id', 'this$0');
+      connreq1.ctx.should.have.keys('id'); // 'this$0'
       connreq1.ctx.id.should.equal(101);
 
       var connreq = hessian.decode(javabuf, '2.0', true);
@@ -400,21 +403,21 @@ describe('object.test.js', function () {
             $class: 'hessian.ConnectionRequest$RequestContext',
             $: {
               id: 101,
-              'this$0': null
+              // 'this$0': null
             }
           }
         }
       };
 
-      jsconnreq.$.ctx.$.this$0 = jsconnreq;
-
+      // jsconnreq.$.ctx.$.this$0 = jsconnreq;
+      jsconnreq.should.eql(connreq);
       var jsbuf = hessian.encode(connreq, '2.0');
       var jsbuf2 = hessian.encode(jsconnreq, '2.0');
-      jsbuf2.should.length(javabuf.length);
-      jsbuf2.should.eql(javabuf);
+      // jsbuf2.should.length(javabuf.length);
+      // jsbuf2.should.eql(javabuf);
 
-      jsbuf.should.length(javabuf.length);
-      jsbuf.should.eql(javabuf);
+      // jsbuf.should.length(javabuf.length);
+      // jsbuf.should.eql(javabuf);
     });
 
     it('should decode hessian 1.0 ConnectionRequest', function () {