Code

Multiplayer APIv2#9497

Code

Draft

CrsiX wants to merge 157 commits intoyairm210:masteryairm210/Unciv:masterfrom hopfenspace:devhopfenspace/Unciv:devCopy head branch name to clipboard

+4,059-441

Commits

Commits on May 4, 2023

• Added new dependencies for networking in the new multiplayer (ktor)

  CrsiX

  committed
  8fe9b45

  Copy full SHA for 8fe9b45

• Added some utilities and first structs

  CrsiX

  committed
  24fdb17

  Copy full SHA for 24fdb17

• Replace moshi serializer with kotlinx.json, added the API structs

  CrsiX

  committed
  6680144

  Copy full SHA for 6680144

• Added the first endpoint implementations, added logging dependency

  CrsiX

  committed
  55f49bf

  Copy full SHA for 55f49bf

• Added the Api core class, fixed enum and response status handling

  CrsiX

  committed
  b88c564

  Copy full SHA for b88c564

• Added a cookie helper to fix authentication flow problems

  CrsiX

  committed
  c741f44

  Copy full SHA for c741f44

• Added WebSocket handling and logger functionality, fixed cookie handling

  CrsiX

  committed
  07d0fb5

  Copy full SHA for 07d0fb5

• Added support for lobby handling to the Api wrapper

  CrsiX

  committed
  b09ee86

  Copy full SHA for b09ee86

• Added friendship handling support to the Api wrapper

  CrsiX

  committed
  8051c9a

  Copy full SHA for 8051c9a

• Updated the API structs

  CrsiX

  committed
  39516cb

  Copy full SHA for 39516cb

• Renamed the old multiplayer handler to start reworking the mechanics

  CrsiX

  committed
  9fbca56

  Copy full SHA for 9fbca56

• Added WebSocket serializers, structs and message types

  CrsiX

  committed
  4fbc686

  Copy full SHA for 4fbc686

• Updated the client's implementation of the REST API

  CrsiX

  committed
  dd04aff

  Copy full SHA for dd04aff

• Added first WebSocket handler

  CrsiX

  committed
  1fdb8d0

  Copy full SHA for 1fdb8d0

• Added frame handling, added functional WS sending, added apiVersion to server feature set

  CrsiX

  committed
  9888bed

  Copy full SHA for 9888bed

• Added get all chat rooms endpoint

  CrsiX

  committed
  8dce89d

  Copy full SHA for 8dce89d

• Added WebSocket data structs

  CrsiX

  committed
  204e4a3

  Copy full SHA for 204e4a3

• Added game and invite API and structs

  CrsiX

  committed
  4557dc8

  Copy full SHA for 4557dc8

• Switched to a non-blocking file storage API

  CrsiX

  committed
  8a16d4b

  Copy full SHA for 8a16d4b

• Switch to UUIDs for game identification, added a auth testing function

  CrsiX

  committed
  1390c8b

  Copy full SHA for 1390c8b

• Added the possibility to set specific game IDs during game creation

  Show description for 6a2f1a2
  CrsiX

  committed
  6a2f1a2

  Copy full SHA for 6a2f1a2

• Split the FileStorage interface to differentiate between game and preview data

  CrsiX

  committed
  775d8fd

  Copy full SHA for 775d8fd

• Allow setting the username from the multiplayer options dialogue

  CrsiX

  committed
  a102a8f

  Copy full SHA for a102a8f

• Added a file storage emulator as workaround to use API v2

  CrsiX

  committed
  94a5ebd

  Copy full SHA for 94a5ebd

• Added some API helpers and a lot of glue to enable the APIv2 file handler

  CrsiX

  committed
  e8f15c3

  Copy full SHA for e8f15c3

• Renamed api package, added ApiVersion enum for easier auto-detection

  CrsiX

  committed
  303cc56

  Copy full SHA for 303cc56

