From 767736d0769d2810dd17ea17a50c6811d80954dd Mon Sep 17 00:00:00 2001
From: Krushna Kanta Rout <129386740+krushnarout@users.noreply.github.com>
Date: Wed, 7 Jan 2026 23:55:27 +0530
Subject: [PATCH 1/2] fix improve error handling

---
 app/lib/backend/http/http_pool_manager.dart | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/lib/backend/http/http_pool_manager.dart b/app/lib/backend/http/http_pool_manager.dart
index ee65b25a16..e44e4c4ef1 100644
--- a/app/lib/backend/http/http_pool_manager.dart
+++ b/app/lib/backend/http/http_pool_manager.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 import 'package:http/http.dart' as http;
+import 'package:flutter/foundation.dart';
 import 'package:http/io_client.dart';
 import 'package:pool/pool.dart';
 
@@ -74,7 +75,6 @@ class HttpPoolManager {
         lastError = e;
       } catch (e) {
         lastError = e;
-        rethrow;
       }
 
       if (i < retries) {
@@ -83,7 +83,10 @@ class HttpPoolManager {
     }
 
     if (lastResponse != null) return lastResponse;
-    throw lastError ?? Exception('Request failed with unknown error');
+    if(lastError != null) {
+      debugPrint('HTTP retry failed: $lastError');
+    }
+    return http.Response('', 503);
   }
 
   Future<http.StreamedResponse> sendStreaming(http.BaseRequest request) {

From f97051a66db2b59f044ad43ae25d136af52092eb Mon Sep 17 00:00:00 2001
From: Krushna Kanta Rout <129386740+krushnarout@users.noreply.github.com>
Date: Thu, 8 Jan 2026 00:03:12 +0530
Subject: [PATCH 2/2] fix handshake exception

---
 app/lib/backend/http/http_pool_manager.dart | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/lib/backend/http/http_pool_manager.dart b/app/lib/backend/http/http_pool_manager.dart
index e44e4c4ef1..9d4f1987c2 100644
--- a/app/lib/backend/http/http_pool_manager.dart
+++ b/app/lib/backend/http/http_pool_manager.dart
@@ -71,6 +71,8 @@ class HttpPoolManager {
         lastError = TimeoutException('Request timeout');
       } on SocketException catch (e) {
         lastError = e;
+      } on HandshakeException catch (e) {
+        lastError = e;
       } on http.ClientException catch (e) {
         lastError = e;
       } catch (e) {