🐛 Fix info queries failing because of challenge response

GiyoMoon · Dec 30, 2021 · e3e27b9 · e3e27b9
1 parent 4eb4134
commit e3e27b9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/src/gameServer/gameServer.ts b/src/gameServer/gameServer.ts
@@ -70,6 +70,17 @@ class GameServerQuery {
       throw new Error(err);
     }
 
+    // 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) {
+      resultBuffer = resultBuffer.slice(5);
+      const challenge = resultBuffer;
+      try {
+        resultBuffer = await this._promiseSocket.send(this._buildInfoPacket(challenge), this._host, this._port);
+      } catch (err: any) {
+        throw new Error(err);
+      }
+    }
+
     const parsedInfoBuffer = this._parseInfoBuffer(resultBuffer);
     return parsedInfoBuffer as InfoResponse;
   }
@@ -120,18 +131,15 @@ class GameServerQuery {
     let packet = Buffer.concat([
       Buffer.from([0xFF, 0xFF, 0xFF, 0xFF]),
       Buffer.from([0x54]),
-      Buffer.from('Source Engine Query', 'ascii')
+      Buffer.from('Source Engine Query', 'ascii'),
+      Buffer.from([0x00])
     ]);
     if (challenge) {
       packet = Buffer.concat([
         packet,
         challenge
       ]);
     }
-    packet = Buffer.concat([
-      packet,
-      Buffer.from([0x00])
-    ]);
     return packet;
   }
 

diff --git a/src/masterServer/masterServer.ts b/src/masterServer/masterServer.ts
@@ -68,9 +68,13 @@ class MasterServerQuery {
       // @ts-ignore
       let val = this._filters[key];
       str += '\\' + key + '\\';
-      str += (key === 'nor' || key === 'nand')
-        ? Object.keys(val).length + this._slashifyObject(val)
-        : val;
+      if (key === 'nor' || key === 'nand') {
+        str += Object.keys(val).length + this._slashifyObject(val);
+      } else if (Array.isArray(val)) {
+        str += val.join(',');
+      } else {
+        str += val;
+      }
     }
     str += '\x00';
     return str;