基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。
feat(network): add configurable ECH acceleration for bangumi
Prediditc576d1d812e3
diff --git a/lib/bean/settings/network_mirror_settings.dart b/lib/bean/settings/network_mirror_settings.dartindex e8c12eb7..0c672f1d 100644--- a/lib/bean/settings/network_mirror_settings.dart+++ b/lib/bean/settings/network_mirror_settings.dart@@ -1,6 +1,7 @@import 'package:flutter/material.dart';import 'package:kazumi/bean/dialog/dialog_helper.dart';import 'package:kazumi/bean/settings/settings_list.dart';+import 'package:kazumi/services/network/bangumi_acceleration.dart';import 'package:kazumi/services/network/image_acceleration.dart';import 'package:kazumi/services/storage/storage.dart';@@ -21,7 +22,7 @@ class _NetworkMirrorSettingsState extends State<NetworkMirrorSettings> {@overrideWidget build(BuildContext context) {- final bangumiProxy = GStorage.getSetting(SettingsKeys.enableBangumiProxy);+ final bangumiAcceleration = BangumiAcceleration.current;final gitProxy = GStorage.getSetting(SettingsKeys.enableGitProxy);final imageAcceleration = ImageAcceleration.fromSetting(GStorage.getSetting(SettingsKeys.imageAcceleration),@@ -30,13 +31,27 @@ class _NetworkMirrorSettingsState extends State<NetworkMirrorSettings> {title: const Text('访问加速'),margin: widget.margin,tiles: [- SettingsTile.switchTile(+ SettingsTile(leading: Icons.travel_explore_rounded,- title: const Text('番剧条目镜像'),- description: const Text('加速番剧信息、热门与时间表加载'),- initialValue: bangumiProxy,- onToggle: (value) =>- _save(SettingsKeys.enableBangumiProxy, value ?? !bangumiProxy),+ title: const Text('番剧条目加速'),+ description: const Text(+ '番剧信息与评论',+ maxLines: 1,+ overflow: TextOverflow.ellipsis,+ ),+ value: SizedBox(+ width: 60,+ child: Text(bangumiAcceleration.label, textAlign: TextAlign.center),+ ),+ onPressed: (context) => _selectAcceleration(+ context,+ title: '番剧条目加速',+ current: bangumiAcceleration,+ modes: BangumiAcceleration.values,+ label: (mode) => mode.label,+ description: (mode) => mode.description,+ setting: SettingsKeys.bangumiAcceleration,+ ),),SettingsTile.switchTile(leading: Icons.extension_rounded,@@ -49,39 +64,58 @@ class _NetworkMirrorSettingsState extends State<NetworkMirrorSettings> {SettingsTile(leading: Icons.image_rounded,title: const Text('图片加速'),- description: const Text('加速封面与头像加载'),+ description: const Text(+ '封面与头像',+ maxLines: 1,+ overflow: TextOverflow.ellipsis,+ ),value: SizedBox(- // Match the trailing Material 3 switch width.width: 60,child: Text(imageAcceleration.label, textAlign: TextAlign.center),),- onPressed: (context) =>- _selectImageAcceleration(context, imageAcceleration),+ onPressed: (context) => _selectAcceleration(+ context,+ title: '图片加速',+ current: imageAcceleration,+ modes: ImageAcceleration.values,+ label: (mode) => mode.label,+ description: (mode) => mode.description,+ setting: SettingsKeys.imageAcceleration,+ ),),],);}- Future<void> _selectImageAcceleration(- BuildContext context,- ImageAcceleration current,- ) async {- final selected = await KazumiDialog.show<ImageAcceleration>(+ Future<void> _selectAcceleration<T extends Enum>(+ BuildContext context, {+ required String title,+ required T current,+ required List<T> modes,+ required String Function(T) label,+ required String Function(T) description,+ required SettingKey<String> setting,+ }) async {+ final selected = await KazumiDialog.show<T>(context: context,builder: (context) => SimpleDialog(- title: const Text('图片加速'),+ title: Text(title),children: [- RadioGroup<ImageAcceleration>(+ RadioGroup<T>(groupValue: current,onChanged: (value) => Navigator.of(context).pop(value),child: Column(mainAxisSize: MainAxisSize.min,children: [- for (final mode in ImageAcceleration.values)- RadioListTile<ImageAcceleration>(+ for (final mode in modes)+ RadioListTile<T>(value: mode,- title: Text(mode.label),- subtitle: Text(mode.description),+ title: Text(label(mode)),+ subtitle: Text(+ description(mode),+ maxLines: 1,+ overflow: TextOverflow.ellipsis,+ ),),],),@@ -90,11 +124,19 @@ class _NetworkMirrorSettingsState extends State<NetworkMirrorSettings> {),);if (mounted && selected != null && selected != current) {- await _save(SettingsKeys.imageAcceleration, selected.name);+ await _save(setting, selected.name);}}}+extension on BangumiAcceleration {+ String get description => switch (this) {+ BangumiAcceleration.direct => '访问官方接口',+ BangumiAcceleration.ech => '启用加密握手',+ BangumiAcceleration.mirror => '镜像接口(默认)',+ };+}+extension on ImageAcceleration {String get label => switch (this) {ImageAcceleration.direct => '直连',@@ -103,8 +145,8 @@ extension on ImageAcceleration {};String get description => switch (this) {- ImageAcceleration.direct => '直接从 Bangumi 加载图片',- ImageAcceleration.ech => '通过 ECH 加载 Bangumi 图片,推荐使用',- ImageAcceleration.mirror => '通过图片镜像服务加载 Bangumi 图片',+ ImageAcceleration.direct => '加载原始图片',+ ImageAcceleration.ech => '加密握手(推荐)',+ ImageAcceleration.mirror => '使用图片镜像',};}diff --git a/lib/bean/widget/bangumi_mirror_error_widget.dart b/lib/bean/widget/bangumi_mirror_error_widget.dartindex 22e804bf..1504fb83 100644--- a/lib/bean/widget/bangumi_mirror_error_widget.dart+++ b/lib/bean/widget/bangumi_mirror_error_widget.dart@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';import 'package:flutter_modular/flutter_modular.dart';import 'package:kazumi/bean/widget/error_widget.dart';import 'package:kazumi/bean/widget/state_presentation.dart';-import 'package:kazumi/services/storage/storage.dart';+import 'package:kazumi/services/network/bangumi_acceleration.dart';class BangumiMirrorErrorWidget extends StatelessWidget {const BangumiMirrorErrorWidget({@@ -16,11 +16,11 @@ class BangumiMirrorErrorWidget extends StatelessWidget {@overrideWidget build(BuildContext context) {- final mirrorEnabled = GStorage.getSetting(SettingsKeys.enableBangumiProxy);+ final acceleration = BangumiAcceleration.current;return GeneralErrorWidget(title: '暂时无法加载番剧',- errMsg: '请检查网络连接,或调整镜像设置后重试。\n番剧条目镜像${mirrorEnabled ? '已启用' : '已禁用'}',+ errMsg: '请检查网络连接,或调整加速设置后重试。\n番剧条目加速:${acceleration.label}',icon: Icons.cloud_off_rounded,onRetry: onRetry,actions: [@@ -30,7 +30,7 @@ class BangumiMirrorErrorWidget extends StatelessWidget {onSettingsReturned?.call();},icon: Icons.tune_rounded,- text: '镜像设置',+ text: '加速设置',),],);diff --git a/lib/pages/onboarding/onboarding_page.dart b/lib/pages/onboarding/onboarding_page.dartindex 40f5cc0e..49cae9be 100644--- a/lib/pages/onboarding/onboarding_page.dart+++ b/lib/pages/onboarding/onboarding_page.dart@@ -35,7 +35,7 @@ class OnboardingPage extends StatefulWidget {enum _OnboardingStep {welcome('使用约定'),updates('更新来源'),- mirrors('网络镜像'),+ mirrors('访问加速'),rules('添加规则');const _OnboardingStep(this.label);diff --git a/lib/pages/onboarding/steps/mirror_settings_step.dart b/lib/pages/onboarding/steps/mirror_settings_step.dartindex 1de1b8fa..3a9ec3d1 100644--- a/lib/pages/onboarding/steps/mirror_settings_step.dart+++ b/lib/pages/onboarding/steps/mirror_settings_step.dart@@ -12,7 +12,7 @@ class MirrorSettingsStep extends StatelessWidget {shape: OnboardingIconShape.clover,),title: '让连接更顺畅',- subtitle: '中国大陆用户推荐启用镜像,加快番剧信息与规则的访问。图片默认使用 ECH 加速。',+ subtitle: '番剧信息与评论默认使用镜像,也可选择 ECH 或直连。图片默认使用 ECH 加速。',child: Column(crossAxisAlignment: CrossAxisAlignment.stretch,children: [diff --git a/lib/pages/popular/popular_controller.dart b/lib/pages/popular/popular_controller.dartindex 74ff0614..49d5735f 100644--- a/lib/pages/popular/popular_controller.dart+++ b/lib/pages/popular/popular_controller.dart@@ -1,7 +1,7 @@import 'dart:math';import 'package:kazumi/request/apis/bangumi_api.dart';import 'package:kazumi/modules/bangumi/bangumi_item.dart';-import 'package:kazumi/services/storage/storage.dart';+import 'package:kazumi/services/network/bangumi_acceleration.dart';import 'package:mobx/mobx.dart';part 'popular_controller.g.dart';@@ -31,7 +31,7 @@ abstract class _PopularController with Store {bool isTimeOut = false;bool get _bangumiMirrorEnabled =>- GStorage.getSetting(SettingsKeys.enableBangumiProxy);+ BangumiAcceleration.current == BangumiAcceleration.mirror;void setCurrentTag(String s) {currentTag = s;diff --git a/lib/pages/timeline/timeline_controller.dart b/lib/pages/timeline/timeline_controller.dartindex a801a07a..da0d7dda 100644--- a/lib/pages/timeline/timeline_controller.dart+++ b/lib/pages/timeline/timeline_controller.dart@@ -3,7 +3,7 @@ import 'package:kazumi/request/apis/bangumi_api.dart';import 'package:kazumi/utils/anime_season.dart';import 'package:kazumi/repositories/collect_repository.dart';import 'package:kazumi/modules/collect/collect_type.dart';-import 'package:kazumi/services/storage/storage.dart';+import 'package:kazumi/services/network/bangumi_acceleration.dart';import 'package:kazumi/services/logging/logger.dart';import 'package:mobx/mobx.dart';@@ -47,7 +47,7 @@ abstract class _TimelineController with Store {TimelineSort _sort = TimelineSort.popularity;bool get _bangumiMirrorEnabled =>- GStorage.getSetting(SettingsKeys.enableBangumiProxy);+ BangumiAcceleration.current == BangumiAcceleration.mirror;@actionFuture<void> loadSeason(DateTime date) async {diff --git a/lib/request/clients/bangumi_client.dart b/lib/request/clients/bangumi_client.dartindex 5447e852..6fd4a5ec 100644--- a/lib/request/clients/bangumi_client.dart+++ b/lib/request/clients/bangumi_client.dart@@ -1,11 +1,13 @@import 'dart:convert';import 'package:dio/dio.dart';+import 'package:kazumi/request/config/api_endpoints.dart';import 'package:kazumi/request/core/dio_factory.dart';import 'package:kazumi/request/core/network_error_mapper.dart';-import 'package:kazumi/utils/constants.dart';+import 'package:kazumi/services/network/bangumi_acceleration.dart';import 'package:kazumi/services/storage/storage.dart';import 'package:kazumi/utils/bangumi_mirror_credentials.dart';+import 'package:kazumi/utils/constants.dart';import 'package:kazumi/utils/crypto.dart';class BangumiClient {@@ -21,7 +23,7 @@ class BangumiClient {CancelToken? cancelToken,}) async {try {- final response = await DioFactory.apiDio.get(+ final response = await DioFactory.bangumiDio.get(url,queryParameters: queryParameters,options: Options(@@ -48,7 +50,7 @@ class BangumiClient {CancelToken? cancelToken,}) async {try {- final response = await DioFactory.apiDio.post(+ final response = await DioFactory.bangumiDio.post(url,data: data,queryParameters: queryParameters,@@ -76,11 +78,13 @@ class BangumiClient {Object? data,}) {final headers = <String, dynamic>{...bangumiHTTPHeader};- final bangumiSyncEnable =- GStorage.getSetting(SettingsKeys.bangumiSyncEnable);- final token = (accessToken ??- GStorage.getSetting<String>(SettingsKeys.bangumiAccessToken))- .trim();+ final bangumiSyncEnable = GStorage.getSetting(+ SettingsKeys.bangumiSyncEnable,+ );+ final token =+ (accessToken ??+ GStorage.getSetting<String>(SettingsKeys.bangumiAccessToken))+ .trim();if ((requiresAuth || bangumiSyncEnable) && token.isNotEmpty) {headers['Authorization'] = 'Bearer $token';}@@ -100,12 +104,12 @@ class BangumiClient {}bool _shouldSignProtectedMirrorRequest(String url, String method) {- final enableBangumiProxy =- GStorage.getSetting(SettingsKeys.enableBangumiProxy);- if (!enableBangumiProxy) {+ final uri = Uri.parse(url);+ if (BangumiAcceleration.current != BangumiAcceleration.mirror ||+ !ApiEndpoints.bangumiPublicApiHosts.contains(uri.host)) {return false;}- final path = Uri.parse(url).path;+ final path = uri.path;if (method == 'POST' && path == '/v0/search/subjects') {return true;}diff --git a/lib/request/config/api_endpoints.dart b/lib/request/config/api_endpoints.dartindex ca888ddc..0f2e8740 100644--- a/lib/request/config/api_endpoints.dart+++ b/lib/request/config/api_endpoints.dart@@ -82,6 +82,8 @@ class ApiEndpoints {/// Bangumi Next API Domainstatic const String bangumiAPINextDomain = 'https://next.bgm.tv';+ static const bangumiPublicApiHosts = {'api.bgm.tv', 'next.bgm.tv'};+/// 每日放送static const String bangumiCalendar = '/p1/calendar';diff --git a/lib/request/core/bangumi_transport.dart b/lib/request/core/bangumi_transport.dartnew file mode 100644index 00000000..f0de7099--- /dev/null+++ b/lib/request/core/bangumi_transport.dart@@ -0,0 +1,223 @@+import 'dart:async';+import 'dart:typed_data';++import 'package:dio/dio.dart';+import 'package:ech_http/ech_http.dart';+import 'package:http/http.dart' as http;+import 'package:kazumi/request/config/api_endpoints.dart';+import 'package:kazumi/request/core/network_config.dart';+import 'package:kazumi/services/logging/logger.dart';+import 'package:kazumi/services/network/bangumi_acceleration.dart';+import 'package:kazumi/services/network/bangumi_ech_resolver.dart';++const _echRequestKey = 'bangumiEch';++class BangumiAccelerationInterceptor extends Interceptor {+ @override+ void onRequest(RequestOptions options, RequestInterceptorHandler handler) {+ options.extra.remove(_echRequestKey);+ final uri = options.uri;+ if (ApiEndpoints.bangumiPublicApiHosts.contains(uri.host)) {+ switch (BangumiAcceleration.current) {+ case BangumiAcceleration.direct:+ break;+ case BangumiAcceleration.ech:+ options.path = uri.replace(scheme: 'https').toString();+ options.queryParameters = {};+ options.extra[_echRequestKey] = true;+ case BangumiAcceleration.mirror:+ options.path =+ ApiEndpoints.bangumiMirrorDomain ++ uri.path ++ (uri.hasQuery ? '?${uri.query}' : '');+ options.queryParameters = {};+ KazumiLogger().d('Bangumi mirror: ${options.path}');+ }+ }+ handler.next(options);+ }+}++class BangumiEchAdapter implements HttpClientAdapter {+ BangumiEchAdapter({+ required HttpClientAdapter fallback,+ required NetworkConfig config,+ http.Client Function(RequestOptions)? clientFactory,+ }) : _fallback = fallback,+ _config = config,+ _clientFactory = clientFactory;++ final HttpClientAdapter _fallback;+ final NetworkConfig _config;+ final http.Client Function(RequestOptions)? _clientFactory;+ final _resolvers = <Uri?, DohEchResolver>{};+ final _clients = <http.Client>{};+ bool _closed = false;++ http.Client _createClient(RequestOptions options) {+ final dohProxy = _config.proxyForUri(BangumiEchResolver.endpoint);+ final resolver = _resolvers.putIfAbsent(+ dohProxy,+ () => BangumiEchResolver.create(EchClient(proxy: dohProxy)),+ );+ return EchClient(+ proxy: _config.proxyForUri(options.uri),+ resolver: resolver,+ connectTimeout: _positive(options.connectTimeout, _config.connectTimeout),+ timeout:+ _positive(options.connectTimeout, _config.connectTimeout) ++ _positive(options.receiveTimeout, _config.receiveTimeout) ++ _positive(options.sendTimeout, const Duration(seconds: 12)),+ );+ }++ static Duration _positive(Duration? value, Duration fallback) =>+ value != null && value > Duration.zero ? value : fallback;++ @override+ Future<ResponseBody> fetch(+ RequestOptions options,+ Stream<Uint8List>? requestStream,+ Future<void>? cancelFuture,+ ) async {+ if (_closed) throw StateError('Bangumi ECH adapter is closed');+ if (options.extra[_echRequestKey] != true) {+ return _fallback.fetch(options, requestStream, cancelFuture);+ }++ final abort = Completer<void>();+ void cancel() {+ if (!abort.isCompleted) abort.complete();+ }++ cancelFuture?.then((_) => cancel());+ final client = (_clientFactory ?? _createClient)(options);+ _clients.add(client);+ void release() {+ cancel();+ if (_clients.remove(client)) client.close();+ if (_closed && _clients.isEmpty) _closeResolvers();+ }++ try {+ final request =+ _EchRequest(options.method, options.uri, requestStream, abort.future)+ ..followRedirects = options.followRedirects+ ..maxRedirects = options.maxRedirects+ ..persistentConnection = options.persistentConnection;+ for (final entry in options.headers.entries) {+ final value = entry.value;+ if (value != null) {+ request.headers[entry.key] = value is Iterable+ ? value.join(', ')+ : value.toString();+ }+ }+ // Native connect timeouts exclude DoH discovery.+ final timeout =+ _positive(options.connectTimeout, _config.connectTimeout) ++ _positive(options.receiveTimeout, _config.receiveTimeout);+ final response = await client+ .send(request)+ .timeout(+ timeout,+ onTimeout: () {+ cancel();+ throw DioException.receiveTimeout(+ timeout: timeout,+ requestOptions: options,+ );+ },+ );+ return ResponseBody(+ _responseStream(response.stream, options, release),+ response.statusCode,+ headers: response.headers.map((key, value) => MapEntry(key, [value])),+ statusMessage: response.reasonPhrase,+ isRedirect: response.isRedirect,+ onClose: release,+ );+ } catch (error, stackTrace) {+ release();+ throw _mapError(error, stackTrace, options);+ }+ }++ Stream<Uint8List> _responseStream(+ Stream<List<int>> stream,+ RequestOptions options,+ void Function() release,+ ) async* {+ try {+ await for (final chunk in stream) {+ yield chunk is Uint8List ? chunk : Uint8List.fromList(chunk);+ }+ } catch (error, stackTrace) {+ throw _mapError(error, stackTrace, options);+ } finally {+ release();+ }+ }++ DioException _mapError(+ Object error,+ StackTrace stack,+ RequestOptions options,+ ) {+ if (error is DioException) return error;+ if (error is http.RequestAbortedException) {+ return DioException.requestCancelled(+ requestOptions: options,+ reason: error,+ stackTrace: stack,+ );+ }+ if (error is EchException && error.nativeCode == 28) {+ return DioException.receiveTimeout(+ requestOptions: options,+ timeout: options.receiveTimeout ?? _config.receiveTimeout,+ error: error,+ );+ }+ return DioException.connectionError(+ requestOptions: options,+ reason: error.toString(),+ error: error,+ stackTrace: stack,+ );+ }++ void _closeResolvers() {+ for (final resolver in _resolvers.values) {+ resolver.client.close();+ }+ _resolvers.clear();+ }++ @override+ void close({bool force = false}) {+ _closed = true;+ _fallback.close(force: force);+ if (force) {+ for (final client in _clients) {+ client.close();+ }+ _clients.clear();+ }+ if (_clients.isEmpty) _closeResolvers();+ }+}++class _EchRequest extends http.BaseRequest with http.Abortable {+ _EchRequest(super.method, super.url, this._stream, this.abortTrigger);++ final Stream<Uint8List>? _stream;+ @override+ final Future<void> abortTrigger;++ @override+ http.ByteStream finalize() {+ super.finalize();+ return http.ByteStream(_stream ?? const Stream.empty());+ }+}diff --git a/lib/request/core/dio_factory.dart b/lib/request/core/dio_factory.dartindex 98c2af66..a2190043 100644--- a/lib/request/core/dio_factory.dart+++ b/lib/request/core/dio_factory.dart@@ -1,5 +1,6 @@import 'package:dio/dio.dart';import 'package:kazumi/request/config/api_endpoints.dart';+import 'package:kazumi/request/core/bangumi_transport.dart';import 'package:kazumi/request/core/dio_logger_interceptor.dart';import 'package:kazumi/request/core/network_config.dart';import 'package:kazumi/services/logging/logger.dart';@@ -10,51 +11,66 @@ class DioFactory {DioFactory._();static Dio? _apiDio;+ static Dio? _bangumiDio;static Dio? _rulesRepoDio;static Dio? _pluginDio;static Dio? _downloadDio;static Dio get apiDio => _apiDio ??= _create(- NetworkConfig.fromSettings(),- defaultHeaders: {- 'referer': '',- 'user-agent': getRandomUA(),- },- interceptors: [_BangumiMirrorInterceptor()],- );+ NetworkConfig.fromSettings(),+ defaultHeaders: {'referer': '', 'user-agent': getRandomUA()},+ );++ static Dio get bangumiDio {+ if (_bangumiDio != null) return _bangumiDio!;+ final config = NetworkConfig.fromSettings();+ final dio = _create(+ config,+ defaultHeaders: {'referer': ''},+ interceptors: [BangumiAccelerationInterceptor()],+ );+ dio.httpClientAdapter = BangumiEchAdapter(+ fallback: dio.httpClientAdapter,+ config: config,+ );+ return _bangumiDio = dio;+ }static Dio get rulesRepoDio => _rulesRepoDio ??= _create(- NetworkConfig.fromSettings(),- defaultHeaders: {- 'user-agent': getRandomUA(),- },- interceptors: [_RulesMirrorInterceptor()],- );+ NetworkConfig.fromSettings(),+ defaultHeaders: {'user-agent': getRandomUA()},+ interceptors: [_RulesMirrorInterceptor()],+ );static Dio get pluginDio => _pluginDio ??= _create(- NetworkConfig.fromSettings(),- defaultHeaders: {- 'user-agent': getRandomUA(),- 'accept-language': getRandomAcceptedLanguage(),- },- );+ NetworkConfig.fromSettings(),+ defaultHeaders: {+ 'user-agent': getRandomUA(),+ 'accept-language': getRandomAcceptedLanguage(),+ },+ );static Dio get downloadDio => _downloadDio ??= _create(- NetworkConfig.fromSettings(- connectTimeout: const Duration(seconds: 15),- receiveTimeout: const Duration(seconds: 30),- ),- defaultHeaders: {- 'user-agent': getRandomUA(),- },- );+ NetworkConfig.fromSettings(+ connectTimeout: const Duration(seconds: 15),+ receiveTimeout: const Duration(seconds: 30),+ ),+ defaultHeaders: {'user-agent': getRandomUA()},+ );static Dio createForConfig(NetworkConfig config) {return _create(config);}static void reset() {+ // Retire old adapters without interrupting requests already in flight.+ _apiDio?.close();+ _bangumiDio?.close();+ _rulesRepoDio?.close();+ _pluginDio?.close();+ _downloadDio?.close();_apiDio = null;+ _bangumiDio = null;_rulesRepoDio = null;_pluginDio = null;_downloadDio = null;@@ -65,10 +81,7 @@ class DioFactory {Map<String, dynamic> defaultHeaders = const {},List<Interceptor> interceptors = const [],}) {- // Keep the constructor tear-off form so the migration guard can flag- // direct Dio construction outside this factory with a simple search.- // ignore: unnecessary_constructor_name- final dio = Dio.new(+ final dio = Dio(BaseOptions(connectTimeout: config.connectTimeout,receiveTimeout: config.receiveTimeout,@@ -87,36 +100,6 @@ class DioFactory {}}-class _BangumiMirrorInterceptor extends Interceptor {- static const _mirrorableHosts = {- 'api.bgm.tv',- 'next.bgm.tv',- };-- @override- void onRequest(RequestOptions options, RequestInterceptorHandler handler) {- final enableBangumiProxy =- GStorage.getSetting(SettingsKeys.enableBangumiProxy);- if (!enableBangumiProxy) {- handler.next(options);- return;- }-- final uri = options.uri;- if (!_mirrorableHosts.contains(uri.host)) {- handler.next(options);- return;- }-- final mirrored = ApiEndpoints.bangumiMirrorDomain +- uri.path +- (uri.hasQuery ? '?${uri.query}' : '');- KazumiLogger().d('Bangumi mirror: $mirrored');- options.path = mirrored;- handler.next(options);- }-}-class _RulesMirrorInterceptor extends Interceptor {@overridevoid onRequest(RequestOptions options, RequestInterceptorHandler handler) {@@ -132,7 +115,8 @@ class _RulesMirrorInterceptor extends Interceptor {return;}- final mirrored = ApiEndpoints.pluginShopMirror ++ final mirrored =+ ApiEndpoints.pluginShopMirror +url.substring(ApiEndpoints.pluginShop.length);KazumiLogger().d('Rules mirror: $mirrored');options.path = mirrored;diff --git a/lib/request/core/network_config.dart b/lib/request/core/network_config.dartindex 3e420067..638f75cf 100644--- a/lib/request/core/network_config.dart+++ b/lib/request/core/network_config.dart@@ -27,6 +27,17 @@ class NetworkConfig {bool get hasProxy => proxyHost != null && proxyPort != null;+ Uri? proxyForUri(Uri uri) {+ if (hasProxy) return Uri(scheme: 'http', host: proxyHost, port: proxyPort);+ if (Platform.isWindows) {+ final proxy = SystemProxyService.findProxy(uri);+ if (proxy.startsWith('PROXY ')) {+ return Uri.parse('http://${proxy.substring(6)}');+ }+ }+ return null;+ }+IOHttpClientAdapter createAdapter() {return IOHttpClientAdapter(createHttpClient: () {diff --git a/lib/services/network/bangumi_acceleration.dart b/lib/services/network/bangumi_acceleration.dartnew file mode 100644index 00000000..e57dda1b--- /dev/null+++ b/lib/services/network/bangumi_acceleration.dart@@ -0,0 +1,22 @@+import 'package:kazumi/services/storage/storage.dart';++enum BangumiAcceleration {+ direct,+ ech,+ mirror;++ static BangumiAcceleration get current => switch (GStorage.getSetting(+ SettingsKeys.bangumiAcceleration,+ )) {+ 'direct' => direct,+ 'ech' => ech,+ 'mirror' => mirror,+ _ => GStorage.getSetting(SettingsKeys.enableBangumiProxy) ? mirror : direct,+ };++ String get label => switch (this) {+ direct => '直连',+ ech => 'ECH',+ mirror => '镜像',+ };+}diff --git a/lib/services/network/bangumi_ech_image_service.dart b/lib/services/network/bangumi_ech_image_service.dartindex 4934f747..9188f4ff 100644--- a/lib/services/network/bangumi_ech_image_service.dart+++ b/lib/services/network/bangumi_ech_image_service.dart@@ -1,51 +1,32 @@+import 'dart:io' show HttpClientResponseCompressionState;+import 'package:ech_http/ech_http.dart';import 'package:flutter_cache_manager/flutter_cache_manager.dart';import 'package:http/http.dart' as http;+import 'package:kazumi/services/network/bangumi_ech_resolver.dart';import 'package:kazumi/services/network/image_file_response.dart';import 'package:kazumi/utils/constants.dart' show bangumiHTTPHeader;class BangumiEchImageService extends FileService {- BangumiEchImageService({- required Uri? Function(Uri) proxyForUrl,- http.Client Function(Uri? proxy, EchResolver? resolver)? clientFactory,- }) : _proxyForUrl = proxyForUrl,- _clientFactory = clientFactory ?? _createClient;-- static final _dohEndpoint = Uri.https('dns.alidns.com', '/resolve');+ BangumiEchImageService({required Uri? Function(Uri) proxyForUrl})+ : _proxyForUrl = proxyForUrl;final Uri? Function(Uri) _proxyForUrl;- final http.Client Function(Uri?, EchResolver?) _clientFactory;final _current = <(Uri?, Uri?), _EchSession>{};final _sessions = <_EchSession>{};bool _closed = false;- static http.Client _createClient(Uri? proxy, EchResolver? resolver) =>- EchClient(proxy: proxy, resolver: resolver);-_EchSession _sessionFor(Uri uri) {- final proxies = (_proxyForUrl(uri), _proxyForUrl(_dohEndpoint));+ final proxies = (+ _proxyForUrl(uri),+ _proxyForUrl(BangumiEchResolver.endpoint),+ );return _current.putIfAbsent(proxies, () {- final bootstrap = _clientFactory(proxies.$2, null);+ final bootstrap = EchClient(proxy: proxies.$2);try {- final images = _clientFactory(- proxies.$1,- DohEchResolver(- client: bootstrap,- endpoint: _dohEndpoint,- // This client only handles images. Protect both the API image- // redirect and its CDN destination; API JSON still uses Dio.- hosts: {'api.bgm.tv', 'lain.bgm.tv'},- // Bangumi currently shares Cloudflare's ECH config. Pin its CDN- // addresses to bypass polluted A records; revisit on CDN changes.- configDomains: {- 'api.bgm.tv': 'crypto.cloudflare.com',- 'lain.bgm.tv': 'crypto.cloudflare.com',- },- addressOverrides: {- 'api.bgm.tv': ['172.67.134.140', '104.21.6.61', '172.67.73.67'],- 'lain.bgm.tv': ['172.67.134.140', '104.21.6.61', '172.67.73.67'],- },- ),+ final images = EchClient(+ proxy: proxies.$1,+ resolver: BangumiEchResolver.create(bootstrap),);final session = _EchSession(bootstrap, images);_sessions.add(session);@@ -66,14 +47,11 @@ class BangumiEchImageService extends FileService {final uri = Uri.parse(url);final session = _sessionFor(uri);session.active++;- final http.StreamedResponse response;+ final EchResponse response;try {final request = http.Request('GET', uri);- // Bangumi image endpoints can reject requests without an application UA.request.headers['user-agent'] = bangumiHTTPHeader['user-agent']!;if (headers != null) request.headers.addAll(headers);- // ech_http does not decompress HTTP content encodings.- request.headers['accept-encoding'] = 'identity';response = await session.images.send(request);} catch (_) {_release(session);@@ -81,6 +59,12 @@ class BangumiEchImageService extends FileService {}return createImageFileResponse(response,+ // ECH preserves wire lengths after decompression; decoded size is unknown.+ contentLength:+ response.compressionState ==+ HttpClientResponseCompressionState.decompressed+ ? null+ : response.contentLength,onComplete: () => _release(session),);}@@ -117,8 +101,8 @@ class BangumiEchImageService extends FileService {class _EchSession {_EchSession(this.bootstrap, this.images);- final http.Client bootstrap;- final http.Client images;+ final EchClient bootstrap;+ final EchClient images;int active = 0;bool retired = false;diff --git a/lib/services/network/bangumi_ech_resolver.dart b/lib/services/network/bangumi_ech_resolver.dartnew file mode 100644index 00000000..d089c9ad--- /dev/null+++ b/lib/services/network/bangumi_ech_resolver.dart@@ -0,0 +1,20 @@+import 'package:ech_http/ech_http.dart';+import 'package:http/http.dart' as http;+import 'package:kazumi/request/config/api_endpoints.dart';++class BangumiEchResolver {+ BangumiEchResolver._();++ static final endpoint = Uri.https('dns.alidns.com', '/resolve');+ static const _hosts = {...ApiEndpoints.bangumiPublicApiHosts, 'lain.bgm.tv'};+ static const _addresses = ['172.67.134.140', '104.21.6.61', '172.67.73.67'];++ static DohEchResolver create(http.Client bootstrap) => DohEchResolver(+ client: bootstrap,+ endpoint: endpoint,+ hosts: _hosts,+ // Shared Cloudflare ECH config and pinned IPs bypass polluted Bangumi DNS.+ configDomains: {for (final host in _hosts) host: 'crypto.cloudflare.com'},+ addressOverrides: {for (final host in _hosts) host: _addresses},+ );+}diff --git a/lib/services/network/image_file_response.dart b/lib/services/network/image_file_response.dartindex b9589398..6a5466e2 100644--- a/lib/services/network/image_file_response.dart+++ b/lib/services/network/image_file_response.dart@@ -3,6 +3,7 @@ import 'package:http/http.dart' as http;Future<FileServiceResponse> createImageFileResponse(http.StreamedResponse response, {+ required int? contentLength,required void Function() onComplete,}) async {// CacheManager only consumes 200/202 bodies.@@ -12,11 +13,12 @@ Future<FileServiceResponse> createImageFileResponse(} finally {onComplete();}- return _ImageFileResponse(response, const Stream.empty());+ return _ImageFileResponse(response, const Stream.empty(), contentLength);}return _ImageFileResponse(response,_releaseAfter(response.stream, onComplete),+ contentLength,);}@@ -32,8 +34,11 @@ Stream<List<int>> _releaseAfter(}class _ImageFileResponse extends HttpGetResponse {- _ImageFileResponse(super.response, this.content);+ _ImageFileResponse(super.response, this.content, this.contentLength);@overridefinal Stream<List<int>> content;++ @override+ final int? contentLength;}diff --git a/lib/services/network/image_file_service.dart b/lib/services/network/image_file_service.dartindex a4a9c445..4684460d 100644--- a/lib/services/network/image_file_service.dart+++ b/lib/services/network/image_file_service.dart@@ -63,6 +63,7 @@ class ImageFileService extends FileService {}return createImageFileResponse(response,+ contentLength: response.contentLength,onComplete: () => _release(client),);}diff --git a/lib/services/storage/settings_keys.dart b/lib/services/storage/settings_keys.dartindex 9b0cb180..e6b4377b 100644--- a/lib/services/storage/settings_keys.dart+++ b/lib/services/storage/settings_keys.dart@@ -268,6 +268,12 @@ class SettingsKeys {'ech',group: SettingGroup.proxy,);+ // An unset mode inherits the old mirror switch (enabled by default).+ static const bangumiAcceleration = SettingKey<String>(+ 'bangumiAcceleration',+ '',+ group: SettingGroup.proxy,+ );static const enableSystemProxy = SettingKey<bool>(_SettingBoxKey.enableSystemProxy,false,@@ -598,6 +604,7 @@ class SettingsKeys {enableGitProxy,enableBangumiProxy,imageAcceleration,+ bangumiAcceleration,enableSystemProxy,defaultStartupPage,webDavEnable,diff --git a/test/bangumi_sync_service_test.dart b/test/bangumi_sync_service_test.dartindex 5e73225a..d39de6cf 100644--- a/test/bangumi_sync_service_test.dart+++ b/test/bangumi_sync_service_test.dart@@ -39,11 +39,12 @@ void main() {await GStorage.collectibles.clear();DioFactory.reset();adapter = _BangumiAdapter();- DioFactory.apiDio.httpClientAdapter = adapter;+ DioFactory.bangumiDio.httpClientAdapter.close();+ DioFactory.bangumiDio.httpClientAdapter = adapter;});tearDownAll(() async {- DioFactory.apiDio.close(force: true);+ DioFactory.bangumiDio.close(force: true);DioFactory.reset();await Hive.close();PathProviderPlatform.instance = originalPathProvider;