refactor: use long to instead of bignum (#2)

BoogeeDoo · Jul 21, 2020 · 86566ea · 86566ea
1 parent ca5efa3
commit 86566ea
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,9 @@
 language: node_js
 node_js:
-  - "0.10"
-  - "0.12"
-  - "4.2"
+  - "4"
+  - "6"
+  - "8"
+  - "10"
 
 install:
   - export CXX="g++-4.8" CXX="gcc-4.8"

diff --git a/lib/base_tag.js b/lib/base_tag.js
@@ -4,7 +4,7 @@
  * Copyright (c) 2015 XadillaX' Gensokyo, all rights
  * reserved
  */
-var Bignum = require("bignum");
+var Long = require("long");
 var util = require("util");
 var TAG_TYPE_OFFSET = 1;
 var _tagIds;
@@ -181,7 +181,7 @@ BaseTag.prototype.toJSON = function() {
         return val;
     }
 
-    if(val instanceof Bignum) {
+    if(val instanceof Long) {
         return val;
     }
 

diff --git a/lib/tags/long.js b/lib/tags/long.js
@@ -6,7 +6,7 @@
  */
 var BaseTag = require("../base_tag");
 var util = require("util");
-var bignum = require("bignum");
+var Long = require("long");
 
 var TAGLong = function() {
     BaseTag.call(this);
@@ -17,20 +17,23 @@ util.inherits(TAGLong, BaseTag);
 
 TAGLong.prototype._readBodyFromBuffer = function(buff, offset) {
     var sliced = buff.slice(offset, offset + 8);
-    this.value = bignum.fromBuffer(sliced, { size: 8 });
+    this.value = Long.fromBytesBE(sliced, true);
     return 8;
 };
 
 TAGLong.prototype.calcBufferLength = BaseTag._returnSize(8);
 
 TAGLong.prototype.writeBuffer = function(buff, offset) {
-    this.value.toBuffer({ endian: "big", size: 8 }).copy(buff, offset);
+    var bytes = this.value.toBytesBE();
+    for(var i = 0, j = offset; i < 8; i++, j++) {
+        buff.writeUInt8(bytes[i], j);
+    }
     return 8;
 };
 
 var _longBound = {
-    min: bignum("-9223372036854775808"),
-    max: bignum("9223372036854775807")
+    min: Long.fromString("-9223372036854775808"),
+    max: Long.fromString("9223372036854775807")
 };
 
 TAGLong.prototype.toJSON = function() {
@@ -40,18 +43,18 @@ TAGLong.prototype.toJSON = function() {
 TAGLong.prototype.setValue = function(value) {
     var temp = -1;
     if(typeof value === "string") {
-        temp = bignum(value);
-    } else if(value instanceof bignum) {
-        temp = value;
+        temp = new Long(value);
+    } else if(value instanceof Long) {
+        temp = Long.fromString(value.toString());
     } else if(typeof value === "number" && !isNaN(value)) {
-        temp = bignum(value);
+        temp = Long.fromNumber(value);
     }
 
     if(-1 === temp) {
         throw new Error("Wrong type to set TAG_Long's value.");
     }
 
-    if(temp.lt(_longBound.min) || temp.gt(_longBound.max)) {
+    if(temp.lessThan(_longBound.min) || temp.greaterThan(_longBound.max)) {
         throw new Error("Value of TAG_Long should between " +
                         "-9223372036854775808 and 9223372036854775807");
     }

diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
   },
   "homepage": "https://github.com/XadillaX/mcnbt",
   "dependencies": {
-    "bignum": "^0.11.0"
+    "long": "^4.0.0"
   },
   "devDependencies": {
     "coveralls": "^2.11.4",

diff --git a/test/archive.js b/test/archive.js
@@ -6,7 +6,7 @@
  */
 "use strict";
 
-var bignum = require("bignum");
+var Long = require("long");
 var fs = require("fs");
 var util = require("util");
 
@@ -62,10 +62,12 @@ describe("Real archive test", function() {
                 if(typeof result === "object" && !util.isArray(result)) {
                     node.getType().should.be.eql("TAG_Compound");
                 } else if(typeof result === "string") {
-                    if(bignum(result).toString() === result) {
-                        node.getType().should.match(/^TAG_(String|Long)$/);
+                    if(result === "") {
+                        node.getType().should.match(/^TAG_String/);
+                    } else if(Long.fromString(result).toString() === result) {
+                        node.getType().should.match(/^TAG_(Long|String)$/);
                     } else {
-                        node.getType().should.be.eql("TAG_String");
+                        node.getType().should.match(/^TAG_String$/);
                     }
                 } else if(typeof result === "number" && result < 256) {
                     node.getType().should.match(/^TAG_(Int|Byte|Double)$/);

diff --git a/test/bigtest_archive.js b/test/bigtest_archive.js
@@ -6,7 +6,7 @@
  */
 "use strict";
 
-var bignum = require("bignum");
+var Long = require("long");
 var fs = require("fs");
 var util = require("util");
 
@@ -63,7 +63,7 @@ describe("Real bugtest archive test", function() {
                 } else if(typeof result === "object" && !util.isArray(result)) {
                     node.getType().should.be.eql("TAG_Compound");
                 } else if(typeof result === "string") {
-                    if(bignum(result).toString() === result) {
+                    if(Long.fromString(result).toString() === result) {
                         node.getType().should.match(/^TAG_(String|Long)$/);
                     } else {
                         node.getType().should.be.eql("TAG_String");