research/08 方案 A:GUI 的微软登录改走授权码流(HMCL 主流做法),设备码流保留给 CLI/无浏览器场景。两条流只差「怎么拿到 MS access_token」,拿到之后共用 chain::complete_chain 与 MicrosoftSession,落盘/刷新语义没有第二套。 core(crates/core/src/auth/microsoft/) - endpoints:新增 authorize(…/consumers/oauth2/v2.0/authorize),与 token 同租户。 - authcode:RedirectUri 是 http://localhost:{port}/auth 的唯一来源(授权 URL、 token 请求体、实际监听三处共用,坑 5);AuthCodePolicy(回调超时 300s / 绑定重试 3 次 / 固定端口 / 固定 state);authorization_url(response_type=code + prompt=select_account + scope=XboxLive.signin%20offline_access);exchange_code 复用 flow 的 oauth_error/tokens_from。 - callback:本地 HTTP/1.1 回调服务器。内核分配端口(占用按次数退避重试);非 /auth 路径 (favicon、预连)404 后继续等;state 不匹配 400 后继续等;error=access_denied 归 Canceled; 单条连接读头超时 5s,半开连接拖不垮时间预算。 - MicrosoftAuth::authcode_login(present):绑端口 → present(宿主开浏览器)→ 等回调 → 换 token → 整链;失败与设备码流一样落 M38 失败日志。 app(crates/app) - AppCommand::StartBrowserLogin + host::accounts::start_browser_login;设备码/授权码共用 LoginJob 取消槽位、收尾入库(store_session)与面板 DTO。 - host::opener 用系统默认浏览器打开授权 URL(Windows rundll32 url.dll,FileProtocolHandler)。 - 账户页:主按钮「微软登录」走授权码流,「设备码登录」作备用;DeviceLoginView::browser_waiting 在面板里给出可复制的授权链接(user_code 留空)。 测试 - crates/core/tests/auth/microsoft_authcode.rs:授权 URL 向量(租户/编码/prompt)、 URI 一致性(授权 URL 与 token 表单同字面量)、mock 全链、favicon+陈旧 state 后仍拿到 code、 端口占用重试文案、超时、access_denied→Canceled、login_with_xbox 403 的 M38 诊断 (detail_code=login_with_xbox_403,真机白名单未批时验收止步于此)。 - 单测:authcode 编码/向量、callback query 解码与错误分流、DTO browser_waiting、conv 面板。 未做/未验证:真机完整登录需 Azure 公共客户端 id(ULL_MSA_CLIENT_ID)与 Minecraft API 许可, 本机只能到「授权页 302 到 login.live.com 且 redirect_uri/scope/prompt 原样保留」这一步。 AskaEth <i@yeij.top>
163 lines
7.7 KiB
Rust
163 lines
7.7 KiB
Rust
//! `CoreHost::dispatch` 的指令实现(从 `host/mod.rs` 拆出,守 400 行上限)。
|
||
//!
|
||
//! 父模块的私有字段对子模块可见,所以这里直接读写 `self.env` / `self.tx` 等。
|
||
|
||
use crate::dto::{AppCommand, Backend, CoreEvent, CreateRequest, LoaderKind};
|
||
use crate::toast::ToastKind;
|
||
|
||
use super::accounts::{self, LoginJob};
|
||
use super::{game, install, java, launch, logs, settings, versions, CoreHost};
|
||
|
||
impl CoreHost {
|
||
/// 下发一条用户意图(`Backend::dispatch` 的实现体)。
|
||
pub(super) fn dispatch_command(&mut self, command: AppCommand) {
|
||
self.dispatch_inner(command);
|
||
}
|
||
}
|
||
impl CoreHost {
|
||
/// 指令分发(见 `dispatch_command`)。
|
||
fn dispatch_inner(&mut self, command: AppCommand) {
|
||
match command {
|
||
AppCommand::RefreshAll => self.refresh_all(),
|
||
AppCommand::LaunchInstance(id) => self.start_launch(&id),
|
||
AppCommand::StopInstance(id) => match self.running_pid(&id) {
|
||
Some(pid) => match launch::stop(pid) {
|
||
Ok(()) => self.toast(ToastKind::Info, "已请求停止游戏进程"),
|
||
Err(reason) => self.toast(ToastKind::Error, reason),
|
||
},
|
||
None => self.toast(ToastKind::Warn, "这个实例当前没有在跑"),
|
||
},
|
||
AppCommand::ListVersions(_) => versions::spawn_list(self.env.clone(), self.tx.clone()),
|
||
AppCommand::InstallVersion(version) => {
|
||
let cancel = std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false));
|
||
self.install_cancel = Some(std::sync::Arc::clone(&cancel));
|
||
install::spawn_install(
|
||
self.env.clone(),
|
||
self.tx.clone(),
|
||
CreateRequest {
|
||
name: version.clone(),
|
||
version,
|
||
loader: LoaderKind::Vanilla,
|
||
loader_version: String::new(),
|
||
},
|
||
cancel,
|
||
);
|
||
}
|
||
AppCommand::CreateInstance(request) => {
|
||
let cancel = std::sync::Arc::new(std::sync::atomic::AtomicBool::new(false));
|
||
self.install_cancel = Some(std::sync::Arc::clone(&cancel));
|
||
install::spawn_install(self.env.clone(), self.tx.clone(), request, cancel);
|
||
}
|
||
AppCommand::CancelInstall => {
|
||
// 取消只在阶段边界生效(core 的下载循环没有取消钩子):这里先把面板收回,
|
||
// 后台线程会在下一阶段开始前看到标记并收尾。
|
||
if let Some(cancel) = &self.install_cancel {
|
||
cancel.store(true, std::sync::atomic::Ordering::SeqCst);
|
||
}
|
||
self.install = None;
|
||
self.send(CoreEvent::InstallProgress(None));
|
||
}
|
||
AppCommand::SetIsolation { id, mode } => {
|
||
match game::set_isolation(&self.env, &id, &mode) {
|
||
Ok(()) => {
|
||
self.toast(ToastKind::Success, "隔离档位已更新");
|
||
self.refresh_instances();
|
||
}
|
||
Err(reason) => self.toast(ToastKind::Error, reason),
|
||
}
|
||
}
|
||
AppCommand::RefreshLogSessions => {
|
||
self.send(CoreEvent::LogSessionsChanged(logs::sessions(&self.env)));
|
||
}
|
||
AppCommand::OpenLogSession(id) => self.open_session(&id),
|
||
AppCommand::ImportCrashLog(path) => match logs::analyze_crash_file(&path) {
|
||
Ok((label, report)) => {
|
||
self.send(CoreEvent::DiagnosisReady(report));
|
||
self.toast(ToastKind::Info, label);
|
||
}
|
||
Err(reason) => self.toast(ToastKind::Warn, reason),
|
||
},
|
||
AppCommand::AddOfflineAccount(name) => match accounts::add_offline(&self.env, &name) {
|
||
Ok(display) => {
|
||
self.toast(ToastKind::Success, format!("已添加离线账户 {display}"));
|
||
self.refresh_accounts();
|
||
}
|
||
Err(reason) => self.toast(ToastKind::Error, reason),
|
||
},
|
||
AppCommand::RemoveAccount(key) => match accounts::remove(&self.env, &key) {
|
||
Ok(display) => {
|
||
if self.active_account.as_deref() == Some(key.as_str()) {
|
||
self.active_account = None;
|
||
}
|
||
self.toast(ToastKind::Info, format!("已删除账户 {display}"));
|
||
self.refresh_accounts();
|
||
}
|
||
Err(reason) => self.toast(ToastKind::Error, reason),
|
||
},
|
||
AppCommand::SwitchAccount(id) => {
|
||
self.active_account = Some(id);
|
||
self.refresh_accounts();
|
||
self.toast(ToastKind::Info, "已切换启动账户");
|
||
}
|
||
AppCommand::StartDeviceLogin => {
|
||
self.login = Some(LoginJob::new());
|
||
let job = self.login.clone().unwrap_or_default();
|
||
self.send(CoreEvent::DeviceLoginChanged(crate::dto::DeviceLoginView {
|
||
phase: crate::dto::DeviceLoginPhase::Requesting,
|
||
message: "正在向微软申请设备码…".to_string(),
|
||
..crate::dto::DeviceLoginView::new()
|
||
}));
|
||
accounts::start_login(self.env.clone(), self.tx.clone(), job);
|
||
}
|
||
AppCommand::StartBrowserLogin => {
|
||
self.login = Some(LoginJob::new());
|
||
let job = self.login.clone().unwrap_or_default();
|
||
self.send(CoreEvent::DeviceLoginChanged(crate::dto::DeviceLoginView {
|
||
phase: crate::dto::DeviceLoginPhase::Requesting,
|
||
message: "正在准备浏览器登录(本地回调端口)…".to_string(),
|
||
..crate::dto::DeviceLoginView::new()
|
||
}));
|
||
accounts::start_browser_login(self.env.clone(), self.tx.clone(), job);
|
||
}
|
||
AppCommand::CancelDeviceLogin => {
|
||
if let Some(job) = &self.login {
|
||
job.cancel();
|
||
}
|
||
self.login = None;
|
||
self.send(CoreEvent::DeviceLoginChanged(
|
||
crate::dto::DeviceLoginView::new(),
|
||
));
|
||
}
|
||
AppCommand::InstallJava(vendor) => {
|
||
self.java_busy = true;
|
||
self.java_message = format!("正在安装 Java({vendor})…");
|
||
self.refresh_java();
|
||
java::spawn_install(
|
||
self.env.clone(),
|
||
self.tx.clone(),
|
||
unlucky_core::game::java::JdkVendor::parse(&vendor),
|
||
);
|
||
}
|
||
AppCommand::SetSetting { key, value } => match settings::set(&self.env, &key, &value) {
|
||
Ok(()) => {
|
||
self.send(CoreEvent::SettingsChanged(settings::groups(&self.env)));
|
||
self.java_chain.clear();
|
||
self.refresh_java();
|
||
}
|
||
Err(reason) => self.toast(ToastKind::Error, reason),
|
||
},
|
||
AppCommand::DismissNotice(id) => {
|
||
self.notices.retain(|notice| notice.id != id);
|
||
self.send(CoreEvent::NoticesChanged(self.notices.clone()));
|
||
}
|
||
// AI 对话:agent 的 GUI host 未落地前用脚本回复(不接真实模型)
|
||
other @ (AppCommand::AskAgent(_) | AppCommand::StopAgent | AppCommand::SetYolo(_)) => {
|
||
self.chat.dispatch(other);
|
||
for event in self.chat.drain_events() {
|
||
self.events.push_back(event);
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|