• Added the poll checker, changed the android notification worker poller

  CrsiX

  committed
  fb7f056

  Copy full SHA for fb7f056

• Fixed a bunch of problems related to error handling

  CrsiX

  committed
  6130beb

  Copy full SHA for 6130beb

• Added a lobby browser screen for the APIv2

  CrsiX

  committed
  2b8d4d6

  Copy full SHA for 2b8d4d6

• Improved lobby handling with information in the right side table

  CrsiX

  committed
  ffbb661

  Copy full SHA for ffbb661

• Added two new popup types, InfoPopup and RegisterLoginPopup

  CrsiX

  committed
  0fc201c

  Copy full SHA for 0fc201c

• Improved OnlineMultiplayer with various new endpoints and concurrency fixes

  CrsiX

  committed
  6bf91a8

  Copy full SHA for 6bf91a8

• Added a separate multiplayer screen using the APIv2

  CrsiX

  committed
  0333bb3

  Copy full SHA for 0333bb3

• Fixed some API incompatibilities, added getFriends() method

  CrsiX

  committed
  9b403ce

  Copy full SHA for 9b403ce

• Added a helper to open the new multiplayer screen or the register popup

  CrsiX

  committed
  9973a11

  Copy full SHA for 9973a11

• Implemented the friend screen

  CrsiX

  committed
  c30b53d

  Copy full SHA for c30b53d

• Moved I/O dependency to desktop only, fixed InfoPopus in register popup

  CrsiX

  committed
  459c81c

  Copy full SHA for 459c81c

• Rename the Api class to ApiV2Wrapper, added a chat room screen

  CrsiX

  committed
  1473f04

  Copy full SHA for 1473f04

• Improved the chat room screen

  CrsiX

  committed
  c51bc17

  Copy full SHA for c51bc17

• Added a button in the WorldScreenTopBar that should open the chat room

  CrsiX

  committed
  db9a81a

  Copy full SHA for db9a81a

• Fixed RegisterLoginPopup colspan, added key shortcuts

  CrsiX

  committed
  aec9904

  Copy full SHA for aec9904

• Replaced logging dependency, renamed the endpoint implementations

  CrsiX

  committed
  817bb6f

  Copy full SHA for 817bb6f

• Dropped the extra logger to remove dependencies, added the APIv2 class

  CrsiX

  committed
  af0ee11

  Copy full SHA for af0ee11

• Restructured the project to make ApiV2 class the center

  CrsiX

  committed
  ceffacf

  Copy full SHA for ceffacf

• Improved chat handling, added server game detail caching

  CrsiX

  committed
  27ce25b

  Copy full SHA for 27ce25b

• Align the right control buttons of the NewGameScreen horizontally

  Show description for 29abeb4
  CrsiX

  committed
  29abeb4

  Copy full SHA for 29abeb4

• Avoid crashing during server checks (e.g. due to network issues)

  CrsiX

  committed
  0fd7227

  Copy full SHA for 0fd7227

• Added a logout button in the multiplayer options tab

  CrsiX

  committed
  99708e7

  Copy full SHA for 99708e7

• Added a generic HTTP request wrapper that can retry requests easily

  CrsiX

  committed
  69ef74b

  Copy full SHA for 69ef74b

• Added a default handler to retry requests after session refreshing

  CrsiX

  committed
  d5423d3

  Copy full SHA for d5423d3

• Updated the API structs based on the new OpenAPI specifications

  CrsiX

  committed
  b6873d7

  Copy full SHA for b6873d7

• Switched endpoint implementations to use the new 'request', updated WebSocket structs

  CrsiX

  committed
  c37d98b

  Copy full SHA for c37d98b

• Updated the auth helper, added the UncivNetworkException

  CrsiX

  committed
  0e5953b

  Copy full SHA for 0e5953b

• Fixed some more issues due to refactoring APIv2 handler

  CrsiX

  committed
  93d9327

  Copy full SHA for 93d9327

