Merge pull request #1 from warreth/add-mirrors-and-settings

Add multi-instance support with automatic failover for Anna's Archive mirrors

Author: warreth

README.md

@@ -2,17 +2,18 @@
 
 <img src="assets/icons/appIcon.png" width="150">
 
-# Openlib
+# OpenlibExtended
+> I made this fork to keep using the app. It’s intended for personal use; I’ll keep it updated, but don’t expect weekly releases.
 
 An Open source app to download and read books from shadow library ([Anna’s Archive](https://annas-archive.org/))
 
 [![made-with-flutter](https://img.shields.io/badge/Made%20with-Flutter-4361ee.svg?style=for-the-badge)](https://flutter.dev/)
 [![GPLv3 License](https://img.shields.io/badge/License-GPL%20v3-e63946.svg?style=for-the-badge)](https://opensource.org/licenses/)
-[![Latest release](https://img.shields.io/github/release/dstark5/Openlib.svg?style=for-the-badge)](https://github.com/dstark5/Openlib/releases)
+[![Latest release](https://img.shields.io/github/release/warreth/OpenlibExtended.svg?style=for-the-badge)](https://github.com/warreth/OpenlibExtended/releases)
 
 [<img src="github_releases.png"
      alt="Get it on GitHub"
-     height="60">](https://github.com/dstark5/Openlib/releases)
+     height="60">](https://github.com/warreth/OpenlibExtended/releases)
 [<img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png"
      alt="Get it on IzzyOnDroid"
      height="60">](https://android.izzysoft.de/repo/apk/com.app.openlib)
@@ -28,7 +29,7 @@ An Open source app to download and read books from shadow library ([Anna’s Arc
 
 **WARNING:** This App Is In Beta Stage, So You May Encounter Bugs. If You Do, Open An Issue In Github Repository.
 
-**Publishing Openlib, Or Any Fork Of It In The Google Play Store Violates Their Terms And Conditions**
+**Publishing OpenlibExtended, Or Any Fork Of It In The Google Play Store Violates Their Terms And Conditions**
 
 ## Screenshots 🖼️
 
@@ -43,12 +44,18 @@ An Open source app to download and read books from shadow library ([Anna’s Arc
 
 ## Description 📖
 
-Openlib Is An Open Source App To Download And Read Books From Shadow Library ([Anna’s Archive](https://annas-archive.org/)). The App Has Built In Reader to Read Books
+OpenlibExtended Is An Open Source App To Download And Read Books From Shadow Library ([Anna’s Archive](https://annas-archive.org/)). The App Has Built In Reader to Read Books
 
 As [Anna’s Archive](https://annas-archive.org/) Doesn't Have An API. The App Works By Sending Request To Anna’s Archive And Parses The Response To objects. The App Extracts The Mirrors From Response And Downloads The Book
 
 ## Features ✨
 
+- **Multi-Instance Support** - Configure multiple Anna's Archive mirrors with automatic failover
+  - 6 pre-configured instances (Anna's Archive .gs, .se, .li, .st, .pm + welib.org)
+  - Add custom mirror instances
+  - Drag-to-reorder priority
+  - Enable/disable instances
+  - Automatic retry (2x per instance) with seamless fallback
 - Trending Books
 - Download And Read Books With In-Built Viewer
 - Supports Epub And Pdf Formats
@@ -70,7 +77,7 @@ As [Anna’s Archive](https://annas-archive.org/) Doesn't Have An API. The App W
 - Git Clone The Repo
 
      ```sh
-     git clone https://github.com/dstark5/Openlib.git
+     git clone https://github.com/warreth/OpenlibExtended.git
      ```
 
 - Run the app with Android Studio or VS Code. Or the command line:
@@ -105,20 +112,20 @@ If you'd like to get involved See [CONTRIBUTING.md](./CONTRIBUTING.md) for the g
 
 ## Issues 🚩
 
-Please report bugs via the [issue tracker](https://github.com/dstark5/Openlib/issues).
+Please report bugs via the [issue tracker](https://github.com/warreth/OpenlibExtended/issues).
 
 ## Donate 🎁
 
-If you like Openlib, you're welcome to send a donation.
+If you like OpenlibExtended, you're welcome to send a donation.
 
 [Donate To Anna’s Archive.](https://annas-archive.org/donate?tier=1)
 
 ## License 📜
 
 [![GNU GPLv3 Image](https://www.gnu.org/graphics/gplv3-127x51.png)](https://www.gnu.org/licenses/gpl-3.0.en.html)  
 
-Openlib is a free software licensed under GPL v3.0 It is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. [GNU General Public License](https://www.gnu.org/licenses/gpl.html) as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+OpenlibExtended is a free software licensed under GPL v3.0 It is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY. [GNU General Public License](https://www.gnu.org/licenses/gpl.html) as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 
 ## Disclaimer ⚠️
 
-Openlib does not own or have any affiliation with the books available through the app. All books are the property of their respective owners and are protected by copyright law. Openlib is not responsible for any infringement of copyright or other intellectual property rights that may result from the use of the books available through the app. By using the app, you agree to use the books only for personal, non-commercial purposes and in compliance with all applicable laws and regulations.
+OpenlibExtended does not own or have any affiliation with the books available through the app. All books are the property of their respective owners and are protected by copyright law. OpenlibExtended is not responsible for any infringement of copyright or other intellectual property rights that may result from the use of the books available through the app. By using the app, you agree to use the books only for personal, non-commercial purposes and in compliance with all applicable laws and regulations.

lib/services/annas_archieve.dart

@@ -7,6 +7,9 @@ import 'package:html/parser.dart' show parse;
 import 'package:html/dom.dart' as dom;
 import 'dart:convert';
 
+// Project imports:
+import 'package:openlib/services/instance_manager.dart';
+
 // ====================================================================
 // DATA MODELS
 // ====================================================================
@@ -53,15 +56,58 @@ class BookInfoData extends BookData {
 // ====================================================================
 
 class AnnasArchieve {
-  static const String baseUrl = "https://annas-archive.org";
+  static const String baseUrl = "https://annas-archive.org"; // Fallback default
 
   final Dio dio = Dio();
+  final InstanceManager _instanceManager = InstanceManager();
+  static const int maxRetries = 2; // Check each server 2x as per requirements
+  static const int retryDelayMs = 500; // Delay between retries in milliseconds
 
   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",
   };
 
+  // Try request with retry logic across multiple instances
+  Future<T> _requestWithRetry<T>(
+    Future<T> Function(String baseUrl) requestFn,
+  ) async {
+    final instances = await _instanceManager.getEnabledInstances();
+    
+    if (instances.isEmpty) {
+      // Use default if no instances are enabled
+      return await requestFn(baseUrl);
+    }
+
+    Exception? lastException;
+    List<String> failedInstances = []; // Track failed instances for logging
+    
+    // Try each instance
+    for (final instance in instances) {
+      // Try each instance up to maxRetries times
+      for (int attempt = 0; attempt < maxRetries; attempt++) {
+        try {
+          return await requestFn(instance.baseUrl);
+        } catch (e) {
+          lastException = e is Exception ? e : Exception(e.toString());
+          // Log the failure
+          final attemptInfo = '${instance.name} (${instance.baseUrl}) - Attempt ${attempt + 1}/$maxRetries: ${e.toString()}';
+          failedInstances.add(attemptInfo);
+          print('Instance failed: $attemptInfo');
+          
+          // If this is not the last attempt for this instance, wait before retrying
+          if (attempt < maxRetries - 1) {
+            await Future.delayed(Duration(milliseconds: retryDelayMs));
+          }
+        }
+      }
+    }
+    
+    // If all instances failed, throw the last exception with context
+    print('All instances failed. Attempted: ${failedInstances.join(", ")}');
+    throw lastException ?? Exception('All instances failed');
+  }
+
   String getMd5(String url) {
     final uri = Uri.parse(url);
     final pathSegments = uri.pathSegments;
@@ -95,7 +141,7 @@ class AnnasArchieve {
   // --------------------------------------------------------------------
   // _parser FUNCTION (Search Results - Fixed nth-of-type issue)
   // --------------------------------------------------------------------
-  List<BookData> _parser(resData, String fileType) {
+  List<BookData> _parser(resData, String fileType, String currentBaseUrl) {
     var document = parse(resData.toString());
 
     var bookContainers =
@@ -113,7 +159,7 @@ class AnnasArchieve {
       }
 
       final String title = mainLinkElement.text.trim();
-      final String link = baseUrl + mainLinkElement.attributes['href']!;
+      final String link = currentBaseUrl + mainLinkElement.attributes['href']!;
       final String md5 = getMd5(mainLinkElement.attributes['href']!);
       final String? thumbnail = thumbnailElement?.attributes['src'];
 
@@ -163,7 +209,7 @@ class AnnasArchieve {
   // --------------------------------------------------------------------
   // _bookInfoParser FUNCTION (Detail Page - Fixed 'unable to get data' error)
   // --------------------------------------------------------------------
-  Future<BookInfoData?> _bookInfoParser(resData, url) async {
+  Future<BookInfoData?> _bookInfoParser(resData, url, String currentBaseUrl) async {
     var document = parse(resData.toString());
     final main = document.querySelector('div.main-inner'); 
     if (main == null) return null;
@@ -172,7 +218,7 @@ class AnnasArchieve {
     String? mirror;
     final slowDownloadLinks = main.querySelectorAll('ul.list-inside a[href*="/slow_download/"]');
     if (slowDownloadLinks.isNotEmpty && slowDownloadLinks.first.attributes['href'] != null) {
-        mirror = baseUrl + slowDownloadLinks.first.attributes['href']!;
+        mirror = currentBaseUrl + slowDownloadLinks.first.attributes['href']!;
     }
     // --------------------------------
 
@@ -239,12 +285,13 @@ class AnnasArchieve {
       required String content,
       required String sort,
       required String fileType,
-      required bool enableFilters}) {
+      required bool enableFilters,
+      required String currentBaseUrl}) {
     searchQuery = searchQuery.replaceAll(" ", "+");
     if (!enableFilters) {
-      return '$baseUrl/search?q=$searchQuery';
+      return '$currentBaseUrl/search?q=$searchQuery';
     }
-    return '$baseUrl/search?index=&q=$searchQuery&content=$content&ext=$fileType&sort=$sort';
+    return '$currentBaseUrl/search?index=&q=$searchQuery&content=$content&ext=$fileType&sort=$sort';
   }
 
   Future<List<BookData>> searchBooks(
@@ -254,16 +301,19 @@ class AnnasArchieve {
       String fileType = "",
       bool enableFilters = true}) async {
     try {
-      final String encodedURL = urlEncoder(
-          searchQuery: searchQuery,
-          content: content,
-          sort: sort,
-          fileType: fileType,
-          enableFilters: enableFilters);
-
-      final response = await dio.get(encodedURL,
-          options: Options(headers: defaultDioHeaders));
-      return _parser(response.data, fileType);
+      return await _requestWithRetry<List<BookData>>((currentBaseUrl) async {
+        final String encodedURL = urlEncoder(
+            searchQuery: searchQuery,
+            content: content,
+            sort: sort,
+            fileType: fileType,
+            enableFilters: enableFilters,
+            currentBaseUrl: currentBaseUrl);
+
+        final response = await dio.get(encodedURL,
+            options: Options(headers: defaultDioHeaders));
+        return _parser(response.data, fileType, currentBaseUrl);
+      });
     } on DioException catch (e) {
         if (e.type == DioExceptionType.unknown) {
             throw "socketException";
@@ -274,16 +324,26 @@ class AnnasArchieve {
 
   Future<BookInfoData> bookInfo({required String url}) async {
     try {
-      final response =
-          await dio.get(url, options: Options(headers: defaultDioHeaders));
-      BookInfoData? data = await _bookInfoParser(response.data, url);
-      if (data != null) {
-        // Here's where you might use _safeParse if the API returned a numeric field
-        // E.g., int pages = _safeParse(data.pages).toInt(); 
-        return data;
-      } else {
-        throw 'unable to get data';
-      }
+      return 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);
+        final currentParsed = Uri.parse(currentBaseUrl);
+        
+        // If the URL has a different host, replace it with current instance's host
+        if (urlParsed.host != currentParsed.host) {
+          adjustedUrl = '$currentBaseUrl${urlParsed.path}${urlParsed.query.isNotEmpty ? "?${urlParsed.query}" : ""}';
+        }
+        
+        final response = await dio.get(adjustedUrl, 
+            options: Options(headers: defaultDioHeaders));
+        BookInfoData? data = await _bookInfoParser(response.data, adjustedUrl, currentBaseUrl);
+        if (data != null) {
+          return data;
+        } else {
+          throw 'unable to get data';
+        }
+      });
     } on DioException catch (e) {
       if (e.type == DioExceptionType.unknown) {
         throw "socketException";