Skip to content

Improve LAN network service cleanup robustness #957

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

Open
calcitem wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve LAN network service cleanup robustness #957

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 25 additions & 7 deletions src/ui/flutter_app/lib/game_page/services/network/network_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,7 @@ class NetworkService with WidgetsBindingObserver {
}

_notifyConnectionStatusChanged(false, info: userFriendlyMessage);
_disposeInternals();
_resetConnectionState();
onDisconnected?.call();
}

Expand All @@ -955,20 +955,20 @@ class NetworkService with WidgetsBindingObserver {
}
WidgetsBinding.instance.removeObserver(this);
logger.i("$_logTag dispose() called");
_disposeInternals();
_resetConnectionState(markDisposed: true);
}

void _disposeInternals() {
if (_disposed) {
void _resetConnectionState({bool markDisposed = false}) {
if (markDisposed && _disposed) {
return;
}
_disposed = true;

try {
_clientSocket?.destroy();
} catch (e) {
logger.e("$_logTag Error destroying client socket: $e");
}

try {
if (_serverSocket != null) {
if (_serverSocket!.port > 0) {
Expand Down Expand Up @@ -998,13 +998,31 @@ class NetworkService with WidgetsBindingObserver {
_heartbeatCheckTimer = null;
_reconnectTimer = null;

if (_protocolHandshakeCompleter != null &&
!_protocolHandshakeCompleter!.isCompleted) {
_protocolHandshakeCompleter!.complete(false);
}
_protocolHandshakeCompleter = null;

_messageQueue.clear();
_isProcessingMessages = false;
_protocolHandshakeCompleter = null;
_heartbeatStarted = false;
_isReconnecting = false;
_messagesSent = 0;
_messagesReceived = 0;
_reconnectAttempts = 0;
_lastConnectionTime = null;
_opponentAddress = null;
_opponentPort = null;
isHost = false;

logger.i("$_logTag Network disposed");
if (markDisposed) {
_disposed = true;
logger.i("$_logTag Network disposed");
} else {
_disposed = false;
logger.i("$_logTag Network connection reset");
}
}

/// Returns the first non-loopback IPv4 address, or null if not found.
Expand Down
Loading