Implemented better API handling

Author: MrAlders0n

lib/providers/app_state_provider.dart

@@ -830,6 +830,17 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
 
           debugLog('[APP] Stage 1 failed: ${result['message'] ?? 'Unknown error'}');
 
+          // If Stage 1 failed due to GPS issues, Stage 2 will also fail with same bad data
+          final stage1Reason = result['reason'] as String?;
+          if (stage1Reason == 'gps_inaccurate' || stage1Reason == 'gps_stale') {
+            debugError('[APP] Stage 1 failed for GPS reason ($stage1Reason), skipping Stage 2');
+            return {
+              'success': false,
+              'reason': stage1Reason,
+              'message': result['message'] as String?,
+            };
+          }
+
           // ============================================================
           // STAGE 2: Auth failed, attempt registration via signed contact_uri
           // ============================================================
@@ -873,11 +884,13 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
           }
 
           if (registerResult['success'] != true) {
-            debugError('[APP] Stage 2 failed: registration rejected by server');
+            final serverReason = registerResult['reason'] as String? ?? 'registration_failed';
+            final serverMessage = registerResult['message'] as String?;
+            debugError('[APP] Stage 2 failed: $serverReason - ${serverMessage ?? 'no message'}');
             return {
               'success': false,
-              'reason': 'registration_failed',
-              'message': 'Companion not found in backend and failed to register via API'
+              'reason': serverReason,
+              'message': serverMessage ?? 'Registration rejected by server',
             };
           }
 
@@ -1318,7 +1331,8 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
         if (parts.length > 1) {
           final errorParts = parts[1].split(':');
           final reason = errorParts.isNotEmpty ? errorParts[0] : 'unknown';
-          _connectionError = _getErrorMessage(reason, null);
+          final serverMessage = errorParts.length > 1 ? errorParts.sublist(1).join(':') : null;
+          _connectionError = _getErrorMessage(reason, serverMessage);
         } else {
           _connectionError = 'Authentication failed';
         }
@@ -2493,7 +2507,8 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
       }
 
       // Upload the batch
