From 2aa7a3898b31bbf4263614d8722571c3dfc0c892 Mon Sep 17 00:00:00 2001 From: teobogdan <97450245+teooko@users.noreply.github.com> Date: Mon, 12 Aug 2024 10:34:10 +0300 Subject: [PATCH] Chore: update Gamedig (#3841) Co-Authored-By: shamoon <4887959+shamoon@users.noreply.github.com> --- package-lock.json | 44 ++++++++++++++++++------------------ package.json | 2 +- pnpm-lock.yaml | 30 ++++++++++++------------ src/widgets/gamedig/proxy.js | 6 +++-- 4 files changed, 42 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7d9c47918..de2d1bc89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "compare-versions": "^6.1.0", "dockerode": "^4.0.2", "follow-redirects": "^1.15.6", - "gamedig": "^4.3.1", + "gamedig": "^5.1.1", "i18next": "^21.10.0", "js-yaml": "^4.1.0", "json-rpc-2.0": "^1.7.0", @@ -3419,25 +3419,25 @@ } }, "node_modules/gamedig": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/gamedig/-/gamedig-4.3.1.tgz", - "integrity": "sha512-et9Aq4wlD0cExXEO3r3LWiEEjOzsnG5l/0YSqza7FZLoJqunNT6DedkAXAdeOqAqStkRQahQiPFjx2WCg4SOtg==", - "dependencies": { - "cheerio": "^1.0.0-rc.10", - "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" + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/gamedig/-/gamedig-5.1.1.tgz", + "integrity": "sha512-r0+GofQFtsuMEVKmF502ULl0bpo/QhPfkY7srLW/EicgMiNE682NqpjKt9fhM0U8DFymlUJ28lmaTHa5Q9TJIQ==", + "dependencies": { + "cheerio": "1.0.0-rc.12", + "gbxremote": "0.2.1", + "got": "13.0.0", + "iconv-lite": "0.6.3", + "long": "5.2.3", + "minimist": "1.2.8", + "punycode": "2.3.1", + "seek-bzip": "2.0.0", + "varint": "6.0.0" }, "bin": { "gamedig": "bin/gamedig.js" }, "engines": { - "node": ">=14.0.0" + "node": ">=16.20.0" } }, "node_modules/gbxremote": { @@ -3616,9 +3616,9 @@ } }, "node_modules/got": { - "version": "12.6.1", - "resolved": "https://registry.npmjs.org/got/-/got-12.6.1.tgz", - "integrity": "sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==", + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/got/-/got-13.0.0.tgz", + "integrity": "sha512-XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA==", "dependencies": { "@sindresorhus/is": "^5.2.0", "@szmarczak/http-timer": "^5.0.1", @@ -3633,7 +3633,7 @@ "responselike": "^3.0.0" }, "engines": { - "node": ">=14.16" + "node": ">=16" }, "funding": { "url": "https://github.com/sindresorhus/got?sponsor=1" @@ -5036,9 +5036,9 @@ } }, "node_modules/normalize-url": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.0.tgz", - "integrity": "sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz", + "integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==", "engines": { "node": ">=14.16" }, diff --git a/package.json b/package.json index 99d7b7a45..944650241 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "compare-versions": "^6.1.0", "dockerode": "^4.0.2", "follow-redirects": "^1.15.6", - "gamedig": "^4.3.1", + "gamedig": "^5.1.1", "i18next": "^21.10.0", "js-yaml": "^4.1.0", "json-rpc-2.0": "^1.7.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1f1606766..734f5b4c6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -30,8 +30,8 @@ importers: specifier: ^1.15.6 version: 1.15.6 gamedig: - specifier: ^4.3.1 - version: 4.3.1 + specifier: ^5.1.1 + version: 5.1.1 i18next: specifier: ^21.10.0 version: 21.10.0 @@ -1274,9 +1274,9 @@ packages: functions-have-names@1.2.3: resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} - gamedig@4.3.1: - resolution: {integrity: sha512-et9Aq4wlD0cExXEO3r3LWiEEjOzsnG5l/0YSqza7FZLoJqunNT6DedkAXAdeOqAqStkRQahQiPFjx2WCg4SOtg==} - engines: {node: '>=14.0.0'} + gamedig@5.1.1: + resolution: {integrity: sha512-r0+GofQFtsuMEVKmF502ULl0bpo/QhPfkY7srLW/EicgMiNE682NqpjKt9fhM0U8DFymlUJ28lmaTHa5Q9TJIQ==} + engines: {node: '>=16.20.0'} hasBin: true gbxremote@0.2.1: @@ -1336,9 +1336,9 @@ packages: gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} - got@12.6.1: - resolution: {integrity: sha512-mThBblvlAF1d4O5oqyvN+ZxLAYwIJK7bpMxgYqPD9okW0C3qm5FFn7k811QrcuEBwaogR3ngOFoCfs6mRv7teQ==} - engines: {node: '>=14.16'} + got@13.0.0: + resolution: {integrity: sha512-XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA==} + engines: {node: '>=16'} graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} @@ -1872,8 +1872,8 @@ packages: resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==} engines: {node: '>=0.10.0'} - normalize-url@8.0.0: - resolution: {integrity: sha512-uVFpKhj5MheNBJRTiMZ9pE/7hD1QTeEvugSJW/OmLzAp78PB5O6adfMNTvmfKhXBkvCzC+rqifWcVYpGFwTjnw==} + normalize-url@8.0.1: + resolution: {integrity: sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==} engines: {node: '>=14.16'} npm-run-path@4.0.1: @@ -3256,7 +3256,7 @@ snapshots: http-cache-semantics: 4.1.1 keyv: 4.5.4 mimic-response: 4.0.0 - normalize-url: 8.0.0 + normalize-url: 8.0.1 responselike: 3.0.0 cal-parser@1.0.2: @@ -4086,11 +4086,11 @@ snapshots: functions-have-names@1.2.3: {} - gamedig@4.3.1: + gamedig@5.1.1: dependencies: cheerio: 1.0.0-rc.12 gbxremote: 0.2.1 - got: 12.6.1 + got: 13.0.0 iconv-lite: 0.6.3 long: 5.2.3 minimist: 1.2.8 @@ -4183,7 +4183,7 @@ snapshots: dependencies: get-intrinsic: 1.2.4 - got@12.6.1: + got@13.0.0: dependencies: '@sindresorhus/is': 5.6.0 '@szmarczak/http-timer': 5.0.1 @@ -4684,7 +4684,7 @@ snapshots: normalize-range@0.1.2: {} - normalize-url@8.0.0: {} + normalize-url@8.0.1: {} npm-run-path@4.0.1: dependencies: diff --git a/src/widgets/gamedig/proxy.js b/src/widgets/gamedig/proxy.js index 8a7e55c5a..05fa615c1 100644 --- a/src/widgets/gamedig/proxy.js +++ b/src/widgets/gamedig/proxy.js @@ -1,9 +1,10 @@ +import { GameDig } from "gamedig"; + import createLogger from "utils/logger"; import getServiceWidget from "utils/config/service-helpers"; const proxyName = "gamedigProxyHandler"; const logger = createLogger(proxyName); -const gamedig = require("gamedig"); export default async function gamedigProxyHandler(req, res) { const { group, service } = req.query; @@ -11,11 +12,12 @@ export default async function gamedigProxyHandler(req, res) { const url = new URL(serviceWidget.url); try { - const serverData = await gamedig.query({ + const serverData = await GameDig.query({ type: serviceWidget.serverType, host: url.hostname, port: url.port, givenPortOnly: true, + checkOldIDs: true, }); res.status(200).send({