FIX generals auto-match

Author: sokie

app/servers/automatch/base.py

@@ -108,3 +108,21 @@ def pick_random_map_index(common_bitset: str) -> int:
     """Pick a random map index from a common bitset. Returns -1 if none available."""
     indices = [i for i, c in enumerate(common_bitset) if c == "1"]
     return random.choice(indices) if indices else -1
+
+
+# GameSpy peerchat username encoding (piMangleIP / piDemangleUser)
+# Format: X<8 encoded chars>X|<profileID>
+# The game decodes the bot's username to validate the sender before accepting
+# any MBOT: messages. An invalid username causes all messages to be silently dropped.
+
+_GAMESPY_XOR_KEY = 0xC3801DC7
+_GAMESPY_ALPHABET = "aFl4uOD9sfWq1vGp"
+_HEX_CHARS = "0123456789abcdef"
+
+
+def encode_gamespy_username(ip: int, profile_id: int) -> str:
+    """Encode an IP + profile ID into GameSpy peerchat username format."""
+    xored = ip ^ _GAMESPY_XOR_KEY
+    hex_str = f"{xored:08x}"
+    encoded = "".join(_GAMESPY_ALPHABET[_HEX_CHARS.index(c)] for c in hex_str)
+    return f"X{encoded}X|{profile_id}"

app/servers/automatch/games/generals.py

@@ -4,7 +4,7 @@
 import time
 from dataclasses import dataclass, field
 
-from app.servers.automatch.base import BasePlayer, GameFactory, find_common_maps, pick_random_map_index
+from app.servers.automatch.base import BasePlayer, GameFactory, encode_gamespy_username, find_common_maps, pick_random_map_index
 
 
 @dataclass
@@ -26,7 +26,10 @@ class GeneralsGameFactory(GameFactory):
 
     game_id = "generals_zh"
     nickname = "qmbot"
-    username = "0|0"
+    # Username must be GameSpy-encoded: X<encoded_ip>X|<profile_id>
+    # The game decodes this via piDemangleUser before accepting any MBOT: messages.
+    # encode_gamespy_username(0x0A000001, 17461195) -> "X1fsaFv1DX|17461195"
+    username = encode_gamespy_username(0x0A000001, 17461195)
     channels = ["#GPG!597", "#GPG!392"]
     match_interval = 2.0
     valid_num_players = [2, 4, 6, 8]