A cross platform Audiobookshelf client for Android and iOS
Dart
Make cloud icon reflect actual server reachability
Barnabas2fd10560831e
diff --git a/lib/providers/_lp_core.dart b/lib/providers/_lp_core.dartindex 8d1d08c4..4ae2e594 100644--- a/lib/providers/_lp_core.dart+++ b/lib/providers/_lp_core.dart@@ -138,6 +138,7 @@ mixin _CoreMixin on ChangeNotifier, _StateMixin {final wasOffline = _networkOffline;_networkOffline = offline;if (offline && !wasOffline) {+ _stopHealthCheckTimer();_buildOfflineSections();notifyListeners();AndroidAutoService().refresh(force: true);@@ -146,6 +147,7 @@ mixin _CoreMixin on ChangeNotifier, _StateMixin {}} else if (!offline && wasOffline && !_manualOffline) {_stopServerPingTimer();+ _startHealthCheckTimer();PaintingBinding.instance.imageCache.clear();if (_api != null) {debugPrint('[Library] Back online — flushing pending syncs');@@ -539,11 +541,28 @@ mixin _CoreMixin on ChangeNotifier, _StateMixin {_auth?.clearLocalOverride();} else if (!_manualOffline) {if (result.contains(ConnectivityResult.wifi)) {- setNetworkOffline(false);- _auth?.checkLocalServer();- if (_rollingDownloadSeries.isNotEmpty) _catchUpRollingDownloads();- _catchUpQueueAutoDownloads();- (this as LibraryProvider).catchUpSubscribedPodcasts();+ // Verify server is actually reachable before flipping to online.+ // A wifi reconnect during a server outage should not make the cloud+ // icon look connected while API calls are still 5xx.+ await _auth?.checkLocalServer();+ final serverUrl = _auth?.activeServerUrl ?? _auth?.serverUrl ?? '';+ final reachable = serverUrl.isNotEmpty+ ? await ApiService.pingServer(serverUrl, customHeaders: _auth?.customHeaders ?? {})+ .timeout(const Duration(seconds: 5), onTimeout: () => false)+ : false;+ if (reachable) {+ setNetworkOffline(false);+ if (_rollingDownloadSeries.isNotEmpty) _catchUpRollingDownloads();+ _catchUpQueueAutoDownloads();+ (this as LibraryProvider).catchUpSubscribedPodcasts();+ } else {+ debugPrint('[Library] Wifi connected but server unreachable — starting ping timer');+ if (_networkOffline) {+ _startServerPingTimer();+ } else {+ _goOffline();+ }+ }} else {_auth?.clearLocalOverride();final serverUrl = _auth?.serverUrl ?? '';@@ -615,11 +634,43 @@ mixin _CoreMixin on ChangeNotifier, _StateMixin {_serverPingTimer = null;}+ // ── Health check (proactive reachability verification while online) ──+ //+ // The offline state only flips via explicit triggers (connectivity change,+ // ping timer success, manual toggle). HTTP 5xx bursts and socket connect+ // failures don't feed back, so during a server outage the cloud icon stays+ // green until the next explicit event. This periodic ping closes that gap.++ void _startHealthCheckTimer() {+ _healthCheckTimer?.cancel();+ if (_isBackgrounded) return;+ debugPrint('[Library] Health check timer started (60s ping while online)');+ _healthCheckTimer = Timer.periodic(const Duration(seconds: 60), (_) async {+ if (_networkOffline || _manualOffline || !_deviceHasConnectivity) return;+ final serverUrl = _auth?.activeServerUrl ?? _auth?.serverUrl ?? '';+ if (serverUrl.isEmpty) return;+ final reachable = await ApiService.pingServer(+ serverUrl,+ customHeaders: _auth?.customHeaders ?? {},+ ).timeout(const Duration(seconds: 10), onTimeout: () => false);+ if (!reachable) {+ debugPrint('[Library] Health check failed — server unreachable, going offline');+ setNetworkOffline(true);+ }+ });+ }++ void _stopHealthCheckTimer() {+ _healthCheckTimer?.cancel();+ _healthCheckTimer = null;+ }+// ── Battery-saving lifecycle ──void onAppBackgrounded() {_isBackgrounded = true;_stopServerPingTimer();+ _stopHealthCheckTimer();_idleDisconnectTimer?.cancel(); // No timers in background_idleDisconnectTimer = null;_softDisconnectSocket(); // Always disconnect, even during playback@@ -630,6 +681,8 @@ mixin _CoreMixin on ChangeNotifier, _StateMixin {_softReconnectSocket();if (_networkOffline && _deviceHasConnectivity && !_manualOffline) {_startServerPingTimer();+ } else if (!_networkOffline && !_manualOffline) {+ _startHealthCheckTimer();}_restartIdleTimer();}diff --git a/lib/providers/_lp_state.dart b/lib/providers/_lp_state.dartindex b20fb805..e1e64fdf 100644--- a/lib/providers/_lp_state.dart+++ b/lib/providers/_lp_state.dart@@ -62,6 +62,7 @@ mixin _StateMixin on ChangeNotifier {bool _networkOffline = false;bool _deviceHasConnectivity = true;Timer? _serverPingTimer;+ Timer? _healthCheckTimer;bool _isBackgrounded = false;bool _socketSoftDisconnected = false;diff --git a/lib/providers/library_provider.dart b/lib/providers/library_provider.dartindex c836478e..6833f36a 100644--- a/lib/providers/library_provider.dart+++ b/lib/providers/library_provider.dart@@ -67,6 +67,7 @@ class LibraryProvider extends ChangeNotifier_networkOffline = false;_connectivitySub?.cancel();_stopServerPingTimer();+ _stopHealthCheckTimer();_isLoading = true;notifyListeners();}@@ -124,6 +125,9 @@ class LibraryProvider extends ChangeNotifierProgressSyncService().flushPendingSync(api: _api!);ProgressSyncService().flushOfflineListeningTime(api: _api!);DownloadService().enrichMetadata(_api!);+ // Start proactive reachability verification so the cloud icon+ // reflects actual server state, not just the initial login result.+ _startHealthCheckTimer();}if (auth.serverUrl != null && auth.token != null) {final socket = SocketService();@@ -162,6 +166,7 @@ class LibraryProvider extends ChangeNotifier_connectivitySub?.cancel();_progressRefreshDebounce?.cancel();_stopServerPingTimer();+ _stopHealthCheckTimer();SocketService().disconnect();_personalizedInFlight = null;_lastPersonalizedFetchAt = null;