fix: support writeLong parameter is a Long object (#96)

Author: gxcsoccer

.autod.conf.js

@@ -0,0 +1,18 @@
+'use strict';
+
+module.exports = {
+  write: true,
+  prefix: '^',
+  devprefix: '^',
+  exclude: [],
+  devdep: [
+    'autod',
+    'mm',
+    'jshint',
+    'mocha',
+    'istanbul',
+  ],
+  semver: [
+    'mocha@3',
+  ],
+};

lib/v2/encoder.js

@@ -17,9 +17,10 @@
 var debug = require('debug')('hessian:v2:encoder');
 var is = require('is-type-of');
 var util = require('util');
-var EncoderV1 = require('../v1/encoder');
-var javaObject = require('../object');
+var Long = require('long');
 var utility = require('utility');
+var javaObject = require('../object');
+var EncoderV1 = require('../v1/encoder');
 var supportES6Map = require('../utils').supportES6Map;
 
 function Encoder(options) {
@@ -142,23 +143,35 @@ proto.writeInt = function (val) {
  * ```
  */
 proto.writeLong = function (val) {
-  if (typeof val !== 'number' && utility.isSafeNumberString(val)) {
-    val = Number(val);
+  if (typeof val === 'string') {
+    if (!utility.isSafeNumberString(val)) {
+      val = Long.fromString(val);
+    } else {
+      val = Number(val);
+    }
+  } else if (Long.isLong(val) && (val.high === 0 || val.high === -1)) {
+    val = val.toNumber();
   }
 
-  if (val >= -8 && val <= 15) {
-    this.byteBuffer.put(val + 0xe0);
-  } else if (val >= -2048 && val <= 2047) {
-    var b0 = val & 0xff;
-    var code = (val >> 8) + 0xf8;
-    this.byteBuffer.put(code).put(b0);
-  } else if (val >= -262144 && val <= 262143) {
-    var b1b0 = val & 0xffff;
-    var code = (val >> 16) + 0x3c;
-    this.byteBuffer.put(code).putUInt16(b1b0);
-  } else if (val >= -0x80000000 && val <= 0x7fffffff) {
-    // 32-bit integer cast to long
-    this.byteBuffer.put(0x59).putInt32(val);
+  if (typeof val === 'number') {
+    if (val >= -8 && val <= 15) {
+      this.byteBuffer.put(val + 0xe0);
+    } else if (val >= -2048 && val <= 2047) {
+      var b0 = val & 0xff;
+      var code = (val >> 8) + 0xf8;
+      this.byteBuffer.put(code).put(b0);
+    } else if (val >= -262144 && val <= 262143) {
+      var b1b0 = val & 0xffff;
+      var code = (val >> 16) + 0x3c;
+      this.byteBuffer.put(code).putUInt16(b1b0);
+    } else if (val >= -0x80000000 && val <= 0x7fffffff) {
+      // 32-bit integer cast to long
+      this.byteBuffer.put(0x59).putInt32(val);
+    } else {
+      this.byteBuffer
+        .put(0x4c) // 'L'
+        .putLong(val);
+    }
   } else {
     this.byteBuffer
       .put(0x4c) // 'L'

package.json

@@ -12,7 +12,7 @@
     "test-cov": "istanbul cover _mocha -- -t 15000 test/*.test.js",
     "lint": "jshint .",
     "ci": "npm run lint && npm run test-cov",
-    "autod": "autod -w --prefix '~' -e benchmark",
+    "autod": "autod",
     "benchmark": "node benchmark/encode.js && node benchmark/decode.js"
   },
   "repository": {
@@ -34,20 +34,21 @@
   },
   "homepage": "https://github.com/node-modules/hessian.js",
   "dependencies": {
-    "byte": "^1.1.6",
-    "debug": "^2.6.8",
-    "is-type-of": "^1.1.0",
+    "byte": "^1.3.0",
+    "debug": "^3.1.0",
+    "is-type-of": "^1.2.0",
     "long": "^3.2.0",
-    "utility": "^1.12.0"
+    "utility": "^1.13.1"
   },
   "devDependencies": {
-    "autod": "*",
-    "beautify-benchmark": "*",
-    "benchmark": "*",
-    "istanbul": "*",
-    "js-to-java": "2",
-    "jshint": "*",
-    "mocha": "2"
+    "autod": "^3.0.1",
+    "beautify-benchmark": "^0.2.4",
+    "benchmark": "^2.1.4",
+    "istanbul": "^0.4.5",
+    "js-to-java": "^2.4.0",
+    "jshint": "^2.9.5",
+    "mm": "^2.2.0",
+    "mocha": "^3.5.3"
   },
   "engines": {
     "node": ">= 0.12.0"

test/long.test.js

@@ -49,6 +49,15 @@ describe('long.test.js', function () {
   });
 
   it('should write and read equal java impl', function () {
+    assert.deepEqual(hessian.encode(java.long(Long.fromNumber(15)), '2.0'), utils.bytes('v2/long/15'));
+    assert.deepEqual(hessian.encode(java.long(Long.fromNumber(-8)), '2.0'), utils.bytes('v2/long/-8'));
+    assert.deepEqual(hessian.encode(java.long(Long.fromNumber(-2048)), '2.0'), utils.bytes('v2/long/-2048'));
+    assert.deepEqual(hessian.encode(java.long(Long.fromNumber(2047)), '2.0'), utils.bytes('v2/long/2047'));
+    assert.deepEqual(hessian.encode(java.long(Long.fromNumber(-262144)), '2.0'), utils.bytes('v2/long/-262144'));
+    assert.deepEqual(hessian.encode(java.long(Long.fromNumber(262143)), '2.0'), utils.bytes('v2/long/262143'));
+    assert.deepEqual(hessian.encode(java.long(Long.fromNumber(-2147483648)), '2.0'), utils.bytes('v2/long/-2147483648'));
+    assert.deepEqual(hessian.encode(java.long(Long.fromNumber(2147483647)), '2.0'), utils.bytes('v2/long/2147483647'));
+
     assert.deepEqual(hessian.encode(java.long(0), '1.0'), utils.bytes('v1/long/0'));
     assert(hessian.decode(utils.bytes('v1/long/0')) === 0);
     assert.deepEqual(hessian.encode(java.long(-8), '1.0'), utils.bytes('v1/long/-8'));