h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-11 01:07:23 +08:00
Code Issues Releases Wiki Activity

Refactor post-join setup to not pass delegates around

Browse Source
This commit is contained in:
Dan Balasescu 2025-02-27 14:50:35 +09:00
parent a33aff9bbd
commit 47ca5c90a5
No known key found for this signature in database
1 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
osu.Game/Online/Multiplayer/MultiplayerClient.cs
View File

@ -170,13 +170,23 @@ namespace osu.Game.Online.Multiplayer
private readonly TaskChain joinOrLeaveTaskChain = new TaskChain(); private readonly TaskChain joinOrLeaveTaskChain = new TaskChain();
private CancellationTokenSource? joinCancellationSource; private CancellationTokenSource? joinCancellationSource;
/// <summary>
/// Creates and joins a <see cref="MultiplayerRoom"/> described by an API <see cref="Room"/>.
/// </summary>
/// <param name="room">The API <see cref="Room"/> describing the room to create.</param>
/// <exception cref="InvalidOperationException">If the current user is already in another room.</exception>
public async Task CreateRoom(Room room) public async Task CreateRoom(Room room)
{ {
if (Room != null) if (Room != null)
throw new InvalidOperationException("Cannot create a multiplayer room while already in one."); throw new InvalidOperationException("Cannot create a multiplayer room while already in one.");
var cancellationSource = joinCancellationSource = new CancellationTokenSource(); var cancellationSource = joinCancellationSource = new CancellationTokenSource();
await initRoom(room, r => CreateRoomInternal(new MultiplayerRoom(room)), cancellationSource.Token).ConfigureAwait(false);
await joinOrLeaveTaskChain.Add(async () =>
{
var multiplayerRoom = await CreateRoomInternal(new MultiplayerRoom(room)).ConfigureAwait(false);
await setupJoinedRoom(room, multiplayerRoom, cancellationSource.Token).ConfigureAwait(false);
}, cancellationSource.Token).ConfigureAwait(false);
} }
/// <summary> /// <summary>
@ -184,54 +194,61 @@ namespace osu.Game.Online.Multiplayer
/// </summary> /// </summary>
/// <param name="room">The API <see cref="Room"/>.</param> /// <param name="room">The API <see cref="Room"/>.</param>
/// <param name="password">An optional password to use for the join operation.</param> /// <param name="password">An optional password to use for the join operation.</param>
/// <exception cref="InvalidOperationException">If the current user is already in another room, or <paramref name="room"/> does not represent an active room.</exception>
public async Task JoinRoom(Room room, string? password = null) public async Task JoinRoom(Room room, string? password = null)
{ {
if (Room != null) if (Room != null)
throw new InvalidOperationException("Cannot join a multiplayer room while already in one."); throw new InvalidOperationException("Cannot join a multiplayer room while already in one.");
Debug.Assert(room.RoomID != null); if (room.RoomID == null)
throw new InvalidOperationException("Cannot join an inactive room.");
var cancellationSource = joinCancellationSource = new CancellationTokenSource(); var cancellationSource = joinCancellationSource = new CancellationTokenSource();
await initRoom(room, r => JoinRoomInternal(room.RoomID.Value, password ?? room.Password), cancellationSource.Token).ConfigureAwait(false);
}
private async Task initRoom(Room room, Func<Room, Task<MultiplayerRoom>> initFunc, CancellationToken cancellationToken)
{
await joinOrLeaveTaskChain.Add(async () => await joinOrLeaveTaskChain.Add(async () =>
{ {
// Initialise the server-side room. var multiplayerRoom = await JoinRoomInternal(room.RoomID.Value, password ?? room.Password).ConfigureAwait(false);
MultiplayerRoom joinedRoom = await initFunc(room).ConfigureAwait(false); await setupJoinedRoom(room, multiplayerRoom, cancellationSource.Token).ConfigureAwait(false);
}, cancellationSource.Token).ConfigureAwait(false);
}
// Populate users. /// <summary>
await PopulateUsers(joinedRoom.Users).ConfigureAwait(false); /// Performs post-join setup of a <see cref="MultiplayerRoom"/>.
/// </summary>
/// <param name="apiRoom">The incoming API <see cref="Room"/> that was requested to be joined.</param>
/// <param name="joinedRoom">The resuling <see cref="MultiplayerRoom"/> that was joined.</param>
/// <param name="cancellationToken">A token to cancel the process.</param>
private async Task setupJoinedRoom(Room apiRoom, MultiplayerRoom joinedRoom, CancellationToken cancellationToken)
{
// Populate users.
await PopulateUsers(joinedRoom.Users).ConfigureAwait(false);
// Update the stored room (must be done on update thread for thread-safety). // Update the stored room (must be done on update thread for thread-safety).
await runOnUpdateThreadAsync(() => await runOnUpdateThreadAsync(() =>
{ {
Debug.Assert(Room == null); Debug.Assert(Room == null);
Debug.Assert(APIRoom == null); Debug.Assert(APIRoom == null);
Room = joinedRoom; Room = joinedRoom;
APIRoom = room; APIRoom = apiRoom;
APIRoom.RoomID = joinedRoom.RoomID; APIRoom.RoomID = joinedRoom.RoomID;
APIRoom.Playlist = joinedRoom.Playlist.Select(item => new PlaylistItem(item)).ToArray(); APIRoom.Playlist = joinedRoom.Playlist.Select(item => new PlaylistItem(item)).ToArray();
APIRoom.CurrentPlaylistItem = APIRoom.Playlist.Single(item => item.ID == joinedRoom.Settings.PlaylistItemId); APIRoom.CurrentPlaylistItem = APIRoom.Playlist.Single(item => item.ID == joinedRoom.Settings.PlaylistItemId);
// The server will null out the end date upon the host joining the room, but the null value is never communicated to the client. // The server will null out the end date upon the host joining the room, but the null value is never communicated to the client.
APIRoom.EndDate = null; APIRoom.EndDate = null;
Debug.Assert(LocalUser != null); Debug.Assert(LocalUser != null);
addUserToAPIRoom(LocalUser); addUserToAPIRoom(LocalUser);
foreach (var user in joinedRoom.Users) foreach (var user in joinedRoom.Users)
updateUserPlayingState(user.UserID, user.State); updateUserPlayingState(user.UserID, user.State);
updateLocalRoomSettings(joinedRoom.Settings); updateLocalRoomSettings(joinedRoom.Settings);
postServerShuttingDownNotification(); postServerShuttingDownNotification();
OnRoomJoined(); OnRoomJoined();
}, cancellationToken).ConfigureAwait(false);
}, cancellationToken).ConfigureAwait(false); }, cancellationToken).ConfigureAwait(false);
} }