• Fixed some issues and some minor incompatibilities with the new API

  CrsiX

  committed
  f83a77a

  Copy full SHA for f83a77a

• Allow storing the result of the register/auth popup persistently

  CrsiX

  committed
  148eee6

  Copy full SHA for 148eee6

• Improved lobby handling, added a InfoPopup wrapper

  CrsiX

  committed
  feed93d

  Copy full SHA for feed93d

• Updated the InfoPopup, added a common interface for map options table

  CrsiX

  committed
  4d921fd

  Copy full SHA for 4d921fd

• Added a ChatMessageList

  CrsiX

  committed
  f6882de

  Copy full SHA for f6882de

• Switch to full JSON for saving APIv2 games instead of minimal

  CrsiX

  committed
  0681df8

  Copy full SHA for 0681df8

• Use the ChatMessageList in the ChatRoomScreen

  CrsiX

  committed
  437cc70

  Copy full SHA for 437cc70

• Added the first version of the LobbyScreen

  CrsiX

  committed
  b6c2a82

  Copy full SHA for b6c2a82

• Opened the NationPickerPopup to use it from other screens as well

  Show description for 739e4cf
  CrsiX

  committed
  739e4cf

  Copy full SHA for 739e4cf

• Added a lobby player list and a lobby player

  CrsiX

  committed
  2a21a4a

  Copy full SHA for 2a21a4a

• Added button collections, make use of player lists, fixed various bugs

  CrsiX

  committed
  331d881

  Copy full SHA for 331d881

• Implemented the LobbyBrowserTable, added missing API endpoint

  CrsiX

  committed
  bd0df40

  Copy full SHA for bd0df40

• Added choosing nations for players, fixed kick and add buttons

  CrsiX

  committed
  ebf5c8c

  Copy full SHA for ebf5c8c

• Added a popup that allows creating new APIv2 lobbies (optional password)

  CrsiX

  committed
  13975b3

  Copy full SHA for 13975b3

• Created GameDisplayBase for common functionality, introduced GameDisplayV2

  CrsiX

  committed
  ba9e2d3

  Copy full SHA for ba9e2d3

• Revert "Created GameDisplayBase for common functionality, introduced GameDisplayV2"

  Show description for b93a49d
  CrsiX

  committed
  b93a49d

  Copy full SHA for b93a49d

• Added new button and various fixes, moved CreateLobbyPopup

  CrsiX

  committed
  1ee8dfb

  Copy full SHA for 1ee8dfb

• Fixed login and auth issues in the main menu screen

  CrsiX

  committed
  0b62347

  Copy full SHA for 0b62347

• Added GameListV2, improved the lobby screens

  CrsiX

  committed
  f411e7f

  Copy full SHA for f411e7f

• Added a ChatTable and various fixes to the chat handling

  CrsiX

  committed
  5f80ffa

  Copy full SHA for 5f80ffa

• Added new WebSocket structs for handling invites and friends

  CrsiX

  committed
  286b719

  Copy full SHA for 286b719

• Updated the API reference implementation

  CrsiX

  committed
  f7a3662

  Copy full SHA for f7a3662

• Always display InfoPopups forcefully, refreshed the button collection

  CrsiX

  committed
  37ae9d5

  Copy full SHA for 37ae9d5

• Added a friend table to handle friends and requests

  CrsiX

  committed
  4e7bdc8

  Copy full SHA for 4e7bdc8

• Added GET cache, allowed all WS messages to be Events, added missing endpoints

  CrsiX

  committed
  22e3de6

  Copy full SHA for 22e3de6

• Added lobby invite table

  CrsiX

  committed
  36694c0

  Copy full SHA for 36694c0

• Added func to dispose and refresh OnlineMultiplayer, only show set username for APIv2

  CrsiX

  committed
  6c5ec58

  Copy full SHA for 6c5ec58

