feat: support java.util.HashMap to es6 Map (#70)

Author: gxcsoccer

.travis.yml

@@ -3,11 +3,7 @@ language: node_js
 node_js:
   - '5'
   - '4'
-  - '3'
-  - '2'
-  - '1'
   - '0.12'
-  - '0.10'
 script:
   - "npm run ci"
 after_script:

lib/object.js

@@ -1,6 +1,6 @@
-/**!
+/**
  * hessian.js - lib/object.js
- * Copyright(c) 2014
+ * Copyright(c)
  * MIT Licensed
  *
  * Authors:

lib/utils.js

@@ -1,6 +1,6 @@
-/**!
+/**
  * hessian.js - lib/utils.js
- * Copyright(c) 2014
+ * Copyright(c)
  * MIT Licensed
  *
  * Authors:
@@ -19,6 +19,9 @@ var MIN_SAFE_INT = Long.fromNumber(1 - Math.pow(2, 53));
 var MAX_BYTE_TRUNK_SIZE = exports.MAX_BYTE_TRUNK_SIZE = 0x8000;
 var MAX_CHAR_TRUNK_SIZE = exports.MAX_CHAR_TRUNK_SIZE = 0x8000;
 
+// Map feature detect
+exports.supportES6Map = typeof Map === 'function' && typeof Map.prototype.forEach === 'function';
+
 exports.getSerializer = function (type) {
   // get from SERIALIZER_MAP
   if (object.SERIALIZER_MAP[type]) {

lib/v1/decoder.js

@@ -1,6 +1,6 @@
-/**!
+/**
  * hessian.js - lib/v1/decoder.js
- * Copyright(c) 2014
+ * Copyright(c)
  * MIT Licensed
  *
  * Authors:
@@ -16,6 +16,7 @@ var is = require('is-type-of');
 var utils = require('../utils');
 var object = require('../object');
 var JavaExceptionError = object.JavaExceptionError;
+var supportES6Map = require('../utils').supportES6Map;
 
 var BYTE_CODES = {};
 
@@ -402,12 +403,22 @@ proto.readObject = function (withType) {
     $class: type,
     $: {}
   };
+  var isMap = (type.indexOf(object.DEFAULT_CLASSNAME.map) === 0 ||
+    type.indexOf(object.DEFAULT_CLASSNAME.iMap) === 0) && supportES6Map;
+
+  if (isMap) {
+    Object.defineProperty(result.$, '$map', {
+      value: new Map(),
+      enumerable: false,
+    });
+  }
 
   this._addRef(result);
 
   // get
   var label = this.byteBuffer.getChar();
   var key;
+  var t;
 
   while (label !== 'z') {
     this.byteBuffer.position(this.byteBuffer.position() - 1);
@@ -416,9 +427,13 @@ proto.readObject = function (withType) {
     label = this.byteBuffer.getChar();
     // property name will auto transfer to a String type.
     debug('read object prop: %j with type: %s', key, withType);
-    if (!/^this\$\d+$/.test(key)) {
+    t = typeof key;
+    if ((t === 'string' || t === 'number') && !/^this\$\d+$/.test(key)) {
       result.$[key] = value;
     }
+    if (isMap) {
+      result.$.$map.set(key, value);
+    }
   }
   debug('read object finish');
 

lib/v1/encoder.js

@@ -1,6 +1,6 @@
-/**!
+/**
  * hessian.js - lib/encoder.js
- * Copyright(c) 2014
+ * Copyright(c)
  * MIT Licensed
  *
  * Authors:
@@ -15,8 +15,7 @@ var debug = require('debug')('hessian:v1:encoder');
 var utils = require('../utils');
 var javaObject = require('../object');
 var is = require('is-type-of');
-
-var SUPPORT_ES6_MAP = typeof Map === 'function' && typeof Map.prototype.forEach === 'function';
+var supportES6Map = require('../utils').supportES6Map;
 
 function Encoder(options) {
   options = options || {};
@@ -265,7 +264,7 @@ proto._writeHashMap = function (obj) {
   // hashmap's type is null
   this.writeType('');
 
-  if (SUPPORT_ES6_MAP && obj instanceof Map) {
+  if (supportES6Map && obj instanceof Map) {
     obj.forEach(function (value, key) {
       this.write(key);
       this.write(value);

lib/v2/decoder.js

@@ -1,7 +1,7 @@
-/**!
+/**
  * hessian.js - lib/v2/decoder.js
  *
- * Copyright(c) 2014
+ * Copyright(c)
  * MIT Licensed
  *
  * Authors:
@@ -19,6 +19,7 @@ var debug = require('debug')('hessian:v2:decoder');
 var DecoderV1 = require('../v1/decoder');
 var utils = require('../utils');
 var JavaExceptionError = require('../object').JavaExceptionError;
+var supportES6Map = require('../utils').supportES6Map;
 
 var BYTE_CODES = {};
 
@@ -714,13 +715,30 @@ utils.addByteCodes(BYTE_CODES, [
 proto._readMap = function (map, withType) {
   var code = this.byteBuffer.get(this.byteBuffer.position());
   map = map || {};
+
+  if (supportES6Map) {
+    Object.defineProperty(map, '$map', {
+      value: new Map(),
+      enumerable: false,
+    });
+  }
+
   var k;
   var v;
+  var t;
   // Z(0x5a) list/map terminator
   while (code !== 0x5a) {
     k = this.read(withType);
     v = this.read(withType);
-    map[k] = v;
+    t = typeof k;
+
+    if (t === 'string' || t === 'number') {
+      map[k] = v;
+    }
+    if (supportES6Map) {
+      map.$map.set(k, v);
+    }
+
     code = this.byteBuffer.get(this.byteBuffer.position());
   }
 

lib/v2/encoder.js

@@ -1,7 +1,7 @@
-/**!
+/**
  * hessian.js - lib/v2/encoder.js
  *
- * Copyright(c) 2014
+ * Copyright(c)
  * MIT Licensed
  *
  * Authors:
@@ -20,8 +20,7 @@ var util = require('util');
 var EncoderV1 = require('../v1/encoder');
 var javaObject = require('../object');
 var utility = require('utility');
-
-var SUPPORT_ES6_MAP = typeof Map === 'function' && typeof Map.prototype.forEach === 'function';
+var supportES6Map = require('../utils').supportES6Map;
 
 function Encoder(options) {
   EncoderV1.call(this, options);
@@ -584,7 +583,7 @@ proto._writeHashMap = function (obj) {
 
   this.byteBuffer.put(0x48); // H
 
-  if (SUPPORT_ES6_MAP && obj instanceof Map) {
+  if (supportES6Map && obj instanceof Map) {
     obj.forEach(function (value, key) {
       this.write(key);
       this.write(value);

package.json

@@ -48,9 +48,9 @@
     "js-to-java": "2",
     "jshint": "*",
     "mocha": "*",
-    "should": "5"
+    "should": "10"
   },
   "engines": {
-    "node": ">= 0.10.0"
+    "node": ">= 0.12.0"
   }
 }

test/array.test.js

@@ -1,4 +1,4 @@
-/**!
+/**
  * Copyright(c) node-modules and other contributors.
  * MIT Licensed
  *

test/binary.test.js

@@ -1,7 +1,7 @@
-/*!
+/*
  * hessian.js - test/binary.test.js
  *
- * Copyright(c) 2014
+ * Copyright(c)
  * MIT Licensed
  *
  * Authors: