From 25dd405136ff3827e103a48dc4c9cccb41494782 Mon Sep 17 00:00:00 2001 From: teooko Date: Sun, 11 Aug 2024 20:57:05 +0300 Subject: [PATCH] Update the gamedig version --- package-lock.json | 42 ++++++++++++++++++------------------ package.json | 2 +- src/widgets/gamedig/proxy.js | 4 +--- 3 files changed, 23 insertions(+), 25 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==", + "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.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" + "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/src/widgets/gamedig/proxy.js b/src/widgets/gamedig/proxy.js index 620d9dbd8..b69f8d3ac 100644 --- a/src/widgets/gamedig/proxy.js +++ b/src/widgets/gamedig/proxy.js @@ -1,15 +1,14 @@ import createLogger from "utils/logger"; import getServiceWidget from "utils/config/service-helpers"; +import {GameDig as gamedig} from "gamedig"; const proxyName = "gamedigProxyHandler"; const logger = createLogger(proxyName); -const gamedig = require("gamedig"); export default async function gamedigProxyHandler(req, res) { const { group, service } = req.query; const serviceWidget = await getServiceWidget(group, service); const url = new URL(serviceWidget.url); - const gamedigArgs = serviceWidget.gamedigArgs; try { const serverData = await gamedig.query({ @@ -17,7 +16,6 @@ export default async function gamedigProxyHandler(req, res) { host: url.hostname, port: url.port, givenPortOnly: true, - ...gamedigArgs }); res.status(200).send({