From ca7f56c996b655292233c60298ff06f66a9e8e7f Mon Sep 17 00:00:00 2001 From: CosminPerRam Date: Sat, 9 Sep 2023 11:33:02 +0300 Subject: [PATCH] deps: Replace compressjs by seek-bzip (#349) * Replace compressjs by seek-bzip * Update CHANGELOG --- CHANGELOG.md | 1 + package-lock.json | 104 +++++++++++++++++---------------------------- package.json | 2 +- protocols/valve.js | 4 +- 4 files changed, 42 insertions(+), 69 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d0ca682..fa59e61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ### To Be Released... +* Replace `compressjs` dependency by `seek-bzip` to solve some possible import issues. * Sons Of The Forest - Added support * Red Dead Redemption 2 - RedM (2018) - Added support * Creativerse (2017) - Added support diff --git a/package-lock.json b/package-lock.json index 6554c64..aa45302 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,22 +1,22 @@ { "name": "gamedig", - "version": "4.0.6", + "version": "4.0.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "gamedig", - "version": "4.0.6", + "version": "4.0.7", "license": "MIT", "dependencies": { "cheerio": "^1.0.0-rc.10", - "compressjs": "^1.0.2", "gbxremote": "^0.2.1", "got": "^12.1.0", "iconv-lite": "^0.6.3", "long": "^5.2.0", "minimist": "^1.2.6", "punycode": "^2.1.1", + "seek-bzip": "^2.0.0", "varint": "^6.0.0" }, "bin": { @@ -72,14 +72,6 @@ "integrity": "sha512-Z6/KzgyWOga3pJNS42A+zayjhPbf2zM3hegRQaOPnLOzEi86VV++6FLDWgR1LGrVCRufP/ph2daa3tEa5br1zA==", "dev": true }, - "node_modules/amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "engines": { - "node": ">=0.4.2" - } - }, "node_modules/any-promise": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", @@ -158,29 +150,6 @@ "url": "https://github.com/sponsors/fb55" } }, - "node_modules/commander": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", - "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", - "dependencies": { - "graceful-readlink": ">= 1.0.0" - }, - "engines": { - "node": ">= 0.6.x" - } - }, - "node_modules/compressjs": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/compressjs/-/compressjs-1.0.3.tgz", - "integrity": "sha1-ldt03VuQOM+AvKMhqw7eJxtJWbY=", - "dependencies": { - "amdefine": "~1.0.0", - "commander": "~2.8.1" - }, - "bin": { - "compressjs": "bin/compressjs" - } - }, "node_modules/core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -368,11 +337,6 @@ "url": "https://github.com/sindresorhus/got?sponsor=1" } }, - "node_modules/graceful-readlink": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=" - }, "node_modules/htmlparser2": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", @@ -586,6 +550,26 @@ "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, + "node_modules/seek-bzip": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-2.0.0.tgz", + "integrity": "sha512-SMguiTnYrhpLdk3PwfzHeotrcwi8bNV4iemL9tx9poR/yeaMYwB9VzR1w7b57DuWpuqR8n6oZboi0hj3AxZxQg==", + "dependencies": { + "commander": "^6.0.0" + }, + "bin": { + "seek-bunzip": "bin/seek-bunzip", + "seek-table": "bin/seek-bzip-table" + } + }, + "node_modules/seek-bzip/node_modules/commander": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", + "engines": { + "node": ">= 6" + } + }, "node_modules/string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", @@ -698,11 +682,6 @@ "integrity": "sha512-Z6/KzgyWOga3pJNS42A+zayjhPbf2zM3hegRQaOPnLOzEi86VV++6FLDWgR1LGrVCRufP/ph2daa3tEa5br1zA==", "dev": true }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" - }, "any-promise": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", @@ -766,23 +745,6 @@ "domutils": "^2.7.0" } }, - "commander": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", - "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", - "requires": { - "graceful-readlink": ">= 1.0.0" - } - }, - "compressjs": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/compressjs/-/compressjs-1.0.3.tgz", - "integrity": "sha1-ldt03VuQOM+AvKMhqw7eJxtJWbY=", - "requires": { - "amdefine": "~1.0.0", - "commander": "~2.8.1" - } - }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -908,11 +870,6 @@ "responselike": "^3.0.0" } }, - "graceful-readlink": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=" - }, "htmlparser2": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", @@ -1074,6 +1031,21 @@ "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, + "seek-bzip": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-2.0.0.tgz", + "integrity": "sha512-SMguiTnYrhpLdk3PwfzHeotrcwi8bNV4iemL9tx9poR/yeaMYwB9VzR1w7b57DuWpuqR8n6oZboi0hj3AxZxQg==", + "requires": { + "commander": "^6.0.0" + }, + "dependencies": { + "commander": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", + "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==" + } + } + }, "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", diff --git a/package.json b/package.json index 9fbc1ef..c593006 100644 --- a/package.json +++ b/package.json @@ -38,13 +38,13 @@ }, "dependencies": { "cheerio": "^1.0.0-rc.10", - "compressjs": "^1.0.2", "gbxremote": "^0.2.1", "got": "^12.1.0", "iconv-lite": "^0.6.3", "long": "^5.2.0", "minimist": "^1.2.6", "punycode": "^2.1.1", + "seek-bzip": "^2.0.0", "varint": "^6.0.0" }, "bin": { diff --git a/protocols/valve.js b/protocols/valve.js index 0a24d6e..3aa27d1 100644 --- a/protocols/valve.js +++ b/protocols/valve.js @@ -1,4 +1,4 @@ -const Bzip2 = require('compressjs').Bzip2; +const Bzip2 = require('seek-bzip'); const Core = require('./core'); const Results = require('../lib/Results'); const Reader = require('../lib/reader'); @@ -592,7 +592,7 @@ class Valve extends Core { if(bzip) { this.debugLog("BZIP DETECTED - Extracing packet..."); try { - assembled = Buffer.from(Bzip2.decompressFile(assembled)); + assembled = Bzip2.decode(assembled); } catch(e) { throw new Error('Invalid bzip packet'); }