Skip to content

Fix LAN network cleanup state for stability #959

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

Fix LAN network cleanup state for stability #959

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
29 changes: 23 additions & 6 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();
_disposeInternals(markDisposed: false);
onDisconnected?.call();
}

Expand All @@ -958,11 +958,13 @@ class NetworkService with WidgetsBindingObserver {
_disposeInternals();
}

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

try {
_clientSocket?.destroy();
Expand Down Expand Up @@ -1000,11 +1002,26 @@ class NetworkService with WidgetsBindingObserver {

_messageQueue.clear();
_isProcessingMessages = false;
if (_protocolHandshakeCompleter != null &&
!_protocolHandshakeCompleter!.isCompleted) {
_protocolHandshakeCompleter!.complete(false);
}
_protocolHandshakeCompleter = null;
_heartbeatStarted = false;
_isReconnecting = false;
_messagesSent = 0;
_messagesReceived = 0;
_reconnectAttempts = 0;
_opponentAddress = null;
_opponentPort = null;
_lastConnectionTime = null;

logger.i("$_logTag Network disposed");
if (!markDisposed) {
_disposed = false;
logger.i("$_logTag Network connection reset");
Comment on lines 1002 to +1021

@chatgpt-codex-connector chatgpt-codex-connector Bot Oct 12, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Guard _disposeInternals against re-entrancy

The new _disposeInternals({bool markDisposed = true}) skips setting _disposed when markDisposed is false and immediately resets it to false at the end. _handleDisconnection now calls this method with markDisposed: false, so during teardown the service never enters a disposed state. Socket listeners (onError, onDone) and heartbeat timers check _disposed before invoking _handleDisconnection, meaning multiple callbacks that fire during the same disconnect will all pass the check and re-enter the teardown logic. This can invoke onDisconnected and UI updates multiple times and race concurrent clean‑ups. To keep the service reusable while still preventing repeated work, _disposeInternals should temporarily mark _disposed true while cleaning up and only set it back to false after the reset completes.

Useful? React with 👍 / 👎.

} else {
logger.i("$_logTag Network disposed");
}
}

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