Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
9eb7422
refactor(utils): Unity 分辨率覆盖从 MFW 搬到宿主工具
qiyinxi Nov 21, 2026
2c4a1f7
refactor(utils): 远端区间读取器与直连速度保护从 MFW 搬到宿主
qiyinxi Nov 21, 2026
1ece624
refactor(mfw): M9A、MSS 改用专属脚本页与账号页
qiyinxi Nov 21, 2026
e2ce0a3
refactor(mfw): 三类 MFW 托管登记为适配条目,MSS 计划表改由 entry 登记
qiyinxi Nov 21, 2026
0e97c9e
refactor(mfw): 展开任务快照抽到核心,建计划与预览收同一份规则表
qiyinxi Nov 21, 2026
bbec729
refactor(mfw): 周期任务过滤、记账与重试剔除改成核心纯函数
qiyinxi Nov 21, 2026
43517b0
refactor(mfw): 删除 MFW 风味机制,家族判断改看适配条目标记
qiyinxi Nov 21, 2026
e8fdd7b
docs(mfw): M9A、MSS 前端说明改指向专属页与 entry 登记
qiyinxi Nov 21, 2026
ff3feb0
merge: 并入 MFW 专属页分支(M9A、MSS 专属页,删风味前端机制)
qiyinxi Nov 21, 2026
3c6faa7
refactor(mfw): 原生库识别分到 tools/core/native
qiyinxi Nov 21, 2026
2378220
refactor(mfw): 运行环境的准备与借还归 agent 环境
qiyinxi Nov 21, 2026
4e7d898
refactor(mfw): 清掉运行、agent 环境、项目更新之间的反向导入
qiyinxi Nov 21, 2026
a5dd6f2
refactor(mfw): 更新预检的一次性环境准备收到 agent 环境一侧
qiyinxi Nov 21, 2026
044bd8f
refactor(mfw): 建计划不再调 agent 环境,agent 命令计划改在借运行环境时算
qiyinxi Nov 21, 2026
20dc792
refactor(mfw): 设备配置与首任务闸门抽成吃普通数据的函数
qiyinxi Nov 21, 2026
26efd54
merge: sync upstream dev f5867f264
qiyinxi Nov 21, 2026
8159700
refactor(mfw): 托管类型新建时定死,导入不再按项目换类型
qiyinxi Nov 21, 2026
e959341
refactor(mfw): 页面宿主不再在导入后整页换页
qiyinxi Nov 21, 2026
e38f950
refactor(mfw): 「跑一份计划」抽成只收普通数据的 plan_run
qiyinxi Nov 21, 2026
ece0ba6
refactor(mfw): 任务类改为调 plan_run 跑计划,自己只剩一层
qiyinxi Nov 21, 2026
3f99a24
refactor(mfw): 运行前设置抽成只收普通数据的 pretask_run
qiyinxi Nov 22, 2026
f5b157d
refactor(mfw): 密码三件事各归各位,尝试结果判定收成一个函数
qiyinxi Nov 22, 2026
44475e6
docs(mfw): 清掉托管换类型与原生库位置的过时说法
qiyinxi Nov 22, 2026
12ee81a
refactor(mfw): 项目会话抽成只收普通数据的 project_session
qiyinxi Nov 22, 2026
1191854
refactor(mfw): 去掉没人调用的 has_live_process,写明 runner 接缝的导入方向
qiyinxi Nov 22, 2026
5dae0ce
refactor(mfw): 托管属主登记表,三种 MFW 托管按确切类型各自登记
qiyinxi Nov 22, 2026
254a7f0
refactor(mfw): 共享目录的清理改按属主的回答,判定不了的一律不删
qiyinxi Nov 22, 2026
d0fc50a
refactor(mfw): /maafw/* 端点与管理器经属主入口读写托管
qiyinxi Nov 22, 2026
3ff7e67
docs(mfw): 写明托管属主登记的规则、清理前的判断与新增专项要做的事
qiyinxi Nov 22, 2026
347c5fc
fix(mfw): 属主一个都没登记时不算回答,后台对账兜住算集合时的异常
qiyinxi Nov 22, 2026
d286a53
refactor(mfw): 导入、克隆、同来源重建出的新视图当场记下属主
qiyinxi Nov 22, 2026
3bf58bb
docs(mfw): 属主登记补写空登记表、后台对账兜异常、新视图当场记属主与插件形态前要补的三条
qiyinxi Nov 22, 2026
cdb64bc
refactor(mfw): 登录失败异常归位,判定不再导入风味
qiyinxi Nov 22, 2026
fdf7c38
refactor(mfw): task_name_for_entry 归到解析库
qiyinxi Nov 22, 2026
fb514b2
refactor(m9a): 规则常量与排队列搬进 M9A 自己的 rules、arrange
qiyinxi Nov 22, 2026
7f09148
refactor(mss): 规则常量与排队列搬进 MSS 自己的 rules、arrange
qiyinxi Nov 22, 2026
d3fb01f
refactor(mfw): 「是 MFW 托管」拆出 MAAFW_FAMILY_TYPES
qiyinxi Nov 22, 2026
c116ea0
refactor(mfw): 运行设置原值解析与运行文案抽成 run_settings、run_messages
qiyinxi Nov 22, 2026
30fd9d9
refactor(mfw): 两组打码值的收集并进 run_redaction
qiyinxi Nov 22, 2026
f2b10f0
refactor(mfw): 代理次数结算与周期记账的计算并进 proxy_quota、plan_transforms
qiyinxi Nov 22, 2026
322c829
refactor(mfw): 账号级通知正文抽成 run_notices
qiyinxi Nov 22, 2026
b079bba
refactor(mfw): 尝试记账抽成 attempt_ledger
qiyinxi Nov 22, 2026
aed32c2
refactor(mfw): 开模拟器、adb 环境与锁屏判定抽成 host_client
qiyinxi Nov 22, 2026
0a225cf
refactor(mfw): 桌面游戏启停抽成 desktop_game
qiyinxi Nov 22, 2026
34be36b
refactor(mfw): 运行池自检、路由、遥测与代理结果正文抽出管理器
qiyinxi Nov 22, 2026
e435939
refactor(mfw): 项目运行环境准备搬出管理器,进 project_environment
qiyinxi Nov 22, 2026
c757638
refactor(mfw): 按属主记录组项目会话请求,同来源候选收成 current_siblings
qiyinxi Nov 22, 2026
5c78481
refactor(mfw): 交回项目预约与资源包修复抽成 release_run_reservation、resource_repair
qiyinxi Nov 22, 2026
a428041
refactor(mfw): 按排好的队列建计划收成 task_selection.build_arranged_plan
qiyinxi Nov 22, 2026
acdd392
refactor(mfw): 配置回调搬到中立的 config_handler,恢复池公开拆件
qiyinxi Nov 22, 2026
53b1e87
refactor(mfw): 去掉任务类里留下的桌面游戏时限常量
qiyinxi Nov 22, 2026
d82e735
merge: sync upstream dev a152eb102
qiyinxi Nov 22, 2026
4fcc4d3
fix(mfw): 关游戏时恢复先关进程、再读 exe 路径的旧先后
qiyinxi Nov 22, 2026
b21625b
feat(m9a): M9A 自己的账号流程与脚本级管理器,先不登记
qiyinxi Nov 22, 2026
a0e0ad4
feat(m9a): M9A 自己的配置回调与恢复池,先不登记
qiyinxi Nov 22, 2026
aab8630
feat(m9a): M9A 托管改跑自己的流程(翻登记)
qiyinxi Nov 22, 2026
46a0a82
docs(m9a): 写明 M9A 自己的流程、边界与回退
qiyinxi Nov 22, 2026
ccf6288
feat(mss): MSS 自己的账号流程与脚本级管理器,先不登记
qiyinxi Nov 22, 2026
068ea9b
feat(mss): MSS 托管改跑自己的流程(翻登记)
qiyinxi Nov 22, 2026
048993f
docs(mss): 写明 MSS 自己的流程、边界与回退,记下第 11 步的前置件
qiyinxi Nov 22, 2026
803aeb7
merge: sync upstream dev 55dacc670
qiyinxi Nov 22, 2026
bbd2e92
fix(m9a): 同步上游的游戏会话选定与预下载口径
qiyinxi Nov 22, 2026
e237f16
fix(mss): 同步上游的游戏会话选定与预下载口径
qiyinxi Nov 22, 2026
6e38a30
fix(m9a,mss): 收尾时托管已被删不再把结果改成异常
qiyinxi Nov 22, 2026
46785ce
docs(mfw): 写明合并上游后金样怎么重录
qiyinxi Nov 22, 2026
16b5444
refactor(mfw): shell_instances 的标签与选项换算改成公开名
qiyinxi Nov 22, 2026
a2022e4
refactor(end): MaaEnd 用到时才导入 MFW 解析
qiyinxi Nov 22, 2026
cb43a61
feat(plugin): 插件命令失败时把原因交给界面
qiyinxi Nov 22, 2026
99aef53
feat(plugin): 依赖无法共同满足时说出涉及的包
qiyinxi Nov 22, 2026
ae33a72
fix(config): 加载出错的配置根不再写回
qiyinxi Nov 22, 2026
0d5eb35
feat(plugin): 安装时连带加载顺带装上的依赖插件
qiyinxi Nov 22, 2026
e1f0cb8
feat(plugin): 脚本适配插件可声明托管生命周期钩子
qiyinxi Nov 22, 2026
85fba63
docs(plugin): 写明托管生命周期钩子的调用时机
qiyinxi Nov 22, 2026
7ed2fc8
fix(plugin): 停用和卸载前对整棵下游树查锁
qiyinxi Nov 22, 2026
ed4f4b9
feat(plugin): 插件托管检查可以记「跳过」
qiyinxi Nov 22, 2026
4ea58ee
feat(plugin): 插件可以在拆卸前说明不能停用的原因
qiyinxi Nov 22, 2026
29280fc
feat(config): 集合可原样保留未登记类型的成员
qiyinxi Nov 22, 2026
80aeb1c
feat(plugin): 注册表给出插件依赖关系与停用连带范围
qiyinxi Nov 22, 2026
bf9c582
docs(plugin): 写明插件依赖插件的安装、连带范围和失败原因
qiyinxi Nov 22, 2026
bac2d54
feat(plugin): 脚本适配插件可按配置判定游戏类型和桌面分身
qiyinxi Nov 22, 2026
e3a358c
docs(plugin): 更正失败原因的显示范围
qiyinxi Nov 22, 2026
5464aad
feat(sdk): 补齐 MFW 专项要用的宿主出口
qiyinxi Nov 22, 2026
1c205a3
feat(desktop-session): 分身增加通用的窗口列举动作
qiyinxi Nov 22, 2026
6ff8eaa
feat(plugin): 本地源码库参与插件依赖求解并加入导入路径
qiyinxi Nov 22, 2026
f033043
feat(config): 插件加载失败时托管原样保留,插件恢复后自动还原
qiyinxi Nov 22, 2026
003478a
refactor(mfw): 预览规则表与导入拒收改由托管属主给出
qiyinxi Nov 22, 2026
ebcc49e
feat(scripts): 列表接口标出所属插件不可用的托管
qiyinxi Nov 22, 2026
83717e0
docs(plugin): 写明托管加载状态与旁挂托管的读法
qiyinxi Nov 22, 2026
00b55a2
feat(config): 备份含所属插件不可用的配置时记一条警告
qiyinxi Nov 22, 2026
8ead882
refactor(mfw): 删掉通用账号流程里的风味分支
qiyinxi Nov 22, 2026
91dec02
refactor(mfw): 删掉风味本体
qiyinxi Nov 22, 2026
726e09b
docs(mfw): 文档与注释改成删风味之后的现状
qiyinxi Nov 22, 2026
9e74159
refactor(mfw): 客户端版本改由建计划的调用方传入
qiyinxi Nov 22, 2026
ede2c4d
refactor(mfw): 扫桌面窗口从解析库拆到运行一侧
qiyinxi Nov 22, 2026
aee6a5f
refactor(mfw): 标签可读化与 MXU 选项换算切到解析一侧
qiyinxi Nov 22, 2026
0e240af
refactor(mfw): 删掉 worker 按脚本方式启动时的裸名导入回退
qiyinxi Nov 22, 2026
c56d738
refactor(mfw): worker 的模块路径与导入根改由运行器按自己的位置算
qiyinxi Nov 22, 2026
5c77dbb
refactor(mfw): 原生库识别搬进 blocks/maafw_native
qiyinxi Nov 22, 2026
9665b6a
refactor(mfw): 解析库搬进 blocks/maafw_interface
qiyinxi Nov 22, 2026
d03180a
refactor(mfw): agent 环境搬进 blocks/maafw_agent_env
qiyinxi Nov 22, 2026
9e78258
refactor(mfw): 项目更新搬进 blocks/maafw_project_update
qiyinxi Nov 22, 2026
5d14fea
refactor(mfw): 运行搬进 blocks/maafw_runner
qiyinxi Nov 22, 2026
52177a5
refactor(mfw): 宿主接缝收进 seams,通用 MFW 的任务类与外壳导入上移
qiyinxi Nov 22, 2026
dcbff13
test(mfw): 运行进度测试改从上移后的 runner_task 导入
qiyinxi Nov 22, 2026
4348272
docs(mfw): 文档与注释里的路径换成按积木拆目录之后的位置
qiyinxi Nov 22, 2026
0ec22a1
docs(mfw): 补改专项与积木 docstring 里剩下的旧目录名
qiyinxi Nov 22, 2026
d2072d9
merge: 并入 feat/mfw-mig-sdk-a-20261122
qiyinxi Nov 22, 2026
b02e1cd
merge: 并入 feat/mfw-mig-sdk-b-20261122
qiyinxi Nov 22, 2026
ce8dc39
merge: 并入 feat/mfw-mig-sdk-c-20261122
qiyinxi Nov 22, 2026
fbab285
merge: 并入 feat/mfw-mig-maaend-lazy-20261122
qiyinxi Nov 22, 2026
506598b
fix(mfw): 有属主没答上来时不清理任何带属主标记的视图
qiyinxi Nov 22, 2026
da8cf41
refactor(mfw): 桌面分身里查窗口改走宿主通用动作
qiyinxi Nov 22, 2026
5e3df58
refactor(m9a): 宿主启动不迁移时不导入 MFW 解析库
qiyinxi Nov 22, 2026
87c054d
docs(mfw): 合并 SDK 三组与 MaaEnd 延迟导入之后的说明
qiyinxi Nov 22, 2026
da704b5
chore(frontend): 重新生成 OpenAPI 客户端里插件依赖与托管加载的新字段
qiyinxi Nov 22, 2026
f3a04e6
fix(plugin): 安装时加载依赖链上已登记的插件,并按启用意图启用
qiyinxi Nov 22, 2026
df40d4e
feat(plugin): 插件目录可按包名从 PyPI 补充
qiyinxi Nov 22, 2026
59b0989
fix(plugin): 插件目录里有读不了的元数据时不再挡住后端启动
qiyinxi Nov 22, 2026
b8351bf
refactor(m9a): 旧数据迁移搬到宿主自有的 m9a_legacy
qiyinxi Nov 22, 2026
5baecd4
refactor(mfw): MFW、M9A、MSS 改由插件提供,删除内置实现
qiyinxi Nov 22, 2026
e766901
fix(mfw): 没装 MFW 插件时说清楚该装哪个包
qiyinxi Nov 22, 2026
d6dd951
feat(frontend): MSS 计划表改用插件登记的类型
qiyinxi Nov 22, 2026
2b99dbe
feat(frontend): 所属插件不可用的托管与计划表只读显示,插件中心说出失败原因
qiyinxi Nov 22, 2026
5353bea
docs(mfw): 写下 MFW 插件化后的升级、离线与回退
qiyinxi Nov 22, 2026
9693d22
chore(changelog): MFW、M9A、MSS 改为插件形式提供
qiyinxi Nov 22, 2026
6bd32b3
docs: 调度与日志文档里指向已删除 MFW 目录的链接改成插件说明
qiyinxi Nov 22, 2026
03f3451
chore(dev): 加上把 MFW 插件族本地源码接进宿主的脚本
qiyinxi Nov 22, 2026
c7dc72e
docs(mfw): 写下 MFW 插件族本地联调、无害真跑与升级演练的做法
qiyinxi Nov 22, 2026
11a4ccf
style(docs): 联调文档里的代码块按 ruff 格式化
qiyinxi Nov 22, 2026
5a6246a
fix(dispatch): 任务状态查询回传结束时间,等待与获取游戏实例写进后端日志
qiyinxi Nov 22, 2026
2bafa7b
refactor(frontend): 不可用托管与计划表的卡片接线收进独立组件
qiyinxi Nov 22, 2026
a95f622
fix(plugin): 同族插件旧版本在装时可以一起升到新的次版本
qiyinxi Nov 22, 2026
6eef2ef
fix(plugin): MFW 一族的专项插件要求 0.2.0 起
qiyinxi Nov 22, 2026
33fcc34
fix(frontend): 停用与卸载确认把 MFW、M9A、MSS 名下的托管和计划表算进去
qiyinxi Nov 22, 2026
15bc28a
fix(dispatch): 结束时间用查到任务的同一个 ID 取
qiyinxi Nov 22, 2026
f77a876
docs(mfw): 回退说明分开写两种起点
qiyinxi Nov 22, 2026
d5dc164
fix(plugin): 启动前就把存量配置要的专项插件升到下限
qiyinxi Nov 22, 2026
b73f47a
fix(plugin): 版本没达标的专项插件这一轮不接手配置
qiyinxi Nov 22, 2026
bda6e26
fix(config): 旁挂配置恢复时原文与新条目在同一次写入里交接
qiyinxi Nov 22, 2026
233289d
fix(config): 已登记类型的单条坏配置只隔离这一条
qiyinxi Nov 22, 2026
3f70a2a
merge: 并入旁挂配置恢复的原子交接与单条隔离
qiyinxi Nov 22, 2026
1a7ecf0
fix(maaend): 有 MaaEnd 托管时宿主自动把 MFW 解析库装进插件环境
qiyinxi Nov 22, 2026
3aed890
fix(plugin): 单个镜像的 uv 超时换下一个镜像,不再让整次安装空着原因失败
qiyinxi Nov 22, 2026
dd98cdd
merge: 并入迁移分支 feat/mfw-plugin-migration-20261121(3f70a2a7f)
qiyinxi Nov 22, 2026
709edd0
test(config): 旁挂托管保留、还原与单条隔离的回归测试
qiyinxi Nov 22, 2026
464961b
test(plugin): 同族插件一起升级的回归测试
qiyinxi Nov 22, 2026
dd241f3
merge: 并入首启升级到位、未达标不接手、MaaEnd 解析库与镜像超时换源
qiyinxi Nov 22, 2026
dfbc148
fix(plugin): 插件环境里读不了的发行元数据在另两处也跳过并告警
qiyinxi Nov 22, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
| 任务/队列 UI | 关卡理智 Section | Stage Section | TaskConfig + Skyland | 高频字段(固定 -t 1 日常) | 动态表单(后端下发字段) | 后端下发托管字段动态渲染(共享 / 独立来源各写各的 owner) |
| 后端侧重 | 进程与实例 | 任务栈、模拟器、Stage | runtime_bridge、MXU 路径、切号 | 三态来源、working 备份恢复 | 半自动 schema、双通道配置 | 模块→引擎分配、双份配置备份、路径锁 |

M9A 不在此表:它是 MaaFW 的特调类型,前端用 MaaFW 的组件(见 `app/task/M9A/AGENTS.md`)。
M9A、MSS 不在此表:它们是 MaaFW 家族的类型,前端是用 MaaFW 分节与编排层拼的专属页面(`frontend/src/views/m9a/`、`frontend/src/views/mss/`,由各自 `entry.ts` 登记),见 `app/task/M9A/AGENTS.md`、`app/task/MSS/AGENTS.md`。

## 前端表面通用约定

Expand Down
14 changes: 13 additions & 1 deletion app/api/config_triggers.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""运行时配置触发器的字段写入、在途投影与任务结果。"""

from typing import Any
from uuid import UUID

from fastapi import APIRouter
Expand Down Expand Up @@ -31,6 +32,12 @@ class TriggerResultIn(BaseModel):
class TriggerTaskResult(BaseModel):
state: BackgroundTaskState
errorCode: str | None = None
message: str | None = Field(
default=None, description="失败原因,仅可展示的异常(如插件错误)填写"
)
detail: dict[str, Any] | None = Field(
default=None, description="失败原因的结构化附加信息"
)


class TriggerResultOut(OutBase):
Expand Down Expand Up @@ -91,5 +98,10 @@ async def get_config_trigger_result(body: TriggerResultIn) -> TriggerResultOut:
code=404, status="error", message="trigger_task_not_found"
)
return TriggerResultOut(
data=TriggerTaskResult(state=result.state, errorCode=result.error_code)
data=TriggerTaskResult(
state=result.state,
errorCode=result.error_code,
message=result.message,
detail=result.detail,
)
)
16 changes: 10 additions & 6 deletions app/api/plan.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import app.models.config as _config_models
from app.config.wire import ConfigPayload, StrictConfigInput, config_contract
from app.core import Config
from app.models.schema import ConfigSnapshotOut, OutBase
from app.models.schema import ConfigSnapshotOut, OutBase, UnavailableConfigItem
from app.utils import get_logger

OkwwPlanConfig = ConfigPayload[_config_models.OkwwPlanConfig]
Expand All @@ -48,8 +48,6 @@

BAAHPlanConfig = ConfigPayload[_config_models.BAAHPlanConfig]
BAAHPlanConfigInput = StrictConfigInput[_config_models.BAAHPlanConfig]
MSSPlanConfig = ConfigPayload[_config_models.MSSPlanConfig]
MSSPlanConfigInput = StrictConfigInput[_config_models.MSSPlanConfig]
MaaEndPlanConfig = ConfigPayload[_config_models.MaaEndPlanConfig]
MaaEndPlanConfigInput = StrictConfigInput[_config_models.MaaEndPlanConfig]

Expand All @@ -68,7 +66,6 @@ class PlanIndexItem(BaseModel):
PlanCreateType = Literal[
"MaaEndPlan",
"BAAHPlan",
"MSSPlan",
"UniversalPlan",
"OkNtePlan",
"OkwwPlan",
Expand All @@ -79,7 +76,6 @@ class PlanIndexItem(BaseModel):
SerializeAsAny[BaseModel]
| MaaEndPlanConfig
| BAAHPlanConfig
| MSSPlanConfig
| UniversalPlanConfig
| OkNtePlanConfig
| OkwwPlanConfig
Expand All @@ -88,7 +84,6 @@ class PlanIndexItem(BaseModel):
SerializeAsAny[BaseModel]
| MaaEndPlanConfigInput
| BAAHPlanConfigInput
| MSSPlanConfigInput
| UniversalPlanConfigInput
| OkNtePlanConfigInput
| OkwwPlanConfigInput
Expand Down Expand Up @@ -118,6 +113,10 @@ class PlanGetIn(BaseModel):
class PlanGetOut(ConfigSnapshotOut):
index: List[PlanIndexItem] = Field(..., description="计划索引列表")
data: Dict[str, PlanConfigData] = Field(..., description="计划列表或单个计划数据")
unavailable: List[UnavailableConfigItem] = Field(
default_factory=list,
description="所属插件不可用的计划表,只在获取全部计划时给出;只能删除",
)


class PlanUpdateIn(BaseModel):
Expand Down Expand Up @@ -225,6 +224,11 @@ async def get_plan(plan: PlanGetIn = Body(...)) -> PlanGetOut:
return PlanGetOut(
index=index,
data=data,
unavailable=(
[UnavailableConfigItem(**item) for item in Config.unavailable_plans()]
if plan.planId is None
else []
),
uiSources=[UUID(plan.planId) if plan.planId else Config.PlanConfig.uid],
)

Expand Down
18 changes: 17 additions & 1 deletion app/api/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,22 @@ class PluginRegistryDocument(ConfigPayload[PluginRecord]):

uid: UUID
ui: PluginConfigUi
disableImpact: list[Literal["scripts", "games"]] = Field(default_factory=list)
disableImpact: list[Literal["scripts", "games", "plans"]] = Field(
default_factory=list,
description="停用本插件及其级联下游时会删除的配置领域",
)
dependsOn: list[str] = Field(
default_factory=list, description="直接上游插件名(requires 的提供者)"
)
missingServices: list[str] = Field(
default_factory=list, description="requires 中当前找不到提供者的服务名"
)
disableCascade: list[str] = Field(
default_factory=list, description="停用或重载时会一并拆掉的下游插件名"
)
uninstallCascade: list[str] = Field(
default_factory=list, description="卸载时会一并卸掉的下游插件名"
)


class PluginCatalogDocument(ConfigPayload[PluginMeta]):
Expand Down Expand Up @@ -221,6 +236,7 @@ async def get_plugin_registry(
{
"uid": uid,
"disableImpact": Plugin.disable_impact(col[uid]),
**Plugin.dependency_view(col[uid]),
**col[uid].model_dump(mode="json", context={"audience": "api"}),
}
)
Expand Down
2 changes: 0 additions & 2 deletions app/api/scripts/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
from app.task.BetterGI.api import router as bettergi_router
from app.task.HSR.api import router as hsr_router
from app.task.MaaEnd.api import router as maaend_router
from app.task.MaaFW.api import router as maafw_router
from app.task.OkNte.api import router as oknte_router
from app.task.Okww.api import router as okww_router
from app.task.ZzzOd.api import router as zzzod_router
Expand All @@ -39,7 +38,6 @@
router.include_router(sharing.router)
router.include_router(okww_router)
router.include_router(maaend_router)
router.include_router(maafw_router)
router.include_router(hsr_router)
router.include_router(bettergi_router)
router.include_router(baah_router)
Expand Down
75 changes: 41 additions & 34 deletions app/api/scripts/management.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
ConfigSnapshotOut,
OutBase,
ScriptDeleteIn,
UnavailableConfigItem,
UserInBase,
)
from app.models.script_access import script_users
Expand Down Expand Up @@ -71,30 +72,12 @@
HSRConfigInput = ConfigInput[_config_models.HSRConfig]


M9AConfig = ConfigPayload[_config_models.M9AConfig]


M9AConfigInput = ConfigInput[_config_models.M9AConfig]


MSSConfig = ConfigPayload[_config_models.MSSConfig]


MSSConfigInput = ConfigInput[_config_models.MSSConfig]


MaaEndConfig = ConfigPayload[_config_models.MaaEndConfig]


MaaEndConfigInput = ConfigInput[_config_models.MaaEndConfig]


MaaFWConfig = ConfigPayload[_config_models.MaaFWConfig]


MaaFWConfigInput = ConfigInput[_config_models.MaaFWConfig]


OkNteConfig = ConfigPayload[_config_models.OkNteConfig]


Expand Down Expand Up @@ -122,13 +105,10 @@ class ScriptIndexItem(BaseModel):
"OkwwConfig",
"OkNteConfig",
"MaaEndConfig",
"M9AConfig",
"MaaFWConfig",
"HSRConfig",
"BetterGIConfig",
"ZzzOdConfig",
"BAAHConfig",
"MSSConfig",
]
},
default=...,
Expand All @@ -138,6 +118,10 @@ class ScriptIndexItem(BaseModel):
activityGame: str | None = Field(
default=None, description="对应的游戏活动标识,无游戏归属时为空"
)
pluginAvailable: bool = Field(
default=True,
description="所属插件当前是否可用;插件托管的插件不在已启用状态时为 false",
)


class ScriptCreateIn(BaseModel):
Expand All @@ -148,13 +132,10 @@ class ScriptCreateIn(BaseModel):
"Okww",
"OkNte",
"MaaEnd",
"M9A",
"MaaFW",
"HSR",
"BetterGI",
"ZzzOd",
"BAAH",
"MSS",
]
},
default=...,
Expand All @@ -173,13 +154,10 @@ class ScriptCreateOut(OutBase):
OkwwConfig,
OkNteConfig,
MaaEndConfig,
M9AConfig,
MaaFWConfig,
HSRConfig,
BetterGIConfig,
ZzzOdConfig,
BAAHConfig,
MSSConfig,
] = Field(..., description="托管配置数据")


Expand All @@ -199,15 +177,16 @@ class ScriptGetOut(ConfigSnapshotOut):
OkwwConfig,
OkNteConfig,
MaaEndConfig,
M9AConfig,
MaaFWConfig,
HSRConfig,
BetterGIConfig,
ZzzOdConfig,
BAAHConfig,
MSSConfig,
],
] = Field(..., description="托管数据字典, key来自于index列表的uid")
unavailable: List[UnavailableConfigItem] = Field(
default_factory=list,
description="所属插件不可用的托管,只在获取全部托管时给出;只能删除",
)


class ScriptLockIn(UserInBase):
Expand All @@ -226,13 +205,10 @@ class ScriptUpdateIn(BaseModel):
OkwwConfigInput,
OkNteConfigInput,
MaaEndConfigInput,
M9AConfigInput,
MaaFWConfigInput,
HSRConfigInput,
BetterGIConfigInput,
ZzzOdConfigInput,
BAAHConfigInput,
MSSConfigInput,
] = Field(..., description="托管更新数据")

@model_validator(mode="before")
Expand Down Expand Up @@ -277,6 +253,25 @@ async def get_script_types() -> ScriptTypesOut:
logger = get_logger("托管管理 API")


def _plugin_available(config: object) -> bool:
"""插件托管:有处于已启用状态、类型命中的声明才算可用(同运行时的分派判法)。"""
from app.core.plugin import Plugin
from app.models.config import ScriptEntry
from app.plugin.types import PluginState

if not isinstance(config, ScriptEntry):
return True
for record in Plugin.list_plugins():
decl = Plugin.script_types.get(record.uid)
if (
decl is not None
and record.info.state == PluginState.ENABLED
and isinstance(config, decl.script_type)
):
return True
return False


@router.post(
"/add",
tags=["Add"],
Expand Down Expand Up @@ -327,13 +322,24 @@ async def get_script(script: ScriptGetIn = Body(...)) -> ScriptGetOut:
}
)
index = [
ScriptIndexItem(**item, activityGame=activity_games.get(item["type"]))
ScriptIndexItem(
**item,
activityGame=activity_games.get(item["type"]),
pluginAvailable=_plugin_available(
Config.ScriptConfig[uuid.UUID(item["uid"])]
),
)
for item in index
]
data = {
uid: ConfigPayload[type(Config.ScriptConfig[uuid.UUID(uid)])](**cfg)
for uid, cfg in data.items()
}
unavailable = (
[UnavailableConfigItem(**item) for item in Config.unavailable_scripts()]
if script.scriptId is None
else []
)
except Exception as e:
logger.opt(exception=True).warning(f"get_script失败: {type(e).__name__}: {e}")
return ScriptGetOut(
Expand All @@ -347,6 +353,7 @@ async def get_script(script: ScriptGetIn = Body(...)) -> ScriptGetOut:
return ScriptGetOut(
index=index,
data=data, # pyright: ignore[reportArgumentType]
unavailable=unavailable,
uiSources=[
uuid.UUID(script.scriptId) if script.scriptId else Config.ScriptConfig.uid
],
Expand Down
Loading
Loading