🐛 Add challenge retries for A2S_PLAYER requests

package.json

@@ -1,6 +1,6 @@
 {
   "name": "steam-server-query",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Module which implements the Master Server Query Protocol and Game Server Queries.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/GiyoMoon/steam-server-query#readme",
   "devDependencies": {
-    "@types/node": "^17.0.5",
-    "typescript": "^4.5.4"
+    "@types/node": "^17.0.17",
+    "typescript": "^4.5.5"
   }
 }

src/gameServer/gameServer.ts

@@ -75,7 +75,7 @@ class GameServerQuery {
     }
 
     // If the server replied with a challenge, grab challenge number and send request again
-    if (resultBuffer.compare(Buffer.from([0xFF, 0xFF, 0xFF, 0xFF, 0x41]), 0, 5, 0, 5) === 0) {
+    if (this._isChallengeResponse(resultBuffer)) {
       resultBuffer = resultBuffer.slice(5);
       const challenge = resultBuffer;
       try {
@@ -93,26 +93,40 @@ class GameServerQuery {
   }
 
   public async player(): Promise<PlayerResponse> {
-    let challengeResultBuffer: Buffer;
-    try {
-      challengeResultBuffer = await this._promiseSocket.send(this._buildPacket(Buffer.from([0x55])), this._host, this._port);
-    } catch (err: any) {
-      this._promiseSocket.closeSocket();
-      throw new Error(err);
-    }
+    let resultBuffer: Buffer;
+    let gotPlayerResponse = false;
+    let challengeTries = 0;
 
-    const challenge = challengeResultBuffer.slice(5);
+    do {
+      let challengeResultBuffer: Buffer;
+      try {
+        challengeResultBuffer = await this._promiseSocket.send(this._buildPacket(Buffer.from([0x55])), this._host, this._port);
+      } catch (err: any) {
+        this._promiseSocket.closeSocket();
+        throw new Error(err);
+      }
 
-    let resultBuffer: Buffer;
-    try {
-      resultBuffer = await this._promiseSocket.send(this._buildPacket(Buffer.from([0x55]), challenge), this._host, this._port);
-    } catch (err: any) {
-      this._promiseSocket.closeSocket();
-      throw new Error(err);
-    }
+      const challenge = challengeResultBuffer.slice(5);
+      try {
+        resultBuffer = await this._promiseSocket.send(this._buildPacket(Buffer.from([0x55]), challenge), this._host, this._port);
+      } catch (err: any) {
+        this._promiseSocket.closeSocket();
+        throw new Error(err);
+      }
+
+      if (!this._isChallengeResponse(resultBuffer)) {
+        gotPlayerResponse = true;
+      }
+
+      challengeTries++;
+    } while (!gotPlayerResponse && challengeTries < 5);
 
     this._promiseSocket.closeSocket();
 
+    if (this._isChallengeResponse(resultBuffer)) {
+      throw new Error('Server kept sending challenge responses.');
+    }
+
     const parsedPlayerBuffer = this._parsePlayerBuffer(resultBuffer);
     return parsedPlayerBuffer;
   }
@@ -177,6 +191,10 @@ class GameServerQuery {
     return packet;
   }
 
+  private _isChallengeResponse(buffer: Buffer) {
+    return buffer.compare(Buffer.from([0xFF, 0xFF, 0xFF, 0xFF, 0x41]), 0, 5, 0, 5) === 0;
+  }
+
   private _parseInfoBuffer(buffer: Buffer): InfoResponse {
     const infoResponse: Partial<InfoResponse> = {};
     buffer = buffer.slice(5);