Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

fix extra IP lookups in server banner plugin

Browse Source
This commit is contained in:
RaidMax 2023-04-08 12:00:28 -05:00
parent 222f2ba5f8
commit 1f77d10eed
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Plugins/ScriptPlugins/ServerBanner.js
View File

@ -29,21 +29,29 @@ const plugin = {
}, },
onServerMonitoringStart: function (startEvent) { onServerMonitoringStart: function (startEvent) {
let lookupComplete = true;
if (serverLocationCache[startEvent.server.listenAddress] === undefined) { if (serverLocationCache[startEvent.server.listenAddress] === undefined) {
serverLocationCache[startEvent.server.listenAddress] = 'UA'; serverLocationCache[startEvent.server.listenAddress] = 'SO';
lookupComplete = false;
} }
if (serverOrderCache[startEvent.server.gameCode] === undefined) { if (serverOrderCache[startEvent.server.gameCode] === undefined) {
serverOrderCache[startEvent.server.gameCode] = []; serverOrderCache[startEvent.server.gameCode] = [];
} }
const lookupIp = startEvent.server.resolvedIpEndPoint.address.isInternal() ?
this.manager.externalIPAddress :
startEvent.server.listenAddress;
serverOrderCache[startEvent.server.gameCode].push(startEvent.server); serverOrderCache[startEvent.server.gameCode].push(startEvent.server);
serverOrderCache[startEvent.server.gameCode].sort((a, b) => b.clientNum - a.clientNum); serverOrderCache[startEvent.server.gameCode].sort((a, b) => b.clientNum - a.clientNum);
if (lookupComplete) {
return;
}
const lookupIp = startEvent.server.resolvedIpEndPoint.address.isInternal() ?
this.manager.externalIPAddress :
startEvent.server.resolvedIpEndPoint.toString().split(':')[0];
this.logger.logInformation('Looking up server location for IP {IP}', lookupIp);
this.scriptHelper.getUrl(`https://ipinfo.io/${lookupIp}/country`, (result) => { this.scriptHelper.getUrl(`https://ipinfo.io/${lookupIp}/country`, (result) => {
let error = true; let error = true;
@ -143,7 +151,7 @@ const plugin = {
const displayIp = server.resolvedIpEndPoint.address.isInternal() ? const displayIp = server.resolvedIpEndPoint.address.isInternal() ?
plugin.manager.externalIPAddress : plugin.manager.externalIPAddress :
server.listenAddress; server.resolvedIpEndPoint.toString().split(':')[0];
return `<html> return `<html>
<head> <head>