• Updated the lobby screen

  CrsiX

  committed
  dbb8b0e

  Copy full SHA for dbb8b0e

• Added a handler to start a game from a lobby

  CrsiX

  committed
  811cb8a

  Copy full SHA for 811cb8a

• Updated the chat table and message list to react to incoming messages

  CrsiX

  committed
  6af8718

  Copy full SHA for 6af8718

• Reworked the ApiV2 class to improve WebSocket handling for every login

  CrsiX

  committed
  659621e

  Copy full SHA for 659621e

• Added small game fetch, fixed lobby start, some smaller fixes

  CrsiX

  committed
  d3f6b91

  Copy full SHA for d3f6b91

• Added friend request canceling and search

  CrsiX

  committed
  0b00a36

  Copy full SHA for 0b00a36

• Fixed replacing the OnlineMultiplayer instance

  CrsiX

  committed
  05f09c2

  Copy full SHA for 05f09c2

• Added lobby player sorting, fixed duplicate chat messages

  CrsiX

  committed
  599ac30

  Copy full SHA for 599ac30

• Enforce multiplayer games when the lobby for V2 games is used

  CrsiX

  committed
  78fe724

  Copy full SHA for 78fe724

• Improved the LobbyBrowserTable

  CrsiX

  committed
  7a1fb22

  Copy full SHA for 7a1fb22

• Allow to specify the player and AI civs for new games

  CrsiX

  committed
  03f962d

  Copy full SHA for 03f962d

• Change the user ID after logging in to fix later in-game issues

  Show description for 059de8b
  CrsiX

  committed
  059de8b

  Copy full SHA for 059de8b

• Updated the WorldTopBar's social button, dropped update for LobbyPlayerList, fixed some bugs

  CrsiX

  committed
  4f9312e

  Copy full SHA for 4f9312e

• Added periodic redrawing of chat messages, added dispose to chat list, dropped LobbyInviteTable

  CrsiX

  committed
  f0cc612

  Copy full SHA for f0cc612

• Corrected the friend list handling, implemented the social button

  CrsiX

  committed
  be7c505

  Copy full SHA for be7c505

• Added serializer class for WebSocket's FriendshipEvent enum

  CrsiX

  committed
  fe98ecf

  Copy full SHA for fe98ecf

• Fixed chat room access and cancelling friendships

  CrsiX

  committed
  b1ea972

  Copy full SHA for b1ea972

• Added lobby player event handling

  CrsiX

  committed
  a63cf83

  Copy full SHA for a63cf83

• Added a mutex for all changes to the lobby player list

  CrsiX

  committed
  d089ccd

  Copy full SHA for d089ccd

• Dropped MultiplayerScreenV2, improved disposing functionality

  CrsiX

  committed
  cb5834c

  Copy full SHA for cb5834c

• Improved the social tab and the friend list with the chatting ability

  CrsiX

  committed
  bc49cab

  Copy full SHA for bc49cab

• Fixed WebSocket re-connecting, outsourced configs

  CrsiX

  committed
  6e1b721

  Copy full SHA for 6e1b721

• Updated the RegisterLoginPopup to ask if the user wants to use the new servers

  CrsiX

  committed
  7b3d45b

  Copy full SHA for 7b3d45b

• Improved the lobby handling, fixed many bugs

  CrsiX

  committed
  ddd06ce

  Copy full SHA for ddd06ce

• Implemented a self-contained API version check with side-effects

  CrsiX

  committed
  2a27ec0

  Copy full SHA for 2a27ec0

• Reworked the multiplayer server check in the multiplayer settings tab

  CrsiX

  committed
  8efbee5

  Copy full SHA for 8efbee5

• Added helper to set the user ID, fixed multiplayer reloading

  CrsiX

  committed
  8bea254

  Copy full SHA for 8bea254

• Added automatic loading of new games when receiving UpdateGameData events

  CrsiX

  committed
  4c58bc3

  Copy full SHA for 4c58bc3