-      final success = await _apiService.uploadBatch(pings);
+      final result = await _apiService.uploadBatch(pings);
+      final success = result == UploadResult.success;
       if (success) {
         // Delete the session file on successful upload
         await _offlineSessionService.deleteSession(filename);
@@ -2579,8 +2594,8 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
 
     for (var i = 0; i < pings.length; i += batchSize) {
       final batch = pings.skip(i).take(batchSize).toList();
-      final success = await _apiService.uploadBatch(batch);
-      if (success) {
+      final result = await _apiService.uploadBatch(batch);
+      if (result == UploadResult.success) {
         uploadedCount += batch.length;
         debugLog('[APP] Uploaded batch ${(i ~/ batchSize) + 1}: ${batch.length} pings');
       } else {
@@ -2814,6 +2829,7 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
     const zoneErrors = {
       'outside_zone',
       'zone_full',
+      'zone_disabled',
     };
 
     // Handle errors that require disconnect
@@ -3064,9 +3080,17 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
         } else if (reason == 'gps_stale') {
           logError('GPS Stale Error\n$message');
           _scheduleZoneCheckRetry(seconds: 5, error: message, reason: 'gps_stale');
+        } else if (reason == 'zone_disabled') {
+          final errorMsg = _getErrorMessage(reason, message);
+          logError(errorMsg);
+          _scheduleZoneCheckRetry(seconds: 30, error: errorMsg, reason: reason!);
+        } else if (reason == 'bad_key' || reason == 'invalid_request') {
+          final errorMsg = _getErrorMessage(reason, message);
+          logError(errorMsg);
+          _scheduleZoneCheckRetry(seconds: 60, error: errorMsg, reason: reason!);
         } else {
-          // 500 server errors, database errors, or unknown failures
-          _scheduleZoneCheckRetry(seconds: 15, error: 'MeshMapper server error', reason: 'server_error');
+          // Unknown server errors — use server message
+          _scheduleZoneCheckRetry(seconds: 15, error: message, reason: 'server_error');
         }
 
         return;

lib/services/api_queue_service.dart

@@ -425,16 +425,22 @@ class ApiQueueService {
       debugLog('[API QUEUE] Uploading ${items.length} items...');
 
       // Attempt upload
-      final success = await _apiService.uploadBatch(pings);
+      final result = await _apiService.uploadBatch(pings);
 
-      if (success) {
+      if (result == UploadResult.success) {
         final uploadedCount = items.length;
         // Remove successful items
         for (final item in items) {
           await item.delete();
         }
         debugLog('[API QUEUE] Upload SUCCESS: deleted $uploadedCount items');
         onUploadSuccess?.call(uploadedCount);
+      } else if (result == UploadResult.nonRetryable) {
+        // Data is permanently invalid (bad GPS, invalid request, etc.) — discard
+        for (final item in items) {
+          await item.delete();
+        }
+        debugWarn('[API QUEUE] Discarded ${items.length} items (non-retryable error)');
       } else {
         // Mark items as retried
         for (final item in items) {

lib/services/api_service.dart

@@ -6,6 +6,9 @@ import 'package:http/http.dart' as http;
 import '../models/repeater.dart';
 import '../utils/debug_logger_io.dart';
 
+/// Result of a batch upload attempt
+enum UploadResult { success, retryable, nonRetryable }
+
 /// MeshMapper API service
 /// Handles communication with the MeshMapper backend
 ///
@@ -473,7 +476,7 @@ class ApiService {
     const criticalErrors = {
       'session_expired', 'session_invalid', 'session_revoked', 'bad_session',
       'invalid_key', 'unauthorized', 'bad_key',
-      'outside_zone', 'zone_full',
+      'outside_zone', 'zone_full', 'zone_disabled',
     };
     if (criticalErrors.contains(reason)) {
       _clearSession();
@@ -544,9 +547,28 @@ class ApiService {
     if (result?['success'] == true) {
       debugLog('[HEARTBEAT] Heartbeat successful');
       // Next heartbeat will be scheduled when we get new expires_at
-    } else {
-      debugWarn('[HEARTBEAT] Heartbeat failed: ${result?['message']}');
+    } else if (result == null) {
+      // Network error — transient, trigger session expiring
+      debugWarn('[HEARTBEAT] Heartbeat failed: network error');
       _onSessionExpiring?.call();
+    } else {
+      // Server returned an error — check if critical
+      final reason = result['reason'] as String?;
+      final message = result['message'] as String?;
+      debugWarn('[HEARTBEAT] Heartbeat failed: $reason - $message');
+
+      const criticalErrors = {
+        'session_expired', 'session_invalid', 'session_revoked', 'bad_session',
+        'invalid_key', 'unauthorized', 'bad_key',
+        'outside_zone', 'zone_full', 'zone_disabled',
+      };
+
+      if (criticalErrors.contains(reason)) {
+        _clearSession();
+        onSessionError?.call(reason, message);
+      } else {
+        _onSessionExpiring?.call();
+      }
     }
   }
 
@@ -572,28 +594,28 @@ class ApiService {
   /// Callback for maintenance mode detection (while connected)
   void Function(String message, String? url)? onMaintenanceMode;
 
-  /// Legacy: Upload batch (wrapper for submitWardriveData)
-  /// Returns true on success, false on failure
+  /// Upload batch of wardrive data
+  /// Returns UploadResult indicating success, retryable failure, or non-retryable failure
   /// Triggers onSessionError callback for session-related errors
-  Future<bool> uploadBatch(List<Map<String, dynamic>> pings) async {
-    if (pings.isEmpty) return true;
+  Future<UploadResult> uploadBatch(List<Map<String, dynamic>> pings) async {
+    if (pings.isEmpty) return UploadResult.success;
 
     try {
       final result = await submitWardriveData(pings);
 
       if (result == null) {
         debugError('[API] Upload batch failed: no response');
-        return false;
+        return UploadResult.retryable;
       }
 
       // Check for maintenance mode first
       if (_checkMaintenanceMode(result)) {
-        return false;
+        return UploadResult.retryable;
       }
 
       if (result['success'] == true) {
         debugLog('[API] Upload batch SUCCESS: ${pings.length} items');
-        return true;
+        return UploadResult.success;
       }
 
       // Check for session errors that require disconnect
@@ -606,7 +628,7 @@ class ApiService {
         // Auth errors
         'invalid_key', 'unauthorized', 'bad_key',
         // Zone errors
-        'outside_zone', 'zone_full',
+        'outside_zone', 'zone_full', 'zone_disabled',
       };
 
       if (criticalErrors.contains(reason)) {
@@ -616,12 +638,22 @@ class ApiService {
         _clearSession();
         // Notify listener for auto-disconnect
         onSessionError?.call(reason, message);
+        return UploadResult.nonRetryable;
+      }
+
+      // Errors where the batch data itself is invalid — retrying won't help
+      const nonRetryableErrors = {
+        'gps_inaccurate', 'gps_stale', 'invalid_request', 'zone_disabled', 'outofdate',
+      };
+      if (nonRetryableErrors.contains(reason)) {
+        debugWarn('[API] Upload batch non-retryable error: $reason - discarding batch');
+        return UploadResult.nonRetryable;
       }
 
-      return false;
+      return UploadResult.retryable;
     } catch (e) {
       debugError('[API] Upload batch exception: $e');
-      return false;
+      return UploadResult.retryable;
     }
   }