Skip to content

基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。

feat: proxy support (#1582)

林晨6be351c9fda3
diff --git a/lib/main.dart b/lib/main.dart
index b9c417dc..15f891bd 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -8,6 +8,7 @@ import 'package:path_provider/path_provider.dart';
import 'package:kazumi/utils/storage.dart';
import 'package:hive_flutter/hive_flutter.dart';
import 'package:kazumi/request/request.dart';
+import 'package:kazumi/utils/proxy_manager.dart';
import 'package:flutter/services.dart';
import 'package:kazumi/utils/utils.dart';
import 'package:media_kit/media_kit.dart';
@@ -85,6 +86,7 @@ void main() async {
}
Request();
await Request.setCookie();
+ ProxyManager.applyProxy();
runApp(
ChangeNotifierProvider(
create: (_) => ThemeProvider(),
diff --git a/lib/pages/my/my_page.dart b/lib/pages/my/my_page.dart
index 3123575e..63c2f41f 100644
--- a/lib/pages/my/my_page.dart
+++ b/lib/pages/my/my_page.dart
@@ -96,6 +96,14 @@ class _MyPageState extends State<MyPage> {
title: Text('操作设置', style: TextStyle(fontFamily: fontFamily)),
description: Text('设置播放器按键映射', style: TextStyle(fontFamily: fontFamily)),
),
+ SettingsTile.navigation(
+ onPressed: (_) {
+ Modular.to.pushNamed('/settings/proxy');
+ },
+ leading: const Icon(Icons.vpn_key_rounded),
+ title: Text('代理设置', style: TextStyle(fontFamily: fontFamily)),
+ description: Text('配置HTTP代理', style: TextStyle(fontFamily: fontFamily)),
+ ),
],
),
SettingsSection(
diff --git a/lib/pages/player/player_controller.dart b/lib/pages/player/player_controller.dart
index c4c61fe8..e03df943 100644
--- a/lib/pages/player/player_controller.dart
+++ b/lib/pages/player/player_controller.dart
@@ -13,6 +13,7 @@ import 'package:kazumi/pages/video/video_controller.dart';
import 'package:flutter_modular/flutter_modular.dart';
import 'package:hive/hive.dart';
import 'package:kazumi/utils/storage.dart';
+import 'package:kazumi/utils/proxy_utils.dart';
import 'package:kazumi/utils/logger.dart';
import 'package:kazumi/utils/utils.dart';
import 'package:kazumi/utils/constants.dart';
@@ -332,6 +333,19 @@ abstract class _PlayerController with Store {
}
}
+ // 设置 HTTP 代理
+ final bool proxyEnable =
+ setting.get(SettingBoxKey.proxyEnable, defaultValue: false);
+ if (proxyEnable) {
+ final String proxyUrl =
+ setting.get(SettingBoxKey.proxyUrl, defaultValue: '');
+ final formattedProxy = ProxyUtils.getFormattedProxyUrl(proxyUrl);
+ if (formattedProxy != null) {
+ await pp.setProperty("http-proxy", formattedProxy);
+ KazumiLogger().i('Player: HTTP 代理设置成功 $formattedProxy');
+ }
+ }
+
await mediaPlayer!.setAudioTrack(
AudioTrack.auto(),
);
diff --git a/lib/pages/settings/proxy/proxy_editor_page.dart b/lib/pages/settings/proxy/proxy_editor_page.dart
new file mode 100644
index 00000000..4e976211
--- /dev/null
+++ b/lib/pages/settings/proxy/proxy_editor_page.dart
@@ -0,0 +1,160 @@
+import 'package:flutter/material.dart';
+import 'package:dio/dio.dart';
+import 'package:kazumi/bean/dialog/dialog_helper.dart';
+import 'package:hive/hive.dart';
+import 'package:kazumi/bean/appbar/sys_app_bar.dart';
+import 'package:kazumi/utils/storage.dart';
+import 'package:kazumi/utils/proxy_utils.dart';
+import 'package:kazumi/utils/proxy_manager.dart';
+import 'package:kazumi/request/request.dart';
+
+class ProxyEditorPage extends StatefulWidget {
+ const ProxyEditorPage({super.key});
+
+ @override
+ State<ProxyEditorPage> createState() => _ProxyEditorPageState();
+}
+
+class _ProxyEditorPageState extends State<ProxyEditorPage> {
+ Box setting = GStorage.setting;
+ final _formKey = GlobalKey<FormState>();
+ final TextEditingController urlController = TextEditingController();
+ final TextEditingController usernameController = TextEditingController();
+ final TextEditingController passwordController = TextEditingController();
+ bool passwordVisible = false;
+
+ @override
+ void initState() {
+ super.initState();
+ urlController.text =
+ setting.get(SettingBoxKey.proxyUrl, defaultValue: '');
+ usernameController.text =
+ setting.get(SettingBoxKey.proxyUsername, defaultValue: '');
+ passwordController.text =
+ setting.get(SettingBoxKey.proxyPassword, defaultValue: '');
+ }
+
+ @override
+ void dispose() {
+ urlController.dispose();
+ usernameController.dispose();
+ passwordController.dispose();
+ super.dispose();
+ }
+
+ Future<void> saveAndTest() async {
+ if (!_formKey.currentState!.validate()) {
+ return;
+ }
+
+ final url = urlController.text.trim();
+ if (url.isEmpty) {
+ KazumiDialog.showToast(message: '请输入代理地址');
+ return;
+ }
+
+ await setting.put(SettingBoxKey.proxyUrl, url);
+ await setting.put(SettingBoxKey.proxyUsername, usernameController.text);
+ await setting.put(SettingBoxKey.proxyPassword, passwordController.text);
+ // 重置配置状态,等待测试结果
+ await setting.put(SettingBoxKey.proxyConfigured, false);
+
+ // 临时启用代理进行测试
+ await setting.put(SettingBoxKey.proxyEnable, true);
+ ProxyManager.applyProxy();
+
+ try {
+ final response = await Request().get(
+ 'https://www.google.com',
+ options: Options(
+ sendTimeout: const Duration(seconds: 10),
+ receiveTimeout: const Duration(seconds: 10),
+ ),
+ shouldRethrow: true,
+ ).timeout(const Duration(seconds: 15));
+ if (response.statusCode == 200) {
+ await setting.put(SettingBoxKey.proxyConfigured, true);
+ KazumiDialog.showToast(message: '测试成功');
+ } else {
+ await setting.put(SettingBoxKey.proxyEnable, false);
+ ProxyManager.clearProxy();
+ KazumiDialog.showToast(message: '代理连接失败');
+ }
+ } catch (e) {
+ await setting.put(SettingBoxKey.proxyEnable, false);
+ ProxyManager.clearProxy();
+ KazumiDialog.showToast(message: '代理连接失败');
+ }
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ appBar: const SysAppBar(title: Text('代理配置')),
+ body: SingleChildScrollView(
+ padding: const EdgeInsets.all(16.0),
+ child: Center(
+ child: SizedBox(
+ width: (MediaQuery.of(context).size.width > 800) ? 800 : null,
+ child: Form(
+ key: _formKey,
+ child: Column(
+ children: [
+ TextFormField(
+ controller: urlController,
+ decoration: const InputDecoration(
+ labelText: '代理地址',
+ hintText: 'http://127.0.0.1:7890',
+ border: OutlineInputBorder(),
+ ),
+ validator: (value) {
+ if (value == null || value.isEmpty) {
+ return '请输入代理地址';
+ }
+ if (!ProxyUtils.isValidProxyUrl(value)) {
+ return '格式错误,请使用 http://host:port 格式';
+ }
+ return null;
+ },
+ ),
+ const SizedBox(height: 20),
+ TextFormField(
+ controller: usernameController,
+ decoration: const InputDecoration(
+ labelText: '用户名(可选)',
+ border: OutlineInputBorder(),
+ ),
+ ),
+ const SizedBox(height: 20),
+ TextFormField(
+ controller: passwordController,
+ obscureText: !passwordVisible,
+ decoration: InputDecoration(
+ labelText: '密码(可选)',
+ border: const OutlineInputBorder(),
+ suffixIcon: IconButton(
+ onPressed: () {
+ setState(() {
+ passwordVisible = !passwordVisible;
+ });
+ },
+ icon: Icon(passwordVisible
+ ? Icons.visibility_rounded
+ : Icons.visibility_off_rounded),
+ ),
+ ),
+ ),
+ ],
+ ),
+ ),
+ ),
+ ),
+ ),
+ floatingActionButton: FloatingActionButton.extended(
+ onPressed: saveAndTest,
+ icon: const Icon(Icons.save),
+ label: const Text('保存并测试'),
+ ),
+ );
+ }
+}
diff --git a/lib/pages/settings/proxy/proxy_module.dart b/lib/pages/settings/proxy/proxy_module.dart
new file mode 100644
index 00000000..c022a145
--- /dev/null
+++ b/lib/pages/settings/proxy/proxy_module.dart
@@ -0,0 +1,14 @@
+import 'package:kazumi/pages/settings/proxy/proxy_settings_page.dart';
+import 'package:kazumi/pages/settings/proxy/proxy_editor_page.dart';
+import 'package:flutter_modular/flutter_modular.dart';
+
+class ProxyModule extends Module {
+ @override
+ void binds(i) {}
+
+ @override
+ void routes(r) {
+ r.child("/", child: (_) => const ProxySettingsPage());
+ r.child("/editor", child: (_) => const ProxyEditorPage());
+ }
+}
diff --git a/lib/pages/settings/proxy/proxy_settings_page.dart b/lib/pages/settings/proxy/proxy_settings_page.dart
new file mode 100644
index 00000000..67822f08
--- /dev/null
+++ b/lib/pages/settings/proxy/proxy_settings_page.dart
@@ -0,0 +1,99 @@
+import 'package:flutter/material.dart';
+import 'package:kazumi/bean/dialog/dialog_helper.dart';
+import 'package:hive/hive.dart';
+import 'package:flutter_modular/flutter_modular.dart';
+import 'package:kazumi/bean/appbar/sys_app_bar.dart';
+import 'package:kazumi/utils/storage.dart';
+import 'package:kazumi/utils/proxy_manager.dart';
+import 'package:card_settings_ui/card_settings_ui.dart';
+
+class ProxySettingsPage extends StatefulWidget {
+ const ProxySettingsPage({super.key});
+
+ @override
+ State<ProxySettingsPage> createState() => _ProxySettingsPageState();
+}
+
+class _ProxySettingsPageState extends State<ProxySettingsPage> {
+ Box setting = GStorage.setting;
+ late bool proxyEnable;
+
+ @override
+ void initState() {
+ super.initState();
+ proxyEnable = setting.get(SettingBoxKey.proxyEnable, defaultValue: false);
+ }
+
+ void onBackPressed(BuildContext context) {
+ if (KazumiDialog.observer.hasKazumiDialog) {
+ KazumiDialog.dismiss();
+ return;
+ }
+ }
+
+ Future<void> updateProxyEnable(bool value) async {
+ if (value) {
+ final proxyConfigured =
+ setting.get(SettingBoxKey.proxyConfigured, defaultValue: false);
+ if (!proxyConfigured) {
+ KazumiDialog.showToast(message: '请先在代理配置中完成测试');
+ return;
+ }
+ await setting.put(SettingBoxKey.proxyEnable, true);
+ ProxyManager.applyProxy();
+ } else {
+ await setting.put(SettingBoxKey.proxyEnable, false);
+ ProxyManager.clearProxy();
+ }
+ setState(() {
+ proxyEnable = value;
+ });
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ final fontFamily = Theme.of(context).textTheme.bodyMedium?.fontFamily;
+ return PopScope(
+ canPop: true,
+ onPopInvokedWithResult: (bool didPop, Object? result) {
+ onBackPressed(context);
+ },
+ child: Scaffold(
+ appBar: const SysAppBar(title: Text('代理设置')),
+ body: SettingsList(
+ maxWidth: 800,
+ sections: [
+ SettingsSection(
+ title: Text('代理', style: TextStyle(fontFamily: fontFamily)),
+ tiles: [
+ SettingsTile.switchTile(
+ onToggle: (value) async {
+ await updateProxyEnable(value ?? !proxyEnable);
+ },
+ title:
+ Text('启用代理', style: TextStyle(fontFamily: fontFamily)),
+ description: Text('启用后网络请求将通过代理服务器',
+ style: TextStyle(fontFamily: fontFamily)),
+ initialValue: proxyEnable,
+ ),
+ SettingsTile.navigation(
+ onPressed: (_) async {
+ await Modular.to.pushNamed('/settings/proxy/editor');
+ setState(() {
+ proxyEnable = setting.get(SettingBoxKey.proxyEnable,
+ defaultValue: false);
+ });
+ },
+ title:
+ Text('代理配置', style: TextStyle(fontFamily: fontFamily)),
+ description: Text('配置代理服务器地址和认证信息',
+ style: TextStyle(fontFamily: fontFamily)),
+ ),
+ ],
+ ),
+ ],
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/pages/settings/settings_module.dart b/lib/pages/settings/settings_module.dart
index ec6dff69..6bd6dac6 100644
--- a/lib/pages/settings/settings_module.dart
+++ b/lib/pages/settings/settings_module.dart
@@ -8,6 +8,7 @@ import 'package:kazumi/pages/settings/player_settings.dart';
import 'package:kazumi/pages/settings/displaymode_settings.dart';
import 'package:kazumi/pages/settings/decoder_settings.dart';
import 'package:kazumi/pages/settings/super_resolution_settings.dart';
+import 'package:kazumi/pages/settings/proxy/proxy_module.dart';
import 'package:kazumi/pages/webdav_editor/webdav_module.dart';
import 'package:kazumi/pages/settings/keyboard_settings.dart';
@@ -22,7 +23,7 @@ class SettingsModule extends Module {
r.child("/keyboard", child: (_) => const KeyboardSettingsPage());
r.child("/player", child: (_) => const PlayerSettingsPage());
r.child("/player/decoder", child: (_) => const DecoderSettings());
- // r.child("/other", child: (_) => const OtherSettingsPage());
+ r.module("/proxy", module: ProxyModule());
r.child("/player/super", child: (_) => const SuperResolutionSettings());
r.module("/webdav", module: WebDavModule());
r.module("/about", module: AboutModule());
diff --git a/lib/pages/webview/webview_controller_impel/webview_android_controller_impel.dart b/lib/pages/webview/webview_controller_impel/webview_android_controller_impel.dart
index e927ae79..8fd93165 100644
--- a/lib/pages/webview/webview_controller_impel/webview_android_controller_impel.dart
+++ b/lib/pages/webview/webview_controller_impel/webview_android_controller_impel.dart
@@ -1,7 +1,12 @@
import 'dart:async';
import 'package:kazumi/utils/utils.dart';
+import 'package:kazumi/utils/storage.dart';
+import 'package:kazumi/utils/proxy_utils.dart';
+import 'package:kazumi/utils/logger.dart';
import 'package:kazumi/pages/webview/webview_controller.dart';
import 'package:flutter_inappwebview_platform_interface/flutter_inappwebview_platform_interface.dart';
+import 'package:flutter_inappwebview_android/flutter_inappwebview_android.dart'
+ as android_webview;
class WebviewAndroidItemControllerImpel
extends WebviewItemController<PlatformInAppWebViewController> {
@@ -13,6 +18,7 @@ class WebviewAndroidItemControllerImpel
@override
Future<void> init() async {
+ await _setupProxy();
headlessWebView ??= PlatformHeadlessInAppWebView(
PlatformHeadlessInAppWebViewCreationParams(
initialSettings: InAppWebViewSettings(
@@ -376,4 +382,43 @@ class WebviewAndroidItemControllerImpel
headlessWebView = null;
webviewController = null;
}
+
+ Future<void> _setupProxy() async {
+ final setting = GStorage.setting;
+ final bool proxyEnable =
+ setting.get(SettingBoxKey.proxyEnable, defaultValue: false);
+ if (!proxyEnable) {
+ return;
+ }
+
+ final String proxyUrl =
+ setting.get(SettingBoxKey.proxyUrl, defaultValue: '');
+ final formattedProxy = ProxyUtils.getFormattedProxyUrl(proxyUrl);
+ if (formattedProxy == null) {
+ return;
+ }
+
+ try {
+ final proxyAvailable =
+ await android_webview.AndroidWebViewFeature.instance()
+ .isFeatureSupported(WebViewFeature.PROXY_OVERRIDE);
+ if (!proxyAvailable) {
+ KazumiLogger().w('WebView: 当前 Android 版本不支持代理');
+ return;
+ }
+
+ final proxyController = android_webview.AndroidProxyController.instance();
+ await proxyController.clearProxyOverride();
+ await proxyController.setProxyOverride(
+ settings: ProxySettings(
+ proxyRules: [
+ ProxyRule(url: formattedProxy),
+ ],
+ ),
+ );
+ KazumiLogger().i('WebView: 代理设置成功 $formattedProxy');
+ } catch (e) {
+ KazumiLogger().e('WebView: 设置代理失败 $e');
+ }
+ }
}
diff --git a/lib/pages/webview/webview_controller_impel/webview_linux_controller_impel.dart b/lib/pages/webview/webview_controller_impel/webview_linux_controller_impel.dart
index df46c280..4a04f906 100644
--- a/lib/pages/webview/webview_controller_impel/webview_linux_controller_impel.dart
+++ b/lib/pages/webview/webview_controller_impel/webview_linux_controller_impel.dart
@@ -1,6 +1,9 @@
import 'dart:async';
import 'package:kazumi/pages/webview/webview_controller.dart';
import 'package:kazumi/utils/utils.dart';
+import 'package:kazumi/utils/storage.dart';
+import 'package:kazumi/utils/proxy_utils.dart';
+import 'package:kazumi/utils/logger.dart';
import 'package:desktop_webview_window/desktop_webview_window.dart';
class WebviewLinuxItemControllerImpel extends WebviewItemController<Webview> {
@@ -8,26 +11,51 @@ class WebviewLinuxItemControllerImpel extends WebviewItemController<Webview> {
@override
Future<void> init() async {
+ final proxyConfig = _getProxyConfiguration();
webviewController ??= await WebviewWindow.create(
- configuration: const CreateConfiguration(headless: true, userScripts: [
- UserScript(
- source: blobScript,
- injectionTime: UserScriptInjectionTime.documentStart,
- forAllFrames: true),
- UserScript(
- source: iframeScript,
- injectionTime: UserScriptInjectionTime.documentEnd,
- forAllFrames: true),
- UserScript(
- source: videoScript,
- injectionTime: UserScriptInjectionTime.documentEnd,
- forAllFrames: true)
- ]),
+ configuration: CreateConfiguration(
+ headless: true,
+ proxy: proxyConfig,
+ userScripts: const [
+ UserScript(
+ source: blobScript,
+ injectionTime: UserScriptInjectionTime.documentStart,
+ forAllFrames: true),
+ UserScript(
+ source: iframeScript,
+ injectionTime: UserScriptInjectionTime.documentEnd,
+ forAllFrames: true),
+ UserScript(
+ source: videoScript,
+ injectionTime: UserScriptInjectionTime.documentEnd,
+ forAllFrames: true)
+ ],
+ ),
);
bridgeInited = false;
initEventController.add(true);
}
+ ProxyConfiguration? _getProxyConfiguration() {
+ final setting = GStorage.setting;
+ final bool proxyEnable =
+ setting.get(SettingBoxKey.proxyEnable, defaultValue: false);
+ if (!proxyEnable) {
+ return null;
+ }
+
+ final String proxyUrl =
+ setting.get(SettingBoxKey.proxyUrl, defaultValue: '');
+ final parsed = ProxyUtils.parseProxyUrl(proxyUrl);
+ if (parsed == null) {
+ return null;
+ }
+
+ final (host, port) = parsed;
+ KazumiLogger().i('WebView: 代理设置成功 $host:$port');
+ return ProxyConfiguration(host: host, port: port);
+ }
+
Future<void> initBridge(bool useNativePlayer, bool useLegacyParser) async {
await initJSBridge(useNativePlayer, useLegacyParser);
bridgeInited = true;
diff --git a/lib/pages/webview/webview_controller_impel/webview_windows_controller_impel.dart b/lib/pages/webview/webview_controller_impel/webview_windows_controller_impel.dart
index fbb4d957..299e1c13 100644
--- a/lib/pages/webview/webview_controller_impel/webview_windows_controller_impel.dart
+++ b/lib/pages/webview/webview_controller_impel/webview_windows_controller_impel.dart
@@ -1,6 +1,9 @@
import 'dart:async';
import 'package:webview_windows/webview_windows.dart';
import 'package:kazumi/pages/webview/webview_controller.dart';
+import 'package:kazumi/utils/storage.dart';
+import 'package:kazumi/utils/proxy_utils.dart';
+import 'package:kazumi/utils/logger.dart';
class WebviewWindowsItemControllerImpel
extends WebviewItemController<WebviewController> {
@@ -8,6 +11,7 @@ class WebviewWindowsItemControllerImpel
@override
Future<void> init() async {
+ await _setupProxy();
webviewController ??= WebviewController();
await webviewController!.initialize();
await webviewController!
@@ -15,6 +19,31 @@ class WebviewWindowsItemControllerImpel
initEventController.add(true);
}
+ Future<void> _setupProxy() async {
+ final setting = GStorage.setting;
+ final bool proxyEnable =
+ setting.get(SettingBoxKey.proxyEnable, defaultValue: false);
+ if (!proxyEnable) {
+ return;
+ }
+
+ final String proxyUrl =
+ setting.get(SettingBoxKey.proxyUrl, defaultValue: '');
+ final formattedProxy = ProxyUtils.getFormattedProxyUrl(proxyUrl);
+ if (formattedProxy == null) {
+ return;
+ }
+
+ try {
+ await WebviewController.initializeEnvironment(
+ additionalArguments: '--proxy-server=$formattedProxy',
+ );
+ KazumiLogger().i('WebView: 代理设置成功 $formattedProxy');
+ } catch (e) {
+ KazumiLogger().e('WebView: 设置代理失败 $e');
+ }
+ }
+
@override
Future<void> loadUrl(String url, bool useNativePlayer, bool useLegacyParser,
{int offset = 0}) async {
diff --git a/lib/request/request.dart b/lib/request/request.dart
index 6215394f..e48af721 100644
--- a/lib/request/request.dart
+++ b/lib/request/request.dart
@@ -4,18 +4,26 @@ import 'package:dio/dio.dart';
import 'package:dio/io.dart';
import 'package:kazumi/request/interceptor.dart';
import 'package:kazumi/utils/utils.dart';
+import 'package:kazumi/utils/storage.dart';
+import 'package:kazumi/utils/proxy_utils.dart';
+import 'package:kazumi/utils/logger.dart';
+import 'package:hive/hive.dart';
class Request {
static final Request _instance = Request._internal();
static late final Dio dio;
- // Box setting = GStorage.setting;
- // static Box localCache = GStorage.localCache;
- // late bool enableSystemProxy;
+ static Box setting = GStorage.setting;
factory Request() => _instance;
// 初始化 (一般只在应用启动时调用)
static Future<void> setCookie() async {
setOptionsHeaders();
+ // 初始化时检查并设置代理
+ final bool proxyEnable =
+ setting.get(SettingBoxKey.proxyEnable, defaultValue: false);
+ if (proxyEnable) {
+ setProxy();
+ }
}
// 设置请求头
@@ -24,26 +32,52 @@ class Request {
dio.options.headers['user-agent'] = Utils.getRandomUA();
}
- // 设置代理
+ // 设置代理(仅支持 HTTP 代理)
static void setProxy() {
- // var systemProxyHost =
- // localCache.get(LocalCacheKey.systemProxyHost, defaultValue: '');
- // var systemProxyPort =
- // localCache.get(LocalCacheKey.systemProxyPort, defaultValue: '');
- // dio.httpClientAdapter = IOHttpClientAdapter(
- // createHttpClient: () {
- // final HttpClient client = HttpClient();
- // // Config the client.
- // client.findProxy = (Uri uri) {
- // // return 'PROXY host:port';
- // return 'PROXY $systemProxyHost:$systemProxyPort';
- // };
- // client.badCertificateCallback =
- // (X509Certificate cert, String host, int port) => true;
- // return client;
- // },
- // );
- // debugPrint('代理设置更新成功');
+ final bool proxyEnable =
+ setting.get(SettingBoxKey.proxyEnable, defaultValue: false);
+ if (!proxyEnable) {
+ disableProxy();
+ return;
+ }
+
+ final String proxyUrl =
+ setting.get(SettingBoxKey.proxyUrl, defaultValue: '');
+ final String proxyUsername =
+ setting.get(SettingBoxKey.proxyUsername, defaultValue: '');
+ final String proxyPassword =
+ setting.get(SettingBoxKey.proxyPassword, defaultValue: '');
+
+ final parsed = ProxyUtils.parseProxyUrl(proxyUrl);
+ if (parsed == null) {
+ KazumiLogger().w('Proxy: 代理地址格式错误或为空');
+ return;
+ }
+
+ final (proxyHost, proxyPort) = parsed;
+
+ dio.httpClientAdapter = IOHttpClientAdapter(
+ createHttpClient: () {
+ final HttpClient client = HttpClient();
+ client.findProxy = (Uri uri) {
+ return 'PROXY $proxyHost:$proxyPort';
+ };
+ // 处理代理认证
+ if (proxyUsername.isNotEmpty && proxyPassword.isNotEmpty) {
+ client.addProxyCredentials(
+ proxyHost,
+ proxyPort,
+ 'Basic',
+ HttpClientBasicCredentials(proxyUsername, proxyPassword),
+ );
+ }
+ // 忽略证书验证
+ client.badCertificateCallback =
+ (X509Certificate cert, String host, int port) => true;
+ return client;
+ },
+ );
+ KazumiLogger().i('Proxy: HTTP 代理设置成功 $proxyHost:$proxyPort');
}
// 禁用代理
@@ -54,7 +88,7 @@ class Request {
return client;
},
);
- print('代理禁用');
+ KazumiLogger().i('Proxy: 代理已禁用');
}
Request._internal() {
diff --git a/lib/utils/proxy_manager.dart b/lib/utils/proxy_manager.dart
new file mode 100644
index 00000000..c7039b89
--- /dev/null
+++ b/lib/utils/proxy_manager.dart
@@ -0,0 +1,18 @@
+import 'package:kazumi/request/request.dart';
+
+/// 代理管理器
+/// 统一管理 Dio HTTP 请求的代理设置
+/// 注意:WebView 代理在各平台 controller 初始化时单独处理
+class ProxyManager {
+ ProxyManager._();
+
+ /// 应用代理设置
+ static void applyProxy() {
+ Request.setProxy();
+ }
+
+ /// 清除代理设置
+ static void clearProxy() {
+ Request.disableProxy();
+ }
+}
diff --git a/lib/utils/proxy_utils.dart b/lib/utils/proxy_utils.dart
new file mode 100644
index 00000000..4ab256d1
--- /dev/null
+++ b/lib/utils/proxy_utils.dart
@@ -0,0 +1,46 @@
+/// 代理相关的工具函数
+class ProxyUtils {
+ // 防止实例化
+ ProxyUtils._();
+
+ /// 解析代理 URL,返回 (主机, 端口)
+ ///
+ /// 支持的格式:
+ /// - http://127.0.0.1:7890
+ /// - 127.0.0.1:7890
+ static (String, int)? parseProxyUrl(String url) {
+ url = url.trim();
+ if (url.isEmpty) return null;
+
+ String hostPort = url;
+
+ // 移除 http:// 前缀
+ if (url.toLowerCase().startsWith('http://')) {
+ hostPort = url.substring(7);
+ } else if (url.toLowerCase().startsWith('https://')) {
+ hostPort = url.substring(8);
+ }
+
+ // 解析主机和端口
+ final parts = hostPort.split(':');
+ if (parts.length != 2) return null;
+
+ final host = parts[0];
+ final port = int.tryParse(parts[1]);
+ if (host.isEmpty || port == null) return null;
+
+ return (host, port);
+ }
+
+ /// 获取格式化的代理 URL(用于 mpv)
+ static String? getFormattedProxyUrl(String url) {
+ final parsed = parseProxyUrl(url);
+ if (parsed == null) return null;
+ return 'http://${parsed.$1}:${parsed.$2}';
+ }
+
+ /// 验证代理 URL 是否有效
+ static bool isValidProxyUrl(String url) {
+ return parseProxyUrl(url) != null;
+ }
+}
diff --git a/lib/utils/storage.dart b/lib/utils/storage.dart
index ba9207d5..0d4d3eb2 100644
--- a/lib/utils/storage.dart
+++ b/lib/utils/storage.dart
@@ -267,5 +267,10 @@ class SettingBoxKey {
timelineNotShowAbandonedBangumis = 'timelineNotShowAbandonedBangumis',
timelineNotShowWatchedBangumis = 'timelineNotShowWatchedBangumis',
useSystemFont = 'useSystemFont',
- forceAdBlocker = 'forceAdBlocker';
+ forceAdBlocker = 'forceAdBlocker',
+ proxyEnable = 'proxyEnable',
+ proxyConfigured = 'proxyConfigured',
+ proxyUrl = 'proxyUrl',
+ proxyUsername = 'proxyUsername',
+ proxyPassword = 'proxyPassword';
}
diff --git a/pubspec.lock b/pubspec.lock
index 41fccab4..04e676e6 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -317,8 +317,8 @@ packages:
dependency: "direct main"
description:
path: "."
- ref: b107a03068b8c4249cec4a3b159d56f1326103c5
- resolved-ref: b107a03068b8c4249cec4a3b159d56f1326103c5
+ ref: "5a07358"
+ resolved-ref: "5a07358d2f52a0cd01a767ba6d998f5e32170426"
url: "https://github.com/Predidit/linux_webview_window.git"
source: git
version: "0.2.4"
diff --git a/pubspec.yaml b/pubspec.yaml
index 5a41ef8e..6457e83c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -98,7 +98,7 @@ dependencies:
desktop_webview_window:
git:
url: https://github.com/Predidit/linux_webview_window.git
- ref: b107a03068b8c4249cec4a3b159d56f1326103c5
+ ref: 5a07358
media_kit:
git:
url: https://github.com/Predidit/media-kit.git