add support for multiple cedmod instances

AlexInABox · Nov 28, 2024 · f7cff9f · f7cff9f
1 parent fbc09ea
commit f7cff9f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.env.example b/.env.example
@@ -12,6 +12,7 @@ SERVER_CLIENT_ID="dj28041orSomethingLikeThat"
 SCP_SERVER_TIMEOUT=300000
 
 CEDMOD_INSTANCE_ID="1234"
+CEDMOD_WHICH_SERVER="1"
 
 SCPLISTKR_INSTANCE_ID="12345; scplist.kr instance id";
 

diff --git a/lib/CedMod.js b/lib/CedMod.js
@@ -17,7 +17,7 @@ async function writeServerStats() {
 
 
 
-async function refreshPlayerList(instanceId) {
+async function refreshPlayerList(instanceId, whichServer) {
     const options = {
         'method': 'GET',
         'url': `https://queryws.cedmod.nl/Api/Realtime/QueryServers/GetPopulation?instanceId=${instanceId}`,
@@ -39,15 +39,15 @@ async function refreshPlayerList(instanceId) {
     } catch (e) {
         throw new Error("Failed to parse response from CedMod!");
     }
-    if (!response || !response[0] || response[0].playerCount === undefined || response[0].userIds === undefined)
+    if (!response || !response[whichServer] || response[whichServer].playerCount === undefined || response[whichServer].userIds === undefined)
         throw new Error("Invalid response from CedMod!");
 
 
     await readServerStats();
 
     serverStats.state = "";
-    serverStats.playerCount = response[0].playerCount || 0;
-    serverStats.playerList = response[0].userIds || [];
+    serverStats.playerCount = response[whichServer].playerCount || 0;
+    serverStats.playerList = response[whichServer].userIds || [];
     serverStats.provider = "CedMod";
     serverStats.timestamp = Date.now();
 

diff --git a/lib/ServerStatsManager.js b/lib/ServerStatsManager.js
@@ -12,6 +12,7 @@ async function readServerStats() {
 
 const timeoutThreshold = Number.parseInt(process.env.SCP_SERVER_TIMEOUT) | 30000;
 const instanceId = process.env.CEDMOD_INSTANCE_ID;
+const whichCedmodServer = process.env.CEDMOD_WHICH_SERVER - 1;
 const serverId = process.env.SCPLISTKR_SERVER_ID;
 
 
@@ -32,7 +33,7 @@ async function mainloop() {
             console.log("DataTransmitServer hasn't sent any data in the last 30 seconds. Trying to get player list from alternative sources...");
 
             try{
-                await CedMod.refreshPlayerList(instanceId);
+                await CedMod.refreshPlayerList(instanceId, whichCedmodServer);
             }catch(e){
                 console.error("Failed to get player list from CedMod. Trying SCPListKr...");
                 console.error(e);