From 5aec0b2d1304644e1b10a5d4bd1268b2dee6719b Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Tue, 11 Nov 2025 17:49:52 +0700
Subject: [PATCH] TF-3976: Fix URL lookup failure when DNS resolution fails

---
 .../dns_lookup/dns_lookup_manager.dart        | 33 ++++++-------------
 pubspec.lock                                  |  4 +--
 pubspec.yaml                                  |  2 +-
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/lib/features/login/data/network/dns_lookup/dns_lookup_manager.dart b/lib/features/login/data/network/dns_lookup/dns_lookup_manager.dart
index ee3ad1c8d..03407ec45 100644
--- a/lib/features/login/data/network/dns_lookup/dns_lookup_manager.dart
+++ b/lib/features/login/data/network/dns_lookup/dns_lookup_manager.dart
@@ -33,13 +33,13 @@ class DnsLookupManager {
     const debug = BuildUtils.isDebugMode;
     switch (priority) {
       case DnsLookupPriority.system:
-        return SystemUdpSrvClient(debugMode: debug);
+        return SystemUdpSrvClient(debugMode: debug, timeout: _defaultTimeout);
       case DnsLookupPriority.publicUdp:
-        return PublicUdpSrvClient(debugMode: debug);
+        return PublicUdpSrvClient(debugMode: debug, timeout: _defaultTimeout);
       case DnsLookupPriority.publicDoh:
-        return DnsOverHttpsBinaryClient(debugMode: debug);
+        return DnsOverHttpsBinaryClient(debugMode: debug, timeout: _defaultTimeout);
       case DnsLookupPriority.cloud:
-        return DnsOverHttps.google(debugMode: debug);
+        return DnsOverHttps.empty(debugMode: debug, timeout: _defaultTimeout);
     }
   }
 
@@ -56,31 +56,18 @@ class DnsLookupManager {
 
     for (final priority in priorities) {
       final client = createClient(priority);
-      log('$runtimeType::lookupJmapUrl → 🔍 Trying ${priority.label} (timeout: ${_defaultTimeout.inSeconds}s)...');
+      log('$runtimeType::lookupJmapUrl → 🔍 Trying ${priority.label} (timeout: ${client.timeout.inSeconds}s)...');
 
       try {
         final records = client is DnsOverHttps
-            ? await client.lookupSrvParallel(jmapHostName).timeout(
-                _defaultTimeout,
-                onTimeout: () {
-                  throw TimeoutException(
-                      'Lookup timed out after ${_defaultTimeout.inSeconds}s');
-                },
-              )
-            : await client.lookupSrv(jmapHostName).timeout(
-                _defaultTimeout,
-                onTimeout: () {
-                  throw TimeoutException(
-                      'Lookup timed out after ${_defaultTimeout.inSeconds}s');
-                },
-              );
+            ? await client.lookupSrvMulti(jmapHostName)
+            : await client.lookupSrv(jmapHostName);
 
-        if (records.isNotEmpty) {
-          final target = records.first.target;
+        final target = records.firstOrNull?.target ?? '';
+        if (target.isNotEmpty) {
           log('$runtimeType::lookupJmapUrl → ✅ Success via ${priority.label}: $target');
           return target;
         }
-
         log('$runtimeType::lookupJmapUrl → ⚠️ No records via ${priority.label}, continuing...');
       } on TimeoutException catch (_) {
         logError(
@@ -92,6 +79,6 @@ class DnsLookupManager {
     }
 
     log('$runtimeType::lookupJmapUrl → 🚨 All DNS lookups failed for $jmapHostName');
-    return '';
+    throw Exception('DNS lookup failed for $jmapHostName');
   }
 }
diff --git a/pubspec.lock b/pubspec.lock
index 6a3ae56c3..836562418 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -2169,10 +2169,10 @@ packages:
     dependency: "direct main"
     description:
       name: super_dns_client
-      sha256: fe51cb3da20be471ca1d72293bf0f86ddff015fbc1644b586cdb695e85433b9c
+      sha256: dbb9d36e91c22dcd3455b930efbc3c6f68074a91d4e7e11efb89d721387f3593
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.3"
+    version: "0.3.6"
   super_ip:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 9bae1a141..ca2457b32 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -105,7 +105,7 @@ dependencies:
   ### Dependencies from pub.dev ###
   super_tag_editor: 1.1.0
 
-  super_dns_client: 0.3.3
+  super_dns_client: 0.3.6
 
   external_app_launcher: 4.0.3