feat: remove debug and use byte@2 (#137)

fengmk2 · web-flow · commit 1eb3b3ed5193 · 2023-04-16T15:28:59.000+08:00
change test runner to egg-bin
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -15,4 +15,4 @@ jobs:
     uses: artusjs/github-actions/.github/workflows/node-test.yml@v1
     with:
       os: 'ubuntu-latest'
-      version: '8, 10, 12, 14, 16, 18'
+      version: '14, 16, 18'
diff --git a/AUTHORS b/AUTHORS
diff --git a/lib/utils.js b/lib/utils.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var debug = require('debug')('hessian.js:utils');
+var debug = require('util').debuglog('hessian.js:utils');
 var Long = require('long');
 var object = require('./object');
 
diff --git a/lib/v1/decoder.js b/lib/v1/decoder.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var debug = require('debug')('hessian:v1:decoder');
+var debug = require('util').debuglog('hessian:v1:decoder');
 var ByteBuffer = require('byte');
 var is = require('is-type-of');
 var utils = require('../utils');
diff --git a/lib/v1/encoder.js b/lib/v1/encoder.js
@@ -1,8 +1,8 @@
 'use strict';
 
+var debug = require('util').debuglog('hessian:v1:encoder');
 var utility = require('utility');
 var ByteBuffer = require('byte');
-var debug = require('debug')('hessian:v1:encoder');
 var utils = require('../utils');
 var javaObject = require('../object');
 var is = require('is-type-of');
diff --git a/lib/v2/decoder.js b/lib/v2/decoder.js
@@ -1,8 +1,8 @@
 'use strict';
 
+var debug = require('util').debuglog('hessian:v2:decoder');
 var util = require('util');
 var is = require('is-type-of');
-var debug = require('debug')('hessian:v2:decoder');
 var DecoderV1 = require('../v1/decoder');
 var utils = require('../utils');
 var handle = require('../custom_handler').handle;
diff --git a/lib/v2/encoder.js b/lib/v2/encoder.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var debug = require('debug')('hessian:v2:encoder');
+var debug = require('util').debuglog('hessian:v2:encoder');
 var is = require('is-type-of');
 var util = require('util');
 var Long = require('long');
diff --git a/lib/v2_optimize/encoder.js b/lib/v2_optimize/encoder.js
@@ -1,6 +1,5 @@
 'use strict';
 
-var debug = require('debug')('hessian:v2_optimize:encoder');
 var util = require('util');
 var EncoderV2 = require('../v2/encoder');
 var EncoderV1 = require('../v1/encoder');
diff --git a/package.json b/package.json
@@ -8,8 +8,8 @@
     "lib"
   ],
   "scripts": {
-    "test": "mocha -R spec -t 15000 test/*.test.js",
-    "test-cov": "istanbul cover _mocha -- -t 15000 test/*.test.js",
+    "test": "egg-bin test",
+    "test-cov": "egg-bin cov",
     "lint": "jshint .",
     "ci": "npm run lint && npm run test-cov",
     "benchmark": "node benchmark/encode.js && node benchmark/decode.js"
@@ -33,21 +33,17 @@
   },
   "homepage": "https://github.com/node-modules/hessian.js",
   "dependencies": {
-    "byte": "^1.4.1",
-    "debug": "^3.2.6",
+    "byte": "^2.0.0",
     "is-type-of": "^1.2.1",
     "long": "^4.0.0",
     "utility": "^1.16.1"
   },
   "devDependencies": {
-    "autod": "^3.1.0",
     "beautify-benchmark": "^0.2.4",
     "benchmark": "^2.1.4",
-    "istanbul": "^0.4.5",
+    "egg-bin": "^6.3.0",
     "js-to-java": "^2.6.1",
-    "jshint": "^2.10.2",
-    "mm": "^2.5.0",
-    "mocha": "^3.5.3"
+    "jshint": "^2.10.2"
   },
   "engines": {
     "node": ">= 0.12.0"
diff --git a/test/array.test.js b/test/array.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
-var assert = require('assert');
-var hessian = require('../');
+const assert = require('assert');
+const hessian = require('..');
 
 describe('array.test.js', function () {
   it('should write null v1', function () {
diff --git a/test/binary.test.js b/test/binary.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
-var assert = require('assert');
-var hessian = require('../');
-var utils = require('./utils');
+const assert = require('assert');
+const hessian = require('..');
+const utils = require('./utils');
 
 describe('binary.test.js', function () {
   it('should read "foo" binary', function () {
diff --git a/test/boolean.test.js b/test/boolean.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
-var assert = require('assert');
-var hessian = require('../');
+const assert = require('assert');
+const hessian = require('..');
 
 describe('boolean.test.js', function () {
   it('should read true and false', function () {
diff --git a/test/convert.test.js b/test/convert.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
-var assert = require('assert');
-var hessian = require('../');
-var java = require('js-to-java');
+const assert = require('assert');
+const java = require('js-to-java');
+const hessian = require('..');
 
 describe('test/convert.test.js', function() {
   [
diff --git a/test/custom_handler.test.js b/test/custom_handler.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
-var assert = require('assert');
-var hessian = require('../');
-var supportES6Map = require('../lib/utils').supportES6Map;
+const assert = require('assert');
+const hessian = require('..');
+const supportES6Map = require('../lib/utils').supportES6Map;
 
 describe('utils.test.js', function () {
   describe('v1.0', function () {
diff --git a/test/date.test.js b/test/date.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
-var assert = require('assert');
-var hessian = require('../');
-var utils = require('./utils');
+const assert = require('assert');
+const hessian = require('..');
+const utils = require('./utils');
 
 describe('date.test.js', function () {
   var dateBuffer = new Buffer(['d'.charCodeAt(0), 0x00, 0x00, 0x00, 0xd0, 0x4b, 0x92, 0x84, 0xb8]);
diff --git a/test/decode.circular.test.js b/test/decode.circular.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
-var assert = require('assert');
-var hessian = require('../');
-var utils = require('./utils');
+const assert = require('assert');
+const hessian = require('..');
+const utils = require('./utils');
 
 describe('test/decode.circular.test.js', function () {
 
diff --git a/test/double.test.js b/test/double.test.js
@@ -1,9 +1,9 @@
 'use strict';
 
-var assert = require('assert');
-var java = require('js-to-java');
-var hessian = require('../');
-var utils = require('./utils');
+const assert = require('assert');
+const java = require('js-to-java');
+const hessian = require('..');
+const utils = require('./utils');
 
 describe('double.test.js', function () {
   var doubleBuffer = new Buffer(['D'.charCodeAt(0),
diff --git a/test/exception.test.js b/test/exception.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
-var assert = require('assert');
-var hessian = require('../');
-var utils = require('./utils');
+const assert = require('assert');
+const hessian = require('..');
+const utils = require('./utils');
 
 describe('exception.test.js', function () {
   describe('v1.0', function () {
diff --git a/test/int.test.js b/test/int.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
-var assert = require('assert');
-var hessian = require('../');
-var utils = require('./utils');
+const assert = require('assert');
+const hessian = require('..');
+const utils = require('./utils');
 
 describe('int.test.js', function () {
   it('should read integer 300', function () {
diff --git a/test/list.test.js b/test/list.test.js
@@ -1,9 +1,9 @@
 'use strict';
 
-var assert = require('assert');
-var java = require('js-to-java');
-var hessian = require('../');
-var utils = require('./utils');
+const assert = require('assert');
+const java = require('js-to-java');
+const hessian = require('..');
+const utils = require('./utils');
 
 describe('list.test.js', function () {
   var intListBuffer = Buffer.concat([
diff --git a/test/long.test.js b/test/long.test.js
@@ -1,10 +1,10 @@
 'use strict';
 
-var assert = require('assert');
-var java = require('js-to-java');
-var Long = require('long');
-var hessian = require('../');
-var utils = require('./utils');
+const assert = require('assert');
+const java = require('js-to-java');
+const Long = require('long');
+const hessian = require('..');
+const utils = require('./utils');
 
 describe('long.test.js', function () {
   var longBuffer = new Buffer(['L'.charCodeAt(0), 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x2c]);
diff --git a/test/map.test.js b/test/map.test.js
@@ -1,9 +1,9 @@
 'use strict';
 
-var assert = require('assert');
-var hessian = require('../');
-var utils = require('./utils');
-var supportES6Map = require('../lib/utils').supportES6Map;
+const assert = require('assert');
+const hessian = require('..');
+const utils = require('./utils');
+const supportES6Map = require('../lib/utils').supportES6Map;
 
 describe('map.test.js', function() {
   it('should read Serialization of a Java Object', function() {
diff --git a/test/null.test.js b/test/null.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
-var assert = require('assert');
-var hessian = require('../');
+const assert = require('assert');
+const hessian = require('..');
 
 describe('null.test.js', function () {
   it('should read null', function () {
diff --git a/test/object.test.js b/test/object.test.js
@@ -1,9 +1,9 @@
 'use strict';
 
-var assert = require('assert');
-var hessian = require('../');
-var utils = require('./utils');
-var supportES6Map = require('../lib/utils').supportES6Map;
+const assert = require('assert');
+const hessian = require('..');
+const utils = require('./utils');
+const supportES6Map = require('../lib/utils').supportES6Map;
 
 describe('object.test.js', function () {
   describe('v1.0', function () {
diff --git a/test/string.test.js b/test/string.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
-var assert = require('assert');
-var hessian = require('../');
-var utils = require('./utils');
+const assert = require('assert');
+const hessian = require('..');
+const utils = require('./utils');
 
 describe('string.test.js', function () {
   var helloBuffer = Buffer.concat([new Buffer(['S'.charCodeAt(0), 0x00, 0x05]),
diff --git a/test/utils.test.js b/test/utils.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
-var assert = require('assert');
-var utils = require('../lib/utils');
+const assert = require('assert');
+const utils = require('../lib/utils');
 
 describe('utils.test.js', function () {
   describe('getSerializer()', function () {
diff --git a/test/v1.test.js b/test/v1.test.js
@@ -1,12 +1,12 @@
 'use strict';
 
-var assert = require('assert');
-var fs = require('fs');
-var path = require('path');
-var hessian = require('../');
-var Encoder = hessian.Encoder;
-var Decoder = hessian.Decoder;
-var utils = require('../lib/utils');
+const assert = require('assert');
+const fs = require('fs');
+const path = require('path');
+const hessian = require('..');
+const Encoder = hessian.Encoder;
+const Decoder = hessian.Decoder;
+const utils = require('../lib/utils');
 
 var encoder = new Encoder();
 var decoder = new Decoder();
@@ -40,7 +40,7 @@ describe('hessian v1', function () {
 
     it('should write and read false ok', function () {
       var buf = encoder.writeBool(false).get();
-      assert.deepEqual(buf, new Buffer('F'));
+      assert.deepEqual(buf, Buffer.from('F'));
 
       assert(decoder.init(buf).readBool() === false);
     });
@@ -208,15 +208,15 @@ describe('hessian v1', function () {
     it('should write and read small bytes ok', function () {
       var inputBuffer = new Buffer([1, 2, 3, 4, 5]);
       var buf = encoder.writeBytes(inputBuffer).get();
-      assert(buf.inspect() === '<Buffer 42 00 05 01 02 03 04 05>');
+      assert.equal(buf.inspect(), '<Buffer 42 00 05 01 02 03 04 05>');
       assert.deepEqual(decoder.init(buf).readBytes(), inputBuffer);
     });
 
     it('should write and read big bytes ok', function () {
       var inputBuffer = fixtureBytes;
       var inputLength = inputBuffer.length;
       var buf = encoder.writeBytes(inputBuffer).get();
-      assert(buf.length === inputLength +
+      assert.equal(buf.length, inputLength +
         Math.ceil(inputLength / utils.MAX_BYTE_TRUNK_SIZE) * 3);
       assert.deepEqual(decoder.init(buf).readBytes(), inputBuffer);
     });
@@ -235,12 +235,12 @@ describe('hessian v1', function () {
     });
 
     it('should bytes length equal MAX_BYTE_TRUNK_SIZE work', function () {
-      var oneTrunkBuf = new Buffer(utils.MAX_BYTE_TRUNK_SIZE);
+      var oneTrunkBuf = Buffer.alloc(utils.MAX_BYTE_TRUNK_SIZE);
       var buf = encoder.writeBytes(oneTrunkBuf).get();
       assert.deepEqual(decoder.init(buf).readBytes(), oneTrunkBuf);
 
       encoder.clean();
-      var twoTrunkBuf = new Buffer(utils.MAX_BYTE_TRUNK_SIZE * 2);
+      var twoTrunkBuf = Buffer.alloc(utils.MAX_BYTE_TRUNK_SIZE * 2);
       buf = encoder.writeBytes(twoTrunkBuf).get();
       assert.deepEqual(decoder.init(buf).readBytes(), twoTrunkBuf);
     });
@@ -280,7 +280,7 @@ describe('hessian v1', function () {
       var inputStr = fixtureString;
       var inputStrLength = inputStr.length;
       var buf = encoder.writeString(inputStr).get();
-      assert(buf.length === new Buffer(inputStr).length +
+      assert.equal(buf.length, Buffer.from(inputStr).length +
         Math.ceil(inputStrLength / utils.MAX_CHAR_TRUNK_SIZE) * 3);
       assert(decoder.init(buf).readString() === inputStr);
     });
diff --git a/test/v2.decode.cache.test.js b/test/v2.decode.cache.test.js
@@ -1,11 +1,11 @@
 'use strict';
 
-var assert = require('assert');
-var hessian = require('../');
-var utils = require('./utils');
-var supportES6Map = require('../lib/utils').supportES6Map;
+const assert = require('assert');
+const hessian = require('..');
+const utils = require('./utils');
+const supportES6Map = require('../lib/utils').supportES6Map;
 
-var cache = new Map();
+const cache = new Map();
 
 describe('v2.decode.cache.test.js', function () {
   var decode = hessian.decode;
diff --git a/test/v2.list.encode.test.js b/test/v2.list.encode.test.js
diff --git a/test/v2.optimize.endecode.test.js b/test/v2.optimize.endecode.test.js
