基于自定义规则的番剧采集APP,支持流媒体在线观看,支持弹幕,支持实时超分辨率。
refactor: network (#2041)
Prediditdf86d7b9d890
diff --git a/lib/main.dart b/lib/main.dartindex d529a7c5..e697d8c0 100644--- a/lib/main.dart+++ b/lib/main.dart@@ -7,7 +7,6 @@ import 'package:kazumi/bean/settings/theme_provider.dart';import 'package:path_provider/path_provider.dart';import 'package:kazumi/utils/storage.dart';import 'package:hive_ce_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';@@ -87,8 +86,6 @@ void main() async {await windowManager.focus();});}- Request();- await Request.setCookie();ProxyManager.applyProxy();runApp(ChangeNotifierProvider(diff --git a/lib/modules/characters/characters_response.dart b/lib/modules/characters/characters_response.dartindex f78e3bc2..6085f05b 100644--- a/lib/modules/characters/characters_response.dart+++ b/lib/modules/characters/characters_response.dart@@ -1,7 +1,7 @@-import 'package:kazumi/request/api.dart';+import 'package:kazumi/request/config/api_endpoints.dart';import 'package:kazumi/modules/characters/character_item.dart';-/// The response from [Api.bangumiInfoByID]+/// The response from [ApiEndpoints.bangumiInfoByID]/// It contains a list of [CharacterItem]/// It is used to show general information about seraval bangumi charactersclass CharactersResponse {diff --git a/lib/pages/about/about_module.dart b/lib/pages/about/about_module.dartindex 000e0f48..27d1fd5f 100644--- a/lib/pages/about/about_module.dart+++ b/lib/pages/about/about_module.dart@@ -1,5 +1,5 @@import 'package:flutter/material.dart';-import 'package:kazumi/request/api.dart';+import 'package:kazumi/request/config/api_endpoints.dart';import 'package:kazumi/pages/about/about_page.dart';import 'package:flutter_modular/flutter_modular.dart';import 'package:kazumi/pages/logs/logs_page.dart';@@ -16,7 +16,7 @@ class AboutModule extends Module {"/license",child: (_) => const LicensePage(applicationName: 'Kazumi',- applicationVersion: Api.version,+ applicationVersion: ApiEndpoints.version,applicationLegalese: '开源许可证',),);diff --git a/lib/pages/about/about_page.dart b/lib/pages/about/about_page.dartindex 927f7a9c..22d677a7 100644--- a/lib/pages/about/about_page.dart+++ b/lib/pages/about/about_page.dart@@ -7,7 +7,7 @@ import 'package:hive_ce/hive.dart';import 'package:kazumi/bean/appbar/sys_app_bar.dart';import 'package:kazumi/bean/dialog/dialog_helper.dart';import 'package:kazumi/pages/my/my_controller.dart';-import 'package:kazumi/request/api.dart';+import 'package:kazumi/request/config/api_endpoints.dart';import 'package:kazumi/utils/mortis.dart';import 'package:kazumi/utils/storage.dart';import 'package:kazumi/utils/utils.dart';@@ -148,8 +148,10 @@ class _AboutPageState extends State<AboutPage> {onPressed: (_) {Modular.to.pushNamed('/settings/about/license');},- title: Text('开源许可证', style: TextStyle(fontFamily: fontFamily)),- description: Text('查看所有开源许可证', style: TextStyle(fontFamily: fontFamily)),+ title:+ Text('开源许可证', style: TextStyle(fontFamily: fontFamily)),+ description: Text('查看所有开源许可证',+ style: TextStyle(fontFamily: fontFamily)),),],),@@ -158,34 +160,37 @@ class _AboutPageState extends State<AboutPage> {tiles: [SettingsTile.navigation(onPressed: (_) {- launchUrl(Uri.parse(Api.projectUrl),+ launchUrl(Uri.parse(ApiEndpoints.projectUrl),mode: LaunchMode.externalApplication);},title: Text('项目主页', style: TextStyle(fontFamily: fontFamily)),),SettingsTile.navigation(onPressed: (_) {- launchUrl(Uri.parse(Api.sourceUrl),+ launchUrl(Uri.parse(ApiEndpoints.sourceUrl),mode: LaunchMode.externalApplication);},title: Text('代码仓库', style: TextStyle(fontFamily: fontFamily)),- value: Text('Github', style: TextStyle(fontFamily: fontFamily)),+ value:+ Text('Github', style: TextStyle(fontFamily: fontFamily)),),SettingsTile.navigation(onPressed: (_) {- launchUrl(Uri.parse(Api.iconUrl),+ launchUrl(Uri.parse(ApiEndpoints.iconUrl),mode: LaunchMode.externalApplication);},title: Text('图标创作', style: TextStyle(fontFamily: fontFamily)),- value: Text('Pixiv', style: TextStyle(fontFamily: fontFamily)),+ value:+ Text('Pixiv', style: TextStyle(fontFamily: fontFamily)),),SettingsTile.navigation(onPressed: (_) {- launchUrl(Uri.parse(Api.bangumiIndex),+ launchUrl(Uri.parse(ApiEndpoints.bangumiIndex),mode: LaunchMode.externalApplication);},title: Text('番剧索引', style: TextStyle(fontFamily: fontFamily)),- value: Text('Bangumi', style: TextStyle(fontFamily: fontFamily)),+ value:+ Text('Bangumi', style: TextStyle(fontFamily: fontFamily)),),SettingsTile.navigation(onPressed: (_) {@@ -193,16 +198,19 @@ class _AboutPageState extends State<AboutPage> {mode: LaunchMode.externalApplication);},title: Text('以图搜番', style: TextStyle(fontFamily: fontFamily)),- value: Text('trace.moe', style: TextStyle(fontFamily: fontFamily)),+ value: Text('trace.moe',+ style: TextStyle(fontFamily: fontFamily)),),SettingsTile.navigation(onPressed: (_) {- launchUrl(Uri.parse(Api.dandanIndex),+ launchUrl(Uri.parse(ApiEndpoints.dandanIndex),mode: LaunchMode.externalApplication);},title: Text('弹幕来源', style: TextStyle(fontFamily: fontFamily)),- description: Text('ID: ${mortis['id']}', style: TextStyle(fontFamily: fontFamily)),- value: Text('DanDanPlay', style: TextStyle(fontFamily: fontFamily)),+ description: Text('ID: ${mortis['id']}',+ style: TextStyle(fontFamily: fontFamily)),+ value: Text('DanDanPlay',+ style: TextStyle(fontFamily: fontFamily)),),],),@@ -218,7 +226,8 @@ class _AboutPageState extends State<AboutPage> {menuController.open();}},- title: Text('关闭时', style: TextStyle(fontFamily: fontFamily)),+ title:+ Text('关闭时', style: TextStyle(fontFamily: fontFamily)),value: MenuAnchor(consumeOutsideTap: true,controller: menuController,@@ -274,7 +283,8 @@ class _AboutPageState extends State<AboutPage> {title: Text('清除缓存', style: TextStyle(fontFamily: fontFamily)),value: _cacheSizeMB == -1? Text('统计中...', style: TextStyle(fontFamily: fontFamily))- : Text('${_cacheSizeMB.toStringAsFixed(2)}MB', style: TextStyle(fontFamily: fontFamily)),+ : Text('${_cacheSizeMB.toStringAsFixed(2)}MB',+ style: TextStyle(fontFamily: fontFamily)),),],),@@ -295,7 +305,8 @@ class _AboutPageState extends State<AboutPage> {myController.checkUpdate();},title: Text('检查更新', style: TextStyle(fontFamily: fontFamily)),- value: Text('当前版本 ${Api.version}', style: TextStyle(fontFamily: fontFamily)),+ value: Text('当前版本 ${ApiEndpoints.version}',+ style: TextStyle(fontFamily: fontFamily)),),],),diff --git a/lib/pages/download/download_controller.dart b/lib/pages/download/download_controller.dartindex 3f71b748..bc253452 100644--- a/lib/pages/download/download_controller.dart+++ b/lib/pages/download/download_controller.dart@@ -13,7 +13,7 @@ import 'package:kazumi/utils/format_utils.dart';import 'package:kazumi/utils/logger.dart';import 'package:kazumi/utils/storage.dart';import 'package:kazumi/providers/video/providers.dart';-import 'package:kazumi/request/damaku.dart';+import 'package:kazumi/request/apis/danmaku_api.dart';import 'package:mobx/mobx.dart';part 'download_controller.g.dart';@@ -68,8 +68,7 @@ abstract class _DownloadController with Store {bool recordChanged = false;for (final entry in record.episodes.entries) {final episode = entry.value;- if (episode.danmakuData.isEmpty ||- episode.downloadDirectory.isEmpty) {+ if (episode.danmakuData.isEmpty || episode.downloadDirectory.isEmpty) {continue;}try {@@ -138,7 +137,8 @@ abstract class _DownloadController with Store {episode.status == DownloadStatus.paused;final now = DateTime.now();- if (isFinalState || now.difference(_lastUiUpdateTime) >= _uiUpdateInterval) {+ if (isFinalState ||+ now.difference(_lastUiUpdateTime) >= _uiUpdateInterval) {_lastUiUpdateTime = now;refreshRecords();_updateBackgroundNotification();@@ -176,7 +176,8 @@ abstract class _DownloadController with Store {}}- ({int activeCount, int pendingCount, int totalCount, double overallProgress}) _getDownloadStats() {+ ({int activeCount, int pendingCount, int totalCount, double overallProgress})+ _getDownloadStats() {int activeCount = 0;int pendingCount = 0;int totalCount = 0;@@ -210,8 +211,6 @@ abstract class _DownloadController with Store {return _speeds[key] ?? 0.0;}--@actionvoid refreshRecords() {final temp = _repository.getAllRecords();@@ -269,8 +268,7 @@ abstract class _DownloadController with Store {final decoded = jsonDecode(content);if (decoded is List) {// 旧格式:纯弹幕数组- final danmakus =- decoded.map((json) => Danmaku.fromJson(json)).toList();+ final danmakus = decoded.map((json) => Danmaku.fromJson(json)).toList();return (danmakus: danmakus, danDanBangumiID: 0);} else if (decoded is Map<String, dynamic>) {// 新格式:带 danDanBangumiID 的 wrapper@@ -289,8 +287,8 @@ abstract class _DownloadController with Store {}/// 写入弹幕数据到文件 (新格式,包含 danDanBangumiID)- Future<void> _writeDanmakuToFile(- String downloadDirectory, List<Danmaku> danmakus, int danDanBangumiID) async {+ Future<void> _writeDanmakuToFile(String downloadDirectory,+ List<Danmaku> danmakus, int danDanBangumiID) async {if (downloadDirectory.isEmpty) return;final file = File(_danmakuFilePath(downloadDirectory));final wrapper = {@@ -519,7 +517,7 @@ abstract class _DownloadController with Store {// 获取 DanDan 番剧 IDfinal danDanBangumiID =- await DanmakuRequest.getDanDanBangumiIDByBgmBangumiID(bangumiId);+ await DanmakuApi.getDanDanBangumiIDByBgmBangumiID(bangumiId);if (danDanBangumiID == 0) {KazumiLogger().w('DownloadController: failed to get DanDan bangumiID for $bangumiId');@@ -528,7 +526,7 @@ abstract class _DownloadController with Store {// 获取弹幕列表final danmakus =- await DanmakuRequest.getDanDanmaku(danDanBangumiID, episodeNumber);+ await DanmakuApi.getDanDanmaku(danDanBangumiID, episodeNumber);if (danmakus.isEmpty) {KazumiLogger().i('DownloadController: no danmaku found for episode $episodeNumber');@@ -558,8 +556,7 @@ abstract class _DownloadController with Store {}// 写入独立文件- await _writeDanmakuToFile(- downloadDirectory, danmakus, danDanBangumiID);+ await _writeDanmakuToFile(downloadDirectory, danmakus, danDanBangumiID);KazumiLogger().i('DownloadController: cached ${danmakus.length} danmakus for episode $episodeNumber');@@ -826,7 +823,6 @@ abstract class _DownloadController with Store {.where((e) => e.status == DownloadStatus.completed).length;}-}class _ResolveRequest {diff --git a/lib/pages/info/character_page.dart b/lib/pages/info/character_page.dartindex 99a3ee2e..3aab3e79 100644--- a/lib/pages/info/character_page.dart+++ b/lib/pages/info/character_page.dart@@ -2,7 +2,7 @@ import 'dart:ui';import 'package:flutter/material.dart';import 'package:kazumi/modules/character/character_full_item.dart';import 'package:kazumi/modules/comments/comment_item.dart';-import 'package:kazumi/request/bangumi.dart';+import 'package:kazumi/request/apis/bangumi_api.dart';import 'package:kazumi/bean/card/network_img_layer.dart';import 'package:kazumi/bean/card/character_comments_card.dart';import 'package:kazumi/bean/widget/error_widget.dart';@@ -27,7 +27,7 @@ class _CharacterPageState extends State<CharacterPage> {setState(() {loadingCharacter = true;});- await BangumiHTTP.getCharacterByCharacterID(widget.characterID)+ await BangumiApi.getCharacterByCharacterID(widget.characterID).then((character) {characterFullItem = character;});@@ -44,8 +44,8 @@ class _CharacterPageState extends State<CharacterPage> {commentsError = false;});try {- final value =- await BangumiHTTP.getCharacterCommentsByCharacterID(widget.characterID);+ final value = await BangumiApi.getCharacterCommentsByCharacterID(+ widget.characterID);commentsList = value.commentList;} catch (e) {if (mounted) {diff --git a/lib/pages/info/info_controller.dart b/lib/pages/info/info_controller.dartindex b20cf756..25e664cd 100644--- a/lib/pages/info/info_controller.dart+++ b/lib/pages/info/info_controller.dart@@ -3,7 +3,7 @@ import 'package:kazumi/modules/bangumi/bangumi_item.dart';import 'package:kazumi/pages/collect/collect_controller.dart';import 'package:flutter_modular/flutter_modular.dart';import 'package:kazumi/modules/search/plugin_search_module.dart';-import 'package:kazumi/request/bangumi.dart';+import 'package:kazumi/request/apis/bangumi_api.dart';import 'package:mobx/mobx.dart';import 'package:kazumi/utils/logger.dart';import 'package:kazumi/modules/comments/comment_item.dart';@@ -38,7 +38,7 @@ abstract class _InfoController with Store {Future<void> queryBangumiInfoByID(int id, {String type = "init"}) async {isLoading = true;- await BangumiHTTP.getBangumiInfoByID(id).then((value) {+ await BangumiApi.getBangumiInfoByID(id).then((value) {if (value != null) {if (type == "init") {bangumiItem = value;@@ -63,15 +63,16 @@ abstract class _InfoController with Store {if (offset == 0) {commentsList.clear();}- await BangumiHTTP.getBangumiCommentsByID(id, offset: offset).then((value) {+ await BangumiApi.getBangumiCommentsByID(id, offset: offset).then((value) {commentsList.addAll(value.commentList);});- KazumiLogger().i('InfoController: loaded comments list length ${commentsList.length}');+ KazumiLogger().i(+ 'InfoController: loaded comments list length ${commentsList.length}');}Future<void> queryBangumiCharactersByID(int id) async {characterList.clear();- await BangumiHTTP.getCharatersByBangumiID(id).then((value) {+ await BangumiApi.getCharatersByBangumiID(id).then((value) {characterList.addAll(value.charactersList);});Map<String, int> relationValue = {@@ -89,14 +90,16 @@ abstract class _InfoController with Store {} catch (e) {KazumiDialog.showToast(message: '$e');}- KazumiLogger().i('InfoController: loaded character list length ${characterList.length}');+ KazumiLogger().i(+ 'InfoController: loaded character list length ${characterList.length}');}Future<void> queryBangumiStaffsByID(int id) async {staffList.clear();- await BangumiHTTP.getBangumiStaffByID(id).then((value) {+ await BangumiApi.getBangumiStaffByID(id).then((value) {staffList.addAll(value.data);});- KazumiLogger().i('InfoController: loaded staff list length ${staffList.length}');+ KazumiLogger()+ .i('InfoController: loaded staff list length ${staffList.length}');}}diff --git a/lib/pages/info/source_sheet.dart b/lib/pages/info/source_sheet.dartindex 904d3516..056f5225 100644--- a/lib/pages/info/source_sheet.dart+++ b/lib/pages/info/source_sheet.dart@@ -9,7 +9,7 @@ import 'package:kazumi/plugins/plugins_controller.dart';import 'package:kazumi/plugins/plugins.dart';import 'package:kazumi/pages/video/video_controller.dart';import 'package:url_launcher/url_launcher.dart';-import 'package:kazumi/request/query_manager.dart';+import 'package:kazumi/request/apis/query_manager.dart';import 'package:kazumi/pages/collect/collect_controller.dart';import 'package:kazumi/bean/widget/error_widget.dart';import 'dart:async';@@ -91,7 +91,8 @@ class _SourceSheetState extends State<SourceSheet>_captchaProvider?.dispose();_captchaProvider = CaptchaProvider();- final searchUrl = plugin.searchURL.replaceAll('@keyword', Uri.encodeQueryComponent(keyword));+ final searchUrl = plugin.searchURL+ .replaceAll('@keyword', Uri.encodeQueryComponent(keyword));_captchaProvider!.loadForCaptcha(searchUrl,@@ -284,7 +285,8 @@ class _SourceSheetState extends State<SourceSheet>_captchaProvider?.dispose();_captchaProvider = CaptchaProvider();- final searchUrl = plugin.searchURL.replaceAll('@keyword', Uri.encodeQueryComponent(keyword));+ final searchUrl = plugin.searchURL+ .replaceAll('@keyword', Uri.encodeQueryComponent(keyword));void onVerified() {if (autoVerified) return;@@ -368,8 +370,7 @@ class _SourceSheetState extends State<SourceSheet>}Widget buildPluginView(Plugin plugin, List<Widget> cardList) {- final status =- widget.infoController.pluginSearchStatus[plugin.name];+ final status = widget.infoController.pluginSearchStatus[plugin.name];if (status == 'pending') {return const Center(child: CircularProgressIndicator());}@@ -672,7 +673,8 @@ class _SourceSheetState extends State<SourceSheet>launchUrl(Uri.parse(pluginsController.pluginList[currentIndex].searchURL- .replaceFirst('@keyword', Uri.encodeQueryComponent(keyword))),+ .replaceFirst(+ '@keyword', Uri.encodeQueryComponent(keyword))),mode: LaunchMode.externalApplication,);},diff --git a/lib/pages/player/episode_comments_sheet.dart b/lib/pages/player/episode_comments_sheet.dartindex fe5dc794..d6ecf09b 100644--- a/lib/pages/player/episode_comments_sheet.dart+++ b/lib/pages/player/episode_comments_sheet.dart@@ -7,7 +7,7 @@ import 'package:kazumi/bean/card/episode_comments_card.dart';import 'package:kazumi/bean/widget/error_widget.dart';import 'package:kazumi/modules/bangumi/episode_item.dart';import 'package:kazumi/pages/video/video_controller.dart';-import 'package:kazumi/request/bangumi.dart';+import 'package:kazumi/request/apis/bangumi_api.dart';class EpisodeInfoWidget extends InheritedWidget {/// This widget receives changes of episode and notify it's child,@@ -236,7 +236,7 @@ class _EpisodeCommentsSheetState extends State<EpisodeCommentsSheet> {ep == 0 ? EpisodeInfoWidget.of(context)!.episode : ep;KazumiDialog.showLoading(msg: '分集列表加载中');final List<EpisodeInfo> episodeList =- await BangumiHTTP.getBangumiEpisodesByID(+ await BangumiApi.getBangumiEpisodesByID(videoPageController.bangumiItem.id);KazumiDialog.dismiss();if (episodeList.isEmpty) {diff --git a/lib/pages/player/player_controller.dart b/lib/pages/player/player_controller.dartindex c081a15a..b4df298f 100644--- a/lib/pages/player/player_controller.dart+++ b/lib/pages/player/player_controller.dart@@ -8,7 +8,7 @@ import 'package:media_kit_video/media_kit_video.dart';import 'package:kazumi/modules/danmaku/danmaku_module.dart';import 'package:mobx/mobx.dart';import 'package:canvas_danmaku/canvas_danmaku.dart';-import 'package:kazumi/request/damaku.dart';+import 'package:kazumi/request/apis/danmaku_api.dart';import 'package:flutter_modular/flutter_modular.dart';import 'package:hive_ce/hive.dart';import 'package:kazumi/utils/storage.dart';@@ -673,9 +673,9 @@ abstract class _PlayerController with Store {.i('PlayerController: no cached danmaku, attempting online fetch');try {bangumiID =- await DanmakuRequest.getDanDanBangumiIDByBgmBangumiID(bangumiId);+ await DanmakuApi.getDanDanBangumiIDByBgmBangumiID(bangumiId);if (bangumiID != 0) {- var res = await DanmakuRequest.getDanDanmaku(bangumiID, episode);+ var res = await DanmakuApi.getDanDanmaku(bangumiID, episode);if (res.isNotEmpty) {addDanmakus(res);KazumiLogger()@@ -730,8 +730,8 @@ abstract class _PlayerController with Store {try {danDanmakus.clear();bangumiID =- await DanmakuRequest.getDanDanBangumiIDByBgmBangumiID(bgmBangumiID);- var res = await DanmakuRequest.getDanDanmaku(bangumiID, episode);+ await DanmakuApi.getDanDanBangumiIDByBgmBangumiID(bgmBangumiID);+ var res = await DanmakuApi.getDanDanmaku(bangumiID, episode);addDanmakus(res);} catch (e) {KazumiLogger().w(@@ -753,7 +753,7 @@ abstract class _PlayerController with Store {danmakuLoading = true;try {danDanmakus.clear();- var res = await DanmakuRequest.getDanDanmakuByEpisodeID(episodeID);+ var res = await DanmakuApi.getDanDanmakuByEpisodeID(episodeID);addDanmakus(res);} catch (e) {KazumiLogger().w('PlayerController: failed to get danmaku', error: e);diff --git a/lib/pages/player/player_item.dart b/lib/pages/player/player_item.dartindex 89f19909..1ee74d1b 100644--- a/lib/pages/player/player_item.dart+++ b/lib/pages/player/player_item.dart@@ -24,7 +24,7 @@ import 'package:kazumi/pages/history/history_controller.dart';import 'package:kazumi/pages/collect/collect_controller.dart';import 'package:hive_ce/hive.dart';import 'package:kazumi/utils/storage.dart';-import 'package:kazumi/request/damaku.dart';+import 'package:kazumi/request/apis/danmaku_api.dart';import 'package:kazumi/modules/danmaku/danmaku_search_response.dart';import 'package:kazumi/modules/danmaku/danmaku_episode_response.dart';import 'package:kazumi/pages/player/player_item_surface.dart';@@ -495,8 +495,7 @@ class _PlayerItemState extends State<PlayerItem>);_syncAudioServiceState();} catch (e) {- KazumiLogger()- .w('AudioController: failed to bind callbacks', error: e);+ KazumiLogger().w('AudioController: failed to bind callbacks', error: e);}}@@ -937,7 +936,7 @@ class _PlayerItemState extends State<PlayerItem>DanmakuEpisodeResponse danmakuEpisodeResponse;try {danmakuSearchResponse =- await DanmakuRequest.getDanmakuSearchResponse(keyword);+ await DanmakuApi.getDanmakuSearchResponse(keyword);} catch (e) {KazumiDialog.dismiss();KazumiDialog.showToast(message: '弹幕检索错误: ${e.toString()}');@@ -962,7 +961,7 @@ class _PlayerItemState extends State<PlayerItem>KazumiDialog.showLoading(msg: '弹幕检索中');try {danmakuEpisodeResponse =- await DanmakuRequest.getDanDanEpisodesByDanDanBangumiID(+ await DanmakuApi.getDanDanEpisodesByDanDanBangumiID(danmakuInfo.animeId);} catch (e) {KazumiDialog.dismiss();@@ -1634,7 +1633,8 @@ class _PlayerItemState extends State<PlayerItem>}},child: SizedBox(- height: videoPageController.isFullscreen || videoPageController.isPip+ height: videoPageController.isFullscreen ||+ videoPageController.isPip? (MediaQuery.of(context).size.height): (MediaQuery.of(context).size.width * 9.0 / (16.0)),width: MediaQuery.of(context).size.width,@@ -1712,7 +1712,8 @@ class _PlayerItemState extends State<PlayerItem>top: 0,left: 0,right: 0,- height: videoPageController.isFullscreen || videoPageController.isPip+ height: videoPageController.isFullscreen ||+ videoPageController.isPip? MediaQuery.sizeOf(context).height: (MediaQuery.sizeOf(context).width * 9 / 16),child: DanmakuScreen(diff --git a/lib/pages/popular/popular_controller.dart b/lib/pages/popular/popular_controller.dartindex 68e4cf34..3ceb0c8a 100644--- a/lib/pages/popular/popular_controller.dart+++ b/lib/pages/popular/popular_controller.dart@@ -1,6 +1,6 @@import 'dart:math';import 'package:flutter/material.dart';-import 'package:kazumi/request/bangumi.dart';+import 'package:kazumi/request/apis/bangumi_api.dart';import 'package:kazumi/modules/bangumi/bangumi_item.dart';import 'package:mobx/mobx.dart';@@ -42,7 +42,7 @@ abstract class _PopularController with Store {}isLoadingMore = true;var result =- await BangumiHTTP.getBangumiTrendsList(offset: trendList.length);+ await BangumiApi.getBangumiTrendsList(offset: trendList.length);trendList.addAll(result);isLoadingMore = false;isTimeOut = trendList.isEmpty;@@ -55,7 +55,7 @@ abstract class _PopularController with Store {isLoadingMore = true;int randomNumber = Random().nextInt(8000) + 1;var tag = currentTag;- var result = await BangumiHTTP.getBangumiList(rank: randomNumber, tag: tag);+ var result = await BangumiApi.getBangumiList(rank: randomNumber, tag: tag);bangumiList.addAll(result);isLoadingMore = false;isTimeOut = bangumiList.isEmpty;diff --git a/lib/pages/search/search_controller.dart b/lib/pages/search/search_controller.dartindex cb9552cc..5919324d 100644--- a/lib/pages/search/search_controller.dart+++ b/lib/pages/search/search_controller.dart@@ -8,8 +8,8 @@ import 'package:kazumi/modules/search/image_search_module.dart';import 'package:kazumi/modules/search/search_history_module.dart';import 'package:kazumi/repositories/collect_repository.dart';import 'package:kazumi/repositories/search_history_repository.dart';-import 'package:kazumi/request/bangumi.dart';-import 'package:kazumi/request/trace.dart';+import 'package:kazumi/request/apis/bangumi_api.dart';+import 'package:kazumi/request/apis/trace_api.dart';import 'package:kazumi/utils/search_parser.dart';part 'search_controller.g.dart';@@ -27,10 +27,12 @@ abstract class _SearchPageController with Store {bool isTimeOut = false;@observable- late bool notShowWatchedBangumis = _collectRepository.getSearchNotShowWatchedBangumis();+ late bool notShowWatchedBangumis =+ _collectRepository.getSearchNotShowWatchedBangumis();@observable- late bool notShowAbandonedBangumis = _collectRepository.getSearchNotShowAbandonedBangumis();+ late bool notShowAbandonedBangumis =+ _collectRepository.getSearchNotShowAbandonedBangumis();@observableObservableList<BangumiItem> bangumiList = ObservableList.of([]);@@ -93,14 +95,14 @@ abstract class _SearchPageController with Store {if (idString != null) {final id = int.tryParse(idString);if (id != null) {- final BangumiItem? item = await BangumiHTTP.getBangumiInfoByID(id);+ final BangumiItem? item = await BangumiApi.getBangumiInfoByID(id);if (item != null) {bangumiList.add(item);}return;}}- var result = await BangumiHTTP.bangumiSearch(keywords,+ var result = await BangumiApi.bangumiSearch(keywords,tags: [if (tag != null) tag],offset: bangumiList.length,sort: sort ?? 'heat');@@ -134,7 +136,7 @@ abstract class _SearchPageController with Store {imageSearchError = '';imageSearchResults.clear();try {- final result = await Trace.searchAnimeByImageFile(imageFile);+ final result = await TraceApi.searchAnimeByImageFile(imageFile);imageSearchResults.addAll(result.result ?? []);if (result.error != null && result.error!.isNotEmpty) {imageSearchError = result.error!;@@ -154,7 +156,7 @@ abstract class _SearchPageController with Store {imageSearchError = '';imageSearchResults.clear();try {- final result = await Trace.searchAnimeByImageUrl(imageUrl);+ final result = await TraceApi.searchAnimeByImageUrl(imageUrl);imageSearchResults.addAll(result.result ?? []);if (result.error != null && result.error!.isNotEmpty) {imageSearchError = result.error!;diff --git a/lib/pages/settings/proxy/proxy_editor_page.dart b/lib/pages/settings/proxy/proxy_editor_page.dartindex 2fdc1769..f42d20df 100644--- a/lib/pages/settings/proxy/proxy_editor_page.dart+++ b/lib/pages/settings/proxy/proxy_editor_page.dart@@ -1,12 +1,12 @@import 'package:flutter/material.dart';-import 'package:dio/dio.dart';import 'package:kazumi/bean/dialog/dialog_helper.dart';import 'package:hive_ce/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';+import 'package:kazumi/request/core/dio_factory.dart';+import 'package:kazumi/request/core/network_config.dart';class ProxyEditorPage extends StatefulWidget {const ProxyEditorPage({super.key});@@ -24,10 +24,9 @@ class _ProxyEditorPageState extends State<ProxyEditorPage> {@overridevoid initState() {super.initState();- urlController.text =- setting.get(SettingBoxKey.proxyUrl, defaultValue: '');- testUrlController.text =- setting.get(SettingBoxKey.proxyTestUrl, defaultValue: 'https://www.google.com');+ urlController.text = setting.get(SettingBoxKey.proxyUrl, defaultValue: '');+ testUrlController.text = setting.get(SettingBoxKey.proxyTestUrl,+ defaultValue: 'https://www.google.com');}@override@@ -62,15 +61,26 @@ class _ProxyEditorPageState extends State<ProxyEditorPage> {ProxyManager.applyProxy();try {- await Request().get(- testUrl,- options: Options(- sendTimeout: const Duration(seconds: 10),+ final parsed = ProxyUtils.parseProxyUrl(url);+ if (parsed == null) {+ throw StateError('Invalid proxy URL');+ }+ final dio = DioFactory.createForConfig(+ NetworkConfig(+ connectTimeout: const Duration(seconds: 10),receiveTimeout: const Duration(seconds: 10),- validateStatus: (status) => true,+ sendTimeout: const Duration(seconds: 10),+ proxyHost: parsed.$1,+ proxyPort: parsed.$2,+ allowBadCertificates: true,+ enableLog: false,),- shouldRethrow: true,- ).timeout(const Duration(seconds: 15));+ );+ await dio+ .get(+ testUrl,+ )+ .timeout(const Duration(seconds: 15));await setting.put(SettingBoxKey.proxyConfigured, true);KazumiDialog.showToast(message: '测试成功');} catch (e) {diff --git a/lib/pages/timeline/timeline_controller.dart b/lib/pages/timeline/timeline_controller.dartindex 4b1dc3fb..599d3e05 100644--- a/lib/pages/timeline/timeline_controller.dart+++ b/lib/pages/timeline/timeline_controller.dart@@ -1,6 +1,6 @@import 'package:flutter_modular/flutter_modular.dart';import 'package:kazumi/modules/bangumi/bangumi_item.dart';-import 'package:kazumi/request/bangumi.dart';+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';@@ -27,13 +27,16 @@ abstract class _TimelineController with Store {bool isTimeOut = false;@observable- late bool notShowAbandonedBangumis = _collectRepository.getTimelineNotShowAbandonedBangumis();+ late bool notShowAbandonedBangumis =+ _collectRepository.getTimelineNotShowAbandonedBangumis();@observable- late bool notShowWatchedBangumis = _collectRepository.getTimelineNotShowWatchedBangumis();+ late bool notShowWatchedBangumis =+ _collectRepository.getTimelineNotShowWatchedBangumis();@observable- late bool onlyShowWatchingBangumis = _collectRepository.getTimelineOnlyShowWatchingBangumis();+ late bool onlyShowWatchingBangumis =+ _collectRepository.getTimelineOnlyShowWatchingBangumis();int sortType = 3;@@ -49,7 +52,7 @@ abstract class _TimelineController with Store {isLoading = true;isTimeOut = false;bangumiCalendar.clear();- final resBangumiCalendar = await BangumiHTTP.getCalendar();+ final resBangumiCalendar = await BangumiApi.getCalendar();bangumiCalendar.clear();bangumiCalendar.addAll(resBangumiCalendar);changeSortType(sortType);@@ -68,7 +71,7 @@ abstract class _TimelineController with Store {var resBangumiCalendar = List.generate(7, (_) => <BangumiItem>[]);for (time = 0; time < maxTime; time++) {final offset = time * limit;- var newList = await BangumiHTTP.getCalendarBySearch(+ var newList = await BangumiApi.getCalendarBySearch(AnimeSeason(selectedDate).toSeasonStartAndEnd(), limit, offset);for (int i = 0; i < resBangumiCalendar.length; ++i) {resBangumiCalendar[i].addAll(newList[i]);diff --git a/lib/pages/video/video_controller.dart b/lib/pages/video/video_controller.dartindex 82a3c73c..8319328d 100644--- a/lib/pages/video/video_controller.dart+++ b/lib/pages/video/video_controller.dart@@ -17,7 +17,7 @@ import 'package:kazumi/utils/logger.dart';import 'package:window_manager/window_manager.dart';import 'package:kazumi/modules/bangumi/episode_item.dart';import 'package:kazumi/modules/comments/comment_item.dart';-import 'package:kazumi/request/bangumi.dart';+import 'package:kazumi/request/apis/bangumi_api.dart';import 'package:dio/dio.dart';import 'package:hive_ce/hive.dart';import 'package:kazumi/utils/storage.dart';@@ -345,9 +345,9 @@ abstract class _VideoPageController with Store {Future<void> queryBangumiEpisodeCommentsByID(int id, int episode) async {final int requestId = ++_episodeCommentsRequestId;final EpisodeInfo latestEpisodeInfo =- await BangumiHTTP.getBangumiEpisodeByID(id, episode);+ await BangumiApi.getBangumiEpisodeByID(id, episode);final value =- await BangumiHTTP.getBangumiCommentsByEpisodeID(latestEpisodeInfo.id);+ await BangumiApi.getBangumiCommentsByEpisodeID(latestEpisodeInfo.id);if (requestId != _episodeCommentsRequestId) {return;}diff --git a/lib/plugins/plugins.dart b/lib/plugins/plugins.dartindex a94a5f45..7e73e0ec 100644--- a/lib/plugins/plugins.dart+++ b/lib/plugins/plugins.dart@@ -1,9 +1,9 @@import 'package:dio/dio.dart';import 'package:kazumi/modules/search/plugin_search_module.dart';import 'package:kazumi/modules/roads/road_module.dart';-import 'package:kazumi/request/request.dart';+import 'package:kazumi/request/clients/plugin_site_client.dart';import 'package:html/parser.dart';-import 'package:kazumi/request/api.dart';+import 'package:kazumi/request/config/api_endpoints.dart';import 'package:kazumi/utils/logger.dart';import 'package:xpath_selector_html_parser/xpath_selector_html_parser.dart';import 'package:kazumi/utils/utils.dart';@@ -17,7 +17,8 @@ class CaptchaRequiredException implements Exception {final String pluginName;const CaptchaRequiredException(this.pluginName);@override- String toString() => 'CaptchaRequiredException: $pluginName requires captcha verification';+ String toString() =>+ 'CaptchaRequiredException: $pluginName requires captcha verification';}/// Thrown by [Plugin.queryBangumi] when the search request succeeds but the@@ -26,7 +27,8 @@ class NoResultException implements Exception {final String pluginName;const NoResultException(this.pluginName);@override- String toString() => 'NoResultException: $pluginName returned no search results';+ String toString() =>+ 'NoResultException: $pluginName returned no search results';}/// Thrown by [Plugin.queryBangumi] when the HTTP request or HTML parsing@@ -36,16 +38,20 @@ class SearchErrorException implements Exception {final Object? cause;const SearchErrorException(this.pluginName, {this.cause});@override- String toString() => 'SearchErrorException: $pluginName search failed${cause != null ? ' ($cause)' : ''}';+ String toString() =>+ 'SearchErrorException: $pluginName search failed${cause != null ? ' ($cause)' : ''}';}class Plugin {+ static final PluginSiteClient _siteClient = PluginSiteClient.instance;+String api;String type;String name;String version;bool muliSources;bool useWebview;+/// Deprecated (always true)bool useNativePlayer;bool usePost;@@ -114,7 +120,7 @@ class Plugin {factory Plugin.fromTemplate() {return Plugin(- api: Api.apiLevel.toString(),+ api: ApiEndpoints.apiLevel.toString(),type: 'anime',name: '',version: '',@@ -164,75 +170,77 @@ class Plugin {Future<PluginSearchResponse> queryBangumi(String keyword,{bool shouldRethrow = false}) async {try {- String queryURL = searchURL.replaceAll('@keyword', Uri.encodeQueryComponent(keyword));- dynamic resp;- List<SearchItem> searchItems = [];- final String cookieHeader = await _cookieHeaderFor(queryURL);- if (usePost) {- Uri uri = Uri.parse(queryURL);- Map<String, String> queryParams = uri.queryParameters;- Uri postUri = Uri(- scheme: uri.scheme,- host: uri.host,- path: uri.path,- );- var httpHeaders = {- 'referer': '$baseUrl/',- 'Content-Type': 'application/x-www-form-urlencoded',- 'Accept-Language': Utils.getRandomAcceptedLanguage(),- 'Connection': 'keep-alive',- if (cookieHeader.isNotEmpty) 'Cookie': cookieHeader,- };- resp = await Request().post(postUri.toString(),- options: Options(headers: httpHeaders),- extra: {'customError': ''},+ String queryURL =+ searchURL.replaceAll('@keyword', Uri.encodeQueryComponent(keyword));+ String htmlString;+ List<SearchItem> searchItems = [];+ final String cookieHeader = await _cookieHeaderFor(queryURL);+ if (usePost) {+ Uri uri = Uri.parse(queryURL);+ Map<String, String> queryParams = uri.queryParameters;+ Uri postUri = Uri(+ scheme: uri.scheme,+ host: uri.host,+ path: uri.path,+ );+ var httpHeaders = {+ 'referer': '$baseUrl/',+ 'Content-Type': 'application/x-www-form-urlencoded',+ 'Accept-Language': Utils.getRandomAcceptedLanguage(),+ 'Connection': 'keep-alive',+ if (cookieHeader.isNotEmpty) 'Cookie': cookieHeader,+ };+ htmlString = await _siteClient.postFormText(+ postUri.toString(),+ headers: httpHeaders,data: queryParams,- shouldRethrow: shouldRethrow);- } else {- var httpHeaders = {- 'referer': '$baseUrl/',- 'Accept-Language': Utils.getRandomAcceptedLanguage(),- 'Connection': 'keep-alive',- if (cookieHeader.isNotEmpty) 'Cookie': cookieHeader,- };- resp = await Request().get(queryURL,- options: Options(headers: httpHeaders),- shouldRethrow: shouldRethrow,- extra: {'customError': ''});- }+ );+ } else {+ var httpHeaders = {+ 'referer': '$baseUrl/',+ 'Accept-Language': Utils.getRandomAcceptedLanguage(),+ 'Connection': 'keep-alive',+ if (cookieHeader.isNotEmpty) 'Cookie': cookieHeader,+ };+ htmlString = await _siteClient.getText(+ queryURL,+ headers: httpHeaders,+ );+ }- var htmlString = resp.data.toString();- var htmlElement = parse(htmlString).documentElement!;+ var htmlElement = parse(htmlString).documentElement!;- // Detect captcha challenge: if antiCrawlerConfig is enabled, check both- // captchaImage and captchaButton XPaths — if either matches, throw so- // callers can show the dedicated captcha UI instead of a generic error.- if (antiCrawlerConfig.enabled) {- final List<String> detectionXpaths = [- antiCrawlerConfig.captchaImage,- antiCrawlerConfig.captchaButton,- ].where((x) => x.isNotEmpty).toList();- final bool captchaDetected = detectionXpaths.any(- (xpath) => htmlElement.queryXPath(xpath).node != null);- if (captchaDetected) {- KazumiLogger().w('Plugin: $name detected captcha challenge in search response');- throw CaptchaRequiredException(name);+ // Detect captcha challenge: if antiCrawlerConfig is enabled, check both+ // captchaImage and captchaButton XPaths — if either matches, throw so+ // callers can show the dedicated captcha UI instead of a generic error.+ if (antiCrawlerConfig.enabled) {+ final List<String> detectionXpaths = [+ antiCrawlerConfig.captchaImage,+ antiCrawlerConfig.captchaButton,+ ].where((x) => x.isNotEmpty).toList();+ final bool captchaDetected = detectionXpaths+ .any((xpath) => htmlElement.queryXPath(xpath).node != null);+ if (captchaDetected) {+ KazumiLogger()+ .w('Plugin: $name detected captcha challenge in search response');+ throw CaptchaRequiredException(name);+ }}- }- htmlElement.queryXPath(searchList).nodes.forEach((element) {- try {- SearchItem searchItem = SearchItem(- name: element.queryXPath(searchName).node!.text?.trim() ?? '',- src: element.queryXPath(searchResult).node!.attributes['href'] ?? '',- );- searchItems.add(searchItem);- KazumiLogger().i(- 'Plugin: $name ${element.queryXPath(searchName).node!.text ?? ''} $baseUrl${element.queryXPath(searchResult).node!.attributes['href'] ?? ''}');- } catch (_) {}- });- if (searchItems.isEmpty) throw NoResultException(name);- return PluginSearchResponse(pluginName: name, data: searchItems);+ htmlElement.queryXPath(searchList).nodes.forEach((element) {+ try {+ SearchItem searchItem = SearchItem(+ name: element.queryXPath(searchName).node!.text?.trim() ?? '',+ src:+ element.queryXPath(searchResult).node!.attributes['href'] ?? '',+ );+ searchItems.add(searchItem);+ KazumiLogger().i(+ 'Plugin: $name ${element.queryXPath(searchName).node!.text ?? ''} $baseUrl${element.queryXPath(searchResult).node!.attributes['href'] ?? ''}');+ } catch (_) {}+ });+ if (searchItems.isEmpty) throw NoResultException(name);+ return PluginSearchResponse(pluginName: name, data: searchItems);} on CaptchaRequiredException {rethrow;} on NoResultException {@@ -244,7 +252,8 @@ class Plugin {}}- Future<List<Road>> querychapterRoads(String url, {CancelToken? cancelToken}) async {+ Future<List<Road>> querychapterRoads(String url,+ {CancelToken? cancelToken}) async {List<Road> roadList = [];if (!url.contains('https')) {url = url.replaceAll('http', 'https');@@ -261,9 +270,11 @@ class Plugin {'Connection': 'keep-alive',};try {- var resp =- await Request().get(queryURL, options: Options(headers: httpHeaders), cancelToken: cancelToken);- var htmlString = resp.data.toString();+ final htmlString = await _siteClient.getText(+ queryURL,+ headers: httpHeaders,+ cancelToken: cancelToken,+ );var htmlElement = parse(htmlString).documentElement!;int count = 1;htmlElement.queryXPath(chapterRoads).nodes.forEach((element) {@@ -292,8 +303,9 @@ class Plugin {Future<String> testSearchRequest(String keyword,{bool shouldRethrow = false, CancelToken? cancelToken}) async {- String queryURL = searchURL.replaceAll('@keyword', Uri.encodeQueryComponent(keyword));- dynamic resp;+ String queryURL =+ searchURL.replaceAll('@keyword', Uri.encodeQueryComponent(keyword));+ String htmlString;if (usePost) {Uri uri = Uri.parse(queryURL);Map<String, String> queryParams = uri.queryParameters;@@ -308,26 +320,26 @@ class Plugin {'Accept-Language': Utils.getRandomAcceptedLanguage(),'Connection': 'keep-alive',};- resp = await Request().post(postUri.toString(),- options: Options(headers: httpHeaders),- extra: {'customError': ''},- data: queryParams,- shouldRethrow: shouldRethrow,- cancelToken: cancelToken);+ htmlString = await _siteClient.postFormText(+ postUri.toString(),+ headers: httpHeaders,+ data: queryParams,+ cancelToken: cancelToken,+ );} else {var httpHeaders = {'referer': '$baseUrl/','Accept-Language': Utils.getRandomAcceptedLanguage(),'Connection': 'keep-alive',};- resp = await Request().get(queryURL,- options: Options(headers: httpHeaders),- shouldRethrow: shouldRethrow,- extra: {'customError': ''},- cancelToken: cancelToken);+ htmlString = await _siteClient.getText(+ queryURL,+ headers: httpHeaders,+ cancelToken: cancelToken,+ );}- return resp.data.toString();+ return htmlString;}Future<String> _cookieHeaderFor(String url) async {@@ -374,7 +386,7 @@ class Plugin {} catch (_) {}});PluginSearchResponse pluginSearchResponse =- PluginSearchResponse(pluginName: name, data: searchItems);+ PluginSearchResponse(pluginName: name, data: searchItems);return pluginSearchResponse;}}diff --git a/lib/plugins/plugins_controller.dart b/lib/plugins/plugins_controller.dartindex c094b08f..b64ac50a 100644--- a/lib/plugins/plugins_controller.dart+++ b/lib/plugins/plugins_controller.dart@@ -6,10 +6,10 @@ import 'package:path_provider/path_provider.dart';import 'package:kazumi/plugins/plugins.dart';import 'package:kazumi/plugins/plugin_validity_tracker.dart';import 'package:kazumi/plugins/plugin_install_time_tracker.dart';-import 'package:kazumi/request/plugin.dart';+import 'package:kazumi/request/apis/plugin_catalog_api.dart';import 'package:kazumi/modules/plugin/plugin_http_module.dart';import 'package:kazumi/utils/logger.dart';-import 'package:kazumi/request/api.dart';+import 'package:kazumi/request/config/api_endpoints.dart';part 'plugins_controller.g.dart';@@ -54,15 +54,13 @@ abstract class _PluginsController with Store {// Loads all plugins from the directory, populates the plugin list, and saves to plugins.json if neededFuture<void> loadAllPlugins() async {pluginList.clear();- KazumiLogger()- .i('Plugins Directory: ${newPluginDirectory!.path}');+ KazumiLogger().i('Plugins Directory: ${newPluginDirectory!.path}');if (await newPluginDirectory!.exists()) {final pluginsFile = File('${newPluginDirectory!.path}/$pluginsFileName');if (await pluginsFile.exists()) {final jsonString = await pluginsFile.readAsString();pluginList.addAll(getPluginListFromJson(jsonString));- KazumiLogger()- .i('Plugin: Current Plugin number: ${pluginList.length}');+ KazumiLogger().i('Plugin: Current Plugin number: ${pluginList.length}');} else {// No plugins.jsonvar jsonFiles = await getPluginFiles();@@ -169,13 +167,13 @@ abstract class _PluginsController with Store {Future<void> queryPluginHTTPList() async {pluginHTTPList.clear();- var pluginHTTPListRes = await PluginHTTP.getPluginList();+ var pluginHTTPListRes = await PluginCatalogApi.getPluginList();pluginHTTPList.addAll(pluginHTTPListRes);}Future<Plugin?> queryPluginHTTP(String name) async {Plugin? plugin;- plugin = await PluginHTTP.getPlugin(name);+ plugin = await PluginCatalogApi.getPlugin(name);return plugin;}@@ -211,7 +209,7 @@ abstract class _PluginsController with Store {Future<int> tryUpdatePluginByName(String name) async {var pluginHTTPItem = await queryPluginHTTP(name);if (pluginHTTPItem != null) {- if (int.parse(pluginHTTPItem.api) > Api.apiLevel) {+ if (int.parse(pluginHTTPItem.api) > ApiEndpoints.apiLevel) {return 1;}updatePlugin(pluginHTTPItem);diff --git a/lib/request/bangumi.dart b/lib/request/apis/bangumi_api.dartsimilarity index 72%rename from lib/request/bangumi.dartrename to lib/request/apis/bangumi_api.dartindex f21df4a8..4a26d07a 100644--- a/lib/request/bangumi.dart+++ b/lib/request/apis/bangumi_api.dart@@ -1,7 +1,7 @@-import 'package:dio/dio.dart';import 'package:kazumi/utils/logger.dart';-import 'package:kazumi/request/api.dart';-import 'package:kazumi/request/request.dart';+import 'package:kazumi/request/config/api_endpoints.dart';+import 'package:kazumi/request/clients/bangumi_client.dart';+import 'package:kazumi/request/core/network_exception.dart';import 'package:kazumi/modules/bangumi/bangumi_item.dart';import 'package:kazumi/modules/comments/comment_response.dart';import 'package:kazumi/modules/characters/characters_response.dart';@@ -13,16 +13,16 @@ import 'package:kazumi/modules/collect/collect_type.dart';import 'package:kazumi/modules/collect/collect_type_mapper.dart';import 'package:kazumi/modules/bangumi/bangumi_collection_type.dart';-class BangumiHTTP {+class BangumiApi {+ static final BangumiClient _client = BangumiClient.instance;// why the api havn't been replaced by getCalendarBySearch?// Because getCalendarBySearch is not stable, it will miss some bangumi items.static Future<List<List<BangumiItem>>> getCalendar() async {List<List<BangumiItem>> bangumiCalendar = [];try {- var res = await Request().get(- Api.bangumiAPINextDomain + Api.bangumiCalendar,+ final jsonData = await _client.get(+ ApiEndpoints.bangumiAPINextDomain + ApiEndpoints.bangumiCalendar,);- final jsonData = res.data;for (int i = 1; i <= 7; i++) {List<BangumiItem> bangumiList = [];final jsonList = jsonData['$i'];@@ -35,8 +35,7 @@ class BangumiHTTP {bangumiCalendar.add(bangumiList);}} catch (e) {- KazumiLogger()- .e('Resolve calendar failed', error: e);+ KazumiLogger().e('Resolve calendar failed', error: e);}return bangumiCalendar;}@@ -60,13 +59,13 @@ class BangumiHTTP {}};try {- final url = Api.formatUrl(- Api.bangumiAPIDomain + Api.bangumiRankSearch, [limit, offset]);- final res = await Request().post(+ final url = ApiEndpoints.formatUrl(+ ApiEndpoints.bangumiAPIDomain + ApiEndpoints.bangumiRankSearch,+ [limit, offset]);+ final jsonData = await _client.post(url,data: params,);- final jsonData = res.data;final jsonList = jsonData['data'];for (dynamic jsonItem in jsonList) {if (jsonItem is Map<String, dynamic>) {@@ -74,8 +73,7 @@ class BangumiHTTP {}}} catch (e) {- KazumiLogger()- .e('Resolve bangumi list failed', error: e);+ KazumiLogger().e('Resolve bangumi list failed', error: e);}try {for (int weekday = 1; weekday <= 7; weekday++) {@@ -88,7 +86,8 @@ class BangumiHTTP {bangumiCalendar.add(bangumiDayList);}} catch (e) {- KazumiLogger().e('Network: fetch bangumi item to calendar failed', error: e);+ KazumiLogger()+ .e('Network: fetch bangumi item to calendar failed', error: e);}return bangumiCalendar;}@@ -121,11 +120,12 @@ class BangumiHTTP {};}try {- final res = await Request().post(- Api.formatUrl(Api.bangumiAPIDomain + Api.bangumiRankSearch, [100, 0]),+ final jsonData = await _client.post(+ ApiEndpoints.formatUrl(+ ApiEndpoints.bangumiAPIDomain + ApiEndpoints.bangumiRankSearch,+ [100, 0]),data: params,);- final jsonData = res.data;final jsonList = jsonData['data'];for (dynamic jsonItem in jsonList) {if (jsonItem is Map<String, dynamic>) {@@ -133,8 +133,7 @@ class BangumiHTTP {}}} catch (e) {- KazumiLogger()- .e('Network: resolve bangumi list failed', error: e);+ KazumiLogger().e('Network: resolve bangumi list failed', error: e);}return bangumiList;}@@ -148,11 +147,10 @@ class BangumiHTTP {'offset': offset,};try {- final res = await Request().get(- Api.bangumiAPINextDomain + Api.bangumiTrendsNext,- data: params,+ final jsonData = await _client.get(+ ApiEndpoints.bangumiAPINextDomain + ApiEndpoints.bangumiTrendsNext,+ queryParameters: params,);- final jsonData = res.data;final jsonList = jsonData['data'];for (dynamic jsonItem in jsonList) {if (jsonItem is Map<String, dynamic>) {@@ -183,12 +181,12 @@ class BangumiHTTP {};try {- final res = await Request().post(- Api.formatUrl(- Api.bangumiAPIDomain + Api.bangumiRankSearch, [20, offset]),+ final jsonData = await _client.post(+ ApiEndpoints.formatUrl(+ ApiEndpoints.bangumiAPIDomain + ApiEndpoints.bangumiRankSearch,+ [20, offset]),data: params,);- final jsonData = res.data;final jsonList = jsonData['data'];for (dynamic jsonItem in jsonList) {if (jsonItem is Map<String, dynamic>) {@@ -198,7 +196,8 @@ class BangumiHTTP {bangumiList.add(bangumiItem);}} catch (e) {- KazumiLogger().e('Network: resolve search results failed', error: e);+ KazumiLogger()+ .e('Network: resolve search results failed', error: e);}}}@@ -210,10 +209,11 @@ class BangumiHTTP {static Future<BangumiItem?> getBangumiInfoByID(int id) async {try {- final res = await Request().get(- Api.formatUrl(Api.bangumiAPIDomain + Api.bangumiInfoByID, [id]),+ final jsonData = await _client.get(+ ApiEndpoints.formatUrl(+ ApiEndpoints.bangumiAPIDomain + ApiEndpoints.bangumiInfoByID, [id]),);- return BangumiItem.fromJson(res.data);+ return BangumiItem.fromJson(jsonData);} catch (e) {KazumiLogger().e('Network: resolve bangumi item failed', error: e);return null;@@ -228,12 +228,11 @@ class BangumiHTTP {'limit': 1};try {- final res = await Request().get(- Api.bangumiAPIDomain + Api.bangumiEpisodeByID,- data: params,+ final jsonData = await _client.get(+ ApiEndpoints.bangumiAPIDomain + ApiEndpoints.bangumiEpisodeByID,+ queryParameters: params,);- final jsonData = res.data['data'][0];- episodeInfo = EpisodeInfo.fromJson(jsonData);+ episodeInfo = EpisodeInfo.fromJson(jsonData['data'][0]);} catch (e) {KazumiLogger().e('Network: resolve bangumi episode failed', error: e);}@@ -252,11 +251,10 @@ class BangumiHTTP {'offset': offset,'limit': limit,};- final res = await Request().get(- Api.bangumiAPIDomain + Api.bangumiEpisodeByID,- data: params,+ final jsonData = await _client.get(+ ApiEndpoints.bangumiAPIDomain + ApiEndpoints.bangumiEpisodeByID,+ queryParameters: params,);- final jsonData = res.data;total ??= jsonData['total'] as int?;final data = jsonData['data'] as List<dynamic>? ?? [];if (data.isEmpty) {@@ -276,68 +274,64 @@ class BangumiHTTP {static Future<CommentResponse> getBangumiCommentsByID(int id,{int offset = 0}) async {- final res = await Request().get(- Api.formatUrl(Api.bangumiAPINextDomain + Api.bangumiCommentsByIDNext,+ final jsonData = await _client.get(+ ApiEndpoints.formatUrl(+ ApiEndpoints.bangumiAPINextDomain ++ ApiEndpoints.bangumiCommentsByIDNext,[id, 20, offset]),- extra: {'customError': ''},- shouldRethrow: true,);- return CommentResponse.fromJson(res.data);+ return CommentResponse.fromJson(jsonData);}static Future<EpisodeCommentResponse> getBangumiCommentsByEpisodeID(int id) async {- final res = await Request().get(- Api.formatUrl(- Api.bangumiAPINextDomain + Api.bangumiEpisodeCommentsByIDNext,+ final jsonData = await _client.get(+ ApiEndpoints.formatUrl(+ ApiEndpoints.bangumiAPINextDomain ++ ApiEndpoints.bangumiEpisodeCommentsByIDNext,[id]),- extra: {'customError': ''},- shouldRethrow: true,);- return EpisodeCommentResponse.fromJson(res.data);+ return EpisodeCommentResponse.fromJson(jsonData);}static Future<CharacterCommentResponse> getCharacterCommentsByCharacterID(int id) async {- final res = await Request().get(- Api.formatUrl(- Api.bangumiAPINextDomain + Api.bangumiCharacterCommentsByIDNext,+ final jsonData = await _client.get(+ ApiEndpoints.formatUrl(+ ApiEndpoints.bangumiAPINextDomain ++ ApiEndpoints.bangumiCharacterCommentsByIDNext,[id]),- extra: {'customError': ''},- shouldRethrow: true,);- return CharacterCommentResponse.fromJson(res.data);+ return CharacterCommentResponse.fromJson(jsonData);}static Future<StaffResponse> getBangumiStaffByID(int id) async {- final res = await Request().get(- Api.formatUrl(- Api.bangumiAPINextDomain + Api.bangumiStaffByIDNext, [id]),- extra: {'customError': ''},- shouldRethrow: true,+ final jsonData = await _client.get(+ ApiEndpoints.formatUrl(+ ApiEndpoints.bangumiAPINextDomain + ApiEndpoints.bangumiStaffByIDNext,+ [id]),);- return StaffResponse.fromJson(res.data);+ return StaffResponse.fromJson(jsonData);}static Future<CharactersResponse> getCharatersByBangumiID(int id) async {- final res = await Request().get(- Api.formatUrl(Api.bangumiAPIDomain + Api.bangumiCharacterByID, [id]),- extra: {'customError': ''},- shouldRethrow: true,+ final jsonData = await _client.get(+ ApiEndpoints.formatUrl(+ ApiEndpoints.bangumiAPIDomain + ApiEndpoints.bangumiCharacterByID,+ [id]),);- return CharactersResponse.fromJson(res.data);+ return CharactersResponse.fromJson(jsonData);}static Future<CharacterFullItem> getCharacterByCharacterID(int id) async {CharacterFullItem characterFullItem = CharacterFullItem.fromTemplate();try {- final res = await Request().get(- Api.formatUrl(- Api.bangumiAPINextDomain +- Api.bangumiCharacterInfoByCharacterIDNext,+ final jsonData = await _client.get(+ ApiEndpoints.formatUrl(+ ApiEndpoints.bangumiAPINextDomain ++ ApiEndpoints.bangumiCharacterInfoByCharacterIDNext,[id]),);- final jsonData = res.data;characterFullItem = CharacterFullItem.fromJson(jsonData);} catch (e) {KazumiLogger().e('Network: resolve character info failed', error: e);@@ -347,16 +341,17 @@ class BangumiHTTP {static Future<String?> getUsername() async {try {- final res = await Request().get(- Api.formatUrl(Api.bangumiAPIDomain + Api.bangumiUsernameByToken, []),- extra: {'customError': '', 'requiresBangumiAuth': true},- shouldRethrow: true,+ final jsonData = await _client.get(+ ApiEndpoints.formatUrl(+ ApiEndpoints.bangumiAPIDomain + ApiEndpoints.bangumiUsernameByToken,+ []),+ requiresAuth: true,);- if (res.data['id'] != null) {- return res.data['username'] ?? 'Unknown';+ if (jsonData['id'] != null) {+ return jsonData['username'] ?? 'Unknown';}- } on DioException catch (e) {- if (e.response?.statusCode == 401) {+ } on NetworkException catch (e) {+ if (e.statusCode == 401) {KazumiLogger().e('Bangumi token unauthorized, please check your token');throw StateError('Bangumi token 未授权,请检查您的 token');}@@ -381,8 +376,9 @@ class BangumiHTTP {void Function(String message, int current, int total)? onProgress,}) async {final List<BangumiCollection> bangumiCollection = [];- final resolvedUsername =- username != null && username.isNotEmpty ? username : await getUsername();+ final resolvedUsername = username != null && username.isNotEmpty+ ? username+ : await getUsername();int failedItemCount = 0;int progressCurrent = 0;int progressTotal = 0;@@ -402,27 +398,27 @@ class BangumiHTTP {int? total;bool totalInitialized = false;while (true) {- Response<dynamic> res;+ dynamic jsonData;try {- final url = Api.formatUrl(- Api.bangumiAPIDomain + Api.bangumiGetCollection,+ final url = ApiEndpoints.formatUrl(+ ApiEndpoints.bangumiAPIDomain ++ ApiEndpoints.bangumiGetCollection,[resolvedUsername, limit, offset, collectionType.value]);- res = await Request().get(+ jsonData = await _client.get(url,- extra: {'customError': '', 'requiresBangumiAuth': true},- shouldRethrow: true,+ requiresAuth: true,);} catch (e) {KazumiLogger().e(- 'BangumiHTTP: fetch collection failed. type=${collectionType.value}, offset=$offset',+ 'BangumiApi: fetch collection failed. type=${collectionType.value}, offset=$offset',error: e,);rethrow;}- final Map jsonData = res.data;- final List<dynamic> jsonList = jsonData['data'];- total ??= jsonData['total'];+ final Map jsonMap = jsonData;+ final List<dynamic> jsonList = jsonMap['data'];+ total ??= jsonMap['total'];if (!totalInitialized && total != null) {progressTotal += total;totalInitialized = true;@@ -440,7 +436,7 @@ class BangumiHTTP {);} catch (e) {KazumiLogger().e(- 'BangumiHTTP: parse collection item failed: ${e.toString()}',+ 'BangumiApi: parse collection item failed: ${e.toString()}',error: e,);failedItemCount++;@@ -471,17 +467,18 @@ class BangumiHTTP {int id, Map<String, dynamic> data) async {const Duration requestInterval = Duration(milliseconds: 250);try {- await Request().post(- Api.formatUrl(Api.bangumiAPIDomain + Api.bangumiSetCollection, [id]),+ await _client.post(+ ApiEndpoints.formatUrl(+ ApiEndpoints.bangumiAPIDomain + ApiEndpoints.bangumiSetCollection,+ [id]),data: data,- extra: {'customError': '', 'requiresBangumiAuth': true},- shouldRethrow: true,+ requiresAuth: true,);KazumiLogger().d('Update to Bangumi: Id: $id');return true;- } on DioException catch (e) {+ } on NetworkException catch (e) {String str;- switch (e.response?.statusCode) {+ switch (e.statusCode) {case 400:str = 'Validation Error 验证错误';break;diff --git a/lib/request/damaku.dart b/lib/request/apis/danmaku_api.dartsimilarity index 63%rename from lib/request/damaku.dartrename to lib/request/apis/danmaku_api.dartindex 2286be2e..20b29abe 100644--- a/lib/request/damaku.dart+++ b/lib/request/apis/danmaku_api.dart@@ -1,19 +1,20 @@-import 'package:kazumi/request/request.dart';-import 'package:kazumi/request/api.dart';+import 'package:kazumi/request/config/api_endpoints.dart';+import 'package:kazumi/request/clients/danmaku_client.dart';import 'package:kazumi/utils/logger.dart';import 'package:kazumi/modules/danmaku/danmaku_module.dart';import 'package:kazumi/modules/danmaku/danmaku_search_response.dart';import 'package:kazumi/modules/danmaku/danmaku_episode_response.dart';import 'package:kazumi/utils/string_match.dart';-class DanmakuRequest {+class DanmakuApi {+ static final DanmakuClient _client = DanmakuClient.instance;+// 从BgmBangumiID获取DanDanBangumiIDstatic Future<int> getDanDanBangumiIDByBgmBangumiID(int bgmBangumiID) async {- var path = Api.formatUrl(Api.dandanAPIInfoByBgmBangumiId, [bgmBangumiID]);- var endPoint = Api.dandanAPIDomain + path;- final res = await Request().get(endPoint,- extra: {'customError': '弹幕检索错误: 获取弹幕分集ID失败'});- Map<String, dynamic> jsonData = res.data;+ var path = ApiEndpoints.formatUrl(+ ApiEndpoints.dandanAPIInfoByBgmBangumiId, [bgmBangumiID]);+ var endPoint = ApiEndpoints.dandanAPIDomain + path;+ final jsonData = await _client.get(endPoint);DanmakuEpisodeResponse danmakuEpisodeResponse =DanmakuEpisodeResponse.fromJson(jsonData);return danmakuEpisodeResponse.bangumiId;@@ -43,7 +44,8 @@ class DanmakuRequest {if (similarity > maxSimilarity) {maxSimilarity = similarity;bestAnimeId = animeId;- KazumiLogger().i('Danmaku: match anime danmaku $title --- $animeTitle similarity: $similarity');+ KazumiLogger().i(+ 'Danmaku: match anime danmaku $title --- $animeTitle similarity: $similarity');}}@@ -53,11 +55,10 @@ class DanmakuRequest {// 从BangumiID获取分集IDstatic Future<DanmakuEpisodeResponse> getDanmakuEpisodesByBangumiID(int bangumiID) async {- var path = Api.formatUrl(Api.dandanAPIInfoByBgmBangumiId, [bangumiID]);- var endPoint = Api.dandanAPIDomain + path;- final res = await Request().get(endPoint,- extra: {'customError': '弹幕检索错误: 获取弹幕分集ID失败'});- Map<String, dynamic> jsonData = res.data;+ var path = ApiEndpoints.formatUrl(+ ApiEndpoints.dandanAPIInfoByBgmBangumiId, [bangumiID]);+ var endPoint = ApiEndpoints.dandanAPIDomain + path;+ final jsonData = await _client.get(endPoint);DanmakuEpisodeResponse danmakuEpisodeResponse =DanmakuEpisodeResponse.fromJson(jsonData);return danmakuEpisodeResponse;@@ -66,11 +67,9 @@ class DanmakuRequest {// 从DanDanBangumiID获取分集IDstatic Future<DanmakuEpisodeResponse> getDanDanEpisodesByDanDanBangumiID(int bangumiID) async {- var path = Api.dandanAPIInfo + bangumiID.toString();- var endPoint = Api.dandanAPIDomain + path;- final res = await Request().get(endPoint,- extra: {'customError': '弹幕检索错误: 获取弹幕分集ID失败'});- Map<String, dynamic> jsonData = res.data;+ var path = ApiEndpoints.dandanAPIInfo + bangumiID.toString();+ var endPoint = ApiEndpoints.dandanAPIDomain + path;+ final jsonData = await _client.get(endPoint);DanmakuEpisodeResponse danmakuEpisodeResponse =DanmakuEpisodeResponse.fromJson(jsonData);return danmakuEpisodeResponse;@@ -79,16 +78,13 @@ class DanmakuRequest {// 从标题检索DanDan番剧数据库static Future<DanmakuSearchResponse> getDanmakuSearchResponse(String title) async {- var path = Api.dandanAPISearch;- var endPoint = Api.dandanAPIDomain + path;+ var path = ApiEndpoints.dandanAPISearch;+ var endPoint = ApiEndpoints.dandanAPIDomain + path;Map<String, String> keywordMap = {'keyword': title,};- final res = await Request().get(endPoint,- data: keywordMap,- extra: {'customError': '弹幕检索错误: 获取弹幕番剧ID失败'});- Map<String, dynamic> jsonData = res.data;+ final jsonData = await _client.get(endPoint, queryParameters: keywordMap);DanmakuSearchResponse danmakuSearchResponse =DanmakuSearchResponse.fromJson(jsonData);return danmakuSearchResponse;@@ -99,20 +95,16 @@ class DanmakuRequest {if (bangumiID == 0) {return danmakus;}- // 这里猜测了弹弹Play的分集命名规则,例如上面的番剧ID为1758,第一集弹幕库ID大概率为17580001,但是此命名规则并没有体现在官方API文档里,保险的做法是请求 Api.dandanInfo- var path = Api.dandanAPIComment ++ // 这里猜测了弹弹Play的分集命名规则,例如上面的番剧ID为1758,第一集弹幕库ID大概率为17580001,但是此命名规则并没有体现在官方API文档里,保险的做法是请求 ApiEndpoints.dandanInfo+ var path = ApiEndpoints.dandanAPIComment +bangumiID.toString() +episode.toString().padLeft(4, '0');- var endPoint = Api.dandanAPIDomain + path;+ var endPoint = ApiEndpoints.dandanAPIDomain + path;Map<String, String> withRelated = {'withRelated': 'true',};KazumiLogger().i("Danmaku: final request URL $endPoint");- final res = await Request().get(endPoint,- data: withRelated,- extra: {'customError': '弹幕检索错误: 获取弹幕失败'});-- Map<String, dynamic> jsonData = res.data;+ final jsonData = await _client.get(endPoint, queryParameters: withRelated);List<dynamic> comments = jsonData['comments'];for (var comment in comments) {@@ -123,16 +115,13 @@ class DanmakuRequest {}static Future<List<Danmaku>> getDanDanmakuByEpisodeID(int episodeID) async {- var path = Api.dandanAPIComment + episodeID.toString();- var endPoint = Api.dandanAPIDomain + path;+ var path = ApiEndpoints.dandanAPIComment + episodeID.toString();+ var endPoint = ApiEndpoints.dandanAPIDomain + path;List<Danmaku> danmakus = [];Map<String, String> withRelated = {'withRelated': 'true',};- final res = await Request().get(endPoint,- data: withRelated,- extra: {'customError': '弹幕检索错误: 获取弹幕失败'});- Map<String, dynamic> jsonData = res.data;+ final jsonData = await _client.get(endPoint, queryParameters: withRelated);List<dynamic> comments = jsonData['comments'];for (var comment in comments) {diff --git a/lib/request/plugin.dart b/lib/request/apis/plugin_catalog_api.dartsimilarity index 58%rename from lib/request/plugin.dartrename to lib/request/apis/plugin_catalog_api.dartindex e6d3e8d7..89c914e1 100644--- a/lib/request/plugin.dart+++ b/lib/request/apis/plugin_catalog_api.dart@@ -1,19 +1,22 @@import 'dart:convert';import 'package:kazumi/utils/logger.dart';-import 'package:kazumi/request/api.dart';-import 'package:kazumi/request/request.dart';+import 'package:kazumi/request/config/api_endpoints.dart';+import 'package:kazumi/request/clients/github_client.dart';import 'package:kazumi/plugins/plugins.dart';import 'package:kazumi/modules/plugin/plugin_http_module.dart';-class PluginHTTP {+class PluginCatalogApi {+ static final GithubClient _client = GithubClient.instance;+static Future<List<PluginHTTPItem>> getPluginList() async {List<PluginHTTPItem> pluginHTTPItemList = [];try {- var res = await Request().get('${Api.pluginShop}index.json');- final jsonData = json.decode(res.data);+ final raw = await _client.getText('${ApiEndpoints.pluginShop}index.json');+ final jsonData = json.decode(raw);for (dynamic pluginJsonItem in jsonData) {try {- PluginHTTPItem pluginHTTPItem = PluginHTTPItem.fromJson(pluginJsonItem);+ PluginHTTPItem pluginHTTPItem =+ PluginHTTPItem.fromJson(pluginJsonItem);pluginHTTPItemList.add(pluginHTTPItem);} catch (_) {}}@@ -26,12 +29,12 @@ class PluginHTTP {static Future<Plugin?> getPlugin(String name) async {Plugin? plugin;try {- var res = await Request().get('${Api.pluginShop}$name.json');- final jsonData = json.decode(res.data);+ final raw = await _client.getText('${ApiEndpoints.pluginShop}$name.json');+ final jsonData = json.decode(raw);plugin = Plugin.fromJson(jsonData);- } catch(e) {+ } catch (e) {KazumiLogger().e('Plugin: getPlugin error: ${e.toString()}');}return plugin;}-}\ No newline at end of file+}diff --git a/lib/request/query_manager.dart b/lib/request/apis/query_manager.dartsimilarity index 87%rename from lib/request/query_manager.dartrename to lib/request/apis/query_manager.dartindex 0fdec035..6434a518 100644--- a/lib/request/query_manager.dart+++ b/lib/request/apis/query_manager.dart@@ -45,13 +45,16 @@ class QueryManager {}if (error is CaptchaRequiredException) {- KazumiLogger().w('QueryManager: captcha required for ${error.pluginName}');+ KazumiLogger()+ .w('QueryManager: captcha required for ${error.pluginName}');infoController.pluginSearchStatus[error.pluginName] = 'captcha';} else if (error is NoResultException) {- KazumiLogger().i('QueryManager: no results for ${error.pluginName}');+ KazumiLogger()+ .i('QueryManager: no results for ${error.pluginName}');infoController.pluginSearchStatus[error.pluginName] = 'noResult';} else {- final name = error is SearchErrorException ? error.pluginName : plugin.name;+ final name =+ error is SearchErrorException ? error.pluginName : plugin.name;KazumiLogger().w('QueryManager: search error for $name');infoController.pluginSearchStatus[name] = 'error';}@@ -87,13 +90,15 @@ class QueryManager {}if (error is CaptchaRequiredException) {- KazumiLogger().w('QueryManager: captcha required for ${error.pluginName}');+ KazumiLogger()+ .w('QueryManager: captcha required for ${error.pluginName}');infoController.pluginSearchStatus[error.pluginName] = 'captcha';} else if (error is NoResultException) {KazumiLogger().i('QueryManager: no results for ${error.pluginName}');infoController.pluginSearchStatus[error.pluginName] = 'noResult';} else {- final name = error is SearchErrorException ? error.pluginName : plugin.name;+ final name =+ error is SearchErrorException ? error.pluginName : plugin.name;KazumiLogger().w('QueryManager: search error for $name');infoController.pluginSearchStatus[name] = 'error';}diff --git a/lib/request/apis/trace_api.dart b/lib/request/apis/trace_api.dartnew file mode 100644index 00000000..4a425050--- /dev/null+++ b/lib/request/apis/trace_api.dart@@ -0,0 +1,38 @@+import 'dart:io';++import 'package:kazumi/request/clients/api_client.dart';+import 'package:kazumi/modules/search/image_search_module.dart';+import 'package:kazumi/request/config/api_endpoints.dart';++class TraceApi {+ static final ApiClient _client = ApiClient.instance;++ ///根据图片搜索番剧信息+ static Future<ImageSearchItem> searchAnimeByImageFile(File imageFile,+ {int anilistInfo = 2}) async {+ final bytes = await imageFile.readAsBytes();++ final data = await _client.post(+ ApiEndpoints.traceApi,+ queryParameters: {+ 'anilistInfo': anilistInfo,+ },+ data: bytes,+ headers: {'Content-Type': 'image/jpeg'},+ );+ return ImageSearchItem.fromJson(data as Map<String, dynamic>);+ }++ ///根据图片URL搜索番剧信息+ static Future<ImageSearchItem> searchAnimeByImageUrl(String imageUrl,+ {int anilistInfo = 2}) async {+ final data = await _client.post(+ ApiEndpoints.traceApi,+ queryParameters: {+ 'anilistInfo': anilistInfo,+ 'url': imageUrl,+ },+ );+ return ImageSearchItem.fromJson(data as Map<String, dynamic>);+ }+}diff --git a/lib/request/clients/api_client.dart b/lib/request/clients/api_client.dartnew file mode 100644index 00000000..602994be--- /dev/null+++ b/lib/request/clients/api_client.dart@@ -0,0 +1,30 @@+import 'package:dio/dio.dart';+import 'package:kazumi/request/core/dio_factory.dart';+import 'package:kazumi/request/core/network_error_mapper.dart';++class ApiClient {+ ApiClient._();++ static final ApiClient instance = ApiClient._();++ Future<dynamic> post(+ String url, {+ Object? data,+ Map<String, dynamic>? queryParameters,+ Map<String, dynamic> headers = const {},+ CancelToken? cancelToken,+ }) async {+ try {+ final response = await DioFactory.apiDio.post(+ url,+ data: data,+ queryParameters: queryParameters,+ options: Options(headers: headers),+ cancelToken: cancelToken,+ );+ return response.data;+ } on DioException catch (e) {+ throw await NetworkErrorMapper.mapException(e);+ }+ }+}diff --git a/lib/request/clients/bangumi_client.dart b/lib/request/clients/bangumi_client.dartnew file mode 100644index 00000000..89bf10c2--- /dev/null+++ b/lib/request/clients/bangumi_client.dart@@ -0,0 +1,68 @@+import 'package:dio/dio.dart';+import 'package:hive_ce/hive.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/utils/storage.dart';++class BangumiClient {+ BangumiClient._();++ static final BangumiClient instance = BangumiClient._();++ Box get _setting => GStorage.setting;++ Future<dynamic> get(+ String url, {+ Map<String, dynamic>? queryParameters,+ bool requiresAuth = false,+ CancelToken? cancelToken,+ }) async {+ try {+ final response = await DioFactory.apiDio.get(+ url,+ queryParameters: queryParameters,+ options: Options(headers: _headers(requiresAuth: requiresAuth)),+ cancelToken: cancelToken,+ );+ return response.data;+ } on DioException catch (e) {+ throw await NetworkErrorMapper.mapException(e);+ }+ }++ Future<dynamic> post(+ String url, {+ Object? data,+ Map<String, dynamic>? queryParameters,+ bool requiresAuth = false,+ CancelToken? cancelToken,+ }) async {+ try {+ final response = await DioFactory.apiDio.post(+ url,+ data: data,+ queryParameters: queryParameters,+ options: Options(headers: _headers(requiresAuth: requiresAuth)),+ cancelToken: cancelToken,+ );+ return response.data;+ } on DioException catch (e) {+ throw await NetworkErrorMapper.mapException(e);+ }+ }++ Map<String, dynamic> _headers({required bool requiresAuth}) {+ final headers = <String, dynamic>{...bangumiHTTPHeader};+ final bangumiSyncEnable =+ _setting.get(SettingBoxKey.bangumiSyncEnable, defaultValue: false);+ final token = _setting+ .get(SettingBoxKey.bangumiAccessToken, defaultValue: '')+ .toString()+ .trim();+ if ((requiresAuth || bangumiSyncEnable) && token.isNotEmpty) {+ headers['Authorization'] = 'Bearer $token';+ }+ return headers;+ }+}diff --git a/lib/request/clients/danmaku_client.dart b/lib/request/clients/danmaku_client.dartnew file mode 100644index 00000000..d78d274d--- /dev/null+++ b/lib/request/clients/danmaku_client.dart@@ -0,0 +1,42 @@+import 'package:dio/dio.dart';+import 'package:kazumi/request/core/dio_factory.dart';+import 'package:kazumi/request/core/network_error_mapper.dart';+import 'package:kazumi/utils/mortis.dart';+import 'package:kazumi/utils/utils.dart';++class DanmakuClient {+ DanmakuClient._();++ static final DanmakuClient instance = DanmakuClient._();++ Future<dynamic> get(+ String url, {+ Map<String, dynamic>? queryParameters,+ Map<String, dynamic> headers = const {},+ CancelToken? cancelToken,+ }) async {+ final timestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;+ final uri = Uri.parse(url);+ final requestHeaders = <String, dynamic>{+ 'user-agent': Utils.getRandomUA(),+ 'referer': '',+ 'X-Auth': 1,+ 'X-AppId': mortis['id'],+ 'X-Timestamp': timestamp,+ 'X-Signature': Utils.generateDandanSignature(uri.path, timestamp),+ ...headers,+ };++ try {+ final response = await DioFactory.apiDio.get(+ url,+ queryParameters: queryParameters,+ options: Options(headers: requestHeaders),+ cancelToken: cancelToken,+ );+ return response.data;+ } on DioException catch (e) {+ throw await NetworkErrorMapper.mapException(e);+ }+ }+}diff --git a/lib/request/clients/download_http_client.dart b/lib/request/clients/download_http_client.dartnew file mode 100644index 00000000..6a9e3968--- /dev/null+++ b/lib/request/clients/download_http_client.dart@@ -0,0 +1,74 @@+import 'package:dio/dio.dart';+import 'package:kazumi/request/core/dio_factory.dart';+import 'package:kazumi/request/core/network_error_mapper.dart';++class DownloadHttpClient {+ DownloadHttpClient._();++ static final DownloadHttpClient instance = DownloadHttpClient._();++ Future<Response<ResponseBody>> getStream(+ String url, {+ Map<String, dynamic> headers = const {},+ Duration? receiveTimeout,+ CancelToken? cancelToken,+ }) async {+ try {+ return await DioFactory.downloadDio.get<ResponseBody>(+ url,+ options: Options(+ headers: headers,+ responseType: ResponseType.stream,+ receiveTimeout: receiveTimeout,+ ),+ cancelToken: cancelToken,+ );+ } on DioException catch (e) {+ throw await NetworkErrorMapper.mapException(e);+ }+ }++ Future<String> getPlain(+ String url, {+ Map<String, dynamic> headers = const {},+ Duration? receiveTimeout,+ CancelToken? cancelToken,+ ProgressCallback? onReceiveProgress,+ }) async {+ try {+ final response = await DioFactory.downloadDio.get<String>(+ url,+ options: Options(+ headers: headers,+ responseType: ResponseType.plain,+ receiveTimeout: receiveTimeout,+ ),+ cancelToken: cancelToken,+ onReceiveProgress: onReceiveProgress,+ );+ return response.data ?? '';+ } on DioException catch (e) {+ throw await NetworkErrorMapper.mapException(e);+ }+ }++ Future<void> download(+ String url,+ String savePath, {+ Map<String, dynamic> headers = const {},+ CancelToken? cancelToken,+ ProgressCallback? onReceiveProgress,+ }) async {+ try {+ await DioFactory.downloadDio.download(+ url,+ savePath,+ options: Options(headers: headers),+ cancelToken: cancelToken,+ onReceiveProgress: onReceiveProgress,+ );+ } on DioException catch (e) {+ throw await NetworkErrorMapper.mapException(e);+ }+ }+}diff --git a/lib/request/clients/github_client.dart b/lib/request/clients/github_client.dartnew file mode 100644index 00000000..f6a41834--- /dev/null+++ b/lib/request/clients/github_client.dart@@ -0,0 +1,50 @@+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';++class GithubClient {+ GithubClient._();++ static final GithubClient instance = GithubClient._();++ Future<Map<String, dynamic>> latestRelease() async {+ final data = await getJson(ApiEndpoints.latestApp);+ return Map<String, dynamic>.from(data);+ }++ Future<String> latestVersion() async {+ final data = await latestRelease();+ return data['tag_name']?.toString() ?? ApiEndpoints.version;+ }++ Future<dynamic> getJson(+ String url, {+ Map<String, dynamic>? queryParameters,+ CancelToken? cancelToken,+ }) async {+ try {+ final response = await DioFactory.githubDio.get(+ url,+ queryParameters: queryParameters,+ cancelToken: cancelToken,+ );+ return response.data;+ } on DioException catch (e) {+ throw await NetworkErrorMapper.mapException(e);+ }+ }++ Future<String> getText(String url, {CancelToken? cancelToken}) async {+ try {+ final response = await DioFactory.githubDio.get<String>(+ url,+ options: Options(responseType: ResponseType.plain),+ cancelToken: cancelToken,+ );+ return response.data ?? '';+ } on DioException catch (e) {+ throw await NetworkErrorMapper.mapException(e);+ }+ }+}diff --git a/lib/request/clients/plugin_site_client.dart b/lib/request/clients/plugin_site_client.dartnew file mode 100644index 00000000..7b1b01e5--- /dev/null+++ b/lib/request/clients/plugin_site_client.dart@@ -0,0 +1,64 @@+import 'package:dio/dio.dart';+import 'package:kazumi/request/core/dio_factory.dart';+import 'package:kazumi/request/core/network_error_mapper.dart';+import 'package:kazumi/utils/utils.dart';++class PluginSiteClient {+ PluginSiteClient._();++ static final PluginSiteClient instance = PluginSiteClient._();++ Future<String> getText(+ String url, {+ Map<String, dynamic> headers = const {},+ CancelToken? cancelToken,+ }) async {+ try {+ final response = await DioFactory.pluginDio.get<String>(+ url,+ options: Options(+ responseType: ResponseType.plain,+ headers: _headers(headers),+ ),+ cancelToken: cancelToken,+ );+ return response.data ?? '';+ } on DioException catch (e) {+ throw await NetworkErrorMapper.mapException(e);+ }+ }++ Future<String> postFormText(+ String url, {+ Object? data,+ Map<String, dynamic> headers = const {},+ CancelToken? cancelToken,+ }) async {+ try {+ final response = await DioFactory.pluginDio.post<String>(+ url,+ data: data,+ options: Options(+ responseType: ResponseType.plain,+ headers: _headers({+ 'Content-Type': 'application/x-www-form-urlencoded',+ ...headers,+ }),+ ),+ cancelToken: cancelToken,+ );+ return response.data ?? '';+ } on DioException catch (e) {+ throw await NetworkErrorMapper.mapException(e);+ }+ }++ Map<String, dynamic> _headers(Map<String, dynamic> headers) {+ return {+ 'user-agent': Utils.getRandomUA(),+ 'Accept-Language': Utils.getRandomAcceptedLanguage(),+ 'Connection': 'keep-alive',+ ...headers,+ };+ }+}diff --git a/lib/request/api.dart b/lib/request/config/api_endpoints.dartsimilarity index 78%rename from lib/request/api.dartrename to lib/request/config/api_endpoints.dartindex da817e0f..3a6854e6 100644--- a/lib/request/api.dart+++ b/lib/request/config/api_endpoints.dart@@ -1,70 +1,105 @@-class Api {+class ApiEndpoints {/// 当前版本static const String version = '2.1.0';+/// 规则API级别static const int apiLevel = 6;+/// 项目主页static const String projectUrl = "https://kazumi.app/";+/// Github 项目主页static const String sourceUrl = "https://github.com/Predidit/Kazumi";+/// 图标作者static const String iconUrl = "https://www.pixiv.net/users/66219277";+/// 规则仓库- static const String pluginShop = 'https://raw.githubusercontent.com/Predidit/KazumiRules/main/';+ static const String pluginShop =+ 'https://raw.githubusercontent.com/Predidit/KazumiRules/main/';+/// 在线升级static const String latestApp =- 'https://api.github.com/repos/Predidit/Kazumi/releases/latest';+ 'https://api.github.com/repos/Predidit/Kazumi/releases/latest';+/// Github镜像static const String gitMirror = 'https://ghfast.top/';+/// 弹弹官网static const String dandanIndex = 'https://www.dandanplay.com/';+/// Bangumi 官网static const String bangumiIndex = 'https://bangumi.tv/';/// bangumi API Domainstatic const String bangumiAPIDomain = 'https://api.bgm.tv';+/// 番剧信息static const String bangumiInfoByID = '/v0/subjects/{0}';+/// 条目搜索- static const String bangumiRankSearch = '/v0/search/subjects?limit={0}&offset={1}';+ static const String bangumiRankSearch =+ '/v0/search/subjects?limit={0}&offset={1}';+/// 从条目ID获取角色信息static const String bangumiCharacterByID = '/v0/subjects/{0}/characters';+/// 从条目ID获取剧集IDstatic const String bangumiEpisodeByID = '/v0/episodes';+/// 返回当前 Access Token 对应的用户信息static const String bangumiUsernameByToken = '/v0/me';+/// 新增或修改用户单个条目收藏static const String bangumiSetCollection = '/v0/users/-/collections/{0}';+/// 获取用户收藏。用户名,分页参数1,分页参数2- static const String bangumiGetCollection = '/v0/users/{0}/collections?subject_type=2&limit={1}&offset={2}&type={3}';+ static const String bangumiGetCollection =+ '/v0/users/{0}/collections?subject_type=2&limit={1}&offset={2}&type={3}';/// Bangumi Next API Domainstatic const String bangumiAPINextDomain = 'https://next.bgm.tv';+/// 每日放送static const String bangumiCalendar = '/p1/calendar';+/// 番剧趋势static const String bangumiTrendsNext = '/p1/trending/subjects';+/// 番剧信息static const String bangumiInfoByIDNext = '/p1/subjects/{0}';+/// 番剧评论- static const String bangumiCommentsByIDNext = '/p1/subjects/{0}/comments?limit={1}&offset={2}';+ static const String bangumiCommentsByIDNext =+ '/p1/subjects/{0}/comments?limit={1}&offset={2}';+/// 番剧剧集评论- static const String bangumiEpisodeCommentsByIDNext = '/p1/episodes/{0}/comments';+ static const String bangumiEpisodeCommentsByIDNext =+ '/p1/episodes/{0}/comments';+/// 番剧角色信息- static const String bangumiCharacterInfoByCharacterIDNext = '/p1/characters/{0}';+ static const String bangumiCharacterInfoByCharacterIDNext =+ '/p1/characters/{0}';+/// 番剧角色评论- static const String bangumiCharacterCommentsByIDNext = '/p1/characters/{0}/comments';+ static const String bangumiCharacterCommentsByIDNext =+ '/p1/characters/{0}/comments';+/// 番剧工作人员信息static const String bangumiStaffByIDNext = '/p1/subjects/{0}/staffs/persons';/// DanDanPlay API Domainstatic const String dandanAPIDomain = 'https://api.dandanplay.net';+/// 获取弹幕static const String dandanAPIComment = "/api/v2/comment/";+/// 检索弹弹番剧元数据static const String dandanAPISearch = "/api/v2/search/anime";+/// 获取弹弹番剧元数据static const String dandanAPIInfo = "/api/v2/bangumi/";+/// 获取弹弹番剧元数据(通过BGM番剧ID)static const String dandanAPIInfoByBgmBangumiId = "/api/v2/bangumi/bgmtv/{0}";@@ -77,4 +112,4 @@ class Api {}return url;}-}\ No newline at end of file+}diff --git a/lib/request/core/dio_factory.dart b/lib/request/core/dio_factory.dartnew file mode 100644index 00000000..939041c3--- /dev/null+++ b/lib/request/core/dio_factory.dart@@ -0,0 +1,120 @@+import 'package:dio/dio.dart';+import 'package:kazumi/request/config/api_endpoints.dart';+import 'package:kazumi/request/core/dio_logger_interceptor.dart';+import 'package:kazumi/request/core/network_config.dart';+import 'package:kazumi/utils/logger.dart';+import 'package:kazumi/utils/storage.dart';+import 'package:kazumi/utils/utils.dart';++class DioFactory {+ DioFactory._();++ static Dio? _apiDio;+ static Dio? _githubDio;+ static Dio? _pluginDio;+ static Dio? _downloadDio;++ static Dio get apiDio => _apiDio ??= _create(+ NetworkConfig.fromSettings(),+ defaultHeaders: {+ 'referer': '',+ 'user-agent': Utils.getRandomUA(),+ },+ );++ static Dio get githubDio => _githubDio ??= _create(+ NetworkConfig.fromSettings(),+ defaultHeaders: {+ 'accept': 'application/vnd.github+json',+ 'user-agent': Utils.getRandomUA(),+ },+ interceptors: [_GithubMirrorInterceptor()],+ );++ static Dio get pluginDio => _pluginDio ??= _create(+ NetworkConfig.fromSettings(),+ defaultHeaders: {+ 'user-agent': Utils.getRandomUA(),+ 'accept-language': Utils.getRandomAcceptedLanguage(),+ },+ );++ static Dio get downloadDio => _downloadDio ??= _create(+ NetworkConfig.fromSettings(+ connectTimeout: const Duration(seconds: 15),+ receiveTimeout: const Duration(seconds: 30),+ ),+ defaultHeaders: {+ 'user-agent': Utils.getRandomUA(),+ },+ );++ static Dio createForConfig(NetworkConfig config) {+ return _create(config);+ }++ static void reset() {+ _apiDio = null;+ _githubDio = null;+ _pluginDio = null;+ _downloadDio = null;+ }++ static Dio _create(+ NetworkConfig config, {+ 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(+ BaseOptions(+ connectTimeout: config.connectTimeout,+ receiveTimeout: config.receiveTimeout,+ sendTimeout: config.sendTimeout,+ headers: defaultHeaders,+ validateStatus: (status) =>+ status != null && status >= 200 && status < 300,+ ),+ );+ dio.httpClientAdapter = config.createAdapter();+ dio.transformer = BackgroundTransformer();+ dio.interceptors.addAll(interceptors);+ if (config.enableLog) {+ dio.interceptors.add(DioLoggerInterceptor());+ }+ return dio;+ }+}++class _GithubMirrorInterceptor extends Interceptor {+ static const _mirrorableHosts = {+ 'api.github.com',+ 'github.com',+ 'raw.githubusercontent.com',+ 'objects.githubusercontent.com',+ 'github-releases.githubusercontent.com',+ };++ @override+ void onRequest(RequestOptions options, RequestInterceptorHandler handler) {+ final enableGitProxy =+ GStorage.setting.get(SettingBoxKey.enableGitProxy, defaultValue: false);+ if (!enableGitProxy) {+ handler.next(options);+ return;+ }++ final uri = options.uri;+ if (!_mirrorableHosts.contains(uri.host)) {+ handler.next(options);+ return;+ }++ final mirrored = '${ApiEndpoints.gitMirror}${uri.toString()}';+ KazumiLogger().d('GitHub mirror: $mirrored');+ options.path = mirrored;+ handler.next(options);+ }+}diff --git a/lib/request/core/dio_logger_interceptor.dart b/lib/request/core/dio_logger_interceptor.dartnew file mode 100644index 00000000..db802ce3--- /dev/null+++ b/lib/request/core/dio_logger_interceptor.dart@@ -0,0 +1,45 @@+import 'package:dio/dio.dart';+import 'package:kazumi/utils/logger.dart';++class DioLoggerInterceptor extends Interceptor {+ static const _startedAtExtraKey = '_kazumiStartedAt';++ @override+ void onRequest(RequestOptions options, RequestInterceptorHandler handler) {+ options.extra[_startedAtExtraKey] = DateTime.now();+ KazumiLogger().d('HTTP: --> ${options.method} ${options.uri}');+ handler.next(options);+ }++ @override+ void onResponse(Response response, ResponseInterceptorHandler handler) {+ final elapsed = _elapsed(response.requestOptions);+ KazumiLogger().d(+ 'HTTP: <-- ${response.statusCode} '+ '${response.requestOptions.method} ${response.requestOptions.uri}'+ '${elapsed == null ? '' : ' ${elapsed}ms'}',+ );+ handler.next(response);+ }++ @override+ void onError(DioException err, ErrorInterceptorHandler handler) {+ final elapsed = _elapsed(err.requestOptions);+ final statusCode = err.response?.statusCode;+ final status = statusCode == null ? err.type.name : statusCode.toString();+ KazumiLogger().w(+ 'HTTP: <-- $status ${err.requestOptions.method} ${err.requestOptions.uri}'+ '${elapsed == null ? '' : ' ${elapsed}ms'}',+ error: err.message,+ );+ handler.next(err);+ }++ int? _elapsed(RequestOptions options) {+ final startedAt = options.extra[_startedAtExtraKey];+ if (startedAt is! DateTime) {+ return null;+ }+ return DateTime.now().difference(startedAt).inMilliseconds;+ }+}diff --git a/lib/request/core/network_config.dart b/lib/request/core/network_config.dartnew file mode 100644index 00000000..f0de3df7--- /dev/null+++ b/lib/request/core/network_config.dart@@ -0,0 +1,103 @@+import 'dart:io';++import 'package:dio/io.dart';+import 'package:hive_ce/hive.dart';+import 'package:kazumi/utils/logger.dart';+import 'package:kazumi/utils/proxy_utils.dart';+import 'package:kazumi/utils/storage.dart';++class NetworkConfig {+ const NetworkConfig({+ this.connectTimeout = const Duration(seconds: 12),+ this.receiveTimeout = const Duration(seconds: 12),+ this.sendTimeout,+ this.proxyHost,+ this.proxyPort,+ this.allowBadCertificates = false,+ this.enableLog = true,+ });++ final Duration connectTimeout;+ final Duration receiveTimeout;+ final Duration? sendTimeout;+ final String? proxyHost;+ final int? proxyPort;+ final bool allowBadCertificates;+ final bool enableLog;++ bool get hasProxy => proxyHost != null && proxyPort != null;++ IOHttpClientAdapter createAdapter() {+ return IOHttpClientAdapter(+ createHttpClient: () {+ final client = HttpClient();+ if (hasProxy) {+ client.findProxy = (_) => 'PROXY $proxyHost:$proxyPort';+ }+ if (allowBadCertificates) {+ client.badCertificateCallback = (cert, host, port) => true;+ }+ return client;+ },+ );+ }++ NetworkConfig copyWith({+ Duration? connectTimeout,+ Duration? receiveTimeout,+ Duration? sendTimeout,+ String? proxyHost,+ int? proxyPort,+ bool? clearProxy,+ bool? allowBadCertificates,+ bool? enableLog,+ }) {+ final shouldClearProxy = clearProxy ?? false;+ return NetworkConfig(+ connectTimeout: connectTimeout ?? this.connectTimeout,+ receiveTimeout: receiveTimeout ?? this.receiveTimeout,+ sendTimeout: sendTimeout ?? this.sendTimeout,+ proxyHost: shouldClearProxy ? null : proxyHost ?? this.proxyHost,+ proxyPort: shouldClearProxy ? null : proxyPort ?? this.proxyPort,+ allowBadCertificates: allowBadCertificates ?? this.allowBadCertificates,+ enableLog: enableLog ?? this.enableLog,+ );+ }++ static NetworkConfig fromSettings({+ Duration connectTimeout = const Duration(seconds: 12),+ Duration receiveTimeout = const Duration(seconds: 12),+ Duration? sendTimeout,+ }) {+ final Box setting = GStorage.setting;+ final bool proxyEnable =+ setting.get(SettingBoxKey.proxyEnable, defaultValue: false);+ if (!proxyEnable) {+ return NetworkConfig(+ connectTimeout: connectTimeout,+ receiveTimeout: receiveTimeout,+ sendTimeout: sendTimeout,+ );+ }++ final proxyUrl = setting.get(SettingBoxKey.proxyUrl, defaultValue: '');+ final parsed = ProxyUtils.parseProxyUrl(proxyUrl);+ if (parsed == null) {+ KazumiLogger().w('Proxy: 代理地址格式错误或为空');+ return NetworkConfig(+ connectTimeout: connectTimeout,+ receiveTimeout: receiveTimeout,+ sendTimeout: sendTimeout,+ );+ }++ return NetworkConfig(+ connectTimeout: connectTimeout,+ receiveTimeout: receiveTimeout,+ sendTimeout: sendTimeout,+ proxyHost: parsed.$1,+ proxyPort: parsed.$2,+ allowBadCertificates: true,+ );+ }+}diff --git a/lib/request/core/network_error_mapper.dart b/lib/request/core/network_error_mapper.dartnew file mode 100644index 00000000..2e859e6c--- /dev/null+++ b/lib/request/core/network_error_mapper.dart@@ -0,0 +1,102 @@+import 'package:connectivity_plus/connectivity_plus.dart';+import 'package:dio/dio.dart';+import 'package:kazumi/request/core/network_exception.dart';++class NetworkErrorMapper {+ const NetworkErrorMapper._();++ static Future<NetworkException> mapException(DioException error) async {+ switch (error.type) {+ case DioExceptionType.badCertificate:+ return NetworkException(+ type: NetworkExceptionType.badCertificate,+ message: '证书有误!',+ rawError: error,+ stackTrace: error.stackTrace,+ );+ case DioExceptionType.badResponse:+ return NetworkException(+ type: NetworkExceptionType.badResponse,+ message: '服务器异常,请稍后重试!',+ statusCode: error.response?.statusCode,+ rawError: error,+ stackTrace: error.stackTrace,+ );+ case DioExceptionType.cancel:+ return NetworkException(+ type: NetworkExceptionType.cancel,+ message: '请求已被取消,请重新请求',+ rawError: error,+ stackTrace: error.stackTrace,+ );+ case DioExceptionType.connectionError:+ return NetworkException(+ type: NetworkExceptionType.connectionError,+ message: '连接错误,请检查网络设置',+ rawError: error,+ stackTrace: error.stackTrace,+ );+ case DioExceptionType.connectionTimeout:+ return NetworkException(+ type: NetworkExceptionType.connectionTimeout,+ message: '网络连接超时,请检查网络设置',+ rawError: error,+ stackTrace: error.stackTrace,+ );+ case DioExceptionType.receiveTimeout:+ return NetworkException(+ type: NetworkExceptionType.receiveTimeout,+ message: '响应超时,请稍后重试!',+ rawError: error,+ stackTrace: error.stackTrace,+ );+ case DioExceptionType.sendTimeout:+ return NetworkException(+ type: NetworkExceptionType.sendTimeout,+ message: '发送请求超时,请检查网络设置',+ rawError: error,+ stackTrace: error.stackTrace,+ );+ case DioExceptionType.unknown:+ final connection = await _connectionLabel();+ return NetworkException(+ type: NetworkExceptionType.unknown,+ message: '$connection 网络异常'.trimLeft(),+ rawError: error,+ stackTrace: error.stackTrace,+ );+ }+ }++ static NetworkException parse(Object error, StackTrace stackTrace) {+ return NetworkException(+ type: NetworkExceptionType.parseError,+ message: '响应解析失败',+ rawError: error,+ stackTrace: stackTrace,+ );+ }++ static Future<String> _connectionLabel() async {+ final connectivityResult = await Connectivity().checkConnectivity();+ if (connectivityResult.contains(ConnectivityResult.mobile)) {+ return '正在使用移动流量';+ }+ if (connectivityResult.contains(ConnectivityResult.wifi)) {+ return '正在使用wifi';+ }+ if (connectivityResult.contains(ConnectivityResult.ethernet)) {+ return '正在使用局域网';+ }+ if (connectivityResult.contains(ConnectivityResult.vpn)) {+ return '正在使用代理网络';+ }+ if (connectivityResult.contains(ConnectivityResult.other)) {+ return '正在使用其他网络';+ }+ if (connectivityResult.contains(ConnectivityResult.none)) {+ return '未连接到任何网络';+ }+ return '';+ }+}diff --git a/lib/request/core/network_exception.dart b/lib/request/core/network_exception.dartnew file mode 100644index 00000000..a622299d--- /dev/null+++ b/lib/request/core/network_exception.dart@@ -0,0 +1,33 @@+enum NetworkExceptionType {+ badCertificate,+ badResponse,+ cancel,+ connectionError,+ connectionTimeout,+ receiveTimeout,+ sendTimeout,+ parseError,+ unknown,+}++class NetworkException implements Exception {+ final NetworkExceptionType type;+ final String message;+ final int? statusCode;+ final Object? rawError;+ final StackTrace? stackTrace;++ const NetworkException({+ required this.type,+ required this.message,+ this.statusCode,+ this.rawError,+ this.stackTrace,+ });++ @override+ String toString() {+ final status = statusCode == null ? '' : ' ($statusCode)';+ return 'NetworkException.$type$status: $message';+ }+}diff --git a/lib/request/interceptor.dart b/lib/request/interceptor.dartdeleted file mode 100644index 1588cac1..00000000--- a/lib/request/interceptor.dart+++ /dev/null@@ -1,129 +0,0 @@-import 'package:dio/dio.dart';-import 'package:kazumi/request/api.dart';-import 'package:hive_ce/hive.dart';-import 'package:kazumi/utils/storage.dart';-import 'package:kazumi/bean/dialog/dialog_helper.dart';-import 'package:connectivity_plus/connectivity_plus.dart';-import 'package:kazumi/utils/utils.dart';-import 'package:kazumi/utils/mortis.dart';-import 'package:kazumi/utils/constants.dart';--class ApiInterceptor extends Interceptor {- static Box setting = GStorage.setting;- @override- void onRequest(RequestOptions options, RequestInterceptorHandler handler) {- // Github mirror- if (options.path.contains('github')) {- bool enableGitProxy =- setting.get(SettingBoxKey.enableGitProxy, defaultValue: false);- if (enableGitProxy) {- options.path = Api.gitMirror + options.path;- }- }- if (options.path.contains(Api.dandanAPIDomain)) {- var timestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;- options.headers = {- 'user-agent': Utils.getRandomUA(),- 'referer': '',- 'X-Auth': 1,- 'X-AppId': mortis['id'],- 'X-Timestamp': timestamp,- 'X-Signature': Utils.generateDandanSignature(- Uri.parse(options.path).path, timestamp),- };- }- if (options.path.contains(Api.bangumiAPIDomain) ||- options.path.contains(Api.bangumiAPINextDomain)) {- final mergedHeaders = <String, dynamic>{- ...options.headers,- ...bangumiHTTPHeader,- };- final bool bangumiSyncEnable =- setting.get(SettingBoxKey.bangumiSyncEnable, defaultValue: false);- final bool requiresBangumiAuth =- options.extra['requiresBangumiAuth'] == true;- final String token = setting- .get(SettingBoxKey.bangumiAccessToken, defaultValue: '')- .toString()- .trim();- if ((bangumiSyncEnable || requiresBangumiAuth) && token.isNotEmpty) {- mergedHeaders['Authorization'] = 'Bearer $token';- }- options.headers = mergedHeaders;- }- handler.next(options);- }-- @override- void onResponse(Response response, ResponseInterceptorHandler handler) {- handler.next(response);- }-- @override- void onError(DioException err, ErrorInterceptorHandler handler) async {- String url = err.requestOptions.uri.toString();- if (!url.contains('heartBeat') &&- err.requestOptions.extra['customError'] != '') {- if (err.requestOptions.extra['customError'] == null) {- KazumiDialog.showToast(- message: await dioError(err),- );- } else {- KazumiDialog.showToast(- message: err.requestOptions.extra['customError'],- );- }- }- super.onError(err, handler);- }-- static Future<String> dioError(DioException error) async {- bool proxyEnable =- await setting.get(SettingBoxKey.proxyEnable, defaultValue: false);- if (proxyEnable) {- return '代理连接异常,请检查代理设置';- }- switch (error.type) {- case DioExceptionType.badCertificate:- return '证书有误!';- case DioExceptionType.badResponse:- return '服务器异常,请稍后重试!';- case DioExceptionType.cancel:- return '请求已被取消,请重新请求';- case DioExceptionType.connectionError:- return '连接错误,请检查网络设置';- case DioExceptionType.connectionTimeout:- return '网络连接超时,请检查网络设置';- case DioExceptionType.receiveTimeout:- return '响应超时,请稍后重试!';- case DioExceptionType.sendTimeout:- return '发送请求超时,请检查网络设置';- case DioExceptionType.unknown:- final String res = await checkConnect();- return '$res 网络异常';- }- }-- static Future<String> checkConnect() async {- final connectivityResult = await Connectivity().checkConnectivity();- if (connectivityResult.contains(ConnectivityResult.mobile)) {- return '正在使用移动流量';- }- if (connectivityResult.contains(ConnectivityResult.wifi)) {- return '正在使用wifi';- }- if (connectivityResult.contains(ConnectivityResult.ethernet)) {- return '正在使用局域网';- }- if (connectivityResult.contains(ConnectivityResult.vpn)) {- return '正在使用代理网络';- }- if (connectivityResult.contains(ConnectivityResult.other)) {- return '正在使用其他网络';- }- if (connectivityResult.contains(ConnectivityResult.none)) {- return '未连接到任何网络';- }- return '';- }-}diff --git a/lib/request/request.dart b/lib/request/request.dartdeleted file mode 100644index c2084112..00000000--- a/lib/request/request.dart+++ /dev/null@@ -1,219 +0,0 @@-import 'dart:io';--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_ce/hive.dart';--class Request {- static final Request _instance = Request._internal();- static late final Dio dio;- 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();- }- }-- // 设置请求头- static void setOptionsHeaders() {- dio.options.headers['referer'] = '';- dio.options.headers['user-agent'] = Utils.getRandomUA();- }-- // 设置代理(仅支持 HTTP 代理)- static void setProxy() {- final bool proxyEnable =- setting.get(SettingBoxKey.proxyEnable, defaultValue: false);- if (!proxyEnable) {- disableProxy();- return;- }-- final String proxyUrl =- setting.get(SettingBoxKey.proxyUrl, 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';- };- // 忽略证书验证- client.badCertificateCallback =- (X509Certificate cert, String host, int port) => true;- return client;- },- );- KazumiLogger().i('Proxy: HTTP 代理设置成功 $proxyHost:$proxyPort');- }-- // 禁用代理- static void disableProxy() {- dio.httpClientAdapter = IOHttpClientAdapter(- createHttpClient: () {- final HttpClient client = HttpClient();- return client;- },- );- KazumiLogger().i('Proxy: 代理已禁用');- }-- Request._internal() {- //BaseOptions、Options、RequestOptions 都可以配置参数,优先级别依次递增,且可以根据优先级别覆盖参数- BaseOptions options = BaseOptions(- //请求基地址,可以包含子路径- baseUrl: '',- //连接服务器超时时间,单位是毫秒.- connectTimeout: const Duration(milliseconds: 12000),- //响应流上前后两次接受到数据的间隔,单位为毫秒。- receiveTimeout: const Duration(milliseconds: 12000),- //Http请求头.- headers: {},- );-- // enableSystemProxy = setting.get(SettingBoxKey.enableSystemProxy,- // defaultValue: false) as bool;-- dio = Dio(options);- // debugPrint('Dio 初始化完成');-- // if (enableSystemProxy) {- // setProxy();- // debugPrint('系统代理启用');- // }-- // 拦截器- dio.interceptors.add(ApiInterceptor());-- // 日志拦截器 输出请求、响应内容- dio.interceptors.add(LogInterceptor(- request: false,- requestHeader: false,- responseHeader: false,- ));-- dio.transformer = BackgroundTransformer();- dio.options.validateStatus = (int? status) {- return status! >= 200 && status < 300;- };- }-- // Merge extra options into the main options- void _applyExtraOptions(Options options, Map? extra) {- if (extra == null) {- return;- }-- if (extra['ua'] != null) {- options.headers = {- ...?options.headers,- 'user-agent': headerUa(type: extra['ua']),- };- }-- if (extra['customError'] != null) {- options.extra = {- ...?options.extra,- 'customError': extra['customError'],- };- }-- if (extra['requiresBangumiAuth'] != null) {- options.extra = {- ...?options.extra,- 'requiresBangumiAuth': extra['requiresBangumiAuth'],- };- }- }-- Future<Response> get(url, {data, options, cancelToken, extra, bool shouldRethrow = false}) async {- Response response;- ResponseType resType = ResponseType.json;- options ??= Options();- if (extra != null) {- resType = extra['resType'] ?? ResponseType.json;- _applyExtraOptions(options, extra);- }- options.responseType = resType;- try {- response = await dio.get(- url,- queryParameters: data,- options: options,- cancelToken: cancelToken,- );- return response;- } on DioException catch (e) {- if (shouldRethrow) {- rethrow;- }- Response errResponse = Response(- data: {- 'message': await ApiInterceptor.dioError(e)- }, // 将自定义 Map 数据赋值给 Response 的 data 属性- statusCode: 200,- requestOptions: RequestOptions(),- );- return errResponse;- }- }-- Future<Response> post(url, {data, queryParameters, options, cancelToken, extra, bool shouldRethrow = false}) async {- // print('post-data: $data');- Response response;- ResponseType resType = ResponseType.json;- options ??= Options();- if (extra != null) {- resType = extra['resType'] ?? ResponseType.json;- _applyExtraOptions(options, extra);- }- options.responseType = resType;- try {- response = await dio.post(- url,- data: data,- queryParameters: queryParameters,- options: options,- cancelToken: cancelToken,- );- // print('post success: ${response.data}');- return response;- } on DioException catch (e) {- if (shouldRethrow) {- rethrow;- }- Response errResponse = Response(- data: {- 'message': await ApiInterceptor.dioError(e)- }, // 将自定义 Map 数据赋值给 Response 的 data 属性- statusCode: 200,- requestOptions: RequestOptions(),- );- return errResponse;- }- }-- String headerUa({type = 'mob'}) {- return Utils.getRandomUA();- }-}diff --git a/lib/request/trace.dart b/lib/request/trace.dartdeleted file mode 100644index f9d767dd..00000000--- a/lib/request/trace.dart+++ /dev/null@@ -1,38 +0,0 @@-import 'dart:io';--import 'package:dio/dio.dart';-import 'package:kazumi/modules/search/image_search_module.dart';-import 'package:kazumi/request/api.dart';--import 'request.dart';--class Trace {- ///根据图片搜索番剧信息- static Future<ImageSearchItem> searchAnimeByImageFile(File imageFile,- {int anilistInfo = 2}) async {- final bytes = await imageFile.readAsBytes();-- return await Request()- .post(Api.traceApi,- queryParameters: {- 'anilistInfo': anilistInfo,- },- data: bytes,- options: Options(headers: {'Content-Type': 'image/jpeg'}))- .then((onValue) =>- ImageSearchItem.fromJson(onValue.data as Map<String, dynamic>));- }-- ///根据图片URL搜索番剧信息- static Future<ImageSearchItem> searchAnimeByImageUrl(String imageUrl,- {int anilistInfo = 2}) async {- return await Request()- .post(Api.traceApi,- queryParameters: {- 'anilistInfo': anilistInfo,- 'url': imageUrl,- })- .then((onValue) =>- ImageSearchItem.fromJson(onValue.data as Map<String, dynamic>));- }-}diff --git a/lib/utils/auto_updater.dart b/lib/utils/auto_updater.dartindex e76a5fa6..ff4a7dec 100644--- a/lib/utils/auto_updater.dart+++ b/lib/utils/auto_updater.dart@@ -3,7 +3,9 @@ import 'package:dio/dio.dart';import 'package:flutter/material.dart';import 'package:hive_ce/hive.dart';import 'package:kazumi/bean/dialog/dialog_helper.dart';-import 'package:kazumi/request/api.dart';+import 'package:kazumi/request/clients/download_http_client.dart';+import 'package:kazumi/request/clients/github_client.dart';+import 'package:kazumi/request/config/api_endpoints.dart';import 'package:kazumi/utils/logger.dart';import 'package:kazumi/utils/storage.dart';import 'package:kazumi/utils/utils.dart';@@ -61,7 +63,8 @@ class AutoUpdater {AutoUpdater._internal();- final Dio _dio = Dio();+ final GithubClient _githubClient = GithubClient.instance;+ final DownloadHttpClient _downloadClient = DownloadHttpClient.instance;Box get setting => GStorage.setting;@@ -102,15 +105,14 @@ class AutoUpdater {/// 检查是否有新版本可用Future<UpdateInfo?> checkForUpdates() async {try {- final response = await _dio.get(Api.latestApp);- final data = response.data;+ final data = await _githubClient.latestRelease();- if (data == null || !data.containsKey('tag_name')) {+ if (!data.containsKey('tag_name')) {throw Exception('无效的响应数据');}final remoteVersion = data['tag_name'] as String;- final currentVersion = Api.version;+ final currentVersion = ApiEndpoints.version;if (Utils.needUpdate(currentVersion, remoteVersion)) {final availableTypes = await _detectAvailableInstallationTypes();@@ -343,7 +345,7 @@ class AutoUpdater {selectedType == InstallationType.linuxTar) {String releaseUrl = updateInfo.releaseNotes;if (releaseUrl.isEmpty) {- releaseUrl = Api.latestApp;+ releaseUrl = ApiEndpoints.latestApp;}launchUrl(Uri.parse(releaseUrl), mode: LaunchMode.externalApplication);return;@@ -599,7 +601,8 @@ class AutoUpdater {final localHash = await Utils.calculateFileHash(file);if (localHash == expectedHash) {// 文件已存在且哈希匹配,直接返回- KazumiLogger().i('Update: file already exists and hash verified, skipping download: $filePath');+ KazumiLogger().i(+ 'Update: file already exists and hash verified, skipping download: $filePath');_downloadProgress.value = 1.0;return filePath;} else {@@ -610,7 +613,9 @@ class AutoUpdater {}} catch (e) {// 验证过程中出错,删除文件重新下载- KazumiLogger().w('Update: file verification failed, deleting and re-downloading', error: e);+ KazumiLogger().w(+ 'Update: file verification failed, deleting and re-downloading',+ error: e);if (await file.exists()) {await file.delete();}@@ -619,7 +624,7 @@ class AutoUpdater {_cancelToken = CancelToken();- await _dio.download(+ await _downloadClient.download(url,filePath,cancelToken: _cancelToken,@@ -704,7 +709,9 @@ class AutoUpdater {final arg = '/select,${filePath.replaceAll('/', r'\')}';await Process.start('explorer.exe', [arg], runInShell: true);} else {- await Process.start('explorer.exe', [targetDirOrFile.replaceAll('/', r'\')], runInShell: true);+ await Process.start(+ 'explorer.exe', [targetDirOrFile.replaceAll('/', r'\')],+ runInShell: true);}} else if (Platform.isMacOS) {if (type == FileSystemEntityType.file) {diff --git a/lib/utils/bangumi_sync_service.dart b/lib/utils/bangumi_sync_service.dartindex 772d99f0..87487e3d 100644--- a/lib/utils/bangumi_sync_service.dart+++ b/lib/utils/bangumi_sync_service.dart@@ -8,7 +8,7 @@ import 'package:kazumi/utils/logger.dart';import 'package:kazumi/modules/bangumi/bangumi_collection.dart';import 'package:kazumi/modules/bangumi/sync_priority.dart';import 'package:kazumi/modules/collect/collect_type_mapper.dart';-import 'package:kazumi/request/bangumi.dart';+import 'package:kazumi/request/apis/bangumi_api.dart';/// Bangumi 同步服务工具类class BangumiSyncService {@@ -68,7 +68,7 @@ class BangumiSyncService {}await _runExclusive(() async {try {- final name = await BangumiHTTP.getUsername();+ final name = await BangumiApi.getUsername();if (name == null) {throw Exception('Bangumi: 获取用户名失败');} else {@@ -85,7 +85,7 @@ class BangumiSyncService {/// to finish and serializing multiple immediate update requests.Future<bool> syncCollectibleWhenIdle(int bangumiId, int localType) {return _runExclusive(() async {- return BangumiHTTP.updateBangumiByType(+ return BangumiApi.updateBangumiByType(bangumiId,localType,);@@ -155,7 +155,7 @@ class BangumiSyncService {);// 1. 全量拉取远程收藏- final remoteCollection = await BangumiHTTP.getBangumiCollectibles(+ final remoteCollection = await BangumiApi.getBangumiCollectibles(username: username,limit: 100,onProgress: onProgress,@@ -205,7 +205,7 @@ class BangumiSyncService {if (localOnlyIds.isNotEmpty) {onProgress?.call('正在上传本地新增状态', syncedCount, totalOperations);for (final id in localOnlyIds) {- final updated = await BangumiHTTP.updateBangumiByType(+ final updated = await BangumiApi.updateBangumiByType(id,localMap[id]!.type,);@@ -241,7 +241,7 @@ class BangumiSyncService {onProgress?.call('本地优先:正在处理冲突状态', syncedCount, totalOperations);for (final id in mismatchIds) {final updated =- await BangumiHTTP.updateBangumiByType(id, localMap[id]!.type);+ await BangumiApi.updateBangumiByType(id, localMap[id]!.type);if (updated != true) {throw Exception('同步失败:条目 $id 上传到 Bangumi 失败');}diff --git a/lib/utils/constants.dart b/lib/utils/constants.dartindex ee4a0b95..6cd73d7f 100644--- a/lib/utils/constants.dart+++ b/lib/utils/constants.dart@@ -1,5 +1,5 @@import 'package:flutter/material.dart';-import 'package:kazumi/request/api.dart';+import 'package:kazumi/request/config/api_endpoints.dart';class StyleString {static const double cardSpace = 8;@@ -90,7 +90,7 @@ const List<String> acceptLanguageList = [/// Bangumi API 文档要求的UA格式Map<String, String> bangumiHTTPHeader = {'user-agent':- 'Predidit/Kazumi/${Api.version} (Android) (https://github.com/Predidit/Kazumi)',+ 'Predidit/Kazumi/${ApiEndpoints.version} (Android) (https://github.com/Predidit/Kazumi)','referer': '','content-type': 'application/json'};@@ -214,58 +214,58 @@ final List<String> defaultAnimeTags = const [];// 播放器默认快捷键- final Map<String, List<String>> defaultShortcuts = const {- 'playorpause': [' '],- 'forward': ['Arrow Right'],- 'rewind': ['Arrow Left'],- 'next': ['N'],- 'prev': ['P'],- 'volumeup': ['Arrow Up'],- 'volumedown': ['Arrow Down'],- 'togglemute': ['M'],- 'fullscreen': ['F'],- 'exitfullscreen': ['Escape'],- 'toggledanmaku': ['D'],- 'screenshot': ['S'],- 'skip': ['K'],- 'speed1': ['1'],- 'speed2': ['2'],- 'speed3': ['3'],- 'speedup': ['X'],- 'speeddown': ['Z'],- };+final Map<String, List<String>> defaultShortcuts = const {+ 'playorpause': [' '],+ 'forward': ['Arrow Right'],+ 'rewind': ['Arrow Left'],+ 'next': ['N'],+ 'prev': ['P'],+ 'volumeup': ['Arrow Up'],+ 'volumedown': ['Arrow Down'],+ 'togglemute': ['M'],+ 'fullscreen': ['F'],+ 'exitfullscreen': ['Escape'],+ 'toggledanmaku': ['D'],+ 'screenshot': ['S'],+ 'skip': ['K'],+ 'speed1': ['1'],+ 'speed2': ['2'],+ 'speed3': ['3'],+ 'speedup': ['X'],+ 'speeddown': ['Z'],+};// 键位别名- final Map<String, String> keyAliases = {- ' ': '空格',- 'Arrow Up': '↑',- 'Arrow Down': '↓',- 'Arrow Left': '←',- 'Arrow Right': '→',- 'Enter': '回车',- 'Tab': 'Tab',- 'Escape': 'Esc',- 'Backspace': '退格',- };+final Map<String, String> keyAliases = {+ ' ': '空格',+ 'Arrow Up': '↑',+ 'Arrow Down': '↓',+ 'Arrow Left': '←',+ 'Arrow Right': '→',+ 'Enter': '回车',+ 'Tab': 'Tab',+ 'Escape': 'Esc',+ 'Backspace': '退格',+};//功能中文名对应- final Map<String, String> shortcutsChineseName = {- 'playorpause': '播放 / 暂停',- 'forward': '快进 / 长按倍速',- 'rewind': '快退',- 'next': '下一集',- 'prev': '上一集',- 'volumeup': '音量加',- 'volumedown': '音量减',- 'togglemute': '静音',- 'fullscreen': '全屏',- 'exitfullscreen': '退出全屏',- 'toggledanmaku': '弹幕开关',- 'screenshot': '截图',- 'skip': '跳过',- 'speed1': '倍速:1x',- 'speed2': '倍速:2x',- 'speed3': '倍速:3x',- 'speedup': '倍速加',- 'speeddown': '倍速减',- };\ No newline at end of file+final Map<String, String> shortcutsChineseName = {+ 'playorpause': '播放 / 暂停',+ 'forward': '快进 / 长按倍速',+ 'rewind': '快退',+ 'next': '下一集',+ 'prev': '上一集',+ 'volumeup': '音量加',+ 'volumedown': '音量减',+ 'togglemute': '静音',+ 'fullscreen': '全屏',+ 'exitfullscreen': '退出全屏',+ 'toggledanmaku': '弹幕开关',+ 'screenshot': '截图',+ 'skip': '跳过',+ 'speed1': '倍速:1x',+ 'speed2': '倍速:2x',+ 'speed3': '倍速:3x',+ 'speedup': '倍速加',+ 'speeddown': '倍速减',+};diff --git a/lib/utils/download_manager.dart b/lib/utils/download_manager.dartindex a9e5cfa6..57c0edb7 100644--- a/lib/utils/download_manager.dart+++ b/lib/utils/download_manager.dart@@ -3,6 +3,8 @@ import 'dart:io';import 'package:dio/dio.dart';import 'package:flutter/services.dart';import 'package:kazumi/modules/download/download_module.dart';+import 'package:kazumi/request/clients/download_http_client.dart';+import 'package:kazumi/request/core/network_exception.dart';import 'package:kazumi/utils/m3u8_parser.dart';import 'package:kazumi/utils/m3u8_ad_filter.dart';import 'package:kazumi/utils/format_utils.dart' as fmt;@@ -74,7 +76,8 @@ abstract class IDownloadManager {Future<void> resume(DownloadRequest request);void cancel(String recordKey, int episodeNumber);String? getLocalVideoPath(DownloadEpisode? episode);- Future<void> deleteEpisodeFiles(int bangumiId, String pluginName, int episodeNumber);+ Future<void> deleteEpisodeFiles(+ int bangumiId, String pluginName, int episodeNumber);Future<void> deleteRecordFiles(int bangumiId, String pluginName);double getSpeed(String recordKey, int episodeNumber);}@@ -107,10 +110,7 @@ class DownloadManager implements IDownloadManager {_loadSettings();}- final Dio _dio = Dio(BaseOptions(- connectTimeout: const Duration(seconds: 15),- receiveTimeout: const Duration(seconds: 30),- ));+ final DownloadHttpClient _http = DownloadHttpClient.instance;final Map<String, DownloadTask> _activeTasks = {};final List<DownloadRequest> _queue = [];@@ -153,7 +153,8 @@ class DownloadManager implements IDownloadManager {}}- Future<void> _checkStorageSpace(String downloadDir, {int requiredBytes = 0}) async {+ Future<void> _checkStorageSpace(String downloadDir,+ {int requiredBytes = 0}) async {final available = await _getAvailableStorage(downloadDir);if (available == -1) return; // Skip check if unable to determine@@ -197,7 +198,8 @@ class DownloadManager implements IDownloadManager {return '${appSupport.path}/downloads';}- String getEpisodeDir(String downloadBase, int bangumiId, String pluginName, int episodeNumber) {+ String getEpisodeDir(String downloadBase, int bangumiId, String pluginName,+ int episodeNumber) {return '$downloadBase/${bangumiId}_$pluginName/$episodeNumber';}@@ -235,7 +237,9 @@ class DownloadManager implements IDownloadManager {final key = _taskKey(request.recordKey, request.episodeNumber);_queue.removeWhere(- (r) => r.recordKey == request.recordKey && r.episodeNumber == request.episodeNumber,+ (r) =>+ r.recordKey == request.recordKey &&+ r.episodeNumber == request.episodeNumber,);_activeTasks.remove(key);@@ -313,7 +317,9 @@ class DownloadManager implements IDownloadManager {final request = _queue.removeAt(0);final key = _taskKey(request.recordKey, request.episodeNumber);final existingTask = _activeTasks[key];- if (existingTask == null || existingTask.isPaused || existingTask.cancelToken.isCancelled) {+ if (existingTask == null ||+ existingTask.isPaused ||+ existingTask.cancelToken.isCancelled) {_activeTasks.remove(key);continue;}@@ -373,10 +379,12 @@ class DownloadManager implements IDownloadManager {final master = M3u8Parser.parseMasterPlaylist(m3u8Content, m3u8Url);final bestVariant = master.bestVariant;mediaM3u8Url = bestVariant.uri;- mediaM3u8Content = await _fetchM3u8(mediaM3u8Url, httpHeaders, task.cancelToken);+ mediaM3u8Content =+ await _fetchM3u8(mediaM3u8Url, httpHeaders, task.cancelToken);}- final playlist = M3u8Parser.parseMediaPlaylist(mediaM3u8Content, mediaM3u8Url);+ final playlist =+ M3u8Parser.parseMediaPlaylist(mediaM3u8Content, mediaM3u8Url);// 展开嵌套 m3u8 片段(部分源将实际内容嵌套在 m3u8 引用中)final resolvedSegments = await M3u8Parser.resolveNestedSegments(@@ -409,7 +417,8 @@ class DownloadManager implements IDownloadManager {}final base = await _downloadBaseDir;- final episodeDir = getEpisodeDir(base, bangumiId, pluginName, task.episodeNumber);+ final episodeDir =+ getEpisodeDir(base, bangumiId, pluginName, task.episodeNumber);await Directory(episodeDir).create(recursive: true);episode.downloadDirectory = episodeDir;await _checkStorageSpace(base);@@ -424,7 +433,8 @@ class DownloadManager implements IDownloadManager {for (int i = 0; i < keys.length; i++) {final keyFile = 'key_$i.key';final keyPath = '$episodeDir/$keyFile';- await _downloadFile(keys[i].uri, keyPath, httpHeaders, task.cancelToken);+ await _downloadFile(+ keys[i].uri, keyPath, httpHeaders, task.cancelToken);keyUriToLocal[keys[i].uri] = keyFile;}@@ -444,7 +454,8 @@ class DownloadManager implements IDownloadManager {final existingSegments = <int>{};for (int i = 0; i < segments.length; i++) {- final segFile = File('$episodeDir/seg_${i.toString().padLeft(5, '0')}.ts');+ final segFile =+ File('$episodeDir/seg_${i.toString().padLeft(5, '0')}.ts');if (await segFile.exists() && await segFile.length() > 0) {existingSegments.add(i);episode.downloadedSegments++;@@ -504,7 +515,9 @@ class DownloadManager implements IDownloadManager {});}- if (!task.isPaused && !task.cancelToken.isCancelled && pendingIndices.isNotEmpty) {+ if (!task.isPaused &&+ !task.cancelToken.isCancelled &&+ pendingIndices.isNotEmpty) {await completer.future;}}@@ -547,7 +560,8 @@ class DownloadManager implements IDownloadManager {);} on _InsufficientStorageException catch (e) {episode.status = DownloadStatus.failed;- episode.errorMessage = '存储空间不足 (可用: ${fmt.formatBytes(e.availableBytes)})';+ episode.errorMessage =+ '存储空间不足 (可用: ${fmt.formatBytes(e.availableBytes)})';_notifyProgress(task.recordKey, task.episodeNumber, episode);KazumiLogger().w('DownloadManager: insufficient storage space', error: e);} on FileSystemException catch (e) {@@ -555,14 +569,14 @@ class DownloadManager implements IDownloadManager {episode.errorMessage = _getStorageErrorMessage(e);_notifyProgress(task.recordKey, task.episodeNumber, episode);KazumiLogger().e('DownloadManager: file system error', error: e);- } on DioException catch (e) {- if (e.type == DioExceptionType.cancel) {+ } on NetworkException catch (e) {+ if (e.type == NetworkExceptionType.cancel) {if (task.isPaused) {episode.status = DownloadStatus.paused;}} else {episode.status = DownloadStatus.failed;- episode.errorMessage = e.message ?? '网络错误';+ episode.errorMessage = e.message;}_notifyProgress(task.recordKey, task.episodeNumber, episode);} catch (e) {@@ -586,7 +600,8 @@ class DownloadManager implements IDownloadManager {final key = _taskKey(task.recordKey, task.episodeNumber);try {final base = await _downloadBaseDir;- final episodeDir = getEpisodeDir(base, bangumiId, pluginName, task.episodeNumber);+ final episodeDir =+ getEpisodeDir(base, bangumiId, pluginName, task.episodeNumber);await Directory(episodeDir).create(recursive: true);episode.downloadDirectory = episodeDir;await _checkStorageSpace(base);@@ -612,30 +627,24 @@ class DownloadManager implements IDownloadManager {Response<ResponseBody> response;try {- response = await _dio.get<ResponseBody>(+ response = await _http.getStream(videoUrl,- options: Options(- headers: requestHeaders,- responseType: ResponseType.stream,- receiveTimeout: const Duration(minutes: 30),- ),+ headers: requestHeaders,+ receiveTimeout: const Duration(minutes: 30),cancelToken: task.cancelToken,);- } on DioException catch (e) {- if (e.response?.statusCode == 416 && useRange) {+ } on NetworkException catch (e) {+ if (e.statusCode == 416 && useRange) {KazumiLogger().w('DownloadManager: 416 Range Not Satisfiable, deleting tmp file and retrying',);await tmpFile.delete();existingBytes = 0;requestHeaders.remove('Range');- response = await _dio.get<ResponseBody>(+ response = await _http.getStream(videoUrl,- options: Options(- headers: requestHeaders,- responseType: ResponseType.stream,- receiveTimeout: const Duration(minutes: 30),- ),+ headers: requestHeaders,+ receiveTimeout: const Duration(minutes: 30),cancelToken: task.cancelToken,);} else {@@ -645,7 +654,8 @@ class DownloadManager implements IDownloadManager {final contentRange = response.headers.value('content-range');final contentLength = int.tryParse(- response.headers.value(Headers.contentLengthHeader) ?? '') ?? 0;+ response.headers.value(Headers.contentLengthHeader) ?? '') ??+ 0;int totalSize;if (contentRange != null) {final totalMatch = RegExp(r'/(\d+)').firstMatch(contentRange);@@ -699,7 +709,8 @@ class DownloadManager implements IDownloadManager {);} on _InsufficientStorageException catch (e) {episode.status = DownloadStatus.failed;- episode.errorMessage = '存储空间不足 (可用: ${fmt.formatBytes(e.availableBytes)})';+ episode.errorMessage =+ '存储空间不足 (可用: ${fmt.formatBytes(e.availableBytes)})';_notifyProgress(task.recordKey, task.episodeNumber, episode);KazumiLogger().w('DownloadManager: insufficient storage space', error: e);} on FileSystemException catch (e) {@@ -707,21 +718,22 @@ class DownloadManager implements IDownloadManager {episode.errorMessage = _getStorageErrorMessage(e);_notifyProgress(task.recordKey, task.episodeNumber, episode);KazumiLogger().e('DownloadManager: file system error', error: e);- } on DioException catch (e) {- if (e.type == DioExceptionType.cancel) {+ } on NetworkException catch (e) {+ if (e.type == NetworkExceptionType.cancel) {if (task.isPaused) {episode.status = DownloadStatus.paused;}} else {episode.status = DownloadStatus.failed;- episode.errorMessage = e.message ?? '网络错误';+ episode.errorMessage = e.message;}_notifyProgress(task.recordKey, task.episodeNumber, episode);} catch (e) {episode.status = DownloadStatus.failed;episode.errorMessage = e.toString();_notifyProgress(task.recordKey, task.episodeNumber, episode);- KazumiLogger().e('DownloadManager: direct file download failed', error: e);+ KazumiLogger()+ .e('DownloadManager: direct file download failed', error: e);}}@@ -744,20 +756,17 @@ class DownloadManager implements IDownloadManager {final fetchToken = CancelToken();if (cancelToken.isCancelled) {- throw DioException(- type: DioExceptionType.cancel,- requestOptions: RequestOptions(path: url),+ throw NetworkException(+ type: NetworkExceptionType.cancel,+ message: '请求已被取消,请重新请求',);}try {- final response = await _dio.get<String>(+ final content = await _http.getPlain(url,- options: Options(- headers: headers,- responseType: ResponseType.plain,- receiveTimeout: const Duration(seconds: 15),- ),+ headers: headers,+ receiveTimeout: const Duration(seconds: 15),cancelToken: fetchToken,onReceiveProgress: (received, total) {if (cancelToken.isCancelled) {@@ -770,17 +779,15 @@ class DownloadManager implements IDownloadManager {},);- final content = response.data!;-final trimmed = content.trimLeft();if (!trimmed.startsWith('#EXTM3U')) {throw _NotM3u8Exception('URL 不是 M3U8 播放列表');}return content;- } on DioException catch (e) {+ } on NetworkException catch (e) {if (cancelToken.isCancelled) rethrow;- if (e.type == DioExceptionType.cancel) {+ if (e.type == NetworkExceptionType.cancel) {throw _NotM3u8Exception('响应过大,非 M3U8 播放列表');}rethrow;@@ -789,10 +796,10 @@ class DownloadManager implements IDownloadManager {Future<void> _downloadFile(String url, String savePath,Map<String, String> headers, CancelToken cancelToken) async {- await _dio.download(+ await _http.download(url,savePath,- options: Options(headers: headers),+ headers: headers,cancelToken: cancelToken,);}@@ -808,10 +815,10 @@ class DownloadManager implements IDownloadManager {int retryCount = 0;while (true) {try {- await _dio.download(+ await _http.download(url,tmpPath,- options: Options(headers: headers),+ headers: headers,cancelToken: cancelToken,);await File(tmpPath).rename(savePath);@@ -834,7 +841,8 @@ class DownloadManager implements IDownloadManager {Future<void> deleteEpisodeFiles(int bangumiId, String pluginName, int episodeNumber) async {final base = await _downloadBaseDir;- final dir = Directory(getEpisodeDir(base, bangumiId, pluginName, episodeNumber));+ final dir =+ Directory(getEpisodeDir(base, bangumiId, pluginName, episodeNumber));if (await dir.exists()) {await dir.delete(recursive: true);}diff --git a/lib/utils/proxy_manager.dart b/lib/utils/proxy_manager.dartindex c7039b89..a1a0d173 100644--- a/lib/utils/proxy_manager.dart+++ b/lib/utils/proxy_manager.dart@@ -1,4 +1,5 @@-import 'package:kazumi/request/request.dart';+import 'package:kazumi/request/core/dio_factory.dart';+import 'package:kazumi/utils/logger.dart';/// 代理管理器/// 统一管理 Dio HTTP 请求的代理设置@@ -8,11 +9,13 @@ class ProxyManager {/// 应用代理设置static void applyProxy() {- Request.setProxy();+ DioFactory.reset();+ KazumiLogger().i('Proxy: 网络客户端配置已刷新');}/// 清除代理设置static void clearProxy() {- Request.disableProxy();+ DioFactory.reset();+ KazumiLogger().i('Proxy: 网络客户端代理已清除');}}diff --git a/lib/utils/utils.dart b/lib/utils/utils.dartindex e3e43b8b..eb678d05 100644--- a/lib/utils/utils.dart+++ b/lib/utils/utils.dart@@ -4,12 +4,12 @@ import 'dart:io';import 'dart:math';import 'package:crypto/crypto.dart';-import 'package:dio/dio.dart';import 'package:flutter/foundation.dart';import 'package:flutter/material.dart';import 'package:flutter/services.dart';import 'package:kazumi/modules/danmaku/danmaku_module.dart';-import 'package:kazumi/request/api.dart';+import 'package:kazumi/request/config/api_endpoints.dart';+import 'package:kazumi/request/clients/github_client.dart';import 'package:kazumi/utils/constants.dart';import 'package:kazumi/utils/logger.dart';import 'package:kazumi/utils/mortis.dart';@@ -278,17 +278,11 @@ class Utils {return '${(similarity * 100).toStringAsFixed(fractionDigits)}%';}-static Future<String> latest() async {try {- var resp = await Dio().get<Map<String, dynamic>>(Api.latestApp);- if (resp.data?.containsKey("tag_name") ?? false) {- return resp.data!["tag_name"];- } else {- throw resp.data?["message"];- }+ return await GithubClient.instance.latestVersion();} catch (e) {- return Api.version;+ return ApiEndpoints.version;}}@@ -318,8 +312,8 @@ class Utils {static List<Danmaku> mergeDuplicateDanmakus(List<Danmaku> danmakus, {- double timeWindowSeconds = 0,- }) {+ double timeWindowSeconds = 0,+ }) {final Map<String, List<Danmaku>> grouped = {};// 弹幕规范化处理@@ -344,10 +338,12 @@ class Utils {text = text.replaceAll(RegExp(r'\s+'), '');- text = text.replaceAll(RegExp(- r'[^\w\u4e00-\u9fff\u3040-\u309F\u30A0-\u30FF\u31F0-\u31FF\uFF65-\uFF9F]',- unicode: true,- ),'');+ text = text.replaceAll(+ RegExp(+ r'[^\w\u4e00-\u9fff\u3040-\u309F\u30A0-\u30FF\u31F0-\u31FF\uFF65-\uFF9F]',+ unicode: true,+ ),+ '');text = text.replaceAllMapped(RegExp(r'(.)\1{2,}'), (match) {final char = match.group(1)!;@@ -397,7 +393,8 @@ class Utils {} else {result.add(Danmaku(- message: '${currentGroup.first.message} x${currentGroup.length}',+ message:+ '${currentGroup.first.message} x${currentGroup.length}',time: currentGroup.first.time,type: 5,color: Utils.generateDanmakuColor(0xFFFFFF),@@ -713,4 +710,4 @@ class Utils {action?.call();});}-}\ No newline at end of file+}