refactor: 提取Dio单例，常量 by futurw4v · Pull Request #5 · lxdklp/FML

futurw4v · 2026-02-11T05:56:09Z

一些小重构

添加了一个存放常量的constants.dart，提取了部分重复常量
提取了一个DioClient单例，统一输出日志，设置UA等便于管理，替换创建Dio实例为调用DioClient

（自动格式化）

…nstants

Copilot

Pull request overview

该 PR 主要做了网络层与常量的重构：引入统一的 DioClient 单例来集中管理 Dio 配置/日志/UA，并新增 constants.dart 抽取重复字符串与常量，以减少各处重复代码并便于后续维护。

Changes:

新增 lib/constants.dart，集中管理应用名、URL、路由、字体字重等常量。
新增 lib/function/dio_client.dart（Dio 单例），并将大量网络请求从“临时创建 Dio”迁移为复用 DioClient().dio。
多处页面/逻辑做了格式化与小幅重构（UI 文案/URL 常量替换、代码排版等）。

Reviewed changes

Copilot reviewed 33 out of 33 changed files in this pull request and generated 9 comments.

Show a summary per file

File	Description
macos/Flutter/GeneratedPluginRegistrant.swift	注册新增的 `path_provider_foundation` 插件。
lib/pages/setting/theme.dart	适配 `FMLBaseApp`，并做格式化。
lib/pages/setting/about.dart	使用 `constants.dart` 中的 app 名与 URL 常量，减少硬编码。
lib/pages/online/member.dart	主要为格式化与日志输出排版调整。
lib/pages/online.dart	通过 `DioClient` 统一进行 GitHub API 请求，移除本地 UA 拼接逻辑。
lib/pages/home.dart	仅格式化导航代码。
lib/pages/download/modrinth/type/shader.dart	Modrinth 请求改为 `DioClient`，并做格式化。
lib/pages/download/modrinth/type/resourcepack.dart	同上，改用 `DioClient` 并格式化。
lib/pages/download/modrinth/type/modpack.dart	同上，改用 `DioClient`。
lib/pages/download/modrinth/type/mod.dart	同上，改用 `DioClient` 并格式化。
lib/pages/download/modrinth/info.dart	移除版本读取/自定义 UA，改用 `DioClient`。
lib/pages/download/download_version/download_game.dart	BMCLAPI 请求改为 `DioClient`，移除版本读取逻辑。
lib/pages/download/download_version.dart	版本清单请求改为 `DioClient`，移除版本读取逻辑。
lib/pages/download/download_resources.dart	资源列表请求改为 `DioClient`，请求头简化。
lib/pages/download/download_modrinth.dart	Modrinth 请求改为 `DioClient`，移除版本读取逻辑。
lib/pages/download/download_curseforge.dart	CurseForge 请求改为 `DioClient`，请求头简化。
lib/pages/download/curseforge/type/shader.dart	CurseForge 文件列表请求改为 `DioClient`（仍保留 `_appVersion`/UA 拼接）。
lib/pages/download/curseforge/type/resourcepack.dart	CurseForge 文件列表请求改为 `DioClient`，移除版本读取/UA 拼接。
lib/pages/download/curseforge/type/modpack.dart	CurseForge 文件列表请求改为 `DioClient`，移除版本读取/UA 拼接。
lib/pages/download/curseforge/type/mod.dart	CurseForge 文件列表请求改为 `DioClient`，移除版本读取/UA 拼接。
lib/pages/download/curseforge/type/download_modpack/loader/curseforge_fabric_modpack.dart	多处请求改为 `DioClient`，并进行大量格式化。
lib/pages/download/curseforge/info.dart	项目详情/描述请求改为 `DioClient`，简化请求头。
lib/main.dart	引入 `FMLBaseApp` 命名与常量替换、接入 `DioClient`，并调整部分 URL/路由常量。
lib/function/launcher/login/microsoft_login.dart	登录相关请求改为 `DioClient`，减少重复 UA 拼接。
lib/function/launcher/login/external_login.dart	外置登录/校验相关请求改为 `DioClient`。
lib/function/download.dart	下载逻辑改为复用 `DioClient().dio`，移除原先专用 Dio/HttpClientAdapter 配置。
lib/function/dio_client.dart	新增 Dio 单例封装（超时、UA、调试日志拦截）。
lib/function/account/microsoft.dart	微软账号设备码/令牌请求改为 `DioClient`。
lib/function/account/external.dart	外置登录认证请求改为 `DioClient` 并格式化。
lib/constants.dart	新增全局常量集中定义（App 名、URL、路由、MethodChannel 等）。

Comments suppressed due to low confidence (1)

lib/main.dart:214