• Corrected loading of multiplayer games to make auto-loading work smoothly

  CrsiX

  committed
  472bec3

  Copy full SHA for 472bec3

• Added an optional heading for chat message lists

  CrsiX

  committed
  075d9e8

  Copy full SHA for 075d9e8

• Added the SocialMenuScreen, fixed some bugs, improved game start handling

  CrsiX

  committed
  72408a5

  Copy full SHA for 72408a5

• Only show the new incoming game when the user is expecting it

  CrsiX

  committed
  179c6a9

  Copy full SHA for 179c6a9

• Added online multiplayer disposing on app exit

  CrsiX

  committed
  7437208

  Copy full SHA for 7437208

• Fixed various problems with WebSocket connections

  CrsiX

  committed
  6806789

  Copy full SHA for 6806789

• Removed refresh button from chat, changed color of auth close button

  CrsiX

  committed
  b1758ba

  Copy full SHA for b1758ba

• Added BaseScreen handling for some incoming events

  CrsiX

  committed
  f96915b

  Copy full SHA for f96915b

• Reworked the RegisterLoginPopup to address a bunch of UX issues

  CrsiX

  committed
  8f148d6

  Copy full SHA for 8f148d6

• Don't show kick button for lobby owner, handle network issues during login

  CrsiX

  committed
  9247c44

  Copy full SHA for 9247c44

• Added auto-reload to lobby browser, added lobby invitation popup

  CrsiX

  committed
  9c1d782

  Copy full SHA for 9c1d782

• Fixed compilation errors due to rebasing regressions

  CrsiX

  committed
  7a6f23a

  Copy full SHA for 7a6f23a

Commits on May 9, 2023

• Added various UX fixes to the lobby screen and the browser

  CrsiX

  committed
  49af6b1

  Copy full SHA for 49af6b1

• Added a first Multiplayer (M) tab for the overview field

  CrsiX

  committed
  f1d37d2

  Copy full SHA for f1d37d2

• Fixed auto-loading for single player, added GameListV2 updating, fixed MultiplayerTab layout

  CrsiX

  committed
  1ec7429

  Copy full SHA for 1ec7429

Commits on May 10, 2023

• Suppress onlineMultiplayer checkbox clicks in game options (APIv2), fixed NPE in popup

  CrsiX

  committed
  642aaf8

  Copy full SHA for 642aaf8

Commits on May 11, 2023

• Added English translations for ApiStatusCode, fixed broken APIv1 games for uncivserver.xyz

  CrsiX

  committed
  6702856

  Copy full SHA for 6702856

Commits on May 12, 2023

• Added auto-scroll to bottom for chat message lists, added some fixes for other things

  CrsiX

  committed
  3c90e8f

  Copy full SHA for 3c90e8f

• Fixed subpaths in baseUrl, added server settings button

  CrsiX

  committed
  bbb2a26

  Copy full SHA for bbb2a26

Commits on May 15, 2023

• Added WS-based Android turn checker, added a new event channel, fixed APIWrapper

  CrsiX

  committed
  c6f01c0

  Copy full SHA for c6f01c0

Commits on May 18, 2023

• Refactored the multiplayer turn checker to use its own package

  CrsiX

  committed
  1ecbfd4

  Copy full SHA for 1ecbfd4

• Refactored the multiplayer turn checker to move companion code into a separate object

  CrsiX

  committed
  cefc6cb

  Copy full SHA for cefc6cb

Commits on May 20, 2023

• Implemented the APIv2-based listener as TurnChecker V2 (Android)

  CrsiX

  committed
  30bb0a9

  Copy full SHA for 30bb0a9

• Added a logout hook, implemented ensureConnectedWebSocket

  CrsiX

  committed
  c0abe0d

  Copy full SHA for c0abe0d

Commits on May 21, 2023

• Merge branch 'master' into dev

  CrsiX

  committed
  f68ff4c

  Copy full SHA for f68ff4c

