v2 - Remove Deprecations (#816)

* Remove modvault

* Remove create_account

* Remove id and login from welcome message

* Remove mod from game_matchmaking command

* Remove QDataStreamProtocol

* Remove 'faction' parameter from game_matchmaking command

* Stop sending game_launch when match is cancelled

* Remove InitMode

* Remove search boundaries from matchmaker_info

Dockerfile

@@ -38,7 +38,7 @@ USER faf
 # Main entrypoint and the default command that will be run
 CMD ["/usr/local/bin/python3", "main.py"]
 
-# lobby server runs on 8001/tcp (QDataStream) and 8002/tcp (JSON)
-EXPOSE 8001 8002
+# lobby server runs on 8002/tcp (JSON)
+EXPOSE 8002
 
 RUN python3 -V

README.md

@@ -82,26 +82,8 @@ list see [https://faforever.github.io/server/](https://faforever.github.io/serve
 The protocol is mainly JSON-encoded maps, containing at minimum a `command` key,
 representing the command to dispatch.
 
-The wire format uses [QDataStream](http://doc.qt.io/qt-5/qdatastream.html) (UTF-16, BigEndian).
-
-For the lobbyconnection, each message is of the form:
-```
-ACTION: QString
-```
-With most carrying a footer containing:
-```
-LOGIN: QString
-SESSION: QString
-```
-
 ## Incoming Packages
 
-##### Mod Vault
-
--   (deprecated) `{command: modvault, type: start}`: show the last 100 mods
--   (deprecated) `{command: modvault, type: like, uid: <uid>}`: check if user liked the mod, otherwise increase the like counter
--   (deprecated) `{command: modvault, type: download, uid: <uid>}`: notify server about a download (for download counter), does not start the download
-
 ##### Social
 -   `{command: social_add, friend|foe: <player_id>}`: Add a friend or foe
 -   `{command: social_remove, friend|foe: <player_id>}`: Remove a friend or foe

integration_tests/conftest.py

@@ -16,7 +16,7 @@ class Manager():
         def __init__(self):
             self.clients = []
 
-        async def add_client(self, host="test.faforever.com", port=8001):
+        async def add_client(self, host="test.faforever.com", port=8002):
             client = FAFClient()
             await client.connect(host, port)
             self.clients.append(client)

integration_tests/fafclient.py

@@ -2,7 +2,7 @@
 import subprocess
 from hashlib import sha256
 
-from server.protocol import QDataStreamProtocol
+from server.protocol import SimpleJsonProtocol
 from tests.integration_tests.conftest import read_until, read_until_command
 
 
@@ -29,7 +29,7 @@ async def close(self):
         await self.proto.close()
 
     async def connect(self, host, port):
-        self.proto = QDataStreamProtocol(
+        self.proto = SimpleJsonProtocol(
             *(await asyncio.open_connection(host, port))
         )
 
@@ -91,8 +91,8 @@ async def login(self, username, password):
             "unique_id": unique_id
         })
         msg = await self.read_until_command("welcome")
-        self.player_id = msg["id"]
-        self.player_name = msg["login"]
+        self.player_id = msg["me"]["id"]
+        self.player_name = msg["me"]["login"]
         return msg
 
     def get_unique_id(self, session):

integration_tests/test_login.py

@@ -9,6 +9,5 @@ async def test_user_existence(client_factory, username):
     """Verify that these users exist on the test server"""
     client, welcome_message = await client_factory.login(username, "foo")
 
-    assert welcome_message["login"] == welcome_message["me"]["login"] == username
-    assert welcome_message["id"] == welcome_message["me"]["id"]
+    assert welcome_message["me"]["login"] == username
     assert client.is_connected()

server/__init__.py

@@ -112,7 +112,7 @@
 from .oauth_service import OAuthService
 from .party_service import PartyService
 from .player_service import PlayerService
-from .protocol import Protocol, QDataStreamProtocol
+from .protocol import Protocol, SimpleJsonProtocol
 from .rating_service.rating_service import RatingService
 from .servercontext import ServerContext
 from .stats.game_stats_service import GameStatsService
@@ -244,7 +244,7 @@ async def listen(
         self,
         address: tuple[str, int],
         name: Optional[str] = None,
-        protocol_class: type[Protocol] = QDataStreamProtocol,
+        protocol_class: type[Protocol] = SimpleJsonProtocol,
         proxy: bool = False,
     ) -> ServerContext:
         """

server/games/__init__.py

@@ -13,7 +13,6 @@
     GameConnectionState,
     GameState,
     GameType,
-    InitMode,
     ValidityState,
     Victory,
     VisibilityState
@@ -39,7 +38,6 @@ class FeaturedMod(NamedTuple):
     "GameError",
     "GameState",
     "GameType",
-    "InitMode",
     "LadderGame",
     "ValidityState",
     "Victory",

server/games/coop.py

@@ -1,10 +1,9 @@
 from .game import Game
-from .typedefs import FA, GameType, InitMode, ValidityState, Victory
+from .typedefs import FA, GameType, ValidityState, Victory
 
 
 class CoopGame(Game):
     """Class for coop game"""
-    init_mode = InitMode.NORMAL_LOBBY
     game_type = GameType.COOP
 
     def __init__(self, *args, **kwargs):

server/games/custom_game.py

@@ -4,12 +4,11 @@
 from server.rating import RatingType
 
 from .game import Game
-from .typedefs import GameType, InitMode, ValidityState
+from .typedefs import GameType, ValidityState
 
 
 @with_logger
 class CustomGame(Game):
-    init_mode = InitMode.NORMAL_LOBBY
     game_type = GameType.CUSTOM
 
     def __init__(self, id_, *args, **kwargs):

server/games/game.py

@@ -36,7 +36,6 @@
     GameConnectionState,
     GameState,
     GameType,
-    InitMode,
     ValidityState,
     Victory,
     VisibilityState
@@ -51,7 +50,6 @@ class Game:
     """
     Object that lasts for the lifetime of a game on FAF.
     """
-    init_mode = InitMode.NORMAL_LOBBY
     game_type = GameType.CUSTOM
 
     def __init__(

server/games/ladder_game.py

@@ -7,7 +7,7 @@
 
 from .game import Game
 from .game_results import ArmyOutcome, GameOutcome
-from .typedefs import GameState, GameType, InitMode
+from .typedefs import GameState, GameType
 
 logger = logging.getLogger(__name__)
 
@@ -23,8 +23,6 @@ def __init__(self, player: Player):
 
 class LadderGame(Game):
     """Class for 1v1 ladder games"""
-
-    init_mode = InitMode.AUTO_LOBBY
     game_type = GameType.MATCHMAKER
 
     def __init__(self, id_, *args, **kwargs):

server/games/typedefs.py

@@ -22,12 +22,6 @@ class GameConnectionState(Enum):
     ENDED = 3
 
 
-@unique
-class InitMode(Enum):
-    NORMAL_LOBBY = 0
-    AUTO_LOBBY = 1
-
-
 @unique
 class GameType(Enum):
     COOP = "coop"
@@ -224,7 +218,6 @@ class FA(object):
     "GameConnectionState",
     "GameState",
     "GameType",
-    "InitMode",
     "TeamRatingSummary",
     "ValidityState",
     "Victory",

server/ladder_service/ladder_service.py

@@ -35,7 +35,7 @@
 )
 from server.decorators import with_logger
 from server.game_service import GameService
-from server.games import InitMode, LadderGame
+from server.games import LadderGame
 from server.games.ladder_game import GameClosedError
 from server.ladder_service.game_name import game_name
 from server.ladder_service.violation_service import ViolationService
@@ -524,7 +524,6 @@ def get_displayed_rating(player: Player) -> float:
                 rating_type=queue.rating_type,
                 max_players=len(all_players)
             )
-            game.init_mode = InitMode.AUTO_LOBBY
             game.map_file_path = map_path
             game.set_name_unchecked(game_name(team1, team2))
 
@@ -637,13 +636,8 @@ async def launch_match(
             await game.wait_hosted(60)
         except asyncio.TimeoutError:
             raise NotConnectedError([host])
-        finally:
-            # TODO: Once the client supports `match_cancelled`, don't
-            # send `launch_game` to the client if the host timed out. Until
-            # then, failing to send `launch_game` will cause the client to
-            # think it is searching for ladder, even though the server has
-            # already removed it from the queue.
 
+        try:
             # Launch the guests
             not_connected_guests = [
                 player for player in guests
@@ -660,7 +654,7 @@ async def launch_match(
                     is_host=False,
                     options=make_game_options(guest)
                 )
-        try:
+
             await game.wait_launched(60 + 10 * len(guests))
         except asyncio.TimeoutError:
             connected_players = game.get_connected_players()