mirror of
https://github.com/ppy/osu.git
synced 2026-05-18 19:10:28 +08:00
1c4ecba950
This is in response to https://osu.ppy.sh/community/forums/topics/2058708?n=5, wherein the user is having a problem with joining multiplayer, but I have basically no diagnosing capabilities, because the logs are all 2025-03-26 18:57:57 [error]: Failed to join multiplayer room: 2025-03-26 18:58:40 [error]: Failed to join multiplayer room: 2025-03-26 18:58:41 [error]: Failed to join multiplayer room: 2025-03-26 18:58:41 [error]: Failed to join multiplayer room: which appears to originate from https://github.com/ppy/osu/blob/c82eaafe98d96b9f49a4a7f168ef5c484e67d76f/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs#L91 Now, as far as I can tell, there are two possibilities here: 1. The exception's `Message` is null or empty. That's not exactly great or typical, but sure, this could possibly happen - in which case the error logging is silently eating whatever little relevant detail there is left to use. 2. The exception is *actually* `null` itself, and we're in the X Files. This PR is intending to defend against (1). In examining the logging further, I also spotted the following issues: - In the single path that specifies a custom failure handler (which is `DrawableLoungeRoom` which handles joining a passworded room), the custom failure handler being present means that the error would be presented to the user, but it would not be logged. At all. - In playlists, if the exception for whatever reason had an empty message, an empty notification would get posted. And in general to me it feels a bit dodgy to be directly presenting exception notifications to users without any preamble, hence the added "Failed to open playlist" prefix.
111 lines
4.2 KiB
C#
111 lines
4.2 KiB
C#
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
// See the LICENCE file in the repository root for full licence text.
|
|
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using osu.Framework.Allocation;
|
|
using osu.Framework.Extensions.ExceptionExtensions;
|
|
using osu.Framework.Logging;
|
|
using osu.Framework.Graphics;
|
|
using osu.Framework.Graphics.UserInterface;
|
|
using osu.Game.Configuration;
|
|
using osu.Game.Graphics.UserInterface;
|
|
using osu.Game.Online.API;
|
|
using osu.Game.Online.Multiplayer;
|
|
using osu.Game.Online.Rooms;
|
|
using osu.Game.Screens.OnlinePlay.Lounge;
|
|
using osu.Game.Screens.OnlinePlay.Lounge.Components;
|
|
|
|
namespace osu.Game.Screens.OnlinePlay.Multiplayer
|
|
{
|
|
public partial class MultiplayerLoungeSubScreen : LoungeSubScreen
|
|
{
|
|
[Resolved]
|
|
private IAPIProvider api { get; set; } = null!;
|
|
|
|
[Resolved]
|
|
private MultiplayerClient client { get; set; } = null!;
|
|
|
|
private Dropdown<RoomPermissionsFilter> roomAccessTypeDropdown = null!;
|
|
private OsuCheckbox showInProgress = null!;
|
|
|
|
protected override IEnumerable<Drawable> CreateFilterControls()
|
|
{
|
|
foreach (var control in base.CreateFilterControls())
|
|
yield return control;
|
|
|
|
yield return roomAccessTypeDropdown = new SlimEnumDropdown<RoomPermissionsFilter>
|
|
{
|
|
RelativeSizeAxes = Axes.None,
|
|
Current = Config.GetBindable<RoomPermissionsFilter>(OsuSetting.MultiplayerRoomFilter),
|
|
Width = 160,
|
|
};
|
|
|
|
roomAccessTypeDropdown.Current.BindValueChanged(_ => UpdateFilter());
|
|
|
|
yield return showInProgress = new OsuCheckbox
|
|
{
|
|
LabelText = "Show in-progress rooms",
|
|
RelativeSizeAxes = Axes.None,
|
|
Width = 220,
|
|
Padding = new MarginPadding { Vertical = 5, },
|
|
Current = Config.GetBindable<bool>(OsuSetting.MultiplayerShowInProgressFilter),
|
|
};
|
|
|
|
showInProgress.Current.BindValueChanged(_ => UpdateFilter());
|
|
StatusDropdown.Current.BindValueChanged(_ => showInProgress.Alpha = StatusDropdown.Current.Value == RoomModeFilter.Open ? 1 : 0, true);
|
|
}
|
|
|
|
protected override FilterCriteria CreateFilterCriteria()
|
|
{
|
|
var criteria = base.CreateFilterCriteria();
|
|
criteria.Category = @"realtime";
|
|
criteria.Permissions = roomAccessTypeDropdown.Current.Value;
|
|
criteria.Status = showInProgress.Current.Value && criteria.Mode == RoomModeFilter.Open ? null : RoomStatusFilter.Idle;
|
|
return criteria;
|
|
}
|
|
|
|
protected override OsuButton CreateNewRoomButton() => new CreateMultiplayerMatchButton();
|
|
|
|
protected override Room CreateNewRoom() => new Room
|
|
{
|
|
Name = $"{api.LocalUser}'s awesome room",
|
|
Type = MatchType.HeadToHead,
|
|
};
|
|
|
|
protected override OnlinePlaySubScreen CreateRoomSubScreen(Room room) => new MultiplayerMatchSubScreen(room);
|
|
|
|
protected override void JoinInternal(Room room, string? password, Action<Room> onSuccess, Action<string, Exception?> onFailure)
|
|
{
|
|
client.JoinRoom(room, password).ContinueWith(result =>
|
|
{
|
|
if (result.IsCompletedSuccessfully)
|
|
onSuccess(room);
|
|
else
|
|
{
|
|
Exception? exception = result.Exception?.AsSingular();
|
|
|
|
if (exception?.GetHubExceptionMessage() is string message)
|
|
onFailure(message, exception);
|
|
else
|
|
onFailure($"Failed to join multiplayer room. {exception?.Message}", exception);
|
|
}
|
|
});
|
|
}
|
|
|
|
public override void Close(Room room)
|
|
=> throw new NotSupportedException("Cannot close multiplayer rooms.");
|
|
|
|
protected override void OpenNewRoom(Room room)
|
|
{
|
|
if (!client.IsConnected.Value)
|
|
{
|
|
Logger.Log("Not currently connected to the multiplayer server.", LoggingTarget.Runtime, LogLevel.Important);
|
|
return;
|
|
}
|
|
|
|
base.OpenNewRoom(room);
|
|
}
|
|
}
|
|
}
|