From d675af3fb4271de5427a5a8470a2376c47169c67 Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Fri, 31 Jan 2025 10:46:24 +0800
Subject: [PATCH] fix cloudflare verification

---
 assets/translation.json     |  8 +++++--
 lib/components/loading.dart | 28 ++++++++--------------
 lib/network/cloudflare.dart | 47 +++++++++++++++++++++++--------------
 3 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/assets/translation.json b/assets/translation.json
index 4362b1b..f9f3955 100644
--- a/assets/translation.json
+++ b/assets/translation.json
@@ -318,7 +318,9 @@
     "Deselect All": "取消全选",
     "Add keyword": "添加关键词",
     "Keyword": "关键词",
-    "Manage": "管理"
+    "Manage": "管理",
+    "Verify": "验证",
+    "Cloudflare verification required": "需要Cloudflare验证"
   },
   "zh_TW": {
     "Home": "首頁",
@@ -639,6 +641,8 @@
     "Deselect All": "取消全選",
     "Add keyword": "添加關鍵詞",
     "Keyword": "關鍵詞",
-    "Manage": "管理"
+    "Manage": "管理",
+    "Verify": "驗證",
+    "Cloudflare verification required": "需要Cloudflare驗證"
   }
 }
\ No newline at end of file
diff --git a/lib/components/loading.dart b/lib/components/loading.dart
index 10f8224..234d0ef 100644
--- a/lib/components/loading.dart
+++ b/lib/components/loading.dart
@@ -57,7 +57,9 @@ class NetworkError extends StatelessWidget {
             if (cfe != null)
               FilledButton(
                 onPressed: () => passCloudflare(
-                    CloudflareException.fromString(message)!, retry!),
+                  CloudflareException.fromString(message)!,
+                  retry!,
+                ),
                 child: Text('Verify'.tl),
               )
             else
@@ -130,7 +132,7 @@ abstract class LoadingState<T extends StatefulWidget, S extends Object>
       if (res.success) {
         return res;
       } else {
-        if(!mounted) return res;
+        if (!mounted) return res;
         if (retry >= 3) {
           return res;
         }
@@ -188,7 +190,7 @@ abstract class LoadingState<T extends StatefulWidget, S extends Object>
     isLoading = true;
     Future.microtask(() {
       loadDataWithRetry().then((value) async {
-        if(!mounted) return;
+        if (!mounted) return;
         if (value.success) {
           data = value.data;
           await onDataLoaded();
@@ -321,21 +323,11 @@ abstract class MultiPageLoadingState<T extends StatefulWidget, S extends Object>
   }
 
   Widget buildError(BuildContext context, String error) {
-    return Center(
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Text(error, maxLines: 3),
-          const SizedBox(height: 12),
-          Button.outlined(
-            onPressed: () {
-              reset();
-            },
-            child: const Text("Retry"),
-          )
-        ],
-      ),
-    ).paddingHorizontal(16);
+    return NetworkError(
+      withAppbar: false,
+      message: error,
+      retry: reset,
+    );
   }
 
   @override
diff --git a/lib/network/cloudflare.dart b/lib/network/cloudflare.dart
index ff22041..fdbbf30 100644
--- a/lib/network/cloudflare.dart
+++ b/lib/network/cloudflare.dart
@@ -1,6 +1,7 @@
 import 'dart:io' as io;
 
 import 'package:dio/dio.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:venera/foundation/app.dart';
 import 'package:venera/foundation/appdata.dart';
 import 'package:venera/foundation/consts.dart';
@@ -58,7 +59,7 @@ class CloudflareException implements DioException {
 class CloudflareInterceptor extends Interceptor {
   @override
   void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
-    if(options.headers['cookie'].toString().contains('cf_clearance')) {
+    if (options.headers['cookie'].toString().contains('cf_clearance')) {
       options.headers['user-agent'] = appdata.implicitData['ua'] ?? webUA;
     }
     handler.next(options);
@@ -129,7 +130,7 @@ void passCloudflare(CloudflareException e, void Function() onFinished) async {
             appdata.writeImplicitData();
           }
           var cookiesMap = await controller.getCookies(url);
-          if(cookiesMap['cf_clearance'] == null) {
+          if (cookiesMap['cf_clearance'] == null) {
             return;
           }
           saveCookies(cookiesMap);
@@ -137,30 +138,40 @@ void passCloudflare(CloudflareException e, void Function() onFinished) async {
           onFinished();
         }
       },
+      onClose: onFinished,
     );
     webview.open();
   } else {
+    void check(InAppWebViewController controller) async {
+      var res = await controller.platform.evaluateJavascript(
+          source:
+              "document.head.innerHTML.includes('#challenge-success-text')");
+      if (res == false) {
+        var ua = await controller.getUA();
+        if (ua != null) {
+          appdata.implicitData['ua'] = ua;
+          appdata.writeImplicitData();
+        }
+        var cookies = await controller.getCookies(url) ?? [];
+        if (cookies.firstWhereOrNull(
+                (element) => element.name == 'cf_clearance') ==
+            null) {
+          return;
+        }
+        SingleInstanceCookieJar.instance?.saveFromResponse(uri, cookies);
+        App.rootPop();
+      }
+    }
+
     await App.rootContext.to(
       () => AppWebview(
         initialUrl: url,
         singlePage: true,
+        onTitleChange: (title, controller) async {
+          check(controller);
+        },
         onLoadStop: (controller) async {
-          var res = await controller.platform.evaluateJavascript(
-              source:
-                  "document.head.innerHTML.includes('#challenge-success-text')");
-          if (res == false) {
-            var ua = await controller.getUA();
-            if (ua != null) {
-              appdata.implicitData['ua'] = ua;
-              appdata.writeImplicitData();
-            }
-            var cookies = await controller.getCookies(url) ?? [];
-            if(cookies.firstWhereOrNull((element) => element.name == 'cf_clearance') == null) {
-              return;
-            }
-            SingleInstanceCookieJar.instance?.saveFromResponse(uri, cookies);
-            App.rootPop();
-          }
+          check(controller);
         },
         onStarted: (controller) async {
           var ua = await controller.getUA();