Skip to content

修复 ServerLinkHolder 无法重连的问题 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 1, 2025
Merged

修复 ServerLinkHolder 无法重连的问题 #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7037c19
修复 ServerLinkHolder 无法重连的问题
natsurainko Mar 31, 2025
e049e0b
Merge branch 'Corona-Studio:main' into main
natsurainko Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 30 additions & 24 deletions ConnectX.Client/ServerLinkHolder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public ServerLinkHolder(
_tcpConnector = tcpConnector;
_logger = logger;

_dispatcher.AddHandler<SigninSucceeded>(OnSigninSucceededReceived);
_dispatcher.AddHandler<HeartBeat>(OnHeartBeatReceived);
_dispatcher.AddHandler<ShutdownMessage>(OnShutdownMessageReceived);
}
Expand Down Expand Up @@ -101,37 +100,46 @@ private async Task CheckServerLivenessAsync(CancellationToken cancellationToken)

public async Task ConnectAsync(CancellationToken cancellationToken)
{
_logger.LogConnectingToServer();
_dispatcher.AddHandler<SigninSucceeded>(OnSigninSucceededReceived);

var endPoint = new IPEndPoint(_settingProvider.ServerAddress, _settingProvider.ServerPort);
var session = await _tcpConnector.ConnectAsync(endPoint, cancellationToken);
_logger.LogConnectingToServer();

if (session == null)
try
{
_logger.LogFailedToConnectToServer(endPoint);
return;
}
var endPoint = new IPEndPoint(_settingProvider.ServerAddress, _settingProvider.ServerPort);
var session = await _tcpConnector.ConnectAsync(endPoint, cancellationToken);

session.BindTo(_dispatcher);
session.StartAsync(cancellationToken).Forget();
if (session == null)
{
_logger.LogFailedToConnectToServer(endPoint);
return;
}

_logger.LogSendingSigninMessageToServer();
session.BindTo(_dispatcher);
session.StartAsync(cancellationToken).Forget();

await Task.Delay(1000, cancellationToken);
await _dispatcher.SendAsync(session, new SigninMessage
{
JoinP2PNetwork = _settingProvider.JoinP2PNetwork,
DisplayName = session.RemoteEndPoint?.ToString() ?? Guid.NewGuid().ToString("N")
}, cancellationToken);
_logger.LogSendingSigninMessageToServer();

await Task.Delay(1000, cancellationToken);
await _dispatcher.SendAsync(session, new SigninMessage
{
JoinP2PNetwork = _settingProvider.JoinP2PNetwork,
DisplayName = session.RemoteEndPoint?.ToString() ?? Guid.NewGuid().ToString("N")
}, cancellationToken);

await TaskHelper.WaitUntilAsync(() => IsSignedIn, cancellationToken);
await TaskHelper.WaitUntilAsync(() => IsSignedIn, cancellationToken);

_logger.LogConnectedAndSignedToServer(endPoint);
_logger.LogConnectedAndSignedToServer(endPoint);

ServerSession = session;
IsConnected = true;
ServerSession = session;
IsConnected = true;

Hive.Common.Shared.Helpers.TaskHelper.FireAndForget(() => CheckServerLivenessAsync(cancellationToken));
Hive.Common.Shared.Helpers.TaskHelper.FireAndForget(() => CheckServerLivenessAsync(cancellationToken));
}
finally
{
_dispatcher.RemoveHandler<SigninSucceeded>(OnSigninSucceededReceived);
}
}

public async Task DisconnectAsync(CancellationToken cancellationToken)
Expand All @@ -155,8 +163,6 @@ private void OnSigninSucceededReceived(MessageContext<SigninSucceeded> obj)
UserId = obj.Message.UserId;

_logger.LogSuccessfullyLoggedIn(UserId);

_dispatcher.RemoveHandler<SigninSucceeded>(OnSigninSucceededReceived);
}

private void OnHeartBeatReceived(MessageContext<HeartBeat> ctx)
Expand Down
Loading