ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-03-04 08:25:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'feature/updated-gamedig-implementation' into feature/update-gamedig-v2

Browse source
This commit is contained in:
Markus Reisenhofer 2024-07-17 23:30:44 +02:00
commit f553681aea
No known key found for this signature in database
GPG key ID: F9BF452D473D63AC
4 changed files with 34 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
package-lock.json generated
View file

@ -32,7 +32,7 @@
"express-basic-auth": "~1.2.1", "express-basic-auth": "~1.2.1",
"express-static-gzip": "~2.1.7", "express-static-gzip": "~2.1.7",
"form-data": "~4.0.0", "form-data": "~4.0.0",
"gamedig": "^4.2.0", "gamedig": "^5.0.1",
"html-escaper": "^3.0.3", "html-escaper": "^3.0.3",
"http-cookie-agent": "~5.0.4", "http-cookie-agent": "~5.0.4",
"http-graceful-shutdown": "~3.1.7", "http-graceful-shutdown": "~3.1.7",
@ -8665,13 +8665,13 @@
"integrity": "sha512-et9Aq4wlD0cExXEO3r3LWiEEjOzsnG5l/0YSqza7FZLoJqunNT6DedkAXAdeOqAqStkRQahQiPFjx2WCg4SOtg==", "integrity": "sha512-et9Aq4wlD0cExXEO3r3LWiEEjOzsnG5l/0YSqza7FZLoJqunNT6DedkAXAdeOqAqStkRQahQiPFjx2WCg4SOtg==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"cheerio": "^1.0.0-rc.10", "cheerio": "^1.0.0-rc.12",
"gbxremote": "^0.2.1", "gbxremote": "^0.2.1",
"got": "^12.1.0", "got": "^13.0.0",
"iconv-lite": "^0.6.3", "iconv-lite": "^0.6.3",
"long": "^5.2.0", "long": "^5.2.3",
"minimist": "^1.2.6", "minimist": "^1.2.8",
"punycode": "^2.1.1", "punycode": "^2.3.0",
"seek-bzip": "^2.0.0", "seek-bzip": "^2.0.0",
"varint": "^6.0.0" "varint": "^6.0.0"
}, },
@ -8679,7 +8679,7 @@
"gamedig": "bin/gamedig.js" "gamedig": "bin/gamedig.js"
}, },
"engines": { "engines": {
"node": ">=14.0.0" "node": ">=16.20.0"
} }
}, },
"node_modules/gauge": { "node_modules/gauge": {
@ -9015,7 +9015,7 @@
"responselike": "^3.0.0" "responselike": "^3.0.0"
}, },
"engines": { "engines": {
"node": ">=14.16" "node": ">=16"
}, },
"funding": { "funding": {
"url": "https://github.com/sindresorhus/got?sponsor=1" "url": "https://github.com/sindresorhus/got?sponsor=1"

2
package.json
View file

@ -97,7 +97,7 @@
"express-basic-auth": "~1.2.1", "express-basic-auth": "~1.2.1",
"express-static-gzip": "~2.1.7", "express-static-gzip": "~2.1.7",
"form-data": "~4.0.0", "form-data": "~4.0.0",
"gamedig": "^4.2.0", "gamedig": "^5.0.1",
"html-escaper": "^3.0.3", "html-escaper": "^3.0.3",
"http-cookie-agent": "~5.0.4", "http-cookie-agent": "~5.0.4",
"http-graceful-shutdown": "~3.1.7", "http-graceful-shutdown": "~3.1.7",

4
server/model/monitor.js
View file

@ -16,7 +16,7 @@ const version = require("../../package.json").version;
const apicache = require("../modules/apicache"); const apicache = require("../modules/apicache");
const { UptimeKumaServer } = require("../uptime-kuma-server"); const { UptimeKumaServer } = require("../uptime-kuma-server");
const { DockerHost } = require("../docker"); const { DockerHost } = require("../docker");
const Gamedig = require("gamedig"); const { GameDig } = require("gamedig");
const jwt = require("jsonwebtoken"); const jwt = require("jsonwebtoken");
const crypto = require("crypto"); const crypto = require("crypto");
const { UptimeCalculator } = require("../uptime-calculator"); const { UptimeCalculator } = require("../uptime-calculator");
@ -696,7 +696,7 @@ class Monitor extends BeanModel {
} }
} else if (this.type === "gamedig") { } else if (this.type === "gamedig") {
try { try {
const state = await Gamedig.query({ const state = await GameDig.query({
type: this.game, type: this.game,
host: this.hostname, host: this.hostname,
port: this.port, port: this.port,

39
server/socket-handlers/general-socket-handler.js
View file

@ -2,31 +2,36 @@ const { log } = require("../../src/util");
const { Settings } = require("../settings"); const { Settings } = require("../settings");
const { sendInfo } = require("../client"); const { sendInfo } = require("../client");
const { checkLogin } = require("../util-server"); const { checkLogin } = require("../util-server");
const GameResolver = require("gamedig/lib/GameResolver"); const { games } = require("gamedig");
const { testChrome } = require("../monitor-types/real-browser-monitor-type"); const { testChrome } = require("../monitor-types/real-browser-monitor-type");
const fs = require("fs"); const fs = require("fs");
const path = require("path"); const path = require("path");
let gameResolver = new GameResolver();
let gameList = null;
/** /**
* Get a game list via GameDig * Get a game list via GameDig
* @returns {object[]} list of games supported by GameDig * @returns {Object} list of games supported by GameDig
*/ */
function getGameList() { function getGameList() {
if (gameList == null) { let gamelist = [];
gameList = gameResolver._readGames().games.sort((a, b) => { gamelist = Object.keys(games).map(key => {
if ( a.pretty < b.pretty ) { const item = games[key];
return -1; return {
} keys: [ key ],
if ( a.pretty > b.pretty ) { pretty: item.name,
return 1; options: item.options,
} extra: item.extra || {}
return 0; };
}); });
} gamelist.sort((a, b) => {
return gameList; if ( a.pretty < b.pretty ) {
return -1;
}
if ( a.pretty > b.pretty ) {
return 1;
}
return 0;
});
return gamelist;
} }
module.exports.generalSocketHandler = (socket, server) => { module.exports.generalSocketHandler = (socket, server) => {