Skip to content

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

fix(network): enable ECH for Bangumi API image requests

Predidit2ba61312012e
diff --git a/lib/services/network/bangumi_ech_image_service.dart b/lib/services/network/bangumi_ech_image_service.dart
index 469d5bf2..4934f747 100644
--- a/lib/services/network/bangumi_ech_image_service.dart
+++ b/lib/services/network/bangumi_ech_image_service.dart
@@ -2,6 +2,7 @@ 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/image_file_response.dart';
+import 'package:kazumi/utils/constants.dart' show bangumiHTTPHeader;
class BangumiEchImageService extends FileService {
BangumiEchImageService({
@@ -31,11 +32,17 @@ class BangumiEchImageService extends FileService {
DohEchResolver(
client: bootstrap,
endpoint: _dohEndpoint,
- hosts: {'lain.bgm.tv'},
+ // 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: {'lain.bgm.tv': 'crypto.cloudflare.com'},
+ 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'],
},
),
@@ -62,6 +69,8 @@ class BangumiEchImageService extends FileService {
final http.StreamedResponse 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';
diff --git a/test/bangumi_sync_service_test.dart b/test/bangumi_sync_service_test.dart
index 7f23d8a3..5e73225a 100644
--- a/test/bangumi_sync_service_test.dart
+++ b/test/bangumi_sync_service_test.dart
@@ -81,6 +81,27 @@ void main() {
expect(GStorage.getSetting(SettingsKeys.bangumiSyncEnable), isTrue);
});
+ test('ECH image acceleration preserves Bangumi API mirror routing', () async {
+ final previousMode = GStorage.getSetting<String>(
+ SettingsKeys.imageAcceleration,
+ );
+ addTearDown(
+ () => GStorage.putSetting(SettingsKeys.imageAcceleration, previousMode),
+ );
+ await GStorage.putSetting(SettingsKeys.imageAcceleration, 'ech');
+ await GStorage.putSetting(SettingsKeys.enableBangumiProxy, true);
+ for (final url in [
+ 'https://api.bgm.tv/v0/subjects/1',
+ 'https://next.bgm.tv/p1/subjects/1?test=value',
+ ]) {
+ await BangumiClient.instance.get(url);
+ expect(
+ adapter.requests.last.uri,
+ Uri.parse(url).replace(host: 'api.kazumi.fyi'),
+ );
+ }
+ });
+
test('failed draft validation preserves credentials and connected account',
() async {
await bangumi.ping();