Fix zoom gestures, enhance download UX, add DNS-over-HTTPS, and improve logging

Fix zoom gestures, enhance download UX, add DNS-over-HTTPS, and improve logging

Author: warreth

lib/main.dart

@@ -13,6 +13,7 @@ import 'package:sqflite_common_ffi/sqflite_ffi.dart';
 
 // Project imports:
 import 'package:openlib/services/database.dart' show MyLibraryDb;
+import 'package:openlib/services/dns_resolver.dart';
 import 'package:openlib/ui/mylibrary_page.dart';
 import 'package:openlib/ui/search_page.dart';
 import 'package:openlib/ui/settings_page.dart';
@@ -28,6 +29,8 @@ import 'package:openlib/state/state.dart'
         themeModeProvider,
         openPdfWithExternalAppProvider,
         openEpubWithExternalAppProvider,
+        showManualDownloadButtonProvider,
+        selectedDnsProviderIndexProvider,
         userAgentProvider,
         cookieProvider;
 
@@ -59,6 +62,24 @@ void main() async {
       ? false
       : true;
 
+  bool showManualDownloadButton = await dataBase
+              .getPreference('showManualDownloadButton')
+              .catchError((e) => null) ==
+          0
+      ? false
+      : true;
+
+  int selectedDnsProviderIndex = await dataBase
+      .getPreference('selectedDnsProviderIndex')
+      .catchError((e) => 0);
+
+  // Initialize DNS resolver with saved preference
+  final dnsResolver = DnsResolverService();
+  if (selectedDnsProviderIndex >= 0 && 
+      selectedDnsProviderIndex < DnsProviders.builtIn.length) {
+    dnsResolver.setProvider(DnsProviders.builtIn[selectedDnsProviderIndex]);
+  }
+
   String browserUserAgent = await dataBase.getBrowserOptions('userAgent');
   String browserCookie = await dataBase.getBrowserOptions('cookie');
 
@@ -79,6 +100,10 @@ void main() async {
             .overrideWith((ref) => openPdfwithExternalapp),
         openEpubWithExternalAppProvider
             .overrideWith((ref) => openEpubwithExternalapp),
+        showManualDownloadButtonProvider
+            .overrideWith((ref) => showManualDownloadButton),
+        selectedDnsProviderIndexProvider
+            .overrideWith((ref) => selectedDnsProviderIndex),
         userAgentProvider.overrideWith((ref) => browserUserAgent),
         cookieProvider.overrideWith((ref) => browserCookie),
       ],

lib/services/annas_archieve.dart

@@ -5,6 +5,8 @@ import 'package:html/dom.dart' as dom;
 
 // Project imports:
 import 'package:openlib/services/instance_manager.dart';
+import 'package:openlib/services/logger.dart';
+import 'package:openlib/services/dns_resolver.dart';
 
 // ====================================================================
 // DATA MODELS
@@ -56,9 +58,16 @@ class AnnasArchieve {
 
   final Dio dio = Dio();
   final InstanceManager _instanceManager = InstanceManager();
+  final AppLogger _logger = AppLogger();
+  final DnsResolverService _dnsResolver = DnsResolverService();
   static const int maxRetries = 2; // Check each server 2x as per requirements
   static const int retryDelayMs = 500; // Delay between retries in milliseconds
 
+  AnnasArchieve() {
+    // Configure Dio to use DNS-over-HTTPS
+    _dnsResolver.configureDio(dio);
+  }
+
   Map<String, dynamic> defaultDioHeaders = {
     "user-agent":
         "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36",
@@ -284,8 +293,16 @@ class AnnasArchieve {
       String sort = "",
       String fileType = "",
       bool enableFilters = true}) async {
+    _logger.info('Searching books', tag: 'AnnasArchive', metadata: {
+      'query': searchQuery,
+      'content': content,
+      'sort': sort,
+      'fileType': fileType,
+      'filtersEnabled': enableFilters,
+    });
+    
     try {
-      return await _requestWithRetry<List<BookData>>((currentBaseUrl) async {
+      final books = await _requestWithRetry<List<BookData>>((currentBaseUrl) async {
         final String encodedURL = urlEncoder(
             searchQuery: searchQuery,
             content: content,
@@ -294,11 +311,16 @@ class AnnasArchieve {
             enableFilters: enableFilters,
             currentBaseUrl: currentBaseUrl);
 
+        _logger.debug('Fetching search results', tag: 'AnnasArchive', metadata: {'url': encodedURL});
         final response = await dio.get(encodedURL,
             options: Options(headers: defaultDioHeaders));
         return _parser(response.data, fileType, currentBaseUrl);
       });
+      
+      _logger.info('Search completed', tag: 'AnnasArchive', metadata: {'results': books.length});
+      return books;
     } on DioException catch (e) {
+        _logger.error('Search failed', tag: 'AnnasArchive', error: e.message ?? e.error);
         if (e.type == DioExceptionType.unknown) {
             throw "socketException";
         }
@@ -307,8 +329,10 @@ class AnnasArchieve {
   }
 
   Future<BookInfoData> bookInfo({required String url}) async {
+    _logger.info('Fetching book info', tag: 'AnnasArchive', metadata: {'url': url});
+    
     try {
-      return await _requestWithRetry<BookInfoData>((currentBaseUrl) async {
+      final data = await _requestWithRetry<BookInfoData>((currentBaseUrl) async {
         // Replace the base URL in the url parameter if it contains a different one
         String adjustedUrl = url;
         final urlParsed = Uri.parse(url);
@@ -319,6 +343,7 @@ class AnnasArchieve {
           adjustedUrl = '$currentBaseUrl${urlParsed.path}${urlParsed.query.isNotEmpty ? "?${urlParsed.query}" : ""}';
         }
 
+        _logger.debug('Fetching book details', tag: 'AnnasArchive', metadata: {'url': adjustedUrl});
         final response = await dio.get(adjustedUrl, 
             options: Options(headers: defaultDioHeaders));
         BookInfoData? data = await _bookInfoParser(response.data, adjustedUrl, currentBaseUrl);
@@ -328,7 +353,15 @@ class AnnasArchieve {
           throw 'unable to get data';
         }
       });
+      
+      _logger.info('Book info retrieved successfully', tag: 'AnnasArchive', metadata: {
+        'title': data.title,
+        'format': data.format,
+        'hasMirror': data.mirror != null,
+      });
+      return data;
     } on DioException catch (e) {
+      _logger.error('Failed to fetch book info', tag: 'AnnasArchive', error: e.message ?? e.error);
       if (e.type == DioExceptionType.unknown) {
         throw "socketException";
       }

lib/services/database.dart

@@ -114,6 +114,10 @@ class MyLibraryDb {
             "INSERT OR IGNORE INTO preferences (name, value) VALUES ('openEpubwithExternalApp', 0)");
         await db.execute(
             "INSERT OR IGNORE INTO preferences (name, value) VALUES ('bookStorageDirectory', '$bookStorageDefaultDirectory')");
+        await db.execute(
+            "INSERT OR IGNORE INTO preferences (name, value) VALUES ('showManualDownloadButton', 0)");
+        await db.execute(
+            "INSERT OR IGNORE INTO preferences (name, value) VALUES ('selectedDnsProviderIndex', 0)");
       },
     );
   }