Commits on May 22, 2023

• Switched to use MultiplayerStatusButton for APIv2 games as well

  CrsiX

  committed
  ef3152e

  Copy full SHA for ef3152e

• Throttle auto-reconnect for WS on Android in background, added reload notice for your turn popup

  CrsiX

  committed
  8d4d7dc

  Copy full SHA for 8d4d7dc

Commits on May 29, 2023

• Implemented real pinging with awaiting responses, fixed ping-related problems

  CrsiX

  committed
  118292f

  Copy full SHA for 118292f

Commits on Jun 1, 2023

• Reworked the SocialMenuScreen into a MultiplayerGameScreen

  CrsiX

  committed
  a41f7c6

  Copy full SHA for a41f7c6

• Fixed bugs in MultiplayerGameScreen, improved chat message list loading

  CrsiX

  committed
  489b0fc

  Copy full SHA for 489b0fc

• Adapted new getAllChats API, added outstanding friend request list, improved styling

  CrsiX

  committed
  40316e4

  Copy full SHA for 40316e4

Commits on Jun 8, 2023

• Fixed defeated civs not shown in Multiplayer popup

  CrsiX

  committed
  2a4aaad

  Copy full SHA for 2a4aaad

Commits on Jun 9, 2023

• Improved the game list and added a new popup for modifications

  CrsiX

  committed
  70a8adb

  Copy full SHA for 70a8adb

• Fixed build by moving ktorVersion to buildSrc dir

  CrsiX

  committed
  f0444f5

  Copy full SHA for f0444f5

Commits on Jun 14, 2023

• Merge branch 'master' into dev

  CrsiX

  committed
  23d3d0d

  Copy full SHA for 23d3d0d

• Fixed broken CreateLobbyPopup, added extra "invalid password" answer

  CrsiX

  committed
  1b95ae1

  Copy full SHA for 1b95ae1

Commits on Jun 15, 2023

• Replaced all wildcard imports with named imports

  CrsiX

  committed
  50ada3b

  Copy full SHA for 50ada3b

Commits on Jun 19, 2023

• Moved the default message to the ApiStatusCode enum (MPv2)

  CrsiX

  committed
  1db199a

  Copy full SHA for 1db199a

Commits on Jun 20, 2023

• Merge branch 'master' into dev

  CrsiX

  committed
  1810556

  Copy full SHA for 1810556

Commits on Jun 22, 2023

• Fixed imports

  CrsiX

  committed
  7f7134f

  Copy full SHA for 7f7134f

Commits on Jun 24, 2023

• Replaced most runBlocking calls with Concurrency.runBlocking calls

  Show description for 19445ef
  CrsiX

  committed
  19445ef

  Copy full SHA for 19445ef

• Reworked the APIv2 file storage mechanism

  CrsiX

  committed
  d9f1930

  Copy full SHA for d9f1930

Commits on Jun 25, 2023

• Smaller network improvements, extended docs

  CrsiX

  committed
  5f258b8

  Copy full SHA for 5f258b8

• Reworked the access to the api and apiVersion properties, fixed MultiplayerTab's refresh calls

  CrsiX

  committed
  c69c9b3

  Copy full SHA for c69c9b3

Commits on Jun 27, 2023

• Reworked the LobbyPlayerList and the LobbyScreen sync (mutex behavior)

  Show description for c024098
  CrsiX

  committed
  c024098

  Copy full SHA for c024098

Commits on Jul 8, 2023

• Fixed an instant app crash on Android due to uninitialized UncivGame

  CrsiX

  committed
  f03884d

  Copy full SHA for f03884d

Commits on Oct 7, 2023

• Merge branch 'master' into dev

  CrsiX

  committed
  5b4c652

  Copy full SHA for 5b4c652

• Merge branch 'master' into dev

  CrsiX

  committed
  0db9d14

  Copy full SHA for 0db9d14