onGenerateRoute casts settings.arguments to both int and String, which will throw at runtime if this route is ever used. If this route is needed, pass a single arguments object (e.g. a Map/record/class) and decode it accordingly; if it’s unused (current navigation uses SlidePageRoute directly), consider removing this route branch to avoid a latent crash.

        if (settings.name == kOnlineOwnerRoute) {
          final int port = settings.arguments as int;
          final String etServer = settings.arguments as String;
          return SlidePageRoute(
            page: OwnerPage(port: port, etServer: etServer),

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

lib/function/download.dart

lib/main.dart

lib/pages/setting/about.dart

lib/function/dio_client.dart

lib/main.dart

lib/function/dio_client.dart

lib/function/download.dart

Copilot

Pull request overview

Copilot reviewed 33 out of 33 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

lib/function/dio_client.dart

lib/main.dart

lxdklp · 2026-02-11T17:44:45Z

lib/function/dio_client.dart

+        if (existingUserAgent == null ||
+            (existingUserAgent is String && existingUserAgent.isEmpty)) {
+          final userAgent =
+              '$kAppNameAbb/${Platform.operatingSystem}/$_appVersion ${kDebugMode ? 'debug' : ''}';


ua不能被固定为'$kAppNameAbb/${Platform.operatingSystem}/$_appVersion ${kDebugMode ? 'debug' : ''}'; 不同的平台有不同的ua规范,如
bmclapi、LittleSkin: 访问BMCLAPI时，使用${NAME}/${VERSION}作为UA的开头
modrinth: 最佳：User-Agent: github_username/project_name/1.56.0 (launcher.com)或User-Agent: github_username/project_name/1.56.0 (contact@launcher.com)
以及我自己的api也要根据ua进行统计:FML/${Platform.operatingSystem}/$appVersion
虽然说ua不规范也不影响使用,但是用到了人家的东西,还是按照人家的规范来吧 :)

感觉NAME/VERSION是最通用的了，固定ua主要是避免重复造轮子

感觉NAME/VERSION是最通用的了，固定ua主要是避免重复造轮子

ua最好默认为modrinth格式,然后bmclapi、LittleSkin以及我自己的API处再写入特别的ua

感觉NAME/VERSION是最通用的了，固定ua主要是避免重复造轮子

ua最好默认为modrinth格式,然后bmclapi、LittleSkin以及我自己的API处再写入特别的ua

我存到静态变量里然后给它改成了类似FML/1.8.0了，有需求再提 <3

futurw4v · 2026-02-12T01:46:08Z

还有一个，我看到version存在了shared preferences，读取也是用shared preferences读的，这个为啥

lxdklp · 2026-02-12T04:41:00Z

还有一个，我看到version存在了shared preferences，读取也是用shared preferences读的，这个为啥

最开始只是想shared preferences方便一点,不过后面我看从PackageInfo和shared preferences代码数量差不多,但是也懒得改了,新的代码直接用PackageInfo就行了

futurw4v · 2026-02-12T05:01:15Z

还有一个，我看到version存在了shared preferences，读取也是用shared preferences读的，这个为啥

最开始只是想shared preferences方便一点,不过后面我看从PackageInfo和shared preferences代码数量差不多,但是也懒得改了,新的代码直接用PackageInfo就行了

其实换成PackageInfo也会有同样的问题，因为也是Future，比如在download.dart:96这种并发量大的工具类里，如果每个任务都去await获取版本可能导致竞态和性能问题，我晚点搞个静态变量

Copilot

Pull request overview

Copilot reviewed 35 out of 35 changed files in this pull request and generated 3 comments.

Comments suppressed due to low confidence (1)

lib/main.dart:208

onGenerateRoute里把 settings.arguments 同时强转成 int 和 String（同一个对象）会在运行时直接抛 TypeError。如果需要同时传 port 和 etServer，建议把 arguments 设计成 Map/record/自定义对象（例如 {port: ..., etServer: ...}），并分别取值；或者移除这段路由逻辑，继续使用当前的 SlidePageRoute(page: OwnerPage(...)) 方式。

        if (settings.name == kOnlineOwnerRoute) {
          final int port = settings.arguments as int;
          final String etServer = settings.arguments as String;
          return SlidePageRoute(
            page: OwnerPage(port: port, etServer: etServer),
          );

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

lib/main.dart

lib/pages/setting/about.dart

lib/function/dio_client.dart

Copilot

Pull request overview

Copilot reviewed 35 out of 35 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

lib/function/dio_client.dart

Copilot · 2026-02-12T14:44:07Z

lib/function/launcher/login/microsoft_login.dart

 // 登录
 Future<String> login(String refreshToken) async {
-  LogUtil.log(refreshToken,level: 'INFO');
+  LogUtil.log(refreshToken, level: 'INFO');


这里把 refreshToken 以 INFO 级别写入日志会泄露敏感凭据（本地日志/崩溃上报/截图等场景都可能暴露）。建议删除该日志或至少打码（仅记录前后少量字符）并确保默认不落盘。

这个我还是之前写微软登录功能时拿来debug用的，我居然忘了删（

这个我还是之前写微软登录功能时拿来debug用的，我居然忘了删（

刚刚没看到这个还没改也

Copilot · 2026-02-12T14:44:07Z

lib/main.dart

          final int port = settings.arguments as int;
          final String etServer = settings.arguments as String;


onGenerateRoute里把 settings.arguments 同时强转为 int 和 String（同一个对象）会在运行时直接抛 TypeError。建议把 arguments 统一封装成一个对象（例如 Map/record/专用参数类），再分别取 port 和 etServer；或者如果当前没有命名路由调用方，直接移除这段路由分支避免潜在崩溃。

Suggested change

final int port = settings.arguments as int;

final String etServer = settings.arguments as String;

final args = settings.arguments as Map<String, dynamic>;

final int port = args['port'] as int;

final String etServer = args['etServer'] as String;

可以直接把onGenerateRoute直接删掉其实，项目里的路由跳转都是匿名路由，这个只和命名路由有关系

lib/main.dart

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

futurw4v added 12 commits January 24, 2026 19:26

chore: 移除远程跟踪的.vscode文件夹

0e80d65

feat: 添加slide_page_route.dart

dfa26d0

feat: 替换路由切换动画

ae534f8

chore: 更改路由切换动画默认时值

2d03567

perf: 添加const关键字避免不必要的重建

dccf7e2

perf: 对const页面调用添加const关键字

8e55bbc

refactor: 清理并规范化导入和常量

b8aa2fb

refactor: 封装DioClient单例，统一替换Dio实例为调用DioClient

a4427cd

chore: 替换部分常量

f8276f8

Merge branch 'main' of https://github.com/lxdklp/FML into refactor/co…

7a9ae26

…nstants

fix: 移除合并时导致错误的多余代码

4709abf

chore: 移除不必要的导入

f8bd15c

dvdamghier requested a review from Copilot February 11, 2026 07:34

Copilot started reviewing on behalf of dvdamghier February 11, 2026 07:35 View session

Copilot AI reviewed Feb 11, 2026

View reviewed changes

futurw4v added 4 commits February 12, 2026 00:29

style: 更正GitHub拼写

06ee110

fix: 移除未使用的 _cachedUserAgent

5c1d41a

fix: 使DioClient仅当未设置UA时才添加默认请求头，替换多余设置的UA

93e7696

refactor: DioClient使用绝对路径，优化版本获取

e588c7c

futurw4v force-pushed the refactor/constants branch from 5b43ecd to e588c7c Compare February 11, 2026 16:55

futurw4v added 3 commits February 12, 2026 01:01

chore: 移除多余日志输出, 在DioClient中添加TODO

d6f42eb

refactor: 移除未使用的变量

18e3a02

回滚download.dart至"perf: 优化下载速度" (957eb7b)

566b831

dvdamghier requested a review from Copilot February 11, 2026 17:32

Copilot started reviewing on behalf of dvdamghier February 11, 2026 17:32 View session

Copilot AI reviewed Feb 11, 2026

View reviewed changes

lib/function/dio_client.dart Outdated Show resolved Hide resolved

lib/main.dart Outdated Show resolved Hide resolved

lxdklp reviewed Feb 11, 2026

View reviewed changes

futurw4v added 2 commits February 12, 2026 13:35

perf: 提取部分版本信息为全局静态常量，优化异步读取性能

c56ae7b

refactor: 移除无用变量/导入，重命名MyHomePage为MainStartPage

fab40ad

dvdamghier requested a review from Copilot February 12, 2026 05:57

Copilot started reviewing on behalf of dvdamghier February 12, 2026 05:57 View session

Copilot AI reviewed Feb 12, 2026

View reviewed changes

lib/main.dart Outdated Show resolved Hide resolved

lib/pages/setting/about.dart Outdated Show resolved Hide resolved

lib/function/dio_client.dart Show resolved Hide resolved

futurw4v added 2 commits February 12, 2026 22:10

style: 更正GitHub拼写

4c9e942

refactor: 优化DioClient日志处理与超时配置

38a5010

dvdamghier requested a review from Copilot February 12, 2026 14:38

Copilot started reviewing on behalf of dvdamghier February 12, 2026 14:38 View session

Copilot AI reviewed Feb 12, 2026

View reviewed changes

style: 更正GitHub拼写

8f7bba4

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

dvdamghier requested a review from Copilot February 12, 2026 15:55

Copilot started reviewing on behalf of dvdamghier February 12, 2026 15:56 View session

lxdklp merged commit e6b96d0 into lxdklp:main Feb 12, 2026
6 of 7 checks passed

		final int port = settings.arguments as int;
		final String etServer = settings.arguments as String;

-          final int port = settings.arguments as int;
-          final String etServer = settings.arguments as String;
+          final args = settings.arguments as Map<String, dynamic>;
+          final int port = args['port'] as int;
+          final String etServer = args['etServer'] as String;

Conversation

futurw4v commented Feb 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

lxdklp Feb 11, 2026

Choose a reason for hiding this comment

Uh oh!

futurw4v Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

lxdklp Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

futurw4v Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

futurw4v commented Feb 12, 2026

Uh oh!

lxdklp commented Feb 12, 2026

Uh oh!

futurw4v commented Feb 12, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

lxdklp Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

futurw4v Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

futurw4v Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

futurw4v commented Feb 11, 2026 •

edited

Loading