dsh模块、快捷键调整
This commit is contained in:
1 parent
ff1d5cd517
commit
7e65825d3e
54 files changed
+7082
-109
No files matched your search
@@ -22,6 +22,10 @@ pub mod windows {
|
||||
/// 文件管理器独立窗口。**单例**(label 固定,不含会话 id):
|
||||
/// 它不绑定会话,左右两栏各自选择连接,因此没有「每会话一个窗口」的语义。
|
||||
pub const FILE_WINDOW: &str = "file-window";
|
||||
/// dsh 模块的 Web UI 独立窗口(内容是远端 `http://127.0.0.1:<port>`,
|
||||
/// 因此**不登记 capability**:远端页面不应获得任何 Tauri 权限)。
|
||||
#[allow(dead_code)]
|
||||
pub const DSH_WEB: &str = "dsh-web";
|
||||
}
|
||||
|
||||
/// Tauri 事件名(与前端 constants::EVENTS 对应)
|
||||
@@ -123,4 +127,11 @@ pub mod events {
|
||||
pub const DOWNLOAD_REMOVED: &str = "download-removed";
|
||||
/// 浏览器扩展通过 HTTP API 新增下载(负载 { id },前端据以为该任务创建专属下载窗口)
|
||||
pub const DOWNLOAD_EXTENSION_ADDED: &str = "download-extension-added";
|
||||
// dsh 模块:安装/下载进度(负载见 dsh::types::DshInstallProgress)
|
||||
pub const DSH_INSTALL_PROGRESS: &str = "dsh-install-progress";
|
||||
// dsh 模块:服务进程状态(负载见 dsh::types::DshServerStatus)
|
||||
pub const DSH_SERVER_STATE: &str = "dsh-server-state";
|
||||
/// dsh 模块:全局快捷键触发「打开独立窗口」(无负载)。
|
||||
/// 窗口由前端创建(它持有带令牌的地址与 label 判重),Rust 侧只负责注册快捷键。
|
||||
pub const DSH_OPEN_WINDOW: &str = "dsh-open-window";
|
||||
}
|
||||
@@ -0,0 +1,253 @@
|
||||
//! AI 装载:把主设置(AI 服务)里的供应商映射进 dsh 的 `$DSH_HOME/settings.yaml`,
|
||||
//! 并在启动服务时以环境变量注入 API Key。
|
||||
//!
|
||||
//! 安全姿态(对齐 `crate::ai` 与 `crate::secrets`):**密钥不落盘**。
|
||||
//! settings.yaml 里只写 `apiKeyEnv`(环境变量名),明文由
|
||||
//! [`crate::ai::provider_api_key`] 从系统凭据管理器读出后随子进程环境注入。
|
||||
//!
|
||||
//! 合并规则:只替换 `llm-pi-ai.providers` 下本模块管理的 `thing-*` 键与
|
||||
//! `agent-default-model`,用户自己写的其它段落(profile patch / 第三方插件配置)
|
||||
//! 原样保留;写盘前把旧文件备份为 `settings.yaml.bak`。
|
||||
|
||||
use serde_yaml::{Mapping, Value};
|
||||
use tauri::AppHandle;
|
||||
|
||||
use super::types::{DshAiPreview, DshAiProvider};
|
||||
use super::DshManager;
|
||||
|
||||
/// 本模块写入 settings.yaml 的供应商键前缀。
|
||||
const PROVIDER_PREFIX: &str = "thing-";
|
||||
/// `llm-pi-ai` 段名(dsh 的通用 OpenAI 兼容提供方插件)。
|
||||
const LLM_SECTION: &str = "llm-pi-ai";
|
||||
/// 默认模型段名。
|
||||
const DEFAULT_MODEL_SECTION: &str = "agent-default-model";
|
||||
|
||||
impl DshManager {
|
||||
/// dsh 侧供应商键(`thing-<id>`,只保留小写字母数字与短横线)。
|
||||
fn dsh_provider_id(id: &str) -> String {
|
||||
let sanitized: String = id
|
||||
.trim()
|
||||
.to_lowercase()
|
||||
.chars()
|
||||
.map(|c| if c.is_ascii_alphanumeric() { c } else { '-' })
|
||||
.collect();
|
||||
format!("{PROVIDER_PREFIX}{sanitized}")
|
||||
}
|
||||
|
||||
/// 环境变量名(`THING_AI_<ID>_KEY`)。
|
||||
fn env_name(id: &str) -> String {
|
||||
let sanitized: String = id
|
||||
.trim()
|
||||
.to_uppercase()
|
||||
.chars()
|
||||
.map(|c| if c.is_ascii_alphanumeric() { c } else { '_' })
|
||||
.collect();
|
||||
format!("THING_AI_{sanitized}_KEY")
|
||||
}
|
||||
|
||||
/// settings.yaml 路径(`$DSH_HOME/settings.yaml`)。
|
||||
pub fn dsh_settings_path(&self) -> std::path::PathBuf {
|
||||
self.home_dir().join("settings.yaml")
|
||||
}
|
||||
|
||||
/// 当前将被映射的供应商列表(enabled 且 baseUrl 非空)。
|
||||
pub fn ai_providers(&self) -> Vec<DshAiProvider> {
|
||||
let settings = crate::ai::AiManager::load_settings_sync(&self.data_dir);
|
||||
settings
|
||||
.providers
|
||||
.iter()
|
||||
.filter(|p| p.enabled && !p.base_url.trim().is_empty() && !p.model.trim().is_empty())
|
||||
.map(|p| DshAiProvider {
|
||||
id: p.id.clone(),
|
||||
name: p.name.clone(),
|
||||
env_name: Self::env_name(&p.id),
|
||||
base_url: p.base_url.clone(),
|
||||
model: p.model.clone(),
|
||||
has_key: !crate::ai::provider_api_key(&p.id).is_empty(),
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// 构造本模块管理的配置片段(`llm-pi-ai.providers` + `agent-default-model`)。
|
||||
fn build_patch(&self) -> (Mapping, Value, Option<String>, Option<String>) {
|
||||
let settings = crate::ai::AiManager::load_settings_sync(&self.data_dir);
|
||||
let mut providers = Mapping::new();
|
||||
let mut default_pair: Option<(String, String)> = None;
|
||||
let wanted = self.load_settings().provider_id;
|
||||
|
||||
for p in settings.providers.iter() {
|
||||
if !p.enabled || p.base_url.trim().is_empty() || p.model.trim().is_empty() {
|
||||
continue;
|
||||
}
|
||||
let dsh_id = Self::dsh_provider_id(&p.id);
|
||||
let mut entry = Mapping::new();
|
||||
entry.insert(
|
||||
Value::String("displayName".into()),
|
||||
Value::String(if p.name.trim().is_empty() {
|
||||
p.id.clone()
|
||||
} else {
|
||||
p.name.clone()
|
||||
}),
|
||||
);
|
||||
entry.insert(
|
||||
Value::String("api".into()),
|
||||
Value::String("openai-completions".into()),
|
||||
);
|
||||
entry.insert(
|
||||
Value::String("baseURL".into()),
|
||||
Value::String(p.base_url.trim().trim_end_matches('/').to_string()),
|
||||
);
|
||||
entry.insert(
|
||||
Value::String("apiKeyEnv".into()),
|
||||
Value::String(Self::env_name(&p.id)),
|
||||
);
|
||||
// 模型目录:当前模型 + 常见上下文窗口(字段名以 dsh 的 catalog 为准,
|
||||
// 这里只写最稳定的 id/name,避免写错字段导致 dsh 拒绝配置)
|
||||
let mut model = Mapping::new();
|
||||
model.insert(Value::String("id".into()), Value::String(p.model.clone()));
|
||||
model.insert(Value::String("name".into()), Value::String(p.model.clone()));
|
||||
entry.insert(
|
||||
Value::String("models".into()),
|
||||
Value::Sequence(vec![Value::Mapping(model)]),
|
||||
);
|
||||
providers.insert(Value::String(dsh_id.clone()), Value::Mapping(entry));
|
||||
|
||||
let is_wanted = p.id == wanted || (wanted.is_empty() && default_pair.is_none());
|
||||
if is_wanted {
|
||||
default_pair = Some((dsh_id, p.model.clone()));
|
||||
}
|
||||
}
|
||||
|
||||
let default_value = match &default_pair {
|
||||
Some((provider, model)) => {
|
||||
let mut m = Mapping::new();
|
||||
m.insert(Value::String("provider".into()), Value::String(provider.clone()));
|
||||
m.insert(Value::String("model".into()), Value::String(model.clone()));
|
||||
Value::Mapping(m)
|
||||
}
|
||||
None => Value::Null,
|
||||
};
|
||||
let default_provider = default_pair.as_ref().map(|(p, _)| p.clone());
|
||||
let default_model = default_pair.map(|(_, m)| m);
|
||||
(providers, default_value, default_provider, default_model)
|
||||
}
|
||||
|
||||
/// 预览将要写入的 YAML(不含明文密钥)。
|
||||
pub fn ai_preview(&self) -> DshAiPreview {
|
||||
let (providers, default_value, default_provider, default_model) = self.build_patch();
|
||||
let mut root = Mapping::new();
|
||||
if !default_value.is_null() {
|
||||
root.insert(Value::String(DEFAULT_MODEL_SECTION.into()), default_value);
|
||||
}
|
||||
let mut llm = Mapping::new();
|
||||
llm.insert(Value::String("providers".into()), Value::Mapping(providers));
|
||||
root.insert(Value::String(LLM_SECTION.into()), Value::Mapping(llm));
|
||||
|
||||
let yaml = serde_yaml::to_string(&Value::Mapping(root))
|
||||
.unwrap_or_else(|e| format!("# 生成预览失败: {e}"));
|
||||
DshAiPreview {
|
||||
yaml,
|
||||
providers: self.ai_providers(),
|
||||
default_provider,
|
||||
default_model,
|
||||
settings_path: self.dsh_settings_path().to_string_lossy().to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
/// 生成/合并 `$DSH_HOME/settings.yaml`(写盘前备份旧文件)。
|
||||
pub fn ai_sync(&self, _app: &AppHandle) -> Result<(), String> {
|
||||
let (providers, default_value, _, _) = self.build_patch();
|
||||
let path = self.dsh_settings_path();
|
||||
if let Some(parent) = path.parent() {
|
||||
std::fs::create_dir_all(parent).map_err(|e| format!("创建 $DSH_HOME 失败: {e}"))?;
|
||||
}
|
||||
|
||||
// 读现有文档(缺失/非映射时用空映射起步)
|
||||
let existing = std::fs::read_to_string(&path).ok();
|
||||
let mut doc = existing
|
||||
.as_deref()
|
||||
.and_then(|t| serde_yaml::from_str::<Value>(t).ok())
|
||||
.filter(|v| v.is_mapping())
|
||||
.unwrap_or_else(|| Value::Mapping(Mapping::new()));
|
||||
let root = doc.as_mapping_mut().ok_or_else(|| "settings.yaml 结构非法".to_string())?;
|
||||
|
||||
// 备份
|
||||
if existing.is_some() {
|
||||
std::fs::write(path.with_extension("yaml.bak"), existing.as_deref().unwrap_or_default())
|
||||
.map_err(|e| format!("备份 settings.yaml 失败: {e}"))?;
|
||||
}
|
||||
|
||||
// llm-pi-ai.providers:只替换本模块管理的 thing-* 键
|
||||
let llm_key = Value::String(LLM_SECTION.into());
|
||||
let llm_entry = root
|
||||
.entry(llm_key)
|
||||
.or_insert_with(|| Value::Mapping(Mapping::new()));
|
||||
if !llm_entry.is_mapping() {
|
||||
*llm_entry = Value::Mapping(Mapping::new());
|
||||
}
|
||||
let llm_map = llm_entry.as_mapping_mut().expect("已保证为映射");
|
||||
let providers_key = Value::String("providers".into());
|
||||
let providers_entry = llm_map
|
||||
.entry(providers_key)
|
||||
.or_insert_with(|| Value::Mapping(Mapping::new()));
|
||||
if !providers_entry.is_mapping() {
|
||||
*providers_entry = Value::Mapping(Mapping::new());
|
||||
}
|
||||
let providers_map = providers_entry.as_mapping_mut().expect("已保证为映射");
|
||||
// 先清掉上一次由本模块写入的键(用户自建的其它键保留)
|
||||
let stale: Vec<Value> = providers_map
|
||||
.keys()
|
||||
.filter(|k| {
|
||||
k.as_str()
|
||||
.map(|s| s.starts_with(PROVIDER_PREFIX))
|
||||
.unwrap_or(false)
|
||||
})
|
||||
.cloned()
|
||||
.collect();
|
||||
for key in stale {
|
||||
providers_map.remove(&key);
|
||||
}
|
||||
for (key, value) in providers.iter() {
|
||||
providers_map.insert(key.clone(), value.clone());
|
||||
}
|
||||
|
||||
// agent-default-model
|
||||
if default_value.is_null() {
|
||||
root.remove(&Value::String(DEFAULT_MODEL_SECTION.into()));
|
||||
} else {
|
||||
root.insert(Value::String(DEFAULT_MODEL_SECTION.into()), default_value);
|
||||
}
|
||||
|
||||
let text = serde_yaml::to_string(&doc).map_err(|e| format!("序列化 settings.yaml 失败: {e}"))?;
|
||||
std::fs::write(&path, text).map_err(|e| format!("写入 settings.yaml 失败: {e}"))?;
|
||||
crate::logger::log_info(
|
||||
"dsh",
|
||||
&format!("已同步 AI 供应商到 {}", path.display()),
|
||||
);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 启动服务时注入的环境变量(供应商密钥 + DeepSeek 官方变量兜底)。
|
||||
pub fn ai_env_vars(&self) -> Vec<(String, String)> {
|
||||
let settings = crate::ai::AiManager::load_settings_sync(&self.data_dir);
|
||||
let mut vars: Vec<(String, String)> = Vec::new();
|
||||
for p in settings.providers.iter() {
|
||||
if !p.enabled || p.base_url.trim().is_empty() || p.model.trim().is_empty() {
|
||||
continue;
|
||||
}
|
||||
let key = crate::ai::provider_api_key(&p.id);
|
||||
if key.is_empty() {
|
||||
continue;
|
||||
}
|
||||
vars.push((Self::env_name(&p.id), key.clone()));
|
||||
// DeepSeek 官方通道:dsh 内置 provider 直接读 DEEPSEEK_API_KEY
|
||||
let is_deepseek = p.id.eq_ignore_ascii_case("deepseek")
|
||||
|| p.preset.eq_ignore_ascii_case("deepseek")
|
||||
|| p.base_url.contains("api.deepseek.com");
|
||||
if is_deepseek {
|
||||
vars.push(("DEEPSEEK_API_KEY".into(), key));
|
||||
}
|
||||
}
|
||||
vars
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,232 @@
|
||||
//! dsh 模块的 Tauri 命令层。
|
||||
//!
|
||||
//! 前端统一经 `@/lib/bindings` 的 `commands.dsh*` 调用。
|
||||
//! 进度事件 `dsh-install-progress`、状态事件 `dsh-server-state` 见
|
||||
//! `crate::constants::events`(与 `src/lib/constants.ts` 的 `EVENTS` 对应)。
|
||||
|
||||
use tauri::Manager;
|
||||
use tauri::{AppHandle, State};
|
||||
use tauri_plugin_opener::OpenerExt;
|
||||
|
||||
use super::types::{
|
||||
DshAiPreview, DshEnvStatus, DshInstallStatus, DshNpmRegistryInfo, DshServerStatus, DshSettings,
|
||||
DshUpdateInfo, NodeStatus,
|
||||
};
|
||||
use super::DshManager;
|
||||
|
||||
/// 环境总览:Node / dsh / 服务状态 + 模块设置(模块首屏一次拿全)。
|
||||
///
|
||||
/// 声明为 `async`:Tauri 的**同步**命令在主线程执行,而本命令要跑
|
||||
/// `node --version` 子进程探测,放主线程会造成界面卡顿。
|
||||
/// (async 命令带 `State<'_>` 引用参数时必须返回 `Result`,故这里包一层 Ok。)
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_env_status(state: State<'_, DshManager>) -> Result<DshEnvStatus, String> {
|
||||
Ok(DshEnvStatus {
|
||||
node: state.node_status(),
|
||||
dsh: state.install_status(),
|
||||
server: state.server_status(),
|
||||
settings: state.load_settings(),
|
||||
})
|
||||
}
|
||||
|
||||
/// 重新探测 Node(系统 PATH + 托管目录)。同样因执行 `node --version` 而用 async。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_node_detect(state: State<'_, DshManager>) -> Result<NodeStatus, String> {
|
||||
Ok(state.node_status())
|
||||
}
|
||||
|
||||
/// 下载并安装便携 Node(`version` 为空 = 自动取满足要求的最新版)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_node_install(
|
||||
app: AppHandle,
|
||||
state: State<'_, DshManager>,
|
||||
version: Option<String>,
|
||||
) -> Result<NodeStatus, String> {
|
||||
state.node_install(&app, version).await
|
||||
}
|
||||
|
||||
/// 安装 dsh(`version` 为空 = latest)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_install(
|
||||
app: AppHandle,
|
||||
state: State<'_, DshManager>,
|
||||
version: Option<String>,
|
||||
) -> Result<DshInstallStatus, String> {
|
||||
state.install(&app, version).await
|
||||
}
|
||||
|
||||
/// 更新 dsh 到 latest(更新前停止服务,避免文件被占用)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_update(
|
||||
app: AppHandle,
|
||||
state: State<'_, DshManager>,
|
||||
) -> Result<DshInstallStatus, String> {
|
||||
state.stop_server(&app);
|
||||
state.install(&app, None).await
|
||||
}
|
||||
|
||||
/// 卸载 dsh(停止服务并删除包目录;保留设置与 $DSH_HOME)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_uninstall(app: AppHandle, state: State<'_, DshManager>) -> Result<(), String> {
|
||||
state.uninstall(&app)
|
||||
}
|
||||
|
||||
/// 取消进行中的下载 / 安装。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_cancel_install(state: State<'_, DshManager>) {
|
||||
state.request_cancel();
|
||||
}
|
||||
|
||||
/// 查询 npm 上的可用版本。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_check_update(state: State<'_, DshManager>) -> Result<DshUpdateInfo, String> {
|
||||
state.check_update().await
|
||||
}
|
||||
|
||||
/// 读取「本次安装实际使用的 npm 源」及其来源。
|
||||
///
|
||||
/// 设置为空时 npm 会用自己配置链里的源(含系统 Node 的 `~/.npmrc`),
|
||||
/// 这里把解析结果回给前端展示,让用户能看出「到底走的是哪个源」。
|
||||
/// async:内部要跑 `node <npm-cli.js> config get registry` 子进程。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_npm_registry_info(
|
||||
state: State<'_, DshManager>,
|
||||
) -> Result<DshNpmRegistryInfo, String> {
|
||||
Ok(state.npm_registry_info())
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_get_settings(state: State<'_, DshManager>) -> DshSettings {
|
||||
state.load_settings()
|
||||
}
|
||||
|
||||
/// 保存设置(即时生效;端口等改动在下次启动服务时生效)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_save_settings(
|
||||
state: State<'_, DshManager>,
|
||||
settings: DshSettings,
|
||||
) -> Result<DshSettings, String> {
|
||||
state.save_settings(settings)
|
||||
}
|
||||
|
||||
/// 启动 dsh Web 服务。async:内部要 spawn 子进程 + 读凭据 + 写 settings.yaml,
|
||||
/// 同步命令会在主线程执行从而卡住界面。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_start(app: AppHandle, state: State<'_, DshManager>) -> Result<DshServerStatus, String> {
|
||||
state.start_server(&app)
|
||||
}
|
||||
|
||||
/// 停止 dsh Web 服务。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_stop(app: AppHandle, state: State<'_, DshManager>) -> Result<DshServerStatus, String> {
|
||||
state.stop_server(&app);
|
||||
Ok(state.server_status())
|
||||
}
|
||||
|
||||
/// 重启 dsh Web 服务。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_restart(app: AppHandle, state: State<'_, DshManager>) -> Result<DshServerStatus, String> {
|
||||
state.stop_server(&app);
|
||||
// Windows 上端口释放有延迟,稍等再起,避免 bind 预检误判占用
|
||||
// (用异步 sleep:同步命令在主线程执行,阻塞 500ms 会冻界面)
|
||||
tokio::time::sleep(std::time::Duration::from_millis(500)).await;
|
||||
state.start_server(&app)
|
||||
}
|
||||
|
||||
/// 预览将写入 `$DSH_HOME/settings.yaml` 的内容(不含明文密钥)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_ai_preview(state: State<'_, DshManager>) -> DshAiPreview {
|
||||
state.ai_preview()
|
||||
}
|
||||
|
||||
/// 执行 AI 配置同步(合并写入 settings.yaml,写前备份)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_ai_sync(app: AppHandle, state: State<'_, DshManager>) -> Result<DshAiPreview, String> {
|
||||
state.ai_sync(&app)?;
|
||||
Ok(state.ai_preview())
|
||||
}
|
||||
|
||||
/// 读取服务日志尾部。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_log_tail(state: State<'_, DshManager>, lines: u32) -> String {
|
||||
state.log_tail(lines as usize)
|
||||
}
|
||||
|
||||
/// 读取 dsh 安装输出(npm 的 stdout/stderr 尾部)。
|
||||
///
|
||||
/// 只存在内存里(每次安装开始时清空),供「安装引导 → dsh 本体」页临时展示,
|
||||
/// **不写应用日志、不落盘**。前端在安装进行中轮询这个命令。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_install_log(state: State<'_, DshManager>) -> String {
|
||||
state.install_log()
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_log_clear(state: State<'_, DshManager>) {
|
||||
state.clear_log();
|
||||
}
|
||||
|
||||
/// 在资源管理器中打开 dsh 模块目录。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub fn dsh_open_dir(app: AppHandle, state: State<'_, DshManager>) -> Result<(), String> {
|
||||
app.opener()
|
||||
.open_path(state.root().to_string_lossy().to_string(), None::<&str>)
|
||||
.map_err(|e| format!("打开目录失败: {e}"))
|
||||
}
|
||||
|
||||
/// 注册(或切换)「打开 dsh 独立窗口」全局快捷键;传空字符串则注销。
|
||||
///
|
||||
/// 按下时只 emit `dsh-open-window` 事件,**窗口由前端创建**:前端才持有带令牌的
|
||||
/// 启动地址,也能用 label 判重复用已开窗口(与截图模块「快捷键 → 事件 → 前端开窗」同构)。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_register_shortcut(app: AppHandle, shortcut: String) -> Result<(), String> {
|
||||
crate::shortcut::register_shortcut(&app, "dsh", &shortcut, |a| {
|
||||
use tauri::Emitter;
|
||||
let _ = a.emit(crate::constants::events::DSH_OPEN_WINDOW, ());
|
||||
})
|
||||
}
|
||||
|
||||
/// 注销「打开 dsh 独立窗口」全局快捷键。
|
||||
#[tauri::command]
|
||||
#[specta::specta]
|
||||
pub async fn dsh_unregister_shortcut(app: AppHandle) -> Result<(), String> {
|
||||
crate::shortcut::unregister_shortcut(&app, "dsh");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 供 `setup.rs` 在应用启动时按设置自启服务。
|
||||
pub fn autostart_if_enabled(app: &AppHandle) {
|
||||
let manager = app.state::<DshManager>();
|
||||
let settings = manager.load_settings();
|
||||
if !settings.auto_start {
|
||||
return;
|
||||
}
|
||||
if !manager.install_status().installed {
|
||||
crate::logger::log_warn("dsh", "设置了自动启动,但 dsh 尚未安装,跳过");
|
||||
return;
|
||||
}
|
||||
if let Err(e) = manager.start_server(app) {
|
||||
crate::logger::log_warn("dsh", &format!("自动启动 dsh 服务失败: {e}"));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,397 @@
|
||||
//! dsh 本体的安装 / 更新 / 卸载与版本查询。
|
||||
//!
|
||||
//! 安装方式:用当前解析出的 Node 自带的 npm,把 `@deepseek-ai/dsh` 装进模块目录
|
||||
//! (`npm install --prefix {app_data}/dsh`)。好处是版本可锁、可配镜像源、可复用
|
||||
//! 已下载的依赖,且启动时直接 `node <bin 入口>`,不依赖 PATH 上的全局 shim。
|
||||
//!
|
||||
//! npm 调用形态:`node <npm-cli.js> install ...`(不走 npm.cmd,理由见 `node.rs`)。
|
||||
|
||||
use std::io::{BufRead, BufReader};
|
||||
use std::path::PathBuf;
|
||||
use std::sync::atomic::Ordering;
|
||||
use std::sync::Arc;
|
||||
|
||||
use tauri::{AppHandle, Emitter};
|
||||
|
||||
use super::node::NODE_CANCELLED;
|
||||
use super::types::{DshInstallProgress, DshInstallStatus, DshNpmRegistryInfo, DshUpdateInfo, DSH_PACKAGE};
|
||||
use super::DshManager;
|
||||
|
||||
impl DshManager {
|
||||
/// dsh 包目录
|
||||
fn package_dir(&self) -> PathBuf {
|
||||
self.install_root()
|
||||
.join("node_modules")
|
||||
.join("@deepseek-ai")
|
||||
.join("dsh")
|
||||
}
|
||||
|
||||
/// 已安装版本(读 package.json,不起进程)
|
||||
pub fn installed_version(&self) -> Option<String> {
|
||||
let text = std::fs::read_to_string(self.package_dir().join("package.json")).ok()?;
|
||||
let value: serde_json::Value = serde_json::from_str(&text).ok()?;
|
||||
value
|
||||
.get("version")
|
||||
.and_then(|v| v.as_str())
|
||||
.map(|s| s.to_string())
|
||||
}
|
||||
|
||||
/// dsh bin 入口(`package.json` 的 `bin.dsh`),启动服务时直接 `node <入口>`。
|
||||
pub fn bin_entry(&self) -> Option<PathBuf> {
|
||||
let dir = self.package_dir();
|
||||
let text = std::fs::read_to_string(dir.join("package.json")).ok()?;
|
||||
let value: serde_json::Value = serde_json::from_str(&text).ok()?;
|
||||
let rel = match value.get("bin") {
|
||||
Some(serde_json::Value::String(s)) => s.clone(),
|
||||
Some(serde_json::Value::Object(map)) => map.get("dsh")?.as_str()?.to_string(),
|
||||
_ => return None,
|
||||
};
|
||||
let entry = dir.join(rel);
|
||||
entry.exists().then_some(entry)
|
||||
}
|
||||
|
||||
/// 安装状态
|
||||
pub fn install_status(&self) -> DshInstallStatus {
|
||||
let version = self.installed_version();
|
||||
let entry = self.bin_entry();
|
||||
DshInstallStatus {
|
||||
installed: version.is_some() && entry.is_some(),
|
||||
version,
|
||||
entry: entry.map(|p| p.to_string_lossy().to_string()),
|
||||
dir: self.install_root().to_string_lossy().to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
/// 模块设置里**显式**填写的 npm 源(空 = 未指定,交给 npm 自己解析)。
|
||||
///
|
||||
/// 与 [`Self::npm_registry_info`] 的区别:这里只认模块设置。安装时只在
|
||||
/// 显式填写的情况下才传 `--registry`,其余情况让 npm 走自己的配置链
|
||||
/// (环境变量 > 安装目录 `.npmrc` > 用户 `~/.npmrc` > 内置),
|
||||
/// 这样「系统 node 以前配过的镜像」会被自动沿用。
|
||||
fn registry_setting(&self) -> String {
|
||||
self.load_settings()
|
||||
.npm_registry
|
||||
.trim()
|
||||
.trim_end_matches('/')
|
||||
.to_string()
|
||||
}
|
||||
|
||||
/// npm 自身解析出的源(`node <npm-cli.js> config get registry`)。
|
||||
///
|
||||
/// 未检测到 Node/npm、或 npm 执行失败时为 None。cwd 取安装目录——
|
||||
/// npm 的「项目级配置」来自 cwd 下的 `.npmrc`,要与真实安装保持一致。
|
||||
pub fn npm_config_registry(&self) -> Option<String> {
|
||||
let env = self.resolve_node_env()?;
|
||||
let npm = env.npm?;
|
||||
let mut cmd = std::process::Command::new(&env.node_exe);
|
||||
cmd.arg(&npm).args(["config", "get", "registry"]);
|
||||
// 安装目录可能还没创建(首次安装):退回模块目录,保证能起来
|
||||
let install_root = self.install_root();
|
||||
cmd.current_dir(if install_root.exists() {
|
||||
install_root
|
||||
} else {
|
||||
self.root.clone()
|
||||
});
|
||||
cmd.stdout(std::process::Stdio::piped())
|
||||
.stderr(std::process::Stdio::null())
|
||||
.stdin(std::process::Stdio::null());
|
||||
crate::process_manager::setup_creation_flags(&mut cmd);
|
||||
let out = cmd.output().ok()?;
|
||||
if !out.status.success() {
|
||||
return None;
|
||||
}
|
||||
let text = String::from_utf8_lossy(&out.stdout);
|
||||
text.lines()
|
||||
.map(|l| l.trim())
|
||||
.find(|l| !l.is_empty())
|
||||
.map(|l| l.trim_end_matches('/').to_string())
|
||||
}
|
||||
|
||||
/// 本次安装/查询实际使用的源 + 来源(供 UI 展示与快捷切换)。
|
||||
pub fn npm_registry_info(&self) -> DshNpmRegistryInfo {
|
||||
let setting = self.registry_setting();
|
||||
let npm_registry = self.npm_config_registry();
|
||||
let (effective, source) = if !setting.is_empty() {
|
||||
(setting.clone(), "setting")
|
||||
} else if let Some(npm) = npm_registry.as_ref() {
|
||||
(npm.clone(), "npm")
|
||||
} else {
|
||||
("https://registry.npmjs.org".to_string(), "fallback")
|
||||
};
|
||||
DshNpmRegistryInfo {
|
||||
effective,
|
||||
source: source.to_string(),
|
||||
npm_registry,
|
||||
setting,
|
||||
}
|
||||
}
|
||||
|
||||
/// 版本查询(reqwest)用的源:与安装保持一致(设置 → npm 配置 → 官方源)。
|
||||
///
|
||||
/// 之前这里在设置为空时硬编码官方源,导致「安装走国内镜像、检查更新却直连
|
||||
/// npmjs.org」的不一致。
|
||||
fn registry_for_query(&self) -> String {
|
||||
self.npm_registry_info().effective
|
||||
}
|
||||
|
||||
/// 查询 npm 上的可用版本(`dist-tags.latest` + 版本列表)。
|
||||
pub async fn check_update(&self) -> Result<DshUpdateInfo, String> {
|
||||
let url = format!("{}/{DSH_PACKAGE}", self.registry_for_query());
|
||||
let resp = self
|
||||
.http_client(30)
|
||||
.get(&url)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("查询 npm 版本失败: {e}"))?;
|
||||
if !resp.status().is_success() {
|
||||
return Err(format!("查询 npm 版本失败: HTTP {}", resp.status().as_u16()));
|
||||
}
|
||||
let value: serde_json::Value = resp
|
||||
.json()
|
||||
.await
|
||||
.map_err(|e| format!("解析 npm 响应失败: {e}"))?;
|
||||
|
||||
let latest = value
|
||||
.get("dist-tags")
|
||||
.and_then(|t| t.get("latest"))
|
||||
.and_then(|v| v.as_str())
|
||||
.ok_or_else(|| "npm 响应缺少 dist-tags.latest".to_string())?
|
||||
.to_string();
|
||||
|
||||
let mut versions: Vec<String> = value
|
||||
.get("versions")
|
||||
.and_then(|v| v.as_object())
|
||||
.map(|m| m.keys().cloned().collect())
|
||||
.unwrap_or_default();
|
||||
// 取尾部若干(近似按发布顺序),再反转成最新在前
|
||||
if versions.len() > 20 {
|
||||
versions = versions.split_off(versions.len() - 20);
|
||||
}
|
||||
versions.reverse();
|
||||
|
||||
let current = self.installed_version();
|
||||
Ok(DshUpdateInfo {
|
||||
has_update: current.as_deref() != Some(latest.as_str()),
|
||||
current,
|
||||
latest,
|
||||
versions,
|
||||
})
|
||||
}
|
||||
|
||||
/// 安装 / 更新 dsh(`version` 为空 = 装 latest)。
|
||||
pub async fn install(&self, app: &AppHandle, version: Option<String>) -> Result<DshInstallStatus, String> {
|
||||
self.cancel.store(false, Ordering::SeqCst);
|
||||
// 每次安装开始清空上一次的输出缓冲
|
||||
self.clear_install_log();
|
||||
let result = self.install_inner(app, version).await;
|
||||
self.cancel.store(false, Ordering::SeqCst);
|
||||
if let Err(ref e) = result {
|
||||
if e != NODE_CANCELLED {
|
||||
self.push_install_log(&format!("[错误] {e}"));
|
||||
self.emit_progress(app, "error", 0, 0, None, e);
|
||||
}
|
||||
}
|
||||
result
|
||||
}
|
||||
|
||||
async fn install_inner(&self, app: &AppHandle, version: Option<String>) -> Result<DshInstallStatus, String> {
|
||||
let env = self
|
||||
.resolve_node_env()
|
||||
.ok_or_else(|| "未找到可用的 Node,请先完成第 1 步".to_string())?;
|
||||
if !super::satisfies_node_requirement(&env.version) {
|
||||
return Err(format!(
|
||||
"当前 Node {} 不满足 dsh 要求({}),请先安装合规的 Node",
|
||||
env.version,
|
||||
super::NODE_REQUIRED
|
||||
));
|
||||
}
|
||||
let npm = env
|
||||
.npm
|
||||
.clone()
|
||||
.ok_or_else(|| "未找到 npm(Node 分发中缺少 npm-cli.js)".to_string())?;
|
||||
|
||||
let spec = version
|
||||
.as_deref()
|
||||
.map(|v| v.trim())
|
||||
.filter(|v| !v.is_empty())
|
||||
.map(|v| format!("{DSH_PACKAGE}@{v}"))
|
||||
.unwrap_or_else(|| DSH_PACKAGE.to_string());
|
||||
|
||||
let install_dir = self.install_root();
|
||||
// npm 的 prefix 目录不存在时由 npm 自己创建;这里先建一次,避免
|
||||
// 自定义到新盘符目录时 npm 因父级缺失报 ENOENT
|
||||
std::fs::create_dir_all(&install_dir)
|
||||
.map_err(|e| format!("创建安装目录失败({}): {e}", install_dir.display()))?;
|
||||
let mut args: Vec<String> = vec![
|
||||
npm.to_string_lossy().to_string(),
|
||||
"install".into(),
|
||||
"--prefix".into(),
|
||||
install_dir.to_string_lossy().to_string(),
|
||||
spec.clone(),
|
||||
"--no-fund".into(),
|
||||
"--no-audit".into(),
|
||||
"--loglevel".into(),
|
||||
"info".into(),
|
||||
];
|
||||
let registry = self.registry_setting();
|
||||
if !registry.is_empty() {
|
||||
// 只在显式指定时才覆盖 npm 自己的配置链
|
||||
args.push("--registry".into());
|
||||
args.push(registry);
|
||||
}
|
||||
|
||||
self.emit_progress(
|
||||
app,
|
||||
"installing",
|
||||
0,
|
||||
0,
|
||||
None,
|
||||
&format!("正在安装 {spec}(依赖较多,请稍候)..."),
|
||||
);
|
||||
|
||||
// npm 不输出百分比:percent 恒为 0(前端按不确定进度展示),
|
||||
// message 跟随 npm 自身的汇总行(`added N packages` 等)更新。
|
||||
//
|
||||
// 逐行输出**只进内存缓冲**(安装引导页临时展示),不写应用日志:
|
||||
// npm 的 72 个依赖会刷出上千行,进应用日志只会淹没真正的运行日志。
|
||||
let progress_app = app.clone();
|
||||
let install_ring = self.install_ring_handle();
|
||||
let on_line = Arc::new(move |line: &str| {
|
||||
super::push_bounded(&install_ring, super::INSTALL_RING_CAPACITY, line);
|
||||
let trimmed = line.trim();
|
||||
if trimmed.starts_with("added ")
|
||||
|| trimmed.starts_with("changed ")
|
||||
|| trimmed.starts_with("removed ")
|
||||
|| trimmed.starts_with("up to date")
|
||||
{
|
||||
let _ = progress_app.emit(
|
||||
crate::constants::events::DSH_INSTALL_PROGRESS,
|
||||
DshInstallProgress {
|
||||
stage: "installing".into(),
|
||||
percent: 0,
|
||||
downloaded_bytes: 0,
|
||||
total_bytes: None,
|
||||
message: trimmed.to_string(),
|
||||
},
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
let node_exe = env.node_exe.clone();
|
||||
let pid_ref = self.install_pid.clone();
|
||||
let result = tauri::async_runtime::spawn_blocking(move || {
|
||||
run_npm(node_exe, args, install_dir, pid_ref, on_line)
|
||||
})
|
||||
.await
|
||||
.map_err(|e| format!("安装任务执行失败: {e}"))?;
|
||||
self.install_pid.store(0, Ordering::SeqCst);
|
||||
|
||||
if self.cancel.load(Ordering::SeqCst) {
|
||||
return Err(NODE_CANCELLED.into());
|
||||
}
|
||||
result?;
|
||||
|
||||
let status = self.install_status();
|
||||
if !status.installed {
|
||||
return Err("npm 安装结束,但未找到 dsh 入口(请查看日志)".into());
|
||||
}
|
||||
self.emit_progress(
|
||||
app,
|
||||
"done",
|
||||
100,
|
||||
0,
|
||||
None,
|
||||
&format!(
|
||||
"dsh {} 安装完成",
|
||||
status.version.as_deref().unwrap_or("unknown")
|
||||
),
|
||||
);
|
||||
crate::logger::log_info(
|
||||
"dsh",
|
||||
&format!(
|
||||
"dsh 安装完成: {}",
|
||||
status.version.as_deref().unwrap_or("unknown")
|
||||
),
|
||||
);
|
||||
Ok(status)
|
||||
}
|
||||
|
||||
/// 卸载 dsh:停止服务并删除包目录(保留设置与 $DSH_HOME)。
|
||||
pub fn uninstall(&self, app: &AppHandle) -> Result<(), String> {
|
||||
self.stop_server(app);
|
||||
let dir = self.package_dir();
|
||||
if dir.exists() {
|
||||
std::fs::remove_dir_all(&dir).map_err(|e| format!("删除 dsh 目录失败: {e}"))?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
/// 同步执行 npm(阻塞线程内),逐行读输出交给 `on_line`;pid 记录供取消时 taskkill。
|
||||
fn run_npm(
|
||||
node_exe: PathBuf,
|
||||
args: Vec<String>,
|
||||
cwd: PathBuf,
|
||||
pid_ref: Arc<std::sync::atomic::AtomicU64>,
|
||||
on_line: Arc<dyn Fn(&str) + Send + Sync>,
|
||||
) -> Result<(), String> {
|
||||
let mut cmd = std::process::Command::new(&node_exe);
|
||||
cmd.args(&args);
|
||||
cmd.current_dir(&cwd);
|
||||
cmd.stdout(std::process::Stdio::piped())
|
||||
.stderr(std::process::Stdio::piped())
|
||||
.stdin(std::process::Stdio::null());
|
||||
crate::process_manager::setup_creation_flags(&mut cmd);
|
||||
|
||||
let mut child = cmd
|
||||
.spawn()
|
||||
.map_err(|e| format!("启动 npm 失败({}): {e}", node_exe.display()))?;
|
||||
let pid = child.id();
|
||||
pid_ref.store(pid as u64, Ordering::SeqCst);
|
||||
|
||||
let stdout = child.stdout.take();
|
||||
let stderr = child.stderr.take();
|
||||
|
||||
// 末 40 行留作失败时的错误摘要
|
||||
let tail = Arc::new(std::sync::Mutex::new(Vec::<String>::new()));
|
||||
let mut handles = Vec::new();
|
||||
let pipes: [Option<Box<dyn std::io::Read + Send>>; 2] = [
|
||||
stdout.map(|p| Box::new(p) as Box<dyn std::io::Read + Send>),
|
||||
stderr.map(|p| Box::new(p) as Box<dyn std::io::Read + Send>),
|
||||
];
|
||||
for pipe in pipes.into_iter().flatten() {
|
||||
let on_line = on_line.clone();
|
||||
let tail = tail.clone();
|
||||
handles.push(std::thread::spawn(move || {
|
||||
let reader = BufReader::new(pipe);
|
||||
for line in reader.lines().map_while(Result::ok) {
|
||||
on_line(&line);
|
||||
if let Ok(mut t) = tail.lock() {
|
||||
if t.len() >= 40 {
|
||||
t.remove(0);
|
||||
}
|
||||
t.push(line);
|
||||
}
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
let status = child.wait();
|
||||
for h in handles {
|
||||
let _ = h.join();
|
||||
}
|
||||
pid_ref.store(0, Ordering::SeqCst);
|
||||
|
||||
let status = status.map_err(|e| format!("等待 npm 结束失败: {e}"))?;
|
||||
if status.success() {
|
||||
return Ok(());
|
||||
}
|
||||
let text = tail.lock().map(|t| t.join("\n")).unwrap_or_default();
|
||||
let chars: Vec<char> = text.chars().collect();
|
||||
let skip = chars.len().saturating_sub(800);
|
||||
Err(format!(
|
||||
"npm 退出码 {}: {}",
|
||||
status.code().unwrap_or(-1),
|
||||
chars[skip..].iter().collect::<String>()
|
||||
))
|
||||
}
|
||||
@@ -0,0 +1,484 @@
|
||||
//! dsh 模块(DeepSeek Harness 外壳)。
|
||||
//!
|
||||
//! 模块定位:为 DeepSeek Harness(npm 包 `@deepseek-ai/dsh`)做安装、更新与
|
||||
//! 生命周期管理,并把主设置里的 AI 供应商(含 DeepSeek API Key)装载给 dsh。
|
||||
//! 模块页不内嵌浏览器,dsh 的 Web UI 通过独立窗口 / 系统浏览器打开。
|
||||
//!
|
||||
//! 目录布局(`{app_data_dir}/dsh`):
|
||||
//! ```text
|
||||
//! settings.json 模块自身设置(版本号 + 自愈)
|
||||
//! node/ 便携 Node(仅系统 Node 不可用时)
|
||||
//! node_modules/ @deepseek-ai/dsh 本地安装(npm --prefix)
|
||||
//! home/ $DSH_HOME(settings.yaml / profiles / 会话)
|
||||
//! workspace/ 默认工作区(dsh 进程的启动目录)
|
||||
//! logs/web.log dsh 服务输出
|
||||
//! ```
|
||||
//!
|
||||
//! 安全姿态:模块设置不含任何密钥;API Key 只在 spawn 子进程时以环境变量注入
|
||||
//! (明文来自系统凭据管理器,见 [`crate::secrets`]),不写 dsh 的
|
||||
//! `.credentials.yaml`、不落日志、不过前端。
|
||||
|
||||
mod ai_sync;
|
||||
mod commands;
|
||||
mod install;
|
||||
mod node;
|
||||
mod server;
|
||||
mod types;
|
||||
|
||||
pub use commands::{
|
||||
dsh_ai_preview, dsh_ai_sync, dsh_cancel_install, dsh_check_update, dsh_env_status,
|
||||
dsh_get_settings, dsh_install, dsh_install_log, dsh_log_clear, dsh_log_tail,
|
||||
dsh_node_detect, dsh_node_install, dsh_npm_registry_info, dsh_open_dir,
|
||||
dsh_register_shortcut, dsh_restart, dsh_save_settings, dsh_start, dsh_stop,
|
||||
dsh_uninstall, dsh_unregister_shortcut, dsh_update,
|
||||
};
|
||||
pub use commands::autostart_if_enabled;
|
||||
// 仅重导出模块自身与子模块会经 `super::` 用到的类型(其余由各子模块直接从 types 取)
|
||||
pub use types::{DshInstallProgress, DshSettings, NODE_REQUIRED};
|
||||
|
||||
use std::collections::VecDeque;
|
||||
use std::path::PathBuf;
|
||||
use std::process::Child;
|
||||
use std::sync::atomic::{AtomicBool, AtomicU64};
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use tauri::AppHandle;
|
||||
|
||||
/// 设置内存缓存有效期(与其他模块的 500ms 一致)。
|
||||
const SETTINGS_CACHE_TTL: Duration = Duration::from_millis(500);
|
||||
/// 日志环形缓冲保留的最大行数(供「日志」页签快速读取)。
|
||||
const LOG_RING_CAPACITY: usize = 500;
|
||||
/// 安装输出缓冲保留的最大行数(npm 输出较啰嗦,只留最近一段)。
|
||||
const INSTALL_RING_CAPACITY: usize = 200;
|
||||
|
||||
/// 服务进程条目(自管 stdio,不走 ProcessManager)。
|
||||
pub(crate) struct ServerEntry {
|
||||
pub child: Child,
|
||||
pub pid: u32,
|
||||
pub port: u16,
|
||||
/// 启动时间(unix 秒)
|
||||
pub started_at: i64,
|
||||
}
|
||||
|
||||
struct SettingsCacheEntry {
|
||||
read_at: Instant,
|
||||
settings: DshSettings,
|
||||
}
|
||||
|
||||
/// 解析出的 Node 运行环境。
|
||||
pub(crate) struct NodeEnv {
|
||||
/// system | managed
|
||||
pub source: &'static str,
|
||||
pub node_exe: PathBuf,
|
||||
/// npm 入口(`node_modules/npm/bin/npm-cli.js`,用 `node <此路径>` 调用)
|
||||
pub npm: Option<PathBuf>,
|
||||
pub version: String,
|
||||
}
|
||||
|
||||
/// dsh 模块管理器(Tauri State)。
|
||||
pub struct DshManager {
|
||||
/// 应用数据目录(`{app_data_dir}`)
|
||||
data_dir: PathBuf,
|
||||
/// 模块根目录(`{app_data_dir}/dsh`)
|
||||
root: PathBuf,
|
||||
settings_cache: Mutex<Option<SettingsCacheEntry>>,
|
||||
/// 安装/下载取消标志
|
||||
cancel: Arc<AtomicBool>,
|
||||
/// 安装子进程 pid(取消时 taskkill /T)
|
||||
install_pid: Arc<AtomicU64>,
|
||||
/// 服务进程
|
||||
server: Mutex<Option<ServerEntry>>,
|
||||
/// 启动串行化锁(防并发双开)
|
||||
start_lock: Mutex<()>,
|
||||
/// HTTP 就绪标志
|
||||
ready: Arc<AtomicBool>,
|
||||
/// 本次进程的「带 token 启动地址」(从 dsh stdout 抓取)。
|
||||
/// dsh web 的浏览器鉴权靠它首次访问换取 cookie,没它就只会拿到 401。
|
||||
launch_url: Arc<Mutex<Option<String>>>,
|
||||
/// 最近一次启动错误(端口占用 / 进程立即退出)
|
||||
server_error: Mutex<Option<String>>,
|
||||
/// 日志环形缓冲
|
||||
log_ring: Arc<Mutex<VecDeque<String>>>,
|
||||
/// 安装(npm)输出缓冲:只在模块页临时展示,**不落应用日志、不落盘**
|
||||
install_ring: Arc<Mutex<VecDeque<String>>>,
|
||||
}
|
||||
|
||||
impl DshManager {
|
||||
pub fn new(app_data_dir: PathBuf) -> Self {
|
||||
let root = app_data_dir.join("dsh");
|
||||
for d in ["node", "logs", "home", "workspace"] {
|
||||
std::fs::create_dir_all(root.join(d)).ok();
|
||||
}
|
||||
Self {
|
||||
data_dir: app_data_dir,
|
||||
root,
|
||||
settings_cache: Mutex::new(None),
|
||||
cancel: Arc::new(AtomicBool::new(false)),
|
||||
install_pid: Arc::new(AtomicU64::new(0)),
|
||||
server: Mutex::new(None),
|
||||
start_lock: Mutex::new(()),
|
||||
ready: Arc::new(AtomicBool::new(false)),
|
||||
launch_url: Arc::new(Mutex::new(None)),
|
||||
server_error: Mutex::new(None),
|
||||
log_ring: Arc::new(Mutex::new(VecDeque::with_capacity(LOG_RING_CAPACITY))),
|
||||
install_ring: Arc::new(Mutex::new(VecDeque::with_capacity(INSTALL_RING_CAPACITY))),
|
||||
}
|
||||
}
|
||||
|
||||
/// 模块根目录(「在文件夹中打开」用)
|
||||
pub fn root(&self) -> &PathBuf {
|
||||
&self.root
|
||||
}
|
||||
|
||||
/// 便携 Node 目录
|
||||
pub fn node_dir(&self) -> PathBuf {
|
||||
self.root.join("node")
|
||||
}
|
||||
|
||||
/// dsh 本体的安装根目录(npm `--prefix` 目标)。
|
||||
///
|
||||
/// 设置留空 = 模块目录。自定义时**只有 dsh 本体与它的 node_modules 跟随**,
|
||||
/// 便携 Node / `$DSH_HOME` / 日志 / 模块设置仍留在应用数据目录——自定义路径
|
||||
/// 若被移动或卸载,至少配置与日志还读得到,排障不会失联。
|
||||
pub fn install_root(&self) -> PathBuf {
|
||||
let raw = self.load_settings().install_dir;
|
||||
let raw = raw.trim();
|
||||
if raw.is_empty() {
|
||||
self.root.clone()
|
||||
} else {
|
||||
PathBuf::from(raw)
|
||||
}
|
||||
}
|
||||
|
||||
/// `$DSH_HOME`
|
||||
pub fn home_dir(&self) -> PathBuf {
|
||||
let settings = self.load_settings();
|
||||
if settings.dsh_home_mode == "user" {
|
||||
dirs::home_dir()
|
||||
.map(|h| h.join(".dsh"))
|
||||
.unwrap_or_else(|| self.root.join("home"))
|
||||
} else {
|
||||
self.root.join("home")
|
||||
}
|
||||
}
|
||||
|
||||
/// dsh 进程的启动目录(工作区)
|
||||
pub fn workspace_dir(&self) -> PathBuf {
|
||||
let settings = self.load_settings();
|
||||
let raw = settings.workspace.trim();
|
||||
let dir = if raw.is_empty() {
|
||||
self.root.join("workspace")
|
||||
} else {
|
||||
PathBuf::from(raw)
|
||||
};
|
||||
std::fs::create_dir_all(&dir).ok();
|
||||
dir
|
||||
}
|
||||
|
||||
pub fn log_path(&self) -> PathBuf {
|
||||
self.root.join("logs").join("web.log")
|
||||
}
|
||||
|
||||
pub fn settings_path(&self) -> PathBuf {
|
||||
self.root.join("settings.json")
|
||||
}
|
||||
|
||||
// ---------- 设置 ----------
|
||||
|
||||
pub fn load_settings(&self) -> DshSettings {
|
||||
if let Ok(cache) = self.settings_cache.lock() {
|
||||
if let Some(entry) = cache.as_ref() {
|
||||
if entry.read_at.elapsed() < SETTINGS_CACHE_TTL {
|
||||
return entry.settings.clone();
|
||||
}
|
||||
}
|
||||
}
|
||||
let mut settings = std::fs::read_to_string(self.settings_path())
|
||||
.ok()
|
||||
.and_then(|t| serde_json::from_str::<DshSettings>(&t).ok())
|
||||
.unwrap_or_default();
|
||||
let changed = settings.heal();
|
||||
if changed {
|
||||
self.write_settings(&settings).ok();
|
||||
}
|
||||
if let Ok(mut cache) = self.settings_cache.lock() {
|
||||
*cache = Some(SettingsCacheEntry {
|
||||
read_at: Instant::now(),
|
||||
settings: settings.clone(),
|
||||
});
|
||||
}
|
||||
settings
|
||||
}
|
||||
|
||||
pub fn save_settings(&self, mut settings: DshSettings) -> Result<DshSettings, String> {
|
||||
// 自定义安装目录必须是绝对路径:npm 的 --prefix 用相对路径会落到
|
||||
// 进程当前目录(开发期即仓库根目录),这种"看起来生效其实装错地方"最难排查
|
||||
let custom = settings.install_dir.trim();
|
||||
if !custom.is_empty() && !std::path::Path::new(custom).is_absolute() {
|
||||
return Err("dsh 安装目录必须是绝对路径(如 D:/Thing/dsh)".to_string());
|
||||
}
|
||||
settings.heal();
|
||||
self.write_settings(&settings)?;
|
||||
if let Ok(mut cache) = self.settings_cache.lock() {
|
||||
*cache = Some(SettingsCacheEntry {
|
||||
read_at: Instant::now(),
|
||||
settings: settings.clone(),
|
||||
});
|
||||
}
|
||||
Ok(settings)
|
||||
}
|
||||
|
||||
fn write_settings(&self, settings: &DshSettings) -> Result<(), String> {
|
||||
let json = serde_json::to_string_pretty(settings)
|
||||
.map_err(|e| format!("序列化 dsh 设置失败: {e}"))?;
|
||||
std::fs::write(self.settings_path(), json).map_err(|e| format!("写入 dsh 设置失败: {e}"))
|
||||
}
|
||||
|
||||
// ---------- 日志 ----------
|
||||
|
||||
/// 追加一行到环形缓冲 + 落盘(服务输出走这里)。
|
||||
pub(crate) fn push_log(&self, line: &str) {
|
||||
push_log_shared(&self.log_ring, &self.log_path(), line);
|
||||
}
|
||||
|
||||
/// 读取日志:优先环形缓冲;为空时回落到文件尾部。
|
||||
pub fn log_tail(&self, lines: usize) -> String {
|
||||
let lines = lines.clamp(1, LOG_RING_CAPACITY);
|
||||
if let Ok(ring) = self.log_ring.lock() {
|
||||
if !ring.is_empty() {
|
||||
let skip = ring.len().saturating_sub(lines);
|
||||
return ring
|
||||
.iter()
|
||||
.skip(skip)
|
||||
.cloned()
|
||||
.collect::<Vec<_>>()
|
||||
.join("\n");
|
||||
}
|
||||
}
|
||||
let text = std::fs::read_to_string(self.log_path()).unwrap_or_default();
|
||||
let all: Vec<&str> = text.lines().collect();
|
||||
let skip = all.len().saturating_sub(lines);
|
||||
all[skip..].join("\n")
|
||||
}
|
||||
|
||||
pub fn clear_log(&self) {
|
||||
if let Ok(mut ring) = self.log_ring.lock() {
|
||||
ring.clear();
|
||||
}
|
||||
std::fs::write(self.log_path(), b"").ok();
|
||||
}
|
||||
|
||||
// ---------- 安装输出(仅内存,供安装引导页临时展示) ----------
|
||||
|
||||
/// 追加一行安装输出(已过滤疑似密钥)。
|
||||
pub(crate) fn push_install_log(&self, line: &str) {
|
||||
push_bounded(&self.install_ring, INSTALL_RING_CAPACITY, line);
|
||||
}
|
||||
|
||||
/// 读取当前安装输出(每次安装开始时清空)。
|
||||
pub fn install_log(&self) -> String {
|
||||
self.install_ring
|
||||
.lock()
|
||||
.map(|r| r.iter().cloned().collect::<Vec<_>>().join("\n"))
|
||||
.unwrap_or_default()
|
||||
}
|
||||
|
||||
pub(crate) fn clear_install_log(&self) {
|
||||
if let Ok(mut ring) = self.install_ring.lock() {
|
||||
ring.clear();
|
||||
}
|
||||
}
|
||||
|
||||
/// 安装输出缓冲句柄(阻塞线程内的 on_line 闭包持有;'static 需要)。
|
||||
pub(crate) fn install_ring_handle(
|
||||
&self,
|
||||
) -> Arc<Mutex<VecDeque<String>>> {
|
||||
self.install_ring.clone()
|
||||
}
|
||||
|
||||
// ---------- 代理 ----------
|
||||
|
||||
/// 按设置解析代理地址(mihomo mixed 端口)。返回 None 表示直连。
|
||||
///
|
||||
/// 只读代理模块设置文件里的 mixedPort,并用一次 300ms TCP 探测确认内核在线;
|
||||
/// 内核没起来时静默直连(与 download_engine / translate 的降级姿态一致)。
|
||||
pub(crate) fn proxy_url(&self) -> Option<String> {
|
||||
if !self.load_settings().use_proxy {
|
||||
return None;
|
||||
}
|
||||
let text = std::fs::read_to_string(self.data_dir.join("proxy").join("settings.json")).ok()?;
|
||||
let value: serde_json::Value = serde_json::from_str(&text).ok()?;
|
||||
let port = value.get("mixedPort").and_then(|v| v.as_u64())?;
|
||||
if port == 0 || port > u16::MAX as u64 {
|
||||
return None;
|
||||
}
|
||||
let port = port as u16;
|
||||
let addr = std::net::SocketAddr::from(([127, 0, 0, 1], port));
|
||||
if std::net::TcpStream::connect_timeout(&addr, Duration::from_millis(300)).is_err() {
|
||||
return None;
|
||||
}
|
||||
Some(format!("http://127.0.0.1:{port}"))
|
||||
}
|
||||
|
||||
// ---------- 事件 ----------
|
||||
|
||||
/// 推送安装/下载进度(stage: download | extracting | installing | done | error)。
|
||||
pub(crate) fn emit_progress(
|
||||
&self,
|
||||
app: &AppHandle,
|
||||
stage: &str,
|
||||
percent: u8,
|
||||
downloaded_bytes: u64,
|
||||
total_bytes: Option<u64>,
|
||||
message: &str,
|
||||
) {
|
||||
use tauri::Emitter;
|
||||
let _ = app.emit(
|
||||
crate::constants::events::DSH_INSTALL_PROGRESS,
|
||||
DshInstallProgress {
|
||||
stage: stage.into(),
|
||||
percent,
|
||||
downloaded_bytes,
|
||||
total_bytes,
|
||||
message: message.into(),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
/// 推送服务状态(启动/停止/就绪变化时)。
|
||||
pub(crate) fn emit_server_state(&self, app: &AppHandle) {
|
||||
use tauri::Emitter;
|
||||
let status = self.server_status();
|
||||
let _ = app.emit(crate::constants::events::DSH_SERVER_STATE, status);
|
||||
}
|
||||
|
||||
/// 构造 reqwest 客户端:按代理设置决定是否走 mihomo。
|
||||
pub(crate) fn http_client(&self, timeout_secs: u64) -> reqwest::Client {
|
||||
let mut builder = reqwest::Client::builder()
|
||||
.user_agent("thing-app")
|
||||
.timeout(Duration::from_secs(timeout_secs));
|
||||
if let Some(proxy) = self.proxy_url() {
|
||||
if let Ok(p) = reqwest::Proxy::all(&proxy) {
|
||||
builder = builder.proxy(p);
|
||||
}
|
||||
}
|
||||
builder.build().unwrap_or_else(|_| reqwest::Client::new())
|
||||
}
|
||||
}
|
||||
|
||||
/// 过滤日志行里的疑似密钥(`sk-` 形态)与 URL 里的会话令牌。
|
||||
pub(crate) fn sanitize_log_line(line: &str) -> String {
|
||||
let line = mask_token_in_url(line);
|
||||
let mut out = String::with_capacity(line.len());
|
||||
for token in line.split_inclusive(char::is_whitespace) {
|
||||
let trimmed = token.trim_end();
|
||||
if trimmed.starts_with("sk-") && trimmed.len() > 12 {
|
||||
out.push_str("sk-***");
|
||||
out.push_str(&token[trimmed.len()..]);
|
||||
} else {
|
||||
out.push_str(token);
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
/// 掩码 URL 里的 `token=` 取值(`?token=xxx` → `?token=***`)。
|
||||
///
|
||||
/// dsh web 的浏览器会话令牌等同于「对该 loopback 服务(能执行代码)的完全访问权」,
|
||||
/// 不该落进应用日志与 logs/web.log;真正的带令牌地址经 IPC 单独给前端使用。
|
||||
fn mask_token_in_url(line: &str) -> String {
|
||||
const NEEDLE: &str = "token=";
|
||||
let mut out = String::with_capacity(line.len());
|
||||
let mut cursor = 0usize;
|
||||
while let Some(rel) = line[cursor..].find(NEEDLE) {
|
||||
let start = cursor + rel + NEEDLE.len();
|
||||
out.push_str(&line[cursor..start]);
|
||||
let after = &line[start..];
|
||||
let end = after
|
||||
.find(|c: char| c.is_whitespace() || matches!(c, ')' | ',' | '"' | '\'' | '&'))
|
||||
.unwrap_or(after.len());
|
||||
out.push_str("***");
|
||||
cursor = start + end;
|
||||
}
|
||||
out.push_str(&line[cursor..]);
|
||||
out
|
||||
}
|
||||
|
||||
/// 从 dsh 输出行里解析「带 token 的启动地址」。
|
||||
///
|
||||
/// `dsh web` 就绪后会打印(见 dsh-web-app 的 announceReady):
|
||||
/// `dsh web: http://127.0.0.1:3080/?token=<随机令牌> (LAN: http://<lan>:3080/?token=<...>)`
|
||||
///
|
||||
/// 浏览器鉴权靠这个地址首次访问换取签名 cookie(dsh-client-connection 的 BrowserAuth);
|
||||
/// 令牌是**每次进程随机生成**的,无法推导,只能从输出里取。
|
||||
/// 取第一个(loopback)地址,忽略随后的 LAN 地址。
|
||||
pub(crate) fn parse_launch_url(line: &str) -> Option<String> {
|
||||
let start = line.find("http://").or_else(|| line.find("https://"))?;
|
||||
let rest = &line[start..];
|
||||
let end = rest.find(char::is_whitespace).unwrap_or(rest.len());
|
||||
let url = rest[..end].trim_end_matches(|c: char| c == ')' || c == ',');
|
||||
url.contains("token=").then(|| url.to_string())
|
||||
}
|
||||
|
||||
/// 共享的日志写入(服务 stdout/stderr reader 线程与探测线程用)。
|
||||
///
|
||||
/// reader 线程拿不到 `&DshManager`(需要 'static),因此把环形缓冲与日志路径
|
||||
/// 单独传进来。
|
||||
pub(crate) fn push_log_shared(
|
||||
ring: &Arc<Mutex<VecDeque<String>>>,
|
||||
log_path: &PathBuf,
|
||||
line: &str,
|
||||
) {
|
||||
let line = push_bounded(ring, LOG_RING_CAPACITY, line);
|
||||
if let Ok(mut f) = std::fs::OpenOptions::new()
|
||||
.create(true)
|
||||
.append(true)
|
||||
.open(log_path)
|
||||
{
|
||||
use std::io::Write;
|
||||
let _ = writeln!(f, "{line}");
|
||||
}
|
||||
}
|
||||
|
||||
/// 有界环形缓冲追加(**不落盘**),返回写入后的文本。
|
||||
///
|
||||
/// 安装输出走这里:只要内存,不写应用日志、不写文件——用户明确要求安装日志
|
||||
/// 仅在安装引导页临时展示(npm 输出啰嗦,进应用日志只会淹没真正的运行日志)。
|
||||
pub(crate) fn push_bounded(
|
||||
ring: &Arc<Mutex<VecDeque<String>>>,
|
||||
capacity: usize,
|
||||
line: &str,
|
||||
) -> String {
|
||||
let line = sanitize_log_line(line);
|
||||
if let Ok(mut r) = ring.lock() {
|
||||
if r.len() >= capacity {
|
||||
r.pop_front();
|
||||
}
|
||||
r.push_back(line.clone());
|
||||
}
|
||||
line
|
||||
}
|
||||
|
||||
/// 解析 "v24.9.0" / "24.9.0" → (24, 9, 0)
|
||||
pub(crate) fn parse_version(raw: &str) -> Option<(u32, u32, u32)> {
|
||||
let cleaned = raw.trim().trim_start_matches('v');
|
||||
let core = cleaned.split('-').next().unwrap_or(cleaned);
|
||||
let mut it = core.split('.');
|
||||
let major = it.next()?.parse::<u32>().ok()?;
|
||||
let minor = it.next().unwrap_or("0").parse::<u32>().ok()?;
|
||||
let patch = it.next().unwrap_or("0").parse::<u32>().ok()?;
|
||||
Some((major, minor, patch))
|
||||
}
|
||||
|
||||
/// 是否满足 dsh 的要求:`^22.19.0 || >=24.0.0`
|
||||
pub(crate) fn satisfies_node_requirement(raw: &str) -> bool {
|
||||
let Some((major, minor, patch)) = parse_version(raw) else {
|
||||
return false;
|
||||
};
|
||||
match major {
|
||||
22 => (minor, patch) >= (19, 0),
|
||||
24.. => true,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,399 @@
|
||||
//! Node 运行环境:探测系统 Node / 下载并解压便携 Node。
|
||||
//!
|
||||
//! dsh 要求 Node `^22.19.0 || >=24.0.0`。策略(用户已确认):
|
||||
//! 优先复用 PATH 上的系统 Node,版本不满足或缺失时才下载官方便携版到
|
||||
//! `{app_data}/dsh/node`(官方 zip 内含 npm/npx,因此托管 Node 自带 npm)。
|
||||
|
||||
use std::fs;
|
||||
use std::io::{Read, Write};
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::sync::atomic::Ordering;
|
||||
|
||||
use futures_util::StreamExt;
|
||||
use tauri::AppHandle;
|
||||
|
||||
use super::types::{NodeStatus, NODE_REQUIRED};
|
||||
use super::{satisfies_node_requirement, DshManager, NodeEnv};
|
||||
|
||||
/// 用户取消时返回的错误信息(前端静默处理,不弹错误 toast)。
|
||||
pub(crate) const NODE_CANCELLED: &str = "已取消";
|
||||
|
||||
impl DshManager {
|
||||
/// 系统 PATH 上的 node.exe
|
||||
pub fn system_node(&self) -> Option<PathBuf> {
|
||||
which_node()
|
||||
}
|
||||
|
||||
/// 托管便携 Node 的 node.exe
|
||||
pub fn managed_node(&self) -> Option<PathBuf> {
|
||||
let exe = self.node_dir().join(if cfg!(windows) { "node.exe" } else { "bin/node" });
|
||||
exe.exists().then_some(exe)
|
||||
}
|
||||
|
||||
/// 解析实际使用的 Node 环境(按 nodeSource 设置)。
|
||||
pub fn resolve_node_env(&self) -> Option<NodeEnv> {
|
||||
let settings = self.load_settings();
|
||||
let system = self.system_node();
|
||||
let managed = self.managed_node();
|
||||
|
||||
let system_ok = system
|
||||
.as_ref()
|
||||
.and_then(|p| node_version(p))
|
||||
.map(|v| satisfies_node_requirement(&v))
|
||||
.unwrap_or(false);
|
||||
|
||||
// 选定 (是否托管, 可执行文件)
|
||||
let chosen: Option<(bool, PathBuf)> = match settings.node_source.as_str() {
|
||||
"system" => system.map(|p| (false, p)),
|
||||
"managed" => managed.map(|p| (true, p)),
|
||||
// auto:系统满足即复用,否则回落托管;两者都没有时退回系统 Node 仅用于展示版本
|
||||
_ => {
|
||||
if system_ok {
|
||||
system.map(|p| (false, p))
|
||||
} else {
|
||||
managed
|
||||
.map(|p| (true, p))
|
||||
.or_else(|| system.map(|p| (false, p)))
|
||||
}
|
||||
}
|
||||
};
|
||||
let (is_managed, exe) = chosen?;
|
||||
|
||||
let version = node_version(&exe).unwrap_or_default();
|
||||
let npm = npm_cli_js(&exe);
|
||||
Some(NodeEnv {
|
||||
source: if is_managed { "managed" } else { "system" },
|
||||
node_exe: exe,
|
||||
npm,
|
||||
version,
|
||||
})
|
||||
}
|
||||
|
||||
/// 当前 Node 状态(供 UI 首屏展示)。
|
||||
pub fn node_status(&self) -> NodeStatus {
|
||||
match self.resolve_node_env() {
|
||||
Some(env) => {
|
||||
let satisfies = satisfies_node_requirement(&env.version);
|
||||
NodeStatus {
|
||||
source: if env.source == "managed" { "managed".into() } else { "system".into() },
|
||||
path: Some(env.node_exe.to_string_lossy().to_string()),
|
||||
version: Some(env.version),
|
||||
satisfies,
|
||||
required: NODE_REQUIRED.into(),
|
||||
}
|
||||
}
|
||||
None => NodeStatus {
|
||||
source: "none".into(),
|
||||
path: None,
|
||||
version: None,
|
||||
satisfies: false,
|
||||
required: NODE_REQUIRED.into(),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
/// 下载并安装便携 Node(进度经 `dsh-install-progress` 推送)。
|
||||
///
|
||||
/// `version` 为空时自动解析满足要求的最新版本(优先 LTS)。
|
||||
pub async fn node_install(&self, app: &AppHandle, version: Option<String>) -> Result<NodeStatus, String> {
|
||||
if !cfg!(windows) {
|
||||
return Err("便携 Node 安装仅支持 Windows,请改用系统 Node(nodeSource = system)".into());
|
||||
}
|
||||
self.cancel.store(false, Ordering::SeqCst);
|
||||
let result = self.node_install_inner(app, version).await;
|
||||
self.cancel.store(false, Ordering::SeqCst);
|
||||
if let Err(ref e) = result {
|
||||
if e != NODE_CANCELLED {
|
||||
self.emit_progress(app, "error", 0, 0, None, e);
|
||||
}
|
||||
}
|
||||
result
|
||||
}
|
||||
|
||||
async fn node_install_inner(&self, app: &AppHandle, version: Option<String>) -> Result<NodeStatus, String> {
|
||||
let base = self.node_mirror_base();
|
||||
let version = match version.filter(|v| !v.trim().is_empty()) {
|
||||
Some(v) => normalize_version(&v),
|
||||
None => {
|
||||
self.emit_progress(app, "download", 0, 0, None, "正在解析 Node 版本...");
|
||||
let requested = self.load_settings().managed_node_version;
|
||||
if requested.trim().is_empty() {
|
||||
self.resolve_latest_node_version(&base).await?
|
||||
} else {
|
||||
normalize_version(&requested)
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
let arch = platform_arch();
|
||||
let url = format!("{base}/{version}/node-{version}-{arch}.zip");
|
||||
let zip_path = self.node_dir().join("node-download.zip");
|
||||
self.emit_progress(
|
||||
app,
|
||||
"download",
|
||||
1,
|
||||
0,
|
||||
None,
|
||||
&format!("正在下载 Node {version}..."),
|
||||
);
|
||||
self.download_to_file(app, &url, &zip_path, "正在下载 Node").await?;
|
||||
|
||||
if self.cancel.load(Ordering::SeqCst) {
|
||||
let _ = fs::remove_file(&zip_path);
|
||||
return Err(NODE_CANCELLED.into());
|
||||
}
|
||||
|
||||
// 解压:官方 zip 顶层是 node-vX-win-x64/,剥掉这一层直接落到 node/
|
||||
self.emit_progress(app, "extracting", 92, 0, None, "正在解压...");
|
||||
let dest = self.node_dir();
|
||||
if dest.exists() {
|
||||
fs::remove_dir_all(&dest).map_err(|e| format!("清理旧 Node 目录失败: {e}"))?;
|
||||
}
|
||||
fs::create_dir_all(&dest).map_err(|e| format!("创建 Node 目录失败: {e}"))?;
|
||||
if let Err(e) = extract_zip_strip_top(&zip_path, &dest) {
|
||||
let _ = fs::remove_file(&zip_path);
|
||||
return Err(format!("解压 Node 失败: {e}"));
|
||||
}
|
||||
let _ = fs::remove_file(&zip_path);
|
||||
|
||||
let exe = dest.join("node.exe");
|
||||
if !exe.exists() {
|
||||
return Err("解压后未找到 node.exe".into());
|
||||
}
|
||||
let actual = node_version(&exe).unwrap_or(version.clone());
|
||||
self.emit_progress(app, "done", 100, 0, None, &format!("Node {actual} 安装完成"));
|
||||
crate::logger::log_info("dsh", &format!("便携 Node 安装完成: {actual} ({})", exe.display()));
|
||||
Ok(self.node_status())
|
||||
}
|
||||
|
||||
/// 托管 Node 的镜像基址(`{base}/{version}/node-{version}-win-x64.zip`)。
|
||||
fn node_mirror_base(&self) -> String {
|
||||
let mirror = self.load_settings().node_mirror;
|
||||
let mirror = mirror.trim().trim_end_matches('/');
|
||||
if mirror.is_empty() {
|
||||
"https://nodejs.org/dist".to_string()
|
||||
} else {
|
||||
mirror.to_string()
|
||||
}
|
||||
}
|
||||
|
||||
/// 解析满足要求的最新 Node 版本(优先 LTS)。
|
||||
async fn resolve_latest_node_version(&self, base: &str) -> Result<String, String> {
|
||||
let url = format!("{base}/index.json");
|
||||
let resp = self
|
||||
.http_client(30)
|
||||
.get(&url)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("获取 Node 版本列表失败: {e}"))?;
|
||||
if !resp.status().is_success() {
|
||||
return Err(format!("获取 Node 版本列表失败: HTTP {}", resp.status().as_u16()));
|
||||
}
|
||||
let list: Vec<serde_json::Value> = resp
|
||||
.json()
|
||||
.await
|
||||
.map_err(|e| format!("解析 Node 版本列表失败: {e}"))?;
|
||||
|
||||
let mut latest_lts: Option<(u32, u32, u32, String)> = None;
|
||||
let mut latest_any: Option<(u32, u32, u32, String)> = None;
|
||||
for item in list {
|
||||
let Some(version) = item.get("version").and_then(|v| v.as_str()) else {
|
||||
continue;
|
||||
};
|
||||
if !satisfies_node_requirement(version) {
|
||||
continue;
|
||||
}
|
||||
let Some(parsed) = super::parse_version(version) else {
|
||||
continue;
|
||||
};
|
||||
let is_lts = item.get("lts").map(|l| !l.is_null() && l != false).unwrap_or(false);
|
||||
if latest_any.as_ref().map(|(maj, min, pat, _)| (parsed.0, parsed.1, parsed.2) > (*maj, *min, *pat)).unwrap_or(true) {
|
||||
latest_any = Some((parsed.0, parsed.1, parsed.2, version.to_string()));
|
||||
}
|
||||
if is_lts
|
||||
&& latest_lts
|
||||
.as_ref()
|
||||
.map(|(maj, min, pat, _)| (parsed.0, parsed.1, parsed.2) > (*maj, *min, *pat))
|
||||
.unwrap_or(true)
|
||||
{
|
||||
latest_lts = Some((parsed.0, parsed.1, parsed.2, version.to_string()));
|
||||
}
|
||||
}
|
||||
latest_lts
|
||||
.or(latest_any)
|
||||
.map(|(_, _, _, v)| v)
|
||||
.ok_or_else(|| "未找到满足 dsh 要求的 Node 版本".to_string())
|
||||
}
|
||||
|
||||
/// 流式下载到文件(带取消 + 进度事件,percent 0-90)。
|
||||
pub(crate) async fn download_to_file(
|
||||
&self,
|
||||
app: &AppHandle,
|
||||
url: &str,
|
||||
dest: &Path,
|
||||
label: &str,
|
||||
) -> Result<(), String> {
|
||||
let resp = self
|
||||
.http_client(1800)
|
||||
.get(url)
|
||||
.send()
|
||||
.await
|
||||
.map_err(|e| format!("请求下载失败({url}): {e}"))?;
|
||||
let status = resp.status();
|
||||
if !status.is_success() {
|
||||
return Err(format!("下载返回 HTTP {}", status.as_u16()));
|
||||
}
|
||||
let total = resp.content_length();
|
||||
let mut file = fs::File::create(dest).map_err(|e| format!("创建文件失败: {e}"))?;
|
||||
let mut stream = resp.bytes_stream();
|
||||
let mut downloaded: u64 = 0;
|
||||
let mut last_percent: u8 = 0;
|
||||
while let Some(chunk) = stream.next().await {
|
||||
if self.cancel.load(Ordering::SeqCst) {
|
||||
drop(file);
|
||||
fs::remove_file(dest).ok();
|
||||
return Err(NODE_CANCELLED.into());
|
||||
}
|
||||
let chunk = chunk.map_err(|e| format!("下载中断: {e}"))?;
|
||||
file.write_all(&chunk).map_err(|e| format!("写入文件失败: {e}"))?;
|
||||
downloaded += chunk.len() as u64;
|
||||
let percent = total
|
||||
.filter(|t| *t > 0)
|
||||
.map(|t| ((downloaded as f64 / t as f64) * 90.0) as u8)
|
||||
.unwrap_or(0)
|
||||
.min(90);
|
||||
if percent >= last_percent + 1 {
|
||||
last_percent = percent;
|
||||
self.emit_progress(
|
||||
app,
|
||||
"download",
|
||||
percent,
|
||||
downloaded,
|
||||
total,
|
||||
&format!("{label} {:.1} MB", downloaded as f64 / 1048576.0),
|
||||
);
|
||||
}
|
||||
}
|
||||
file.flush().ok();
|
||||
self.emit_progress(app, "download", 90, downloaded, total, "下载完成");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 请求取消(下载 / 安装 / 解压均轮询此标志)。
|
||||
pub(crate) fn request_cancel(&self) {
|
||||
self.cancel.store(true, Ordering::SeqCst);
|
||||
let pid = self.install_pid.load(Ordering::SeqCst);
|
||||
if pid > 0 {
|
||||
taskkill_tree(pid);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 官方分发包的平台标识(Windows x64 / arm64)。
|
||||
fn platform_arch() -> &'static str {
|
||||
match std::env::consts::ARCH {
|
||||
"aarch64" => "win-arm64",
|
||||
_ => "win-x64",
|
||||
}
|
||||
}
|
||||
|
||||
/// PATH 上查找 node 可执行文件。
|
||||
fn which_node() -> Option<PathBuf> {
|
||||
let name = if cfg!(windows) { "node.exe" } else { "node" };
|
||||
let path_var = std::env::var_os("PATH")?;
|
||||
for dir in std::env::split_paths(&path_var) {
|
||||
let candidate = dir.join(name);
|
||||
if candidate.is_file() {
|
||||
return Some(candidate);
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
/// 取 node 目录下的 npm 入口(`node_modules/npm/bin/npm-cli.js`)。
|
||||
///
|
||||
/// 直接 `node npm-cli.js` 而不是 `npm.cmd`:`.cmd` 在 Windows 上无法被
|
||||
/// CreateProcess 直接执行(需经 `cmd /C`,而 cmd 的引号规则易踩坑),
|
||||
/// 且批处理 shim 会多出一层进程影响取消时的进程树清理。
|
||||
fn npm_cli_js(node_exe: &Path) -> Option<PathBuf> {
|
||||
let dir = node_exe.parent()?;
|
||||
let candidates = [
|
||||
dir.join("node_modules").join("npm").join("bin").join("npm-cli.js"),
|
||||
dir.join("lib").join("node_modules").join("npm").join("bin").join("npm-cli.js"),
|
||||
];
|
||||
candidates.into_iter().find(|p| p.is_file())
|
||||
}
|
||||
|
||||
/// 执行 `node --version` 取版本号。
|
||||
fn node_version(node_exe: &Path) -> Option<String> {
|
||||
let mut cmd = std::process::Command::new(node_exe);
|
||||
cmd.arg("--version");
|
||||
cmd.stdout(std::process::Stdio::piped())
|
||||
.stderr(std::process::Stdio::null())
|
||||
.stdin(std::process::Stdio::null());
|
||||
crate::process_manager::setup_creation_flags(&mut cmd);
|
||||
let out = cmd.output().ok()?;
|
||||
if !out.status.success() {
|
||||
return None;
|
||||
}
|
||||
let text = String::from_utf8_lossy(&out.stdout).trim().to_string();
|
||||
(!text.is_empty()).then_some(text)
|
||||
}
|
||||
|
||||
/// 规范化版本号:补上 `v` 前缀。
|
||||
fn normalize_version(raw: &str) -> String {
|
||||
let t = raw.trim();
|
||||
if t.starts_with('v') {
|
||||
t.to_string()
|
||||
} else {
|
||||
format!("v{t}")
|
||||
}
|
||||
}
|
||||
|
||||
/// 解压 zip 并剥掉顶层目录(Node 官方分发包顶层是 `node-vX-win-x64/`)。
|
||||
pub(crate) fn extract_zip_strip_top(zip_path: &Path, dest: &Path) -> Result<(), String> {
|
||||
let file = fs::File::open(zip_path).map_err(|e| format!("打开 zip 失败: {e}"))?;
|
||||
let mut archive = zip::ZipArchive::new(file).map_err(|e| format!("读取 zip 失败: {e}"))?;
|
||||
for i in 0..archive.len() {
|
||||
let mut entry = archive.by_index(i).map_err(|e| format!("读取条目失败: {e}"))?;
|
||||
let Some(name) = entry.enclosed_name() else {
|
||||
continue;
|
||||
};
|
||||
// 剥掉第一层目录;顶层目录条目本身(只有一个组件)跳过
|
||||
let mut comps = name.components();
|
||||
comps.next();
|
||||
let rel: PathBuf = comps.map(|c| c.as_os_str()).collect();
|
||||
if rel.as_os_str().is_empty() {
|
||||
continue;
|
||||
}
|
||||
let outpath = dest.join(&rel);
|
||||
if entry.is_dir() {
|
||||
fs::create_dir_all(&outpath).map_err(|e| e.to_string())?;
|
||||
} else {
|
||||
if let Some(parent) = outpath.parent() {
|
||||
fs::create_dir_all(parent).map_err(|e| e.to_string())?;
|
||||
}
|
||||
let mut outfile = fs::File::create(&outpath).map_err(|e| e.to_string())?;
|
||||
let mut buf = [0u8; 8192];
|
||||
loop {
|
||||
let n = entry.read(&mut buf).map_err(|e| e.to_string())?;
|
||||
if n == 0 {
|
||||
break;
|
||||
}
|
||||
outfile.write_all(&buf[..n]).map_err(|e| e.to_string())?;
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// 强杀进程树(安装子进程取消用)。
|
||||
pub(crate) fn taskkill_tree(pid: u64) {
|
||||
let mut cmd = std::process::Command::new("taskkill");
|
||||
cmd.args(["/F", "/T", "/PID", &pid.to_string()])
|
||||
.stdout(std::process::Stdio::null())
|
||||
.stderr(std::process::Stdio::null())
|
||||
.stdin(std::process::Stdio::null());
|
||||
crate::process_manager::setup_creation_flags(&mut cmd);
|
||||
let _ = cmd.status();
|
||||
}
|
||||
@@ -0,0 +1,316 @@
|
||||
//! dsh 服务进程生命周期:spawn(自管 stdio)→ 就绪探测 → 日志落盘 → 停止。
|
||||
//!
|
||||
//! 进程形态参照 `music/bridge.rs` 的长驻子进程:stdout/stderr 各起一个 reader 线程,
|
||||
//! 逐行写入日志环形缓冲与 `logs/web.log`;子进程加入 Job Object,应用退出时由
|
||||
//! 系统自动回收。启动命令为 `node <dsh bin 入口> web --port <端口> --no-open`:
|
||||
//! `--no-open` 让 dsh 不要自己弹出系统浏览器(由本模块的按钮决定何时打开)。
|
||||
|
||||
use std::io::{BufRead, BufReader, Read, Write};
|
||||
use std::net::{SocketAddr, TcpListener, TcpStream};
|
||||
use std::process::{Command, Stdio};
|
||||
use std::sync::atomic::Ordering;
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use tauri::AppHandle;
|
||||
|
||||
use super::types::DshServerStatus;
|
||||
use super::{DshManager, ServerEntry};
|
||||
|
||||
/// 就绪探测总时长上限。
|
||||
const READY_TIMEOUT: Duration = Duration::from_secs(60);
|
||||
|
||||
impl DshManager {
|
||||
/// 进程是否存活。
|
||||
fn server_running(&self) -> bool {
|
||||
let mut guard = match self.server.lock() {
|
||||
Ok(g) => g,
|
||||
Err(_) => return false,
|
||||
};
|
||||
match guard.as_mut() {
|
||||
Some(entry) => entry
|
||||
.child
|
||||
.try_wait()
|
||||
.ok()
|
||||
.map(|w| w.is_none())
|
||||
.unwrap_or(false),
|
||||
None => false,
|
||||
}
|
||||
}
|
||||
|
||||
/// 当前服务状态。
|
||||
pub fn server_status(&self) -> DshServerStatus {
|
||||
let running = self.server_running();
|
||||
// 运行中一律用**进程实际使用的端口**(设置可能在启动后被改过,
|
||||
// 此时 UI 展示的地址必须仍是真正监听的那个)
|
||||
let entry = self
|
||||
.server
|
||||
.lock()
|
||||
.ok()
|
||||
.and_then(|g| g.as_ref().map(|e| (e.pid, e.port, e.started_at)));
|
||||
let (pid, port, started_at) = match (running, entry) {
|
||||
(true, Some((pid, port, started_at))) => (Some(pid), port, Some(started_at)),
|
||||
_ => (None, self.load_settings().port, None),
|
||||
};
|
||||
DshServerStatus {
|
||||
running,
|
||||
ready: running && self.ready.load(Ordering::SeqCst),
|
||||
pid,
|
||||
port,
|
||||
url: format!("http://127.0.0.1:{port}"),
|
||||
launch_url: if running {
|
||||
self.launch_url.lock().ok().and_then(|g| g.clone())
|
||||
} else {
|
||||
None
|
||||
},
|
||||
started_at,
|
||||
error: self.server_error.lock().ok().and_then(|g| g.clone()),
|
||||
}
|
||||
}
|
||||
|
||||
/// 启动 dsh Web 服务(幂等:已在运行直接返回当前状态)。
|
||||
pub fn start_server(&self, app: &AppHandle) -> Result<DshServerStatus, String> {
|
||||
if self.server_running() {
|
||||
return Ok(self.server_status());
|
||||
}
|
||||
let _guard = self.start_lock.lock().map_err(|e| e.to_string())?;
|
||||
if self.server_running() {
|
||||
return Ok(self.server_status());
|
||||
}
|
||||
// 清理可能残留的旧条目
|
||||
if let Ok(mut g) = self.server.lock() {
|
||||
g.take();
|
||||
}
|
||||
self.ready.store(false, Ordering::SeqCst);
|
||||
if let Ok(mut g) = self.server_error.lock() {
|
||||
*g = None;
|
||||
}
|
||||
// 上一进程的令牌必须清掉:沿用旧令牌会让新进程的首次访问仍然 401
|
||||
if let Ok(mut g) = self.launch_url.lock() {
|
||||
*g = None;
|
||||
}
|
||||
|
||||
let settings = self.load_settings();
|
||||
let port = settings.port;
|
||||
let env = self
|
||||
.resolve_node_env()
|
||||
.ok_or_else(|| "未找到可用的 Node,请先完成环境安装".to_string())?;
|
||||
if !super::satisfies_node_requirement(&env.version) {
|
||||
return Err(format!(
|
||||
"当前 Node {} 不满足 dsh 要求({})",
|
||||
env.version,
|
||||
super::NODE_REQUIRED
|
||||
));
|
||||
}
|
||||
let entry = self
|
||||
.bin_entry()
|
||||
.ok_or_else(|| "未安装 dsh,请先完成安装".to_string())?;
|
||||
|
||||
// 端口预检:dsh 自身在端口占用时的报错不够直观,这里提前给出可读错误
|
||||
if let Err(e) = TcpListener::bind(SocketAddr::from(([127, 0, 0, 1], port))) {
|
||||
let msg = format!("端口 {port} 不可用({e}),请在配置中更换端口");
|
||||
self.set_server_error(&msg);
|
||||
return Err(msg);
|
||||
}
|
||||
|
||||
// 同步 AI 供应商配置(写 settings.yaml + 收集环境变量)
|
||||
if settings.ai_sync {
|
||||
if let Err(e) = self.ai_sync(app) {
|
||||
// 同步失败不阻塞启动,只记日志(用户可在 dsh 内手动配置)
|
||||
crate::logger::log_warn("dsh", &format!("AI 配置同步失败(继续启动): {e}"));
|
||||
}
|
||||
}
|
||||
let env_vars = self.ai_env_vars();
|
||||
|
||||
let mut cmd = Command::new(&env.node_exe);
|
||||
cmd.arg(&entry)
|
||||
.arg("web")
|
||||
.arg("--port")
|
||||
.arg(port.to_string())
|
||||
.arg("--no-open");
|
||||
cmd.current_dir(self.workspace_dir());
|
||||
cmd.env("DSH_HOME", self.home_dir());
|
||||
for (key, value) in env_vars {
|
||||
cmd.env(key, value);
|
||||
}
|
||||
cmd.stdout(Stdio::piped())
|
||||
.stderr(Stdio::piped())
|
||||
.stdin(Stdio::null());
|
||||
crate::process_manager::setup_creation_flags(&mut cmd);
|
||||
|
||||
let mut child = cmd.spawn().map_err(|e| {
|
||||
let msg = format!("启动 dsh 失败({}): {e}", env.node_exe.display());
|
||||
self.set_server_error(&msg);
|
||||
msg
|
||||
})?;
|
||||
let pid = child.id();
|
||||
crate::process_manager::assign_to_job(&child);
|
||||
|
||||
let stdout = child.stdout.take();
|
||||
let stderr = child.stderr.take();
|
||||
if let Ok(mut g) = self.server.lock() {
|
||||
*g = Some(ServerEntry {
|
||||
child,
|
||||
pid,
|
||||
port,
|
||||
started_at: chrono::Utc::now().timestamp(),
|
||||
});
|
||||
}
|
||||
|
||||
// 输出 → 日志。stdout 额外承担「抓取带令牌启动地址」的职责:
|
||||
// dsh 就绪后打印 `dsh web: http://127.0.0.1:<port>/?token=<令牌>`,
|
||||
// 浏览器鉴权靠这个地址换 cookie(我们传了 --no-open,没别人替它换)。
|
||||
let ring = self.log_ring_handle();
|
||||
let log_path = self.log_path();
|
||||
if let Some(out) = stdout {
|
||||
spawn_stdout_reader(out, ring.clone(), log_path.clone(), self.launch_url.clone(), app.clone());
|
||||
}
|
||||
if let Some(err) = stderr {
|
||||
spawn_log_reader(err, ring, log_path);
|
||||
}
|
||||
|
||||
crate::logger::log_info(
|
||||
"dsh",
|
||||
&format!("dsh 服务已启动 (pid: {pid}, 端口: {port})"),
|
||||
);
|
||||
self.emit_server_state(app);
|
||||
|
||||
// 就绪探测(后台线程,不阻塞启动返回)
|
||||
self.spawn_ready_probe(app.clone(), port);
|
||||
Ok(self.server_status())
|
||||
}
|
||||
|
||||
/// 停止 dsh 服务(kill 快速返回,wait 移到后台线程)。
|
||||
pub fn stop_server(&self, app: &AppHandle) {
|
||||
let entry = self.server.lock().ok().and_then(|mut g| g.take());
|
||||
self.ready.store(false, Ordering::SeqCst);
|
||||
if let Ok(mut g) = self.launch_url.lock() {
|
||||
*g = None;
|
||||
}
|
||||
if let Some(mut entry) = entry {
|
||||
// 先杀进程树(dsh 可能派生子进程),再关本进程句柄
|
||||
super::node::taskkill_tree(entry.pid as u64);
|
||||
let _ = entry.child.kill();
|
||||
std::thread::spawn(move || {
|
||||
let _ = entry.child.wait();
|
||||
});
|
||||
crate::logger::log_info("dsh", &format!("dsh 服务已停止 (pid: {})", entry.pid));
|
||||
}
|
||||
self.emit_server_state(app);
|
||||
}
|
||||
|
||||
fn set_server_error(&self, message: &str) {
|
||||
if let Ok(mut g) = self.server_error.lock() {
|
||||
*g = Some(message.to_string());
|
||||
}
|
||||
}
|
||||
|
||||
/// 就绪探测:轮询 HTTP,成功置 ready;进程提前退出则记录错误原因。
|
||||
fn spawn_ready_probe(&self, app: AppHandle, port: u16) {
|
||||
std::thread::spawn(move || {
|
||||
use tauri::Manager;
|
||||
let deadline = Instant::now() + READY_TIMEOUT;
|
||||
loop {
|
||||
{
|
||||
let manager = app.state::<DshManager>();
|
||||
if http_probe(port) {
|
||||
manager.ready.store(true, Ordering::SeqCst);
|
||||
manager.emit_server_state(&app);
|
||||
return;
|
||||
}
|
||||
if !manager.server_running() {
|
||||
// 进程已退出:不必等到超时
|
||||
let line = "dsh 服务进程已退出,未能就绪(详见日志)".to_string();
|
||||
manager.push_log(&line);
|
||||
manager.set_server_error(&line);
|
||||
crate::logger::log_warn("dsh", &line);
|
||||
manager.emit_server_state(&app);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if Instant::now() >= deadline {
|
||||
break;
|
||||
}
|
||||
std::thread::sleep(Duration::from_millis(500));
|
||||
}
|
||||
let manager = app.state::<DshManager>();
|
||||
manager.emit_server_state(&app);
|
||||
});
|
||||
}
|
||||
|
||||
/// 日志环形缓冲句柄(reader/探测线程持有)。
|
||||
pub(crate) fn log_ring_handle(&self) -> std::sync::Arc<std::sync::Mutex<std::collections::VecDeque<String>>> {
|
||||
self.log_ring.clone()
|
||||
}
|
||||
}
|
||||
|
||||
/// 起一个 reader 线程把子进程输出逐行写进日志(stdout 与 stderr 类型不同,故泛型化)。
|
||||
fn spawn_log_reader<R: Read + Send + 'static>(
|
||||
pipe: R,
|
||||
ring: std::sync::Arc<std::sync::Mutex<std::collections::VecDeque<String>>>,
|
||||
log_path: std::path::PathBuf,
|
||||
) {
|
||||
std::thread::spawn(move || {
|
||||
let reader = BufReader::new(pipe);
|
||||
for line in reader.lines().map_while(Result::ok) {
|
||||
super::push_log_shared(&ring, &log_path, &line);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/// stdout reader:写日志之外,还从 `dsh web: ...?token=<令牌>` 行里抓取启动地址。
|
||||
///
|
||||
/// 抓到后置入 `launch_url` 并推送状态事件,前端据此启用「独立窗口 / 浏览器打开」。
|
||||
/// 注意锁的粒度:先算好是否需要通知再释放锁——`emit_server_state` 会读
|
||||
/// `launch_url`,持锁调用会自锁。
|
||||
fn spawn_stdout_reader<R: Read + Send + 'static>(
|
||||
pipe: R,
|
||||
ring: std::sync::Arc<std::sync::Mutex<std::collections::VecDeque<String>>>,
|
||||
log_path: std::path::PathBuf,
|
||||
launch_url: std::sync::Arc<std::sync::Mutex<Option<String>>>,
|
||||
app: tauri::AppHandle,
|
||||
) {
|
||||
std::thread::spawn(move || {
|
||||
let reader = BufReader::new(pipe);
|
||||
for line in reader.lines().map_while(Result::ok) {
|
||||
// 先解析原文(落日志时 token 会被掩码)
|
||||
let parsed = super::parse_launch_url(&line);
|
||||
if let Some(url) = parsed {
|
||||
let changed = match launch_url.lock() {
|
||||
Ok(mut slot) => {
|
||||
let changed = slot.as_deref() != Some(url.as_str());
|
||||
if changed {
|
||||
*slot = Some(url);
|
||||
}
|
||||
changed
|
||||
}
|
||||
Err(_) => false,
|
||||
};
|
||||
if changed {
|
||||
use tauri::Manager;
|
||||
if let Some(manager) = app.try_state::<DshManager>() {
|
||||
manager.emit_server_state(&app);
|
||||
}
|
||||
}
|
||||
}
|
||||
super::push_log_shared(&ring, &log_path, &line);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/// 极简 HTTP 探测:TCP 连上并收到以 `HTTP/` 开头的响应即视为就绪。
|
||||
fn http_probe(port: u16) -> bool {
|
||||
let addr = SocketAddr::from(([127, 0, 0, 1], port));
|
||||
let Ok(mut stream) = TcpStream::connect_timeout(&addr, Duration::from_millis(500)) else {
|
||||
return false;
|
||||
};
|
||||
let _ = stream.set_read_timeout(Some(Duration::from_millis(800)));
|
||||
let req = format!("GET / HTTP/1.1\r\nHost: 127.0.0.1:{port}\r\nConnection: close\r\n\r\n");
|
||||
if stream.write_all(req.as_bytes()).is_err() {
|
||||
return false;
|
||||
}
|
||||
let mut buf = [0u8; 16];
|
||||
match stream.read(&mut buf) {
|
||||
Ok(n) if n >= 5 => &buf[..5] == b"HTTP/",
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,239 @@
|
||||
//! dsh 模块(DeepSeek Harness 外壳)的数据类型。
|
||||
//!
|
||||
//! 全部走 specta 导出到 `src/lib/bindings.ts`,字段 camelCase。
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
use specta::Type;
|
||||
|
||||
/// dsh 对 Node 的版本要求(`^22.19.0 || >=24.0.0`)。
|
||||
pub const NODE_REQUIRED: &str = "^22.19.0 || >=24.0.0";
|
||||
/// dsh npm 包名。
|
||||
pub const DSH_PACKAGE: &str = "@deepseek-ai/dsh";
|
||||
/// 默认 Web UI 端口。
|
||||
pub const DEFAULT_PORT: u16 = 3080;
|
||||
/// 默认「打开独立窗口」全局快捷键(与 quickpanel/截图等同为全局快捷键,格式见
|
||||
/// `keyboard-types` 的 `Modifiers+Code`:修饰键名大小写不敏感,数字键名即 `5`)。
|
||||
pub const DEFAULT_SHORTCUT: &str = "Alt+D";
|
||||
|
||||
/// 模块设置(`{app_data}/dsh/settings.json`)。
|
||||
///
|
||||
/// 独立文件,**不写** `thing_app_settings`(appStore 的 SETTINGS_VERSION 迁移会清空用户设置)。
|
||||
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||
#[serde(rename_all = "camelCase", default)]
|
||||
pub struct DshSettings {
|
||||
/// 结构版本号;变更时按版本校正字段
|
||||
pub version: u32,
|
||||
/// Node 来源偏好:auto(系统优先,缺失回落托管)| system | managed
|
||||
pub node_source: String,
|
||||
/// 指定下载的 Node 版本(空 = 自动取满足要求的最新版)
|
||||
pub managed_node_version: String,
|
||||
/// Node 分发包镜像前缀(空 = 官方 nodejs.org;国内可用 npmmirror)
|
||||
pub node_mirror: String,
|
||||
/// npm registry(空 = 官方源)
|
||||
pub npm_registry: String,
|
||||
/// 下载 Node / npm 安装是否走代理模块(mihomo mixed 端口)
|
||||
pub use_proxy: bool,
|
||||
/// Web UI 端口(dsh 的 `--port` 参数)
|
||||
pub port: u16,
|
||||
/// 应用启动时自动拉起 dsh 服务
|
||||
pub auto_start: bool,
|
||||
/// 全局快捷键:打开 dsh Web 独立窗口(空 = 未启用)
|
||||
pub shortcut: String,
|
||||
/// $DSH_HOME 模式:managed({app_data}/dsh/home)| user(~/.dsh)
|
||||
pub dsh_home_mode: String,
|
||||
/// 工作区目录(空 = {app_data}/dsh/workspace),即 dsh 进程的启动目录
|
||||
pub workspace: String,
|
||||
/// dsh 本体的安装目录(npm `--prefix` 目标,即 node_modules 所在位置)。
|
||||
/// 空 = {app_data}/dsh。
|
||||
/// 只有 dsh 本体与它的 node_modules 跟随此设置;便携 Node、$DSH_HOME、
|
||||
/// 日志与模块设置仍固定在应用数据目录,避免自定义路径失效时连配置都读不到。
|
||||
pub install_dir: String,
|
||||
/// 映射为 dsh 默认模型的 Thing AI 供应商 id
|
||||
pub provider_id: String,
|
||||
/// 启动前自动同步 settings.yaml
|
||||
pub ai_sync: bool,
|
||||
}
|
||||
|
||||
impl Default for DshSettings {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
version: 1,
|
||||
node_source: "auto".into(),
|
||||
managed_node_version: String::new(),
|
||||
node_mirror: String::new(),
|
||||
npm_registry: String::new(),
|
||||
use_proxy: true,
|
||||
port: DEFAULT_PORT,
|
||||
auto_start: false,
|
||||
shortcut: DEFAULT_SHORTCUT.into(),
|
||||
dsh_home_mode: "managed".into(),
|
||||
workspace: String::new(),
|
||||
install_dir: String::new(),
|
||||
provider_id: "deepseek".into(),
|
||||
ai_sync: true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl DshSettings {
|
||||
/// 自愈:非法/越界字段夹回默认;版本推进。返回是否发生变更。
|
||||
pub fn heal(&mut self) -> bool {
|
||||
let mut changed = false;
|
||||
if !matches!(self.node_source.as_str(), "auto" | "system" | "managed") {
|
||||
self.node_source = "auto".into();
|
||||
changed = true;
|
||||
}
|
||||
if !matches!(self.dsh_home_mode.as_str(), "managed" | "user") {
|
||||
self.dsh_home_mode = "managed".into();
|
||||
changed = true;
|
||||
}
|
||||
if self.port == 0 {
|
||||
self.port = DEFAULT_PORT;
|
||||
changed = true;
|
||||
}
|
||||
if self.version < 1 {
|
||||
self.version = 1;
|
||||
changed = true;
|
||||
}
|
||||
// v1 → v2:默认「打开独立窗口」快捷键从 Ctrl+5 改为 Alt+D。
|
||||
// 仍等于旧默认值 = 用户没改过,直接迁移;改过(或清空禁用)的原样保留 ——
|
||||
// 版本号已推进,之后即使再改回旧键位也不会被改写(同 translate 的 heal 约定)。
|
||||
if self.version < 2 {
|
||||
if self.shortcut.trim().eq_ignore_ascii_case("ctrl+5") {
|
||||
self.shortcut = DEFAULT_SHORTCUT.to_string();
|
||||
}
|
||||
self.version = 2;
|
||||
changed = true;
|
||||
}
|
||||
changed
|
||||
}
|
||||
}
|
||||
|
||||
/// Node 运行环境状态。
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct NodeStatus {
|
||||
/// system | managed | none
|
||||
pub source: String,
|
||||
/// node.exe 路径
|
||||
pub path: Option<String>,
|
||||
/// 版本号(如 v24.9.0)
|
||||
pub version: Option<String>,
|
||||
/// 是否满足 dsh 的版本要求
|
||||
pub satisfies: bool,
|
||||
/// 版本要求文案(供 UI 展示)
|
||||
pub required: String,
|
||||
}
|
||||
|
||||
/// dsh 本体安装状态。
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DshInstallStatus {
|
||||
pub installed: bool,
|
||||
pub version: Option<String>,
|
||||
/// bin 入口(dist/bin.js 绝对路径)
|
||||
pub entry: Option<String>,
|
||||
/// 安装目录
|
||||
pub dir: String,
|
||||
}
|
||||
|
||||
/// dsh 服务进程状态。
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DshServerStatus {
|
||||
/// 进程存活
|
||||
pub running: bool,
|
||||
/// HTTP 端口已可访问
|
||||
pub ready: bool,
|
||||
pub pid: Option<u32>,
|
||||
pub port: u16,
|
||||
/// 规范地址(不含令牌,用于界面展示)
|
||||
pub url: String,
|
||||
/// 带令牌的启动地址(**用于打开界面**)。
|
||||
///
|
||||
/// dsh web 的浏览器鉴权是「进程级随机令牌 → 首次访问换 cookie」:
|
||||
/// 直接访问 [`Self::url`] 只会拿到 401。令牌每次启动都不同,只能从
|
||||
/// dsh 的输出里抓取,因此进程刚起来时这里可能为 None(等它打印)。
|
||||
pub launch_url: Option<String>,
|
||||
/// 启动时间(unix 秒)
|
||||
pub started_at: Option<i64>,
|
||||
/// 启动失败原因(端口占用 / 进程立即退出等)
|
||||
pub error: Option<String>,
|
||||
}
|
||||
|
||||
/// 模块首屏环境总览。
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DshEnvStatus {
|
||||
pub node: NodeStatus,
|
||||
pub dsh: DshInstallStatus,
|
||||
pub server: DshServerStatus,
|
||||
pub settings: DshSettings,
|
||||
}
|
||||
|
||||
/// 安装/下载进度事件载荷(与 kernel/music 同构)。
|
||||
/// stage: download | extracting | installing | done | error
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DshInstallProgress {
|
||||
pub stage: String,
|
||||
pub percent: u8,
|
||||
#[specta(type = f64)]
|
||||
pub downloaded_bytes: u64,
|
||||
#[specta(type = Option<f64>)]
|
||||
pub total_bytes: Option<u64>,
|
||||
pub message: String,
|
||||
}
|
||||
|
||||
/// dsh 版本更新信息。
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DshUpdateInfo {
|
||||
pub current: Option<String>,
|
||||
pub latest: String,
|
||||
pub has_update: bool,
|
||||
/// 可选版本(倒序,最多 20 个)
|
||||
pub versions: Vec<String>,
|
||||
}
|
||||
|
||||
/// npm 源信息(安装引导页展示「本次实际用哪个源」并提供快捷切换)。
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DshNpmRegistryInfo {
|
||||
/// 本次安装/查询实际会使用的源(已去掉末尾 `/`)
|
||||
pub effective: String,
|
||||
/// effective 的来源:setting(模块设置显式指定)| npm(npm 自身配置链)| fallback(默认官方源)
|
||||
pub source: String,
|
||||
/// npm 自身解析出的源(环境变量 > 安装目录 .npmrc > 用户 ~/.npmrc > 内置),
|
||||
/// 未检测到 Node/npm 时为 None
|
||||
pub npm_registry: Option<String>,
|
||||
/// 模块设置里显式填写的值(空 = 未指定,交给 npm 解析)
|
||||
pub setting: String,
|
||||
}
|
||||
|
||||
/// AI 供应商映射结果(预览用,不含明文密钥)。
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DshAiProvider {
|
||||
/// Thing 侧供应商 id
|
||||
pub id: String,
|
||||
pub name: String,
|
||||
/// 写入 settings.yaml 的 apiKeyEnv 变量名
|
||||
pub env_name: String,
|
||||
pub base_url: String,
|
||||
pub model: String,
|
||||
/// 凭据管理器中是否已配置密钥
|
||||
pub has_key: bool,
|
||||
}
|
||||
|
||||
/// settings.yaml 同步预览。
|
||||
#[derive(Debug, Clone, Serialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct DshAiPreview {
|
||||
/// 将被写入的 YAML 文本(密钥位置只有环境变量名)
|
||||
pub yaml: String,
|
||||
pub providers: Vec<DshAiProvider>,
|
||||
pub default_provider: Option<String>,
|
||||
pub default_model: Option<String>,
|
||||
pub settings_path: String,
|
||||
}
|
||||
+40
-2
@@ -4,6 +4,7 @@ mod ai;
|
||||
mod clipboard;
|
||||
mod constants;
|
||||
mod download_engine;
|
||||
mod dsh;
|
||||
mod logger;
|
||||
mod mihomo_manager;
|
||||
mod monitor_kernel;
|
||||
@@ -73,6 +74,13 @@ use music::{
|
||||
AudioEngine, MusicManager, RemoteManager, SmtcController, SmtcMetaCache,
|
||||
};
|
||||
use network_monitor::network_status;
|
||||
use dsh::{
|
||||
dsh_ai_preview, dsh_ai_sync, dsh_cancel_install, dsh_check_update, dsh_env_status,
|
||||
dsh_get_settings, dsh_install, dsh_install_log, dsh_log_clear, dsh_log_tail,
|
||||
dsh_node_detect, dsh_node_install, dsh_npm_registry_info, dsh_open_dir,
|
||||
dsh_register_shortcut, dsh_restart, dsh_save_settings, dsh_start, dsh_stop,
|
||||
dsh_uninstall, dsh_unregister_shortcut, dsh_update,
|
||||
};
|
||||
use osd_window::{
|
||||
osd_apply_overlay_style, osd_begin_drag, osd_set_bounds, osd_set_click_through,
|
||||
osd_set_topmost, osd_start_drag_watch, osd_start_game_watch, osd_start_topmost_watch,
|
||||
@@ -309,6 +317,13 @@ fn export_bindings() {
|
||||
terminal_history_clear, terminal_history_run,
|
||||
// AI 命令助手(P2)——与 `run()` 里那份保持一致,否则 bindings.ts 缺类型
|
||||
terminal_ai_engines, terminal_ai_suggest,
|
||||
// dsh(22)——与 `run()` 里那份保持一致,否则 bindings.ts 缺类型
|
||||
dsh_env_status, dsh_node_detect, dsh_node_install, dsh_install, dsh_update,
|
||||
dsh_uninstall, dsh_cancel_install, dsh_check_update, dsh_npm_registry_info,
|
||||
dsh_get_settings, dsh_save_settings, dsh_register_shortcut,
|
||||
dsh_unregister_shortcut, dsh_start, dsh_stop, dsh_restart,
|
||||
dsh_ai_preview, dsh_ai_sync, dsh_log_tail, dsh_install_log, dsh_log_clear,
|
||||
dsh_open_dir,
|
||||
])
|
||||
.export(Typescript::default(), "../src/lib/bindings.ts")
|
||||
.expect("failed to export bindings");
|
||||
@@ -332,7 +347,7 @@ pub fn run() {
|
||||
.plugin(tauri_plugin_opener::init())
|
||||
.plugin(tauri_plugin_dialog::init())
|
||||
// 截图快捷键改由 screenshot::shortcut::register_shortcut(on_shortcut)按需注册,
|
||||
// 支持自定义;默认 Ctrl+Alt+A 由前端 store 启动时注册
|
||||
// 支持自定义;默认 F3 由前端 store 启动时注册
|
||||
.plugin(tauri_plugin_global_shortcut::Builder::new().build())
|
||||
.plugin(tauri_plugin_notification::init())
|
||||
.plugin(
|
||||
@@ -724,7 +739,30 @@ pub fn run() {
|
||||
terminal_save_template,
|
||||
// AI 命令助手(P2)
|
||||
terminal_ai_engines,
|
||||
terminal_ai_suggest
|
||||
terminal_ai_suggest,
|
||||
// dsh(22)
|
||||
dsh_env_status,
|
||||
dsh_node_detect,
|
||||
dsh_node_install,
|
||||
dsh_install,
|
||||
dsh_update,
|
||||
dsh_uninstall,
|
||||
dsh_cancel_install,
|
||||
dsh_check_update,
|
||||
dsh_npm_registry_info,
|
||||
dsh_get_settings,
|
||||
dsh_save_settings,
|
||||
dsh_register_shortcut,
|
||||
dsh_unregister_shortcut,
|
||||
dsh_start,
|
||||
dsh_stop,
|
||||
dsh_restart,
|
||||
dsh_ai_preview,
|
||||
dsh_ai_sync,
|
||||
dsh_log_tail,
|
||||
dsh_install_log,
|
||||
dsh_log_clear,
|
||||
dsh_open_dir
|
||||
])
|
||||
.setup(setup::init)
|
||||
.on_window_event(|window, event| {
|
||||
|
||||
@@ -117,6 +117,10 @@ enum Control {
|
||||
struct Session {
|
||||
shared: Arc<Shared>,
|
||||
ctrl: Sender<Control>,
|
||||
/// 播放线程句柄:**故意不 join**(见 `stop_current` 的说明),唯一作用是与会话
|
||||
/// 同生共死 —— 会话 Arc 释放时它一起被丢弃,丢弃即 detach,线程收到 Stop 后
|
||||
/// 自行收尾并释放输出流。因为从不解绑/join,此字段除「持有」外没有任何读取。
|
||||
#[allow(dead_code)]
|
||||
handle: JoinHandle<()>,
|
||||
}
|
||||
|
||||
|
||||
@@ -523,7 +523,7 @@ impl MusicManager {
|
||||
/// 解析桥接要用的 Python 运行时。
|
||||
/// 便携版优先:musicdl 只装入便携运行时,系统 Python 无法保证装有 musicdl;
|
||||
/// 无便携版时退回系统 Python(此时 search 会报 musicdl 未安装,引导用户装便携版)。
|
||||
pub fn resolve_python(&self) -> Result<PythonEnv, String> {
|
||||
pub(crate) fn resolve_python(&self) -> Result<PythonEnv, String> {
|
||||
if let Some(env) = self.detect_bundled_python() {
|
||||
return Ok(env);
|
||||
}
|
||||
@@ -534,7 +534,7 @@ impl MusicManager {
|
||||
}
|
||||
|
||||
/// 便携 Python 是否可用(exe 存在且能跑 --version)
|
||||
pub fn detect_bundled_python(&self) -> Option<PythonEnv> {
|
||||
pub(crate) fn detect_bundled_python(&self) -> Option<PythonEnv> {
|
||||
detect_bundled_python_at(&self.bundled_python_exe())
|
||||
}
|
||||
|
||||
|
||||
+11
-1
@@ -77,6 +77,12 @@ pub fn init(app: &mut App<Wry>) -> Result<(), Box<dyn std::error::Error>> {
|
||||
let _ = ai.load_settings();
|
||||
app.manage(ai);
|
||||
|
||||
// ===== dsh 模块:DshManager(DeepSeek Harness 外壳) =====
|
||||
// 仅注册状态:Node/dsh 的安装、服务进程与 settings.yaml 同步都在命令调用时按需触发
|
||||
// (启动阶段只有 autoStart 开启时才拉起服务,见 init 末尾)。
|
||||
let dsh = crate::dsh::DshManager::new(app_data_dir.clone());
|
||||
app.manage(dsh);
|
||||
|
||||
// ===== 翻译模块:TranslateManager =====
|
||||
// 仅注册状态:设置与密钥都在命令调用时按需读取,启动阶段不发任何网络请求
|
||||
// (模型可用性校验因此改为懒校验:首次翻译失败时解释原因 + 设置页手动拉取模型列表)。
|
||||
@@ -181,8 +187,12 @@ pub fn init(app: &mut App<Wry>) -> Result<(), Box<dyn std::error::Error>> {
|
||||
monitor.auto_start_on_launch(app.handle());
|
||||
}
|
||||
|
||||
// dsh:开启"自动启动"且已安装时拉起 Web 服务(后台线程执行就绪探测,不阻塞启动)。
|
||||
// 「打开独立窗口」快捷键由前端 dshStore 启动时注册(同截图模块约定)。
|
||||
crate::dsh::autostart_if_enabled(app.handle());
|
||||
|
||||
// 截图快捷键由前端 screenshotStore 启动时调用 screenshot_register_shortcut 注册
|
||||
// (支持自定义,默认 Ctrl+Alt+A),此处不再硬编码注册
|
||||
// (支持自定义,默认 F3),此处不再硬编码注册
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -662,9 +662,10 @@ impl Default for TemplateEntry {
|
||||
/// - 新建/关闭标签用 `Ctrl+Shift+T/W`,与浏览器习惯一致。
|
||||
/// - 跳转标签用 `Alt+1..9`:`Ctrl+数字` 已被翻译模块的 `Ctrl+2`(翻译面板)占用,
|
||||
/// 而 `Alt+数字` 在终端里通常不产生控制字符,冲突面最小。
|
||||
/// - `newDetachedWindow`(`Ctrl+3`)是这张表里唯一**全局**生效的一条:它由前端
|
||||
///- `newDetachedWindow`(`Alt+T`)是这张表里唯一**全局**生效的一条:它由前端
|
||||
/// `TerminalQuickLaunch` 注册成系统级热键(任意应用前台可触发),放在这里只为
|
||||
/// 跟着终端设置一起存与改。`Ctrl+2` 已被翻译面板占用,`Ctrl+3` 是空闲的相邻键位。
|
||||
/// 跟着终端设置一起存与改。`Alt+T` 与翻译面板的 `Alt+F`、dsh 的 `Alt+D`
|
||||
/// 同处 `Alt+字母` 段,互不冲突。
|
||||
pub fn default_shortcuts() -> Vec<ShortcutBinding> {
|
||||
let pairs: &[(&str, &str)] = &[
|
||||
("copy", "Ctrl+Shift+C"),
|
||||
@@ -692,7 +693,7 @@ pub fn default_shortcuts() -> Vec<ShortcutBinding> {
|
||||
// action(未知 action 会被剔除),前端设置表里有而这里没有 = 用户改完下次启动就被清掉。
|
||||
("detachWindow", "Ctrl+Shift+N"),
|
||||
// 全局生效的一条(见上方说明):新建独立窗口 + 选择会话
|
||||
("newDetachedWindow", "Ctrl+3"),
|
||||
("newDetachedWindow", "Alt+T"),
|
||||
];
|
||||
pairs
|
||||
.iter()
|
||||
@@ -832,6 +833,23 @@ impl TerminalSettings {
|
||||
changed = true;
|
||||
}
|
||||
|
||||
// v2 → v3:新建独立窗口的默认键位从 Ctrl+3 改为 Alt+T(Ctrl+数字 与
|
||||
// 翻译面板、终端「Alt+数字 跳标签」两处分段冲突,统一收到 Alt+字母)。
|
||||
// 仍等于旧默认值 = 用户没改过,直接迁移;改过的原样保留。
|
||||
if self.version < 3 {
|
||||
if let Some(binding) = self
|
||||
.shortcuts
|
||||
.iter_mut()
|
||||
.find(|s| s.action == "newDetachedWindow")
|
||||
{
|
||||
if binding.keys.trim().eq_ignore_ascii_case("ctrl+3") {
|
||||
binding.keys = "Alt+T".to_string();
|
||||
}
|
||||
}
|
||||
self.version = 3;
|
||||
changed = true;
|
||||
}
|
||||
|
||||
changed
|
||||
}
|
||||
}
|
||||
|
||||
@@ -190,7 +190,7 @@ impl Default for TranslateEngineConfig {
|
||||
pub struct SelectionSettings {
|
||||
/// 总开关:打开翻译面板时是否尝试读取当前划词作为候选
|
||||
pub enabled: bool,
|
||||
/// 打开翻译面板的全局快捷键(默认 Ctrl+2)
|
||||
/// 打开翻译面板的全局快捷键(默认 Alt+F)
|
||||
#[serde(default = "default_panel_shortcut")]
|
||||
pub panel_shortcut: String,
|
||||
/// 取词方式:
|
||||
@@ -209,7 +209,7 @@ pub struct SelectionSettings {
|
||||
}
|
||||
|
||||
fn default_panel_shortcut() -> String {
|
||||
"Ctrl+2".to_string()
|
||||
"Alt+F".to_string()
|
||||
}
|
||||
|
||||
impl Default for SelectionSettings {
|
||||
@@ -427,6 +427,19 @@ impl TranslateSettings {
|
||||
self.version = 2;
|
||||
changed = true;
|
||||
}
|
||||
// v2 → v3:翻译面板默认快捷键从 Ctrl+2 改为 Alt+F(把 Ctrl+数字 让给终端)。
|
||||
// 仍等于旧默认值 = 用户没改过,直接迁移;改过或已清空的原样保留。
|
||||
if self.version < 3 {
|
||||
if self.selection
|
||||
.panel_shortcut
|
||||
.trim()
|
||||
.eq_ignore_ascii_case("ctrl+2")
|
||||
{
|
||||
self.selection.panel_shortcut = default_panel_shortcut();
|
||||
}
|
||||
self.version = 3;
|
||||
changed = true;
|
||||
}
|
||||
changed
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user