Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 zhongluofeng
|
bccd21fde5 | ||
|
zhongluofeng
|
b018abd922 |
@@ -9,6 +9,9 @@ lerna-debug.log*
|
|||||||
|
|
||||||
.trae
|
.trae
|
||||||
.workbuddy
|
.workbuddy
|
||||||
|
.npm-cache
|
||||||
|
.bun-tmp
|
||||||
|
.uploads
|
||||||
temp/
|
temp/
|
||||||
release_stage/
|
release_stage/
|
||||||
musicdl_outputs/
|
musicdl_outputs/
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,756 @@
|
|||||||
|
# Thing UI 设计系统与开发约束
|
||||||
|
|
||||||
|
> **适用范围**：`src/` 下全部前端代码（12 个模块、220+ 组件）
|
||||||
|
> **约束力**：第 7 章为硬性约束，Code Review 据此判定；第 3–5 章为实现规范
|
||||||
|
> **配套**：`UI Design System` 画布（色彩 / 排版 / 组件 / 骨架四屏可视化规范）
|
||||||
|
> **唯一事实来源**：token 值以 `src/style.css` 为准，本文档与之同步
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. 设计原则
|
||||||
|
|
||||||
|
以下 8 条为不可协商项，贯穿全部模块。
|
||||||
|
|
||||||
|
**P1 · 单一强调色**
|
||||||
|
全应用只有 `--primary` 一种交互色，用于按钮、链接、选中态、焦点环。不存在"第二个主题色"。状态色（success/warning/danger）仅表达**状态**，不得用于可点击元素。
|
||||||
|
|
||||||
|
**P2 · 颜色只能来自 token**
|
||||||
|
禁止在组件内写 hex、rgb、oklch，禁止引用 Tailwind 原生色阶（`bg-blue-500`、`text-emerald-700`）。组件里出现的每个颜色都必须能追溯到 `style.css` 的一个语义变量。
|
||||||
|
|
||||||
|
**P3 · 状态必须四态齐全**
|
||||||
|
任何数据驱动的界面必须实现 **加载 / 空 / 错误 / 成功** 四态。禁止空白，禁止静默失败。这是最容易漏、也最影响质感的一条。
|
||||||
|
|
||||||
|
**P4 · 一个主区域，一个主操作**
|
||||||
|
每屏有且仅有一个视觉重心、一个主按钮。破坏性操作（停止内核、删除记录）必须视觉降级或二次确认，且不得与主操作同权重。
|
||||||
|
|
||||||
|
**P5 · 骨架统一，内容区自治**
|
||||||
|
所有模块共享同一套外壳（侧边栏 / 标题栏 / Tab 行）。**模块之间允许不同的只有内容区布局**——这是"统一"与"灵活"的分界线。
|
||||||
|
|
||||||
|
**P6 · 密度一致**
|
||||||
|
全应用统一使用**紧凑偏中**密度：13px 正文、34px 控件、16px 卡片内边距。禁止在同一屏内混用疏密两种节奏。
|
||||||
|
|
||||||
|
**P7 · 卡片统一描边 + 轻阴影，浮层用重阴影**
|
||||||
|
层级靠**表面色差 + 1px 描边 + 轻阴影（`shadow-sm` / `--shadow-card`）**表达。浮层（下拉、气泡、对话框）使用更重的 `--shadow-popover` / `--shadow-dialog`。
|
||||||
|
|
||||||
|
**P8 · 中文界面不做负字距**
|
||||||
|
字体模板中的负字距（`-0.28px` 等）是为拉丁字母设计的，会让中文发挤。**拉丁文与数字可保留微调，中文一律 `letter-spacing: 0`。**
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. Design Token
|
||||||
|
|
||||||
|
### 2.1 命名与结构
|
||||||
|
|
||||||
|
Token 分四组，**在现有 shadcn 变量之上扩展，不另起一套**：
|
||||||
|
|
||||||
|
```
|
||||||
|
shadcn 既有（值调整） → --background / --foreground / --primary / --card / --border / ...
|
||||||
|
本项目扩展 → --canvas / --fg-* / --success / --warning / --data-* / --shadow-*
|
||||||
|
```
|
||||||
|
|
||||||
|
**关键调整**：把 shadcn 的 `--primary` 从当前近黑色（`oklch(0.21 0.006 285.885)`）改为强调蓝 `#0066CC`。这样全部 shadcn 组件（Button / Switch / Checkbox / focus ring）自动获得统一的交互色，无需逐组件改样式。
|
||||||
|
|
||||||
|
### 2.2 色彩
|
||||||
|
|
||||||
|
#### 浅色模式（`:root`）
|
||||||
|
|
||||||
|
```css
|
||||||
|
:root {
|
||||||
|
/* ── 表面 ───────────────────────────── */
|
||||||
|
--canvas: #F5F5F7; /* 应用底 / 模块内容区背景 */
|
||||||
|
--background: #FFFFFF; /* shadcn 基准面 */
|
||||||
|
--card: #FFFFFF; /* 卡片 / 面板 */
|
||||||
|
--popover: #FFFFFF; /* 浮层 */
|
||||||
|
--subtle: #F0F0F2; /* 次级填充：搜索框底、分段控件槽、代码块 */
|
||||||
|
--hover: #EBEBED; /* 幽灵控件 hover */
|
||||||
|
--active: #E4E4E7; /* 幽灵控件 active */
|
||||||
|
|
||||||
|
/* ── 描边 ───────────────────────────── */
|
||||||
|
--border: #E4E4E7; /* 卡片外框、输入框 */
|
||||||
|
--border-strong: #D1D1D6; /* 需要更强分隔时 */
|
||||||
|
--divider: #F0F0F2; /* 卡片内部分隔线（1px） */
|
||||||
|
--input: #E4E4E7;
|
||||||
|
|
||||||
|
/* ── 文字 ───────────────────────────── */
|
||||||
|
--foreground: #1D1D1F; /* 主文字：标题、正文、数值 */
|
||||||
|
--fg-secondary: #55555C; /* 次文字：键名、标签说明、幽灵控件文字 */
|
||||||
|
--muted-foreground: #8A8A90; /* 辅助：占位符、规格说明、次级 meta */
|
||||||
|
--fg-disabled: #B4B4BA; /* 禁用 */
|
||||||
|
|
||||||
|
/* ── 强调 ───────────────────────────── */
|
||||||
|
--primary: #0066CC;
|
||||||
|
--primary-hover: #0055B3;
|
||||||
|
--primary-active: #004A9E;
|
||||||
|
--primary-foreground: #FFFFFF;
|
||||||
|
--primary-soft: #E8F1FC; /* 选中 Tab 底、选中行底 */
|
||||||
|
--primary-soft-text: #004F9E; /* 上述底上的文字 */
|
||||||
|
--ring: #0071E3;
|
||||||
|
|
||||||
|
/* ── 语义状态 ───────────────────────── */
|
||||||
|
--success: #0F7B4F; --success-soft: #E7F5EE; --success-text: #0B5C3B;
|
||||||
|
--warning: #A96B00; --warning-soft: #FDF4E4; --warning-text: #7D4F00;
|
||||||
|
--danger: #C7362F; --danger-soft: #FDECEA; --danger-text: #9A2620;
|
||||||
|
--info: #0066CC; --info-soft: #E8F1FC; --info-text: #004F9E;
|
||||||
|
--neutral: #8A8A90; --neutral-soft: #F0F0F2; --neutral-text: #55555C;
|
||||||
|
--destructive: #C7362F; /* shadcn 兼容别名，指向 danger */
|
||||||
|
--destructive-foreground: #FFFFFF;
|
||||||
|
|
||||||
|
/* ── 数据方向（与状态语义解耦）───────── */
|
||||||
|
--data-down: #0F7B4F; /* 下载 / 入站 */
|
||||||
|
--data-up: #C7362F; /* 上传 / 出站 */
|
||||||
|
|
||||||
|
/* ── 尺寸 ───────────────────────────── */
|
||||||
|
--radius: 12px;
|
||||||
|
--radius-xs: 4px; --radius-sm: 6px; --radius-md: 8px;
|
||||||
|
--radius-lg: 12px; --radius-xl: 16px;
|
||||||
|
|
||||||
|
/* ── 阴影 ───────────────────────────── */
|
||||||
|
--shadow-card: 0 1px 2px rgba(0,0,0,0.06);
|
||||||
|
--shadow-popover: 0 1px 3px rgba(0,0,0,0.06), 0 4px 16px rgba(0,0,0,0.10);
|
||||||
|
--shadow-dialog: 0 4px 12px rgba(0,0,0,0.08), 0 20px 48px rgba(0,0,0,0.16);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
#### 深色模式（`.dark`）
|
||||||
|
|
||||||
|
深色下**必须成对重定义**，且强调色改为亮蓝（`#0066CC` 在深底上对比度不足）：
|
||||||
|
|
||||||
|
```css
|
||||||
|
.dark {
|
||||||
|
--canvas: #16161A;
|
||||||
|
--background: #16161A;
|
||||||
|
--card: #1E1E22;
|
||||||
|
--popover: #1E1E22;
|
||||||
|
--subtle: #26262B;
|
||||||
|
--hover: #2C2C32;
|
||||||
|
--active: #33333A;
|
||||||
|
|
||||||
|
--border: #2E2E34;
|
||||||
|
--border-strong: #3A3A42;
|
||||||
|
--divider: #26262B;
|
||||||
|
--input: #2E2E34;
|
||||||
|
|
||||||
|
--foreground: #F5F5F7;
|
||||||
|
--fg-secondary: #A8A8B0;
|
||||||
|
--muted-foreground: #7A7A82;
|
||||||
|
--fg-disabled: #55555C;
|
||||||
|
|
||||||
|
--primary: #2997FF;
|
||||||
|
--primary-hover: #4AA8FF;
|
||||||
|
--primary-active: #1A85E8;
|
||||||
|
--primary-foreground: #FFFFFF;
|
||||||
|
--primary-soft: #14304D;
|
||||||
|
--primary-soft-text: #7FC0FF;
|
||||||
|
--ring: #2997FF;
|
||||||
|
|
||||||
|
--success: #3DC77F; --success-soft: #12301F; --success-text: #7FE0AB;
|
||||||
|
--warning: #E0A83C; --warning-soft: #33260E; --warning-text: #F0C976;
|
||||||
|
--danger: #FF6B60; --danger-soft: #3A1A18; --danger-text: #FF9E96;
|
||||||
|
--info: #2997FF; --info-soft: #14304D; --info-text: #7FC0FF;
|
||||||
|
--neutral: #7A7A82; --neutral-soft: #26262B; --neutral-text: #A8A8B0;
|
||||||
|
--destructive: #FF6B60; --destructive-foreground: #FFFFFF;
|
||||||
|
|
||||||
|
--data-down: #3DC77F;
|
||||||
|
--data-up: #FF6B60;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
#### 状态色三件套的用法
|
||||||
|
|
||||||
|
每个语义状态有 **3 个** token，用途严格区分：
|
||||||
|
|
||||||
|
| Token | 用途 | 示例 |
|
||||||
|
|---|---|---|
|
||||||
|
| `--success` | 实心：状态点、图标、粗体数值 | ● 运行中 的圆点 |
|
||||||
|
| `--success-soft` | 浅底：徽章背景、行高亮 | `<span class="bg-success-soft">` |
|
||||||
|
| `--success-text` | 浅底上的文字 | 徽章内的"已安装" |
|
||||||
|
|
||||||
|
**禁止**把 `--success` 用作文字色 + `--success-soft` 以外的底色组合，也**禁止**用状态色做可点击元素的颜色（见 P1）。
|
||||||
|
|
||||||
|
#### 强调色的使用边界
|
||||||
|
|
||||||
|
`--primary` 只表达两件事：**这里可以点**、**这里是当前项**。
|
||||||
|
|
||||||
|
| 用 | 不用 |
|
||||||
|
|---|---|
|
||||||
|
| 主按钮底色、开关开启态、焦点环 | 卡片标题前的**装饰性图标** |
|
||||||
|
| 当前 Tab / 选中列表行 / 选中项 | 全部 Tab 的图标 |
|
||||||
|
| 可点击的文字链接 | 状态徽章（那是状态语义色的职责） |
|
||||||
|
| 输入框聚焦态 | 大面积背景、分隔线、装饰元素 |
|
||||||
|
|
||||||
|
**反例（已修正）**：proxy 概览页的 6 个卡片标题图标全部用了 `text-primary`，加上主按钮、开关、选中态，整屏发蓝 —— 结果"蓝色"不再意味着"可点击"，层次感也丢了。已统一改为 `--fg-secondary`。
|
||||||
|
|
||||||
|
#### 数据方向色（`--data-*`）
|
||||||
|
|
||||||
|
下载/上传速率沿用现有视觉（绿/红），但独立成 token，**与 `success/danger` 解耦**。
|
||||||
|
|
||||||
|
> **待决策**：当前 `data-up` 与 `danger` 同色，会让人把"上传速率"误读为"异常"。若希望彻底解耦，建议改为
|
||||||
|
> `--data-down: #0066CC`（蓝）/ `--data-up: #A96B00`（琥珀）。这是**唯一改动成本为零**的时机——只需改两个 token。
|
||||||
|
|
||||||
|
### 2.3 排版
|
||||||
|
|
||||||
|
字体族保持不变（现有 `--font-sans` 已正确针对中文优化）：
|
||||||
|
|
||||||
|
```css
|
||||||
|
--font-sans: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
|
||||||
|
'Microsoft YaHei', 'PingFang SC', 'Noto Sans SC', sans-serif;
|
||||||
|
--font-mono: 'JetBrains Mono', 'Cascadia Code', Consolas, monospace;
|
||||||
|
```
|
||||||
|
|
||||||
|
生产代码不引用外部字体 CDN（设计稿 / 原型页可保留 Inter）；数值对齐通过全局 `font-feature-settings: 'tnum','lnum'` 实现，不依赖具体字体。
|
||||||
|
|
||||||
|
字号标尺（9 级，全部为 `px`）：
|
||||||
|
|
||||||
|
| Token | 字号 / 字重 | 行高 | 用途 |
|
||||||
|
|---|---|---|---|
|
||||||
|
| `display` | 28 / 700 | 36 | 页面级大标题（设置页、关于页），**全应用不超过 1 处/屏** |
|
||||||
|
| `metric` | 22 / 600 | 28 | 关键数值（速率、容量）· **必须 `font-variant-numeric: tabular-nums`** |
|
||||||
|
| `h1` | 16 / 600 | 24 | 模块标题、卡片标题 |
|
||||||
|
| `h2` | 14 / 600 | 20 | 区块标题、卡片标题（小卡） |
|
||||||
|
| `h3` | 13 / 600 | 20 | 小节标题、列表分组标题 |
|
||||||
|
| `body` | 13 / 400 | 20 | **界面默认正文** |
|
||||||
|
| `body-strong` | 13 / 600 | 20 | 行内强调、键值行的键 |
|
||||||
|
| `caption` | 12 / 400 | 18 | 辅助说明、参数解释 |
|
||||||
|
| `label` | 11 / 500 | 16 | 徽章、标签、表头、单位 |
|
||||||
|
|
||||||
|
**规则**：
|
||||||
|
|
||||||
|
1. 字号只从以上 9 级中取，**禁止 `text-[13.5px]` 这类任意值**。
|
||||||
|
2. 数值（速率、版本号、计数）统一用 `tabular-nums`，避免刷新时数字跳动。
|
||||||
|
3. 中文 `letter-spacing: 0`；拉丁小标题可 `-0.1px`，正文一律 `0`。
|
||||||
|
4. 行高按表中固定值写，不用 Tailwind 默认相对行高。
|
||||||
|
|
||||||
|
### 2.4 间距
|
||||||
|
|
||||||
|
4px 基数，**8 个值，用尽即止**：
|
||||||
|
|
||||||
|
| Token | 值 | 典型用途 |
|
||||||
|
|---|---|---|
|
||||||
|
| `space-1` | 4 | 图标与文字间隙、徽章内边距（纵向） |
|
||||||
|
| `space-2` | 8 | 控件内元素间隙、徽章内边距（横向） |
|
||||||
|
| `space-3` | 12 | 列表行内间隙、卡片标题与内容间距 |
|
||||||
|
| `space-4` | 16 | **卡片内边距、卡片间距** |
|
||||||
|
| `space-5` | 20 | **模块内容区默认内边距** |
|
||||||
|
| `space-6` | 24 | 区块之间、对话框内边距 |
|
||||||
|
| `space-8` | 32 | 大区块分隔 |
|
||||||
|
| `space-12` | 48 | 页面级分段 |
|
||||||
|
|
||||||
|
**禁止** `p-[18px]`、`gap-[14px]`、`mt-[6px]`。需要更细的调整时，说明是布局问题而非间距问题。
|
||||||
|
|
||||||
|
### 2.5 圆角
|
||||||
|
|
||||||
|
| Token | 值 | 适用 |
|
||||||
|
|---|---|---|
|
||||||
|
| `radius-xs` | 4 | 内联小元素：标签内块、进度条端点 |
|
||||||
|
| `radius-sm` | 6 | 徽章、小按钮、下拉项 |
|
||||||
|
| `radius-md` | 8 | **按钮、输入框、下拉框、分段控件、Tab 项** |
|
||||||
|
| `radius-lg` | 12 | **卡片、面板、样张容器** |
|
||||||
|
| `radius-xl` | 16 | 对话框、大浮层 |
|
||||||
|
| `radius-full` | 9999 | 状态点、开关、头像、搜索框（胶囊） |
|
||||||
|
|
||||||
|
**规则**：同层级控件必须同圆角。按钮 8px 就全应用 8px，不允许某模块用 6px。
|
||||||
|
|
||||||
|
### 2.6 阴影与层级
|
||||||
|
|
||||||
|
**层级主要靠表面色差 + 描边 + 轻阴影**（P7）：
|
||||||
|
|
||||||
|
| 层级 | 表现 | 用途 |
|
||||||
|
|---|---|---|
|
||||||
|
| L0 应用底 | `--canvas`，无描边无阴影 | 窗口、模块内容区 |
|
||||||
|
| L1 卡片 | `--card` + 1px `--border` + 轻阴影 `shadow-sm` | 所有卡片、面板 |
|
||||||
|
| L1.5 次级容器 | `--subtle`，无描边 | 搜索框底、分段控件槽、代码块 |
|
||||||
|
| L2 浮层 | `--card` + `--shadow-popover` | 下拉菜单、气泡、tooltip、右键菜单 |
|
||||||
|
| L3 模态 | `--card` + `--shadow-dialog` + 遮罩 | 对话框、AlertDialog |
|
||||||
|
|
||||||
|
卡片默认使用轻阴影 `--shadow-card`（`shadow-sm`）；`--shadow-popover` / `--shadow-dialog` 仅用于浮层与模态。
|
||||||
|
|
||||||
|
### 2.7 动效
|
||||||
|
|
||||||
|
```css
|
||||||
|
--ease-standard: cubic-bezier(0.22, 0.61, 0.36, 1); /* 沿用现有 tab-animate 曲线 */
|
||||||
|
--duration-fast: 120ms; /* hover、颜色变化 */
|
||||||
|
--duration-base: 200ms; /* 展开、浮层出现 */
|
||||||
|
--duration-slow: 320ms; /* 页面/Tab 切换 */
|
||||||
|
```
|
||||||
|
|
||||||
|
**规则**：
|
||||||
|
|
||||||
|
1. 只对 `opacity` 和 `transform` 做动画（性能）。
|
||||||
|
2. 按钮按下统一 `transform: scale(0.97)`，不用颜色变化模拟按压。
|
||||||
|
3. 所有动画必须包在 `@media (prefers-reduced-motion: reduce)` 里降级为 `none`（现有 `.music-eq` 已正确实现，作为模板）。
|
||||||
|
4. Tab 切换复用现有全局 `.tab-animate` 类，**不要各模块自建过渡**。
|
||||||
|
|
||||||
|
### 2.8 图标
|
||||||
|
|
||||||
|
- 库：`@lucide/vue`，**禁止混用其他图标库或内联 Unicode 符号**（`↓` `✓` `●` 等）。
|
||||||
|
- 尺寸只有 3 档：`14`（行内 / 徽章内）、`16`（按钮、Tab、默认）、`20`（侧边栏、卡片标题）。
|
||||||
|
- `stroke-width` 统一 `1.75`（lucide 默认 2，偏粗，与 13px 正文不协调）—— 在 `style.css` 里对 `.lucide` 全局设置，不要逐个组件写。
|
||||||
|
- 图标**不单独承载语义**：状态点旁必须有文字，工具栏图标必须有 tooltip 或文字标签（P4 可理解性）。
|
||||||
|
|
||||||
|
### 2.9 主题色自定义（已落地）
|
||||||
|
|
||||||
|
**需求**：设置页提供主题色选择，统一改变全应用的强调色。
|
||||||
|
|
||||||
|
**可行性**：可行且成本低 —— 因为全应用的"可交互色"已经收敛到单一来源 `--primary`。落地后组件层改动为 0。
|
||||||
|
|
||||||
|
**实现**：`src/lib/theme.ts`（派生 + 应用）+ `appStore.setAccent()` + 设置页「主题色」卡片。
|
||||||
|
用户**只选一个基色**，深浅两套由代码派生 —— 不需要为浅色/深色各选一次（同色相两个亮度是既有做法：
|
||||||
|
浅 `#0066cc` / 深 `#2997ff`），也不会出现"浅色选青、深色选紫"的语义割裂。
|
||||||
|
|
||||||
|
#### 需要派生的变量
|
||||||
|
|
||||||
|
只改基色是不够的，必须同时派生 7 个变量，否则 hover / 选中态仍是旧色：
|
||||||
|
|
||||||
|
| 变量 | 派生规则（OKLCH，色相 H 原样保留） | 用途 |
|
||||||
|
|---|---|---|
|
||||||
|
| `--primary` | 基色，L 归一到 `0.42–0.58`（浅）/ `0.68–0.80`（深），C 限制在 `0.06–0.20` | 主按钮、开关、焦点环 |
|
||||||
|
| `--primary-hover` | 浅：L − 0.08；深：L + 0.06 | 主按钮 hover |
|
||||||
|
| `--primary-active` | 浅：L − 0.16；深：L − 0.10 | 主按钮按下 |
|
||||||
|
| `--primary-soft` | 浅：`oklch(0.95, C×0.30, H)`；深：`oklch(0.30, C×0.45, H)` | 选中底、幽灵按钮 hover |
|
||||||
|
| `--primary-soft-text` | 基色加深/提亮起步，再按对比度推进到 ≥4.5:1 | 上述底上的文字 |
|
||||||
|
| `--ring` | 同 `--primary` | 焦点环 |
|
||||||
|
| `--primary-foreground` | 白字低于 2.5:1 时才换 `#1D1D1F` | 填充上的文字 |
|
||||||
|
|
||||||
|
深色模式**单独派生一套**（深底上要提亮），不能复用浅色值。
|
||||||
|
|
||||||
|
#### 关键技术点
|
||||||
|
|
||||||
|
1. **用 OKLCH 做派生，不要用 HSL。**
|
||||||
|
只换色相 H、锁定 L 与 C，才能保证换任意色相后对比度一致。HSL 的"明度"感知不均匀，换色相会时亮时暗。
|
||||||
|
|
||||||
|
2. **对比度靠"推进亮度"而不是固定阈值判定。**
|
||||||
|
同一 OKLCH L 下不同色相的 WCAG 亮度差很多（L=0.58 的青柠对白底只有 ~2.8:1，蓝色却有 ~5:1），
|
||||||
|
所以归一到区间后还要继续推进 L 直到达标：
|
||||||
|
- 浅色：`--primary` 对 `#FFFFFF` ≥ 4.5:1（它会被当文字用在白卡上）→ 选亮色自动压暗
|
||||||
|
- 深色：`--primary` 对 `#1E1E22` ≥ 4.5:1 → 自动提亮
|
||||||
|
- `--primary-soft-text` 对 `--primary-soft` ≥ 4.5:1
|
||||||
|
以上断言在 `src/lib/theme.test.ts` 里对 10 个预设 × 2 模式全量校验。
|
||||||
|
|
||||||
|
3. **`--primary-foreground` 的取舍是有意的。**
|
||||||
|
深色模式下强调色必须够亮才能在深底上当文字用（≥4.5:1），同一颜色做填充时白字只能到 2.7–3:1 ——
|
||||||
|
现有主题就是这个取舍（`#2997ff` + 白字 ≈ 2.98:1）。因此门槛按 UI 组件的 2.5:1 兜底，
|
||||||
|
只在自定义极亮色时才改深墨。
|
||||||
|
|
||||||
|
4. **只开放"强调色"，不开放状态色。**
|
||||||
|
`success` / `warning` / `danger` 是语义色，改了会破坏"绿色=成功"的心智模型。`--data-*` 同理。
|
||||||
|
`--info` 一族当前取值与强调色相同（蓝），但**不跟随**主题色 —— 它表达"信息"而非"可交互"，
|
||||||
|
换紫/绿主色后少数徽标（代理"国外"、HTTP 1xx/3xx、快速面板分类）仍是蓝色，属有意的语义区分。
|
||||||
|
|
||||||
|
5. **预设 + 自定义。**
|
||||||
|
10 个预设（默认蓝 / 靛蓝 / 紫罗兰 / 玫红 / 橙 / 琥珀 / 青柠 / 翠绿 / 青绿 / 石墨）+ 原生取色器。
|
||||||
|
纯自由取色很容易选出对比度不达标的颜色，所以色板优先。
|
||||||
|
色板显示色用**派生后的浅色模式主色**（所见即所得，如青柠显示为压暗后的绿）。
|
||||||
|
|
||||||
|
6. **实时预览 + 可回滚。**
|
||||||
|
点击色块 / 拖动取色器立即生效（写 7 个变量，无防抖）；「恢复默认」清除行内变量回到内置蓝。
|
||||||
|
|
||||||
|
7. **持久化**：随其它设置写入 `thing_app_settings`（`accentId` + `accentHex`）。
|
||||||
|
属**纯增量字段**，`SETTINGS_VERSION` 不递增 —— 递增会命中"版本不匹配清空"分支，
|
||||||
|
把用户的模块排序/启停/开机自启一并抹掉，为零收益付真实数据损失。
|
||||||
|
|
||||||
|
8. **行内变量的优先级陷阱。**
|
||||||
|
变量写在 `documentElement` 的行内样式上，优先级高于 `:root` 与 `.dark` 两条规则，因此：
|
||||||
|
切模式必须**整组 7 个重写**（否则浅色的行内值会残留到深色模式）；
|
||||||
|
恢复默认必须 `removeProperty`（写空串仍算"已设置"）。
|
||||||
|
|
||||||
|
#### 落地范围
|
||||||
|
|
||||||
|
- `src/lib/theme.ts` —— 派生计算 + 应用/清除（新增，含单测）
|
||||||
|
- `src/stores/appStore.ts` —— `accentId`/`accentHex` + `setAccent()`，在 `applyTheme()` 与
|
||||||
|
`handleSystemThemeChange()` 里按当前模式应用
|
||||||
|
- `src/modules/settings/GeneralSettings.vue` —— 「主题色」卡片
|
||||||
|
- 9 个独立窗口（快速面板 / 托盘菜单 / 下载窗 / 剪贴板弹窗与预览 / 翻译弹窗 / 截图覆盖层·编辑器·贴图）
|
||||||
|
各加一行 `applyStoredAccent()`；托盘菜单额外补 `storage` 监听
|
||||||
|
- `src/style.css` —— **无需改动**（7 个变量已是 CSS 变量）
|
||||||
|
- **首屏闪烁（FOUC）不需要额外处理**：主窗口 `visible: false`，`appStore.init()` 在 `show()` 前完成应用；
|
||||||
|
文档原建议的 Rust `initialization_script` 方案与本仓库 localStorage 方案冲突，不实施
|
||||||
|
|
||||||
|
**影响面：0 处组件改动。** 这正是把交互色收敛到 `--primary` 单点带来的收益 —— 现在不做，将来也不用挨个改组件。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. 页面框架
|
||||||
|
|
||||||
|
框架只定义三件事：**谁多高、谁滚动、padding 加在哪**。这三件事定死之前，任何模块级的美化都会被布局 bug 吃掉。
|
||||||
|
|
||||||
|
### 3.1 分区与高度约束链
|
||||||
|
|
||||||
|
```
|
||||||
|
AppShell h-screen flex-col
|
||||||
|
├ TitleBar h-14 shrink-0 固定 · 侧栏图标 + 模块 Tab + 搜索
|
||||||
|
└ 主体 flex-1 min-h-0 flex-row
|
||||||
|
├ Sidebar w-15 shrink-0 60px 固定
|
||||||
|
└ 内容滚动区 flex-1 min-h-0 overflow-y-auto ← 全应用唯一滚动容器
|
||||||
|
└ 内容 wrapper p-5（占满内容宽，无 max-width）
|
||||||
|
```
|
||||||
|
|
||||||
|
Tab 已并入标题栏（见 3.5），内容区不含独立 Tab 行，纵向空间最大化。
|
||||||
|
|
||||||
|
**三个必须遵守的点**（都是实际踩过的坑，不是理论）：
|
||||||
|
|
||||||
|
1. **`min-h-0` 不能漏。**
|
||||||
|
flex 子项默认 `min-height: auto` —— 内容变高时它**不收缩**，直接把父容器顶破，底部 padding 被推出视口。这就是"卡片贴着应用底部"的根因。
|
||||||
|
|
||||||
|
2. **padding 加在滚动容器**内部**的 wrapper 上。**
|
||||||
|
加在滚动容器自身，底部 padding 会被内容高度覆盖，滚动到底依然贴边。
|
||||||
|
|
||||||
|
3. **断点按内容宽度选，不按视口宽度。**
|
||||||
|
侧边栏固定占 60px —— 视口 1000px 时内容只剩 940px。两列网格必须用 `md`(768) 而不是 `lg`(1024)，否则窗口一窄就退化成单列全宽、卡片大片留白。
|
||||||
|
|
||||||
|
### 3.2 滚动归属
|
||||||
|
|
||||||
|
**全应用只有一处滚动容器。**
|
||||||
|
|
||||||
|
- 模块内容区随外层滚动，**不是**每个模块各建一个滚动容器
|
||||||
|
- 模块根 / 页面级容器**禁止** `overflow-y-auto` —— 那会绕过外层 `ScrollArea`，出现原生宽滚动条（快速面板踩过）；根容器一律 `min-h-full`
|
||||||
|
- 局部列表（剪贴板历史、音乐队列等）**可以用 `ScrollArea` 组件**做独立滚动 —— 这是「局部区域」而非「页面级」
|
||||||
|
- 需要固定表头的长表格：用 `position: sticky` 固定表头，而不是给表格单独开滚动容器
|
||||||
|
- 例外：terminal / translate 的工作台面板内部滚动（workbench 模式特征）
|
||||||
|
- 代价：切换 Tab 时共享同一个滚动位置（可以接受，反而更符合"翻页"直觉）
|
||||||
|
|
||||||
|
**统一组件使用规则**（违规即 UI 不一致，等同违反第 5 章 D 系）：
|
||||||
|
|
||||||
|
| 需求 | 用 | 禁止 |
|
||||||
|
|---|---|---|
|
||||||
|
| 页面滚动 | 外层 `ScrollArea`（自动，模块无需处理） | 模块根 `overflow-y-auto` |
|
||||||
|
| 局部列表滚动 | `ScrollArea` 组件 | 原生 `overflow` |
|
||||||
|
| 键值行 / 状态点 / 徽章 / 大数值 | `@/components/common` 对应组件 | 手写 flex 结构 |
|
||||||
|
| 卡片 | `Card` / `InfoGroup(card)` / `StatCard`（统一 `shadow-sm`） | 手写描边块 |
|
||||||
|
| 多分组设置表单 | `SettingGroup` + `SettingRow` | 手写行 |
|
||||||
|
|
||||||
|
### 3.3 内容区宽度
|
||||||
|
|
||||||
|
内容区**不限宽，占满窗口宽度**（已移除 `max-w-6xl` 限制）。窗口拉宽时卡片随内容区延展，不再居中约束。
|
||||||
|
|
||||||
|
### 3.4 内容区布局模式
|
||||||
|
|
||||||
|
内容区**只能**从以下五种里选，不得自创：
|
||||||
|
|
||||||
|
| 模式 | 适用 | 规格 |
|
||||||
|
|---|---|---|
|
||||||
|
| `grid` | 概览 / 状态总览 | `grid-cols-1 md:grid-cols-2`·gap 16·`items-start` 让卡片各自高度 |
|
||||||
|
| `split` | 列表类（clipboard / music / terminal） | 左栏 280–320px·右栏 fill·中间 1px `--border`·无 padding |
|
||||||
|
| `workbench` | 输入-输出类（devtools / translate） | 纵向堆叠·gap 12 |
|
||||||
|
| `settings` | 设置页 | 纵向堆叠·gap 24·复用 `SettingGroup` |
|
||||||
|
| `plain` | 其他 | 纵向堆叠·gap 12 |
|
||||||
|
|
||||||
|
**`grid` 的用法边界**：只适合「各块内容量接近」的概览页。若各块信息量差异大，两列会让矮的那列留空。
|
||||||
|
|
||||||
|
**概览页标准结构 · 「状态横幅 + 卡片网格」**（适用于 proxy / 下载 / 硬件监控，四处横幅已统一，见下方「落地状态」）：
|
||||||
|
|
||||||
|
```
|
||||||
|
第一行：状态横幅（全宽，独立于网格，高约 76px）
|
||||||
|
├ 容器 `Card`（`!py-0 !gap-0`）+ `CardContent`（`flex flex-wrap items-center gap-x-6 gap-y-3 px-4 py-4`）
|
||||||
|
│ 圆角/描边/阴影一律由 Card 提供（`rounded-xl + border + shadow-sm`），禁止手写 `rounded-lg border bg-card`
|
||||||
|
├ 左组成组（状态 → 核心属性 → 实时指标，依次靠左，不把指标悬在中间）
|
||||||
|
│ 状态区 状态点 8px + 状态文字 13px/500 + 进程名 13px 次要色（状态点/文字用语义色；运行态加 status-dot-pulse）
|
||||||
|
│ 指标区 label 11px 灰 + 数值 18px/600 tabular-nums；核心属性（如内核版本、PID）也占一个指标位
|
||||||
|
└ 操作区 运行中 = 重启(outline)+停止(destructive)；停止 = 启动(primary)；sm = 32px；`ml-auto` 推到行尾
|
||||||
|
下方：**两列瀑布流** `columns-1 md:columns-2`（卡片 `break-inside-avoid`，列间距/卡间距 16px），`InfoGroup variant="card"`
|
||||||
|
├ 卡内键值**一律单列**（`InfoGroup columns=1`，一行一条）—— 双列键值会挤压值区，路径类长值被截断
|
||||||
|
├ 瀑布流各卡自然高度、列内堆叠，**没有「同行等高」的配对压力** —— 双列网格的配对调整是反复返工的根源，已废弃
|
||||||
|
├ 表单类内容（下拉/输入）用「label 在上 + 控件全宽」纵排，不塞进键值行的值区
|
||||||
|
└ 阅读顺序为纵向（先左列后右列），分组按重要性排序；列底部不齐是模型特征，不是缺陷
|
||||||
|
```
|
||||||
|
|
||||||
|
**适用判断**：模块概览有「一个核心状态 + 2-4 个实时指标 + 一个主操作」就用横幅；三者不齐的模块直接用卡片网格，不要硬凑横幅。
|
||||||
|
|
||||||
|
**落地状态**（2026-09-21 统一）：proxy 概览 / proxy 连接 / 下载任务 / 硬件监控概览四处横幅均按本节实现 ——
|
||||||
|
- 硬件监控：`PID / 传感器 / 重启 / 事件` 从 `text-xs` 内联「标签: 值」提升为指标位，进程名用 `ThingHK`，操作区 `xs` → `sm`，停止按钮改 `destructive`
|
||||||
|
- 下载：`下载中 / 等待 / 已暂停 / 已完成 / 已取消` 从 `Badge` 改为指标位，且恒显（0 比隐藏更真实，也避免位置漂移）
|
||||||
|
- 状态文字一律「状态 + 进程名」顺序（`运行中 mihomo` / `已连接 ThingHK` / `运行中 下载引擎`）
|
||||||
|
|
||||||
|
**已否决的两个方案**（避免回头再试）：
|
||||||
|
- **平铺分组**（InfoGroup 无容器版）：无容器所以视觉"散"；键值两端对齐导致一行一条时"空"。
|
||||||
|
- **等宽两列卡片**：内容量不齐导致列内留白。D2 之所以成立，是横幅吸收了最"高"的内容（状态+指标），剩下的卡片内容量天然接近。
|
||||||
|
|
||||||
|
**设置行**结构（`SettingGroup` + `SettingRow`）：
|
||||||
|
```
|
||||||
|
分组标题（h2 14/600）+ 可选说明
|
||||||
|
└ 设置行：左 label · 右控件，行高 44，行间 1px --divider
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3.5 导航与 Tab
|
||||||
|
|
||||||
|
**Tab 只有一处：标题栏。** 模块内容区不再渲染 Tab 行。
|
||||||
|
|
||||||
|
| 层级 | 位置 | 内容 |
|
||||||
|
|---|---|---|
|
||||||
|
| 一级导航 | 侧边栏 60px | 模块图标（代理 / 音乐 / 剪贴板…） |
|
||||||
|
| 二级导航 | **标题栏内** | 当前模块的 Tab（概览 / 连接 / 节点 / 订阅 / 设置） |
|
||||||
|
|
||||||
|
**为什么**：Tab 行独占 48px 纵向空间，却只承载一个切换器。并入标题栏后，内容区最大化。
|
||||||
|
|
||||||
|
**实现**：
|
||||||
|
```ts
|
||||||
|
useModuleTabs('proxy', activeTab, tabs, { alwaysVisible: true })
|
||||||
|
```
|
||||||
|
- 模块**不渲染** `TabsList`，标题栏切换器常驻
|
||||||
|
- 传 `alwaysVisible` 后不再注册 `IntersectionObserver`
|
||||||
|
- 未传该选项的模块保持原行为（Tab 行滚出视口时才在标题栏补一个）—— 属过渡状态，应逐步迁移
|
||||||
|
|
||||||
|
**选中态**：`--primary` 实心胶囊 + 白字。标题栏空间小、Tab 数量少，实心比下划线更易扫读。
|
||||||
|
|
||||||
|
> 过渡期存在两套 Tab 外观：模块内的 `TabsList`（下划线）与标题栏切换器（实心胶囊）。**全部模块迁移完成后，只保留标题栏这一套**，那时 `TabsTrigger` 的下划线样式可以简化掉。
|
||||||
|
|
||||||
|
### 3.6 状态覆盖（P3 落地）
|
||||||
|
|
||||||
|
每种模式都必须实现四态，**抽成通用组件，不在模块内手写**：
|
||||||
|
|
||||||
|
| 状态 | 组件 | 表现 |
|
||||||
|
|---|---|---|
|
||||||
|
| 加载 | `<StateBlock variant="loading">` | Spinner 16px + "加载中…"，高度撑满容器最小 120px |
|
||||||
|
| 空 | `<StateBlock variant="empty">` | 图标 32px(`--muted-foreground`) + 说明 caption + 可选主按钮 |
|
||||||
|
| 错误 | `<StateBlock variant="error">` | 图标 32px(`--danger`) + 错误信息 + "重试"次按钮 |
|
||||||
|
| 无权限 | `<StateBlock variant="denied">` | 图标 + 说明 + 引导操作 |
|
||||||
|
|
||||||
|
**验收**：随机打开任一模块的任一 Tab，断网/清空数据/制造错误，都必须看到对应的块，而不是空白。
|
||||||
|
|
||||||
|
### 3.7 页面构造示例 · proxy（样板，含其余四页规划）
|
||||||
|
|
||||||
|
概览页已定稿（横幅 + 瀑布流）。其余四页用**同一套模式**组装，空态一律按 M8（结构恒定 + `—` 占位）：
|
||||||
|
|
||||||
|
**统一原则（四页共用）**
|
||||||
|
1. 每页从 3.4 的模式里选一种承载，不自创
|
||||||
|
2. 统计类信息统一用「指标行」形态（与横幅指标区同构：label 11 + 数值 18/600），容器口径同横幅 —— 用 `Card` 承载，不做裸指标行（M8）
|
||||||
|
3. 表格/列表统一用卡片承载，长表头 `sticky`
|
||||||
|
4. 行内操作集中在行尾，用 `icon-sm`（28px），禁微缩按钮
|
||||||
|
|
||||||
|
**连接** —— 指标行 + 表格卡（workbench 变体）
|
||||||
|
```
|
||||||
|
指标行：活跃连接 + 规则命中 chips（与概览横幅同容器 Card + `px-4 py-4`；chips 紧挨活跃连接，随命中项变化向右延伸）
|
||||||
|
下载/上传速率已删（与概览横幅重复）；命中规则计数已删（恒等于活跃连接数）
|
||||||
|
表格卡（全宽）：进程/域名 + 国内国外徽章 + 规则 + 上下行流量 + 断开
|
||||||
|
表头 sticky · 行 hover(bg-hover) · 空态「暂无活跃连接」
|
||||||
|
```
|
||||||
|
|
||||||
|
**节点** —— 组导航 + 节点网格
|
||||||
|
```
|
||||||
|
顶部：代理组切换（SegmentedNav，组多时降级为 Select）+ 测速按钮（行右）
|
||||||
|
节点网格：节点小卡（名称 + 延迟徽章 + 选中态 primary-soft），grid-cols-2 lg:grid-cols-3
|
||||||
|
未运行时网格空态「暂无节点」，结构不变
|
||||||
|
```
|
||||||
|
|
||||||
|
**订阅** —— 列表卡 + 导入区（plain 模式）
|
||||||
|
```
|
||||||
|
列表卡：行式（名称 / 更新时间 / 节点数 + 更新、删除），行高 52，行间 1px divider
|
||||||
|
导入区：URL 输入 + 导入按钮，置于列表卡上方
|
||||||
|
空态「暂无订阅」+ 主按钮引导导入
|
||||||
|
```
|
||||||
|
|
||||||
|
**设置** —— 单卡 + 卡内标题（峰定稿偏好：设置页标题留在卡片内）
|
||||||
|
```
|
||||||
|
单张设置卡承载全部设置项，卡片占满内容宽（放大居中与概览/连接一致）
|
||||||
|
输入类双列（md:grid-cols-2）、开关行「左说明右开关」、提示条 primary-soft 底；保存按钮在标题栏
|
||||||
|
（SettingGroup / SettingRow 保留，用于全局设置页等多分组场景）
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. 组件规范
|
||||||
|
|
||||||
|
### 4.1 业务组件清单（统一从 `@/components/common` 导入）
|
||||||
|
|
||||||
|
以下 14 个组件已建立完成。**模块内不得再手写同类结构**——这是"UI 不统一"反复复发的根本原因：只要没有现成的替代品，开发者就只能手写。
|
||||||
|
|
||||||
|
| # | 组件 | 解决的问题 | 关键 props |
|
||||||
|
|---|---|---|---|
|
||||||
|
| 1 | `ModuleShell` | **页面框架落地件**：高度约束链 + 滚动归属 + 内容区 padding/限宽 | `layout`, `padded`, `maxWidth`, `tabs` |
|
||||||
|
| 2 | `ModuleToolbar` | 模块内容区顶部操作条 | `slot: left/right` |
|
||||||
|
| 3 | `SectionHeader` | 区块标题 + 说明 + 右侧操作 | `title`, `description`, `slot: action` |
|
||||||
|
| 4 | `StatCard` | 键值卡片（需要视觉分组的独立块） | `title`, `description`, `slot: action` |
|
||||||
|
| 4a | `InfoGroup` | **平铺分组**（概览页键值快照，密度优先） | `title`, `columns`, `slot: action` / `slot: footer` |
|
||||||
|
| 5 | `MetricValue` | 大数值 + 标签 + 单位 + 方向色 | `value`, `unit`, `label`, `trend` |
|
||||||
|
| 6 | `KeyValueRow` | 键值行（状态/版本/路径） | `label`, `value`, `slot: value` |
|
||||||
|
| 7 | `StatusDot` | 状态点 + 文字 | `state: success/warning/danger/neutral`, `label` |
|
||||||
|
| 8 | `StatusBadge` | 徽章 | `variant`, `size: sm/md` |
|
||||||
|
| 9 | `SettingRow` | 设置行 | `label`, `description`, `slot: control` |
|
||||||
|
| 10 | `SettingGroup` | 设置分组 | `title`, `description` |
|
||||||
|
| 11 | `DataListRow` | 列表行（主从分栏左栏） | `title`, `subtitle`, `active`, `slot: trailing` |
|
||||||
|
| 12 | `StateBlock` | 加载/空/错误/无权限 | `variant`, `title`, `description`, `slot: action` |
|
||||||
|
| 13 | `CopyField` | 可复制文本（路径、版本号） | `value`, `mono` |
|
||||||
|
| 14 | `ConfirmDialog` | 破坏性操作确认 | `title`, `description`, `variant: danger` |
|
||||||
|
|
||||||
|
### 4.2 关键组件规格
|
||||||
|
|
||||||
|
**按钮**（基于 shadcn `Button`，只调 token 与尺寸）
|
||||||
|
|
||||||
|
| 变体 | 底色 | 文字 | 描边 | 用途 |
|
||||||
|
|---|---|---|---|---|
|
||||||
|
| `default`（主） | `--primary` | `--primary-foreground` | 无 | 每屏仅 1 个 |
|
||||||
|
| `outline`（次） | `--card` | `--foreground` | `--border-strong` | 常规操作 |
|
||||||
|
| `ghost`（幽灵） | 无底 / hover `--primary-soft` | `--fg-secondary` / hover `--primary-soft-text` | 无 | 工具栏、行内 |
|
||||||
|
| `destructive`（危险） | `--danger` | 白 | 无 | 停止/删除，需确认 |
|
||||||
|
|
||||||
|
尺寸：`sm` 高 28 / `default` 高 34 / `lg` 高 40。内边距 `px-3.5`（default），圆角 `radius-md`。按下统一 `scale(0.97)`。
|
||||||
|
**禁止** `h-4 px-1.5 text-[10px]` 这类微缩按钮（`ProxyModule.vue:1768` 有此写法）——需要更小的按钮时用 `StatusBadge`。
|
||||||
|
|
||||||
|
**交互反馈（hover / active / focus）**
|
||||||
|
|
||||||
|
| 场景 | hover | active |
|
||||||
|
|---|---|---|
|
||||||
|
| 主按钮 | `--primary-hover`（变深） | `--primary-active` |
|
||||||
|
| 次按钮 / 卡片 | `--hover`（中性加深） | `--active` |
|
||||||
|
| 幽灵按钮 / 图标按钮 | `--primary-soft` + `--primary-soft-text` | `--primary-soft` |
|
||||||
|
| 列表行 / 菜单项 | `--hover` | — |
|
||||||
|
| 选中行 / 选中 Tab | — | `--primary-soft` |
|
||||||
|
|
||||||
|
**焦点环**全应用统一：`ring-2 ring-ring/40`。hover ≠ selected：hover 表达"可以点"，selected 表达"已经选中"，后者才用强调色。
|
||||||
|
|
||||||
|
**状态点**
|
||||||
|
|
||||||
|
```
|
||||||
|
8px 圆 · border-radius: full · 底色 = 对应 --<state>
|
||||||
|
与文字间距 6px · 文字用 body 或 label
|
||||||
|
```
|
||||||
|
可选呼吸动效（运行中）：`opacity` 1↔0.55，1.8s 循环，`prefers-reduced-motion` 下禁用。
|
||||||
|
|
||||||
|
**徽章**
|
||||||
|
|
||||||
|
```
|
||||||
|
高 20 · 内边距 3px 8px · 圆角 radius-sm
|
||||||
|
底 --<state>-soft · 文字 --<state>-text · 字号 label(11/500)
|
||||||
|
```
|
||||||
|
|
||||||
|
**卡片**
|
||||||
|
|
||||||
|
```
|
||||||
|
底 --card · 1px --border · 圆角 radius-lg(12) · 内边距 space-4(16)
|
||||||
|
标题 h2(14/600) · 标题与内容间距 space-3(12)
|
||||||
|
统一轻阴影 shadow-sm（--shadow-card）—— shadcn Card / InfoGroup card / StatCard 一致
|
||||||
|
```
|
||||||
|
|
||||||
|
**输入 / 下拉 / 分段控件**
|
||||||
|
|
||||||
|
```
|
||||||
|
高度 34 · 圆角 radius-md(8) · 1px --border
|
||||||
|
输入与下拉态：底 --card
|
||||||
|
分段控件：外槽底 --subtle,内边距 3,选中项底 --card + 文字 --foreground,未选中项文字 --fg-secondary
|
||||||
|
聚焦：border 不变，box-shadow: 0 0 0 2px --ring(40% alpha)
|
||||||
|
```
|
||||||
|
|
||||||
|
### 4.3 组件用法要点
|
||||||
|
|
||||||
|
- 业务组件统一从 `@/components/common` 导入（见 4.1 清单），模块内禁止手写同类结构。
|
||||||
|
- 页面用 `ModuleShell` 包裹，通过 `layout`（grid / split / workbench / settings / plain）选内容区模式。
|
||||||
|
- 内容区先按四态组织：先 `loading`，再 `empty`/`error`，最后才是数据内容（见 3.6 / M8）。
|
||||||
|
- 颜色只用 token 类名（`bg-card border border-border`），禁止 hex 与原生色阶（见第 5 章 D1–D2）。
|
||||||
|
- 数值统一 `tabular-nums`；状态点 / 徽章用 `StatusDot` / `StatusBadge`，键值用 `KeyValueRow` / `InfoGroup`。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. 开发约束（硬性）
|
||||||
|
|
||||||
|
### 5.1 禁止清单
|
||||||
|
|
||||||
|
| # | 禁止 | 替代方案 |
|
||||||
|
|---|---|---|
|
||||||
|
| D1 | 组件内出现 hex / rgb / oklch 字面量 | 用语义 token 类名 |
|
||||||
|
| D2 | Tailwind 原生色阶 `bg-blue-500` `text-emerald-700` `border-slate-200` | 用 `bg-primary` `text-success-text` `border-border` |
|
||||||
|
| D3 | 间距/圆角/尺寸的任意值 `p-[18px]` `rounded-[10px]` | 归位 4px 栅格：`p-4` `rounded-md`（非 4 倍数就近归档）。**字号例外**：正文标准档 `text-[11px]`~`text-[14px]` 是项目字号体系（Tailwind 无 13px 预设），允许保留；非标准档（15/13.5/16px 等）归位最近标准档 |
|
||||||
|
| D4 | 用状态色表达可点击性（绿色按钮 = 主操作） | 主操作一律 `--primary` |
|
||||||
|
| D5 | 卡片使用重阴影（shadow-popover / shadow-dialog 或 hover 抬起阴影） | 卡片统一轻阴影 `shadow-sm` |
|
||||||
|
| D6 | 模块内手写状态点 / 徽章 / 卡片标题 / 键值行 | 用第 4.1 节组件 |
|
||||||
|
| D7 | 混用图标库，或用 Unicode 符号（`↓ ✓ ● ▸`）当图标 | lucide，尺寸 14/16/20 |
|
||||||
|
| D8 | 中文加负字距 | `letter-spacing: 0` |
|
||||||
|
| D9 | 生产代码 `@import` 外部字体 CDN | 系统字体栈 |
|
||||||
|
| D10 | 数据驱动界面缺四态之一 | `StateBlock` |
|
||||||
|
| D11 | 一屏多个主按钮 / 破坏性操作与主操作同权重 | 视觉降级 + `ConfirmDialog` |
|
||||||
|
| D12 | 在 `.dark` 下靠改组件类名做适配 | 只改 token，组件代码不感知主题 |
|
||||||
|
|
||||||
|
### 5.2 必须清单
|
||||||
|
|
||||||
|
- **M1** 新增模块必须使用 `ModuleShell`，内容区三选一（第 3.2 节）
|
||||||
|
- **M2** 所有颜色/间距/圆角/字号可追溯到 `style.css` 的 token
|
||||||
|
- **M3** 深色模式与浅色模式同时验证，不得只测一套
|
||||||
|
- **M4** 数值使用 `tabular-nums`
|
||||||
|
- **M5** 动效尊重 `prefers-reduced-motion`
|
||||||
|
- **M6** 控件最小点击区 28×28（桌面标准，非触摸的 44）
|
||||||
|
- **M7** 文字与背景对比度 ≥ 4.5:1；`--muted-foreground` 不得用于正文，只用于 ≥12px 的辅助信息
|
||||||
|
- **M8** 数据驱动的界面**结构恒定**：无数据时保持完整结构、值用 `—` 占位（横幅、键值行、表格单元同规则）；**不得**用「xx 未运行」之类文案整块替换结构。运行状态由横幅状态区或状态点表达，不在卡片内复述。控件在不可用时禁用，而不是隐藏整块。
|
||||||
|
`—` 与 `0` 的区分：`—` = 数据缺失/不适用（如未运行时的 PID）；`0` = 语义上就是零（如未运行时的连接数、速率）—— 可计数指标显示 0 比 `—` 更真实。指标行/横幅必须有容器（卡片），裸指标行浮在画布上与页面不协调。
|
||||||
|
- **M9** 动态数值的指标位**按数据类型固定最小宽度**：速率/流量/计数高频刷新，宽度变化会左右推移兄弟元素。做法同 OSD（`tabular-nums` + `min-width`）。**宽度按内容定，不要一刀切**——速率 `min-w-24`（容纳 `999 KB/s`）、版本/累计 `min-w-20`、纯计数 `min-w-12`；统一给大值会留白并把同卡操作按钮挤换行
|
||||||
|
- **M8** 键盘可聚焦元素必须有可见焦点环（`ring-2 ring-ring/40`）
|
||||||
|
|
||||||
|
### 5.3 Code Review 检查点
|
||||||
|
|
||||||
|
提交前自查（建议做成 MR 模板 checklist）：
|
||||||
|
|
||||||
|
1. `grep -rE "(#[0-9a-fA-F]{3,8}|(bg|text|border)-(slate|gray|zinc|blue|emerald|amber|red|rose|orange|sky|purple|violet)-[0-9]{2,3})" src/` **无新增命中**
|
||||||
|
2. `grep -rE "\w-\[[^\]]+\]" src/` 新增行数可控且能说明理由
|
||||||
|
3. 深浅两套主题截图留存
|
||||||
|
4. 加载/空/错误三态至少手动触发过一次
|
||||||
|
5. 破坏性操作有确认
|
||||||
|
|
||||||
|
**建议自动化**：加入 ESLint 规则，直接拦截 D1–D3。
|
||||||
|
|
||||||
|
```js
|
||||||
|
// eslint 思路示例：禁止特定 class 模式
|
||||||
|
{
|
||||||
|
files: ['**/*.vue'],
|
||||||
|
rules: {
|
||||||
|
'no-restricted-syntax': [
|
||||||
|
'error',
|
||||||
|
{
|
||||||
|
selector: 'Literal[value=/(bg|text|border)-(slate|gray|zinc|blue|emerald|amber|red|rose|orange|sky|purple|violet)-\\d{3}/]',
|
||||||
|
message: '禁止使用 Tailwind 原生色阶，请使用语义 token（见 UI_DESIGN_SYSTEM.md 第 5.1 节 D2）'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. 工具与状态
|
||||||
|
|
||||||
|
### 6.1 组件预览页（改 token 后的回归工具）
|
||||||
|
|
||||||
|
路径：`preview/` —— **不在生产构建入口内**，只在 `bun dev` 时可访问。
|
||||||
|
|
||||||
|
```bash
|
||||||
|
bun dev
|
||||||
|
# 浏览器打开 http://localhost:14210/preview/index.html
|
||||||
|
```
|
||||||
|
|
||||||
|
用途：改完 `src/style.css` 的 token 后，把全部基础组件与业务组件过一遍，确认浅色 / 深色两套都正确 —— 替代"改完 token 靠记忆推断影响面"。本页不依赖任何 Tauri API，纯浏览器即可运行。
|
||||||
|
|
||||||
|
查询参数：
|
||||||
|
|
||||||
|
| 参数 | 作用 | 示例 |
|
||||||
|
|---|---|---|
|
||||||
|
| `theme=dark` | 以深色模式启动 | `?theme=dark` |
|
||||||
|
| `only=<id>` | 只渲染指定分区，便于放大核对 | `?only=data` |
|
||||||
|
|
||||||
|
已内置 `id` 的分区：`forms`、`data`、`shell`。需要放大看其他分区时，按同样方式给 `<section>` 加 `id` 即可。
|
||||||
|
|
||||||
|
> **实现注意**：`only` 的隔离 CSS 只能用**显式标记**（`[data-block]` / `[data-page-header]`），**不能用 `section` / `header` 这类标签选择器**——`StatCard` 内部也用 `<section>` 和 `<header>`，会被一起隐藏，产生"组件没渲染"的假象。
|
||||||
|
|
||||||
|
### 6.2 当前状态
|
||||||
|
|
||||||
|
- 业务组件层（第 4.1 节 14 个组件）与 Token 层已落地，`preview/` 预览页已完成浅色/深色视觉回归。
|
||||||
|
- 色阶治理：Tailwind 原生色阶从约 155 处降至 3 处（proxy / terminal / monitor / translate / music 的色阶与 Tabs 已完成）。
|
||||||
|
- proxy 概览页定稿为「状态横幅 + 两列瀑布流」，InfoGroup 新增 `variant="card"`。
|
||||||
|
- 状态横幅统一（2026-09-21）：proxy 概览 / proxy 连接 / 下载任务 / 硬件监控概览四处横幅统一为 §3.4 的三段式（状态区 → 指标区 → 操作区）+ `Card` 容器；监控与下载的旧样式（`text-xs` 内联键值、Badge 计数、`xs` 按钮）已废弃。
|
||||||
|
- 主题色自定义落地（2026-09-21，见 §2.9）：`src/lib/theme.ts` + `appStore.setAccent()` + 设置页「主题色」卡片（10 预设 + 自定义），深浅两套自动派生、对比度自动兜底；组件层 0 改动。
|
||||||
|
- 终端模块非终端页对齐（2026-09-21，见 TERMINAL_MODULE_PLAN.md §5）：根 padding 归类、列表 Card 化、表单走 `@/components/ui` 原语、四态/徽章走 `@/components/common`、设置页用 `SettingGroup`/`SettingRow`（此后二者与 `StateBlock`/`StatusBadge` 有真实消费者）；终端画布、状态栏、`h-11` 契约、xterm 链保持不动。
|
||||||
|
- 剩余项：
|
||||||
|
- `OsdWindow` 免改（功能性配置，非 UI token 问题）
|
||||||
|
- `DownloadWindow` / `ClipboardPopup` 仍有少量 hex，待统一
|
||||||
|
- ESLint 约束规则（第 5.3 节）尚未搭建
|
||||||
|
|
||||||
|
### 6.3 待决策
|
||||||
|
|
||||||
|
| # | 问题 | 状态 | 结论 / 影响 |
|
||||||
|
|---|---|---|---|
|
||||||
|
| 1 | 数据方向色是否与状态色解耦 | 已定（暂保留现有取值） | 保留"下载=绿、上传=红"，已独立成 `--data-*` token，要换色只改这 2 个值 |
|
||||||
|
| 2 | 强调色用 `#0066CC` | ✅ 已采用 | 落地；同时解决 shadcn primary 近黑导致按钮发灰 |
|
||||||
|
| 3 | 浮窗（OSD/截图/下载）是否纳入统一体系 | 部分已定 | `OsdWindow` 免改（功能性配置）；`DownloadWindow`/`ClipboardPopup` 少量 hex 待统一；不强行并入主界面 token |
|
||||||
|
| 4 | `--font-mono` 是否用网络字体 | ✅ 已定 | 系统 `Cascadia Code` / `Consolas`，不引外部字体 |
|
||||||
|
| 5 | 侧边栏宽度 60px | ✅ 已定 | 沿用现有实现 |
|
||||||
|
| 6 | 内容区限宽 | ✅ 已定 | 改为**不限宽占满**窗口宽度（原 `max-w-6xl` 限制已移除） |
|
||||||
|
| 7 | 卡片阴影 | ✅ 已定 | 卡片统一轻阴影 `shadow-sm`（shadcn Card / InfoGroup card / StatCard 一致），浮层仍用 `shadow-popover`/`shadow-dialog` |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
**维护约定**：Token 值以 `src/style.css` 为唯一事实来源，本文档与之同步；两者冲突时以本文档为准并修正代码。新增 token 或组件须同步更新第 2、4 章。
|
||||||
@@ -13,6 +13,13 @@
|
|||||||
"@tauri-apps/plugin-global-shortcut": "^2",
|
"@tauri-apps/plugin-global-shortcut": "^2",
|
||||||
"@tauri-apps/plugin-opener": "^2",
|
"@tauri-apps/plugin-opener": "^2",
|
||||||
"@vueuse/core": "^14.4.0",
|
"@vueuse/core": "^14.4.0",
|
||||||
|
"@xterm/addon-fit": "^0.11.0",
|
||||||
|
"@xterm/addon-search": "^0.16.0",
|
||||||
|
"@xterm/addon-serialize": "^0.14.0",
|
||||||
|
"@xterm/addon-unicode11": "^0.9.0",
|
||||||
|
"@xterm/addon-web-links": "^0.12.0",
|
||||||
|
"@xterm/addon-webgl": "^0.19.0",
|
||||||
|
"@xterm/xterm": "^6.0.0",
|
||||||
"class-variance-authority": "^0.7.1",
|
"class-variance-authority": "^0.7.1",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"pinia": "^3.0.4",
|
"pinia": "^3.0.4",
|
||||||
@@ -28,6 +35,9 @@
|
|||||||
"@tauri-apps/cli": "^2",
|
"@tauri-apps/cli": "^2",
|
||||||
"@types/node": "^26.1.1",
|
"@types/node": "^26.1.1",
|
||||||
"@vitejs/plugin-vue": "^5.2.1",
|
"@vitejs/plugin-vue": "^5.2.1",
|
||||||
|
"@vue/eslint-config-typescript": "^14.9.0",
|
||||||
|
"eslint": "^10.11.0",
|
||||||
|
"eslint-plugin-vue": "^10.11.0",
|
||||||
"tw-animate-css": "^1.4.0",
|
"tw-animate-css": "^1.4.0",
|
||||||
"typescript": "~5.6.2",
|
"typescript": "~5.6.2",
|
||||||
"vite": "^6.0.3",
|
"vite": "^6.0.3",
|
||||||
@@ -44,6 +54,10 @@
|
|||||||
|
|
||||||
"@babel/types": ["@babel/types@7.29.7", "https://registry.npmmirror.com/@babel/types/-/types-7.29.7.tgz", { "dependencies": { "@babel/helper-string-parser": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7" } }, "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA=="],
|
"@babel/types": ["@babel/types@7.29.7", "https://registry.npmmirror.com/@babel/types/-/types-7.29.7.tgz", { "dependencies": { "@babel/helper-string-parser": "^7.29.7", "@babel/helper-validator-identifier": "^7.29.7" } }, "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA=="],
|
||||||
|
|
||||||
|
"@cacheable/memory": ["@cacheable/memory@2.2.0", "https://registry.npmmirror.com/@cacheable/memory/-/memory-2.2.0.tgz", { "dependencies": { "@cacheable/utils": "^2.5.0", "@keyv/bigmap": "^1.3.1", "hookified": "^1.15.1", "keyv": "^5.6.0" } }, "sha512-CTLKqLItRCEixEAewD3/j9DB3/o96gpTPD4eJ1v+DGOlxZRZncRQkGYqqnAGCscYd6RNeXfGeiuCphsPtqyIfQ=="],
|
||||||
|
|
||||||
|
"@cacheable/utils": ["@cacheable/utils@2.5.0", "https://registry.npmmirror.com/@cacheable/utils/-/utils-2.5.0.tgz", { "dependencies": { "hashery": "^1.5.1", "keyv": "^5.6.0" } }, "sha512-buipgOVDkkPXNR5+xBpDw7Zk2n1EvU7qBJCNUcL7rhQ//kfpOXPAvQ511Os0vpLYJ1pZnvudNytkQt2hst3wqA=="],
|
||||||
|
|
||||||
"@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.25.12", "https://registry.npmmirror.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz", { "os": "aix", "cpu": "ppc64" }, "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA=="],
|
"@esbuild/aix-ppc64": ["@esbuild/aix-ppc64@0.25.12", "https://registry.npmmirror.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz", { "os": "aix", "cpu": "ppc64" }, "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA=="],
|
||||||
|
|
||||||
"@esbuild/android-arm": ["@esbuild/android-arm@0.25.12", "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.25.12.tgz", { "os": "android", "cpu": "arm" }, "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg=="],
|
"@esbuild/android-arm": ["@esbuild/android-arm@0.25.12", "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.25.12.tgz", { "os": "android", "cpu": "arm" }, "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg=="],
|
||||||
@@ -96,6 +110,20 @@
|
|||||||
|
|
||||||
"@esbuild/win32-x64": ["@esbuild/win32-x64@0.25.12", "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz", { "os": "win32", "cpu": "x64" }, "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA=="],
|
"@esbuild/win32-x64": ["@esbuild/win32-x64@0.25.12", "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz", { "os": "win32", "cpu": "x64" }, "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA=="],
|
||||||
|
|
||||||
|
"@eslint-community/eslint-utils": ["@eslint-community/eslint-utils@4.10.1", "https://registry.npmmirror.com/@eslint-community/eslint-utils/-/eslint-utils-4.10.1.tgz", { "dependencies": { "eslint-visitor-keys": "^3.4.3" }, "peerDependencies": { "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, "sha512-cuadcxVFE8sDK6iWJbs8Sn0av2Nrh2QSGQhVlBW9AaAHqHwjWsZHT8LJ4hFGPh7ASBV2deFdM7H/DPjulmh8rg=="],
|
||||||
|
|
||||||
|
"@eslint-community/regexpp": ["@eslint-community/regexpp@4.12.2", "https://registry.npmmirror.com/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", {}, "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew=="],
|
||||||
|
|
||||||
|
"@eslint/config-array": ["@eslint/config-array@0.23.5", "https://registry.npmmirror.com/@eslint/config-array/-/config-array-0.23.5.tgz", { "dependencies": { "@eslint/object-schema": "^3.0.5", "debug": "^4.3.1", "minimatch": "^10.2.4" } }, "sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA=="],
|
||||||
|
|
||||||
|
"@eslint/config-helpers": ["@eslint/config-helpers@0.7.0", "https://registry.npmmirror.com/@eslint/config-helpers/-/config-helpers-0.7.0.tgz", { "dependencies": { "@eslint/core": "^1.2.1" } }, "sha512-DObd/KKUsU+FaFv4PLxSRenpXfQWmPXXP3pPZ6/K1PCrMu2vQpMDMuQe/BqYeoLcz8ro0bVDF1RxOJgfVEdhUw=="],
|
||||||
|
|
||||||
|
"@eslint/core": ["@eslint/core@1.2.1", "https://registry.npmmirror.com/@eslint/core/-/core-1.2.1.tgz", { "dependencies": { "@types/json-schema": "^7.0.15" } }, "sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ=="],
|
||||||
|
|
||||||
|
"@eslint/object-schema": ["@eslint/object-schema@3.0.5", "https://registry.npmmirror.com/@eslint/object-schema/-/object-schema-3.0.5.tgz", {}, "sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw=="],
|
||||||
|
|
||||||
|
"@eslint/plugin-kit": ["@eslint/plugin-kit@0.7.3", "https://registry.npmmirror.com/@eslint/plugin-kit/-/plugin-kit-0.7.3.tgz", { "dependencies": { "@eslint/core": "^1.2.1", "levn": "^0.4.1" } }, "sha512-IkO+/KEUvwbVpiURZg+P7zF74z5Jxe0UgJxVni+RtoHQ6IZieXaO02kmadomap/q+l6bc/jdPGGqTjhuZnuz1Q=="],
|
||||||
|
|
||||||
"@floating-ui/core": ["@floating-ui/core@1.8.0", "https://registry.npmmirror.com/@floating-ui/core/-/core-1.8.0.tgz", { "dependencies": { "@floating-ui/utils": "^0.2.12" } }, "sha512-0CIZ5itps/8x7BG8dEIhs53BvCUH2PCoogtakwRTut+Arm58sJooJ0AuZhLw2HJYIR5cMLNPBSS728sPho2khQ=="],
|
"@floating-ui/core": ["@floating-ui/core@1.8.0", "https://registry.npmmirror.com/@floating-ui/core/-/core-1.8.0.tgz", { "dependencies": { "@floating-ui/utils": "^0.2.12" } }, "sha512-0CIZ5itps/8x7BG8dEIhs53BvCUH2PCoogtakwRTut+Arm58sJooJ0AuZhLw2HJYIR5cMLNPBSS728sPho2khQ=="],
|
||||||
|
|
||||||
"@floating-ui/dom": ["@floating-ui/dom@1.8.0", "https://registry.npmmirror.com/@floating-ui/dom/-/dom-1.8.0.tgz", { "dependencies": { "@floating-ui/core": "^1.8.0", "@floating-ui/utils": "^0.2.12" } }, "sha512-yXSrzeHZBTZadLOlfyhCkJHNeLJnHRnRInwdZ40L7ZiaAtrBwoYlsDrX3v5zB1Utk7CLfzcOVnVVWoXEky7Ceg=="],
|
"@floating-ui/dom": ["@floating-ui/dom@1.8.0", "https://registry.npmmirror.com/@floating-ui/dom/-/dom-1.8.0.tgz", { "dependencies": { "@floating-ui/core": "^1.8.0", "@floating-ui/utils": "^0.2.12" } }, "sha512-yXSrzeHZBTZadLOlfyhCkJHNeLJnHRnRInwdZ40L7ZiaAtrBwoYlsDrX3v5zB1Utk7CLfzcOVnVVWoXEky7Ceg=="],
|
||||||
@@ -104,6 +132,16 @@
|
|||||||
|
|
||||||
"@floating-ui/vue": ["@floating-ui/vue@1.1.11", "https://registry.npmmirror.com/@floating-ui/vue/-/vue-1.1.11.tgz", { "dependencies": { "@floating-ui/dom": "^1.7.6", "@floating-ui/utils": "^0.2.11", "vue-demi": ">=0.13.0" } }, "sha512-HzHKCNVxnGS35r9fCHBc3+uCnjw9IWIlCPL683cGgM9Kgj2BiAl8x1mS7vtvP6F9S/e/q4O6MApwSHj8hNLGfw=="],
|
"@floating-ui/vue": ["@floating-ui/vue@1.1.11", "https://registry.npmmirror.com/@floating-ui/vue/-/vue-1.1.11.tgz", { "dependencies": { "@floating-ui/dom": "^1.7.6", "@floating-ui/utils": "^0.2.11", "vue-demi": ">=0.13.0" } }, "sha512-HzHKCNVxnGS35r9fCHBc3+uCnjw9IWIlCPL683cGgM9Kgj2BiAl8x1mS7vtvP6F9S/e/q4O6MApwSHj8hNLGfw=="],
|
||||||
|
|
||||||
|
"@humanfs/core": ["@humanfs/core@0.19.2", "https://registry.npmmirror.com/@humanfs/core/-/core-0.19.2.tgz", { "dependencies": { "@humanfs/types": "^0.15.0" } }, "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA=="],
|
||||||
|
|
||||||
|
"@humanfs/node": ["@humanfs/node@0.16.8", "https://registry.npmmirror.com/@humanfs/node/-/node-0.16.8.tgz", { "dependencies": { "@humanfs/core": "^0.19.2", "@humanfs/types": "^0.15.0", "@humanwhocodes/retry": "^0.4.0" } }, "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ=="],
|
||||||
|
|
||||||
|
"@humanfs/types": ["@humanfs/types@0.15.0", "https://registry.npmmirror.com/@humanfs/types/-/types-0.15.0.tgz", {}, "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q=="],
|
||||||
|
|
||||||
|
"@humanwhocodes/module-importer": ["@humanwhocodes/module-importer@1.0.1", "https://registry.npmmirror.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", {}, "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="],
|
||||||
|
|
||||||
|
"@humanwhocodes/retry": ["@humanwhocodes/retry@0.4.3", "https://registry.npmmirror.com/@humanwhocodes/retry/-/retry-0.4.3.tgz", {}, "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ=="],
|
||||||
|
|
||||||
"@internationalized/date": ["@internationalized/date@3.12.2", "https://registry.npmmirror.com/@internationalized/date/-/date-3.12.2.tgz", { "dependencies": { "@swc/helpers": "^0.5.0" } }, "sha512-FY1Y+H64NDs+HAF6omlnWxm3mEpfgaCSWtL5l551ZZfImA+kGjPFgrnJrGjH6lfmLL0g8Z/mBu1R3kufeCp6Jw=="],
|
"@internationalized/date": ["@internationalized/date@3.12.2", "https://registry.npmmirror.com/@internationalized/date/-/date-3.12.2.tgz", { "dependencies": { "@swc/helpers": "^0.5.0" } }, "sha512-FY1Y+H64NDs+HAF6omlnWxm3mEpfgaCSWtL5l551ZZfImA+kGjPFgrnJrGjH6lfmLL0g8Z/mBu1R3kufeCp6Jw=="],
|
||||||
|
|
||||||
"@internationalized/number": ["@internationalized/number@3.6.7", "https://registry.npmmirror.com/@internationalized/number/-/number-3.6.7.tgz", { "dependencies": { "@swc/helpers": "^0.5.0" } }, "sha512-3ji1fcrT+FPAK86UqEhB/psHixYo6niWPJtt7+qRaYFynt/BaJG8GhAPimtWUpEiVSTq8ZM8L5psMxGquiB/Vg=="],
|
"@internationalized/number": ["@internationalized/number@3.6.7", "https://registry.npmmirror.com/@internationalized/number/-/number-3.6.7.tgz", { "dependencies": { "@swc/helpers": "^0.5.0" } }, "sha512-3ji1fcrT+FPAK86UqEhB/psHixYo6niWPJtt7+qRaYFynt/BaJG8GhAPimtWUpEiVSTq8ZM8L5psMxGquiB/Vg=="],
|
||||||
@@ -118,8 +156,18 @@
|
|||||||
|
|
||||||
"@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],
|
"@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],
|
||||||
|
|
||||||
|
"@keyv/bigmap": ["@keyv/bigmap@1.3.1", "https://registry.npmmirror.com/@keyv/bigmap/-/bigmap-1.3.1.tgz", { "dependencies": { "hashery": "^1.4.0", "hookified": "^1.15.0" }, "peerDependencies": { "keyv": "^5.6.0" } }, "sha512-WbzE9sdmQtKy8vrNPa9BRnwZh5UF4s1KTmSK0KUVLo3eff5BlQNNWDnFOouNpKfPKDnms9xynJjsMYjMaT/aFQ=="],
|
||||||
|
|
||||||
|
"@keyv/serialize": ["@keyv/serialize@1.1.1", "https://registry.npmmirror.com/@keyv/serialize/-/serialize-1.1.1.tgz", {}, "sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA=="],
|
||||||
|
|
||||||
"@lucide/vue": ["@lucide/vue@1.28.0", "https://registry.npmmirror.com/@lucide/vue/-/vue-1.28.0.tgz", { "peerDependencies": { "vue": ">=3.0.1" } }, "sha512-cO89UyNM/0i2Srdi04nFWeEOQkqzDZlM2ehtWyBhcMpRTJDKpMZPCGAVlmVBgBgr5HaeL5L6FsU8RHsOdwXtKw=="],
|
"@lucide/vue": ["@lucide/vue@1.28.0", "https://registry.npmmirror.com/@lucide/vue/-/vue-1.28.0.tgz", { "peerDependencies": { "vue": ">=3.0.1" } }, "sha512-cO89UyNM/0i2Srdi04nFWeEOQkqzDZlM2ehtWyBhcMpRTJDKpMZPCGAVlmVBgBgr5HaeL5L6FsU8RHsOdwXtKw=="],
|
||||||
|
|
||||||
|
"@nodelib/fs.scandir": ["@nodelib/fs.scandir@2.1.5", "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", { "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" } }, "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="],
|
||||||
|
|
||||||
|
"@nodelib/fs.stat": ["@nodelib/fs.stat@2.0.5", "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", {}, "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="],
|
||||||
|
|
||||||
|
"@nodelib/fs.walk": ["@nodelib/fs.walk@1.2.8", "https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", { "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" } }, "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="],
|
||||||
|
|
||||||
"@rollup/rollup-android-arm-eabi": ["@rollup/rollup-android-arm-eabi@4.62.2", "https://registry.npmmirror.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz", { "os": "android", "cpu": "arm" }, "sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg=="],
|
"@rollup/rollup-android-arm-eabi": ["@rollup/rollup-android-arm-eabi@4.62.2", "https://registry.npmmirror.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz", { "os": "android", "cpu": "arm" }, "sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg=="],
|
||||||
|
|
||||||
"@rollup/rollup-android-arm64": ["@rollup/rollup-android-arm64@4.62.2", "https://registry.npmmirror.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.2.tgz", { "os": "android", "cpu": "arm64" }, "sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw=="],
|
"@rollup/rollup-android-arm64": ["@rollup/rollup-android-arm64@4.62.2", "https://registry.npmmirror.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.2.tgz", { "os": "android", "cpu": "arm64" }, "sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw=="],
|
||||||
@@ -240,14 +288,38 @@
|
|||||||
|
|
||||||
"@tauri-apps/plugin-opener": ["@tauri-apps/plugin-opener@2.5.4", "https://registry.npmmirror.com/@tauri-apps/plugin-opener/-/plugin-opener-2.5.4.tgz", { "dependencies": { "@tauri-apps/api": "^2.11.0" } }, "sha512-1HnPkb+AmgO29HBazm4uPLKB+r7zzcTBW1d0fyYp1uP+jwtpoiNDGKMMzz58SFp49nOIrxdE3aUJtT57lfO9CQ=="],
|
"@tauri-apps/plugin-opener": ["@tauri-apps/plugin-opener@2.5.4", "https://registry.npmmirror.com/@tauri-apps/plugin-opener/-/plugin-opener-2.5.4.tgz", { "dependencies": { "@tauri-apps/api": "^2.11.0" } }, "sha512-1HnPkb+AmgO29HBazm4uPLKB+r7zzcTBW1d0fyYp1uP+jwtpoiNDGKMMzz58SFp49nOIrxdE3aUJtT57lfO9CQ=="],
|
||||||
|
|
||||||
|
"@types/esrecurse": ["@types/esrecurse@4.3.1", "https://registry.npmmirror.com/@types/esrecurse/-/esrecurse-4.3.1.tgz", {}, "sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw=="],
|
||||||
|
|
||||||
"@types/estree": ["@types/estree@1.0.9", "https://registry.npmmirror.com/@types/estree/-/estree-1.0.9.tgz", {}, "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg=="],
|
"@types/estree": ["@types/estree@1.0.9", "https://registry.npmmirror.com/@types/estree/-/estree-1.0.9.tgz", {}, "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg=="],
|
||||||
|
|
||||||
|
"@types/json-schema": ["@types/json-schema@7.0.15", "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.15.tgz", {}, "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="],
|
||||||
|
|
||||||
"@types/node": ["@types/node@26.1.1", "https://registry.npmmirror.com/@types/node/-/node-26.1.1.tgz", { "dependencies": { "undici-types": "~8.3.0" } }, "sha512-nxAkRSVkN1Y0JC1W8ky/fTfkGsMmcrRsbx+3XoZE+rMOX71kLYTV7fLXpqud1GpbpP5TuffXFqfX7fH2GgZREw=="],
|
"@types/node": ["@types/node@26.1.1", "https://registry.npmmirror.com/@types/node/-/node-26.1.1.tgz", { "dependencies": { "undici-types": "~8.3.0" } }, "sha512-nxAkRSVkN1Y0JC1W8ky/fTfkGsMmcrRsbx+3XoZE+rMOX71kLYTV7fLXpqud1GpbpP5TuffXFqfX7fH2GgZREw=="],
|
||||||
|
|
||||||
"@types/sortablejs": ["@types/sortablejs@1.15.9", "https://registry.npmmirror.com/@types/sortablejs/-/sortablejs-1.15.9.tgz", {}, "sha512-7HP+rZGE2p886PKV9c9OJzLBI6BBJu1O7lJGYnPyG3fS4/duUCcngkNCjsLwIMV+WMqANe3tt4irrXHSIe68OQ=="],
|
"@types/sortablejs": ["@types/sortablejs@1.15.9", "https://registry.npmmirror.com/@types/sortablejs/-/sortablejs-1.15.9.tgz", {}, "sha512-7HP+rZGE2p886PKV9c9OJzLBI6BBJu1O7lJGYnPyG3fS4/duUCcngkNCjsLwIMV+WMqANe3tt4irrXHSIe68OQ=="],
|
||||||
|
|
||||||
"@types/web-bluetooth": ["@types/web-bluetooth@0.0.21", "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz", {}, "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA=="],
|
"@types/web-bluetooth": ["@types/web-bluetooth@0.0.21", "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz", {}, "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA=="],
|
||||||
|
|
||||||
|
"@typescript-eslint/eslint-plugin": ["@typescript-eslint/eslint-plugin@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.70.0.tgz", { "dependencies": { "@eslint-community/regexpp": "^4.12.2", "@typescript-eslint/scope-manager": "8.70.0", "@typescript-eslint/type-utils": "8.70.0", "@typescript-eslint/utils": "8.70.0", "@typescript-eslint/visitor-keys": "8.70.0", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "@typescript-eslint/parser": "^8.70.0", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-/v8HZt6RlyIZxB3ntehELOcUcfxKPVGWXnQdJuHRmzrqgF8nQypcC/oxGW+Ot4VGKDq81XugPKxx0n5PBtf9PA=="],
|
||||||
|
|
||||||
|
"@typescript-eslint/parser": ["@typescript-eslint/parser@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-8.70.0.tgz", { "dependencies": { "@typescript-eslint/scope-manager": "8.70.0", "@typescript-eslint/types": "8.70.0", "@typescript-eslint/typescript-estree": "8.70.0", "@typescript-eslint/visitor-keys": "8.70.0", "debug": "^4.4.3" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-zYvrmj9Yxd63UGaXw+kdt6A0F0s0qveJyuatIM77bYC2DE4pgmg7a50u8LR7PRtXd0x+h+Tl3eXabGm06SWd3Q=="],
|
||||||
|
|
||||||
|
"@typescript-eslint/project-service": ["@typescript-eslint/project-service@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/project-service/-/project-service-8.70.0.tgz", { "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.70.0", "@typescript-eslint/types": "^8.70.0", "debug": "^4.4.3" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-hFHbTNqhU9G+2eKFXCBVb1tjFT/LceiJ4+HfLO4pTpDI0KHi6iajpcFFkaSQ9gXmCh7n82A0PthaayEdN6mspQ=="],
|
||||||
|
|
||||||
|
"@typescript-eslint/scope-manager": ["@typescript-eslint/scope-manager@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-8.70.0.tgz", { "dependencies": { "@typescript-eslint/types": "8.70.0", "@typescript-eslint/visitor-keys": "8.70.0" } }, "sha512-8nP3Kwh5hlgZ4FicGvmznAmJe8UL4sdU8tLukrPaMuQmDuk4Y8xYfzu/aYZW4xT2JCgc7H/TpDI5cGlxcWJSqQ=="],
|
||||||
|
|
||||||
|
"@typescript-eslint/tsconfig-utils": ["@typescript-eslint/tsconfig-utils@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.70.0.tgz", { "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-adnkeeNq9Sq1sUf4+FRVc0KdgYghzsgFpZSQVZVvY0LCuUuN0FnQgyGzCJeC4fW1cdXseBAjU2EOqUIjbNcZUw=="],
|
||||||
|
|
||||||
|
"@typescript-eslint/type-utils": ["@typescript-eslint/type-utils@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-8.70.0.tgz", { "dependencies": { "@typescript-eslint/types": "8.70.0", "@typescript-eslint/typescript-estree": "8.70.0", "@typescript-eslint/utils": "8.70.0", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-NUMKIhYVaVIVLnRL9CRt+VVcuLgSHUCpXn4/+K8wql+vdInUzvx8BjUO1oJ7cG9shjFJKtF8F8Hh2kCh3/KBVw=="],
|
||||||
|
|
||||||
|
"@typescript-eslint/types": ["@typescript-eslint/types@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/types/-/types-8.70.0.tgz", {}, "sha512-asTOIYhDg4zdzOScCyaytrsV3cR6B4ecPQlXw/dJIm7J/MZTtCtfVII9JD8Geh4jTCrK/Xe6cg5UevoleMcoJQ=="],
|
||||||
|
|
||||||
|
"@typescript-eslint/typescript-estree": ["@typescript-eslint/typescript-estree@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.70.0.tgz", { "dependencies": { "@typescript-eslint/project-service": "8.70.0", "@typescript-eslint/tsconfig-utils": "8.70.0", "@typescript-eslint/types": "8.70.0", "@typescript-eslint/visitor-keys": "8.70.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", "ts-api-utils": "^2.5.0" }, "peerDependencies": { "typescript": ">=4.8.4 <6.1.0" } }, "sha512-d9NmHMPEKQ7QCLLm1jI3zmoQBwT5KwFYjXBJ9ymZfKCUU+5rmTRykKAFvH5Qn/ZCds3CEAFS9OC9M/jkl0X2bA=="],
|
||||||
|
|
||||||
|
"@typescript-eslint/utils": ["@typescript-eslint/utils@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-8.70.0.tgz", { "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", "@typescript-eslint/scope-manager": "8.70.0", "@typescript-eslint/types": "8.70.0", "@typescript-eslint/typescript-estree": "8.70.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-oZmtKJz/4fufZ2p3+Cn3ijEojcdfR+1zYDH2xKYrEly0dR/Q/1xUPRCOlKGxod78nWlU2UnDe09GZ3TaknBFGA=="],
|
||||||
|
|
||||||
|
"@typescript-eslint/visitor-keys": ["@typescript-eslint/visitor-keys@8.70.0", "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.70.0.tgz", { "dependencies": { "@typescript-eslint/types": "8.70.0", "eslint-visitor-keys": "^5.0.0" } }, "sha512-BoC8PiO4Hkdo0TVJh9Ntxr5MxPDI7/oFsrygN5ADelFSeXG/qgNuucIGA+L5Z6JpPTE/uRfcTWtscjbUaufepQ=="],
|
||||||
|
|
||||||
"@vitejs/plugin-vue": ["@vitejs/plugin-vue@5.2.4", "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz", { "peerDependencies": { "vite": "^5.0.0 || ^6.0.0", "vue": "^3.2.25" } }, "sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA=="],
|
"@vitejs/plugin-vue": ["@vitejs/plugin-vue@5.2.4", "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz", { "peerDependencies": { "vite": "^5.0.0 || ^6.0.0", "vue": "^3.2.25" } }, "sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA=="],
|
||||||
|
|
||||||
"@volar/language-core": ["@volar/language-core@2.4.15", "https://registry.npmmirror.com/@volar/language-core/-/language-core-2.4.15.tgz", { "dependencies": { "@volar/source-map": "2.4.15" } }, "sha512-3VHw+QZU0ZG9IuQmzT68IyN4hZNd9GchGPhbD9+pa8CVv7rnoOZwo7T8weIbrRmihqy3ATpdfXFnqRrfPVK6CA=="],
|
"@volar/language-core": ["@volar/language-core@2.4.15", "https://registry.npmmirror.com/@volar/language-core/-/language-core-2.4.15.tgz", { "dependencies": { "@volar/source-map": "2.4.15" } }, "sha512-3VHw+QZU0ZG9IuQmzT68IyN4hZNd9GchGPhbD9+pa8CVv7rnoOZwo7T8weIbrRmihqy3ATpdfXFnqRrfPVK6CA=="],
|
||||||
@@ -272,6 +344,8 @@
|
|||||||
|
|
||||||
"@vue/devtools-shared": ["@vue/devtools-shared@7.7.10", "https://registry.npmmirror.com/@vue/devtools-shared/-/devtools-shared-7.7.10.tgz", { "dependencies": { "rfdc": "^1.4.1" } }, "sha512-wOPslzB8vTvpxwdaOcR2qAbwmuSP0L+rhpoC6Cf56V3Jip+HWb7PQQXOUPgBNQARpXsbQX/+mvi8kKucmBGRwQ=="],
|
"@vue/devtools-shared": ["@vue/devtools-shared@7.7.10", "https://registry.npmmirror.com/@vue/devtools-shared/-/devtools-shared-7.7.10.tgz", { "dependencies": { "rfdc": "^1.4.1" } }, "sha512-wOPslzB8vTvpxwdaOcR2qAbwmuSP0L+rhpoC6Cf56V3Jip+HWb7PQQXOUPgBNQARpXsbQX/+mvi8kKucmBGRwQ=="],
|
||||||
|
|
||||||
|
"@vue/eslint-config-typescript": ["@vue/eslint-config-typescript@14.9.0", "https://registry.npmmirror.com/@vue/eslint-config-typescript/-/eslint-config-typescript-14.9.0.tgz", { "dependencies": { "@typescript-eslint/utils": "^8.60.0", "fast-glob": "^3.3.3", "typescript-eslint": "^8.60.0", "vue-eslint-parser": "^10.4.0" }, "peerDependencies": { "eslint": "^9.10.0 || ^10.0.0", "eslint-plugin-vue": "^9.28.0 || ^10.0.0", "typescript": ">=4.8.4" }, "optionalPeers": ["typescript"], "bin": { "vue-eslint-config-typescript": "./dist/bin.js" } }, "sha512-E3j9hDlfVf10F30MRcLTPY2IIhWIx1nsvkVukk14kTcuA+oBVot9zsP1hzsO+PAMDxV3Fd9FimBJtUBNBL5KFA=="],
|
||||||
|
|
||||||
"@vue/language-core": ["@vue/language-core@2.2.12", "https://registry.npmmirror.com/@vue/language-core/-/language-core-2.2.12.tgz", { "dependencies": { "@volar/language-core": "2.4.15", "@vue/compiler-dom": "^3.5.0", "@vue/compiler-vue2": "^2.7.16", "@vue/shared": "^3.5.0", "alien-signals": "^1.0.3", "minimatch": "^9.0.3", "muggle-string": "^0.4.1", "path-browserify": "^1.0.1" }, "peerDependencies": { "typescript": "*" }, "optionalPeers": ["typescript"] }, "sha512-IsGljWbKGU1MZpBPN+BvPAdr55YPkj2nB/TBNGNC32Vy2qLG25DYu/NBN2vNtZqdRbTRjaoYrahLrToim2NanA=="],
|
"@vue/language-core": ["@vue/language-core@2.2.12", "https://registry.npmmirror.com/@vue/language-core/-/language-core-2.2.12.tgz", { "dependencies": { "@volar/language-core": "2.4.15", "@vue/compiler-dom": "^3.5.0", "@vue/compiler-vue2": "^2.7.16", "@vue/shared": "^3.5.0", "alien-signals": "^1.0.3", "minimatch": "^9.0.3", "muggle-string": "^0.4.1", "path-browserify": "^1.0.1" }, "peerDependencies": { "typescript": "*" }, "optionalPeers": ["typescript"] }, "sha512-IsGljWbKGU1MZpBPN+BvPAdr55YPkj2nB/TBNGNC32Vy2qLG25DYu/NBN2vNtZqdRbTRjaoYrahLrToim2NanA=="],
|
||||||
|
|
||||||
"@vue/reactivity": ["@vue/reactivity@3.5.39", "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.5.39.tgz", { "dependencies": { "@vue/shared": "3.5.39" } }, "sha512-TpsuBJ9gGlZa5d23XcM2y8EXanz9dZeVDQBXRwzy46ItgvM+rWpzs+UVM0wcRLxGvcav0HE5jz2gNL53xlRAog=="],
|
"@vue/reactivity": ["@vue/reactivity@3.5.39", "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.5.39.tgz", { "dependencies": { "@vue/shared": "3.5.39" } }, "sha512-TpsuBJ9gGlZa5d23XcM2y8EXanz9dZeVDQBXRwzy46ItgvM+rWpzs+UVM0wcRLxGvcav0HE5jz2gNL53xlRAog=="],
|
||||||
@@ -290,15 +364,41 @@
|
|||||||
|
|
||||||
"@vueuse/shared": ["@vueuse/shared@14.4.0", "https://registry.npmmirror.com/@vueuse/shared/-/shared-14.4.0.tgz", { "peerDependencies": { "vue": "^3.5.0" } }, "sha512-JRgY90Sz8DDtPMsaDflvPMp9xYk69JZAmbuDvAquUVXKr2gEjqtzGNTTthLfckH0BzBqvnu31gb4a8TGLRe79g=="],
|
"@vueuse/shared": ["@vueuse/shared@14.4.0", "https://registry.npmmirror.com/@vueuse/shared/-/shared-14.4.0.tgz", { "peerDependencies": { "vue": "^3.5.0" } }, "sha512-JRgY90Sz8DDtPMsaDflvPMp9xYk69JZAmbuDvAquUVXKr2gEjqtzGNTTthLfckH0BzBqvnu31gb4a8TGLRe79g=="],
|
||||||
|
|
||||||
|
"@xterm/addon-fit": ["@xterm/addon-fit@0.11.0", "https://registry.npmmirror.com/@xterm/addon-fit/-/addon-fit-0.11.0.tgz", {}, "sha512-jYcgT6xtVYhnhgxh3QgYDnnNMYTcf8ElbxxFzX0IZo+vabQqSPAjC3c1wJrKB5E19VwQei89QCiZZP86DCPF7g=="],
|
||||||
|
|
||||||
|
"@xterm/addon-search": ["@xterm/addon-search@0.16.0", "https://registry.npmmirror.com/@xterm/addon-search/-/addon-search-0.16.0.tgz", {}, "sha512-9OeuBFu0/uZJPu+9AHKY6g/w0Czyb/Ut0A5t79I4ULoU4IfU5BEpPFVGQxP4zTTMdfZEYkVIRYbHBX1xWwjeSA=="],
|
||||||
|
|
||||||
|
"@xterm/addon-serialize": ["@xterm/addon-serialize@0.14.0", "https://registry.npmmirror.com/@xterm/addon-serialize/-/addon-serialize-0.14.0.tgz", {}, "sha512-uteyTU1EkrQa2Ux6P/uFl2fzmXI46jy5uoQMKEOM0fKTyiW7cSn0WrFenHm5vO5uEXX/GpwW/FgILvv3r0WbkA=="],
|
||||||
|
|
||||||
|
"@xterm/addon-unicode11": ["@xterm/addon-unicode11@0.9.0", "https://registry.npmmirror.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0.tgz", {}, "sha512-FxDnYcyuXhNl+XSqGZL/t0U9eiNb/q3EWT5rYkQT/zuig8Gz/VagnQANKHdDWFM2lTMk9ly0EFQxxxtZUoRetw=="],
|
||||||
|
|
||||||
|
"@xterm/addon-web-links": ["@xterm/addon-web-links@0.12.0", "https://registry.npmmirror.com/@xterm/addon-web-links/-/addon-web-links-0.12.0.tgz", {}, "sha512-4Smom3RPyVp7ZMYOYDoC/9eGJJJqYhnPLGGqJ6wOBfB8VxPViJNSKdgRYb8NpaM6YSelEKbA2SStD7lGyqaobw=="],
|
||||||
|
|
||||||
|
"@xterm/addon-webgl": ["@xterm/addon-webgl@0.19.0", "https://registry.npmmirror.com/@xterm/addon-webgl/-/addon-webgl-0.19.0.tgz", {}, "sha512-b3fMOsyLVuCeNJWxolACEUED0vm7qC0cy4wRvf3oURSzDTYVQiGPhTnhWZwIHdvC48Y+oLhvYXnY4XDXPoJo6A=="],
|
||||||
|
|
||||||
|
"@xterm/xterm": ["@xterm/xterm@6.0.0", "https://registry.npmmirror.com/@xterm/xterm/-/xterm-6.0.0.tgz", {}, "sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg=="],
|
||||||
|
|
||||||
|
"acorn": ["acorn@8.18.0", "https://registry.npmmirror.com/acorn/-/acorn-8.18.0.tgz", { "bin": { "acorn": "bin/acorn" } }, "sha512-lGq+9yr1/GuAWaVYIHRjvvySG5/4VfKIvC8EWxStPdcDh/Ka7FG3twP6v4d5BkravUilhIAsG4Qj83t02LWUPQ=="],
|
||||||
|
|
||||||
|
"acorn-jsx": ["acorn-jsx@5.3.2", "https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz", { "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="],
|
||||||
|
|
||||||
|
"ajv": ["ajv@6.15.0", "https://registry.npmmirror.com/ajv/-/ajv-6.15.0.tgz", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw=="],
|
||||||
|
|
||||||
"alien-signals": ["alien-signals@1.0.13", "https://registry.npmmirror.com/alien-signals/-/alien-signals-1.0.13.tgz", {}, "sha512-OGj9yyTnJEttvzhTUWuscOvtqxq5vrhF7vL9oS0xJ2mK0ItPYP1/y+vCFebfxoEyAz0++1AIwJ5CMr+Fk3nDmg=="],
|
"alien-signals": ["alien-signals@1.0.13", "https://registry.npmmirror.com/alien-signals/-/alien-signals-1.0.13.tgz", {}, "sha512-OGj9yyTnJEttvzhTUWuscOvtqxq5vrhF7vL9oS0xJ2mK0ItPYP1/y+vCFebfxoEyAz0++1AIwJ5CMr+Fk3nDmg=="],
|
||||||
|
|
||||||
"aria-hidden": ["aria-hidden@1.2.6", "https://registry.npmmirror.com/aria-hidden/-/aria-hidden-1.2.6.tgz", { "dependencies": { "tslib": "^2.0.0" } }, "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA=="],
|
"aria-hidden": ["aria-hidden@1.2.6", "https://registry.npmmirror.com/aria-hidden/-/aria-hidden-1.2.6.tgz", { "dependencies": { "tslib": "^2.0.0" } }, "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA=="],
|
||||||
|
|
||||||
"balanced-match": ["balanced-match@1.0.2", "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="],
|
"balanced-match": ["balanced-match@4.0.4", "https://registry.npmmirror.com/balanced-match/-/balanced-match-4.0.4.tgz", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="],
|
||||||
|
|
||||||
"birpc": ["birpc@2.9.0", "https://registry.npmmirror.com/birpc/-/birpc-2.9.0.tgz", {}, "sha512-KrayHS5pBi69Xi9JmvoqrIgYGDkD6mcSe/i6YKi3w5kekCLzrX4+nawcXqrj2tIp50Kw/mT/s3p+GVK0A0sKxw=="],
|
"birpc": ["birpc@2.9.0", "https://registry.npmmirror.com/birpc/-/birpc-2.9.0.tgz", {}, "sha512-KrayHS5pBi69Xi9JmvoqrIgYGDkD6mcSe/i6YKi3w5kekCLzrX4+nawcXqrj2tIp50Kw/mT/s3p+GVK0A0sKxw=="],
|
||||||
|
|
||||||
"brace-expansion": ["brace-expansion@2.1.2", "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.1.2.tgz", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA=="],
|
"boolbase": ["boolbase@1.0.0", "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz", {}, "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="],
|
||||||
|
|
||||||
|
"brace-expansion": ["brace-expansion@5.0.12", "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-5.0.12.tgz", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ=="],
|
||||||
|
|
||||||
|
"braces": ["braces@3.0.3", "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz", { "dependencies": { "fill-range": "^7.1.1" } }, "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA=="],
|
||||||
|
|
||||||
|
"cacheable": ["cacheable@2.5.0", "https://registry.npmmirror.com/cacheable/-/cacheable-2.5.0.tgz", { "dependencies": { "@cacheable/memory": "^2.2.0", "@cacheable/utils": "^2.5.0", "hookified": "^1.15.0", "keyv": "^5.6.0", "qified": "^0.10.1" } }, "sha512-60cyAOytib/OzBw1JNSoSV/boK1AtHryDIjvVBk7XbN4ugfkM3+Sry7fEjNgPMGgOjuaZPAp8ruZ0Cxafwyq9g=="],
|
||||||
|
|
||||||
"class-variance-authority": ["class-variance-authority@0.7.1", "https://registry.npmmirror.com/class-variance-authority/-/class-variance-authority-0.7.1.tgz", { "dependencies": { "clsx": "^2.1.1" } }, "sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg=="],
|
"class-variance-authority": ["class-variance-authority@0.7.1", "https://registry.npmmirror.com/class-variance-authority/-/class-variance-authority-0.7.1.tgz", { "dependencies": { "clsx": "^2.1.1" } }, "sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg=="],
|
||||||
|
|
||||||
@@ -306,10 +406,18 @@
|
|||||||
|
|
||||||
"copy-anything": ["copy-anything@4.0.5", "https://registry.npmmirror.com/copy-anything/-/copy-anything-4.0.5.tgz", { "dependencies": { "is-what": "^5.2.0" } }, "sha512-7Vv6asjS4gMOuILabD3l739tsaxFQmC+a7pLZm02zyvs8p977bL3zEgq3yDk5rn9B0PbYgIv++jmHcuUab4RhA=="],
|
"copy-anything": ["copy-anything@4.0.5", "https://registry.npmmirror.com/copy-anything/-/copy-anything-4.0.5.tgz", { "dependencies": { "is-what": "^5.2.0" } }, "sha512-7Vv6asjS4gMOuILabD3l739tsaxFQmC+a7pLZm02zyvs8p977bL3zEgq3yDk5rn9B0PbYgIv++jmHcuUab4RhA=="],
|
||||||
|
|
||||||
|
"cross-spawn": ["cross-spawn@7.0.6", "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.6.tgz", { "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", "which": "^2.0.1" } }, "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA=="],
|
||||||
|
|
||||||
|
"cssesc": ["cssesc@3.0.0", "https://registry.npmmirror.com/cssesc/-/cssesc-3.0.0.tgz", { "bin": { "cssesc": "bin/cssesc" } }, "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="],
|
||||||
|
|
||||||
"csstype": ["csstype@3.2.3", "https://registry.npmmirror.com/csstype/-/csstype-3.2.3.tgz", {}, "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ=="],
|
"csstype": ["csstype@3.2.3", "https://registry.npmmirror.com/csstype/-/csstype-3.2.3.tgz", {}, "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ=="],
|
||||||
|
|
||||||
"de-indent": ["de-indent@1.0.2", "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz", {}, "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg=="],
|
"de-indent": ["de-indent@1.0.2", "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz", {}, "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg=="],
|
||||||
|
|
||||||
|
"debug": ["debug@4.4.3", "https://registry.npmmirror.com/debug/-/debug-4.4.3.tgz", { "dependencies": { "ms": "^2.1.3" }, "peerDependencies": { "supports-color": "*" }, "optionalPeers": ["supports-color"] }, "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA=="],
|
||||||
|
|
||||||
|
"deep-is": ["deep-is@0.1.4", "https://registry.npmmirror.com/deep-is/-/deep-is-0.1.4.tgz", {}, "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="],
|
||||||
|
|
||||||
"defu": ["defu@6.1.7", "https://registry.npmmirror.com/defu/-/defu-6.1.7.tgz", {}, "sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ=="],
|
"defu": ["defu@6.1.7", "https://registry.npmmirror.com/defu/-/defu-6.1.7.tgz", {}, "sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ=="],
|
||||||
|
|
||||||
"detect-libc": ["detect-libc@2.1.2", "https://registry.npmmirror.com/detect-libc/-/detect-libc-2.1.2.tgz", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="],
|
"detect-libc": ["detect-libc@2.1.2", "https://registry.npmmirror.com/detect-libc/-/detect-libc-2.1.2.tgz", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="],
|
||||||
@@ -320,22 +428,88 @@
|
|||||||
|
|
||||||
"esbuild": ["esbuild@0.25.12", "https://registry.npmmirror.com/esbuild/-/esbuild-0.25.12.tgz", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.25.12", "@esbuild/android-arm": "0.25.12", "@esbuild/android-arm64": "0.25.12", "@esbuild/android-x64": "0.25.12", "@esbuild/darwin-arm64": "0.25.12", "@esbuild/darwin-x64": "0.25.12", "@esbuild/freebsd-arm64": "0.25.12", "@esbuild/freebsd-x64": "0.25.12", "@esbuild/linux-arm": "0.25.12", "@esbuild/linux-arm64": "0.25.12", "@esbuild/linux-ia32": "0.25.12", "@esbuild/linux-loong64": "0.25.12", "@esbuild/linux-mips64el": "0.25.12", "@esbuild/linux-ppc64": "0.25.12", "@esbuild/linux-riscv64": "0.25.12", "@esbuild/linux-s390x": "0.25.12", "@esbuild/linux-x64": "0.25.12", "@esbuild/netbsd-arm64": "0.25.12", "@esbuild/netbsd-x64": "0.25.12", "@esbuild/openbsd-arm64": "0.25.12", "@esbuild/openbsd-x64": "0.25.12", "@esbuild/openharmony-arm64": "0.25.12", "@esbuild/sunos-x64": "0.25.12", "@esbuild/win32-arm64": "0.25.12", "@esbuild/win32-ia32": "0.25.12", "@esbuild/win32-x64": "0.25.12" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg=="],
|
"esbuild": ["esbuild@0.25.12", "https://registry.npmmirror.com/esbuild/-/esbuild-0.25.12.tgz", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.25.12", "@esbuild/android-arm": "0.25.12", "@esbuild/android-arm64": "0.25.12", "@esbuild/android-x64": "0.25.12", "@esbuild/darwin-arm64": "0.25.12", "@esbuild/darwin-x64": "0.25.12", "@esbuild/freebsd-arm64": "0.25.12", "@esbuild/freebsd-x64": "0.25.12", "@esbuild/linux-arm": "0.25.12", "@esbuild/linux-arm64": "0.25.12", "@esbuild/linux-ia32": "0.25.12", "@esbuild/linux-loong64": "0.25.12", "@esbuild/linux-mips64el": "0.25.12", "@esbuild/linux-ppc64": "0.25.12", "@esbuild/linux-riscv64": "0.25.12", "@esbuild/linux-s390x": "0.25.12", "@esbuild/linux-x64": "0.25.12", "@esbuild/netbsd-arm64": "0.25.12", "@esbuild/netbsd-x64": "0.25.12", "@esbuild/openbsd-arm64": "0.25.12", "@esbuild/openbsd-x64": "0.25.12", "@esbuild/openharmony-arm64": "0.25.12", "@esbuild/sunos-x64": "0.25.12", "@esbuild/win32-arm64": "0.25.12", "@esbuild/win32-ia32": "0.25.12", "@esbuild/win32-x64": "0.25.12" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg=="],
|
||||||
|
|
||||||
|
"escape-string-regexp": ["escape-string-regexp@4.0.0", "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", {}, "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="],
|
||||||
|
|
||||||
|
"eslint": ["eslint@10.11.0", "https://registry.npmmirror.com/eslint/-/eslint-10.11.0.tgz", { "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.2", "@eslint/config-array": "^0.23.5", "@eslint/config-helpers": "^0.7.0", "@eslint/core": "^1.2.1", "@eslint/plugin-kit": "^0.7.3", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "ajv": "^6.14.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", "eslint-scope": "^9.1.2", "eslint-visitor-keys": "^5.0.1", "espree": "^11.2.0", "esquery": "^1.7.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "11.1.5 || >11.1.6 <12", "find-up": "^5.0.0", "glob-parent": "^6.0.2", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", "minimatch": "^10.2.5", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, "peerDependencies": { "jiti": "*" }, "optionalPeers": ["jiti"], "bin": { "eslint": "bin/eslint.js" } }, "sha512-P7a6UEEqb9G95MYAtqkmsTbVXIYyzIfl6NGOIJk162PaahFxFyeGcrlXYFSiagECg4sEm8IseJdZBKR3rx6MsQ=="],
|
||||||
|
|
||||||
|
"eslint-plugin-vue": ["eslint-plugin-vue@10.11.0", "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-10.11.0.tgz", { "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", "natural-compare": "^1.4.0", "nth-check": "^2.1.1", "postcss-selector-parser": "^7.1.4", "semver": "^7.8.5", "xml-name-validator": "^5.0.0" }, "peerDependencies": { "@stylistic/eslint-plugin": "^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0", "@typescript-eslint/parser": "^7.0.0 || ^8.0.0", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "vue-eslint-parser": "^10.3.0" }, "optionalPeers": ["@stylistic/eslint-plugin", "@typescript-eslint/parser"] }, "sha512-fGt38SsaPCZ2FmA3bX/3vOW2qdsPNx0/9x+7Aab6NMX++PhynMtK4LWC4vzXgfQBCqpUAler18H38GA+NBAd0Q=="],
|
||||||
|
|
||||||
|
"eslint-scope": ["eslint-scope@9.1.2", "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-9.1.2.tgz", { "dependencies": { "@types/esrecurse": "^4.3.1", "@types/estree": "^1.0.8", "esrecurse": "^4.3.0", "estraverse": "^5.2.0" } }, "sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ=="],
|
||||||
|
|
||||||
|
"eslint-visitor-keys": ["eslint-visitor-keys@5.0.1", "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", {}, "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA=="],
|
||||||
|
|
||||||
|
"espree": ["espree@11.2.0", "https://registry.npmmirror.com/espree/-/espree-11.2.0.tgz", { "dependencies": { "acorn": "^8.16.0", "acorn-jsx": "^5.3.2", "eslint-visitor-keys": "^5.0.1" } }, "sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw=="],
|
||||||
|
|
||||||
|
"esquery": ["esquery@1.7.0", "https://registry.npmmirror.com/esquery/-/esquery-1.7.0.tgz", { "dependencies": { "estraverse": "^5.1.0" } }, "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g=="],
|
||||||
|
|
||||||
|
"esrecurse": ["esrecurse@4.3.0", "https://registry.npmmirror.com/esrecurse/-/esrecurse-4.3.0.tgz", { "dependencies": { "estraverse": "^5.2.0" } }, "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="],
|
||||||
|
|
||||||
|
"estraverse": ["estraverse@5.3.0", "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz", {}, "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="],
|
||||||
|
|
||||||
"estree-walker": ["estree-walker@2.0.2", "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz", {}, "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="],
|
"estree-walker": ["estree-walker@2.0.2", "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz", {}, "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="],
|
||||||
|
|
||||||
|
"esutils": ["esutils@2.0.3", "https://registry.npmmirror.com/esutils/-/esutils-2.0.3.tgz", {}, "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="],
|
||||||
|
|
||||||
|
"fast-deep-equal": ["fast-deep-equal@3.1.3", "https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", {}, "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="],
|
||||||
|
|
||||||
|
"fast-glob": ["fast-glob@3.3.3", "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.3.3.tgz", { "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", "glob-parent": "^5.1.2", "merge2": "^1.3.0", "micromatch": "^4.0.8" } }, "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg=="],
|
||||||
|
|
||||||
|
"fast-json-stable-stringify": ["fast-json-stable-stringify@2.1.0", "https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", {}, "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="],
|
||||||
|
|
||||||
|
"fast-levenshtein": ["fast-levenshtein@2.0.6", "https://registry.npmmirror.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", {}, "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="],
|
||||||
|
|
||||||
|
"fastq": ["fastq@1.20.3", "https://registry.npmmirror.com/fastq/-/fastq-1.20.3.tgz", { "dependencies": { "reusify": "^1.0.4" } }, "sha512-XKv5nnLs6nLF71NgiKJLIZFLkPyIEuOselLG7ujZnGrRfQK8HpvY+WqKhAJUAdLomwVHErVS4LfxFlPq0/FTAw=="],
|
||||||
|
|
||||||
"fdir": ["fdir@6.5.0", "https://registry.npmmirror.com/fdir/-/fdir-6.5.0.tgz", { "peerDependencies": { "picomatch": "^3 || ^4" }, "optionalPeers": ["picomatch"] }, "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg=="],
|
"fdir": ["fdir@6.5.0", "https://registry.npmmirror.com/fdir/-/fdir-6.5.0.tgz", { "peerDependencies": { "picomatch": "^3 || ^4" }, "optionalPeers": ["picomatch"] }, "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg=="],
|
||||||
|
|
||||||
|
"file-entry-cache": ["file-entry-cache@11.1.5", "https://registry.npmmirror.com/file-entry-cache/-/file-entry-cache-11.1.5.tgz", { "dependencies": { "flat-cache": "^6.1.23" } }, "sha512-+PFTHITI08JIGhnNpGNI8T8inUpgZfk3GNEqfT9R2zZV2iFXg3CvqzSl/uEhs7TSGujYRELEANyDvS8Fj7+S7Q=="],
|
||||||
|
|
||||||
|
"fill-range": ["fill-range@7.1.1", "https://registry.npmmirror.com/fill-range/-/fill-range-7.1.1.tgz", { "dependencies": { "to-regex-range": "^5.0.1" } }, "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg=="],
|
||||||
|
|
||||||
|
"find-up": ["find-up@5.0.0", "https://registry.npmmirror.com/find-up/-/find-up-5.0.0.tgz", { "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" } }, "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="],
|
||||||
|
|
||||||
|
"flat-cache": ["flat-cache@6.1.23", "https://registry.npmmirror.com/flat-cache/-/flat-cache-6.1.23.tgz", { "dependencies": { "cacheable": "^2.5.0", "flatted": "^3.4.2", "hookified": "^1.15.0" } }, "sha512-f++BY9pTk+983xK1FLzlLpmM0i0z+jHmx3QESGkURMXujQZz1k5wzwX6hjnQ8goaD0B+sYnDK1yZ6MTyZfUaqA=="],
|
||||||
|
|
||||||
|
"flatted": ["flatted@3.4.4", "https://registry.npmmirror.com/flatted/-/flatted-3.4.4.tgz", {}, "sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q=="],
|
||||||
|
|
||||||
"fsevents": ["fsevents@2.3.3", "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="],
|
"fsevents": ["fsevents@2.3.3", "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="],
|
||||||
|
|
||||||
|
"glob-parent": ["glob-parent@6.0.2", "https://registry.npmmirror.com/glob-parent/-/glob-parent-6.0.2.tgz", { "dependencies": { "is-glob": "^4.0.3" } }, "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="],
|
||||||
|
|
||||||
"graceful-fs": ["graceful-fs@4.2.11", "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz", {}, "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="],
|
"graceful-fs": ["graceful-fs@4.2.11", "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz", {}, "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="],
|
||||||
|
|
||||||
|
"hashery": ["hashery@1.5.1", "https://registry.npmmirror.com/hashery/-/hashery-1.5.1.tgz", { "dependencies": { "hookified": "^1.15.0" } }, "sha512-iZyKG96/JwPz1N55vj2Ie2vXbhu440zfUfJvSwEqEbeLluk7NnapfGqa7LH0mOsnDxTF85Mx8/dyR6HfqcbmbQ=="],
|
||||||
|
|
||||||
"he": ["he@1.2.0", "https://registry.npmmirror.com/he/-/he-1.2.0.tgz", { "bin": { "he": "bin/he" } }, "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="],
|
"he": ["he@1.2.0", "https://registry.npmmirror.com/he/-/he-1.2.0.tgz", { "bin": { "he": "bin/he" } }, "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="],
|
||||||
|
|
||||||
"hookable": ["hookable@5.5.3", "https://registry.npmmirror.com/hookable/-/hookable-5.5.3.tgz", {}, "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ=="],
|
"hookable": ["hookable@5.5.3", "https://registry.npmmirror.com/hookable/-/hookable-5.5.3.tgz", {}, "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ=="],
|
||||||
|
|
||||||
|
"hookified": ["hookified@1.15.1", "https://registry.npmmirror.com/hookified/-/hookified-1.15.1.tgz", {}, "sha512-MvG/clsADq1GPM2KGo2nyfaWVyn9naPiXrqIe4jYjXNZQt238kWyOGrsyc/DmRAQ+Re6yeo6yX/yoNCG5KAEVg=="],
|
||||||
|
|
||||||
|
"ignore": ["ignore@5.3.2", "https://registry.npmmirror.com/ignore/-/ignore-5.3.2.tgz", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="],
|
||||||
|
|
||||||
|
"imurmurhash": ["imurmurhash@0.1.4", "https://registry.npmmirror.com/imurmurhash/-/imurmurhash-0.1.4.tgz", {}, "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="],
|
||||||
|
|
||||||
|
"is-extglob": ["is-extglob@2.1.1", "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz", {}, "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="],
|
||||||
|
|
||||||
|
"is-glob": ["is-glob@4.0.3", "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz", { "dependencies": { "is-extglob": "^2.1.1" } }, "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="],
|
||||||
|
|
||||||
|
"is-number": ["is-number@7.0.0", "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz", {}, "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="],
|
||||||
|
|
||||||
"is-what": ["is-what@5.5.0", "https://registry.npmmirror.com/is-what/-/is-what-5.5.0.tgz", {}, "sha512-oG7cgbmg5kLYae2N5IVd3jm2s+vldjxJzK1pcu9LfpGuQ93MQSzo0okvRna+7y5ifrD+20FE8FvjusyGaz14fw=="],
|
"is-what": ["is-what@5.5.0", "https://registry.npmmirror.com/is-what/-/is-what-5.5.0.tgz", {}, "sha512-oG7cgbmg5kLYae2N5IVd3jm2s+vldjxJzK1pcu9LfpGuQ93MQSzo0okvRna+7y5ifrD+20FE8FvjusyGaz14fw=="],
|
||||||
|
|
||||||
|
"isexe": ["isexe@2.0.0", "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz", {}, "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="],
|
||||||
|
|
||||||
"jiti": ["jiti@2.7.0", "https://registry.npmmirror.com/jiti/-/jiti-2.7.0.tgz", { "bin": { "jiti": "lib/jiti-cli.mjs" } }, "sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ=="],
|
"jiti": ["jiti@2.7.0", "https://registry.npmmirror.com/jiti/-/jiti-2.7.0.tgz", { "bin": { "jiti": "lib/jiti-cli.mjs" } }, "sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ=="],
|
||||||
|
|
||||||
|
"json-schema-traverse": ["json-schema-traverse@0.4.1", "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", {}, "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="],
|
||||||
|
|
||||||
|
"json-stable-stringify-without-jsonify": ["json-stable-stringify-without-jsonify@1.0.1", "https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", {}, "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="],
|
||||||
|
|
||||||
|
"keyv": ["keyv@5.6.0", "https://registry.npmmirror.com/keyv/-/keyv-5.6.0.tgz", { "dependencies": { "@keyv/serialize": "^1.1.1" } }, "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw=="],
|
||||||
|
|
||||||
|
"levn": ["levn@0.4.1", "https://registry.npmmirror.com/levn/-/levn-0.4.1.tgz", { "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" } }, "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="],
|
||||||
|
|
||||||
"lightningcss": ["lightningcss@1.32.0", "https://registry.npmmirror.com/lightningcss/-/lightningcss-1.32.0.tgz", { "dependencies": { "detect-libc": "^2.0.3" }, "optionalDependencies": { "lightningcss-android-arm64": "1.32.0", "lightningcss-darwin-arm64": "1.32.0", "lightningcss-darwin-x64": "1.32.0", "lightningcss-freebsd-x64": "1.32.0", "lightningcss-linux-arm-gnueabihf": "1.32.0", "lightningcss-linux-arm64-gnu": "1.32.0", "lightningcss-linux-arm64-musl": "1.32.0", "lightningcss-linux-x64-gnu": "1.32.0", "lightningcss-linux-x64-musl": "1.32.0", "lightningcss-win32-arm64-msvc": "1.32.0", "lightningcss-win32-x64-msvc": "1.32.0" } }, "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ=="],
|
"lightningcss": ["lightningcss@1.32.0", "https://registry.npmmirror.com/lightningcss/-/lightningcss-1.32.0.tgz", { "dependencies": { "detect-libc": "^2.0.3" }, "optionalDependencies": { "lightningcss-android-arm64": "1.32.0", "lightningcss-darwin-arm64": "1.32.0", "lightningcss-darwin-x64": "1.32.0", "lightningcss-freebsd-x64": "1.32.0", "lightningcss-linux-arm-gnueabihf": "1.32.0", "lightningcss-linux-arm64-gnu": "1.32.0", "lightningcss-linux-arm64-musl": "1.32.0", "lightningcss-linux-x64-gnu": "1.32.0", "lightningcss-linux-x64-musl": "1.32.0", "lightningcss-win32-arm64-msvc": "1.32.0", "lightningcss-win32-x64-msvc": "1.32.0" } }, "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ=="],
|
||||||
|
|
||||||
"lightningcss-android-arm64": ["lightningcss-android-arm64@1.32.0", "https://registry.npmmirror.com/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz", { "os": "android", "cpu": "arm64" }, "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg=="],
|
"lightningcss-android-arm64": ["lightningcss-android-arm64@1.32.0", "https://registry.npmmirror.com/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz", { "os": "android", "cpu": "arm64" }, "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg=="],
|
||||||
@@ -360,20 +534,42 @@
|
|||||||
|
|
||||||
"lightningcss-win32-x64-msvc": ["lightningcss-win32-x64-msvc@1.32.0", "https://registry.npmmirror.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz", { "os": "win32", "cpu": "x64" }, "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q=="],
|
"lightningcss-win32-x64-msvc": ["lightningcss-win32-x64-msvc@1.32.0", "https://registry.npmmirror.com/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz", { "os": "win32", "cpu": "x64" }, "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q=="],
|
||||||
|
|
||||||
|
"locate-path": ["locate-path@6.0.0", "https://registry.npmmirror.com/locate-path/-/locate-path-6.0.0.tgz", { "dependencies": { "p-locate": "^5.0.0" } }, "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="],
|
||||||
|
|
||||||
"magic-string": ["magic-string@0.30.21", "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.21.tgz", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ=="],
|
"magic-string": ["magic-string@0.30.21", "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.21.tgz", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ=="],
|
||||||
|
|
||||||
"minimatch": ["minimatch@9.0.9", "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.9.tgz", { "dependencies": { "brace-expansion": "^2.0.2" } }, "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg=="],
|
"merge2": ["merge2@1.4.1", "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz", {}, "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="],
|
||||||
|
|
||||||
|
"micromatch": ["micromatch@4.0.8", "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.8.tgz", { "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" } }, "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA=="],
|
||||||
|
|
||||||
|
"minimatch": ["minimatch@10.2.6", "https://registry.npmmirror.com/minimatch/-/minimatch-10.2.6.tgz", { "dependencies": { "brace-expansion": "^5.0.8" } }, "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A=="],
|
||||||
|
|
||||||
"mitt": ["mitt@3.0.1", "https://registry.npmmirror.com/mitt/-/mitt-3.0.1.tgz", {}, "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="],
|
"mitt": ["mitt@3.0.1", "https://registry.npmmirror.com/mitt/-/mitt-3.0.1.tgz", {}, "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="],
|
||||||
|
|
||||||
|
"ms": ["ms@2.1.3", "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="],
|
||||||
|
|
||||||
"muggle-string": ["muggle-string@0.4.1", "https://registry.npmmirror.com/muggle-string/-/muggle-string-0.4.1.tgz", {}, "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ=="],
|
"muggle-string": ["muggle-string@0.4.1", "https://registry.npmmirror.com/muggle-string/-/muggle-string-0.4.1.tgz", {}, "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ=="],
|
||||||
|
|
||||||
"nanoid": ["nanoid@3.3.16", "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.16.tgz", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q=="],
|
"nanoid": ["nanoid@3.3.16", "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.16.tgz", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q=="],
|
||||||
|
|
||||||
|
"natural-compare": ["natural-compare@1.4.0", "https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz", {}, "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="],
|
||||||
|
|
||||||
|
"nth-check": ["nth-check@2.1.1", "https://registry.npmmirror.com/nth-check/-/nth-check-2.1.1.tgz", { "dependencies": { "boolbase": "^1.0.0" } }, "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="],
|
||||||
|
|
||||||
"ohash": ["ohash@2.0.11", "https://registry.npmmirror.com/ohash/-/ohash-2.0.11.tgz", {}, "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ=="],
|
"ohash": ["ohash@2.0.11", "https://registry.npmmirror.com/ohash/-/ohash-2.0.11.tgz", {}, "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ=="],
|
||||||
|
|
||||||
|
"optionator": ["optionator@0.9.4", "https://registry.npmmirror.com/optionator/-/optionator-0.9.4.tgz", { "dependencies": { "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", "levn": "^0.4.1", "prelude-ls": "^1.2.1", "type-check": "^0.4.0", "word-wrap": "^1.2.5" } }, "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g=="],
|
||||||
|
|
||||||
|
"p-limit": ["p-limit@3.1.0", "https://registry.npmmirror.com/p-limit/-/p-limit-3.1.0.tgz", { "dependencies": { "yocto-queue": "^0.1.0" } }, "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="],
|
||||||
|
|
||||||
|
"p-locate": ["p-locate@5.0.0", "https://registry.npmmirror.com/p-locate/-/p-locate-5.0.0.tgz", { "dependencies": { "p-limit": "^3.0.2" } }, "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="],
|
||||||
|
|
||||||
"path-browserify": ["path-browserify@1.0.1", "https://registry.npmmirror.com/path-browserify/-/path-browserify-1.0.1.tgz", {}, "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="],
|
"path-browserify": ["path-browserify@1.0.1", "https://registry.npmmirror.com/path-browserify/-/path-browserify-1.0.1.tgz", {}, "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="],
|
||||||
|
|
||||||
|
"path-exists": ["path-exists@4.0.0", "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz", {}, "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="],
|
||||||
|
|
||||||
|
"path-key": ["path-key@3.1.1", "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz", {}, "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="],
|
||||||
|
|
||||||
"perfect-debounce": ["perfect-debounce@1.0.0", "https://registry.npmmirror.com/perfect-debounce/-/perfect-debounce-1.0.0.tgz", {}, "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA=="],
|
"perfect-debounce": ["perfect-debounce@1.0.0", "https://registry.npmmirror.com/perfect-debounce/-/perfect-debounce-1.0.0.tgz", {}, "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA=="],
|
||||||
|
|
||||||
"picocolors": ["picocolors@1.1.1", "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz", {}, "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="],
|
"picocolors": ["picocolors@1.1.1", "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz", {}, "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="],
|
||||||
@@ -386,12 +582,32 @@
|
|||||||
|
|
||||||
"postcss": ["postcss@8.5.19", "https://registry.npmmirror.com/postcss/-/postcss-8.5.19.tgz", { "dependencies": { "nanoid": "^3.3.12", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-Mz8SaolMd8nB+G13WkORcxQKHZ/NE4xXevtkJHVuG+guo9/wYKlIMTKAqGdEmYOXR2ijPjTYNHssizdaVSUNdQ=="],
|
"postcss": ["postcss@8.5.19", "https://registry.npmmirror.com/postcss/-/postcss-8.5.19.tgz", { "dependencies": { "nanoid": "^3.3.12", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-Mz8SaolMd8nB+G13WkORcxQKHZ/NE4xXevtkJHVuG+guo9/wYKlIMTKAqGdEmYOXR2ijPjTYNHssizdaVSUNdQ=="],
|
||||||
|
|
||||||
|
"postcss-selector-parser": ["postcss-selector-parser@7.1.6", "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-7.1.6.tgz", { "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" } }, "sha512-7qASPzhKF2l2KLboRZux8CCTRMdGiV08vWmyKzPz22qZ7ZjQBOeY7rNzNoCLSUiftJ7HUq0GERHmxw/t0dCdMw=="],
|
||||||
|
|
||||||
|
"prelude-ls": ["prelude-ls@1.2.1", "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz", {}, "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="],
|
||||||
|
|
||||||
|
"punycode": ["punycode@2.3.1", "https://registry.npmmirror.com/punycode/-/punycode-2.3.1.tgz", {}, "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="],
|
||||||
|
|
||||||
|
"qified": ["qified@0.10.1", "https://registry.npmmirror.com/qified/-/qified-0.10.1.tgz", { "dependencies": { "hookified": "^2.1.1" } }, "sha512-+Owyggi9IxT1ePKGafcI87ubSmxol6smwJ+RAHDQlx9+9cPwFWDiKFFCPuWhr9ignlGpZ9vDQLw67N4dcTVFEA=="],
|
||||||
|
|
||||||
|
"queue-microtask": ["queue-microtask@1.2.3", "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz", {}, "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="],
|
||||||
|
|
||||||
"reka-ui": ["reka-ui@2.10.1", "https://registry.npmmirror.com/reka-ui/-/reka-ui-2.10.1.tgz", { "dependencies": { "@floating-ui/dom": "^1.6.13", "@floating-ui/vue": "^1.1.6", "@internationalized/date": "^3.5.0", "@internationalized/number": "^3.5.0", "@tanstack/vue-virtual": "^3.12.0", "@vueuse/core": "^14.1.0", "@vueuse/shared": "^14.1.0", "aria-hidden": "^1.2.4", "defu": "^6.1.5", "ohash": "^2.0.11" }, "peerDependencies": { "vue": ">= 3.4.0" } }, "sha512-drcOQ4rQtDYAcGCsyQBqQg8QQ+H3B+zDaMJU0h8KPEPMa7g9BHu3zcOi4OB39XJSWizceFoNO0Z9tctSGLOXqg=="],
|
"reka-ui": ["reka-ui@2.10.1", "https://registry.npmmirror.com/reka-ui/-/reka-ui-2.10.1.tgz", { "dependencies": { "@floating-ui/dom": "^1.6.13", "@floating-ui/vue": "^1.1.6", "@internationalized/date": "^3.5.0", "@internationalized/number": "^3.5.0", "@tanstack/vue-virtual": "^3.12.0", "@vueuse/core": "^14.1.0", "@vueuse/shared": "^14.1.0", "aria-hidden": "^1.2.4", "defu": "^6.1.5", "ohash": "^2.0.11" }, "peerDependencies": { "vue": ">= 3.4.0" } }, "sha512-drcOQ4rQtDYAcGCsyQBqQg8QQ+H3B+zDaMJU0h8KPEPMa7g9BHu3zcOi4OB39XJSWizceFoNO0Z9tctSGLOXqg=="],
|
||||||
|
|
||||||
|
"reusify": ["reusify@1.1.0", "https://registry.npmmirror.com/reusify/-/reusify-1.1.0.tgz", {}, "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw=="],
|
||||||
|
|
||||||
"rfdc": ["rfdc@1.4.1", "https://registry.npmmirror.com/rfdc/-/rfdc-1.4.1.tgz", {}, "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA=="],
|
"rfdc": ["rfdc@1.4.1", "https://registry.npmmirror.com/rfdc/-/rfdc-1.4.1.tgz", {}, "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA=="],
|
||||||
|
|
||||||
"rollup": ["rollup@4.62.2", "https://registry.npmmirror.com/rollup/-/rollup-4.62.2.tgz", { "dependencies": { "@types/estree": "1.0.9" }, "optionalDependencies": { "@rollup/rollup-android-arm-eabi": "4.62.2", "@rollup/rollup-android-arm64": "4.62.2", "@rollup/rollup-darwin-arm64": "4.62.2", "@rollup/rollup-darwin-x64": "4.62.2", "@rollup/rollup-freebsd-arm64": "4.62.2", "@rollup/rollup-freebsd-x64": "4.62.2", "@rollup/rollup-linux-arm-gnueabihf": "4.62.2", "@rollup/rollup-linux-arm-musleabihf": "4.62.2", "@rollup/rollup-linux-arm64-gnu": "4.62.2", "@rollup/rollup-linux-arm64-musl": "4.62.2", "@rollup/rollup-linux-loong64-gnu": "4.62.2", "@rollup/rollup-linux-loong64-musl": "4.62.2", "@rollup/rollup-linux-ppc64-gnu": "4.62.2", "@rollup/rollup-linux-ppc64-musl": "4.62.2", "@rollup/rollup-linux-riscv64-gnu": "4.62.2", "@rollup/rollup-linux-riscv64-musl": "4.62.2", "@rollup/rollup-linux-s390x-gnu": "4.62.2", "@rollup/rollup-linux-x64-gnu": "4.62.2", "@rollup/rollup-linux-x64-musl": "4.62.2", "@rollup/rollup-openbsd-x64": "4.62.2", "@rollup/rollup-openharmony-arm64": "4.62.2", "@rollup/rollup-win32-arm64-msvc": "4.62.2", "@rollup/rollup-win32-ia32-msvc": "4.62.2", "@rollup/rollup-win32-x64-gnu": "4.62.2", "@rollup/rollup-win32-x64-msvc": "4.62.2", "fsevents": "~2.3.2" }, "bin": { "rollup": "dist/bin/rollup" } }, "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA=="],
|
"rollup": ["rollup@4.62.2", "https://registry.npmmirror.com/rollup/-/rollup-4.62.2.tgz", { "dependencies": { "@types/estree": "1.0.9" }, "optionalDependencies": { "@rollup/rollup-android-arm-eabi": "4.62.2", "@rollup/rollup-android-arm64": "4.62.2", "@rollup/rollup-darwin-arm64": "4.62.2", "@rollup/rollup-darwin-x64": "4.62.2", "@rollup/rollup-freebsd-arm64": "4.62.2", "@rollup/rollup-freebsd-x64": "4.62.2", "@rollup/rollup-linux-arm-gnueabihf": "4.62.2", "@rollup/rollup-linux-arm-musleabihf": "4.62.2", "@rollup/rollup-linux-arm64-gnu": "4.62.2", "@rollup/rollup-linux-arm64-musl": "4.62.2", "@rollup/rollup-linux-loong64-gnu": "4.62.2", "@rollup/rollup-linux-loong64-musl": "4.62.2", "@rollup/rollup-linux-ppc64-gnu": "4.62.2", "@rollup/rollup-linux-ppc64-musl": "4.62.2", "@rollup/rollup-linux-riscv64-gnu": "4.62.2", "@rollup/rollup-linux-riscv64-musl": "4.62.2", "@rollup/rollup-linux-s390x-gnu": "4.62.2", "@rollup/rollup-linux-x64-gnu": "4.62.2", "@rollup/rollup-linux-x64-musl": "4.62.2", "@rollup/rollup-openbsd-x64": "4.62.2", "@rollup/rollup-openharmony-arm64": "4.62.2", "@rollup/rollup-win32-arm64-msvc": "4.62.2", "@rollup/rollup-win32-ia32-msvc": "4.62.2", "@rollup/rollup-win32-x64-gnu": "4.62.2", "@rollup/rollup-win32-x64-msvc": "4.62.2", "fsevents": "~2.3.2" }, "bin": { "rollup": "dist/bin/rollup" } }, "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA=="],
|
||||||
|
|
||||||
|
"run-parallel": ["run-parallel@1.2.0", "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz", { "dependencies": { "queue-microtask": "^1.2.2" } }, "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="],
|
||||||
|
|
||||||
|
"semver": ["semver@7.8.5", "https://registry.npmmirror.com/semver/-/semver-7.8.5.tgz", { "bin": { "semver": "bin/semver.js" } }, "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA=="],
|
||||||
|
|
||||||
|
"shebang-command": ["shebang-command@2.0.0", "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz", { "dependencies": { "shebang-regex": "^3.0.0" } }, "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="],
|
||||||
|
|
||||||
|
"shebang-regex": ["shebang-regex@3.0.0", "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz", {}, "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="],
|
||||||
|
|
||||||
"source-map-js": ["source-map-js@1.2.1", "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz", {}, "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="],
|
"source-map-js": ["source-map-js@1.2.1", "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz", {}, "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="],
|
||||||
|
|
||||||
"speakingurl": ["speakingurl@14.0.1", "https://registry.npmmirror.com/speakingurl/-/speakingurl-14.0.1.tgz", {}, "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ=="],
|
"speakingurl": ["speakingurl@14.0.1", "https://registry.npmmirror.com/speakingurl/-/speakingurl-14.0.1.tgz", {}, "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ=="],
|
||||||
@@ -406,14 +622,26 @@
|
|||||||
|
|
||||||
"tinyglobby": ["tinyglobby@0.2.17", "https://registry.npmmirror.com/tinyglobby/-/tinyglobby-0.2.17.tgz", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.4" } }, "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g=="],
|
"tinyglobby": ["tinyglobby@0.2.17", "https://registry.npmmirror.com/tinyglobby/-/tinyglobby-0.2.17.tgz", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.4" } }, "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g=="],
|
||||||
|
|
||||||
|
"to-regex-range": ["to-regex-range@5.0.1", "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz", { "dependencies": { "is-number": "^7.0.0" } }, "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="],
|
||||||
|
|
||||||
|
"ts-api-utils": ["ts-api-utils@2.5.0", "https://registry.npmmirror.com/ts-api-utils/-/ts-api-utils-2.5.0.tgz", { "peerDependencies": { "typescript": ">=4.8.4" } }, "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA=="],
|
||||||
|
|
||||||
"tslib": ["tslib@2.8.1", "https://registry.npmmirror.com/tslib/-/tslib-2.8.1.tgz", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
|
"tslib": ["tslib@2.8.1", "https://registry.npmmirror.com/tslib/-/tslib-2.8.1.tgz", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
|
||||||
|
|
||||||
"tw-animate-css": ["tw-animate-css@1.4.0", "https://registry.npmmirror.com/tw-animate-css/-/tw-animate-css-1.4.0.tgz", {}, "sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ=="],
|
"tw-animate-css": ["tw-animate-css@1.4.0", "https://registry.npmmirror.com/tw-animate-css/-/tw-animate-css-1.4.0.tgz", {}, "sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ=="],
|
||||||
|
|
||||||
|
"type-check": ["type-check@0.4.0", "https://registry.npmmirror.com/type-check/-/type-check-0.4.0.tgz", { "dependencies": { "prelude-ls": "^1.2.1" } }, "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="],
|
||||||
|
|
||||||
"typescript": ["typescript@5.6.3", "https://registry.npmmirror.com/typescript/-/typescript-5.6.3.tgz", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw=="],
|
"typescript": ["typescript@5.6.3", "https://registry.npmmirror.com/typescript/-/typescript-5.6.3.tgz", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw=="],
|
||||||
|
|
||||||
|
"typescript-eslint": ["typescript-eslint@8.70.0", "https://registry.npmmirror.com/typescript-eslint/-/typescript-eslint-8.70.0.tgz", { "dependencies": { "@typescript-eslint/eslint-plugin": "8.70.0", "@typescript-eslint/parser": "8.70.0", "@typescript-eslint/typescript-estree": "8.70.0", "@typescript-eslint/utils": "8.70.0" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "sha512-P/W5cz70/cQAuKfY3xwQMWWTV7BvJ0mAQmi+9mBcsVPaBUpd6Ohpa+fECv9rBFrQcig86jAiNBFNWUqnTjr4pw=="],
|
||||||
|
|
||||||
"undici-types": ["undici-types@8.3.0", "https://registry.npmmirror.com/undici-types/-/undici-types-8.3.0.tgz", {}, "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ=="],
|
"undici-types": ["undici-types@8.3.0", "https://registry.npmmirror.com/undici-types/-/undici-types-8.3.0.tgz", {}, "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ=="],
|
||||||
|
|
||||||
|
"uri-js": ["uri-js@4.4.1", "https://registry.npmmirror.com/uri-js/-/uri-js-4.4.1.tgz", { "dependencies": { "punycode": "^2.1.0" } }, "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="],
|
||||||
|
|
||||||
|
"util-deprecate": ["util-deprecate@1.0.2", "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz", {}, "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="],
|
||||||
|
|
||||||
"vite": ["vite@6.4.3", "https://registry.npmmirror.com/vite/-/vite-6.4.3.tgz", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.4", "picomatch": "^4.0.2", "postcss": "^8.5.3", "rollup": "^4.34.9", "tinyglobby": "^0.2.13" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", "jiti": ">=1.21.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", "sass-embedded": "*", "stylus": "*", "sugarss": "*", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A=="],
|
"vite": ["vite@6.4.3", "https://registry.npmmirror.com/vite/-/vite-6.4.3.tgz", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.4", "picomatch": "^4.0.2", "postcss": "^8.5.3", "rollup": "^4.34.9", "tinyglobby": "^0.2.13" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", "jiti": ">=1.21.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", "sass-embedded": "*", "stylus": "*", "sugarss": "*", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A=="],
|
||||||
|
|
||||||
"vscode-uri": ["vscode-uri@3.1.0", "https://registry.npmmirror.com/vscode-uri/-/vscode-uri-3.1.0.tgz", {}, "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ=="],
|
"vscode-uri": ["vscode-uri@3.1.0", "https://registry.npmmirror.com/vscode-uri/-/vscode-uri-3.1.0.tgz", {}, "sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ=="],
|
||||||
@@ -424,10 +652,22 @@
|
|||||||
|
|
||||||
"vue-draggable-plus": ["vue-draggable-plus@0.6.1", "https://registry.npmmirror.com/vue-draggable-plus/-/vue-draggable-plus-0.6.1.tgz", { "dependencies": { "@types/sortablejs": "^1.15.8" }, "peerDependencies": { "@vue/composition-api": "*" }, "optionalPeers": ["@vue/composition-api"] }, "sha512-FbtQ/fuoixiOfTZzG3yoPl4JAo9HJXRHmBQZFB9x2NYCh6pq0TomHf7g5MUmpaDYv+LU2n6BPq2YN9sBO+FbIg=="],
|
"vue-draggable-plus": ["vue-draggable-plus@0.6.1", "https://registry.npmmirror.com/vue-draggable-plus/-/vue-draggable-plus-0.6.1.tgz", { "dependencies": { "@types/sortablejs": "^1.15.8" }, "peerDependencies": { "@vue/composition-api": "*" }, "optionalPeers": ["@vue/composition-api"] }, "sha512-FbtQ/fuoixiOfTZzG3yoPl4JAo9HJXRHmBQZFB9x2NYCh6pq0TomHf7g5MUmpaDYv+LU2n6BPq2YN9sBO+FbIg=="],
|
||||||
|
|
||||||
|
"vue-eslint-parser": ["vue-eslint-parser@10.4.1", "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-10.4.1.tgz", { "dependencies": { "debug": "^4.4.0", "eslint-scope": "^8.2.0 || ^9.0.0", "eslint-visitor-keys": "^4.2.0 || ^5.0.0", "espree": "^10.3.0 || ^11.0.0", "esquery": "^1.6.0", "semver": "^7.6.3" }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0" } }, "sha512-Gk6gRDj0n/fkRa3C3l0bBheoBckUq/Rs0F/TvMWIS6nzzx67amAViMe9CkNgsP2tXyQONvGiHQESHwFtZ3aYDA=="],
|
||||||
|
|
||||||
"vue-sonner": ["vue-sonner@2.0.9", "https://registry.npmmirror.com/vue-sonner/-/vue-sonner-2.0.9.tgz", { "peerDependencies": { "@nuxt/kit": "^4.0.3", "@nuxt/schema": "^4.0.3", "nuxt": "^4.0.3" }, "optionalPeers": ["@nuxt/kit", "@nuxt/schema", "nuxt"] }, "sha512-i6BokNlNDL93fpzNxN/LZSn6D6MzlO+i3qXt6iVZne3x1k7R46d5HlFB4P8tYydhgqOrRbIZEsnRd3kG7qGXyw=="],
|
"vue-sonner": ["vue-sonner@2.0.9", "https://registry.npmmirror.com/vue-sonner/-/vue-sonner-2.0.9.tgz", { "peerDependencies": { "@nuxt/kit": "^4.0.3", "@nuxt/schema": "^4.0.3", "nuxt": "^4.0.3" }, "optionalPeers": ["@nuxt/kit", "@nuxt/schema", "nuxt"] }, "sha512-i6BokNlNDL93fpzNxN/LZSn6D6MzlO+i3qXt6iVZne3x1k7R46d5HlFB4P8tYydhgqOrRbIZEsnRd3kG7qGXyw=="],
|
||||||
|
|
||||||
"vue-tsc": ["vue-tsc@2.2.12", "https://registry.npmmirror.com/vue-tsc/-/vue-tsc-2.2.12.tgz", { "dependencies": { "@volar/typescript": "2.4.15", "@vue/language-core": "2.2.12" }, "peerDependencies": { "typescript": ">=5.0.0" }, "bin": { "vue-tsc": "./bin/vue-tsc.js" } }, "sha512-P7OP77b2h/Pmk+lZdJ0YWs+5tJ6J2+uOQPo7tlBnY44QqQSPYvS0qVT4wqDJgwrZaLe47etJLLQRFia71GYITw=="],
|
"vue-tsc": ["vue-tsc@2.2.12", "https://registry.npmmirror.com/vue-tsc/-/vue-tsc-2.2.12.tgz", { "dependencies": { "@volar/typescript": "2.4.15", "@vue/language-core": "2.2.12" }, "peerDependencies": { "typescript": ">=5.0.0" }, "bin": { "vue-tsc": "./bin/vue-tsc.js" } }, "sha512-P7OP77b2h/Pmk+lZdJ0YWs+5tJ6J2+uOQPo7tlBnY44QqQSPYvS0qVT4wqDJgwrZaLe47etJLLQRFia71GYITw=="],
|
||||||
|
|
||||||
|
"which": ["which@2.0.2", "https://registry.npmmirror.com/which/-/which-2.0.2.tgz", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="],
|
||||||
|
|
||||||
|
"word-wrap": ["word-wrap@1.2.5", "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.5.tgz", {}, "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA=="],
|
||||||
|
|
||||||
|
"xml-name-validator": ["xml-name-validator@5.0.0", "https://registry.npmmirror.com/xml-name-validator/-/xml-name-validator-5.0.0.tgz", {}, "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg=="],
|
||||||
|
|
||||||
|
"yocto-queue": ["yocto-queue@0.1.0", "https://registry.npmmirror.com/yocto-queue/-/yocto-queue-0.1.0.tgz", {}, "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="],
|
||||||
|
|
||||||
|
"@eslint-community/eslint-utils/eslint-visitor-keys": ["eslint-visitor-keys@3.4.3", "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", {}, "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag=="],
|
||||||
|
|
||||||
"@tailwindcss/oxide-wasm32-wasi/@emnapi/core": ["@emnapi/core@1.11.2", "https://registry.npmmirror.com/@emnapi/core/-/core-1.11.2.tgz", { "dependencies": { "@emnapi/wasi-threads": "1.2.2", "tslib": "^2.4.0" }, "bundled": true }, "sha512-TC8MkTuZUtcTSiFeuC0ksCh9QIJ5+F21MvZ4Wn4ORfYaFJ/0dsiudv5tVkejgwZlwQ39jL9WWDe2lz8x0WglOA=="],
|
"@tailwindcss/oxide-wasm32-wasi/@emnapi/core": ["@emnapi/core@1.11.2", "https://registry.npmmirror.com/@emnapi/core/-/core-1.11.2.tgz", { "dependencies": { "@emnapi/wasi-threads": "1.2.2", "tslib": "^2.4.0" }, "bundled": true }, "sha512-TC8MkTuZUtcTSiFeuC0ksCh9QIJ5+F21MvZ4Wn4ORfYaFJ/0dsiudv5tVkejgwZlwQ39jL9WWDe2lz8x0WglOA=="],
|
||||||
|
|
||||||
"@tailwindcss/oxide-wasm32-wasi/@emnapi/runtime": ["@emnapi/runtime@1.11.2", "https://registry.npmmirror.com/@emnapi/runtime/-/runtime-1.11.2.tgz", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-kyOl3X0DuTiT1h2ft8r2fYO8JYtU9a9Xis/zBSiGArNaagCOWx90N1k2wxp18czFDH+OgcWGb5ZP/XMt3dcyPA=="],
|
"@tailwindcss/oxide-wasm32-wasi/@emnapi/runtime": ["@emnapi/runtime@1.11.2", "https://registry.npmmirror.com/@emnapi/runtime/-/runtime-1.11.2.tgz", { "dependencies": { "tslib": "^2.4.0" }, "bundled": true }, "sha512-kyOl3X0DuTiT1h2ft8r2fYO8JYtU9a9Xis/zBSiGArNaagCOWx90N1k2wxp18czFDH+OgcWGb5ZP/XMt3dcyPA=="],
|
||||||
@@ -440,10 +680,24 @@
|
|||||||
|
|
||||||
"@tailwindcss/oxide-wasm32-wasi/tslib": ["tslib@2.8.1", "https://registry.npmmirror.com/tslib/-/tslib-2.8.1.tgz", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
|
"@tailwindcss/oxide-wasm32-wasi/tslib": ["tslib@2.8.1", "https://registry.npmmirror.com/tslib/-/tslib-2.8.1.tgz", { "bundled": true }, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
|
||||||
|
|
||||||
|
"@typescript-eslint/eslint-plugin/ignore": ["ignore@7.0.9", "https://registry.npmmirror.com/ignore/-/ignore-7.0.9.tgz", {}, "sha512-brTTsvFRt5C1gGHtPst/281UjPD5t9fBqbgoMPlVWy11ZLTPfu7HxK4ZYqO9H7o/yC9rSTCI85EaQ4OoY12qYw=="],
|
||||||
|
|
||||||
|
"@vue/language-core/minimatch": ["minimatch@9.0.9", "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.9.tgz", { "dependencies": { "brace-expansion": "^2.0.2" } }, "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg=="],
|
||||||
|
|
||||||
|
"fast-glob/glob-parent": ["glob-parent@5.1.2", "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
|
||||||
|
|
||||||
|
"micromatch/picomatch": ["picomatch@2.3.2", "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.2.tgz", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="],
|
||||||
|
|
||||||
|
"qified/hookified": ["hookified@2.2.0", "https://registry.npmmirror.com/hookified/-/hookified-2.2.0.tgz", {}, "sha512-p/LgFzRN5FeoD3DLS6bkUapeye6E4SI6yJs6KetENd18S+FBthqYq2amJUWpt5z0EQwwHemidjY5OqJGEKm5uA=="],
|
||||||
|
|
||||||
"reka-ui/@vueuse/core": ["@vueuse/core@14.3.0", "https://registry.npmmirror.com/@vueuse/core/-/core-14.3.0.tgz", { "dependencies": { "@types/web-bluetooth": "^0.0.21", "@vueuse/metadata": "14.3.0", "@vueuse/shared": "14.3.0" }, "peerDependencies": { "vue": "^3.5.0" } }, "sha512-aHfz47g0ZhMtTVHmIzMVpJy8ePhhOy68GY5bv110+5DVtZ+W7BsOx+m61UNQqfrWyPztIHIanWa3E2tib3NFIw=="],
|
"reka-ui/@vueuse/core": ["@vueuse/core@14.3.0", "https://registry.npmmirror.com/@vueuse/core/-/core-14.3.0.tgz", { "dependencies": { "@types/web-bluetooth": "^0.0.21", "@vueuse/metadata": "14.3.0", "@vueuse/shared": "14.3.0" }, "peerDependencies": { "vue": "^3.5.0" } }, "sha512-aHfz47g0ZhMtTVHmIzMVpJy8ePhhOy68GY5bv110+5DVtZ+W7BsOx+m61UNQqfrWyPztIHIanWa3E2tib3NFIw=="],
|
||||||
|
|
||||||
"reka-ui/@vueuse/shared": ["@vueuse/shared@14.3.0", "https://registry.npmmirror.com/@vueuse/shared/-/shared-14.3.0.tgz", { "peerDependencies": { "vue": "^3.5.0" } }, "sha512-bZpge9eSXwa4ToSiqJ7j6KRwhAsneMFoSz3LMWKQDkqimm3D/tbFlrklrs/IOqC8tEcYmXQZJ6N0UrjhBirVCg=="],
|
"reka-ui/@vueuse/shared": ["@vueuse/shared@14.3.0", "https://registry.npmmirror.com/@vueuse/shared/-/shared-14.3.0.tgz", { "peerDependencies": { "vue": "^3.5.0" } }, "sha512-bZpge9eSXwa4ToSiqJ7j6KRwhAsneMFoSz3LMWKQDkqimm3D/tbFlrklrs/IOqC8tEcYmXQZJ6N0UrjhBirVCg=="],
|
||||||
|
|
||||||
|
"@vue/language-core/minimatch/brace-expansion": ["brace-expansion@2.1.2", "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.1.2.tgz", { "dependencies": { "balanced-match": "^1.0.0" } }, "sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA=="],
|
||||||
|
|
||||||
"reka-ui/@vueuse/core/@vueuse/metadata": ["@vueuse/metadata@14.3.0", "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-14.3.0.tgz", {}, "sha512-BwxmbAzwAVF50+MW57GXOUEV61nFBGnlBvrTqj49PqWJu3uw7hdu72ztXeZ33RdZtDY6kO+bfCAE1PCn88Tktw=="],
|
"reka-ui/@vueuse/core/@vueuse/metadata": ["@vueuse/metadata@14.3.0", "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-14.3.0.tgz", {}, "sha512-BwxmbAzwAVF50+MW57GXOUEV61nFBGnlBvrTqj49PqWJu3uw7hdu72ztXeZ33RdZtDY6kO+bfCAE1PCn88Tktw=="],
|
||||||
|
|
||||||
|
"@vue/language-core/minimatch/brace-expansion/balanced-match": ["balanced-match@1.0.2", "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz", {}, "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
// ESLint 平坦配置 —— 落地 UI_DESIGN_SYSTEM.md 第 5 章的 D 系约束。
|
||||||
|
// 依赖：eslint / eslint-plugin-vue / @vue/eslint-config-typescript（见 package.json devDependencies）
|
||||||
|
// 运行：bun run lint
|
||||||
|
import pluginVue from 'eslint-plugin-vue'
|
||||||
|
import { defineConfigWithVueTs, vueTsConfigs } from '@vue/eslint-config-typescript'
|
||||||
|
|
||||||
|
export default defineConfigWithVueTs(
|
||||||
|
{
|
||||||
|
ignores: [
|
||||||
|
'dist/**',
|
||||||
|
'node_modules/**',
|
||||||
|
'src-tauri/**',
|
||||||
|
'release_stage/**',
|
||||||
|
'ThingHK/**',
|
||||||
|
],
|
||||||
|
},
|
||||||
|
|
||||||
|
// flat/essential：只保留「防错」规则（v-for key、重复 attr 等），
|
||||||
|
// 不含缩进/引号等格式规则 —— 3183 条里 3038 条是格式噪音，与既有代码风格无关
|
||||||
|
pluginVue.configs['flat/essential'],
|
||||||
|
vueTsConfigs.recommended,
|
||||||
|
|
||||||
|
{
|
||||||
|
rules: {
|
||||||
|
// ---- D2：禁止 Tailwind 原生色阶，必须使用语义 token ----
|
||||||
|
'no-restricted-syntax': [
|
||||||
|
'error',
|
||||||
|
{
|
||||||
|
selector:
|
||||||
|
"Literal[value=/(bg|text|border|ring|fill|stroke)-(slate|gray|zinc|neutral|stone|red|orange|amber|yellow|lime|green|emerald|teal|cyan|sky|blue|indigo|violet|purple|fuchsia|pink|rose)-[0-9]{2,3}(\\/[0-9]{1,3})?/]",
|
||||||
|
message:
|
||||||
|
'D2 禁止 Tailwind 原生色阶：请使用语义 token（bg-card / text-success-text / border-border 等），见 UI_DESIGN_SYSTEM.md',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
// D9：生产代码禁止外部字体 CDN
|
||||||
|
selector:
|
||||||
|
"Literal[value=/@import\\s+url\\(['\\\"]?https:\\/\\/(fonts\\.googleapis|fonts\\.gstatic)\\./]",
|
||||||
|
message: 'D9 禁止外部字体 CDN：使用系统字体栈',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
|
||||||
|
// ---- 未使用变量：_ 前缀豁免（Pinia action 占位、解构占位等惯例）----
|
||||||
|
'@typescript-eslint/no-unused-vars': [
|
||||||
|
'error',
|
||||||
|
{
|
||||||
|
argsIgnorePattern: '^_',
|
||||||
|
varsIgnorePattern: '^_',
|
||||||
|
caughtErrors: 'none',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
|
||||||
|
// ---- Vue 风格：与既有代码一致 ----
|
||||||
|
'vue/multi-word-component-names': 'off',
|
||||||
|
'vue/max-attributes-per-line': 'off',
|
||||||
|
'vue/singleline-html-element-content-newline': 'off',
|
||||||
|
'vue/html-self-closing': 'off',
|
||||||
|
'vue/attributes-order': 'off',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
// .d.ts 声明文件：Vue 官方模板的 ImportMetaEnv 写法使用 {} 与 any，豁免
|
||||||
|
{
|
||||||
|
files: ['**/*.d.ts'],
|
||||||
|
rules: {
|
||||||
|
'@typescript-eslint/no-empty-object-type': 'off',
|
||||||
|
'@typescript-eslint/no-explicit-any': 'off',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
// feiniuStore 是飞牛 NAS 的 API 适配层：后端原始结构未在前端定型（字段类型化需对接 Rust 端），
|
||||||
|
// 边界层暂豁免 no-explicit-any；定型后应移除此豁免
|
||||||
|
{
|
||||||
|
files: ['src/stores/feiniuStore.ts'],
|
||||||
|
rules: {
|
||||||
|
'@typescript-eslint/no-explicit-any': 'off',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
// xterm 等第三方深色区域如需豁免，在下方追加 overrides
|
||||||
|
)
|
||||||
Generated
+54
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "thing",
|
"name": "thing",
|
||||||
"version": "0.1.0",
|
"version": "26.9.3",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "thing",
|
"name": "thing",
|
||||||
"version": "0.1.0",
|
"version": "26.9.3",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@lucide/vue": "^1.28.0",
|
"@lucide/vue": "^1.28.0",
|
||||||
"@tailwindcss/vite": "^4.3.2",
|
"@tailwindcss/vite": "^4.3.2",
|
||||||
@@ -16,6 +16,13 @@
|
|||||||
"@tauri-apps/plugin-global-shortcut": "^2",
|
"@tauri-apps/plugin-global-shortcut": "^2",
|
||||||
"@tauri-apps/plugin-opener": "^2",
|
"@tauri-apps/plugin-opener": "^2",
|
||||||
"@vueuse/core": "^14.4.0",
|
"@vueuse/core": "^14.4.0",
|
||||||
|
"@xterm/addon-fit": "^0.11.0",
|
||||||
|
"@xterm/addon-search": "^0.16.0",
|
||||||
|
"@xterm/addon-serialize": "^0.14.0",
|
||||||
|
"@xterm/addon-unicode11": "^0.9.0",
|
||||||
|
"@xterm/addon-web-links": "^0.12.0",
|
||||||
|
"@xterm/addon-webgl": "^0.19.0",
|
||||||
|
"@xterm/xterm": "^6.0.0",
|
||||||
"class-variance-authority": "^0.7.1",
|
"class-variance-authority": "^0.7.1",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"pinia": "^3.0.4",
|
"pinia": "^3.0.4",
|
||||||
@@ -1719,6 +1726,51 @@
|
|||||||
"vue": "^3.5.0"
|
"vue": "^3.5.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@xterm/addon-fit": {
|
||||||
|
"version": "0.11.0",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@xterm/addon-fit/-/addon-fit-0.11.0.tgz",
|
||||||
|
"integrity": "sha512-jYcgT6xtVYhnhgxh3QgYDnnNMYTcf8ElbxxFzX0IZo+vabQqSPAjC3c1wJrKB5E19VwQei89QCiZZP86DCPF7g==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/@xterm/addon-search": {
|
||||||
|
"version": "0.16.0",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@xterm/addon-search/-/addon-search-0.16.0.tgz",
|
||||||
|
"integrity": "sha512-9OeuBFu0/uZJPu+9AHKY6g/w0Czyb/Ut0A5t79I4ULoU4IfU5BEpPFVGQxP4zTTMdfZEYkVIRYbHBX1xWwjeSA==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/@xterm/addon-serialize": {
|
||||||
|
"version": "0.14.0",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@xterm/addon-serialize/-/addon-serialize-0.14.0.tgz",
|
||||||
|
"integrity": "sha512-uteyTU1EkrQa2Ux6P/uFl2fzmXI46jy5uoQMKEOM0fKTyiW7cSn0WrFenHm5vO5uEXX/GpwW/FgILvv3r0WbkA==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/@xterm/addon-unicode11": {
|
||||||
|
"version": "0.9.0",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@xterm/addon-unicode11/-/addon-unicode11-0.9.0.tgz",
|
||||||
|
"integrity": "sha512-FxDnYcyuXhNl+XSqGZL/t0U9eiNb/q3EWT5rYkQT/zuig8Gz/VagnQANKHdDWFM2lTMk9ly0EFQxxxtZUoRetw==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/@xterm/addon-web-links": {
|
||||||
|
"version": "0.12.0",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@xterm/addon-web-links/-/addon-web-links-0.12.0.tgz",
|
||||||
|
"integrity": "sha512-4Smom3RPyVp7ZMYOYDoC/9eGJJJqYhnPLGGqJ6wOBfB8VxPViJNSKdgRYb8NpaM6YSelEKbA2SStD7lGyqaobw==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/@xterm/addon-webgl": {
|
||||||
|
"version": "0.19.0",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@xterm/addon-webgl/-/addon-webgl-0.19.0.tgz",
|
||||||
|
"integrity": "sha512-b3fMOsyLVuCeNJWxolACEUED0vm7qC0cy4wRvf3oURSzDTYVQiGPhTnhWZwIHdvC48Y+oLhvYXnY4XDXPoJo6A==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/@xterm/xterm": {
|
||||||
|
"version": "6.0.0",
|
||||||
|
"resolved": "https://registry.npmmirror.com/@xterm/xterm/-/xterm-6.0.0.tgz",
|
||||||
|
"integrity": "sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"workspaces": [
|
||||||
|
"addons/*"
|
||||||
|
]
|
||||||
|
},
|
||||||
"node_modules/alien-signals": {
|
"node_modules/alien-signals": {
|
||||||
"version": "1.0.13",
|
"version": "1.0.13",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
|||||||
+15
-2
@@ -5,9 +5,12 @@
|
|||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
"build": "vue-tsc --noEmit && vite build",
|
"build": "vue-tsc --noEmit && node --max-old-space-size=8192 node_modules/vite/bin/vite.js build",
|
||||||
|
"build:vite": "node --max-old-space-size=8192 node_modules/vite/bin/vite.js build",
|
||||||
|
"typecheck": "vue-tsc --noEmit",
|
||||||
|
"lint": "eslint src",
|
||||||
"preview": "vite preview",
|
"preview": "vite preview",
|
||||||
"test": "node --test src/modules/quickpanel/engine.test.ts src/lib/calc.test.ts",
|
"test": "node --test src/modules/quickpanel/engine.test.ts src/lib/calc.test.ts src/lib/theme.test.ts",
|
||||||
"tauri": "tauri"
|
"tauri": "tauri"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -19,6 +22,13 @@
|
|||||||
"@tauri-apps/plugin-global-shortcut": "^2",
|
"@tauri-apps/plugin-global-shortcut": "^2",
|
||||||
"@tauri-apps/plugin-opener": "^2",
|
"@tauri-apps/plugin-opener": "^2",
|
||||||
"@vueuse/core": "^14.4.0",
|
"@vueuse/core": "^14.4.0",
|
||||||
|
"@xterm/addon-fit": "^0.11.0",
|
||||||
|
"@xterm/addon-search": "^0.16.0",
|
||||||
|
"@xterm/addon-serialize": "^0.14.0",
|
||||||
|
"@xterm/addon-unicode11": "^0.9.0",
|
||||||
|
"@xterm/addon-web-links": "^0.12.0",
|
||||||
|
"@xterm/addon-webgl": "^0.19.0",
|
||||||
|
"@xterm/xterm": "^6.0.0",
|
||||||
"class-variance-authority": "^0.7.1",
|
"class-variance-authority": "^0.7.1",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"pinia": "^3.0.4",
|
"pinia": "^3.0.4",
|
||||||
@@ -34,6 +44,9 @@
|
|||||||
"@tauri-apps/cli": "^2",
|
"@tauri-apps/cli": "^2",
|
||||||
"@types/node": "^26.1.1",
|
"@types/node": "^26.1.1",
|
||||||
"@vitejs/plugin-vue": "^5.2.1",
|
"@vitejs/plugin-vue": "^5.2.1",
|
||||||
|
"@vue/eslint-config-typescript": "^14.9.0",
|
||||||
|
"eslint": "^10.11.0",
|
||||||
|
"eslint-plugin-vue": "^10.11.0",
|
||||||
"tw-animate-css": "^1.4.0",
|
"tw-animate-css": "^1.4.0",
|
||||||
"typescript": "~5.6.2",
|
"typescript": "~5.6.2",
|
||||||
"vite": "^6.0.3",
|
"vite": "^6.0.3",
|
||||||
|
|||||||
Generated
+1237
-144
File diff suppressed because it is too large
Load Diff
+72
-7
File diff suppressed because one or more lines are too long
@@ -11,6 +11,7 @@
|
|||||||
"dialog:default",
|
"dialog:default",
|
||||||
"core:window:allow-minimize",
|
"core:window:allow-minimize",
|
||||||
"core:window:allow-maximize",
|
"core:window:allow-maximize",
|
||||||
|
"core:window:allow-unminimize",
|
||||||
"core:window:allow-close",
|
"core:window:allow-close",
|
||||||
"core:window:allow-toggle-maximize",
|
"core:window:allow-toggle-maximize",
|
||||||
"core:window:allow-hide",
|
"core:window:allow-hide",
|
||||||
@@ -26,6 +27,9 @@
|
|||||||
"core:window:allow-set-always-on-top",
|
"core:window:allow-set-always-on-top",
|
||||||
"core:window:allow-set-skip-taskbar",
|
"core:window:allow-set-skip-taskbar",
|
||||||
"core:window:allow-set-decorations",
|
"core:window:allow-set-decorations",
|
||||||
|
"global-shortcut:allow-register",
|
||||||
|
"global-shortcut:allow-unregister",
|
||||||
|
"global-shortcut:allow-is-registered",
|
||||||
"snap-layout:default"
|
"snap-layout:default"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
{
|
||||||
|
"$schema": "../gen/schemas/desktop-schema.json",
|
||||||
|
"identifier": "terminal-window",
|
||||||
|
"description": "Capability for detached terminal windows (one session per window, label = terminal-window-<sessionId>)",
|
||||||
|
"windows": ["terminal-window-*"],
|
||||||
|
"permissions": [
|
||||||
|
"core:default",
|
||||||
|
"core:window:allow-show",
|
||||||
|
"core:window:allow-close",
|
||||||
|
"core:window:allow-minimize",
|
||||||
|
"core:window:allow-maximize",
|
||||||
|
"core:window:allow-toggle-maximize",
|
||||||
|
"core:window:allow-set-focus",
|
||||||
|
"core:window:allow-set-title",
|
||||||
|
"core:window:allow-start-dragging",
|
||||||
|
"core:window:allow-set-theme",
|
||||||
|
"core:window:allow-set-background-color",
|
||||||
|
"core:event:allow-listen",
|
||||||
|
"core:event:allow-emit",
|
||||||
|
"opener:default",
|
||||||
|
"opener:allow-open-path",
|
||||||
|
"opener:allow-reveal-item-in-dir",
|
||||||
|
"snap-layout:default"
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -625,8 +625,9 @@ pub fn hide_preview(app: &AppHandle) {
|
|||||||
/// - 交互锁定模式（点击过预览窗的放大/缩小/复制等）：弹窗已失焦不会再收到
|
/// - 交互锁定模式（点击过预览窗的放大/缩小/复制等）：弹窗已失焦不会再收到
|
||||||
/// Focused(false)，检测"鼠标按下沿且按下位置在弹窗+预览之外"→ 点击外部，关闭弹窗。
|
/// Focused(false)，检测"鼠标按下沿且按下位置在弹窗+预览之外"→ 点击外部，关闭弹窗。
|
||||||
///
|
///
|
||||||
/// 公共退出条件：弹窗已隐藏/销毁（其他路径关闭）；弹窗重新获得焦点（用户点击
|
/// 退出条件：弹窗已隐藏/销毁（其他路径关闭）；弹窗重新获得焦点（用户点击
|
||||||
/// 弹窗，恢复正常失焦关闭路径，并复位交互锁定）；超时兜底防线程泄漏
|
/// 弹窗，恢复正常失焦关闭路径，并复位交互锁定）；**光标回到弹窗内并停留片刻
|
||||||
|
/// （交互锁定解除，但看护继续以常规模式运行）**；超时兜底防线程泄漏
|
||||||
/// （常规 30s；交互锁定为事件驱动，放宽至 10min）。
|
/// （常规 30s；交互锁定为事件驱动，放宽至 10min）。
|
||||||
fn spawn_popup_leave_watch(app: AppHandle) {
|
fn spawn_popup_leave_watch(app: AppHandle) {
|
||||||
// 防重入：已有看护在运行则跳过
|
// 防重入：已有看护在运行则跳过
|
||||||
@@ -634,9 +635,12 @@ fn spawn_popup_leave_watch(app: AppHandle) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
std::thread::spawn(move || {
|
std::thread::spawn(move || {
|
||||||
let start = Instant::now();
|
// 超时兜底的起点：交互锁定解除时重置（那之后按常规模式的 30s 计）
|
||||||
|
let mut start = Instant::now();
|
||||||
let mut outside = 0u32;
|
let mut outside = 0u32;
|
||||||
let mut was_down = false;
|
let mut was_down = false;
|
||||||
|
// 交互锁定期间光标停在弹窗内的连续轮数（30ms/轮）
|
||||||
|
let mut back_in_popup = 0u32;
|
||||||
loop {
|
loop {
|
||||||
std::thread::sleep(Duration::from_millis(30));
|
std::thread::sleep(Duration::from_millis(30));
|
||||||
// 弹窗已隐藏或被销毁：看护结束
|
// 弹窗已隐藏或被销毁：看护结束
|
||||||
@@ -654,6 +658,33 @@ fn spawn_popup_leave_watch(app: AppHandle) {
|
|||||||
POPUP_INTERACTED.store(false, Ordering::SeqCst);
|
POPUP_INTERACTED.store(false, Ordering::SeqCst);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
// 交互锁定期间光标已回到弹窗内：用户离开预览窗、回到列表继续浏览 ——
|
||||||
|
// 解除锁定，让前端的悬停逻辑重新生效（否则 hide_preview 在锁定期间一律
|
||||||
|
// 被忽略，表现为「鼠标回到弹窗、悬停在不需要预览的条目上，预览窗不关」）。
|
||||||
|
//
|
||||||
|
// 这里**只解除锁定、不 break**：弹窗此刻没有焦点，不会再收到 Focused(false)，
|
||||||
|
// 若连看护也退出，它就成了无人负责关闭的残留窗口。继续跑常规模式，
|
||||||
|
// 光标离开弹窗+预览区域约 300ms 后照常关闭。
|
||||||
|
// 连续计数（~210ms）用来排除「弹窗-预览之间的间隙」造成的瞬时误判。
|
||||||
|
if POPUP_INTERACTED.load(Ordering::SeqCst) {
|
||||||
|
if is_cursor_in_popup(&app) {
|
||||||
|
back_in_popup += 1;
|
||||||
|
if back_in_popup >= 7 {
|
||||||
|
POPUP_INTERACTED.store(false, Ordering::SeqCst);
|
||||||
|
back_in_popup = 0;
|
||||||
|
// 兜底超时从「解除锁定」这一刻重新计时
|
||||||
|
start = Instant::now();
|
||||||
|
// 顺势收起预览：用户回到弹窗意味着意图已从「看预览」变回
|
||||||
|
// 「浏览列表」。前端在悬停时发出的那次 hide_preview 落在锁定
|
||||||
|
// 期间、已被忽略，这里补上（否则预览会一直挂到下次悬停）。
|
||||||
|
hide_preview(&app);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
back_in_popup = 0;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
back_in_popup = 0;
|
||||||
|
}
|
||||||
let interacted = POPUP_INTERACTED.load(Ordering::SeqCst);
|
let interacted = POPUP_INTERACTED.load(Ordering::SeqCst);
|
||||||
// 超长兜底：避免异常路径下看护线程无限轮询
|
// 超长兜底：避免异常路径下看护线程无限轮询
|
||||||
let timeout = if interacted {
|
let timeout = if interacted {
|
||||||
|
|||||||
@@ -16,6 +16,9 @@ pub mod windows {
|
|||||||
pub const SCREENSHOT_SCROLL: &str = "screenshot-scroll";
|
pub const SCREENSHOT_SCROLL: &str = "screenshot-scroll";
|
||||||
/// 取词翻译悬浮窗（由 translate 模块预创建，非激活显示）
|
/// 取词翻译悬浮窗（由 translate 模块预创建，非激活显示）
|
||||||
pub const TRANSLATE_POPUP: &str = "translate-popup";
|
pub const TRANSLATE_POPUP: &str = "translate-popup";
|
||||||
|
/// 终端独立窗口前缀，实际 label = `${TERMINAL_WINDOW}-<sessionId>`
|
||||||
|
/// 每个终端窗口承载一个会话，脱离主窗口独立存在。
|
||||||
|
pub const TERMINAL_WINDOW: &str = "terminal-window";
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Tauri 事件名（与前端 constants::EVENTS 对应）
|
/// Tauri 事件名（与前端 constants::EVENTS 对应）
|
||||||
@@ -73,6 +76,30 @@ pub mod events {
|
|||||||
pub const TRANSLATE_STREAM_ERROR: &str = "translate-stream-error";
|
pub const TRANSLATE_STREAM_ERROR: &str = "translate-stream-error";
|
||||||
// 音乐模块：Python 便携运行时安装进度
|
// 音乐模块：Python 便携运行时安装进度
|
||||||
pub const MUSIC_RUNTIME_INSTALL_PROGRESS: &str = "music-runtime-install-progress";
|
pub const MUSIC_RUNTIME_INSTALL_PROGRESS: &str = "music-runtime-install-progress";
|
||||||
|
// 终端模块：会话输出批次（负载见 terminal::events::OutputPayload）
|
||||||
|
// 按 8~16ms 窗口聚合，前端用 seq 校验连续性
|
||||||
|
pub const TERMINAL_OUTPUT: &str = "terminal-output";
|
||||||
|
// 终端模块：会话结束（负载见 terminal::events::ExitPayload）
|
||||||
|
pub const TERMINAL_EXIT: &str = "terminal-exit";
|
||||||
|
// 终端模块：会话状态变更（负载为 SessionInfo，前端据此刷新侧栏与标签）
|
||||||
|
pub const TERMINAL_STATE: &str = "terminal-state";
|
||||||
|
// 终端模块：工作目录变化（OSC 7 hook 上报；SFTP 跟随目录依赖此事件）
|
||||||
|
pub const TERMINAL_CWD: &str = "terminal-cwd";
|
||||||
|
// 终端模块：SSH 主机密钥需用户确认（阻塞式交互，握手暂停等待回传）
|
||||||
|
pub const TERMINAL_HOST_KEY_PROMPT: &str = "terminal-host-key-prompt";
|
||||||
|
// 终端模块：请求前端对「关闭仍在运行的会话」二次确认
|
||||||
|
// （P2 起用：P0 的关闭确认在前端 store 内完成，事件通道先占位）
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub const TERMINAL_CONFIRM_CLOSE: &str = "terminal-confirm-close";
|
||||||
|
// 终端模块：SFTP 传输进度（负载见 terminal::ssh::sftp::TransferProgress）
|
||||||
|
// 节流后发送（约 200ms 一次），前端据此画进度条
|
||||||
|
pub const TERMINAL_TRANSFER_PROGRESS: &str = "terminal-transfer-progress";
|
||||||
|
// 终端模块：设置已保存（无负载）。
|
||||||
|
//
|
||||||
|
// 终端设置存在 Rust 侧，而每个窗口（主窗口 / 终端独立窗口 / 选择窗口）各有
|
||||||
|
// 一份前端副本 —— 没有这个事件，在主窗口改完外观后，已打开的独立窗口会一直
|
||||||
|
// 用旧配色，直到重开窗口。
|
||||||
|
pub const TERMINAL_SETTINGS: &str = "terminal-settings";
|
||||||
// 音乐模块：下载任务事件（桥接事件行 → 前端，负载见 bridge.py _emit_event）
|
// 音乐模块：下载任务事件（桥接事件行 → 前端，负载见 bridge.py _emit_event）
|
||||||
pub const MUSIC_DOWNLOAD_EVENT: &str = "music-download-event";
|
pub const MUSIC_DOWNLOAD_EVENT: &str = "music-download-event";
|
||||||
// 后端自动切换节点完成（前端据以刷新节点列表并提示）
|
// 后端自动切换节点完成（前端据以刷新节点列表并提示）
|
||||||
|
|||||||
+169
-1
@@ -16,6 +16,7 @@ mod secrets;
|
|||||||
mod setup;
|
mod setup;
|
||||||
mod shortcut;
|
mod shortcut;
|
||||||
mod snap_fix;
|
mod snap_fix;
|
||||||
|
mod terminal;
|
||||||
mod translate;
|
mod translate;
|
||||||
mod tray_menu;
|
mod tray_menu;
|
||||||
mod updater;
|
mod updater;
|
||||||
@@ -103,6 +104,46 @@ use quickpanel::{
|
|||||||
quickpanel_show_window, quickpanel_unregister_shortcut, quickpanel_focus_main_window,
|
quickpanel_show_window, quickpanel_unregister_shortcut, quickpanel_focus_main_window,
|
||||||
};
|
};
|
||||||
use tray_menu::{tray_menu_action, tray_menu_hide, tray_menu_ready};
|
use tray_menu::{tray_menu_action, tray_menu_hide, tray_menu_ready};
|
||||||
|
use terminal::commands::{
|
||||||
|
terminal_attach_session, terminal_clear_known_hosts, terminal_clear_session,
|
||||||
|
terminal_close_session, terminal_confirm_host_key, terminal_default_cwd, terminal_delete_host,
|
||||||
|
terminal_delete_key, terminal_delete_shell, terminal_detach_session,
|
||||||
|
terminal_export_known_hosts, terminal_forget_host, terminal_generate_key,
|
||||||
|
terminal_get_settings, terminal_import_key, terminal_import_known_hosts,
|
||||||
|
terminal_import_ssh_config, terminal_key_public, terminal_list_hosts,
|
||||||
|
terminal_list_known_hosts, terminal_list_keys, terminal_list_sessions,
|
||||||
|
terminal_list_shells, terminal_new_host_id, terminal_open_local,
|
||||||
|
terminal_open_ssh, terminal_open_local_path, terminal_reveal_local_path,
|
||||||
|
terminal_refresh_shells, terminal_rename_key, terminal_rename_session,
|
||||||
|
terminal_resize, terminal_save_appearance, terminal_save_host, terminal_save_layout,
|
||||||
|
terminal_save_security, terminal_save_selection, terminal_save_settings,
|
||||||
|
terminal_save_shell, terminal_save_shortcuts, terminal_send_key, terminal_session_alive,
|
||||||
|
terminal_session_cwd, terminal_session_cwd_value, terminal_set_host_password,
|
||||||
|
terminal_set_encoding,
|
||||||
|
terminal_set_key_passphrase,
|
||||||
|
terminal_set_last_shell, terminal_test_shell, terminal_write,
|
||||||
|
// SFTP 文件管理（P1）
|
||||||
|
terminal_sftp_close, terminal_sftp_delete, terminal_sftp_download, terminal_sftp_is_open,
|
||||||
|
terminal_sftp_list, terminal_sftp_mkdir, terminal_sftp_open, terminal_sftp_parent,
|
||||||
|
terminal_sftp_read_link, terminal_sftp_rename, terminal_sftp_upload,
|
||||||
|
// 命令片段（P1）
|
||||||
|
terminal_delete_snippet, terminal_list_snippets, terminal_render_snippet,
|
||||||
|
terminal_restore_default_snippets, terminal_run_snippet, terminal_save_snippet,
|
||||||
|
// 命令历史（P1）
|
||||||
|
terminal_history_clear, terminal_history_delete, terminal_history_query,
|
||||||
|
terminal_history_run, terminal_history_sources, terminal_history_toggle_favorite,
|
||||||
|
// 端口转发（P2）
|
||||||
|
terminal_add_forward, terminal_list_forwards, terminal_remove_forward,
|
||||||
|
// 会话日志（P2）
|
||||||
|
terminal_log_path, terminal_toggle_logging,
|
||||||
|
// 主机配置同步（P2）
|
||||||
|
terminal_export_hosts, terminal_import_hosts,
|
||||||
|
// 会话模板（P2）
|
||||||
|
terminal_delete_template, terminal_save_template,
|
||||||
|
// AI 命令助手（P2）
|
||||||
|
terminal_ai_engines, terminal_ai_suggest,
|
||||||
|
};
|
||||||
|
use terminal::TerminalManager;
|
||||||
use translate::{
|
use translate::{
|
||||||
translate_abort, translate_apply_shortcuts, translate_copy_text, translate_engine_delete,
|
translate_abort, translate_apply_shortcuts, translate_copy_text, translate_engine_delete,
|
||||||
translate_engine_models, translate_engine_save, translate_engine_test_config,
|
translate_engine_models, translate_engine_save, translate_engine_test_config,
|
||||||
@@ -208,6 +249,34 @@ fn export_bindings() {
|
|||||||
translate_history_list, translate_history_delete, translate_history_clear,
|
translate_history_list, translate_history_delete, translate_history_clear,
|
||||||
translate_history_set_favorited,
|
translate_history_set_favorited,
|
||||||
translate_stream_start, translate_abort, translate_paste_back,
|
translate_stream_start, translate_abort, translate_paste_back,
|
||||||
|
// terminal（41：39 业务 + key_public / new_host_id 两个辅助）
|
||||||
|
terminal_get_settings, terminal_save_settings, terminal_save_appearance,
|
||||||
|
terminal_save_layout, terminal_save_selection, terminal_save_security,
|
||||||
|
terminal_save_shortcuts,
|
||||||
|
terminal_list_shells, terminal_refresh_shells, terminal_save_shell,
|
||||||
|
terminal_delete_shell, terminal_set_last_shell, terminal_test_shell,
|
||||||
|
terminal_default_cwd,
|
||||||
|
terminal_open_local, terminal_open_ssh, terminal_list_sessions,
|
||||||
|
terminal_close_session, terminal_write, terminal_resize, terminal_rename_session,
|
||||||
|
terminal_detach_session, terminal_attach_session, terminal_session_cwd,
|
||||||
|
terminal_send_key, terminal_clear_session, terminal_session_alive,
|
||||||
|
terminal_set_encoding,
|
||||||
|
terminal_list_hosts, terminal_save_host, terminal_delete_host,
|
||||||
|
terminal_set_host_password, terminal_import_ssh_config,
|
||||||
|
terminal_list_keys, terminal_generate_key, terminal_import_key,
|
||||||
|
terminal_delete_key, terminal_rename_key, terminal_set_key_passphrase,
|
||||||
|
terminal_key_public, terminal_new_host_id,
|
||||||
|
terminal_list_known_hosts, terminal_forget_host, terminal_clear_known_hosts,
|
||||||
|
terminal_export_known_hosts, terminal_import_known_hosts,
|
||||||
|
terminal_confirm_host_key,
|
||||||
|
// 命令历史（6 个）
|
||||||
|
//
|
||||||
|
// 注意：这 6 个命令**必须与 `run()` 里那份 `collect_commands!` 同时登记**。
|
||||||
|
// 只登记其中一处不会报错：漏了这里 = 运行时能调但 `bindings.ts` 里没有类型；
|
||||||
|
// 漏了那边 = 有类型但调用失败。两种都是「编译/启动全绿但功能静默不可用」。
|
||||||
|
terminal_history_query, terminal_history_sources,
|
||||||
|
terminal_history_toggle_favorite, terminal_history_delete,
|
||||||
|
terminal_history_clear, terminal_history_run,
|
||||||
])
|
])
|
||||||
.export(Typescript::default(), "../src/lib/bindings.ts")
|
.export(Typescript::default(), "../src/lib/bindings.ts")
|
||||||
.expect("failed to export bindings");
|
.expect("failed to export bindings");
|
||||||
@@ -473,7 +542,100 @@ pub fn run() {
|
|||||||
translate_history_set_favorited,
|
translate_history_set_favorited,
|
||||||
translate_stream_start,
|
translate_stream_start,
|
||||||
translate_abort,
|
translate_abort,
|
||||||
translate_paste_back
|
translate_paste_back,
|
||||||
|
terminal_get_settings,
|
||||||
|
terminal_save_settings,
|
||||||
|
terminal_save_appearance,
|
||||||
|
terminal_save_layout,
|
||||||
|
terminal_save_selection,
|
||||||
|
terminal_save_security,
|
||||||
|
terminal_save_shortcuts,
|
||||||
|
terminal_list_shells,
|
||||||
|
terminal_refresh_shells,
|
||||||
|
terminal_save_shell,
|
||||||
|
terminal_delete_shell,
|
||||||
|
terminal_set_last_shell,
|
||||||
|
terminal_test_shell,
|
||||||
|
terminal_default_cwd,
|
||||||
|
terminal_open_local,
|
||||||
|
terminal_open_ssh,
|
||||||
|
terminal_list_sessions,
|
||||||
|
terminal_close_session,
|
||||||
|
terminal_write,
|
||||||
|
terminal_resize,
|
||||||
|
terminal_rename_session,
|
||||||
|
terminal_detach_session,
|
||||||
|
terminal_attach_session,
|
||||||
|
terminal_session_cwd,
|
||||||
|
terminal_set_encoding,
|
||||||
|
terminal_send_key,
|
||||||
|
terminal_clear_session,
|
||||||
|
terminal_session_alive,
|
||||||
|
terminal_list_hosts,
|
||||||
|
terminal_save_host,
|
||||||
|
terminal_delete_host,
|
||||||
|
terminal_set_host_password,
|
||||||
|
terminal_import_ssh_config,
|
||||||
|
terminal_list_keys,
|
||||||
|
terminal_generate_key,
|
||||||
|
terminal_import_key,
|
||||||
|
terminal_delete_key,
|
||||||
|
terminal_rename_key,
|
||||||
|
terminal_set_key_passphrase,
|
||||||
|
terminal_key_public,
|
||||||
|
terminal_new_host_id,
|
||||||
|
terminal_list_known_hosts,
|
||||||
|
terminal_forget_host,
|
||||||
|
terminal_clear_known_hosts,
|
||||||
|
terminal_export_known_hosts,
|
||||||
|
terminal_import_known_hosts,
|
||||||
|
terminal_confirm_host_key,
|
||||||
|
// SFTP 文件管理（P1）
|
||||||
|
terminal_sftp_is_open,
|
||||||
|
terminal_sftp_open,
|
||||||
|
terminal_sftp_close,
|
||||||
|
terminal_sftp_list,
|
||||||
|
terminal_sftp_parent,
|
||||||
|
terminal_sftp_read_link,
|
||||||
|
terminal_sftp_mkdir,
|
||||||
|
terminal_sftp_delete,
|
||||||
|
terminal_sftp_rename,
|
||||||
|
terminal_sftp_upload,
|
||||||
|
terminal_sftp_download,
|
||||||
|
terminal_session_cwd_value,
|
||||||
|
// 本地文件操作（SFTP 面板的「打开 / 在资源管理器中显示」）
|
||||||
|
terminal_open_local_path,
|
||||||
|
terminal_reveal_local_path,
|
||||||
|
// 命令片段（P1）
|
||||||
|
terminal_list_snippets,
|
||||||
|
terminal_save_snippet,
|
||||||
|
terminal_delete_snippet,
|
||||||
|
terminal_render_snippet,
|
||||||
|
terminal_run_snippet,
|
||||||
|
terminal_restore_default_snippets,
|
||||||
|
// 命令历史（P1）
|
||||||
|
terminal_history_query,
|
||||||
|
terminal_history_sources,
|
||||||
|
terminal_history_toggle_favorite,
|
||||||
|
terminal_history_delete,
|
||||||
|
terminal_history_clear,
|
||||||
|
terminal_history_run,
|
||||||
|
// 端口转发（P2）
|
||||||
|
terminal_add_forward,
|
||||||
|
terminal_list_forwards,
|
||||||
|
terminal_remove_forward,
|
||||||
|
// 会话日志（P2）
|
||||||
|
terminal_log_path,
|
||||||
|
terminal_toggle_logging,
|
||||||
|
// 主机配置同步（P2）
|
||||||
|
terminal_export_hosts,
|
||||||
|
terminal_import_hosts,
|
||||||
|
// 会话模板（P2）
|
||||||
|
terminal_delete_template,
|
||||||
|
terminal_save_template,
|
||||||
|
// AI 命令助手（P2）
|
||||||
|
terminal_ai_engines,
|
||||||
|
terminal_ai_suggest
|
||||||
])
|
])
|
||||||
.setup(setup::init)
|
.setup(setup::init)
|
||||||
.on_window_event(|window, event| {
|
.on_window_event(|window, event| {
|
||||||
@@ -515,6 +677,12 @@ pub fn run() {
|
|||||||
// 停止音乐桥接进程（kill 快速返回，wait 在后台线程完成）
|
// 停止音乐桥接进程（kill 快速返回，wait 在后台线程完成）
|
||||||
music.cleanup_on_exit();
|
music.cleanup_on_exit();
|
||||||
}
|
}
|
||||||
|
if let Some(term) = app.try_state::<TerminalManager>() {
|
||||||
|
// 关闭全部终端会话。**不等待**：ConPTY 的 ClosePseudoConsole 会
|
||||||
|
// 阻塞到所有句柄关闭，退出路径上等待会卡死（会话侧已把关闭动作
|
||||||
|
// 放进后台线程，进程终止时 OS 回收剩余资源）。
|
||||||
|
term.cleanup_on_exit();
|
||||||
|
}
|
||||||
if let Some(clip) = app.try_state::<ClipboardManager>() {
|
if let Some(clip) = app.try_state::<ClipboardManager>() {
|
||||||
clip.stop();
|
clip.stop();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ use crate::monitor_kernel::{MonitorKernel, check_and_relaunch_if_needed};
|
|||||||
use crate::music::MusicManager;
|
use crate::music::MusicManager;
|
||||||
use crate::network_monitor::NetworkMonitor;
|
use crate::network_monitor::NetworkMonitor;
|
||||||
use crate::process_manager::{ProcessManager, start_monitoring_thread};
|
use crate::process_manager::{ProcessManager, start_monitoring_thread};
|
||||||
|
use crate::terminal::TerminalManager;
|
||||||
use crate::translate::TranslateManager;
|
use crate::translate::TranslateManager;
|
||||||
|
|
||||||
/// 应用启动初始化入口（setup 闭包调用）。
|
/// 应用启动初始化入口（setup 闭包调用）。
|
||||||
@@ -72,6 +73,20 @@ pub fn init(app: &mut App<Wry>) -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
// 失败只记日志（快捷键被占用不该阻断启动）。
|
// 失败只记日志（快捷键被占用不该阻断启动）。
|
||||||
crate::translate::init_on_launch(app.handle());
|
crate::translate::init_on_launch(app.handle());
|
||||||
|
|
||||||
|
// ===== 终端模块：TerminalManager =====
|
||||||
|
// 仅注册状态 + 做一次 Shell 探测，**不建立任何 SSH 连接**
|
||||||
|
// （沿用 translate 的姿态：启动阶段不发网络请求，会话只在用户主动打开时创建）。
|
||||||
|
let terminal = TerminalManager::new(app_data_dir.clone());
|
||||||
|
// 初始化 known_hosts 存储（主机密钥信任库，非机密，明文 JSON）
|
||||||
|
crate::terminal::ssh::hostkey::init(terminal.root().join("known_hosts.json"));
|
||||||
|
app.manage(terminal);
|
||||||
|
// Shell 探测 + 清理上次运行遗留的 hook 脚本
|
||||||
|
if let Ok(t) = crate::terminal::manager(app.handle()) {
|
||||||
|
t.init_on_launch(app.handle());
|
||||||
|
} else {
|
||||||
|
crate::logger::log_warn("terminal", "终端模块初始化异常：State 未注册");
|
||||||
|
}
|
||||||
|
|
||||||
// 网速采样不依赖提权，应用启动即开始
|
// 网速采样不依赖提权，应用启动即开始
|
||||||
let network_monitor = Arc::new(NetworkMonitor::new());
|
let network_monitor = Arc::new(NetworkMonitor::new());
|
||||||
app.manage(network_monitor.clone());
|
app.manage(network_monitor.clone());
|
||||||
|
|||||||
@@ -0,0 +1,207 @@
|
|||||||
|
//! AI 命令助手（P2）。
|
||||||
|
//!
|
||||||
|
//! 根据用户意图（+ 可选的终端上下文）生成可执行的命令建议。
|
||||||
|
//! **复用翻译模块的 AI 引擎配置**：引擎列表、Base URL、模型、密钥
|
||||||
|
//! （凭据管理器）全部来自 translate 的设置——用户只需配置一份 API。
|
||||||
|
//!
|
||||||
|
//! # 输出契约（与模型约定的 JSON）
|
||||||
|
//!
|
||||||
|
//! 模型被要求只输出 `[{"command":"...","description":"..."}]` 数组。
|
||||||
|
//! 但模型不完全可靠，解析器做了三层防御：
|
||||||
|
//! 1. 剥掉可能包裹的 Markdown 代码块标记（```json ... ```）；
|
||||||
|
//! 2. 数组解析失败时尝试提取首个 `[...]` 子串再解析；
|
||||||
|
//! 3. 条目字段校验（command 非空），并截断到 5 条防止异常输出刷屏。
|
||||||
|
use serde::Serialize;
|
||||||
|
use specta::Type;
|
||||||
|
|
||||||
|
use crate::translate::chat_once;
|
||||||
|
use crate::translate::TranslateEngineConfig;
|
||||||
|
use crate::translate::TranslateSettings;
|
||||||
|
|
||||||
|
/// 可用于命令生成的引擎（kind = "ai" 且配置完整）。
|
||||||
|
#[derive(Debug, Clone, Serialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct AiEngineOption {
|
||||||
|
pub id: String,
|
||||||
|
pub name: String,
|
||||||
|
pub model: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 一条命令建议。
|
||||||
|
#[derive(Debug, Clone, Serialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct CommandSuggestion {
|
||||||
|
pub command: String,
|
||||||
|
pub description: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 系统提示词。
|
||||||
|
///
|
||||||
|
/// 输出契约写进 prompt 只是第一道防线；解析器（`parse_suggestions`）
|
||||||
|
/// 才是真正的保证——两者都不假设模型 100% 遵守。
|
||||||
|
const SYSTEM_PROMPT: &str = r#"你是终端命令助手。根据用户的意图和（可选的）终端最近输出，给出可在 shell 中执行的命令建议。
|
||||||
|
|
||||||
|
严格规则：
|
||||||
|
1. 只输出一个 JSON 数组，格式为 [{"command":"命令","description":"说明"}]，不要输出任何其他文字、不要使用 Markdown 代码块标记。
|
||||||
|
2. 给 1~3 条建议：第一条是最直接的做法，其余是备选方案或更安全的变体。
|
||||||
|
3. description 用简体中文，说明这条命令做什么；有风险的命令必须醒目标注风险。
|
||||||
|
4. 命令默认面向 POSIX shell（bash）。仅当用户明确提到 Windows/PowerShell 时才用 PowerShell 语法。
|
||||||
|
5. 命令中的路径、用户名等参数保持通用；不要编造用户环境里不存在的变量值。"#;
|
||||||
|
|
||||||
|
/// 列出可用于命令生成的 AI 引擎（按翻译设置的优先级排序）。
|
||||||
|
pub fn ai_engine_options(settings: &TranslateSettings) -> Vec<AiEngineOption> {
|
||||||
|
let mut opts: Vec<AiEngineOption> = settings
|
||||||
|
.engines
|
||||||
|
.iter()
|
||||||
|
.filter(|e| e.kind == "ai" && e.enabled && !e.base_url.trim().is_empty())
|
||||||
|
.map(|e| AiEngineOption {
|
||||||
|
id: e.id.clone(),
|
||||||
|
name: e.name.clone(),
|
||||||
|
model: e.model.clone(),
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
opts.sort_by_key(|o| {
|
||||||
|
settings
|
||||||
|
.engines
|
||||||
|
.iter()
|
||||||
|
.find(|e| e.id == o.id)
|
||||||
|
.map(|e| e.priority)
|
||||||
|
.unwrap_or(100)
|
||||||
|
});
|
||||||
|
opts
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 生成命令建议。
|
||||||
|
///
|
||||||
|
/// `context` 是可选的终端最近输出/选中文本（前端从 xterm 缓冲取），
|
||||||
|
/// 帮助模型理解「接着上一步做什么」；为空则只看意图。
|
||||||
|
pub async fn suggest(
|
||||||
|
engine: &TranslateEngineConfig,
|
||||||
|
intent: &str,
|
||||||
|
context: &str,
|
||||||
|
) -> Result<Vec<CommandSuggestion>, String> {
|
||||||
|
if intent.trim().is_empty() {
|
||||||
|
return Err("请先描述你想做什么".to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut user = format!("我的意图：{}", intent.trim());
|
||||||
|
if !context.trim().is_empty() {
|
||||||
|
// 上下文截断到 2 KB：太长的输出（cat 大文件）只会稀释意图，
|
||||||
|
// 且模型上下文窗口是按 token 计费的
|
||||||
|
let ctx: String = context.chars().take(2048).collect();
|
||||||
|
user.push_str(&format!("\n\n终端最近的输出（供参考）：\n{ctx}"));
|
||||||
|
}
|
||||||
|
|
||||||
|
let raw = chat_once(engine, vec![("system", SYSTEM_PROMPT.to_string()), ("user", user)]).await?;
|
||||||
|
parse_suggestions(&raw)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 解析模型输出为建议列表（纯函数，单测覆盖）。
|
||||||
|
fn parse_suggestions(raw: &str) -> Result<Vec<CommandSuggestion>, String> {
|
||||||
|
let text = strip_code_fence(raw);
|
||||||
|
let parsed: Result<Vec<SuggestionRaw>, _> = serde_json::from_str(text);
|
||||||
|
|
||||||
|
let items = match parsed {
|
||||||
|
Ok(items) => items,
|
||||||
|
Err(_) => {
|
||||||
|
// 防御二：提取首个 [...] 子串（模型可能在 JSON 前后加了说明文字）
|
||||||
|
let start = text.find('[').ok_or_else(|| {
|
||||||
|
format!("模型未按约定输出 JSON。原始内容：{}", text.chars().take(300).collect::<String>())
|
||||||
|
})?;
|
||||||
|
let end = text.rfind(']').ok_or_else(|| "模型输出缺少 JSON 数组结尾".to_string())?;
|
||||||
|
if end <= start {
|
||||||
|
return Err("模型输出的 JSON 数组为空或格式错误".to_string());
|
||||||
|
}
|
||||||
|
serde_json::from_str(&text[start..=end])
|
||||||
|
.map_err(|e| format!("模型输出的 JSON 解析失败: {e}"))?
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let out: Vec<CommandSuggestion> = items
|
||||||
|
.into_iter()
|
||||||
|
.map(|s| CommandSuggestion {
|
||||||
|
command: s.command.trim().to_string(),
|
||||||
|
description: s.description.trim().to_string(),
|
||||||
|
})
|
||||||
|
.filter(|s| !s.command.is_empty())
|
||||||
|
.take(5)
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
if out.is_empty() {
|
||||||
|
return Err("模型没有给出有效的命令建议".to_string());
|
||||||
|
}
|
||||||
|
Ok(out)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 剥掉 Markdown 代码块围栏（```json / ```），以及首尾空白。
|
||||||
|
fn strip_code_fence(raw: &str) -> &str {
|
||||||
|
let t = raw.trim();
|
||||||
|
let t = t.strip_prefix("```json").or_else(|| t.strip_prefix("```")).unwrap_or(t);
|
||||||
|
let t = t.strip_suffix("```").unwrap_or(t);
|
||||||
|
t.trim()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 模型输出的宽松条目结构（description 缺失时容忍为空串）。
|
||||||
|
#[derive(serde::Deserialize)]
|
||||||
|
struct SuggestionRaw {
|
||||||
|
command: String,
|
||||||
|
#[serde(default)]
|
||||||
|
description: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parses_plain_json_array() {
|
||||||
|
let raw = r#"[{"command":"ls -la","description":"列出文件"},{"command":"du -sh *","description":"查看各目录大小"}]"#;
|
||||||
|
let out = parse_suggestions(raw).unwrap();
|
||||||
|
assert_eq!(out.len(), 2);
|
||||||
|
assert_eq!(out[0].command, "ls -la");
|
||||||
|
assert_eq!(out[1].description, "查看各目录大小");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parses_markdown_fenced_json() {
|
||||||
|
let raw = "```json\n[{\"command\":\"git status\",\"description\":\"查看状态\"}]\n```";
|
||||||
|
let out = parse_suggestions(raw).unwrap();
|
||||||
|
assert_eq!(out.len(), 1);
|
||||||
|
assert_eq!(out[0].command, "git status");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn parses_json_with_surrounding_prose() {
|
||||||
|
// 防御二：模型在 JSON 前后加了说明文字
|
||||||
|
let raw = "好的，以下是建议：\n[{\"command\":\"df -h\",\"description\":\"查看磁盘\"}]\n希望有帮助";
|
||||||
|
let out = parse_suggestions(raw).unwrap();
|
||||||
|
assert_eq!(out[0].command, "df -h");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn tolerates_missing_description_and_blank_commands() {
|
||||||
|
let raw = r#"[{"command":" ","description":"空命令应被过滤"},{"command":"pwd"}]"#;
|
||||||
|
let out = parse_suggestions(raw).unwrap();
|
||||||
|
assert_eq!(out.len(), 1);
|
||||||
|
assert_eq!(out[0].command, "pwd");
|
||||||
|
assert_eq!(out[0].description, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn caps_at_five_and_reports_garbage() {
|
||||||
|
let items: Vec<String> = (0..8)
|
||||||
|
.map(|i| format!(r#"{{"command":"cmd{i}","description":""}}"#))
|
||||||
|
.collect();
|
||||||
|
let out = parse_suggestions(&format!("[{}]", items.join(","))).unwrap();
|
||||||
|
assert_eq!(out.len(), 5, "超出 5 条的异常输出应被截断");
|
||||||
|
|
||||||
|
assert!(parse_suggestions("这不是 JSON").is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn fence_without_json_marker_also_stripped() {
|
||||||
|
let raw = "```\n[{\"command\":\"top\",\"description\":\"进程\"}]\n```";
|
||||||
|
let out = parse_suggestions(raw).unwrap();
|
||||||
|
assert_eq!(out[0].command, "top");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,229 @@
|
|||||||
|
//! 会话日志与审计（P2）。
|
||||||
|
//!
|
||||||
|
//! 把会话的**原始输出字节流**（含 ANSI 序列）追加写入磁盘文件。
|
||||||
|
//! 「审计」的另一半——命令文本与退出码——已由命令历史（OSC 133 落库）承担，
|
||||||
|
//! 本模块补的是命令历史覆盖不了的部分：完整屏幕内容、非命令输出、时序原貌。
|
||||||
|
//!
|
||||||
|
//! # 设计取舍
|
||||||
|
//!
|
||||||
|
//! - **记原始字节，不做任何转义清洗**：与 PuTTY 的会话日志同策略。
|
||||||
|
//! 清洗（剥 ANSI / 转可读文本）是**阅读时**的事，日志要保真——
|
||||||
|
//! 排查「界面显示为什么这样」恰恰需要原始序列。
|
||||||
|
//! - **只记输出不记输入**：PTY 会回显输入（本地与 SSH 皆然），
|
||||||
|
//! 输出流已包含用户敲了什么。更重要的是，关闭回显的密码输入
|
||||||
|
//! **不会**出现在输出流里——这保证了日志不会意外存下密码。
|
||||||
|
//! - **每批同步追加 + 即时 flush**：日志的价值在崩溃/断线后仍然完整，
|
||||||
|
//! 攒缓冲反而丢最关键的最后几行。单批最大 4 MiB（聚合缓冲上限），
|
||||||
|
//! 同步写无性能问题。
|
||||||
|
//! - **不持久化开关状态**：会话结束日志自然终止，下次会话默认关闭。
|
||||||
|
//! 自动记录所有会话涉及磁盘占用与隐私权衡（日志含屏幕上的一切），
|
||||||
|
//! 交给用户显式开启更稳妥。
|
||||||
|
//!
|
||||||
|
//! # 挂点
|
||||||
|
//!
|
||||||
|
//! 本地 ConPTY 与 SSH 两个后端的 `flush_output` 是所有输出的必经之路
|
||||||
|
//! （聚合 → 发前端事件），在此处写日志能保证**零遗漏**且与前端所见一致。
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::io::Write;
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use std::sync::{Mutex, OnceLock};
|
||||||
|
|
||||||
|
/// 注册表：会话 id → 日志条目。
|
||||||
|
static LOGS: OnceLock<Mutex<HashMap<String, LogEntry>>> = OnceLock::new();
|
||||||
|
|
||||||
|
struct LogEntry {
|
||||||
|
path: PathBuf,
|
||||||
|
file: std::fs::File,
|
||||||
|
/// 已写入字节数（预留：后续可做单文件上限保护）
|
||||||
|
#[allow(dead_code)]
|
||||||
|
written: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn registry() -> &'static Mutex<HashMap<String, LogEntry>> {
|
||||||
|
LOGS.get_or_init(|| Mutex::new(HashMap::new()))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 开启或关闭某会话的日志。
|
||||||
|
///
|
||||||
|
/// 开启：在 `dir` 下创建 `{session_id}_{时间戳}.log`，写入头部说明，
|
||||||
|
/// 返回 `Some(路径)`。已在记录中则幂等（返回现有路径，不重复建文件）。
|
||||||
|
/// 关闭：flush 并移除条目，返回 `None`。未在记录中时关闭是空操作。
|
||||||
|
pub fn toggle(
|
||||||
|
session_id: &str,
|
||||||
|
enabled: bool,
|
||||||
|
dir: &PathBuf,
|
||||||
|
header: &str,
|
||||||
|
) -> Result<Option<String>, String> {
|
||||||
|
let mut reg = registry().lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
|
||||||
|
if !enabled {
|
||||||
|
// flush 在 Drop（entry 被 remove）时完成；显式 flush 一次更稳
|
||||||
|
if let Some(e) = reg.remove(session_id) {
|
||||||
|
let mut e = e;
|
||||||
|
let _ = e.file.flush();
|
||||||
|
}
|
||||||
|
return Ok(None);
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(e) = reg.get(session_id) {
|
||||||
|
return Ok(Some(e.path.to_string_lossy().to_string()));
|
||||||
|
}
|
||||||
|
|
||||||
|
std::fs::create_dir_all(dir).map_err(|e| format!("创建日志目录失败: {e}"))?;
|
||||||
|
let stamp = chrono::Local::now().format("%Y%m%d_%H%M%S");
|
||||||
|
let path = dir.join(format!("{session_id}_{stamp}.log"));
|
||||||
|
let mut file = std::fs::OpenOptions::new()
|
||||||
|
.create(true)
|
||||||
|
.append(true)
|
||||||
|
.open(&path)
|
||||||
|
.map_err(|e| format!("创建日志文件失败（{}）: {e}", path.display()))?;
|
||||||
|
|
||||||
|
// 头部人可读：定位「这是谁的日志」不需要任何工具
|
||||||
|
writeln!(
|
||||||
|
file,
|
||||||
|
"# 终端会话日志 | {header} | 开始于 {}",
|
||||||
|
chrono::Local::now().format("%Y-%m-%d %H:%M:%S")
|
||||||
|
)
|
||||||
|
.map_err(|e| format!("写入日志头部失败: {e}"))?;
|
||||||
|
|
||||||
|
let path_str = path.to_string_lossy().to_string();
|
||||||
|
reg.insert(
|
||||||
|
session_id.to_string(),
|
||||||
|
LogEntry {
|
||||||
|
path,
|
||||||
|
file,
|
||||||
|
written: 0,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
Ok(Some(path_str))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 会话是否正在记录。
|
||||||
|
pub fn is_logging(session_id: &str) -> bool {
|
||||||
|
registry()
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.contains_key(session_id)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 当前日志文件路径（未记录时为 `None`）。
|
||||||
|
pub fn path_of(session_id: &str) -> Option<String> {
|
||||||
|
registry()
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.get(session_id)
|
||||||
|
.map(|e| e.path.to_string_lossy().to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 追加一批输出（热路径：未开启时只付一次哈希查表的钱）。
|
||||||
|
pub fn write(session_id: &str, bytes: &[u8]) {
|
||||||
|
if bytes.is_empty() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let mut reg = registry().lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
let Some(entry) = reg.get_mut(session_id) else {
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
if entry.file.write_all(bytes).is_ok() {
|
||||||
|
entry.written += bytes.len() as u64;
|
||||||
|
}
|
||||||
|
// 单条写入失败不中断会话：日志是尽力而为的旁路，不能反过来影响终端 I/O
|
||||||
|
let _ = entry.file.flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 会话关闭时的清理：flush 并移除条目。幂等。
|
||||||
|
pub fn cleanup(session_id: &str) {
|
||||||
|
if let Some(mut e) = registry()
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|x| x.into_inner())
|
||||||
|
.remove(session_id)
|
||||||
|
{
|
||||||
|
let _ = e.file.flush();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
fn temp_dir(tag: &str) -> PathBuf {
|
||||||
|
let d = std::env::temp_dir().join(format!(
|
||||||
|
"thing-audit-test-{tag}-{}",
|
||||||
|
std::process::id()
|
||||||
|
));
|
||||||
|
let _ = std::fs::remove_dir_all(&d);
|
||||||
|
d
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 每条测试用独立会话 id，避免注册表（全局静态）在测试间串扰
|
||||||
|
fn sid(tag: &str) -> String {
|
||||||
|
format!("{tag}-{}", std::process::id())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn toggle_write_and_stop_roundtrip() {
|
||||||
|
let id = sid("roundtrip");
|
||||||
|
let dir = temp_dir("roundtrip");
|
||||||
|
|
||||||
|
// 开启：返回路径，头部已写入
|
||||||
|
let path = toggle(&id, true, &dir, "测试会话 ops@example").unwrap().unwrap();
|
||||||
|
assert!(is_logging(&id));
|
||||||
|
assert_eq!(path_of(&id).unwrap(), path);
|
||||||
|
assert!(path.contains(&id));
|
||||||
|
|
||||||
|
// 写入：文件里能找到原始字节与头部
|
||||||
|
write(&id, b"hello \x1b[31mred\x1b[0m\n");
|
||||||
|
let content = std::fs::read(&path).unwrap();
|
||||||
|
let text = String::from_utf8_lossy(&content);
|
||||||
|
assert!(text.contains("# 终端会话日志"), "头部缺失");
|
||||||
|
assert!(text.contains("ops@example"), "头部信息缺失");
|
||||||
|
assert!(content.windows(5).any(|w| w == b"\x1b[31m"), "原始 ANSI 序列应原样保留");
|
||||||
|
assert!(text.contains("hello "));
|
||||||
|
|
||||||
|
// 关闭：条目移除，文件保留在磁盘上
|
||||||
|
assert!(toggle(&id, false, &dir, "").unwrap().is_none());
|
||||||
|
assert!(!is_logging(&id));
|
||||||
|
assert!(path_of(&id).is_none());
|
||||||
|
assert!(std::path::Path::new(&path).exists(), "关闭后日志文件应保留");
|
||||||
|
let _ = std::fs::remove_dir_all(&dir);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn write_without_log_is_noop() {
|
||||||
|
let id = sid("noop");
|
||||||
|
// 未开启时写入不应 panic、不应创建任何文件
|
||||||
|
write(&id, b"ignored");
|
||||||
|
assert!(!is_logging(&id));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn toggle_on_twice_is_idempotent() {
|
||||||
|
let id = sid("idempotent");
|
||||||
|
let dir = temp_dir("idempotent");
|
||||||
|
let p1 = toggle(&id, true, &dir, "a").unwrap().unwrap();
|
||||||
|
let p2 = toggle(&id, true, &dir, "b").unwrap().unwrap();
|
||||||
|
assert_eq!(p1, p2, "重复开启应返回同一路径而不是新建文件");
|
||||||
|
cleanup(&id);
|
||||||
|
let _ = std::fs::remove_dir_all(&dir);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn cleanup_and_off_when_not_logging_are_safe() {
|
||||||
|
let id = sid("safe");
|
||||||
|
cleanup(&id); // 未开启时清理是空操作
|
||||||
|
assert!(toggle(&id, false, &temp_dir("safe"), "").unwrap().is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn disabled_log_file_keeps_bytes_after_cleanup() {
|
||||||
|
let id = sid("persist");
|
||||||
|
let dir = temp_dir("persist");
|
||||||
|
let path = toggle(&id, true, &dir, "h").unwrap().unwrap();
|
||||||
|
write(&id, b"line1\n");
|
||||||
|
write(&id, b"line2\n");
|
||||||
|
cleanup(&id); // 等价于会话关闭路径
|
||||||
|
let text = std::fs::read_to_string(&path).unwrap();
|
||||||
|
assert!(text.contains("line1") && text.contains("line2"), "cleanup 后内容应完整落盘");
|
||||||
|
let _ = std::fs::remove_dir_all(&dir);
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,170 @@
|
|||||||
|
//! 终端字符编码转换。
|
||||||
|
//!
|
||||||
|
//! # 为什么需要这个模块
|
||||||
|
//!
|
||||||
|
//! 终端输出在 SSH 场景下**不保证是 UTF-8**。国内的存量服务器（CentOS 6/7 时代装机、
|
||||||
|
//! 未改 `LANG`）默认 `zh_CN.GBK`，`ls` 一个中文文件名就会吐出 GBK 字节。
|
||||||
|
//! 若按 UTF-8 解码，得到的是 `测试` 这类不可逆的乱码——而且因为前端拿到的
|
||||||
|
//! 是字符串，原始字节已经丢了，用户除了改服务器配置别无办法。
|
||||||
|
//!
|
||||||
|
//! 因此设计上做了两件事：
|
||||||
|
//! 1. **Rust 侧始终以字节流发往前端**（base64），不在这里转 String；
|
||||||
|
//! 2. 本模块只在**需要把字节解释成文本**的地方使用（当前是「标题」与
|
||||||
|
//! 「cwd」这两处从 OSC 序列解析出的字段，它们是给 UI 直接显示/使用的）。
|
||||||
|
//!
|
||||||
|
//! 终端画面本身的编码转换放在前端做（xterm 支持自定义 `write` 解码），
|
||||||
|
//! 因为那里才能拿到「用户当前是否切了编码」这一运行时状态。
|
||||||
|
//!
|
||||||
|
//! # 为什么不用 iconv
|
||||||
|
//!
|
||||||
|
//! `iconv` 绑定需要 C 工具链与系统库；`encoding_rs` 是纯 Rust（Firefox 的
|
||||||
|
//! 实现抽出），且它按 WHATWG Encoding 标准处理 GBK 的**单双字节混合**与
|
||||||
|
//! 非法序列替换，与浏览器行为一致——这在终端场景下很重要，因为服务端常会
|
||||||
|
//! 混发半截多字节字符。
|
||||||
|
|
||||||
|
/// 把指定编码的字节解码为 UTF-8 字符串。
|
||||||
|
///
|
||||||
|
/// 未知编码名一律按 UTF-8 处理（并做有损解码）：宁可显示替换字符，
|
||||||
|
/// 也不要因为一个拼错的编码名让整个会话不可用。
|
||||||
|
pub fn decode(bytes: &[u8], encoding: &str) -> String {
|
||||||
|
let enc = lookup(encoding);
|
||||||
|
match enc {
|
||||||
|
// UTF-8 走 `from_utf8_lossy`：它比 encoding_rs 的 UTF-8 解码器更快，
|
||||||
|
// 且对非法序列同样产出 U+FFFD（行为一致）。
|
||||||
|
Encoding::Utf8 | Encoding::Fallback => String::from_utf8_lossy(bytes).to_string(),
|
||||||
|
Encoding::Other(e) => {
|
||||||
|
let (cow, _, _) = e.decode(bytes);
|
||||||
|
cow.into_owned()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 把 UTF-8 字符串编码为目标编码的字节。
|
||||||
|
///
|
||||||
|
/// 用于「用户键入的内容发往远端」：若服务器是 GBK，输入的中文也必须以 GBK 发出，
|
||||||
|
/// 否则远端会显示乱码（甚至把半个字符吃掉导致后续命令错位）。
|
||||||
|
pub fn encode(text: &str, encoding: &str) -> Vec<u8> {
|
||||||
|
match lookup(encoding) {
|
||||||
|
Encoding::Utf8 | Encoding::Fallback => text.as_bytes().to_vec(),
|
||||||
|
Encoding::Other(e) => {
|
||||||
|
let (cow, _, _) = e.encode(text);
|
||||||
|
cow.into_owned()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 编码名是否被识别（供命令层做输入校验与 UI 提示）。
|
||||||
|
pub fn is_supported(encoding: &str) -> bool {
|
||||||
|
!matches!(lookup(encoding), Encoding::Fallback)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 归一化编码名到标准写法（供 UI 显示与去重比较）。
|
||||||
|
///
|
||||||
|
/// 输入容忍 `gbk` / `GBK` / `gb18030` / `cp936` / `utf8` 等常见写法。
|
||||||
|
pub fn normalize(encoding: &str) -> String {
|
||||||
|
let e = encoding.trim().to_ascii_lowercase();
|
||||||
|
match e.as_str() {
|
||||||
|
"" => "utf-8".to_string(),
|
||||||
|
"utf8" | "utf-8" | "utf_8" => "utf-8".to_string(),
|
||||||
|
"gbk" | "cp936" | "ms936" | "gb2312" | "gb_2312" => "gbk".to_string(),
|
||||||
|
"gb18030" => "gb18030".to_string(),
|
||||||
|
"big5" | "big-5" | "cp950" => "big5".to_string(),
|
||||||
|
"shift_jis" | "shift-jis" | "sjis" | "cp932" => "shift_jis".to_string(),
|
||||||
|
"euc-kr" | "euckr" | "cp949" => "euc-kr".to_string(),
|
||||||
|
"latin1" | "iso-8859-1" => "latin1".to_string(),
|
||||||
|
other => other.to_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 前端设置页可选的编码列表（值与 `normalize` 的输出一致）。
|
||||||
|
///
|
||||||
|
/// 只列终端场景真实会遇到的：中文（GBK/GB18030）、港台（Big5）、
|
||||||
|
/// 日韩（Shift_JIS/EUC-KR）。ISO-8859-1 保留给嵌入式设备（它们的 busybox
|
||||||
|
/// 经常只有 C locale）。
|
||||||
|
pub const SUPPORTED: &[&str] = &[
|
||||||
|
"utf-8",
|
||||||
|
"gbk",
|
||||||
|
"gb18030",
|
||||||
|
"big5",
|
||||||
|
"shift_jis",
|
||||||
|
"euc-kr",
|
||||||
|
"latin1",
|
||||||
|
];
|
||||||
|
|
||||||
|
enum Encoding {
|
||||||
|
Utf8,
|
||||||
|
Other(&'static encoding_rs::Encoding),
|
||||||
|
/// 未识别的编码名（回退到 UTF-8 语义，但 `is_supported` 会报 false）
|
||||||
|
Fallback,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn lookup(encoding: &str) -> Encoding {
|
||||||
|
let e = normalize(encoding);
|
||||||
|
if e == "utf-8" {
|
||||||
|
return Encoding::Utf8;
|
||||||
|
}
|
||||||
|
match encoding_rs::Encoding::for_label(e.as_bytes()) {
|
||||||
|
// UTF-8 通过 label 也能查到，但我们要走更快的 from_utf8_lossy 分支
|
||||||
|
Some(enc) if enc == encoding_rs::UTF_8 => Encoding::Utf8,
|
||||||
|
Some(enc) => Encoding::Other(enc),
|
||||||
|
None => Encoding::Fallback,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 测试 =====
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn utf8_roundtrip() {
|
||||||
|
let s = "测试目录 /tmp";
|
||||||
|
assert_eq!(decode(&encode(s, "utf-8"), "utf-8"), s);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn gbk_roundtrip() {
|
||||||
|
let s = "测试";
|
||||||
|
let bytes = encode(s, "gbk");
|
||||||
|
// GBK 下「测试」是 4 字节（每字 2 字节），而 UTF-8 是 6 字节。
|
||||||
|
// 断言长度而非魔法数字，是为了让这条测试同时验证「确实用了 GBK」。
|
||||||
|
assert_eq!(bytes.len(), 4, "GBK 编码「测试」应为 4 字节");
|
||||||
|
assert_eq!(decode(&bytes, "gbk"), s);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn gbk_bytes_are_mojibake_under_utf8() {
|
||||||
|
// 反向验证：GBK 字节按 UTF-8 解读会失真。这正是前端必须知道
|
||||||
|
// 会话编码的原因（也是本模块存在的理由）。
|
||||||
|
let bytes = encode("测试", "gbk");
|
||||||
|
let as_utf8 = String::from_utf8_lossy(&bytes).to_string();
|
||||||
|
assert_ne!(as_utf8, "测试");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn alias_normalization() {
|
||||||
|
assert_eq!(normalize("GBK"), "gbk");
|
||||||
|
assert_eq!(normalize("cp936"), "gbk");
|
||||||
|
assert_eq!(normalize("utf8"), "utf-8");
|
||||||
|
assert_eq!(normalize(""), "utf-8");
|
||||||
|
assert_eq!(normalize(" UTF-8 "), "utf-8");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn all_supported_labels_resolve() {
|
||||||
|
for name in SUPPORTED {
|
||||||
|
assert!(is_supported(name), "{name} 应被识别");
|
||||||
|
}
|
||||||
|
assert!(!is_supported("not-a-real-encoding"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn invalid_bytes_do_not_panic() {
|
||||||
|
// 终端输出经常在半截多字节字符处被切断，解码必须容错而不是 panic
|
||||||
|
let broken = [0xB2u8, 0xE2]; // GBK「测」的前 2 字节（完整），再截断一个
|
||||||
|
let _ = decode(&broken, "gbk");
|
||||||
|
let _ = decode(&[0xFF, 0xFE, 0xFD], "utf-8");
|
||||||
|
let _ = decode(&[0xC0], "gb18030");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
//! 终端模块 Tauri 事件定义与负载类型。
|
||||||
|
//!
|
||||||
|
//! 事件名常量集中在 `crate::constants::events`，这里只放负载结构与便捷发射函数。
|
||||||
|
//! 命名口径与既有模块一致：kebab-case、`terminal-` 前缀。
|
||||||
|
|
||||||
|
use serde::Serialize;
|
||||||
|
use specta::Type;
|
||||||
|
|
||||||
|
use super::session::SessionId;
|
||||||
|
|
||||||
|
/// 事件名再导出，让两个后端可以写 `events::TERMINAL_OUTPUT` 而不必回退两层路径。
|
||||||
|
///
|
||||||
|
/// `allow(unused_imports)` 的原因：这是**模块对外的常量出口**，六个事件名成组
|
||||||
|
/// 定义、成组暴露，便于调用方按同一路径取用；个别常量在当前代码路径上暂未被
|
||||||
|
/// 本模块自身引用（如 `TERMINAL_CONFIRM_CLOSE` 由窗口层发射、
|
||||||
|
/// `TERMINAL_CWD` 由 shell hook 发射），但都属于稳定契约，不应按使用情况逐个删改。
|
||||||
|
#[allow(unused_imports)]
|
||||||
|
pub use crate::constants::events::{
|
||||||
|
TERMINAL_CONFIRM_CLOSE, TERMINAL_CWD, TERMINAL_EXIT, TERMINAL_HOST_KEY_PROMPT,
|
||||||
|
TERMINAL_OUTPUT, TERMINAL_STATE, TERMINAL_TRANSFER_PROGRESS,
|
||||||
|
};
|
||||||
|
|
||||||
|
/// 发射 SFTP 传输进度事件。
|
||||||
|
///
|
||||||
|
/// 单独一个函数而不是在命令层直接 `emit`：事件名常量与负载类型分属两个模块，
|
||||||
|
/// 集中在这里能让「事件名 ↔ 负载类型」的对应关系一眼可见（也是排查
|
||||||
|
/// 「前端收到的字段对不上」这类问题的第一落点）。
|
||||||
|
pub fn emit_transfer(app: &tauri::AppHandle, payload: &super::ssh::sftp::TransferProgress) {
|
||||||
|
use tauri::Emitter;
|
||||||
|
let _ = app.emit(TERMINAL_TRANSFER_PROGRESS, payload);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 会话输出批次（**发往前端**的形态）。
|
||||||
|
///
|
||||||
|
/// 字段与内部聚合缓冲一一对应但单独定义，是为了让「前端契约」与
|
||||||
|
/// 「内部分批策略」可以独立演进（例如未来内部改成分块再组装，前端不必感知）。
|
||||||
|
#[derive(Debug, Clone, Serialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct OutputPayload {
|
||||||
|
pub session_id: SessionId,
|
||||||
|
/// base64 编码的原始输出字节。
|
||||||
|
///
|
||||||
|
/// **为什么用 base64 而不是直接给字符串**：终端输出可能是 GBK 等非 UTF-8
|
||||||
|
/// 编码（老服务器常见），若在 Rust 侧转 String 就永久丢失了原始字节，
|
||||||
|
/// 前端再做后处理也无从下手。用 base64 保持字节完整性，由前端按会话编码解码。
|
||||||
|
pub data: String,
|
||||||
|
/// 全局单调批次序号，前端据此检测丢包。
|
||||||
|
pub seq: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 会话结束。
|
||||||
|
#[derive(Debug, Clone, Serialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct ExitPayload {
|
||||||
|
pub session_id: SessionId,
|
||||||
|
/// 退出码。本地会话通常有；SSH 通道关闭时多为 None。
|
||||||
|
pub exit_code: Option<i32>,
|
||||||
|
/// 结束原因："eof" | "process-exit" | "killed" | "disconnected" | "error"
|
||||||
|
pub reason: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 会话工作目录变化（由 OSC 7 hook 上报）。
|
||||||
|
#[derive(Debug, Clone, Serialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct CwdPayload {
|
||||||
|
pub session_id: SessionId,
|
||||||
|
pub cwd: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 状态变更事件直接复用 [`SessionInfo`] 作为负载——
|
||||||
|
/// 前端拿到它就能刷新侧栏与标签，不必再发一次查询。
|
||||||
|
|
||||||
|
/// SSH 主机密钥需要用户确认（首次连接或指纹变更）。
|
||||||
|
///
|
||||||
|
/// 这是一个**阻塞性的交互请求**：Rust 侧握手暂停，等前端调
|
||||||
|
/// `terminal_confirm_host_key` 回传决定。
|
||||||
|
#[derive(Debug, Clone, Serialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct HostKeyPromptPayload {
|
||||||
|
pub session_id: SessionId,
|
||||||
|
pub host: String,
|
||||||
|
pub port: u16,
|
||||||
|
/// 密钥算法（如 "ssh-ed25519" / "ssh-rsa"）
|
||||||
|
pub key_type: String,
|
||||||
|
/// 服务端出示的指纹（SHA256，OpenSSH 展示格式）
|
||||||
|
pub fingerprint: String,
|
||||||
|
/// 本次是「首次见到」还是「与记录不符」。
|
||||||
|
/// 后者是**高危信号**，前端必须以红色阻断式 UI 呈现。
|
||||||
|
pub reason: String,
|
||||||
|
/// 与记录不符时，给出先前记录的指纹以便用户对比
|
||||||
|
pub previous_fingerprint: Option<String>,
|
||||||
|
}
|
||||||
@@ -0,0 +1,857 @@
|
|||||||
|
//! 终端命令历史（SQLite）。
|
||||||
|
//!
|
||||||
|
//! 存储约定：`{app_data_dir}/terminal/history.db`，范式与 `translate/history.rs` 一致
|
||||||
|
//! （WAL、`PRAGMA user_version` 作结构版本、FTS5 trigram 索引）。
|
||||||
|
//!
|
||||||
|
//! # 与翻译历史的关键差异：为什么不做整库重建式迁移
|
||||||
|
//!
|
||||||
|
//! 翻译历史用了「版本不等就 DROP 重建」的简化策略，理由是「历史属于可丢弃数据」。
|
||||||
|
//! 终端历史**不能照抄**：翻译历史里一条记录是「一段译文」，重建丢的是可以重翻的东西；
|
||||||
|
//! 终端历史里一条记录是**用户敲过的命令**，包含服务器地址、路径、以及偶尔泄露在
|
||||||
|
//! 命令行里的凭据。用户可能恰恰是为了翻查这些才留着它。
|
||||||
|
//!
|
||||||
|
//! 因此这里从一开始就写**增量迁移**（`migrate`），不做 DROP。
|
||||||
|
//!
|
||||||
|
//! # 为什么存两列（command + cwd）
|
||||||
|
//!
|
||||||
|
//! 同一条命令在 `/var/log` 下和在 `~` 下含义完全不同（`ls`、`make`、`git status`
|
||||||
|
//! 都是典型例子）。只存命令会让「我上次在哪个目录跑的那条命令」无从追查，
|
||||||
|
//! 而 `cwd` 又是一次 OSC 7 就能免费拿到的信息。
|
||||||
|
//!
|
||||||
|
//! # 去重键的选择
|
||||||
|
//!
|
||||||
|
//! 用 `(command, cwd, host_id)` 而不是 `(command, host_id)`：在 A 目录跑过的命令，
|
||||||
|
//! 换到 B 目录再跑应当各留一条 —— 它们对用户是两个不同的事实。
|
||||||
|
//! 重复执行同一条命令（同一目录）只更新 `ts` 与 `count`，避免历史被刷屏。
|
||||||
|
|
||||||
|
use std::path::Path;
|
||||||
|
use std::sync::Mutex;
|
||||||
|
|
||||||
|
use rusqlite::{params, Connection};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use specta::Type;
|
||||||
|
|
||||||
|
/// 库结构版本（与 `PRAGMA user_version` 对应）。
|
||||||
|
///
|
||||||
|
/// **递增时必须同步在 `migrate` 里加分支**，否则旧库会因缺少新列而在查询时报
|
||||||
|
/// 「no such column」，而报错点在读取路径上、远离真正的成因。
|
||||||
|
const SCHEMA_VERSION: i64 = 1;
|
||||||
|
|
||||||
|
/// 默认保留条数。超出后在写入路径上淘汰最旧的**非收藏**记录。
|
||||||
|
const DEFAULT_MAX_ENTRIES: i64 = 5000;
|
||||||
|
|
||||||
|
/// 走 FTS 索引所需的最小字符数。
|
||||||
|
///
|
||||||
|
/// trigram 分词器把文本切成连续 3 字符的 n-gram，长度小于 3 的查询词
|
||||||
|
/// **不会报错、只会静默返回空**。而终端里两字符的命令恰恰是最常见的
|
||||||
|
/// （`ls`、`cd`、`rm`），所以短词回退到 `LIKE` 前缀匹配。
|
||||||
|
const FTS_MIN_CHARS: usize = 3;
|
||||||
|
|
||||||
|
/// 一条命令历史。
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct CommandHistoryItem {
|
||||||
|
pub id: i64,
|
||||||
|
/// 毫秒时间戳（最后一次执行）
|
||||||
|
pub ts: i64,
|
||||||
|
pub command: String,
|
||||||
|
/// 执行时的工作目录（可能为空 —— OSC 7 未被远端 shell 上报时）
|
||||||
|
pub cwd: String,
|
||||||
|
/// 会话来源：本地 shell 的 id，或 SSH 主机的 id。
|
||||||
|
/// 为空串表示「来源未知」（如手工录入的历史）。
|
||||||
|
pub host_id: String,
|
||||||
|
/// 显示用的来源名（「PowerShell」/「生产服务器」），随记录一起存。
|
||||||
|
///
|
||||||
|
/// # 为什么冗余存名字而不只存 id
|
||||||
|
///
|
||||||
|
/// 主机被删除后，若只有 id，历史列表里那一列会变成一串无意义的 hash。
|
||||||
|
/// 存名字的代价是「主机改名后历史里的旧名字不会更新」—— 这里选择
|
||||||
|
/// **保留历史当时的名字**，因为「我在那台现在叫 X 的机器上跑过什么」
|
||||||
|
/// 本来就是一个有时间性的问题。
|
||||||
|
pub host_name: String,
|
||||||
|
/// 是否为 SSH 会话
|
||||||
|
pub ssh: bool,
|
||||||
|
/// 累计执行次数（同一命令在同一目录重复执行时累加）
|
||||||
|
pub count: i64,
|
||||||
|
/// 用户收藏（收藏项不参与容量淘汰）
|
||||||
|
pub favorited: bool,
|
||||||
|
/// 退出码。`None` 表示未捕获（如会话结束时命令仍在运行）
|
||||||
|
pub exit_code: Option<i32>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 查询参数。
|
||||||
|
///
|
||||||
|
/// 用结构体而不是一长串位置参数：命令层要把前端 payload 原样转发，
|
||||||
|
/// 而 5 个 `Option<String>` 的位置参数在调用点极易顺序写错，且编译器
|
||||||
|
/// 无法发现（全是同类型）。
|
||||||
|
#[derive(Debug, Clone, Default, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase", default)]
|
||||||
|
pub struct HistoryQuery {
|
||||||
|
/// 关键词（对 command 做匹配；空则不过滤）
|
||||||
|
pub keyword: String,
|
||||||
|
/// 只看某个来源（host_id；空则全部）
|
||||||
|
pub host_id: String,
|
||||||
|
/// 只看收藏
|
||||||
|
pub favorited_only: bool,
|
||||||
|
/// 分页偏移
|
||||||
|
pub offset: i64,
|
||||||
|
/// 分页大小
|
||||||
|
pub limit: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl HistoryQuery {
|
||||||
|
/// 归一化：`limit` 兜底并设上限，`offset` 不为负。
|
||||||
|
///
|
||||||
|
/// 上限 500：前端分页步长是 50~100，500 已远超一屏能展示的量，
|
||||||
|
/// 再大只会让 IPC 序列化成为瓶颈。
|
||||||
|
fn normalized(mut self) -> Self {
|
||||||
|
if self.limit <= 0 {
|
||||||
|
self.limit = 100;
|
||||||
|
}
|
||||||
|
if self.limit > 500 {
|
||||||
|
self.limit = 500;
|
||||||
|
}
|
||||||
|
if self.offset < 0 {
|
||||||
|
self.offset = 0;
|
||||||
|
}
|
||||||
|
self
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 一次查询的结果（含总数，供前端显示「共 N 条」）。
|
||||||
|
///
|
||||||
|
/// # 为什么叫 `TerminalHistoryPage` 而不是 `HistoryPage`
|
||||||
|
///
|
||||||
|
/// `tauri-specta` 给 `Type` 派生的类型注册表是**全局按类型名索引**的，重名会让
|
||||||
|
/// `export_bindings()` 直接 panic（`Detected multiple types with the same name`）。
|
||||||
|
/// `clipboard::commands::HistoryPage`（`items: Vec<ClipboardItem>`）已占用这个名字。
|
||||||
|
///
|
||||||
|
/// specta 2.0.0-rc.25 **没有**给 struct 提供重命名手段 —— `#[specta(rename = ...)]`
|
||||||
|
/// 只对**函数**宏生效（`specta-macros/src/specta.rs` 的 `parse_name_attrs`）；
|
||||||
|
/// derive 路径下导出名直接取自 Rust 标识符
|
||||||
|
/// （`specta-macros/src/type/mod.rs`：`let name = unraw_raw_ident(&format_ident!("{}", raw_ident.to_string()))`），
|
||||||
|
/// 而 `ContainerAttr` 只认 `crate` / `type` / `inline` / `remote` / `collect` /
|
||||||
|
/// `skip_attr` / `transparent`，且 `reject_unknown_specta_attrs` 会让未知属性直接编译失败。
|
||||||
|
/// 因此**改名是唯一可行解**。
|
||||||
|
#[derive(Debug, Clone, Serialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct TerminalHistoryPage {
|
||||||
|
pub items: Vec<CommandHistoryItem>,
|
||||||
|
/// 满足筛选条件的总条数（**不受 limit/offset 影响**）
|
||||||
|
pub total: i64,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 历史来源（供前端做筛选下拉）。
|
||||||
|
///
|
||||||
|
/// 单独定义而不是用元组：元组序列化成 JSON 会变成数组，前端得靠下标取值
|
||||||
|
/// （`s[0]`/`s[1]`/`s[2]`），改一次顺序就静默错位。具名字段让前后端
|
||||||
|
/// 各自独立演进而不怕顺序变动。
|
||||||
|
#[derive(Debug, Clone, Serialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct HistorySource {
|
||||||
|
pub host_id: String,
|
||||||
|
pub host_name: String,
|
||||||
|
/// 该来源的命令条数
|
||||||
|
pub count: i64,
|
||||||
|
pub ssh: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct History {
|
||||||
|
conn: Mutex<Connection>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 建表语句。
|
||||||
|
///
|
||||||
|
/// `v1` 即当前结构。后续版本只追加 `ALTER TABLE`，不重建（见模块头说明）。
|
||||||
|
fn schema_v1() -> &'static str {
|
||||||
|
"
|
||||||
|
CREATE TABLE IF NOT EXISTS cmd_history (
|
||||||
|
id INTEGER PRIMARY KEY,
|
||||||
|
ts INTEGER NOT NULL,
|
||||||
|
command TEXT NOT NULL,
|
||||||
|
cwd TEXT NOT NULL DEFAULT '',
|
||||||
|
host_id TEXT NOT NULL DEFAULT '',
|
||||||
|
host_name TEXT NOT NULL DEFAULT '',
|
||||||
|
ssh INTEGER NOT NULL DEFAULT 0,
|
||||||
|
count INTEGER NOT NULL DEFAULT 1,
|
||||||
|
favorited INTEGER NOT NULL DEFAULT 0,
|
||||||
|
exit_code INTEGER,
|
||||||
|
UNIQUE(command, cwd, host_id)
|
||||||
|
);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_cmd_hist_ts ON cmd_history(ts DESC);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_cmd_hist_host ON cmd_history(host_id, ts DESC);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_cmd_hist_fav ON cmd_history(favorited, ts DESC);
|
||||||
|
|
||||||
|
-- 外部内容表：索引只存倒排表，正文仍只在 cmd_history 里一份。
|
||||||
|
-- 代价是不会自动感知主表变化，必须靠下面三个触发器手动同步。
|
||||||
|
CREATE VIRTUAL TABLE IF NOT EXISTS cmd_history_fts USING fts5(
|
||||||
|
command,
|
||||||
|
content='cmd_history', content_rowid='id',
|
||||||
|
tokenize='trigram'
|
||||||
|
);
|
||||||
|
|
||||||
|
CREATE TRIGGER IF NOT EXISTS cmd_hist_fts_ai AFTER INSERT ON cmd_history BEGIN
|
||||||
|
INSERT INTO cmd_history_fts(rowid, command) VALUES (new.id, new.command);
|
||||||
|
END;
|
||||||
|
CREATE TRIGGER IF NOT EXISTS cmd_hist_fts_ad AFTER DELETE ON cmd_history BEGIN
|
||||||
|
INSERT INTO cmd_history_fts(cmd_history_fts, rowid, command)
|
||||||
|
VALUES ('delete', old.id, old.command);
|
||||||
|
END;
|
||||||
|
CREATE TRIGGER IF NOT EXISTS cmd_hist_fts_au AFTER UPDATE ON cmd_history BEGIN
|
||||||
|
INSERT INTO cmd_history_fts(cmd_history_fts, rowid, command)
|
||||||
|
VALUES ('delete', old.id, old.command);
|
||||||
|
INSERT INTO cmd_history_fts(rowid, command) VALUES (new.id, new.command);
|
||||||
|
END;
|
||||||
|
"
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 转义 FTS5 查询串。
|
||||||
|
///
|
||||||
|
/// FTS5 的 `MATCH` 语法把 `"` `*` `(` `)` `:` `^` `-` `+` 等当操作符。
|
||||||
|
/// 终端命令里这些字符**比比皆是**（`grep -v foo`、`ls *.rs`、`git log --oneline`），
|
||||||
|
/// 不转义时会抛语法错误或产生完全意外的匹配。
|
||||||
|
///
|
||||||
|
/// 做法：整体包成双引号短语，并把内部的 `"` 转义为 `""`（FTS5 的转义约定，
|
||||||
|
/// 与 SQL 的 `''` 同理）。包成短语后所有操作符都失去特殊含义，代价是不支持
|
||||||
|
/// 用户手写布尔表达式 —— 对「搜我敲过的命令」这个场景，字面量匹配正是所需。
|
||||||
|
fn fts_phrase(keyword: &str) -> String {
|
||||||
|
format!("\"{}\"", keyword.replace('"', "\"\""))
|
||||||
|
}
|
||||||
|
|
||||||
|
impl History {
|
||||||
|
pub fn new(dir: &Path) -> Result<Self, String> {
|
||||||
|
std::fs::create_dir_all(dir).map_err(|e| format!("创建终端目录失败: {e}"))?;
|
||||||
|
let conn =
|
||||||
|
Connection::open(dir.join("history.db")).map_err(|e| format!("打开历史库失败: {e}"))?;
|
||||||
|
conn.execute_batch("PRAGMA journal_mode = WAL;")
|
||||||
|
.map_err(|e| format!("初始化历史库失败: {e}"))?;
|
||||||
|
|
||||||
|
migrate(&conn)?;
|
||||||
|
|
||||||
|
Ok(Self {
|
||||||
|
conn: Mutex::new(conn),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn conn(&self) -> std::sync::MutexGuard<'_, Connection> {
|
||||||
|
self.conn.lock().unwrap_or_else(|e| e.into_inner())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 记录一条命令（同 command+cwd+host 只累加计数并更新时间）。
|
||||||
|
///
|
||||||
|
/// # 过滤规则
|
||||||
|
///
|
||||||
|
/// - 空命令 / 纯空白：不记（回车空行不该进历史）
|
||||||
|
/// - 以空格开头：不记。这是 shell 的**惯例**（`HISTCONTROL=ignorespace`），
|
||||||
|
/// 用户用它来避免把含密码的命令写进 `.bash_history`。我们若不遵守，
|
||||||
|
/// 等于把用户对系统历史的信任**从背后捅穿** —— 这条规则不是可选项。
|
||||||
|
pub fn record(
|
||||||
|
&self,
|
||||||
|
command: &str,
|
||||||
|
cwd: &str,
|
||||||
|
host_id: &str,
|
||||||
|
host_name: &str,
|
||||||
|
ssh: bool,
|
||||||
|
exit_code: Option<i32>,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let cmd = command.trim();
|
||||||
|
if cmd.is_empty() || command.starts_with(' ') {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let now = chrono::Utc::now().timestamp_millis();
|
||||||
|
self.conn()
|
||||||
|
.execute(
|
||||||
|
"INSERT INTO cmd_history (ts, command, cwd, host_id, host_name, ssh, count,
|
||||||
|
favorited, exit_code)
|
||||||
|
VALUES (?1, ?2, ?3, ?4, ?5, ?6, 1, 0, ?7)
|
||||||
|
ON CONFLICT(command, cwd, host_id)
|
||||||
|
DO UPDATE SET ts = excluded.ts,
|
||||||
|
count = cmd_history.count + 1,
|
||||||
|
ssh = excluded.ssh,
|
||||||
|
host_name = excluded.host_name,
|
||||||
|
exit_code = excluded.exit_code",
|
||||||
|
params![now, cmd, cwd, host_id, host_name, ssh as i64, exit_code],
|
||||||
|
)
|
||||||
|
.map_err(|e| format!("写入命令历史失败: {e}"))?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 分页查询。
|
||||||
|
pub fn query(&self, q: HistoryQuery) -> Result<TerminalHistoryPage, String> {
|
||||||
|
let q = q.normalized();
|
||||||
|
let conn = self.conn();
|
||||||
|
|
||||||
|
// 动态拼 WHERE。所有用户输入一律走 `params!` 占位符绑定，
|
||||||
|
// **不做字符串插值** —— 命令历史里出现 `'` 是家常便饭
|
||||||
|
// （`awk '{print $1}'`），插值会直接语法错误甚至注入。
|
||||||
|
let mut wheres: Vec<String> = Vec::new();
|
||||||
|
let mut args: Vec<Box<dyn rusqlite::ToSql>> = Vec::new();
|
||||||
|
|
||||||
|
let keyword = q.keyword.trim();
|
||||||
|
if !keyword.is_empty() {
|
||||||
|
if keyword.chars().count() >= FTS_MIN_CHARS {
|
||||||
|
wheres.push(
|
||||||
|
"id IN (SELECT rowid FROM cmd_history_fts WHERE cmd_history_fts MATCH ?)"
|
||||||
|
.to_string(),
|
||||||
|
);
|
||||||
|
args.push(Box::new(fts_phrase(keyword)));
|
||||||
|
} else {
|
||||||
|
// 短词回退：trigram 索引里没有 2 字符以下的片段，走 FTS 只会
|
||||||
|
// 静默返回空。用 LIKE 做前缀匹配（`ls` 命中 `ls -la` 也命中 `lsof`）。
|
||||||
|
wheres.push("command LIKE ? ESCAPE '\\'".to_string());
|
||||||
|
args.push(Box::new(format!(
|
||||||
|
"{}%",
|
||||||
|
escape_like(keyword)
|
||||||
|
)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !q.host_id.trim().is_empty() {
|
||||||
|
wheres.push("host_id = ?".to_string());
|
||||||
|
args.push(Box::new(q.host_id.trim().to_string()));
|
||||||
|
}
|
||||||
|
if q.favorited_only {
|
||||||
|
wheres.push("favorited = 1".to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
let where_sql = if wheres.is_empty() {
|
||||||
|
String::new()
|
||||||
|
} else {
|
||||||
|
format!(" WHERE {}", wheres.join(" AND "))
|
||||||
|
};
|
||||||
|
|
||||||
|
// 总数单独查一次：`COUNT(*) OVER ()` 需要窗口函数支持（SQLite 3.25+，
|
||||||
|
// bundled 版本满足），但把 total 与分页放在同一查询里会让「无结果时
|
||||||
|
// total 也拿不到」，而前端在无结果时同样需要显示「共 0 条」。分开查更直白。
|
||||||
|
let total: i64 = {
|
||||||
|
let sql = format!("SELECT COUNT(*) FROM cmd_history{where_sql}");
|
||||||
|
let refs: Vec<&dyn rusqlite::ToSql> = args.iter().map(|b| b.as_ref()).collect();
|
||||||
|
conn.query_row(&sql, refs.as_slice(), |r| r.get(0))
|
||||||
|
.map_err(|e| format!("统计命令历史失败: {e}"))?
|
||||||
|
};
|
||||||
|
|
||||||
|
// 排序：收藏优先 → 时间倒序。收藏优先放在 SQL 而非前端排序，
|
||||||
|
// 否则「翻到第 3 页」的语义会变成「在未排序的集合里翻页」，结果不稳定。
|
||||||
|
let sql = format!(
|
||||||
|
"SELECT id, ts, command, cwd, host_id, host_name, ssh, count, favorited, exit_code
|
||||||
|
FROM cmd_history{where_sql}
|
||||||
|
ORDER BY favorited DESC, ts DESC
|
||||||
|
LIMIT ? OFFSET ?"
|
||||||
|
);
|
||||||
|
let mut refs: Vec<&dyn rusqlite::ToSql> = args.iter().map(|b| b.as_ref()).collect();
|
||||||
|
let limit = q.limit;
|
||||||
|
let offset = q.offset;
|
||||||
|
refs.push(&limit);
|
||||||
|
refs.push(&offset);
|
||||||
|
|
||||||
|
let mut stmt = conn
|
||||||
|
.prepare(&sql)
|
||||||
|
.map_err(|e| format!("准备查询失败: {e}"))?;
|
||||||
|
let items = stmt
|
||||||
|
.query_map(refs.as_slice(), |row| {
|
||||||
|
Ok(CommandHistoryItem {
|
||||||
|
id: row.get(0)?,
|
||||||
|
ts: row.get(1)?,
|
||||||
|
command: row.get(2)?,
|
||||||
|
cwd: row.get(3)?,
|
||||||
|
host_id: row.get(4)?,
|
||||||
|
host_name: row.get(5)?,
|
||||||
|
ssh: row.get::<_, i64>(6)? != 0,
|
||||||
|
count: row.get(7)?,
|
||||||
|
favorited: row.get::<_, i64>(8)? != 0,
|
||||||
|
exit_code: row.get(9)?,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.map_err(|e| format!("查询命令历史失败: {e}"))?
|
||||||
|
.collect::<Result<Vec<_>, _>>()
|
||||||
|
.map_err(|e| format!("读取命令历史失败: {e}"))?;
|
||||||
|
|
||||||
|
Ok(TerminalHistoryPage { items, total })
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 切换收藏。返回切换后的值。
|
||||||
|
pub fn toggle_favorite(&self, id: i64) -> Result<bool, String> {
|
||||||
|
let conn = self.conn();
|
||||||
|
let cur: i64 = conn
|
||||||
|
.query_row("SELECT favorited FROM cmd_history WHERE id = ?1", params![id], |r| {
|
||||||
|
r.get(0)
|
||||||
|
})
|
||||||
|
.map_err(|e| format!("找不到历史记录 {id}: {e}"))?;
|
||||||
|
let next = if cur == 0 { 1 } else { 0 };
|
||||||
|
conn.execute(
|
||||||
|
"UPDATE cmd_history SET favorited = ?1 WHERE id = ?2",
|
||||||
|
params![next, id],
|
||||||
|
)
|
||||||
|
.map_err(|e| format!("更新收藏状态失败: {e}"))?;
|
||||||
|
Ok(next != 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 删除单条。返回是否真的删掉了（`false` = 该 id 不存在）。
|
||||||
|
pub fn delete(&self, id: i64) -> Result<bool, String> {
|
||||||
|
let n = self
|
||||||
|
.conn()
|
||||||
|
.execute("DELETE FROM cmd_history WHERE id = ?1", params![id])
|
||||||
|
.map_err(|e| format!("删除历史记录失败: {e}"))?;
|
||||||
|
Ok(n > 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 清空。`keep_favorites` 为真时保留收藏项。
|
||||||
|
///
|
||||||
|
/// 返回删除条数，供前端提示「已清空 N 条」——只说「已清空」而不给数字，
|
||||||
|
/// 用户无法判断是否误删了收藏项之外的全部内容。
|
||||||
|
pub fn clear(&self, keep_favorites: bool) -> Result<i64, String> {
|
||||||
|
let conn = self.conn();
|
||||||
|
let n = if keep_favorites {
|
||||||
|
conn.execute("DELETE FROM cmd_history WHERE favorited = 0", [])
|
||||||
|
} else {
|
||||||
|
conn.execute("DELETE FROM cmd_history", [])
|
||||||
|
}
|
||||||
|
.map_err(|e| format!("清空历史失败: {e}"))?;
|
||||||
|
Ok(n as i64)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 淘汰超出容量上限的最旧非收藏记录。
|
||||||
|
///
|
||||||
|
/// 在写入路径末尾调用（而非定时任务）：容量只会在写入时增长，
|
||||||
|
/// 挂一个定时器反而要处理「定时器与写入并发」的竞态。
|
||||||
|
///
|
||||||
|
/// 用 `id NOT IN (SELECT id ... LIMIT n)` 的子查询形式而不是 `OFFSET`：
|
||||||
|
/// 后者在超大偏移下要扫描全部前置行，而这里每写一条就跑一次，
|
||||||
|
/// 不能让单次写入的代价随库增大而线性上升。
|
||||||
|
pub fn prune(&self, max: i64) -> Result<i64, String> {
|
||||||
|
let max = if max <= 0 { DEFAULT_MAX_ENTRIES } else { max };
|
||||||
|
let n = self
|
||||||
|
.conn()
|
||||||
|
.execute(
|
||||||
|
"DELETE FROM cmd_history
|
||||||
|
WHERE favorited = 0 AND id NOT IN (
|
||||||
|
SELECT id FROM cmd_history WHERE favorited = 0
|
||||||
|
ORDER BY ts DESC LIMIT ?1
|
||||||
|
)",
|
||||||
|
params![max],
|
||||||
|
)
|
||||||
|
.map_err(|e| format!("淘汰历史失败: {e}"))?;
|
||||||
|
Ok(n as i64)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 全部来源（供前端做筛选下拉，避免前端自己聚合而漏掉已删除主机的历史）。
|
||||||
|
pub fn sources(&self) -> Result<Vec<HistorySource>, String> {
|
||||||
|
let conn = self.conn();
|
||||||
|
let mut stmt = conn
|
||||||
|
.prepare(
|
||||||
|
"SELECT host_id, host_name, COUNT(*) AS n,
|
||||||
|
MAX(CASE WHEN ssh THEN 1 ELSE 0 END) AS ssh
|
||||||
|
FROM cmd_history
|
||||||
|
WHERE host_id <> ''
|
||||||
|
GROUP BY host_id, host_name
|
||||||
|
ORDER BY n DESC",
|
||||||
|
)
|
||||||
|
.map_err(|e| format!("准备来源查询失败: {e}"))?;
|
||||||
|
let rows = stmt
|
||||||
|
.query_map([], |r| {
|
||||||
|
Ok(HistorySource {
|
||||||
|
host_id: r.get(0)?,
|
||||||
|
host_name: r.get(1)?,
|
||||||
|
count: r.get(2)?,
|
||||||
|
ssh: r.get::<_, i64>(3)? != 0,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.map_err(|e| format!("查询来源失败: {e}"))?
|
||||||
|
.collect::<Result<Vec<_>, _>>()
|
||||||
|
.map_err(|e| format!("读取来源失败: {e}"))?;
|
||||||
|
Ok(rows)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 转义 `LIKE` 模式里的通配符。
|
||||||
|
///
|
||||||
|
/// 调用方在 SQL 里写了 `ESCAPE '\'`，这里必须把 `\` `%` `_` 三个字符
|
||||||
|
/// 各自加反斜杠前缀。**`\` 必须最先替换** —— 否则后两步插入的反斜杠
|
||||||
|
/// 会被第三步再次转义，产生 `\\%` 这种把通配符当成字面量的错误结果。
|
||||||
|
fn escape_like(s: &str) -> String {
|
||||||
|
s.replace('\\', "\\\\")
|
||||||
|
.replace('%', "\\%")
|
||||||
|
.replace('_', "\\_")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 增量迁移。
|
||||||
|
///
|
||||||
|
/// 从 `user_version` 逐级升到 `SCHEMA_VERSION`。首次打开（version = 0）
|
||||||
|
/// 直接建 v1 结构并把版本置为 1。
|
||||||
|
///
|
||||||
|
/// # 为什么不复用翻译历史的「版本不等就 DROP」
|
||||||
|
///
|
||||||
|
/// 见模块头说明：终端历史里是用户敲过的命令，可能包含服务器地址与路径，
|
||||||
|
/// 是可追溯的资产而非可丢弃的缓存。
|
||||||
|
fn migrate(conn: &Connection) -> Result<(), String> {
|
||||||
|
let mut version: i64 = conn
|
||||||
|
.query_row("PRAGMA user_version", [], |row| row.get(0))
|
||||||
|
.map_err(|e| format!("读取历史库版本失败: {e}"))?;
|
||||||
|
|
||||||
|
if version == 0 {
|
||||||
|
// 全新库（或来自更早的、没有版本号的实验版本）。
|
||||||
|
// 用 `CREATE TABLE IF NOT EXISTS` 保证对已有表幂等 ——
|
||||||
|
// 若库文件存在但 user_version 丢了，这里不会因表已存在而失败。
|
||||||
|
conn.execute_batch(schema_v1())
|
||||||
|
.map_err(|e| format!("初始化命令历史表失败: {e}"))?;
|
||||||
|
version = 1;
|
||||||
|
conn.execute_batch(&format!("PRAGMA user_version = {version};"))
|
||||||
|
.map_err(|e| format!("写入历史库版本失败: {e}"))?;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 后续版本在此追加：
|
||||||
|
// if version == 1 {
|
||||||
|
// conn.execute_batch("ALTER TABLE cmd_history ADD COLUMN xxx TEXT NOT NULL DEFAULT '';")?;
|
||||||
|
// version = 2;
|
||||||
|
// conn.execute_batch(&format!("PRAGMA user_version = {version};"))?;
|
||||||
|
// }
|
||||||
|
|
||||||
|
if version < SCHEMA_VERSION {
|
||||||
|
// 走到这里说明有迁移分支被漏写了。**显式报错而不是静默继续** ——
|
||||||
|
// 静默继续会让「新加的列在运行时找不到」变成一个远离成因的报错。
|
||||||
|
return Err(format!(
|
||||||
|
"命令历史库版本 {version} 低于期望的 {SCHEMA_VERSION}，但缺少对应的迁移步骤"
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 后台 writer =====
|
||||||
|
|
||||||
|
/// 一条待落库的命令记录（读线程 → writer 线程的通道载荷）。
|
||||||
|
pub struct HistoryEntry {
|
||||||
|
pub command: String,
|
||||||
|
pub cwd: String,
|
||||||
|
pub host_id: String,
|
||||||
|
pub host_name: String,
|
||||||
|
pub ssh: bool,
|
||||||
|
pub exit_code: Option<i32>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 攒批参数：到达任一阈值（条数 / 时间窗）就把积压写进 SQLite。
|
||||||
|
const WRITER_BATCH_MAX: usize = 64;
|
||||||
|
const WRITER_BATCH_WINDOW: std::time::Duration = std::time::Duration::from_millis(400);
|
||||||
|
|
||||||
|
/// 把积压的记录写进历史库。
|
||||||
|
///
|
||||||
|
/// 放成模块级函数（而非闭包）：writer 循环的三个分支（满批 / 超时 / 断开）
|
||||||
|
/// 都要走到它，闭包会被借用检查卡住（循环里持有 `&mut batch`）。
|
||||||
|
fn flush_batch(app: &tauri::AppHandle, batch: &mut Vec<HistoryEntry>) {
|
||||||
|
use tauri::Manager as _;
|
||||||
|
if batch.is_empty() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let Some(mgr) = app.try_state::<crate::terminal::TerminalManager>() else {
|
||||||
|
// 应用正在退出（manager 已释放）：丢掉这批，历史是辅助功能
|
||||||
|
batch.clear();
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
let guard = match mgr.history() {
|
||||||
|
Ok(g) => g,
|
||||||
|
Err(e) => {
|
||||||
|
crate::logger::log_error("terminal", &format!("打开历史库失败（丢弃一批记录）: {e}"));
|
||||||
|
batch.clear();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let Some(h) = guard.as_ref() else {
|
||||||
|
batch.clear();
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
for e in batch.drain(..) {
|
||||||
|
if let Err(err) = h.record(
|
||||||
|
&e.command,
|
||||||
|
&e.cwd,
|
||||||
|
&e.host_id,
|
||||||
|
&e.host_name,
|
||||||
|
e.ssh,
|
||||||
|
e.exit_code,
|
||||||
|
) {
|
||||||
|
crate::logger::log_error("terminal", &format!("写入命令历史失败（不影响会话）: {err}"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 每批淘汰一次（而非每条）：把 prune 的 DELETE 子查询从「每命令一次」
|
||||||
|
// 降为「每批一次」，这是此前输出热路径上最贵的一步。
|
||||||
|
if let Err(err) = h.prune(0) {
|
||||||
|
crate::logger::log_error("terminal", &format!("淘汰历史容量失败: {err}"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 启动后台历史 writer，返回入队端。
|
||||||
|
///
|
||||||
|
/// # 为什么需要它（此前的形态是同步写）
|
||||||
|
///
|
||||||
|
/// `record_command` 位于**输出热路径**上（OSC 133 的 D 标记到达时，读线程/SSH
|
||||||
|
/// 读任务正在转发终端输出）。同步形态意味着：整份 settings 深拷贝 + SQLite
|
||||||
|
/// 写入 + prune 的 DELETE 子查询都发生在转发线程上，`cat` 大文件时每条命令
|
||||||
|
/// 都会让同一批输出多等一次磁盘 IO。
|
||||||
|
///
|
||||||
|
/// 改为通道 + 后台 writer 后，读线程只做一次 `mpsc::send`（非阻塞、无锁竞争）。
|
||||||
|
/// 落库延迟最多一个攒批窗口（400ms），对「翻历史」场景无感。
|
||||||
|
///
|
||||||
|
/// 退出语义：所有入队端 drop 后（`cleanup_on_exit` 会 drop manager 里的那份），
|
||||||
|
/// `recv` 返回 Err 且缓冲清空，writer 把剩余记录写完后自然退出。
|
||||||
|
pub fn spawn_writer(app: tauri::AppHandle) -> std::sync::mpsc::Sender<HistoryEntry> {
|
||||||
|
use std::sync::mpsc::{channel, RecvTimeoutError};
|
||||||
|
|
||||||
|
let (tx, rx) = channel::<HistoryEntry>();
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
let mut batch: Vec<HistoryEntry> = Vec::new();
|
||||||
|
loop {
|
||||||
|
match rx.recv_timeout(WRITER_BATCH_WINDOW) {
|
||||||
|
Ok(e) => {
|
||||||
|
batch.push(e);
|
||||||
|
if batch.len() >= WRITER_BATCH_MAX {
|
||||||
|
flush_batch(&app, &mut batch);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(RecvTimeoutError::Timeout) => {
|
||||||
|
flush_batch(&app, &mut batch);
|
||||||
|
}
|
||||||
|
Err(RecvTimeoutError::Disconnected) => {
|
||||||
|
// 入队端全部关闭：写完剩余的，退出
|
||||||
|
flush_batch(&app, &mut batch);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
tx
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
/// 每个用例一个独立目录。
|
||||||
|
///
|
||||||
|
/// 沿用 `translate/history.rs` 的做法（`std::env::temp_dir()` + 进程号 + 序号），
|
||||||
|
/// 而不是引入 `tempdir` dev-dependency：`History` 持有的连接在测试结束前不释放，
|
||||||
|
/// Windows 会拒绝删除仍被打开的文件，所以**本来就没法真正清理**。
|
||||||
|
/// 为一件做不到的事加一个依赖不划算。
|
||||||
|
fn open(tag: &str) -> History {
|
||||||
|
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||||
|
static SEQ: AtomicUsize = AtomicUsize::new(0);
|
||||||
|
let n = SEQ.fetch_add(1, Ordering::Relaxed);
|
||||||
|
let dir = std::env::temp_dir().join(format!(
|
||||||
|
"thing-cmd-hist-test-{}-{tag}-{n}",
|
||||||
|
std::process::id()
|
||||||
|
));
|
||||||
|
let _ = std::fs::remove_dir_all(&dir);
|
||||||
|
History::new(&dir).expect("建库失败")
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn record_and_query_roundtrip() {
|
||||||
|
let h = open("roundtrip");
|
||||||
|
h.record("ls -la", "/home/me", "h1", "服务器A", true, Some(0))
|
||||||
|
.unwrap();
|
||||||
|
h.record("git status", "/home/me", "h1", "服务器A", true, Some(0))
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let page = h.query(HistoryQuery::default()).unwrap();
|
||||||
|
assert_eq!(page.total, 2);
|
||||||
|
// 收藏优先 + 时间倒序：两条都不是收藏，按 ts 倒序 → 后插入的在前
|
||||||
|
assert_eq!(page.items[0].command, "git status");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn dedup_accumulates_count() {
|
||||||
|
let h = open("dedup");
|
||||||
|
h.record("make", "/proj", "h1", "A", true, Some(0)).unwrap();
|
||||||
|
h.record("make", "/proj", "h1", "A", true, Some(2)).unwrap();
|
||||||
|
let page = h.query(HistoryQuery::default()).unwrap();
|
||||||
|
assert_eq!(page.total, 1, "同 command+cwd+host 应复用同一行");
|
||||||
|
assert_eq!(page.items[0].count, 2);
|
||||||
|
assert_eq!(page.items[0].exit_code, Some(2), "退出码应为最后一次");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn same_command_different_cwd_is_separate() {
|
||||||
|
let h = open("cwd");
|
||||||
|
h.record("ls", "/a", "h1", "A", true, None).unwrap();
|
||||||
|
h.record("ls", "/b", "h1", "A", true, None).unwrap();
|
||||||
|
let page = h.query(HistoryQuery::default()).unwrap();
|
||||||
|
assert_eq!(page.total, 2, "不同目录下的同名命令是两条独立记录");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn leading_space_is_not_recorded() {
|
||||||
|
// shell 惯例：以空格开头的命令不进历史（HISTCONTROL=ignorespace）。
|
||||||
|
// 我们若不遵守，等于把用户对系统历史的信任从背后捅穿。
|
||||||
|
let h = open("leadspace");
|
||||||
|
h.record(" curl -u user:pass http://x", "/", "h1", "A", true, None)
|
||||||
|
.unwrap();
|
||||||
|
h.record("", "/", "h1", "A", true, None).unwrap();
|
||||||
|
h.record(" ", "/", "h1", "A", true, None).unwrap();
|
||||||
|
let page = h.query(HistoryQuery::default()).unwrap();
|
||||||
|
assert_eq!(page.total, 0, "带前导空格与空命令都不应入库");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn short_keyword_uses_like_fallback() {
|
||||||
|
// trigram 索引对 <3 字符的查询静默返回空，必须走 LIKE 回退，
|
||||||
|
// 否则「搜 ls」会得到空结果 —— 而这正是最常用的搜索词之一。
|
||||||
|
let h = open("shortkw");
|
||||||
|
h.record("ls -la", "/", "h1", "A", true, None).unwrap();
|
||||||
|
h.record("git log", "/", "h1", "A", true, None).unwrap();
|
||||||
|
let page = h
|
||||||
|
.query(HistoryQuery {
|
||||||
|
keyword: "ls".to_string(),
|
||||||
|
..Default::default()
|
||||||
|
})
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(page.total, 1);
|
||||||
|
assert_eq!(page.items[0].command, "ls -la");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn keyword_with_quotes_and_operators_is_safe() {
|
||||||
|
// 命令里出现 `'` `"` `*` 是家常便饭（`awk '{print $1}'`、`ls *.rs`）。
|
||||||
|
// 既不能造成 SQL 注入，也不能让 FTS 语法报错。
|
||||||
|
let h = open("meta");
|
||||||
|
h.record("awk '{print $1}' file.txt", "/", "h1", "A", true, None)
|
||||||
|
.unwrap();
|
||||||
|
h.record("ls *.rs", "/", "h1", "A", true, None).unwrap();
|
||||||
|
|
||||||
|
let p1 = h
|
||||||
|
.query(HistoryQuery {
|
||||||
|
keyword: "awk '{print $1}'".to_string(),
|
||||||
|
..Default::default()
|
||||||
|
})
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(p1.total, 1, "含单引号的查询必须能命中且不报错");
|
||||||
|
|
||||||
|
let p2 = h
|
||||||
|
.query(HistoryQuery {
|
||||||
|
keyword: "ls *.rs".to_string(),
|
||||||
|
..Default::default()
|
||||||
|
})
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(p2.total, 1, "含通配符的查询应按字面量匹配");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn favorite_survives_prune_and_clear() {
|
||||||
|
let h = open("fav");
|
||||||
|
for i in 0..5 {
|
||||||
|
h.record(&format!("cmd{i}"), "/", "h1", "A", true, None)
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
|
let page = h.query(HistoryQuery::default()).unwrap();
|
||||||
|
let fav_id = page.items[0].id;
|
||||||
|
assert!(h.toggle_favorite(fav_id).unwrap());
|
||||||
|
|
||||||
|
// 容量淘汰到 2 条：收藏项必须留下（即使它不在最新的 2 条里）
|
||||||
|
h.prune(2).unwrap();
|
||||||
|
let after = h.query(HistoryQuery::default()).unwrap();
|
||||||
|
assert_eq!(after.total, 3, "2 条最新 + 1 条收藏");
|
||||||
|
assert!(
|
||||||
|
after.items.iter().any(|i| i.id == fav_id),
|
||||||
|
"收藏项不应被容量淘汰"
|
||||||
|
);
|
||||||
|
|
||||||
|
// 保留式清空：收藏仍在
|
||||||
|
let removed = h.clear(true).unwrap();
|
||||||
|
assert_eq!(removed, 2);
|
||||||
|
let final_page = h.query(HistoryQuery::default()).unwrap();
|
||||||
|
assert_eq!(final_page.total, 1);
|
||||||
|
assert_eq!(final_page.items[0].id, fav_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn like_escape_handles_backslash_first() {
|
||||||
|
// `\` 必须最先替换，否则后续插入的反斜杠会被再次转义。
|
||||||
|
assert_eq!(escape_like("a%b"), "a\\%b");
|
||||||
|
assert_eq!(escape_like("a_b"), "a\\_b");
|
||||||
|
assert_eq!(escape_like("a\\b"), "a\\\\b");
|
||||||
|
// 混合场景：反斜杠 + 通配符
|
||||||
|
assert_eq!(escape_like("\\%"), "\\\\\\%");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn fts_phrase_escapes_double_quotes() {
|
||||||
|
// FTS5 的短语转义约定：内部 `"` 写成 `""`。
|
||||||
|
assert_eq!(fts_phrase("a\"b"), "\"a\"\"b\"");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn query_limit_is_clamped() {
|
||||||
|
let q = HistoryQuery {
|
||||||
|
limit: 99999,
|
||||||
|
offset: -5,
|
||||||
|
..Default::default()
|
||||||
|
}
|
||||||
|
.normalized();
|
||||||
|
assert_eq!(q.limit, 500, "limit 上限 500");
|
||||||
|
assert_eq!(q.offset, 0, "offset 不为负");
|
||||||
|
|
||||||
|
let q2 = HistoryQuery::default().normalized();
|
||||||
|
assert_eq!(q2.limit, 100, "未指定时默认 100");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn host_filter_and_favorite_filter() {
|
||||||
|
let h = open("filters");
|
||||||
|
h.record("a", "/", "h1", "A", true, None).unwrap();
|
||||||
|
h.record("b", "/", "h2", "B", true, None).unwrap();
|
||||||
|
h.record("c", "/", "h1", "A", true, None).unwrap();
|
||||||
|
|
||||||
|
let by_host = h
|
||||||
|
.query(HistoryQuery {
|
||||||
|
host_id: "h1".to_string(),
|
||||||
|
..Default::default()
|
||||||
|
})
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(by_host.total, 2);
|
||||||
|
|
||||||
|
let page = by_host.clone();
|
||||||
|
h.toggle_favorite(page.items[0].id).unwrap();
|
||||||
|
let favs = h
|
||||||
|
.query(HistoryQuery {
|
||||||
|
favorited_only: true,
|
||||||
|
..Default::default()
|
||||||
|
})
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(favs.total, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn sources_aggregates_by_host_id() {
|
||||||
|
let h = open("sources");
|
||||||
|
h.record("a", "/", "h1", "A", true, None).unwrap();
|
||||||
|
h.record("b", "/", "h1", "A", true, None).unwrap();
|
||||||
|
h.record("c", "/", "h2", "B", true, None).unwrap();
|
||||||
|
h.record("d", "/", "", "", false, None).unwrap(); // 无来源，不参与聚合
|
||||||
|
|
||||||
|
let s = h.sources().unwrap();
|
||||||
|
assert_eq!(s.len(), 2);
|
||||||
|
// 按条数倒序：h1 有 2 条
|
||||||
|
assert_eq!(s[0].host_id, "h1");
|
||||||
|
assert_eq!(s[0].count, 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn migration_is_idempotent_on_reopen() {
|
||||||
|
// 同一目录重复打开不应报错，也不应因重复建表而丢失数据。
|
||||||
|
// `migrate` 在 version != 0 时跳过建表，这条用例正是守着那个分支。
|
||||||
|
use std::sync::atomic::{AtomicUsize, Ordering};
|
||||||
|
static SEQ: AtomicUsize = AtomicUsize::new(0);
|
||||||
|
let n = SEQ.fetch_add(1, Ordering::Relaxed);
|
||||||
|
let dir = std::env::temp_dir().join(format!(
|
||||||
|
"thing-cmd-hist-test-reopen-{}-{n}",
|
||||||
|
std::process::id()
|
||||||
|
));
|
||||||
|
let _ = std::fs::remove_dir_all(&dir);
|
||||||
|
|
||||||
|
{
|
||||||
|
let h = History::new(&dir).expect("首次打开");
|
||||||
|
h.record("keepme", "/", "h1", "A", true, None).unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
let h2 = History::new(&dir).expect("二次打开（v0 分支不应再执行）");
|
||||||
|
let page = h2.query(HistoryQuery::default()).unwrap();
|
||||||
|
assert_eq!(page.total, 1, "重开库不应清空数据");
|
||||||
|
assert_eq!(page.items[0].command, "keepme");
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,431 @@
|
|||||||
|
//! 终端模块：SSH 与本地 Shell 多会话终端。
|
||||||
|
//!
|
||||||
|
//! # 模块结构
|
||||||
|
//!
|
||||||
|
//! | 文件 | 职责 |
|
||||||
|
//! |---|---|
|
||||||
|
//! | [`session`] | `Session` trait 抽象 + `SessionRegistry`（本地/SSH 共用） |
|
||||||
|
//! | [`pty::conpty`] | 本地 ConPTY 后端（含三个已知坑的处理） |
|
||||||
|
//! | [`shell`] | Shell 探测、命令行组装、OSC 7 cwd 跟踪 |
|
||||||
|
//! | [`ssh`] | SSH 后端（russh）、认证、主机密钥校验、SFTP |
|
||||||
|
//! | [`keys`] | SSH 密钥生成/导入/管理 |
|
||||||
|
//! | [`settings`] | 设置模型与默认值（容器级 `#[serde(default)]`） |
|
||||||
|
//! | [`events`] | 事件负载类型 |
|
||||||
|
//! | [`commands`] | Tauri 命令层（薄：整形/校验/归类） |
|
||||||
|
//!
|
||||||
|
//! # 为什么自带一套会话管理而不复用 `ProcessManager`
|
||||||
|
//!
|
||||||
|
//! 见 [`session`] 模块注释。一句话：`ProcessManager` 是「单例守护进程」模型，
|
||||||
|
//! 终端要的是「N 个独立会话 + 双向流式 I/O + 退出不重启」，语义不同。
|
||||||
|
//!
|
||||||
|
//! # 数据目录
|
||||||
|
//!
|
||||||
|
//! ```text
|
||||||
|
//! {app_data_dir}/terminal/
|
||||||
|
//! ├── settings.json 设置、主机列表、密钥元数据
|
||||||
|
//! ├── known_hosts.json 主机密钥指纹库（非机密，人可读可导出）
|
||||||
|
//! ├── keys/ SSH 私钥文件本体
|
||||||
|
//! └── hooks/ Shell cwd 跟踪临时脚本（Git Bash 用）
|
||||||
|
//! ```
|
||||||
|
//!
|
||||||
|
//! # 凭据存储
|
||||||
|
//!
|
||||||
|
//! SSH 密码、私钥 passphrase 一律走 [`crate::secrets`]（系统凭据管理器，DPAPI）。
|
||||||
|
//! 键名约定：
|
||||||
|
//! - `terminal-ssh-password-{hostId}`
|
||||||
|
//! - `terminal-key-passphrase-{keyId}`
|
||||||
|
//!
|
||||||
|
//! **本模块不存在任何读取凭据明文的命令**：列表接口只回传是否已配置与掩码串。
|
||||||
|
|
||||||
|
pub mod assistant;
|
||||||
|
pub mod audit;
|
||||||
|
pub mod commands;
|
||||||
|
pub mod encoding;
|
||||||
|
pub mod events;
|
||||||
|
pub mod history;
|
||||||
|
pub mod keys;
|
||||||
|
pub mod pty;
|
||||||
|
pub mod session;
|
||||||
|
pub mod settings;
|
||||||
|
pub mod shell;
|
||||||
|
pub mod ssh;
|
||||||
|
pub mod window;
|
||||||
|
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use std::sync::{Mutex, MutexGuard};
|
||||||
|
|
||||||
|
use tauri::{AppHandle, Emitter, Manager};
|
||||||
|
|
||||||
|
use session::SessionRegistry;
|
||||||
|
use settings::TerminalSettings;
|
||||||
|
|
||||||
|
/// 供 `pty::conpty` 与 `ssh` 共用的事件常量入口。
|
||||||
|
///
|
||||||
|
/// 两个后端都要 emit 事件，逐处写 `super::super::events::...` 可读性差且容易写错层级，
|
||||||
|
/// 因此在这里做一次再导出，后端内部统一用 `crate::terminal::events::TERMINAL_*`。
|
||||||
|
///
|
||||||
|
/// 注：当前两个后端已改为直接引用 `crate::terminal::events::TERMINAL_*`，
|
||||||
|
/// 此别名保留为对外稳定出口（避免下游按路径引用时因重构断链）。
|
||||||
|
#[allow(unused_imports)]
|
||||||
|
pub use crate::constants::events as event_names;
|
||||||
|
|
||||||
|
/// 输出事件负载（两个后端共用）。同样作为对外出口保留。
|
||||||
|
#[allow(unused_imports)]
|
||||||
|
pub use events::OutputPayload;
|
||||||
|
|
||||||
|
/// 终端模块管理器（Tauri State）。
|
||||||
|
///
|
||||||
|
/// 与 `TranslateManager` / `MusicManager` 平级，在 `setup::init` 中构造并 `manage`。
|
||||||
|
pub struct TerminalManager {
|
||||||
|
/// 模块自身目录：`{app_data_dir}/terminal`
|
||||||
|
root: PathBuf,
|
||||||
|
/// 会话注册表（本地 + SSH 共用一张表，id 全局唯一）
|
||||||
|
pub sessions: SessionRegistry,
|
||||||
|
/// 活跃的 SFTP 通道（按会话 id 索引）。
|
||||||
|
///
|
||||||
|
/// 放在 `TerminalManager` 而不是 `SessionRegistry` 上：SFTP 是**可选能力**，
|
||||||
|
/// 只有 SSH 会话且用户打开了文件面板才存在。挂在会话注册表上会让「会话」
|
||||||
|
/// 这个概念背负一个大多数情况下为空的字段。
|
||||||
|
pub sftp: ssh::sftp::SftpRegistry,
|
||||||
|
/// SSH 连接池（P2 连接复用）：同身份的多个会话共享一条 SSH 连接。
|
||||||
|
///
|
||||||
|
/// 挂在 `TerminalManager` 上与 SFTP 同理——它是**跨会话**的资源，
|
||||||
|
/// 生命周期由池内引用计数管理（最后一个使用它的会话关闭时才断开）。
|
||||||
|
pub ssh_pool: ssh::pool::ConnectionPool,
|
||||||
|
/// 命令历史库（SQLite）。懒加载：`None` 表示尚未打开连接。
|
||||||
|
///
|
||||||
|
/// 与 `settings` 一样懒加载：大多数会话（尤其是刚启动就开标签的场景）
|
||||||
|
/// 在第一次写入命令之前根本用不到历史库，没必要在 `TerminalManager::new`
|
||||||
|
/// 里同步打开一个 SQLite 连接（含 WAL 初始化与建表检查）。
|
||||||
|
pub history: Mutex<Option<history::History>>,
|
||||||
|
/// 命令历史后台 writer 的入队端。
|
||||||
|
///
|
||||||
|
/// `record_command` 位于输出热路径上，此前每次都同步「settings 深拷贝 +
|
||||||
|
/// SQLite 写 + prune」；现在改为 `mpsc::send` 入队，由 [`history::spawn_writer`]
|
||||||
|
/// 的 writer 线程攒批落库。`None` 表示尚未启动（init_on_launch 时启动）。
|
||||||
|
history_tx: Mutex<Option<std::sync::mpsc::Sender<history::HistoryEntry>>>,
|
||||||
|
/// 设置缓存。`None` 表示尚未加载（懒加载，避免启动时多做一次磁盘 IO）
|
||||||
|
settings: Mutex<Option<TerminalSettings>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TerminalManager {
|
||||||
|
pub fn new(app_data_dir: PathBuf) -> Self {
|
||||||
|
let root = app_data_dir.join("terminal");
|
||||||
|
// 目录先行创建：后续 keys/ 与 hooks/ 都依赖它
|
||||||
|
std::fs::create_dir_all(root.join("keys")).ok();
|
||||||
|
std::fs::create_dir_all(root.join("hooks")).ok();
|
||||||
|
// logs/ 由 audit::toggle 按需创建（首次开启日志才落盘），此处不预建
|
||||||
|
Self {
|
||||||
|
root,
|
||||||
|
sessions: SessionRegistry::new(),
|
||||||
|
sftp: ssh::sftp::SftpRegistry::new(),
|
||||||
|
ssh_pool: ssh::pool::ConnectionPool::default(),
|
||||||
|
history: Mutex::new(None),
|
||||||
|
history_tx: Mutex::new(None),
|
||||||
|
settings: Mutex::new(None),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 取（必要时打开）命令历史库。
|
||||||
|
///
|
||||||
|
/// `&self` + 内部 `Mutex<Option<..>>` 而非 `&mut self`：命令层拿到的是
|
||||||
|
/// `State<'_, TerminalManager>`，多个并发命令（比如历史面板在搜、同时
|
||||||
|
/// 另一个会话在写新命令）都会调到它，`&mut` 会把两者串行化。
|
||||||
|
///
|
||||||
|
/// 打开失败**不缓存失败结果**（`left` 保持 `None`）：磁盘临时不可用、
|
||||||
|
/// 目录权限刚被修好这类情况应当允许后续调用重试。若把 `Err` 也当成
|
||||||
|
/// 「已初始化」，用户就得重启应用才能恢复历史功能。
|
||||||
|
pub fn history(&self) -> Result<std::sync::MutexGuard<'_, Option<history::History>>, String> {
|
||||||
|
let mut guard = self.history.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
if guard.is_none() {
|
||||||
|
*guard = Some(history::History::new(&self.root)?);
|
||||||
|
}
|
||||||
|
Ok(guard)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn root(&self) -> &PathBuf {
|
||||||
|
&self.root
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 把一条命令历史入队（由后台 writer 攒批落库）。
|
||||||
|
///
|
||||||
|
/// 通道不可用（writer 尚未启动或已退出）时退回同步写：
|
||||||
|
/// 「writer 死了历史就静默丢失」比「热路径偶尔慢一次」更糟。
|
||||||
|
pub fn queue_history(&self, mut entry: history::HistoryEntry) {
|
||||||
|
{
|
||||||
|
let guard = self.history_tx.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
if let Some(tx) = guard.as_ref() {
|
||||||
|
match tx.send(entry) {
|
||||||
|
Ok(()) => return,
|
||||||
|
// writer 已退出：SendError 里带着原值，取回走同步兜底
|
||||||
|
Err(e) => entry = e.0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 通道已断：同步兜底
|
||||||
|
if let Ok(guard) = self.history() {
|
||||||
|
if let Some(h) = guard.as_ref() {
|
||||||
|
if let Err(e) = h.record(
|
||||||
|
&entry.command,
|
||||||
|
&entry.cwd,
|
||||||
|
&entry.host_id,
|
||||||
|
&entry.host_name,
|
||||||
|
entry.ssh,
|
||||||
|
entry.exit_code,
|
||||||
|
) {
|
||||||
|
crate::logger::log_error(
|
||||||
|
"terminal",
|
||||||
|
&format!("写入命令历史失败（不影响会话）: {e}"),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if let Err(e) = h.prune(0) {
|
||||||
|
crate::logger::log_error("terminal", &format!("淘汰历史容量失败: {e}"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 查 shell / 主机的显示名（供历史落库）。
|
||||||
|
///
|
||||||
|
/// 此前 `record_command` 用 `settings()`（整份深拷贝，含全部主机、Shell、
|
||||||
|
/// 快捷键表）只为拿一个名字，而它在输出热路径上。这里改为持锁只读出
|
||||||
|
/// 需要的字段。
|
||||||
|
pub fn display_name(&self, target_id: &str, ssh: bool) -> String {
|
||||||
|
let guard = self.lock_settings();
|
||||||
|
let Some(s) = guard.as_ref() else {
|
||||||
|
return target_id.to_string();
|
||||||
|
};
|
||||||
|
if ssh {
|
||||||
|
s.hosts
|
||||||
|
.iter()
|
||||||
|
.find(|h| h.id == target_id)
|
||||||
|
.map(|h| h.name.clone())
|
||||||
|
.unwrap_or_else(|| target_id.to_string())
|
||||||
|
} else {
|
||||||
|
s.shells
|
||||||
|
.iter()
|
||||||
|
.find(|x| x.id == target_id)
|
||||||
|
.map(|x| x.name.clone())
|
||||||
|
.unwrap_or_else(|| target_id.to_string())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn settings_path(&self) -> PathBuf {
|
||||||
|
self.root.join("settings.json")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 密钥文件存放目录。
|
||||||
|
pub fn keys_dir(&self) -> PathBuf {
|
||||||
|
self.root.join("keys")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// cwd hook 脚本目录（Git Bash 的 `--init-file` 需要一个真实文件）。
|
||||||
|
pub fn hooks_dir(&self) -> PathBuf {
|
||||||
|
self.root.join("hooks")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 会话日志目录（`{app_data_dir}/terminal/logs/`）。
|
||||||
|
///
|
||||||
|
/// 目录由 `audit::toggle` 按需创建：日志是可选能力，
|
||||||
|
/// 不为它预付一次磁盘 IO。
|
||||||
|
pub fn logs_dir(&self) -> PathBuf {
|
||||||
|
self.root.join("logs")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 读取设置（带缓存）。
|
||||||
|
///
|
||||||
|
/// 首次调用会从磁盘读取并执行 `heal()`；若 `heal` 报告变更则立即落盘，
|
||||||
|
/// 避免「老配置每次启动都要自愈一遍」。
|
||||||
|
pub fn settings(&self) -> TerminalSettings {
|
||||||
|
let mut guard = self.lock_settings();
|
||||||
|
if let Some(s) = guard.as_ref() {
|
||||||
|
return s.clone();
|
||||||
|
}
|
||||||
|
let mut s = self.load_settings_from_disk();
|
||||||
|
if s.heal() {
|
||||||
|
if let Err(e) = self.write_settings_file(&s) {
|
||||||
|
crate::logger::log_error("terminal", &format!("自愈后保存设置失败: {e}"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*guard = Some(s.clone());
|
||||||
|
s
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 写入设置（覆盖缓存 + 落盘）。
|
||||||
|
pub fn save_settings(&self, mut next: TerminalSettings) -> Result<(), String> {
|
||||||
|
// 保存前自愈一次：前端可能提交了越界值（滚动缓冲、字体大小等）
|
||||||
|
next.heal();
|
||||||
|
self.write_settings_file(&next)?;
|
||||||
|
*self.lock_settings() = Some(next);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 局部修改设置：读 → 改 → 写。避免前端为了改一个字段而回传整份设置
|
||||||
|
/// （回传整份会带来「前端旧快照覆盖后端新值」的竞态）。
|
||||||
|
pub fn update_settings<F>(&self, f: F) -> Result<TerminalSettings, String>
|
||||||
|
where
|
||||||
|
F: FnOnce(&mut TerminalSettings),
|
||||||
|
{
|
||||||
|
let mut s = self.settings();
|
||||||
|
f(&mut s);
|
||||||
|
self.save_settings(s.clone())?;
|
||||||
|
Ok(s)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 从磁盘读取。文件不存在或解析失败时返回默认值——
|
||||||
|
/// 配置文件损坏不该让整个模块不可用（用户至少还能新建会话）。
|
||||||
|
fn load_settings_from_disk(&self) -> TerminalSettings {
|
||||||
|
let path = self.settings_path();
|
||||||
|
match std::fs::read_to_string(&path) {
|
||||||
|
Ok(raw) => match serde_json::from_str::<TerminalSettings>(&raw) {
|
||||||
|
Ok(s) => s,
|
||||||
|
Err(e) => {
|
||||||
|
// 备份损坏文件再退回默认：直接覆盖会让用户丢失可手工修复的内容
|
||||||
|
let bak = path.with_extension("json.broken");
|
||||||
|
let _ = std::fs::rename(&path, &bak);
|
||||||
|
crate::logger::log_error(
|
||||||
|
"terminal",
|
||||||
|
&format!(
|
||||||
|
"设置解析失败（已备份至 {}）: {e}",
|
||||||
|
bak.display()
|
||||||
|
),
|
||||||
|
);
|
||||||
|
TerminalSettings::default()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
Err(_) => TerminalSettings::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn write_settings_file(&self, s: &TerminalSettings) -> Result<(), String> {
|
||||||
|
let path = self.settings_path();
|
||||||
|
if let Some(parent) = path.parent() {
|
||||||
|
std::fs::create_dir_all(parent).map_err(|e| format!("创建配置目录失败: {e}"))?;
|
||||||
|
}
|
||||||
|
let json = serde_json::to_string_pretty(s).map_err(|e| format!("序列化设置失败: {e}"))?;
|
||||||
|
// 先写临时文件再 rename：避免写入中途崩溃留下半截 JSON
|
||||||
|
let tmp = path.with_extension("json.tmp");
|
||||||
|
std::fs::write(&tmp, json).map_err(|e| format!("写入设置失败: {e}"))?;
|
||||||
|
std::fs::rename(&tmp, &path).map_err(|e| format!("保存设置失败: {e}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 统一的锁获取：中毒时取回内部值。
|
||||||
|
///
|
||||||
|
/// 设置结构本身没有跨字段不变量（每个字段独立），因此「中毒」不代表数据
|
||||||
|
/// 已损坏，直接 panic 反而会把一次无关的线程崩溃放大成整个模块不可用。
|
||||||
|
fn lock_settings(&self) -> MutexGuard<'_, Option<TerminalSettings>> {
|
||||||
|
self.settings.lock().unwrap_or_else(|e| e.into_inner())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 刷新 Shell 探测结果并写回设置。
|
||||||
|
///
|
||||||
|
/// 返回完整的 Shell 列表（含用户自定义项）。用户在设置页点「重新探测」时调用。
|
||||||
|
pub fn refresh_shells(&self) -> Result<Vec<settings::ShellProfile>, String> {
|
||||||
|
let current = self.settings();
|
||||||
|
let merged = shell::detect_and_merge(¤t.shells);
|
||||||
|
let result = merged.clone();
|
||||||
|
self.update_settings(|s| {
|
||||||
|
s.shells = merged;
|
||||||
|
})?;
|
||||||
|
Ok(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 应用退出清理：关闭所有会话。
|
||||||
|
///
|
||||||
|
/// **不等待**。ConPTY 的 `ClosePseudoConsole` 会阻塞到所有句柄关闭，
|
||||||
|
/// 退出路径上等待会卡死（参照 `MonitorKernel` 的教训——那里用了独立线程
|
||||||
|
/// + `recv_timeout(3s)` 防挂起）。会话侧已把关闭动作放进后台线程，
|
||||||
|
/// 进程终止时 OS 回收剩余资源。
|
||||||
|
pub fn cleanup_on_exit(&self) {
|
||||||
|
let n = self.sessions.len();
|
||||||
|
if n > 0 {
|
||||||
|
crate::logger::log_info("terminal", &format!("退出：关闭 {n} 个会话"));
|
||||||
|
}
|
||||||
|
// 先关 SFTP 通道：它们与 shell 共用同一条 TCP 连接，若先关连接，
|
||||||
|
// SFTP 侧的 close 报文会写到已关闭的 socket 上（在日志里留下一串噪音）。
|
||||||
|
let ids: Vec<String> = self.sessions.list().into_iter().map(|s| s.id).collect();
|
||||||
|
for id in ids {
|
||||||
|
self.sftp.close(&id);
|
||||||
|
}
|
||||||
|
// 丢弃历史 writer 的入队端：writer 会把通道里剩余的记录写完后自然退出
|
||||||
|
// （不 join —— 退出路径上不做任何等待，见本函数头部注释）
|
||||||
|
*self.history_tx.lock().unwrap_or_else(|e| e.into_inner()) = None;
|
||||||
|
self.sessions.close_all();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 在应用启动时初始化：预创建 hooks 目录、刷新 Shell 探测、按需注册全局快捷键。
|
||||||
|
///
|
||||||
|
/// **不发任何网络请求**（沿用 translate 模块的姿态）：SSH 连接只在用户
|
||||||
|
/// 主动打开会话时建立。
|
||||||
|
pub fn init_on_launch(&self, app: &AppHandle) {
|
||||||
|
// 首次运行或探测结果为空时做一次 Shell 探测
|
||||||
|
let s = self.settings();
|
||||||
|
if s.shells.is_empty() {
|
||||||
|
if let Err(e) = self.refresh_shells() {
|
||||||
|
crate::logger::log_error("terminal", &format!("Shell 探测失败: {e}"));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// 已有配置也要重新探测：用户可能升级/卸载了 PowerShell 7。
|
||||||
|
// 失败不阻断启动。
|
||||||
|
if let Err(e) = self.refresh_shells() {
|
||||||
|
crate::logger::log_warn("terminal", &format!("Shell 重探测失败（沿用旧配置）: {e}"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 清理上次运行遗留的 hook 脚本（内容每次都重新生成，不会丢信息）
|
||||||
|
let hooks = self.hooks_dir();
|
||||||
|
if let Ok(entries) = std::fs::read_dir(&hooks) {
|
||||||
|
for e in entries.flatten() {
|
||||||
|
if e.path().extension().map_or(false, |x| x == "sh") {
|
||||||
|
let _ = std::fs::remove_file(e.path());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 启动命令历史后台 writer（见 `history_tx` 字段的说明）
|
||||||
|
*self.history_tx.lock().unwrap_or_else(|e| e.into_inner()) =
|
||||||
|
Some(history::spawn_writer(app.clone()));
|
||||||
|
|
||||||
|
let _ = app; // 全局快捷键由前端 store 在模块启用时注册（与截图模块同一范式）
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 从 Tauri State 取 TerminalManager。
|
||||||
|
pub fn manager(app: &AppHandle) -> Result<tauri::State<'_, TerminalManager>, String> {
|
||||||
|
app.try_state::<TerminalManager>()
|
||||||
|
.ok_or_else(|| "终端模块未初始化".to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 发射 SFTP 传输进度事件。
|
||||||
|
///
|
||||||
|
/// 转发到 [`events::emit_transfer`]，在 `terminal` 根上再导出一层是为了让命令层
|
||||||
|
/// 写 `crate::terminal::emit_transfer(...)` 与 `emit_state` 保持同一路径风格。
|
||||||
|
pub fn emit_transfer(app: &AppHandle, payload: &ssh::sftp::TransferProgress) {
|
||||||
|
events::emit_transfer(app, payload);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 发射会话状态事件。
|
||||||
|
///
|
||||||
|
/// # 为什么需要这个统一入口
|
||||||
|
///
|
||||||
|
/// 两个后端（ConPTY / SSH）在**六处**要更新状态：连接中、已认证、已建立、
|
||||||
|
/// 降级、关闭、失败。若每处各自 `emit(TERMINAL_STATE, session.info())`，
|
||||||
|
/// 就会出现「某处忘了 emit，前端状态点停在旧值」这类难查的不一致。
|
||||||
|
/// 集中到一处后，「改状态」与「广播状态」永远成对发生。
|
||||||
|
///
|
||||||
|
/// `final_state` 参数是**显式传入**而非从 `info()` 读取的：调用方常常是在
|
||||||
|
/// 刚写入状态、但 `info()` 还持有旧值的时间窗内调用（各自持有不同 Mutex），
|
||||||
|
/// 传参能避免这个竞态。
|
||||||
|
pub fn emit_state(
|
||||||
|
app: &AppHandle,
|
||||||
|
state: &session::LocalSessionState,
|
||||||
|
final_state: session::SessionState,
|
||||||
|
error: Option<String>,
|
||||||
|
) {
|
||||||
|
if let Some(err) = error.as_ref() {
|
||||||
|
*state.error.lock().unwrap_or_else(|e| e.into_inner()) = Some(err.clone());
|
||||||
|
}
|
||||||
|
let mut info = session::local_info(state, session::SessionKind::Local);
|
||||||
|
info.state = final_state;
|
||||||
|
let _ = app.emit(crate::constants::events::TERMINAL_STATE, info);
|
||||||
|
}
|
||||||
@@ -0,0 +1,746 @@
|
|||||||
|
//! ConPTY 绑定与本地会话实现。
|
||||||
|
//!
|
||||||
|
//! 直接绑定 `windows-sys` 的 `CreatePseudoConsole` 系列 API（而非引入
|
||||||
|
//! `portable-pty` 之类的封装）。理由：本项目已有大量原生 Win32 调用
|
||||||
|
//! （`win32_util.rs` / `screenshot/wgc_capture.rs` / `translate/capture/uia_capture.rs`），
|
||||||
|
//! 这条路径熟悉；而 ConPTY 的三个坑（见下）无论加不加封装都要踩，多一层只增加定位难度。
|
||||||
|
//!
|
||||||
|
//! # ConPTY 的三个坑（全部已在实现中处理）
|
||||||
|
//!
|
||||||
|
//! 1. **`ClosePseudoConsole` 会阻塞**，直到所有引用该 PTY 的句柄被关闭。若在读线程
|
||||||
|
//! 仍挂起于 `ReadFile` 时调用，就会永久卡住。处理：先 `CancelIoEx` 取消挂起的读，
|
||||||
|
//! 再在**独立线程**里调用 `ClosePseudoConsole`，调用方不等待（见 [`ConPtySession::kill`]）。
|
||||||
|
//!
|
||||||
|
//! 2. **`ResizePseudoConsole` 有早期竞态**：进程刚创建、还没开始读 stdout 时调用，
|
||||||
|
//! 尺寸可能被吞掉（表现为 TUI 程序启动后按 80×24 而不是实际尺寸绘制，vim/htop 花屏）。
|
||||||
|
//! 处理：首帧输出到达前，resize 请求只入队不执行；首帧到达后再应用队列中的最新值
|
||||||
|
//! （见 [`PtyInner::pending_size`]）。
|
||||||
|
//!
|
||||||
|
//! 3. **进程退出 ≠ PTY 关闭**：子进程退出后，管道里可能还有未读完的输出（如最后一行
|
||||||
|
//! 提示符、错误信息）。必须等 `ReadFile` 返回 0 或 `ERROR_BROKEN_PIPE` 才算真正结束，
|
||||||
|
//! 否则会丢掉尾部输出——这正是很多自制终端「退出时少一行」的原因。
|
||||||
|
//!
|
||||||
|
//! # 线程模型
|
||||||
|
//!
|
||||||
|
//! 每个会话起 **两个** 后台线程：
|
||||||
|
//! - 输出读线程：循环 `ReadFile`，把数据推入聚合缓冲，按 8~16ms 窗口发批次事件。
|
||||||
|
//! - 退出等待线程：`WaitForSingleObject` 等子进程句柄，拿退出码，等读线程自然结束
|
||||||
|
//! （即坑 3）后把状态置为 `Closed` 并发事件。
|
||||||
|
//!
|
||||||
|
//! 写操作不单独起线程：`WriteFile` 在 ConPTY 上通常不阻塞（有内部缓冲），
|
||||||
|
//! 由命令层直接同步调用。若未来证实大块粘贴会阻塞，再改成写队列。
|
||||||
|
|
||||||
|
use std::io::{ErrorKind, Read, Write};
|
||||||
|
use std::os::windows::io::{AsRawHandle, FromRawHandle, OwnedHandle};
|
||||||
|
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
|
||||||
|
use std::sync::{Arc, Mutex};
|
||||||
|
use std::time::{Duration, Instant};
|
||||||
|
|
||||||
|
use tauri::{AppHandle, Emitter};
|
||||||
|
use windows_sys::Win32::Foundation::{CloseHandle, HANDLE, INVALID_HANDLE_VALUE};
|
||||||
|
use windows_sys::Win32::System::Console::{
|
||||||
|
ClosePseudoConsole, CreatePseudoConsole, ResizePseudoConsole, COORD, HPCON,
|
||||||
|
};
|
||||||
|
use windows_sys::Win32::System::Threading::{
|
||||||
|
CreateProcessW, GetExitCodeProcess, TerminateProcess, WaitForSingleObject,
|
||||||
|
CREATE_UNICODE_ENVIRONMENT, EXTENDED_STARTUPINFO_PRESENT, PROCESS_INFORMATION,
|
||||||
|
STARTUPINFOEXW,
|
||||||
|
};
|
||||||
|
|
||||||
|
use super::super::session::{
|
||||||
|
local_info, LocalSessionState, Session, SessionId, SessionInfo, SessionKind, SessionState,
|
||||||
|
};
|
||||||
|
|
||||||
|
/// 输出聚合窗口。
|
||||||
|
///
|
||||||
|
/// 8ms 是权衡值：`cat` 大文件时每秒可产生数万次 `ReadFile` 返回，逐条 emit 会压垮
|
||||||
|
/// WebView；但窗口太长（如 50ms）会让交互式输入出现可感知的延迟。8ms 约等于
|
||||||
|
/// 一帧（120Hz），人眼无法分辨，同时能把数千次读合并成一次事件。
|
||||||
|
const AGGREGATE_WINDOW: Duration = Duration::from_millis(8);
|
||||||
|
|
||||||
|
/// 单次读缓冲区大小。64KB 与 ConPTY 内部缓冲匹配，避免多次往返。
|
||||||
|
const READ_BUF_SIZE: usize = 64 * 1024;
|
||||||
|
|
||||||
|
/// 聚合缓冲上限：防止「疯狂输出且前端卡住」时内存无限增长。
|
||||||
|
/// 超出后丢弃**最旧**的数据（终端语义：用户更关心最新的输出）。
|
||||||
|
const MAX_PENDING_BYTES: usize = 4 * 1024 * 1024;
|
||||||
|
|
||||||
|
/// 会话终止时附加到输出的提示（由 Rust 侧统一给出，避免前端各写一套）。
|
||||||
|
const EXIT_HINT: &str = "\r\n";
|
||||||
|
|
||||||
|
// ===== 共享状态 =====
|
||||||
|
|
||||||
|
struct PtyInner {
|
||||||
|
/// PTY 句柄。`Mutex` 保护是因为 resize 需要并发访问，而 ClosePseudoConsole
|
||||||
|
/// 会把它置为 None（表示已关闭，后续调用应静默忽略）。
|
||||||
|
hpc: Mutex<Option<HPCON>>,
|
||||||
|
/// 写入端（我们 → 伪控制台输入）。`Option` 以便 kill 后释放。
|
||||||
|
writer: Mutex<Option<std::fs::File>>,
|
||||||
|
/// 子进程句柄，用于退出等待与强制终止。
|
||||||
|
process: Mutex<Option<OwnedHandle>>,
|
||||||
|
/// 是否已收到首帧输出（ConPTY resize 竞态的处理依据，见模块注释坑 2）。
|
||||||
|
first_output_seen: AtomicBool,
|
||||||
|
/// 首帧之前缓存的尺寸请求。
|
||||||
|
pending_size: Mutex<Option<(u16, u16)>>,
|
||||||
|
/// 是否已关闭（幂等保护）。
|
||||||
|
closed: AtomicBool,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 本地 ConPTY 会话。
|
||||||
|
pub struct ConPtySession {
|
||||||
|
pub state: Arc<LocalSessionState>,
|
||||||
|
inner: Arc<PtyInner>,
|
||||||
|
/// 事件发射器。持有 `AppHandle` 而非 `Window`：会话可以「提升」为独立窗口
|
||||||
|
/// （见 `terminal_detach_session`），事件应发给所有窗口而不是绑定的那一个。
|
||||||
|
app: AppHandle,
|
||||||
|
/// 输出批次序号（每会话独立计数，前端按会话校验连续性）。
|
||||||
|
seq: AtomicU64,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ConPtySession {
|
||||||
|
/// 启动一个本地 Shell 会话。
|
||||||
|
///
|
||||||
|
/// `command_line` 必须是**完整的命令行**（含可执行文件路径）。Windows 的
|
||||||
|
/// `CreateProcessW` 在传入 `lpApplicationName = NULL` 时会自行解析命令行首段
|
||||||
|
/// 作为可执行文件，因此需要调用方保证路径带引号（见 [`super::super::shell::build_command_line`]）。
|
||||||
|
pub fn spawn(
|
||||||
|
app: AppHandle,
|
||||||
|
id: SessionId,
|
||||||
|
shell_id: String,
|
||||||
|
shell_name: String,
|
||||||
|
command_line: String,
|
||||||
|
cwd: Option<String>,
|
||||||
|
env: Vec<(String, String)>,
|
||||||
|
cols: u16,
|
||||||
|
rows: u16,
|
||||||
|
) -> Result<Self, String> {
|
||||||
|
let state = Arc::new(LocalSessionState::new(id.clone(), shell_id, shell_name));
|
||||||
|
*state.size.lock().unwrap_or_else(|e| e.into_inner()) = (cols, rows);
|
||||||
|
|
||||||
|
// ===== 1. 创建一对匿名管道 =====
|
||||||
|
// ConPTY 需要「输入管道」（我们写、PTY 读）与「输出管道」（PTY 写、我们读）。
|
||||||
|
let (input_read, input_write) = create_pipe()?;
|
||||||
|
let (output_read, output_write) = create_pipe()?;
|
||||||
|
|
||||||
|
// ===== 2. 创建伪控制台 =====
|
||||||
|
let size = COORD {
|
||||||
|
X: cols as i16,
|
||||||
|
Y: rows as i16,
|
||||||
|
};
|
||||||
|
let mut hpc: HPCON = 0;
|
||||||
|
// SAFETY: 传入的两个句柄是本函数刚创建的、有效的管道端；
|
||||||
|
// size 已按 COORD 的 i16 范围做了钳制（见 clamp_dim）。
|
||||||
|
let hr = unsafe {
|
||||||
|
CreatePseudoConsole(size, input_read.as_raw_handle() as HANDLE, output_write.as_raw_handle() as HANDLE, 0, &mut hpc)
|
||||||
|
};
|
||||||
|
if hr < 0 {
|
||||||
|
return Err(format!("CreatePseudoConsole 失败（HRESULT: 0x{hr:08X}）"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 创建后立即关掉我们持有的这两端：
|
||||||
|
// - input_read：PTY 已持有自己的副本，我们只保留写端
|
||||||
|
// - output_write：同理，我们只保留读端
|
||||||
|
// 若不关闭，读端永远等不到 EOF（因为写端仍被本进程持有），
|
||||||
|
// 表现为「会话关闭后读线程不退出」，进而导致 ClosePseudoConsole 卡死（坑 1）。
|
||||||
|
drop(input_read);
|
||||||
|
drop(output_write);
|
||||||
|
|
||||||
|
// ===== 3. 组装 STARTUPINFOEX 并把 PTY 传给子进程 =====
|
||||||
|
let mut si: STARTUPINFOEXW = unsafe { std::mem::zeroed() };
|
||||||
|
si.StartupInfo.cb = std::mem::size_of::<STARTUPINFOEXW>() as u32;
|
||||||
|
// 必须设置这两个标志：
|
||||||
|
// - EXTENDED_STARTUPINFO_PRESENT：让系统读 attribute list 里的 HPCON
|
||||||
|
// - CREATE_UNICODE_ENVIRONMENT：环境块是 UTF-16
|
||||||
|
let mut pi: PROCESS_INFORMATION = unsafe { std::mem::zeroed() };
|
||||||
|
|
||||||
|
// 把 HPCON 放进进程属性列表。这一步用 ATTRIBUTE 常量的原始值即可，
|
||||||
|
// 不必引入 PROCTHREAD_ATTRIBUTE 类型（windows-sys 未导出便捷构造器）。
|
||||||
|
const PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE: usize = 0x0002_0016;
|
||||||
|
let mut attr_size: usize = 0;
|
||||||
|
unsafe {
|
||||||
|
// 第一次调用取所需大小
|
||||||
|
InitializeProcThreadAttributeList(std::ptr::null_mut(), 1, 0, &mut attr_size);
|
||||||
|
}
|
||||||
|
let mut attr_buf = vec![0u8; attr_size];
|
||||||
|
let attr_list = attr_buf.as_mut_ptr() as *mut _;
|
||||||
|
// SAFETY: attr_buf 按 API 报告的大小分配；attr_size 已由上一次调用写入。
|
||||||
|
let ok = unsafe { InitializeProcThreadAttributeList(attr_list, 1, 0, &mut attr_size) };
|
||||||
|
if ok == 0 {
|
||||||
|
unsafe { ClosePseudoConsole(hpc) };
|
||||||
|
return Err(format!(
|
||||||
|
"InitializeProcThreadAttributeList 失败: {}",
|
||||||
|
std::io::Error::last_os_error()
|
||||||
|
));
|
||||||
|
}
|
||||||
|
// SAFETY: attr_list 已初始化且声明可容纳 1 个属性；hpc 是有效的 HPCON。
|
||||||
|
//
|
||||||
|
// 注意 windows-sys 0.52 里 `HPCON = isize`（0.59+ 才是 `*mut c_void`）。
|
||||||
|
// `isize as *const c_void` 是不允许的直接转型（E0641），
|
||||||
|
// 必须先转成 `usize` 再转指针——两步都是明确的大小的整数/指针转换。
|
||||||
|
let hpc_ptr = hpc as usize as *const std::ffi::c_void;
|
||||||
|
let ok = unsafe {
|
||||||
|
UpdateProcThreadAttribute(
|
||||||
|
attr_list,
|
||||||
|
0,
|
||||||
|
PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE,
|
||||||
|
hpc_ptr,
|
||||||
|
std::mem::size_of::<HPCON>(),
|
||||||
|
std::ptr::null_mut(),
|
||||||
|
std::ptr::null_mut(),
|
||||||
|
)
|
||||||
|
};
|
||||||
|
if ok == 0 {
|
||||||
|
let e = std::io::Error::last_os_error();
|
||||||
|
unsafe {
|
||||||
|
DeleteProcThreadAttributeList(attr_list);
|
||||||
|
ClosePseudoConsole(hpc);
|
||||||
|
}
|
||||||
|
return Err(format!("UpdateProcThreadAttribute 失败: {e}"));
|
||||||
|
}
|
||||||
|
si.lpAttributeList = attr_list;
|
||||||
|
|
||||||
|
// ===== 4. 组装环境块与命令行 =====
|
||||||
|
let env_block = build_env_block(&env)?;
|
||||||
|
let mut cmdline: Vec<u16> = command_line.encode_utf16().chain(std::iter::once(0)).collect();
|
||||||
|
let cwd_wide: Option<Vec<u16>> = cwd
|
||||||
|
.as_ref()
|
||||||
|
.filter(|s| !s.trim().is_empty())
|
||||||
|
.map(|s| s.encode_utf16().chain(std::iter::once(0)).collect());
|
||||||
|
|
||||||
|
// ===== 5. 创建进程 =====
|
||||||
|
// SAFETY: 所有指针都指向本函数栈/堆上的有效数据，且在调用期间存活；
|
||||||
|
// cmdline 是可变的（CreateProcessW 可能原地修改它，这是 API 约定）。
|
||||||
|
let created = unsafe {
|
||||||
|
CreateProcessW(
|
||||||
|
std::ptr::null(), // 让系统从命令行解析可执行文件
|
||||||
|
cmdline.as_mut_ptr(), // 可写缓冲
|
||||||
|
std::ptr::null(), // 默认进程安全属性
|
||||||
|
std::ptr::null(), // 默认线程安全属性
|
||||||
|
0, // 不继承句柄（PTY 走属性列表传递）
|
||||||
|
EXTENDED_STARTUPINFO_PRESENT | CREATE_UNICODE_ENVIRONMENT,
|
||||||
|
env_block.as_ptr() as *const std::ffi::c_void, // 环境块
|
||||||
|
cwd_wide.as_ref().map_or(std::ptr::null(), |s| s.as_ptr()),
|
||||||
|
&si.StartupInfo,
|
||||||
|
&mut pi,
|
||||||
|
)
|
||||||
|
};
|
||||||
|
|
||||||
|
// 无论成功与否，属性列表都可以释放了（系统已复制所需信息）
|
||||||
|
unsafe {
|
||||||
|
DeleteProcThreadAttributeList(attr_list);
|
||||||
|
}
|
||||||
|
|
||||||
|
if created == 0 {
|
||||||
|
let e = std::io::Error::last_os_error();
|
||||||
|
unsafe { ClosePseudoConsole(hpc) };
|
||||||
|
return Err(format!("创建进程失败: {e}"));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 主线程句柄用不到，立即关闭（进程句柄保留，用于等待退出）
|
||||||
|
unsafe { CloseHandle(pi.hThread) };
|
||||||
|
|
||||||
|
// ===== 6. 组装会话对象 =====
|
||||||
|
// `create_pipe` 已直接返回 `File`（在内部完成裸句柄 → `File` 的转换），
|
||||||
|
// 此处不再做二次转换——早前那版把 `File` 当句柄再转一次，
|
||||||
|
// 会触发 `expected isize, found File` 的类型错误。
|
||||||
|
let writer = input_write;
|
||||||
|
let reader = output_read;
|
||||||
|
let process = unsafe { OwnedHandle::from_raw_handle(pi.hProcess as *mut _) };
|
||||||
|
|
||||||
|
let inner = Arc::new(PtyInner {
|
||||||
|
hpc: Mutex::new(Some(hpc)),
|
||||||
|
writer: Mutex::new(Some(writer)),
|
||||||
|
process: Mutex::new(Some(process)),
|
||||||
|
first_output_seen: AtomicBool::new(false),
|
||||||
|
pending_size: Mutex::new(None),
|
||||||
|
closed: AtomicBool::new(false),
|
||||||
|
});
|
||||||
|
|
||||||
|
let session = Self {
|
||||||
|
state: state.clone(),
|
||||||
|
inner: inner.clone(),
|
||||||
|
app: app.clone(),
|
||||||
|
seq: AtomicU64::new(0),
|
||||||
|
};
|
||||||
|
|
||||||
|
session.set_state(SessionState::Established, None);
|
||||||
|
|
||||||
|
// ===== 7. 启动读线程与退出等待线程 =====
|
||||||
|
spawn_reader(app.clone(), state.clone(), inner.clone(), reader);
|
||||||
|
spawn_waiter(app, state.clone(), inner, session.seq_counter());
|
||||||
|
|
||||||
|
Ok(session)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 输出序号计数器（每会话独立；前端按会话分别校验连续性）。
|
||||||
|
fn seq_counter(&self) -> Arc<AtomicU64> {
|
||||||
|
// 这里刻意返回一个独立计数器：`ConPtySession` 自身可能被 move 进
|
||||||
|
// 注册表，而读线程需要在 move 之前就拿到它。两者通过 Arc 共享。
|
||||||
|
Arc::new(AtomicU64::new(self.seq.load(Ordering::Relaxed)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 管道创建：返回 (读端, 写端) 两个 `File`。
|
||||||
|
fn create_pipe() -> Result<(std::fs::File, std::fs::File), String> {
|
||||||
|
use std::os::windows::io::FromRawHandle;
|
||||||
|
use windows_sys::Win32::System::Pipes::CreatePipe;
|
||||||
|
|
||||||
|
let mut read: HANDLE = INVALID_HANDLE_VALUE;
|
||||||
|
let mut write: HANDLE = INVALID_HANDLE_VALUE;
|
||||||
|
// SAFETY: 两个 out 参数都指向本函数栈上的有效 HANDLE 变量；
|
||||||
|
// 安全属性传 null 表示句柄不可继承（我们不需要子进程继承管道本身）。
|
||||||
|
let ok = unsafe { CreatePipe(&mut read, &mut write, std::ptr::null(), 0) };
|
||||||
|
if ok == 0 {
|
||||||
|
return Err(format!(
|
||||||
|
"CreatePipe 失败: {}",
|
||||||
|
std::io::Error::last_os_error()
|
||||||
|
));
|
||||||
|
}
|
||||||
|
// SAFETY: CreatePipe 成功返回后，read/write 都是有效的、由我们独占的句柄。
|
||||||
|
unsafe {
|
||||||
|
Ok((
|
||||||
|
std::fs::File::from_raw_handle(read as *mut _),
|
||||||
|
std::fs::File::from_raw_handle(write as *mut _),
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 构造 UTF-16 环境块（`KEY=VALUE\0...\0\0`）。
|
||||||
|
///
|
||||||
|
/// 从 `std::env::vars()` 出发做增量修改，而不是从空环境开始：Windows 上进程
|
||||||
|
/// 需要 `SystemRoot` / `PATH` / `USERPROFILE` 等继承变量才能正常工作。
|
||||||
|
/// 值为空串表示**删除**该变量（前端用「清空值」表达删除意图，比另设开关直观）。
|
||||||
|
fn build_env_block(overrides: &[(String, String)]) -> Result<Vec<u16>, String> {
|
||||||
|
let mut map: std::collections::BTreeMap<String, String> = std::env::vars().collect();
|
||||||
|
// 未设置会影响 shell 提示符与编码；显式补齐（用户 override 可覆盖）
|
||||||
|
map.entry("TERM".to_string()).or_insert_with(|| "xterm-256color".to_string());
|
||||||
|
for (k, v) in overrides {
|
||||||
|
if v.is_empty() {
|
||||||
|
map.remove(k);
|
||||||
|
} else {
|
||||||
|
map.insert(k.clone(), v.clone());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut block = Vec::with_capacity(4096);
|
||||||
|
for (k, v) in map {
|
||||||
|
// 环境块不允许 key 含 '='（Windows 用它分隔键值）
|
||||||
|
if k.contains('=') || k.is_empty() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
block.extend(format!("{k}={v}").encode_utf16());
|
||||||
|
block.push(0);
|
||||||
|
}
|
||||||
|
block.push(0); // 双 null 结尾
|
||||||
|
Ok(block)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 输出读线程：读 → 聚合 → 发批次事件。
|
||||||
|
///
|
||||||
|
/// 三种结束条件（都发 `terminal-exit`，但来源不同）：
|
||||||
|
/// 1. `ReadFile` 返回 0（EOF）—— 正常结束
|
||||||
|
/// 2. `ERROR_BROKEN_PIPE` / `ERROR_OPERATION_ABORTED` —— PTY 被关闭（kill 路径）
|
||||||
|
/// 3. 其他 IO 错误 —— 异常，上报 error
|
||||||
|
fn spawn_reader(
|
||||||
|
app: AppHandle,
|
||||||
|
state: Arc<LocalSessionState>,
|
||||||
|
inner: Arc<PtyInner>,
|
||||||
|
mut reader: std::fs::File,
|
||||||
|
) {
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
let mut buf = vec![0u8; READ_BUF_SIZE];
|
||||||
|
let mut pending: Vec<u8> = Vec::with_capacity(READ_BUF_SIZE);
|
||||||
|
let mut last_flush = Instant::now();
|
||||||
|
// OSC 序列扫描的拼接缓冲：序列可能被切在两批数据之间（见 shell::parse_control_sequences）
|
||||||
|
let mut osc_tail: Vec<u8> = Vec::new();
|
||||||
|
// 命令历史累积器（见 session::CommandAccumulator）。
|
||||||
|
// 由本读线程独占持有 —— 只在读线程里被访问，不需要共享。
|
||||||
|
let sim = crate::terminal::session::CommandAccumulator::new();
|
||||||
|
// 上一批发送的序号，用于退出时把 batch 序号一并回传（前端据此判断有无丢包）
|
||||||
|
let mut last_seq: u64 = 0;
|
||||||
|
|
||||||
|
loop {
|
||||||
|
match reader.read(&mut buf) {
|
||||||
|
Ok(0) => break, // EOF：坑 3 的正解，子进程退出后管道仍可能有残余数据
|
||||||
|
Ok(n) => {
|
||||||
|
pending.extend_from_slice(&buf[..n]);
|
||||||
|
|
||||||
|
// 首帧到达：应用之前排队的尺寸（坑 2）
|
||||||
|
if !inner.first_output_seen.swap(true, Ordering::SeqCst) {
|
||||||
|
if let Some((cols, rows)) = inner
|
||||||
|
.pending_size
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.take()
|
||||||
|
{
|
||||||
|
apply_resize(&inner, cols, rows);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// cwd / 标题 / 命令边界跟踪：在**原始字节**上解析，且解析结果不从前端输出里剔除。
|
||||||
|
//
|
||||||
|
// 为什么保留 OSC 7 原文发给前端：xterm 会自行忽略它，而保留原文让
|
||||||
|
// 「会话输出日志」可以原样重放（P2 的审计功能）。剔除反而会引入
|
||||||
|
// 一份「两份流不一致」的隐患。
|
||||||
|
crate::terminal::session::scan_control_sequences(
|
||||||
|
&app,
|
||||||
|
&state,
|
||||||
|
&mut osc_tail,
|
||||||
|
&buf[..n],
|
||||||
|
&sim,
|
||||||
|
);
|
||||||
|
|
||||||
|
// 聚合窗口到了就发一批
|
||||||
|
if last_flush.elapsed() >= AGGREGATE_WINDOW {
|
||||||
|
last_seq = flush_output(&app, &state, &mut pending).unwrap_or(last_seq);
|
||||||
|
last_flush = Instant::now();
|
||||||
|
} else if pending.len() > MAX_PENDING_BYTES {
|
||||||
|
// 前端卡住导致积压：丢弃最旧的一半，保留最新输出
|
||||||
|
let drop_len = pending.len() - MAX_PENDING_BYTES / 2;
|
||||||
|
pending.drain(..drop_len);
|
||||||
|
crate::logger::log_warn(
|
||||||
|
"terminal",
|
||||||
|
&format!(
|
||||||
|
"会话 {} 输出积压超限，已丢弃 {} 字节最旧数据",
|
||||||
|
state.id, drop_len
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
// BROKEN_PIPE / OPERATION_ABORTED 是 kill 路径的正常表现，不算错误
|
||||||
|
if e.kind() != ErrorKind::BrokenPipe && e.raw_os_error() != Some(995) {
|
||||||
|
crate::logger::log_error(
|
||||||
|
"terminal",
|
||||||
|
&format!("会话 {} 读取失败: {e}", state.id),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 有未发出的剩余数据时，退化为「尽快发出」：
|
||||||
|
// 交互式场景下提示符必须立刻可见，不能等满一个窗口
|
||||||
|
if !pending.is_empty() && last_flush.elapsed() >= AGGREGATE_WINDOW {
|
||||||
|
last_seq = flush_output(&app, &state, &mut pending).unwrap_or(last_seq);
|
||||||
|
last_flush = Instant::now();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 读线程结束前把残留数据全部发出（否则最后一行提示符会丢）
|
||||||
|
if let Some(s) = flush_output(&app, &state, &mut pending) {
|
||||||
|
last_seq = s;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 读线程结束即代表 PTY 侧已无更多数据，此时可以安全关闭 PTY（坑 1 的正解）
|
||||||
|
close_pty_background(&inner);
|
||||||
|
|
||||||
|
// 更新状态并发状态事件：若已被 waiter 置为 Closed 则保持 Closed 不变
|
||||||
|
let final_state = {
|
||||||
|
let mut st = state.state.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
if *st != SessionState::Closed && *st != SessionState::Failed {
|
||||||
|
*st = SessionState::Closed;
|
||||||
|
}
|
||||||
|
*st
|
||||||
|
};
|
||||||
|
let _ = last_seq;
|
||||||
|
crate::terminal::emit_state(&app, &state, final_state, None);
|
||||||
|
let _ = app.emit(
|
||||||
|
crate::terminal::events::TERMINAL_EXIT,
|
||||||
|
crate::terminal::events::ExitPayload {
|
||||||
|
session_id: state.id.clone(),
|
||||||
|
exit_code: *state.exit_code.lock().unwrap_or_else(|e| e.into_inner()),
|
||||||
|
reason: Some("eof".to_string()),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// OSC 7（cwd）/ OSC 0,2（标题）/ OSC 133（命令边界）的扫描与落库
|
||||||
|
// 全部委托给 `session::scan_control_sequences`。
|
||||||
|
//
|
||||||
|
// 这里此前有一份与本文件同源的实现，SSH 后端另有一份几乎相同的拷贝。
|
||||||
|
// P1 加命令历史时把两份合一了 —— 否则「OSC 133 解析 + 落库」要在两处各写一遍，
|
||||||
|
// 任何一处漏掉都表现为「只有本地会话有历史」这类按后端分支的诡异 bug。
|
||||||
|
// 具体理由与实现见 `session.rs` 中该函数的长注释。
|
||||||
|
|
||||||
|
/// 退出等待线程：等子进程结束 → 拿退出码 → 等读线程收尾。
|
||||||
|
fn spawn_waiter(
|
||||||
|
app: AppHandle,
|
||||||
|
state: Arc<LocalSessionState>,
|
||||||
|
inner: Arc<PtyInner>,
|
||||||
|
_seq: Arc<AtomicU64>,
|
||||||
|
) {
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
// 取出进程句柄（不 take，kill 也要用）
|
||||||
|
let handle = {
|
||||||
|
let g = inner.process.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
g.as_ref().map(|h| h.as_raw_handle() as HANDLE)
|
||||||
|
};
|
||||||
|
let Some(h) = handle else { return };
|
||||||
|
|
||||||
|
// SAFETY: h 是本会话持有的有效进程句柄；无限等待直到进程退出。
|
||||||
|
let _ = unsafe { WaitForSingleObject(h, u32::MAX) };
|
||||||
|
|
||||||
|
let mut code: u32 = 0;
|
||||||
|
// SAFETY: h 有效且进程已退出，GetExitCodeProcess 会写入 code。
|
||||||
|
let ok = unsafe { GetExitCodeProcess(h, &mut code) };
|
||||||
|
if ok != 0 {
|
||||||
|
*state.exit_code.lock().unwrap_or_else(|e| e.into_inner()) = Some(code as i32);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 注意：这里**不**立刻置 Closed。进程退出后管道里可能还有尾部输出，
|
||||||
|
// 要等读线程把残余数据发完（坑 3）。读线程结束时会把状态置为 Closed。
|
||||||
|
// 但若进程是被 kill 且读线程已退出，这里的 emit 就成了唯一通知。
|
||||||
|
let already_closed = {
|
||||||
|
let st = state.state.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
*st == SessionState::Closed
|
||||||
|
};
|
||||||
|
if !already_closed {
|
||||||
|
// 给读线程一点时间收尾（正常会在 8ms 内完成）
|
||||||
|
std::thread::sleep(Duration::from_millis(50));
|
||||||
|
let st_closed = {
|
||||||
|
let st = state.state.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
*st == SessionState::Closed
|
||||||
|
};
|
||||||
|
if !st_closed {
|
||||||
|
*state.state.lock().unwrap_or_else(|e| e.into_inner()) = SessionState::Closed;
|
||||||
|
close_pty_background(&inner);
|
||||||
|
let _ = app.emit(
|
||||||
|
crate::terminal::events::TERMINAL_EXIT,
|
||||||
|
crate::terminal::events::ExitPayload {
|
||||||
|
session_id: state.id.clone(),
|
||||||
|
exit_code: *state.exit_code.lock().unwrap_or_else(|e| e.into_inner()),
|
||||||
|
reason: Some("process-exit".to_string()),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 把聚合缓冲发成一批事件。返回本次批次序号（缓冲为空时返回 `None`）。
|
||||||
|
fn flush_output(app: &AppHandle, state: &LocalSessionState, pending: &mut Vec<u8>) -> Option<u64> {
|
||||||
|
if pending.is_empty() {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
// 会话日志（audit）在 clear 之前写：保证日志与前端所见完全一致
|
||||||
|
crate::terminal::audit::write(&state.id, pending);
|
||||||
|
use base64::Engine;
|
||||||
|
let data = base64::engine::general_purpose::STANDARD.encode(&pending);
|
||||||
|
pending.clear();
|
||||||
|
|
||||||
|
let seq = SEQ.fetch_add(1, Ordering::Relaxed) + 1;
|
||||||
|
let _ = app.emit(
|
||||||
|
crate::terminal::events::TERMINAL_OUTPUT,
|
||||||
|
crate::terminal::events::OutputPayload {
|
||||||
|
session_id: state.id.clone(),
|
||||||
|
data,
|
||||||
|
seq,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
Some(seq)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 全局输出批次序号。
|
||||||
|
///
|
||||||
|
/// 用全局计数器而非每会话计数器：前端校验连续性只需一个单调序列，
|
||||||
|
/// 且跨会话的绝对顺序在排查问题时更有价值（能看出「哪个会话先输出」）。
|
||||||
|
static SEQ: AtomicU64 = AtomicU64::new(0);
|
||||||
|
|
||||||
|
/// 取下一个全局输出批次序号。
|
||||||
|
///
|
||||||
|
/// 对 SSH 后端开放（见 `ssh::flush_output`）：两种后端共用同一序列，
|
||||||
|
/// 前端只需一套连续性校验逻辑。
|
||||||
|
pub fn next_global_seq() -> u64 {
|
||||||
|
SEQ.fetch_add(1, Ordering::Relaxed) + 1
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 应用尺寸变更（真正调用 ResizePseudoConsole）。
|
||||||
|
fn apply_resize(inner: &PtyInner, cols: u16, rows: u16) {
|
||||||
|
let g = inner.hpc.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
let Some(hpc) = *g else { return };
|
||||||
|
let size = COORD {
|
||||||
|
X: clamp_dim(cols) as i16,
|
||||||
|
Y: clamp_dim(rows) as i16,
|
||||||
|
};
|
||||||
|
// SAFETY: hpc 是有效的伪控制台句柄（未关闭），size 已钳制到 i16 范围。
|
||||||
|
let hr = unsafe { ResizePseudoConsole(hpc, size) };
|
||||||
|
if hr < 0 {
|
||||||
|
crate::logger::log_warn("terminal", &format!("ResizePseudoConsole 失败（HRESULT 0x{hr:08X}）"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 把维度钳制到 COORD 的 i16 正数范围。
|
||||||
|
///
|
||||||
|
/// 为什么需要：`cols`/`rows` 来自前端 xterm 的测量结果，极端布局（超宽显示器 +
|
||||||
|
/// 极窄侧栏）下可能算出 0 或超出 32767，直接转 i16 会得到负数，ConPTY 会拒绝或
|
||||||
|
/// 产生诡异绘制。这里统一兜底到合理区间。
|
||||||
|
fn clamp_dim(v: u16) -> u16 {
|
||||||
|
v.clamp(1, 1000)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 在后台线程关闭 PTY（坑 1：`ClosePseudoConsole` 可能阻塞）。
|
||||||
|
///
|
||||||
|
/// 调用方不等待。先置标志位保证幂等——读线程与退出等待线程都可能走到这里。
|
||||||
|
fn close_pty_background(inner: &Arc<PtyInner>) {
|
||||||
|
if inner.closed.swap(true, Ordering::SeqCst) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let inner = inner.clone();
|
||||||
|
std::thread::spawn(move || {
|
||||||
|
// 先释放写端：否则 PTY 侧仍认为有输入来源，其内部缓冲不会排空
|
||||||
|
{
|
||||||
|
let mut w = inner.writer.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
*w = None;
|
||||||
|
}
|
||||||
|
let hpc = {
|
||||||
|
let mut g = inner.hpc.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
g.take()
|
||||||
|
};
|
||||||
|
if let Some(hpc) = hpc {
|
||||||
|
// SAFETY: hpc 由本会话创建且尚未关闭（take 保证了唯一性）。
|
||||||
|
// 这个调用可能阻塞到所有句柄关闭，因此放在独立线程。
|
||||||
|
unsafe { ClosePseudoConsole(hpc) };
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== Session trait 实现 =====
|
||||||
|
|
||||||
|
impl Session for ConPtySession {
|
||||||
|
fn id(&self) -> &str {
|
||||||
|
&self.state.id
|
||||||
|
}
|
||||||
|
|
||||||
|
fn kind(&self) -> SessionKind {
|
||||||
|
SessionKind::Local
|
||||||
|
}
|
||||||
|
|
||||||
|
fn write(&self, data: &[u8]) -> Result<(), String> {
|
||||||
|
let mut g = self.inner.writer.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
let Some(w) = g.as_mut() else {
|
||||||
|
return Err("会话已关闭，无法写入".to_string());
|
||||||
|
};
|
||||||
|
w.write_all(data).map_err(|e| format!("写入失败: {e}"))?;
|
||||||
|
w.flush().map_err(|e| format!("刷新失败: {e}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn resize(&self, cols: u16, rows: u16) -> Result<(), String> {
|
||||||
|
*self.state.size.lock().unwrap_or_else(|e| e.into_inner()) = (cols, rows);
|
||||||
|
|
||||||
|
// 坑 2：首帧之前只入队。ConPTY 在进程尚未开始读 stdout 时对 resize
|
||||||
|
// 的处理不可靠（尺寸可能被吞掉），表现为 vim/htop 按 80×24 绘制而花屏。
|
||||||
|
if !self.inner.first_output_seen.load(Ordering::SeqCst) {
|
||||||
|
*self
|
||||||
|
.inner
|
||||||
|
.pending_size
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner()) = Some((cols, rows));
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
apply_resize(&self.inner, cols, rows);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn kill(&self) -> Result<(), String> {
|
||||||
|
// 幂等：重复 kill 不报错
|
||||||
|
if self.inner.closed.load(Ordering::SeqCst) {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1. 先终止进程（若有）
|
||||||
|
if let Some(h) = self
|
||||||
|
.inner
|
||||||
|
.process
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.as_ref()
|
||||||
|
.map(|h| h.as_raw_handle() as HANDLE)
|
||||||
|
{
|
||||||
|
// SAFETY: h 是本会话持有的有效进程句柄。
|
||||||
|
// 退出码 1 表示「被终止」，与正常退出 0 区分开，便于前端展示。
|
||||||
|
unsafe { TerminateProcess(h, 1) };
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. 关 PTY（后台线程，不阻塞调用方）
|
||||||
|
close_pty_background(&self.inner);
|
||||||
|
|
||||||
|
// 3. 状态置为 Closed 并发事件
|
||||||
|
*self.state.state.lock().unwrap_or_else(|e| e.into_inner()) = SessionState::Closed;
|
||||||
|
let _ = self.app.emit(
|
||||||
|
crate::terminal::events::TERMINAL_EXIT,
|
||||||
|
crate::terminal::events::ExitPayload {
|
||||||
|
session_id: self.state.id.clone(),
|
||||||
|
exit_code: Some(1),
|
||||||
|
reason: Some("killed".to_string()),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
let _ = EXIT_HINT; // 提示文本由前端拼接，此处保留常量以备审计日志使用
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn info(&self) -> SessionInfo {
|
||||||
|
local_info(&self.state, SessionKind::Local)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn set_state(&self, state: SessionState, error: Option<String>) {
|
||||||
|
*self.state.state.lock().unwrap_or_else(|e| e.into_inner()) = state;
|
||||||
|
if let Some(e) = error {
|
||||||
|
*self.state.error.lock().unwrap_or_else(|e| e.into_inner()) = Some(e);
|
||||||
|
}
|
||||||
|
let _ = self
|
||||||
|
.app
|
||||||
|
.emit(crate::terminal::events::TERMINAL_STATE, self.info());
|
||||||
|
}
|
||||||
|
|
||||||
|
fn set_title_by_user(&self, title: &str) {
|
||||||
|
self.state.set_title_by_user(title);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn set_detached(&self, detached: bool) {
|
||||||
|
self.state.detached.store(detached, Ordering::Relaxed);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 本地会话的编码切换语义与 SSH 不同：**只影响输出的字节→文本解释**，
|
||||||
|
/// 不影响输入（Windows 控制台走 UTF-16 转换，`WriteFile` 收到的一直是
|
||||||
|
/// UTF-8，前端不必按目标代码页重编码）。因此这里不做输入侧处理。
|
||||||
|
fn set_encoding(&self, encoding: &str) -> bool {
|
||||||
|
self.state.set_encoding(encoding)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn emit_state(&self) {
|
||||||
|
let _ = self
|
||||||
|
.app
|
||||||
|
.emit(crate::terminal::events::TERMINAL_STATE, self.info());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== windows-sys 中未随 feature 导出的 API 声明 =====
|
||||||
|
//
|
||||||
|
// `InitializeProcThreadAttributeList` / `UpdateProcThreadAttribute` /
|
||||||
|
// `DeleteProcThreadAttributeList` 属于 `Win32_System_Threading`，但 windows-sys
|
||||||
|
// 0.52 未把它们纳入已启用的 feature 面。用 extern "system" 直接声明，
|
||||||
|
// 避免为了三个函数额外开启一个大 feature（会显著增加编译时间）。
|
||||||
|
unsafe extern "system" {
|
||||||
|
fn InitializeProcThreadAttributeList(
|
||||||
|
lp_attribute_list: *mut std::ffi::c_void,
|
||||||
|
dw_attribute_count: u32,
|
||||||
|
dw_flags: u32,
|
||||||
|
lp_size: *mut usize,
|
||||||
|
) -> i32;
|
||||||
|
|
||||||
|
fn UpdateProcThreadAttribute(
|
||||||
|
lp_attribute_list: *mut std::ffi::c_void,
|
||||||
|
dw_flags: u32,
|
||||||
|
attribute: usize,
|
||||||
|
lp_value: *const std::ffi::c_void,
|
||||||
|
cb_size: usize,
|
||||||
|
lp_previous_value: *mut std::ffi::c_void,
|
||||||
|
lp_return_size: *mut usize,
|
||||||
|
) -> i32;
|
||||||
|
|
||||||
|
fn DeleteProcThreadAttributeList(lp_attribute_list: *mut std::ffi::c_void);
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
//! 终端进程后端。
|
||||||
|
//!
|
||||||
|
//! `conpty` 是本地 Shell 的实现（Windows ConPTY）。未来若需要支持非 Windows
|
||||||
|
//! 平台，在此目录下新增 `unix_pty` 即可，上层只依赖 [`super::session::Session`]。
|
||||||
|
|
||||||
|
pub mod conpty;
|
||||||
@@ -0,0 +1,672 @@
|
|||||||
|
//! 会话抽象与注册表。
|
||||||
|
//!
|
||||||
|
//! ## 为什么不用 `crate::process_manager::ProcessManager`
|
||||||
|
//!
|
||||||
|
//! `ProcessManager` 是为「单例常驻守护进程」设计的（mihomo 内核）：一个模块 ID
|
||||||
|
//! 对应一个进程，进程崩溃即按策略重启，配置在模块 `index.ts` 里静态声明。
|
||||||
|
//! 终端要的是完全不同的语义——
|
||||||
|
//!
|
||||||
|
//! - **N 个会话并存**，每个会话生命周期独立（开一个标签 = 多一个会话）；
|
||||||
|
//! - 需要**双向流式 I/O**（写 stdin、读 stdout），而不只是「启动/停止/看状态」；
|
||||||
|
//! - 崩溃**不应重启**（重启一个 shell 只是给用户一个空提示符，毫无意义），
|
||||||
|
//! 而应把退出码报给前端做展示；
|
||||||
|
//! - 会话可能因为「网络断开」而进入 `degraded` 而不是 `stopped`。
|
||||||
|
//!
|
||||||
|
//! 把这四条塞进 `ProcessManager` 会撑坏它的抽象，因此终端模块自带一套。
|
||||||
|
//!
|
||||||
|
//! ## `Session` trait 的价值
|
||||||
|
//!
|
||||||
|
//! 本地（ConPTY）与远程（SSH）两种后端在「I/O 形态」上高度一致：都是一个字节流，
|
||||||
|
//! 都要支持 write / resize / kill / 输出订阅。抽成 trait 后，上层的命令层
|
||||||
|
//! （`terminal_write` / `terminal_resize` / …）与多会话管理逻辑**只需写一遍**。
|
||||||
|
//!
|
||||||
|
//! 两处刻意的不对称（值得记下，避免后来者以为是疏漏）：
|
||||||
|
//! - `resize`：ConPTY 需要显式调用 `ResizePseudoConsole`；SSH 是发
|
||||||
|
//! `window-change` 请求。两者都要，故都在 trait 上。
|
||||||
|
//! - `exit_code`：本地拿得到真实退出码；SSH 会话通道关闭时通常拿不到，
|
||||||
|
//! 统一返回 `None`，由前端展示为「连接已关闭」。
|
||||||
|
|
||||||
|
use std::sync::atomic::{AtomicU64, Ordering};
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
use dashmap::DashMap;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use specta::Type;
|
||||||
|
|
||||||
|
use super::pty::conpty::ConPtySession;
|
||||||
|
|
||||||
|
/// 会话标识。
|
||||||
|
pub type SessionId = String;
|
||||||
|
|
||||||
|
/// 会话状态机。
|
||||||
|
///
|
||||||
|
/// `degraded` 专为 SSH 保留：TCP 断了但会话对象还在（可以尝试重连），
|
||||||
|
/// 与 `closed`（已终结，需重开）是两回事。本地会话不会进入此态。
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub enum SessionState {
|
||||||
|
/// 已创建，尚未开始握手/启动
|
||||||
|
Idle,
|
||||||
|
/// 正在连接（SSH 握手 / 本地启动进程）
|
||||||
|
Connecting,
|
||||||
|
/// 正在认证（仅 SSH）
|
||||||
|
Authenticating,
|
||||||
|
/// 已建立，可交互
|
||||||
|
Established,
|
||||||
|
/// 连接降级（SSH 断线，可尝试重连）
|
||||||
|
Degraded,
|
||||||
|
/// 已关闭（进程退出或用户主动关闭）
|
||||||
|
Closed,
|
||||||
|
/// 异常（启动失败、握手失败、致命错误）
|
||||||
|
Failed,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 会话类型（决定前端展示哪些能力）。
|
||||||
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub enum SessionKind {
|
||||||
|
Local,
|
||||||
|
Ssh,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 会话元信息（回传前端；**不含任何 I/O 句柄**）。
|
||||||
|
#[derive(Debug, Clone, Serialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct SessionInfo {
|
||||||
|
pub id: SessionId,
|
||||||
|
pub kind: SessionKind,
|
||||||
|
/// 标题（本地为 Shell 名，SSH 为 用户@主机）
|
||||||
|
pub title: String,
|
||||||
|
pub state: SessionState,
|
||||||
|
/// 终端当前列数
|
||||||
|
pub cols: u16,
|
||||||
|
/// 终端当前行数
|
||||||
|
pub rows: u16,
|
||||||
|
/// 当前工作目录（由 OSC 7 hook 上报；未知为空串）
|
||||||
|
pub cwd: String,
|
||||||
|
/// 会话创建时间（Unix 毫秒）
|
||||||
|
pub created_at: u64,
|
||||||
|
/// 进程退出码（本地可拿到；SSH 通常为 None）
|
||||||
|
pub exit_code: Option<i32>,
|
||||||
|
/// 失败原因（state 为 Failed 时非空）
|
||||||
|
pub error: Option<String>,
|
||||||
|
/// 远端标识（本地为 shell id，SSH 为 host id）
|
||||||
|
pub target_id: String,
|
||||||
|
/// 是否由独立窗口承载（决定了关闭窗口时销毁还是保留会话）
|
||||||
|
pub detached: bool,
|
||||||
|
/// 会话的字符编码（规范名，如 `gbk` / `utf-8`）。
|
||||||
|
///
|
||||||
|
/// 回传前端的原因：**终端画面的字节→文本转换在前端做**。xterm 的
|
||||||
|
/// `write` 接受 `Uint8Array`，解码策略由前端按这个字段决定。若放在 Rust 侧
|
||||||
|
/// 转换，前端就失去了「用户临时切编码重看历史内容」的能力——
|
||||||
|
/// 而重看历史恰恰是老服务器场景下最常用的操作。
|
||||||
|
pub encoding: String,
|
||||||
|
/// 是否正在记录会话日志（`audit` 模块）。前端据此显示工具栏开关状态。
|
||||||
|
pub logging: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 会话抽象：本地 ConPTY 与 SSH 两种后端都实现它。
|
||||||
|
///
|
||||||
|
/// 所有方法都要求 `&self`（配合内部可变性）而不是 `&mut self`：会话句柄需要被
|
||||||
|
/// 多个来源同时访问（输出读线程、命令层、退出监听），用 `&mut` 会把它们串行化。
|
||||||
|
pub trait Session: Send + Sync {
|
||||||
|
fn id(&self) -> &str;
|
||||||
|
fn kind(&self) -> SessionKind;
|
||||||
|
|
||||||
|
/// 写入数据（前端键入的字符、粘贴内容）。
|
||||||
|
fn write(&self, data: &[u8]) -> Result<(), String>;
|
||||||
|
|
||||||
|
/// 通知终端尺寸变化。
|
||||||
|
///
|
||||||
|
/// 实现方**必须容忍早期调用**：ConPTY 在进程刚开始输出时 resize 有竞态，
|
||||||
|
/// 需要排队到首帧之后再应用（详见 `pty::conpty`）。
|
||||||
|
fn resize(&self, cols: u16, rows: u16) -> Result<(), String>;
|
||||||
|
|
||||||
|
/// 终止会话。幂等：对已关闭的会话调用不应报错。
|
||||||
|
fn kill(&self) -> Result<(), String>;
|
||||||
|
|
||||||
|
/// 快照当前元信息。
|
||||||
|
fn info(&self) -> SessionInfo;
|
||||||
|
|
||||||
|
/// 更新状态（供内部线程在握手/退出时调用）。
|
||||||
|
fn set_state(&self, state: SessionState, error: Option<String>);
|
||||||
|
|
||||||
|
/// 由**用户**指定标题（重命名）。
|
||||||
|
///
|
||||||
|
/// 名字里带 `_by_user` 是刻意的：它会锁定标题，之后 shell 通过 OSC 0/2
|
||||||
|
/// 上报的标题一律被忽略。任何「程序自动设置标题」的需求都不该走这里 ——
|
||||||
|
/// 那会把用户的命名覆盖掉（见 `LocalSessionState::title_locked`）。
|
||||||
|
fn set_title_by_user(&self, title: &str);
|
||||||
|
|
||||||
|
/// 标记是否由独立窗口承载。
|
||||||
|
fn set_detached(&self, detached: bool);
|
||||||
|
|
||||||
|
/// 切换字符编码。返回 `false` 表示编码名不被支持。
|
||||||
|
///
|
||||||
|
/// # 为什么放进 trait 而不是走 `as_ssh()` 下转换
|
||||||
|
///
|
||||||
|
/// 本地 ConPTY 会话也需要它 —— 用户的 Windows 控制台若是 936 代码页，
|
||||||
|
/// 本地会话同样会乱码，只是默认值不同。放进 trait 后命令层不必先判断
|
||||||
|
/// 会话类型再分派，两条后端路径只有一处实现点。
|
||||||
|
fn set_encoding(&self, encoding: &str) -> bool;
|
||||||
|
|
||||||
|
/// 广播当前会话快照到前端（`TERMINAL_STATE` 事件）。
|
||||||
|
///
|
||||||
|
/// 用于「元信息变了但状态没变」的场景（改编码、改标题），此时
|
||||||
|
/// 既有的状态机路径不会触发广播，需要显式一次。
|
||||||
|
fn emit_state(&self);
|
||||||
|
|
||||||
|
/// 向下转换成 SSH 会话（仅 SFTP 面板需要）。
|
||||||
|
///
|
||||||
|
/// # 为什么用「返回 `Option<&SshSession>`」而不是 `Any` 向下转换
|
||||||
|
///
|
||||||
|
/// `Any::downcast_ref` 要求 trait 对象是 `'static` 且需要引入 `std::any`，
|
||||||
|
/// 更关键的是**编译期一无所知**：调用方写错目标类型要到运行期才炸。
|
||||||
|
/// 这里给出一个具名方法，`SshSession` 的返回 `Some(self)`、其余返回 `None`，
|
||||||
|
/// 类型由签名保证，调用点的 `ok_or_else` 也就有了明确的中文错误提示。
|
||||||
|
///
|
||||||
|
/// 默认实现返回 `None`（本地会话不需要覆写）。
|
||||||
|
fn as_ssh(&self) -> Option<&super::ssh::SshSession> {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 会话注册表。
|
||||||
|
///
|
||||||
|
/// 用 `DashMap` 而不是 `Mutex<HashMap>`：会话的读操作极其频繁（每次输出批次都要
|
||||||
|
/// 查表找会话），而写操作少（创建/销毁）。分片锁能让多个会话的 I/O 线程互不等待。
|
||||||
|
///
|
||||||
|
/// 注意 `Arc<dyn Session>`：注册表持有一份，各 I/O 线程各持一份，生命周期由
|
||||||
|
/// 引用计数管理。**不使用 `Weak`**——会话的存活由用户显式关闭决定，不该因为
|
||||||
|
/// 某个线程退出而被回收。
|
||||||
|
pub struct SessionRegistry {
|
||||||
|
sessions: DashMap<SessionId, Arc<dyn Session>>,
|
||||||
|
/// 会话 id 发生器
|
||||||
|
next_id: AtomicU64,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl SessionRegistry {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
Self {
|
||||||
|
sessions: DashMap::new(),
|
||||||
|
next_id: AtomicU64::new(1),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 生成下一个会话 id。
|
||||||
|
///
|
||||||
|
/// 形如 `s1` / `s2`：短、可读、便于日志检索。不用 UUID 的理由是这个 id 会
|
||||||
|
/// 出现在窗口 label（`terminal-window-s1`）与日志里，UUID 会让两者都难读。
|
||||||
|
/// 会话 id 只在本次进程生命周期内有效，重启后不保证不重复，因此无需全局唯一性。
|
||||||
|
pub fn next_session_id(&self) -> SessionId {
|
||||||
|
let n = self.next_id.fetch_add(1, Ordering::Relaxed);
|
||||||
|
format!("s{n}")
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn insert(&self, session: Arc<dyn Session>) {
|
||||||
|
self.sessions.insert(session.id().to_string(), session);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get(&self, id: &str) -> Option<Arc<dyn Session>> {
|
||||||
|
self.sessions.get(id).map(|e| e.value().clone())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 移除会话（**不调用 kill**，由调用方决定是否先终止）。
|
||||||
|
pub fn remove(&self, id: &str) -> Option<Arc<dyn Session>> {
|
||||||
|
self.sessions.remove(id).map(|(_, v)| v)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn list(&self) -> Vec<SessionInfo> {
|
||||||
|
let mut list: Vec<SessionInfo> = self.sessions.iter().map(|e| e.value().info()).collect();
|
||||||
|
// 按创建时间排序，保证前端标签顺序稳定（DashMap 的迭代顺序不确定）
|
||||||
|
list.sort_by_key(|s| s.created_at);
|
||||||
|
list
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn len(&self) -> usize {
|
||||||
|
self.sessions.len()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 关闭并移除所有会话（应用退出时调用）。
|
||||||
|
///
|
||||||
|
/// 逐个 `kill` 后清表。**不做等待**：退出路径上不能阻塞（ConPTY 的
|
||||||
|
/// `ClosePseudoConsole` 会阻塞到所有句柄关闭，见 `pty::conpty`）。
|
||||||
|
/// 进程终止时 OS 会回收残留资源，这里是「尽力而为」。
|
||||||
|
pub fn close_all(&self) {
|
||||||
|
let ids: Vec<String> = self.sessions.iter().map(|e| e.key().clone()).collect();
|
||||||
|
for id in ids {
|
||||||
|
if let Some(s) = self.get(&id) {
|
||||||
|
if let Err(e) = s.kill() {
|
||||||
|
crate::logger::log_warn(
|
||||||
|
"terminal",
|
||||||
|
&format!("关闭会话 {id} 失败（退出路径，忽略）: {e}"),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 会话日志收尾（flush + 移除条目；与 close 命令路径保持一致）
|
||||||
|
crate::terminal::audit::cleanup(&id);
|
||||||
|
self.remove(&id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for SessionRegistry {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 为一个新会话分配终端默认尺寸。
|
||||||
|
///
|
||||||
|
/// 80×24 是 VT 规范的经典默认值。前端挂载 xterm 后会立刻上报真实尺寸，
|
||||||
|
/// 这里的值只在「创建 → 首帧」之间短暂生效。
|
||||||
|
pub const DEFAULT_COLS: u16 = 80;
|
||||||
|
pub const DEFAULT_ROWS: u16 = 24;
|
||||||
|
|
||||||
|
/// 本地会话的共享状态（供 `ConPtySession` 与命令层共用）。
|
||||||
|
///
|
||||||
|
/// 独立成一个结构而不是塞进 `ConPtySession`，是因为状态字段的读写来自
|
||||||
|
/// 多个线程（命令层、读线程、退出监听线程），集中放置便于审计加锁范围。
|
||||||
|
pub struct LocalSessionState {
|
||||||
|
pub id: SessionId,
|
||||||
|
pub target_id: String,
|
||||||
|
/// 会话类型（本地 ConPTY / SSH）。
|
||||||
|
///
|
||||||
|
/// # 为什么存在这里而不是只由会话对象自己知道
|
||||||
|
///
|
||||||
|
/// `scan_control_sequences` 是**自由函数**（ConPTY 与 SSH 两个后端共用），
|
||||||
|
/// 它只拿到 `LocalSessionState` 而拿不到会话对象。命令历史落库需要区分
|
||||||
|
/// 「target_id 是 shell id 还是主机 id」才能查对显示名 ——
|
||||||
|
/// 没有这个字段就只能靠 `target_id` 的形式去猜，那是不可靠的。
|
||||||
|
pub kind: SessionKind,
|
||||||
|
pub title: std::sync::Mutex<String>,
|
||||||
|
/// 标题是否已被用户手动指定（重命名）。
|
||||||
|
///
|
||||||
|
/// # 为什么需要这个标记
|
||||||
|
///
|
||||||
|
/// 会话标题有两个来源：创建时的 shell/主机名，以及 shell 通过 OSC 0/2
|
||||||
|
/// 上报的自定义标题（每次绘制提示符都可能刷新）。后者是**异步且随时可能到达**的，
|
||||||
|
/// 因此用户刚重命名完，下一条提示符就会把它覆盖回去 —— 表现为「重命名无效」，
|
||||||
|
/// 且因为只在有输出时才复现，很难判断是哪里出的问题。
|
||||||
|
///
|
||||||
|
/// 一旦用户显式命名，就把标题的所有权交给用户：后续 OSC 标题一律忽略。
|
||||||
|
pub title_locked: std::sync::atomic::AtomicBool,
|
||||||
|
pub state: std::sync::Mutex<SessionState>,
|
||||||
|
pub error: std::sync::Mutex<Option<String>>,
|
||||||
|
pub cwd: std::sync::Mutex<String>,
|
||||||
|
pub size: std::sync::Mutex<(u16, u16)>,
|
||||||
|
pub created_at: u64,
|
||||||
|
pub exit_code: std::sync::Mutex<Option<i32>>,
|
||||||
|
pub detached: std::sync::atomic::AtomicBool,
|
||||||
|
/// 会话的字符编码（`encoding::normalize` 之后的规范名，如 `gbk` / `utf-8`）。
|
||||||
|
///
|
||||||
|
/// 放在这里而不是让读线程从 `SshConnectParams` 持有：编码在会话存续期间
|
||||||
|
/// **可能被用户改**（连上后发现是 GBK，在状态栏切一下），此时需要立即生效。
|
||||||
|
/// 用 `Mutex<String>` 而非 `Arc<str>` 就是为了支持这个运行时变更。
|
||||||
|
pub encoding: std::sync::Mutex<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl LocalSessionState {
|
||||||
|
pub fn new(id: SessionId, target_id: String, title: String) -> Self {
|
||||||
|
Self::with_encoding(id, target_id, title, SessionKind::Local, "utf-8")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 带编码与类型构造。
|
||||||
|
///
|
||||||
|
/// `kind` 由**创建方**传入而不是从 `target_id` 推断：本地会话的 target_id 是
|
||||||
|
/// shell id、SSH 会话的是主机 id，两者都是任意字符串，形式上看不出区别。
|
||||||
|
/// 让调用方（`ConPtySession::spawn` / `SshSession::spawn`）显式声明是唯一可靠的来源。
|
||||||
|
pub fn with_encoding(
|
||||||
|
id: SessionId,
|
||||||
|
target_id: String,
|
||||||
|
title: String,
|
||||||
|
kind: SessionKind,
|
||||||
|
encoding: &str,
|
||||||
|
) -> Self {
|
||||||
|
Self {
|
||||||
|
id,
|
||||||
|
target_id,
|
||||||
|
kind,
|
||||||
|
title: std::sync::Mutex::new(title),
|
||||||
|
title_locked: std::sync::atomic::AtomicBool::new(false),
|
||||||
|
state: std::sync::Mutex::new(SessionState::Idle),
|
||||||
|
error: std::sync::Mutex::new(None),
|
||||||
|
cwd: std::sync::Mutex::new(String::new()),
|
||||||
|
size: std::sync::Mutex::new((DEFAULT_COLS, DEFAULT_ROWS)),
|
||||||
|
created_at: now_millis(),
|
||||||
|
exit_code: std::sync::Mutex::new(None),
|
||||||
|
detached: std::sync::atomic::AtomicBool::new(false),
|
||||||
|
encoding: std::sync::Mutex::new(crate::terminal::encoding::normalize(encoding)),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 是否为 SSH 会话（供命令历史等需要区分来源的场景）。
|
||||||
|
pub fn is_ssh(&self) -> bool {
|
||||||
|
matches!(self.kind, SessionKind::Ssh)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 用户手动指定标题（重命名）。同时锁定，见 `title_locked` 的说明。
|
||||||
|
pub fn set_title_by_user(&self, title: &str) {
|
||||||
|
*self.title.lock().unwrap_or_else(|e| e.into_inner()) = title.to_string();
|
||||||
|
self.title_locked
|
||||||
|
.store(true, std::sync::atomic::Ordering::Relaxed);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 标题当前是否被用户锁定（锁定后忽略 shell 上报的 OSC 标题）。
|
||||||
|
pub fn is_title_locked(&self) -> bool {
|
||||||
|
self.title_locked
|
||||||
|
.load(std::sync::atomic::Ordering::Relaxed)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 当前编码（供读线程与命令层读取）。
|
||||||
|
pub fn encoding(&self) -> String {
|
||||||
|
self.encoding
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 切换编码。返回 `false` 表示编码名不被支持（调用方应回滚 UI）。
|
||||||
|
pub fn set_encoding(&self, encoding: &str) -> bool {
|
||||||
|
let norm = crate::terminal::encoding::normalize(encoding);
|
||||||
|
if !crate::terminal::encoding::is_supported(&norm) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
*self.encoding.lock().unwrap_or_else(|e| e.into_inner()) = norm;
|
||||||
|
true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 当前 Unix 毫秒时间戳。
|
||||||
|
pub fn now_millis() -> u64 {
|
||||||
|
use std::time::{SystemTime, UNIX_EPOCH};
|
||||||
|
SystemTime::now()
|
||||||
|
.duration_since(UNIX_EPOCH)
|
||||||
|
.map(|d| d.as_millis() as u64)
|
||||||
|
.unwrap_or(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 控制序列扫描（ConPTY / SSH 共用） =====
|
||||||
|
|
||||||
|
/// `carry` 缓冲上限。正常 OSC 序列只有几十字节，超过即视为畸形数据。
|
||||||
|
///
|
||||||
|
/// 没有上限时，一段缺终止符的畸形输出（比如二进制文件被 `cat` 出来）
|
||||||
|
/// 会让 `carry` 无限增长，最终吃满内存。
|
||||||
|
const MAX_OSC_CARRY: usize = 8 * 1024;
|
||||||
|
|
||||||
|
/// 扫描输出批次里的控制序列，把结果落到会话状态、广播事件、并在命令边界处落库历史。
|
||||||
|
///
|
||||||
|
/// # 为什么两个后端共用这一份（此前 ConPTY 与 SSH 各有一份几乎相同的拷贝）
|
||||||
|
///
|
||||||
|
/// 两份拷贝的差异只有一处：SSH 需要按会话编码二次解码 OSC 载荷
|
||||||
|
/// （GBK 服务器上的标题与 cwd 会乱码）。其余（carry 拼接、上限防御、
|
||||||
|
/// cwd 变更判定、只上报变化量）**完全一致**。
|
||||||
|
///
|
||||||
|
/// P1 新增命令历史时这个问题变成硬约束：若继续维持两份拷贝，
|
||||||
|
/// 「OSC 133 解析 + 落库」就要在两处各写一遍 —— 任何一处漏掉都表现为
|
||||||
|
/// 「只有本地会话有历史」或「只有 SSH 有历史」这类**按后端分支的诡异 bug**，
|
||||||
|
/// 而且因为两条路径平时都各自能用，极难在测试中发现。
|
||||||
|
///
|
||||||
|
/// 编码与类型都从 `state` 上取（`state.encoding()` / `state.kind` /
|
||||||
|
/// `state.is_ssh()`），所以这个函数不需要任何按后端分派的参数。
|
||||||
|
///
|
||||||
|
/// # 关于 `emit_state` 的差异
|
||||||
|
///
|
||||||
|
/// 标题变化时要广播 `TERMINAL_STATE`，而 ConPTY 走 `terminal::emit_state`
|
||||||
|
/// （带显式 `final_state`）、SSH 走 `local_info(.., Ssh)`。统一为
|
||||||
|
/// `local_info(state, state.kind)` + 保持当前 state 不变即可 ——
|
||||||
|
/// 两条路径的原意都是「状态没变，只是标题变了」，用 `state.kind` 恰好等价。
|
||||||
|
pub fn scan_control_sequences(
|
||||||
|
app: &tauri::AppHandle,
|
||||||
|
state: &LocalSessionState,
|
||||||
|
carry: &mut Vec<u8>,
|
||||||
|
chunk: &[u8],
|
||||||
|
sim: &CommandAccumulator,
|
||||||
|
) {
|
||||||
|
use tauri::Emitter as _;
|
||||||
|
|
||||||
|
carry.extend_from_slice(chunk);
|
||||||
|
let parsed = crate::terminal::shell::parse_control_sequences(carry);
|
||||||
|
if parsed.consumed > 0 {
|
||||||
|
carry.drain(..parsed.consumed);
|
||||||
|
}
|
||||||
|
// 防御：畸形数据（没有终止符的超长序列）会让 carry 无限增长
|
||||||
|
if carry.len() > MAX_OSC_CARRY {
|
||||||
|
carry.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 编码转换：OSC 载荷与终端画面**共用同一套字节**，因此也必须用会话编码解码。
|
||||||
|
// 不转的话，GBK 服务器上 `echo -e "\e]0;测试\a"` 这种标题会变成乱码。
|
||||||
|
// 注意只在会话编码不是 UTF-8 时才有实际效果 —— `parse_control_sequences`
|
||||||
|
// 内部已按 UTF-8 有损解码过一轮，这一步是在其基础上的「纠正」。
|
||||||
|
let enc = state.encoding();
|
||||||
|
let recode = |v: Vec<String>| -> Vec<String> {
|
||||||
|
if enc == "utf-8" {
|
||||||
|
return v;
|
||||||
|
}
|
||||||
|
v.into_iter()
|
||||||
|
.map(|s| crate::terminal::encoding::decode(s.as_bytes(), &enc))
|
||||||
|
.collect()
|
||||||
|
};
|
||||||
|
let cwds = recode(parsed.cwds);
|
||||||
|
let titles = recode(parsed.titles);
|
||||||
|
|
||||||
|
if let Some(cwd) = cwds.last() {
|
||||||
|
let changed = {
|
||||||
|
let mut cur = state.cwd.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
if *cur == *cwd {
|
||||||
|
false
|
||||||
|
} else {
|
||||||
|
*cur = cwd.clone();
|
||||||
|
true
|
||||||
|
}
|
||||||
|
};
|
||||||
|
if changed {
|
||||||
|
let _ = app.emit(
|
||||||
|
crate::terminal::events::TERMINAL_CWD,
|
||||||
|
crate::terminal::events::CwdPayload {
|
||||||
|
session_id: state.id.clone(),
|
||||||
|
cwd: cwd.clone(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(title) = titles.last() {
|
||||||
|
// 两类标题一律丢弃，理由不同但都落在同一个判定点上：
|
||||||
|
//
|
||||||
|
// 1. 用户已重命名过（`title_locked`）：标题所有权已交给用户，
|
||||||
|
// 否则下一条提示符就会把用户刚起的名字覆盖回去。
|
||||||
|
// 2. 标题是可执行文件全路径（`osc_title_is_executable_path`）：
|
||||||
|
// cmd.exe / powershell.exe 启动时就是这么设控制台标题的，
|
||||||
|
// 把会话名顶成 `C:\Windows\System32\...\cmd.exe` 毫无信息量。
|
||||||
|
//
|
||||||
|
// 注意这里**不能提前 return** —— 函数尾部还有 OSC 133 命令边界的落库，
|
||||||
|
// 早退会把「同批次里带标题的命令」整条丢掉。
|
||||||
|
let ignored = state.is_title_locked()
|
||||||
|
|| super::shell::osc_title_is_executable_path(title);
|
||||||
|
if !ignored {
|
||||||
|
let changed = {
|
||||||
|
let mut cur = state.title.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
if *cur == *title {
|
||||||
|
false
|
||||||
|
} else {
|
||||||
|
*cur = title.clone();
|
||||||
|
true
|
||||||
|
}
|
||||||
|
};
|
||||||
|
if changed {
|
||||||
|
let _ = app.emit(
|
||||||
|
crate::terminal::events::TERMINAL_STATE,
|
||||||
|
local_info(state, state.kind),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 命令边界：累积到 D 才落库（见 `CommandAccumulator` 的说明）
|
||||||
|
sim.absorb(app, state, &parsed.marks);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 跨批次累积「当前正在执行的命令」，在 OSC 133 的 `D` 标记处落库。
|
||||||
|
///
|
||||||
|
/// # 为什么需要累积而不是收到 D 就存
|
||||||
|
///
|
||||||
|
/// 协议里命令文本（`1337;Cmd=`）与结束标记（`133;D`）是**两个独立序列**，
|
||||||
|
/// 顺序由 shell hook 决定，且可能被切在不同批次里。若收到 D 就立刻用
|
||||||
|
/// 「当前已知的命令」落库，遇到「D 先到、Cmd 后到」的顺序会存下**上一条**命令 ——
|
||||||
|
/// 错位一条，且只在特定时序下复现，是最难查的一类 bug。
|
||||||
|
///
|
||||||
|
/// 因此：Cmd 到达时先暂存，D 到达时用暂存的文本落库并清空。
|
||||||
|
/// 若 D 到达时没有暂存文本（例如 hook 未被注入的老会话），则跳过 ——
|
||||||
|
/// 记一条空命令进历史毫无意义。
|
||||||
|
///
|
||||||
|
/// # 为什么锁粒度是「整段」
|
||||||
|
///
|
||||||
|
/// 一个批次里可能有多组 Cmd/D（`ls; pwd` 在极快执行时被一次性读取）。
|
||||||
|
/// 逐条加锁会让「暂存 → 落库 → 清空」三步之间可能被另一批次的同三步插入，
|
||||||
|
/// 产生交叉覆盖。锁住整段即可，临界区里只有内存操作与一次 SQLite 写入。
|
||||||
|
///
|
||||||
|
/// # 挂载位置
|
||||||
|
///
|
||||||
|
/// 由调用方（两个后端的读线程）持有，与会话同生命周期。不放进
|
||||||
|
/// `LocalSessionState`：那个结构是**状态**（可被任意线程读），
|
||||||
|
/// 而这个是**读线程的私有工作变量**，混在一起会让「谁在改它」变得不清晰。
|
||||||
|
pub struct CommandAccumulator {
|
||||||
|
inner: std::sync::Mutex<Option<String>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl CommandAccumulator {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
Self {
|
||||||
|
inner: std::sync::Mutex::new(None),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn absorb(
|
||||||
|
&self,
|
||||||
|
app: &tauri::AppHandle,
|
||||||
|
state: &LocalSessionState,
|
||||||
|
marks: &[crate::terminal::shell::CommandMark],
|
||||||
|
) {
|
||||||
|
use crate::terminal::shell::CommandMark;
|
||||||
|
if marks.is_empty() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut pending = self.inner.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
for mark in marks {
|
||||||
|
match mark {
|
||||||
|
CommandMark::Command(cmd) => {
|
||||||
|
// 覆盖而非追加：`history 1` 总是给最新一条，
|
||||||
|
// 同一批里出现两次 Cmd 时后者才是当前命令
|
||||||
|
*pending = Some(cmd.clone());
|
||||||
|
}
|
||||||
|
CommandMark::End(code) => {
|
||||||
|
let Some(cmd) = pending.take() else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
if cmd.trim().is_empty() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// 记录失败**不影响终端**：历史是辅助功能，
|
||||||
|
// 磁盘满 / 库损坏都不该让用户的命令执行流程中断。
|
||||||
|
if let Err(e) = record_command(app, state, &cmd, *code) {
|
||||||
|
crate::logger::log_error(
|
||||||
|
"terminal",
|
||||||
|
&format!("写入命令历史失败（不影响会话）: {e}"),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
CommandMark::Start => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for CommandAccumulator {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 把一条命令送进历史库。
|
||||||
|
///
|
||||||
|
/// 从 `AppHandle` 反查 `TerminalManager`：本函数由读线程调用，那里只有
|
||||||
|
/// `AppHandle` 与会话状态，没有 manager 引用。走 Tauri 的 state 查询
|
||||||
|
/// 是这里唯一可行的方式（也是项目里 `manager(&app)` 的既有范式）。
|
||||||
|
///
|
||||||
|
/// # 落库在后台 writer
|
||||||
|
///
|
||||||
|
/// 本函数位于**输出热路径**（OSC 133 的 D 标记到达时读线程正在转发输出），
|
||||||
|
/// 因此只做两次轻量读（显示名持锁读小字段、cwd 克隆）+ 一次 `mpsc::send`。
|
||||||
|
/// SQLite 写入与 prune 由 [`crate::terminal::history::spawn_writer`] 的
|
||||||
|
/// writer 线程攒批完成（通道断开时 manager 内部有同步兜底）。
|
||||||
|
fn record_command(
|
||||||
|
app: &tauri::AppHandle,
|
||||||
|
state: &LocalSessionState,
|
||||||
|
command: &str,
|
||||||
|
exit_code: Option<i32>,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
use tauri::Manager as _;
|
||||||
|
let Some(mgr) = app.try_state::<crate::terminal::TerminalManager>() else {
|
||||||
|
return Ok(()); // 应用正在退出，manager 已释放 —— 静默跳过
|
||||||
|
};
|
||||||
|
|
||||||
|
// 解析显示名。本地会话的 target_id 是 shell id，SSH 会话是主机 id，
|
||||||
|
// 两者对用户是不同含义，所以分开查。
|
||||||
|
//
|
||||||
|
// 显示名**随记录一起存**（而不是查询时再联表）：主机被删除后，
|
||||||
|
// 若只有 id，历史列表里那一列会变成一串无意义的 hash。
|
||||||
|
let name = mgr.display_name(&state.target_id, state.is_ssh());
|
||||||
|
let cwd = state.cwd.lock().unwrap_or_else(|e| e.into_inner()).clone();
|
||||||
|
|
||||||
|
mgr.queue_history(crate::terminal::history::HistoryEntry {
|
||||||
|
command: command.to_string(),
|
||||||
|
cwd,
|
||||||
|
host_id: state.target_id.clone(),
|
||||||
|
host_name: name,
|
||||||
|
ssh: state.is_ssh(),
|
||||||
|
exit_code,
|
||||||
|
});
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 由本地会话状态组装 `SessionInfo`。
|
||||||
|
pub fn local_info(state: &LocalSessionState, kind: SessionKind) -> SessionInfo {
|
||||||
|
let (cols, rows) = *state.size.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
SessionInfo {
|
||||||
|
id: state.id.clone(),
|
||||||
|
kind,
|
||||||
|
title: state
|
||||||
|
.title
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.clone(),
|
||||||
|
state: *state.state.lock().unwrap_or_else(|e| e.into_inner()),
|
||||||
|
cols,
|
||||||
|
rows,
|
||||||
|
cwd: state.cwd.lock().unwrap_or_else(|e| e.into_inner()).clone(),
|
||||||
|
created_at: state.created_at,
|
||||||
|
exit_code: *state.exit_code.lock().unwrap_or_else(|e| e.into_inner()),
|
||||||
|
error: state
|
||||||
|
.error
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.clone(),
|
||||||
|
target_id: state.target_id.clone(),
|
||||||
|
detached: state.detached.load(Ordering::Relaxed),
|
||||||
|
encoding: state.encoding(),
|
||||||
|
logging: crate::terminal::audit::is_logging(&state.id),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 供 `ConPtySession` 引用的类型别名，避免上层直接依赖 `pty` 模块。
|
||||||
|
pub type BoxedSession = Arc<dyn Session>;
|
||||||
|
|
||||||
|
/// 类型占位：确保 `ConPtySession` 在编译期满足 `Session` 契约。
|
||||||
|
/// 若 `ConPtySession` 漏实现某个方法，这里会直接编译失败（比等到使用处才报错更早）。
|
||||||
|
#[allow(dead_code)]
|
||||||
|
fn _assert_conpty_is_session(s: ConPtySession) -> BoxedSession {
|
||||||
|
Arc::new(s)
|
||||||
|
}
|
||||||
@@ -0,0 +1,991 @@
|
|||||||
|
//! 终端模块设置的数据模型与默认值。
|
||||||
|
//!
|
||||||
|
//! 持久化位置：`{app_data_dir}/terminal/settings.json`（与 translate / music 同一范式）。
|
||||||
|
//! 容器级 `#[serde(default)]`：新增字段对旧配置文件是**向后兼容**的——缺字段取默认值
|
||||||
|
//! 而不是让整份设置反序列化失败，避免用户因为一次升级丢掉全部配置。
|
||||||
|
//!
|
||||||
|
//! 安全姿态（与 `crate::secrets` 的约定一致）：**本结构里不允许出现任何明文凭据**。
|
||||||
|
//! SSH 密码、私钥 passphrase 一律进系统凭据管理器，本结构只保存它们的引用 id 与
|
||||||
|
//! 派生展示字段（如 `hasPassphrase`，由命令层回填，不落盘）。
|
||||||
|
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use specta::Type;
|
||||||
|
|
||||||
|
// ===== 本地 Shell =====
|
||||||
|
|
||||||
|
/// 本地 Shell 配置。
|
||||||
|
///
|
||||||
|
/// 探测到的 Shell 与用户自定义的 Shell 用同一结构表达：`detected` 为 true 表示
|
||||||
|
/// 由 [`super::shell::detect_shells`] 自动发现，前端只允许改启动参数而不可改路径
|
||||||
|
/// （路径已被验证存在，改错会让会话起不来）。
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase", default)]
|
||||||
|
pub struct ShellProfile {
|
||||||
|
/// 唯一标识（同时是新建会话时的 shellKey）
|
||||||
|
pub id: String,
|
||||||
|
/// 展示名称，如 "PowerShell 7" / "Windows PowerShell"。
|
||||||
|
///
|
||||||
|
/// **设置页里的描述名，不是标签上显示的名字** —— 后者取
|
||||||
|
/// [`super::shell::session_label`]（按可执行文件名归一的短名）。
|
||||||
|
/// 两者刻意分开：描述名可编辑、可很长，而标签要能一行放下多个会话。
|
||||||
|
pub name: String,
|
||||||
|
/// 可执行文件绝对路径
|
||||||
|
pub path: String,
|
||||||
|
/// 启动参数
|
||||||
|
pub args: Vec<String>,
|
||||||
|
/// 启动时的工作目录（空串表示用用户主目录）
|
||||||
|
pub cwd: String,
|
||||||
|
/// 环境变量覆盖（键值对；值为空串表示删除该变量）
|
||||||
|
pub env: Vec<EnvVar>,
|
||||||
|
/// Shell 类型："powershell" | "cmd" | "bash" | "wsl"
|
||||||
|
///
|
||||||
|
/// 决定三件事：cwd 跟踪 hook 的注入方式、清屏命令、以及 OSC 7 的解析口径。
|
||||||
|
pub kind: String,
|
||||||
|
/// 是否由自动探测得到（true 时前端不可编辑 path）
|
||||||
|
pub detected: bool,
|
||||||
|
/// 是否在新建会话菜单中显示
|
||||||
|
pub enabled: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase", default)]
|
||||||
|
pub struct EnvVar {
|
||||||
|
pub key: String,
|
||||||
|
pub value: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 手写 `Default` 而不是 derive：`detected` 与 `enabled` 的默认值必须是
|
||||||
|
/// `true` / `true`（derive 会给 `false`），而 `#[serde(default)]` 在容器级
|
||||||
|
/// 要求每个字段类型都实现 `Default`。两者不一致会导致「反序列化出来的
|
||||||
|
/// Shell 默认禁用」这种隐性 bug。
|
||||||
|
impl Default for ShellProfile {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
id: String::new(),
|
||||||
|
name: String::new(),
|
||||||
|
path: String::new(),
|
||||||
|
args: Vec::new(),
|
||||||
|
cwd: String::new(),
|
||||||
|
env: Vec::new(),
|
||||||
|
kind: "bash".to_string(),
|
||||||
|
detected: true,
|
||||||
|
enabled: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 容器级 `#[serde(default)]` 要求字段类型实现 `Default`。
|
||||||
|
/// `EnvVar` 的「空值」语义就是空键空值，用 derive 的默认即可。
|
||||||
|
impl Default for EnvVar {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
key: String::new(),
|
||||||
|
value: String::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ShellProfile {
|
||||||
|
pub fn new(id: &str, name: &str, path: &str, kind: &str) -> Self {
|
||||||
|
Self {
|
||||||
|
id: id.to_string(),
|
||||||
|
name: name.to_string(),
|
||||||
|
path: path.to_string(),
|
||||||
|
args: Vec::new(),
|
||||||
|
cwd: String::new(),
|
||||||
|
env: Vec::new(),
|
||||||
|
kind: kind.to_string(),
|
||||||
|
detected: true,
|
||||||
|
enabled: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== SSH 主机 =====
|
||||||
|
|
||||||
|
/// SSH 主机条目。
|
||||||
|
///
|
||||||
|
/// `id` 是凭据键名的一部分（`terminal-ssh-password-{id}`），**创建后不应修改**：
|
||||||
|
/// 改了会让已存进凭据管理器的密码读不到。前端在编辑态需禁用该字段。
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase", default)]
|
||||||
|
pub struct SshHost {
|
||||||
|
pub id: String,
|
||||||
|
/// 展示别名（列表主标题）
|
||||||
|
pub name: String,
|
||||||
|
pub host: String,
|
||||||
|
pub port: u16,
|
||||||
|
pub username: String,
|
||||||
|
/// 认证方式："key"（公钥，默认）| "password" | "agent"（P1）| "keyboard"（P1）
|
||||||
|
pub auth_method: String,
|
||||||
|
/// 公钥认证使用的密钥 id（指向 [`super::keys`] 的密钥库）
|
||||||
|
pub key_id: String,
|
||||||
|
/// 分组名（侧栏按此分组）
|
||||||
|
pub group: String,
|
||||||
|
/// 备注
|
||||||
|
pub note: String,
|
||||||
|
/// 标签色（前端用于状态点/分组标识）
|
||||||
|
pub color: String,
|
||||||
|
/// 是否收藏（置顶显示）
|
||||||
|
pub favorited: bool,
|
||||||
|
/// 连接超时（毫秒）
|
||||||
|
pub connect_timeout_ms: u64,
|
||||||
|
/// keep-alive 间隔（秒，0 表示关闭）
|
||||||
|
pub keepalive_secs: u64,
|
||||||
|
/// 启动目录（空串表示登录后进入默认目录）
|
||||||
|
pub remote_cwd: String,
|
||||||
|
/// 登录后自动执行的命令
|
||||||
|
pub startup_command: String,
|
||||||
|
/// 是否走代理模块（mihomo）。默认关闭：内网主机不该被绕进代理。
|
||||||
|
pub use_proxy: bool,
|
||||||
|
/// 跳板机链（ProxyJump）：按连接顺序排列的主机 id。
|
||||||
|
///
|
||||||
|
/// 每一项引用**本主机列表里的另一台主机**（复用它的地址、账号与凭据），
|
||||||
|
/// 连接方向为 `本机 → jump_ids[0] → jump_ids[1] → … → 本主机`。
|
||||||
|
/// 空 = 直连。约束（命令层校验）：不能引用自己、不能有环、
|
||||||
|
/// 链长上限 5、每一跳的认证方式必须是 key/password。
|
||||||
|
///
|
||||||
|
/// 用 id 引用而不是内联一份地址+凭据的理由：跳板机自己的密码/密钥
|
||||||
|
/// 存在凭据管理器里，按 id 复用可以避免同一台跳板机在多处配置里
|
||||||
|
/// 留下多份凭据副本（改密码时漏改一处就是连接事故）。
|
||||||
|
pub jump_ids: Vec<String>,
|
||||||
|
/// 终端的字符编码（"utf-8" 默认 | "gbk" 等）。老服务器常见 GBK，中文环境刚需。
|
||||||
|
pub encoding: String,
|
||||||
|
/// 是否在远端注入 shell 集成 hook（命令历史 + cwd 跟踪）。
|
||||||
|
///
|
||||||
|
/// # 为什么默认必须是 true
|
||||||
|
///
|
||||||
|
/// 本结构是容器级 `#[serde(default)]`：老配置里缺这个字段时，serde 不是填
|
||||||
|
/// 「零值」而是取 [`SshHost::default()`] 的值。因此**默认值决定老主机是否自动
|
||||||
|
/// 开启注入** —— 填 `false` 会让所有既有主机静默不注入（表现为历史永远为空，
|
||||||
|
/// 而开关在界面上看着是关的，用户根本不会去动它）。填 `true` 则无需改
|
||||||
|
/// `heal()`、无需升 `version`。
|
||||||
|
///
|
||||||
|
/// 关掉它的场景：远端 shell 集成会与 `startup_command` 里 `exec` 换 shell 的
|
||||||
|
/// 配置冲突，或服务器对会话环境有洁癖要求（注入会改本次会话的 `PROMPT_COMMAND`／
|
||||||
|
/// `precmd`，但不落盘、不影响其它会话）。
|
||||||
|
pub inject_shell_integration: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for SshHost {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
id: String::new(),
|
||||||
|
name: String::new(),
|
||||||
|
host: String::new(),
|
||||||
|
port: 22,
|
||||||
|
username: String::new(),
|
||||||
|
auth_method: "key".to_string(),
|
||||||
|
key_id: String::new(),
|
||||||
|
group: String::new(),
|
||||||
|
note: String::new(),
|
||||||
|
color: String::new(),
|
||||||
|
favorited: false,
|
||||||
|
connect_timeout_ms: 15_000,
|
||||||
|
keepalive_secs: 30,
|
||||||
|
remote_cwd: String::new(),
|
||||||
|
startup_command: String::new(),
|
||||||
|
use_proxy: false,
|
||||||
|
jump_ids: Vec::new(),
|
||||||
|
encoding: "utf-8".to_string(),
|
||||||
|
// 必须 true，理由见字段文档（容器级 serde(default) 会用这里的值兜老配置）
|
||||||
|
inject_shell_integration: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 外观 =====
|
||||||
|
|
||||||
|
/// 终端外观设置。
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase", default)]
|
||||||
|
pub struct AppearanceSettings {
|
||||||
|
/// 配色主题 id（内置若干，见前端 terminalThemes.ts）
|
||||||
|
pub theme: String,
|
||||||
|
/// 是否跟随应用亮暗主题（开启时 `theme` 只作为亮/暗的取色基准）
|
||||||
|
pub follow_app_theme: bool,
|
||||||
|
/// 字体族（逗号分隔的 CSS font-family）
|
||||||
|
pub font_family: String,
|
||||||
|
pub font_size: u32,
|
||||||
|
/// 行高倍数
|
||||||
|
pub line_height: f64,
|
||||||
|
/// 字母间距
|
||||||
|
pub letter_spacing: f64,
|
||||||
|
/// 光标样式："block" | "bar" | "underline"
|
||||||
|
pub cursor_style: String,
|
||||||
|
/// 光标是否闪烁
|
||||||
|
pub cursor_blink: bool,
|
||||||
|
/// 滚动缓冲区行数。上限 200000：再高会显著吃内存且滚动查找变慢。
|
||||||
|
pub scrollback: u32,
|
||||||
|
/// 背景不透明度百分比（100 = 不透明）
|
||||||
|
pub opacity: u32,
|
||||||
|
/// 是否启用 GPU 渲染（addon-webgl）。极少数显卡驱动下有花屏问题，故给开关。
|
||||||
|
pub gpu_rendering: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for AppearanceSettings {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
// 「跟随主应用」：配合默认开启的 follow_app_theme，开箱即随应用深浅切换
|
||||||
|
theme: "system".to_string(),
|
||||||
|
follow_app_theme: true,
|
||||||
|
font_family: "Cascadia Mono, Consolas, Microsoft YaHei Mono, monospace".to_string(),
|
||||||
|
font_size: 14,
|
||||||
|
line_height: 1.2,
|
||||||
|
letter_spacing: 0.0,
|
||||||
|
cursor_style: "block".to_string(),
|
||||||
|
cursor_blink: true,
|
||||||
|
scrollback: 10_000,
|
||||||
|
opacity: 100,
|
||||||
|
gpu_rendering: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 快捷键 =====
|
||||||
|
|
||||||
|
/// 一条终端内快捷键绑定。
|
||||||
|
///
|
||||||
|
/// 只覆盖**终端内**（第二层）快捷键：全局快捷键（第一层）由 `crate::shortcut` 统一
|
||||||
|
/// 注册并做应用内冲突检测，不走这里；shell 原生快捷键（第三层）不做拦截。
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase", default)]
|
||||||
|
pub struct ShortcutBinding {
|
||||||
|
/// 动作标识，见前端 `terminalActions.ts`（如 "copy" / "newTab"）
|
||||||
|
pub action: String,
|
||||||
|
/// 键位字符串，格式与 `crate::shortcut::parse_shortcut` 一致（如 "Ctrl+Shift+C"）
|
||||||
|
pub keys: String,
|
||||||
|
/// 是否启用（关掉后该动作无快捷键，但仍可从菜单触发）
|
||||||
|
pub enabled: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for ShortcutBinding {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
action: String::new(),
|
||||||
|
keys: String::new(),
|
||||||
|
enabled: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 终端内选中行为 =====
|
||||||
|
|
||||||
|
/// 终端内选中行为。
|
||||||
|
///
|
||||||
|
/// # 为什么叫 `TerminalSelectionSettings` 而不是 `SelectionSettings`
|
||||||
|
///
|
||||||
|
/// 与 `translate::settings::SelectionSettings` 撞名。`tauri-specta` 的类型注册表
|
||||||
|
/// **全局按类型名索引**，重名会让 `export_bindings()` panic
|
||||||
|
/// （`Detected multiple types with the same name`）。
|
||||||
|
/// specta 2.0.0-rc.25 的 derive 路径无法重命名导出类型
|
||||||
|
/// （详见 `history::TerminalHistoryPage` 的注释），只能改 Rust 标识符本身。
|
||||||
|
///
|
||||||
|
/// 注意：这是**第二个**独立引入的 `SelectionSettings`。新增跨模块共享名之前，
|
||||||
|
/// 先确认没有同名 `Type` 已存在 —— 否则会在**运行时启动阶段**才炸，
|
||||||
|
/// 而不是编译期（见 `TERMINAL_MODULE_PLAN.md` 坑 27）。
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase", default)]
|
||||||
|
pub struct TerminalSelectionSettings {
|
||||||
|
/// 选中即复制（受 Linux/macOS 习惯影响的用户会开；默认关，避免误触）
|
||||||
|
pub copy_on_select: bool,
|
||||||
|
/// 中键粘贴（X11 习惯；Windows 下默认关）
|
||||||
|
pub middle_click_paste: bool,
|
||||||
|
/// 右键行为："menu"（默认，弹菜单）| "paste"（直接粘贴）| "select-word"
|
||||||
|
pub right_click: String,
|
||||||
|
/// 复制时是否去掉尾部空行
|
||||||
|
pub trim_trailing_newline: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for TerminalSelectionSettings {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
copy_on_select: false,
|
||||||
|
middle_click_paste: false,
|
||||||
|
right_click: "menu".to_string(),
|
||||||
|
trim_trailing_newline: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 布局 =====
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase", default)]
|
||||||
|
pub struct LayoutSettings {
|
||||||
|
/// 关闭标签页时若会话仍有活跃进程，是否二次确认
|
||||||
|
pub confirm_close_running: bool,
|
||||||
|
/// 新建标签页时是否继承当前会话的工作目录
|
||||||
|
pub inherit_cwd: bool,
|
||||||
|
/// 是否显示底部状态栏
|
||||||
|
pub show_status_bar: bool,
|
||||||
|
/// 分屏上限（1 = 不分屏，2 = 2×1，4 = 2×2）。
|
||||||
|
/// 上限刻意封在 4：分屏 × 标签 × 会话的组合复杂度会爆炸。
|
||||||
|
pub max_panes: u32,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for LayoutSettings {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
confirm_close_running: true,
|
||||||
|
inherit_cwd: true,
|
||||||
|
show_status_bar: true,
|
||||||
|
max_panes: 4,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 命令片段 =====
|
||||||
|
|
||||||
|
/// 一条命令片段。
|
||||||
|
///
|
||||||
|
/// # 为什么 `command` 里允许变量占位符
|
||||||
|
///
|
||||||
|
/// 常用命令的差异往往只在少数字段（路径、主机名、分支名）。若每条变体都要
|
||||||
|
/// 单独存一条，片段库会迅速退化成「一堆几乎一样的条目」，反而找不到东西。
|
||||||
|
/// 因此支持 `${name}` 形式占位符，执行前弹出表单逐个填写。
|
||||||
|
///
|
||||||
|
/// 占位符语法刻意用 `${name}` 而不是 `{name}`：shell 自身大量使用 `{}`
|
||||||
|
/// （`${VAR}`、`awk '{print}'`、brace expansion），单花括号会与用户的正常
|
||||||
|
/// 命令冲突，导致片段存进去就「被替换掉了」。
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase", default)]
|
||||||
|
pub struct CommandSnippet {
|
||||||
|
pub id: String,
|
||||||
|
/// 展示名称（列表主标题）
|
||||||
|
pub name: String,
|
||||||
|
/// 命令内容（可含 `${name}` 占位符）
|
||||||
|
pub command: String,
|
||||||
|
/// 说明（列表副标题，讲清这条命令做什么、有什么前提）
|
||||||
|
pub description: String,
|
||||||
|
/// 分组名（空串归入「未分组」）
|
||||||
|
pub group: String,
|
||||||
|
/// 占位符的默认值：name → 默认值。未列出的占位符默认空串。
|
||||||
|
pub defaults: std::collections::BTreeMap<String, String>,
|
||||||
|
/// 适用的 shell kind（空数组表示所有 shell 都适用）。
|
||||||
|
/// 例：`Get-ChildItem` 只对 powershell 有意义，不该出现在 cmd 的列表里。
|
||||||
|
pub shell_kinds: Vec<String>,
|
||||||
|
/// 仅对 SSH 会话显示（如 `sudo systemctl restart` 类远端操作）
|
||||||
|
pub ssh_only: bool,
|
||||||
|
/// 是否需要二次确认（危险命令，如 `rm -rf`）
|
||||||
|
pub confirm: bool,
|
||||||
|
/// 是否在片段面板中置顶
|
||||||
|
pub pinned: bool,
|
||||||
|
/// 创建时间（Unix 毫秒，用于列表排序）
|
||||||
|
pub created_at: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for CommandSnippet {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
id: String::new(),
|
||||||
|
name: String::new(),
|
||||||
|
command: String::new(),
|
||||||
|
description: String::new(),
|
||||||
|
group: String::new(),
|
||||||
|
defaults: std::collections::BTreeMap::new(),
|
||||||
|
shell_kinds: Vec::new(),
|
||||||
|
ssh_only: false,
|
||||||
|
confirm: false,
|
||||||
|
pinned: false,
|
||||||
|
created_at: 0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 从命令文本中提取 `${name}` 占位符名（去重、保持出现顺序）。
|
||||||
|
///
|
||||||
|
/// 放在 Rust 侧而不是前端：占位符是**命令语义的一部分**，执行前的替换、
|
||||||
|
/// 校验与「哪些占位符还没填」的判断必须用同一套解析，
|
||||||
|
/// 两边各写一遍迟早会在边界情况（`$${x}`、`${a}${b}` 相邻）上分叉。
|
||||||
|
pub fn snippet_placeholders(command: &str) -> Vec<String> {
|
||||||
|
let bytes = command.as_bytes();
|
||||||
|
let mut out: Vec<String> = Vec::new();
|
||||||
|
let mut i = 0usize;
|
||||||
|
while i < bytes.len() {
|
||||||
|
// 找 `${`
|
||||||
|
if bytes[i] == b'$' && i + 1 < bytes.len() && bytes[i + 1] == b'{' {
|
||||||
|
// `$${x}` 是字面量 `${x}`（转义），跳过
|
||||||
|
let escaped = i > 0 && bytes[i - 1] == b'$';
|
||||||
|
if !escaped {
|
||||||
|
if let Some(end) = command[i + 2..].find('}') {
|
||||||
|
let name = &command[i + 2..i + 2 + end];
|
||||||
|
// 占位符名限定为标识符形态，避免把 `${VAR:-default}` 这类
|
||||||
|
// shell 参数展开语法误当成占位符
|
||||||
|
if !name.is_empty()
|
||||||
|
&& name
|
||||||
|
.chars()
|
||||||
|
.all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-')
|
||||||
|
&& !out.iter().any(|x| x == name)
|
||||||
|
{
|
||||||
|
out.push(name.to_string());
|
||||||
|
}
|
||||||
|
i = i + 2 + end + 1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
i += 1;
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 用给定值替换命令里的占位符。
|
||||||
|
///
|
||||||
|
/// 未提供的占位符**保持原样**（不替换成空串）：静默替换成空串会让
|
||||||
|
/// `rm -rf ${dir}` 变成 `rm -rf ` —— 一个参数缺失的命令可能比一个
|
||||||
|
/// 显式报错的命令危险得多。调用方应先校验所有占位符都有值。
|
||||||
|
pub fn snippet_render(command: &str, values: &std::collections::BTreeMap<String, String>) -> String {
|
||||||
|
let mut out = String::with_capacity(command.len());
|
||||||
|
let bytes = command.as_bytes();
|
||||||
|
let mut i = 0usize;
|
||||||
|
while i < bytes.len() {
|
||||||
|
if bytes[i] == b'$' && i + 1 < bytes.len() && bytes[i + 1] == b'{' {
|
||||||
|
let escaped = i > 0 && bytes[i - 1] == b'$';
|
||||||
|
if !escaped {
|
||||||
|
if let Some(end) = command[i + 2..].find('}') {
|
||||||
|
let name = &command[i + 2..i + 2 + end];
|
||||||
|
if !name.is_empty()
|
||||||
|
&& name
|
||||||
|
.chars()
|
||||||
|
.all(|c| c.is_ascii_alphanumeric() || c == '_' || c == '-')
|
||||||
|
{
|
||||||
|
match values.get(name) {
|
||||||
|
Some(v) => out.push_str(v),
|
||||||
|
None => out.push_str(&command[i..i + 2 + end + 1]),
|
||||||
|
}
|
||||||
|
i = i + 2 + end + 1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// 逐字符拷贝，注意 UTF-8 多字节边界：这里直接按字节推进会让
|
||||||
|
// 中文字符被切断。故用 chars().next() 取整字符的长度。
|
||||||
|
let ch = command[i..].chars().next().unwrap_or(' ');
|
||||||
|
out.push(ch);
|
||||||
|
i += ch.len_utf8();
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 密钥存储（仅元数据）=====
|
||||||
|
|
||||||
|
/// 密钥库的单个条目（元数据，**不含私钥内容**）。
|
||||||
|
///
|
||||||
|
/// 私钥本体存放在 `{app_data_dir}/terminal/keys/` 的独立文件里（可能是几 KB，
|
||||||
|
/// 塞进 Windows 凭据管理器不可靠——单条有大小上限），passphrase 才进凭据管理器。
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase", default)]
|
||||||
|
pub struct KeyMeta {
|
||||||
|
pub id: String,
|
||||||
|
/// 展示名称
|
||||||
|
pub name: String,
|
||||||
|
/// 算法："ed25519" | "rsa" | "ecdsa"
|
||||||
|
pub algorithm: String,
|
||||||
|
/// 位数 / 曲线（RSA 2048/3072/4096；ECDSA P-256/P-384/P-521；ed25519 固定空串）
|
||||||
|
pub bits: u32,
|
||||||
|
/// 公钥指纹（SHA256，OpenSSH 展示格式 `SHA256:xxxx`）
|
||||||
|
pub fingerprint: String,
|
||||||
|
/// 公钥内容（`ssh-ed25519 AAAA... comment`），用于一键复制
|
||||||
|
pub public_key: String,
|
||||||
|
/// 注释
|
||||||
|
pub comment: String,
|
||||||
|
/// 私钥文件名（`keys/` 目录下，相对名）
|
||||||
|
pub file_name: String,
|
||||||
|
/// 创建时间（RFC3339）
|
||||||
|
pub created_at: String,
|
||||||
|
/// 是否由 ssh-agent 托管（P1）
|
||||||
|
pub in_agent: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for KeyMeta {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
id: String::new(),
|
||||||
|
name: String::new(),
|
||||||
|
algorithm: "ed25519".to_string(),
|
||||||
|
bits: 0,
|
||||||
|
fingerprint: String::new(),
|
||||||
|
public_key: String::new(),
|
||||||
|
comment: String::new(),
|
||||||
|
file_name: String::new(),
|
||||||
|
created_at: String::new(),
|
||||||
|
in_agent: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 安全 =====
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase", default)]
|
||||||
|
pub struct SecuritySettings {
|
||||||
|
/// 主机密钥策略："ask"（默认，首次连接必须显式确认指纹）。
|
||||||
|
///
|
||||||
|
/// **不提供 "auto-accept" 选项**：TOFU 静默接受是 MITM 的入口，
|
||||||
|
/// 属于代码层不该给用户的开关。
|
||||||
|
///
|
||||||
|
/// 读取方（`ssh::SshHandler::check_server_key`）**显式读取本字段而不是写死**：
|
||||||
|
/// 唯一支持的取值是 `"ask"`，其它取值（配置文件被手工改过）一律按 `"ask"`
|
||||||
|
/// 处理 —— 安全开关的失败方向必须朝更严的一侧，绝不能因为出现了一个
|
||||||
|
/// 没见过的字符串就放宽。
|
||||||
|
pub host_key_policy: String,
|
||||||
|
/// 指纹变更时是否阻断（**默认 true**）。关掉会让中间人攻击无声通过，
|
||||||
|
/// 因此前端需以红色风险提示呈现该开关。
|
||||||
|
///
|
||||||
|
/// 关闭时的行为不是「照旧弹窗」而是「自动接受并记入变更历史」：
|
||||||
|
/// 开关的语义是「不再拦截」，若关掉后仍弹阻断弹窗，用户会以为没生效。
|
||||||
|
pub block_on_fingerprint_change: bool,
|
||||||
|
/// 是否把**安全事件**写入日志（默认开）。
|
||||||
|
///
|
||||||
|
/// 记录对象是主机密钥相关的事件：指纹已信任 / 首次见到被接受 / 指纹变更
|
||||||
|
/// 被接受或拒绝 / 自动接受（阻断关闭时）。与「会话日志」（输出字节流落盘，
|
||||||
|
/// 由工具栏的 `terminal_toggle_logging` 按会话显式开启，见 `audit` 模块的
|
||||||
|
/// 取舍说明）**是两件事**：这里只写事件行，不含屏幕内容，因此没有隐私代价，
|
||||||
|
/// 默认开启才能保证「发生过什么」事后可查。
|
||||||
|
pub audit_log: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for SecuritySettings {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
host_key_policy: "ask".to_string(),
|
||||||
|
block_on_fingerprint_change: true,
|
||||||
|
audit_log: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 根结构 =====
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase", default)]
|
||||||
|
pub struct TerminalSettings {
|
||||||
|
/// 结构版本号（用于后续迁移判断）
|
||||||
|
pub version: u32,
|
||||||
|
/// 本地 Shell 配置（探测结果 + 用户自定义，合并存放）
|
||||||
|
pub shells: Vec<ShellProfile>,
|
||||||
|
/// SSH 主机条目
|
||||||
|
pub hosts: Vec<SshHost>,
|
||||||
|
/// 密钥元数据
|
||||||
|
pub keys: Vec<KeyMeta>,
|
||||||
|
pub appearance: AppearanceSettings,
|
||||||
|
pub layout: LayoutSettings,
|
||||||
|
pub shortcuts: Vec<ShortcutBinding>,
|
||||||
|
pub selection: TerminalSelectionSettings,
|
||||||
|
pub security: SecuritySettings,
|
||||||
|
/// 「关闭标签页时确认」等行为的白名单：某些会话可豁免确认
|
||||||
|
pub close_confirm_exempt: Vec<String>,
|
||||||
|
/// 上次使用的 Shell id（新建会话时的默认选中项）
|
||||||
|
pub last_shell_id: String,
|
||||||
|
/// 命令片段库
|
||||||
|
pub snippets: Vec<CommandSnippet>,
|
||||||
|
/// 会话模板（一键拉起一组会话 + 布局）
|
||||||
|
pub templates: Vec<SessionTemplate>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for TerminalSettings {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
version: 2,
|
||||||
|
shells: Vec::new(),
|
||||||
|
hosts: Vec::new(),
|
||||||
|
keys: Vec::new(),
|
||||||
|
appearance: AppearanceSettings::default(),
|
||||||
|
layout: LayoutSettings::default(),
|
||||||
|
shortcuts: default_shortcuts(),
|
||||||
|
selection: TerminalSelectionSettings::default(),
|
||||||
|
security: SecuritySettings::default(),
|
||||||
|
close_confirm_exempt: Vec::new(),
|
||||||
|
last_shell_id: String::new(),
|
||||||
|
snippets: Vec::new(),
|
||||||
|
templates: Vec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 会话模板：一键拉起一组会话并排成布局。
|
||||||
|
///
|
||||||
|
/// 拉起语义：`entries[0]` 作为主面板，其余依次以分屏面板加入
|
||||||
|
/// （受 `layout.maxPanes` 上限约束，超过 4 个的条目被忽略——
|
||||||
|
/// WebGL 上下文上限决定了可见面板不可能超过 4，见 useSessionStream 说明）。
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase", default)]
|
||||||
|
pub struct SessionTemplate {
|
||||||
|
pub id: String,
|
||||||
|
pub name: String,
|
||||||
|
/// 创建时间（Unix 毫秒；模板列表按此排序）
|
||||||
|
pub created_at: u64,
|
||||||
|
pub entries: Vec<TemplateEntry>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for SessionTemplate {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
id: String::new(),
|
||||||
|
name: String::new(),
|
||||||
|
created_at: 0,
|
||||||
|
entries: Vec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 模板中的一个会话条目。
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase", default)]
|
||||||
|
pub struct TemplateEntry {
|
||||||
|
/// `"local"`（shell）| `"ssh"`（主机）
|
||||||
|
pub kind: String,
|
||||||
|
/// 本地 = shell id；SSH = host id。拉起时实时解析——
|
||||||
|
/// 模板只存引用，不快照账号密码（那些在凭据管理器里按 id 存取）。
|
||||||
|
pub target_id: String,
|
||||||
|
/// 保存时的展示名快照（仅用于模板列表显示；target 失效时前端据此标注）
|
||||||
|
pub label: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for TemplateEntry {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
kind: "local".to_string(),
|
||||||
|
target_id: String::new(),
|
||||||
|
label: String::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 默认终端内快捷键。
|
||||||
|
///
|
||||||
|
/// 键位选择依据（Windows Terminal 惯例 + 与项目既有全局快捷键避让）：
|
||||||
|
/// - 复制粘贴用 `Ctrl+Shift+C/V` 而**不是** `Ctrl+C/V`：`Ctrl+C` 在终端里必须是
|
||||||
|
/// SIGINT，任何对它做复制映射的设计都会破坏 `^C` 中断，这是不可接受的。
|
||||||
|
/// - 新建/关闭标签用 `Ctrl+Shift+T/W`，与浏览器习惯一致。
|
||||||
|
/// - 跳转标签用 `Alt+1..9`：`Ctrl+数字` 已被翻译模块的 `Ctrl+2`（翻译面板）占用，
|
||||||
|
/// 而 `Alt+数字` 在终端里通常不产生控制字符，冲突面最小。
|
||||||
|
/// - `newDetachedWindow`（`Ctrl+3`）是这张表里唯一**全局**生效的一条：它由前端
|
||||||
|
/// `TerminalQuickLaunch` 注册成系统级热键（任意应用前台可触发），放在这里只为
|
||||||
|
/// 跟着终端设置一起存与改。`Ctrl+2` 已被翻译面板占用，`Ctrl+3` 是空闲的相邻键位。
|
||||||
|
pub fn default_shortcuts() -> Vec<ShortcutBinding> {
|
||||||
|
let pairs: &[(&str, &str)] = &[
|
||||||
|
("copy", "Ctrl+Shift+C"),
|
||||||
|
("paste", "Ctrl+Shift+V"),
|
||||||
|
("newTab", "Ctrl+Shift+T"),
|
||||||
|
("closeTab", "Ctrl+Shift+W"),
|
||||||
|
("nextTab", "Ctrl+Tab"),
|
||||||
|
("prevTab", "Ctrl+Shift+Tab"),
|
||||||
|
("splitRight", "Ctrl+Shift+D"),
|
||||||
|
("splitDown", "Ctrl+Shift+E"),
|
||||||
|
("closePane", "Ctrl+Shift+Q"),
|
||||||
|
("search", "Ctrl+Shift+F"),
|
||||||
|
("clear", "Ctrl+Shift+K"),
|
||||||
|
("fontIncrease", "Ctrl+="),
|
||||||
|
("fontDecrease", "Ctrl+-"),
|
||||||
|
("fontReset", "Ctrl+0"),
|
||||||
|
("toggleSftp", "Ctrl+Shift+P"),
|
||||||
|
("snippets", "Ctrl+Shift+S"),
|
||||||
|
// 历史用 H（History）。不与 `Ctrl+Shift+H`（替换）冲突 ——
|
||||||
|
// 终端里没有「替换」这个动作。
|
||||||
|
("history", "Ctrl+Shift+H"),
|
||||||
|
("renameTab", "F2"),
|
||||||
|
("sessionSwitcher", "Ctrl+Shift+O"),
|
||||||
|
// 把当前会话放到独立窗口。**必须列在这里**：`heal()` 只保留默认表里出现过的
|
||||||
|
// action（未知 action 会被剔除），前端设置表里有而这里没有 = 用户改完下次启动就被清掉。
|
||||||
|
("detachWindow", "Ctrl+Shift+N"),
|
||||||
|
// 全局生效的一条（见上方说明）：新建独立窗口 + 选择会话
|
||||||
|
("newDetachedWindow", "Ctrl+3"),
|
||||||
|
];
|
||||||
|
pairs
|
||||||
|
.iter()
|
||||||
|
.map(|(action, keys)| ShortcutBinding {
|
||||||
|
action: action.to_string(),
|
||||||
|
keys: keys.to_string(),
|
||||||
|
enabled: true,
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TerminalSettings {
|
||||||
|
/// 按 id 找主机。
|
||||||
|
pub fn host(&self, id: &str) -> Option<&SshHost> {
|
||||||
|
self.hosts.iter().find(|h| h.id == id)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 按 id 找 Shell。
|
||||||
|
pub fn shell(&self, id: &str) -> Option<&ShellProfile> {
|
||||||
|
self.shells.iter().find(|s| s.id == id)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 自愈：修复失效引用、补齐缺失的默认值、推进结构版本。
|
||||||
|
///
|
||||||
|
/// 沿用 translate 模块确立的 `heal()` 约定：老配置缺字段取默认值，
|
||||||
|
/// 失效引用自动回落，返回是否发生变更（由调用方决定是否落盘）。
|
||||||
|
pub fn heal(&mut self) -> bool {
|
||||||
|
let mut changed = false;
|
||||||
|
|
||||||
|
// 配色主题：只认前端 `terminalThemes.ts` 里存在的 key。
|
||||||
|
// 早期默认值是 `thing-dark`（一套从未实现的主题），解析时会静默回落到
|
||||||
|
// vscode-dark，用户看到的是「选了主题不生效」。未知 key 一律收敛到
|
||||||
|
// 「system」（跟随主应用）—— 它至少是用户能预期的行为。
|
||||||
|
const THEMES: &[&str] = &[
|
||||||
|
"vscode-dark",
|
||||||
|
"vscode-light",
|
||||||
|
"solarized-dark",
|
||||||
|
"solarized-light",
|
||||||
|
"dracula",
|
||||||
|
"one-dark",
|
||||||
|
"system",
|
||||||
|
];
|
||||||
|
if !THEMES.contains(&self.appearance.theme.as_str()) {
|
||||||
|
self.appearance.theme = "system".to_string();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 快捷键表：补齐新增动作、剔除已废弃动作。用户改过的键位保留。
|
||||||
|
let defaults = default_shortcuts();
|
||||||
|
for d in &defaults {
|
||||||
|
if !self.shortcuts.iter().any(|s| s.action == d.action) {
|
||||||
|
self.shortcuts.push(d.clone());
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let before = self.shortcuts.len();
|
||||||
|
// 只保留默认表里存在的 action，避免版本升级后残留无人消费的绑定
|
||||||
|
self.shortcuts
|
||||||
|
.retain(|s| defaults.iter().any(|d| d.action == s.action));
|
||||||
|
if self.shortcuts.len() != before {
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 主机的 key_id 指向已删除的密钥 → 清空并退回密码认证的提示由前端给，
|
||||||
|
// 这里只做数据层清理（不回退 auth_method，避免静默改变用户的认证选择）
|
||||||
|
let key_ids: Vec<String> = self.keys.iter().map(|k| k.id.clone()).collect();
|
||||||
|
for host in &mut self.hosts {
|
||||||
|
if !host.key_id.is_empty() && !key_ids.contains(&host.key_id) {
|
||||||
|
host.key_id.clear();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 主机字段兜底：端口非法、用户名缺失等由前端表单保证，这里只防越界
|
||||||
|
for host in &mut self.hosts {
|
||||||
|
if host.port == 0 {
|
||||||
|
host.port = 22;
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if host.connect_timeout_ms < 1000 {
|
||||||
|
host.connect_timeout_ms = 15_000;
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if host.encoding.trim().is_empty() {
|
||||||
|
host.encoding = "utf-8".to_string();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 外观：滚动缓冲与字体大小越界会直接导致渲染异常
|
||||||
|
if self.appearance.scrollback < 100 {
|
||||||
|
self.appearance.scrollback = 10_000;
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if self.appearance.scrollback > 200_000 {
|
||||||
|
self.appearance.scrollback = 200_000;
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
if self.appearance.font_size < 8 || self.appearance.font_size > 40 {
|
||||||
|
self.appearance.font_size = 14;
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 布局：分屏上限封顶 4
|
||||||
|
if self.layout.max_panes == 0 || self.layout.max_panes > 4 {
|
||||||
|
self.layout.max_panes = 4;
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 安全：主机密钥策略只有一个合法取值（见 SecuritySettings 的字段说明）。
|
||||||
|
// 手工改过的配置在这里收敛回 "ask"，与 `check_server_key` 里
|
||||||
|
// 「未知取值按 ask 处理」构成两道保险：这道修数据，那道防空。
|
||||||
|
if self.security.host_key_policy != "ask" {
|
||||||
|
self.security.host_key_policy = "ask".to_string();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// last_shell_id 指向已删除的 Shell → 清空，由前端选第一个可用
|
||||||
|
if !self.last_shell_id.is_empty() && self.shell(&self.last_shell_id).is_none() {
|
||||||
|
self.last_shell_id.clear();
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if self.version < 1 {
|
||||||
|
self.version = 1;
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// v2：引入命令片段库。给**空库**塞一批起步片段 ——
|
||||||
|
// 一个空片段面板对着用户等于没有这个功能，而「自己写第一条」的门槛
|
||||||
|
// 比「改一条现成的」高得多。只在空库时注入，用户删光后不会被重塞。
|
||||||
|
if self.version < 2 {
|
||||||
|
if self.snippets.is_empty() {
|
||||||
|
self.snippets = default_snippets();
|
||||||
|
}
|
||||||
|
self.version = 2;
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
changed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 起步命令片段。
|
||||||
|
///
|
||||||
|
/// 选取标准：**跨平台通用、参数化后确有复用价值、且不容易打错**的东西。
|
||||||
|
/// 刻意不放 `ls`/`cd` 这类过短命令 —— 它们手打比在列表里找更快，
|
||||||
|
/// 放进片段库只会稀释信噪比。
|
||||||
|
pub fn default_snippets() -> Vec<CommandSnippet> {
|
||||||
|
fn mk(
|
||||||
|
id: &str,
|
||||||
|
name: &str,
|
||||||
|
command: &str,
|
||||||
|
description: &str,
|
||||||
|
group: &str,
|
||||||
|
placeholders: &[(&str, &str)],
|
||||||
|
ssh_only: bool,
|
||||||
|
confirm: bool,
|
||||||
|
) -> CommandSnippet {
|
||||||
|
CommandSnippet {
|
||||||
|
id: id.to_string(),
|
||||||
|
name: name.to_string(),
|
||||||
|
command: command.to_string(),
|
||||||
|
description: description.to_string(),
|
||||||
|
group: group.to_string(),
|
||||||
|
defaults: placeholders
|
||||||
|
.iter()
|
||||||
|
.map(|(k, v)| (k.to_string(), v.to_string()))
|
||||||
|
.collect(),
|
||||||
|
shell_kinds: Vec::new(),
|
||||||
|
ssh_only,
|
||||||
|
confirm,
|
||||||
|
pinned: false,
|
||||||
|
created_at: 0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
vec![
|
||||||
|
mk(
|
||||||
|
"snip-find-large",
|
||||||
|
"查找大文件",
|
||||||
|
"find ${dir} -type f -size +${size} -exec ls -lh {} \\;",
|
||||||
|
"列出指定目录下大于指定体积的文件。size 用 100M / 1G 这类写法。",
|
||||||
|
"文件",
|
||||||
|
&[("dir", "/"), ("size", "100M")],
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
),
|
||||||
|
mk(
|
||||||
|
"snip-grep-recursive",
|
||||||
|
"递归搜索内容",
|
||||||
|
"grep -rn --include=${pattern} '${keyword}' ${dir}",
|
||||||
|
"在指定目录下按文件名模式递归搜索关键字。",
|
||||||
|
"文件",
|
||||||
|
&[("pattern", "*.log"), ("keyword", ""), ("dir", ".")],
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
),
|
||||||
|
mk(
|
||||||
|
"snip-tar-extract",
|
||||||
|
"解压 tar.gz",
|
||||||
|
"tar -xzvf ${file} -C ${target}",
|
||||||
|
"解压到指定目录。target 留空则解到当前目录。",
|
||||||
|
"文件",
|
||||||
|
&[("file", ""), ("target", ".")],
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
),
|
||||||
|
mk(
|
||||||
|
"snip-df",
|
||||||
|
"磁盘占用概览",
|
||||||
|
"df -h | sort -k5 -hr | head -20",
|
||||||
|
"按使用率倒序列出挂载点。排查「磁盘满了」的第一步。",
|
||||||
|
"诊断",
|
||||||
|
&[],
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
),
|
||||||
|
mk(
|
||||||
|
"snip-port-owner",
|
||||||
|
"查端口占用",
|
||||||
|
"ss -tlnp | grep ${port}",
|
||||||
|
"查看监听指定端口的进程。老系统若无 ss，改用 netstat -tlnp。",
|
||||||
|
"诊断",
|
||||||
|
&[("port", "8080")],
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
),
|
||||||
|
mk(
|
||||||
|
"snip-top-cpu",
|
||||||
|
"CPU 占用前 10",
|
||||||
|
"ps aux --sort=-%cpu | head -11",
|
||||||
|
"按 CPU 占用倒序列出进程（含表头共 11 行）。",
|
||||||
|
"诊断",
|
||||||
|
&[],
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
),
|
||||||
|
mk(
|
||||||
|
"snip-tail-follow",
|
||||||
|
"跟踪日志",
|
||||||
|
"tail -f ${file}",
|
||||||
|
"实时跟随文件新增内容。Ctrl+C 退出。",
|
||||||
|
"运维",
|
||||||
|
&[("file", "")],
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
),
|
||||||
|
mk(
|
||||||
|
"snip-systemd-status",
|
||||||
|
"服务状态",
|
||||||
|
"systemctl status ${service} --no-pager",
|
||||||
|
"查看 systemd 服务状态。--no-pager 让输出直接落到终端而不是进 less。",
|
||||||
|
"运维",
|
||||||
|
&[("service", "")],
|
||||||
|
true,
|
||||||
|
false,
|
||||||
|
),
|
||||||
|
mk(
|
||||||
|
"snip-perm-fix",
|
||||||
|
"递归修正属主",
|
||||||
|
"chown -R ${owner}:${group} ${dir}",
|
||||||
|
"递归修改目录属主与属组。",
|
||||||
|
"运维",
|
||||||
|
&[("owner", ""), ("group", ""), ("dir", "")],
|
||||||
|
true,
|
||||||
|
true,
|
||||||
|
),
|
||||||
|
mk(
|
||||||
|
"snip-ssh-tunnel",
|
||||||
|
"建立 SSH 隧道",
|
||||||
|
"ssh -N -L ${localPort}:${remoteHost}:${remotePort} ${user}@${jumpHost}",
|
||||||
|
"本地端口转发。localPort 是你要在本机访问的端口。",
|
||||||
|
"网络",
|
||||||
|
&[
|
||||||
|
("localPort", "8080"),
|
||||||
|
("remoteHost", "127.0.0.1"),
|
||||||
|
("remotePort", "80"),
|
||||||
|
("user", ""),
|
||||||
|
("jumpHost", ""),
|
||||||
|
],
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
),
|
||||||
|
mk(
|
||||||
|
"snip-ssh-keygen",
|
||||||
|
"生成 SSH 密钥",
|
||||||
|
"ssh-keygen -t ed25519 -C \"${comment}\" -f ~/.ssh/${name}",
|
||||||
|
"生成 ed25519 密钥对。ed25519 比 RSA 短且更快，现代环境首选。",
|
||||||
|
"网络",
|
||||||
|
&[("comment", ""), ("name", "id_ed25519")],
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
),
|
||||||
|
]
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,475 @@
|
|||||||
|
//! 端口转发引擎（P2）：`-L` 本地转发与 `-R` 远程转发。
|
||||||
|
//!
|
||||||
|
//! # 两个方向的管线
|
||||||
|
//!
|
||||||
|
//! **-L（本地转发）**：本机开 `TcpListener`，每来一条连接就在 SSH 会话上开一条
|
||||||
|
//! `direct-tcpip` 通道指向目标，然后 `copy_bidirectional` 对拷：
|
||||||
|
//!
|
||||||
|
//! ```text
|
||||||
|
//! 本地应用 ──TCP──▶ TcpListener ──▶ direct-tcpip 通道 ──▶ 服务器 ──▶ target_host:port
|
||||||
|
//! ```
|
||||||
|
//!
|
||||||
|
//! **-R（远程转发）**：通过 `handle.tcpip_forward()` 请求**服务器**监听；
|
||||||
|
//! 服务器侧来连接时，russh 在 Handler 的
|
||||||
|
//! `server_channel_open_forwarded_tcpip` 回调里把通道交给我们，由我们连到目标：
|
||||||
|
//!
|
||||||
|
//! ```text
|
||||||
|
//! 远端访问者 ──▶ 服务器:bind_port ──forwarded-tcpip 通道──▶ 本机 ──TCP──▶ target_host:port
|
||||||
|
//! ```
|
||||||
|
//!
|
||||||
|
//! # 生命周期与所有权
|
||||||
|
//!
|
||||||
|
//! 转发规则挂在**会话**上（不持久化）：会话关闭 = 全部转发消失，
|
||||||
|
//! 这与 ssh 客户端的直觉一致（连接断开转发即失效）。
|
||||||
|
//! `-L` 的监听任务句柄存进注册表，remove 时 `abort()` 释放端口；
|
||||||
|
//! `-R` 无本地任务（通道由 Handler 回调驱动），remove 时发 `cancel_tcpip_forward`。
|
||||||
|
//!
|
||||||
|
//! # 安全默认
|
||||||
|
//!
|
||||||
|
//! russh 对 `forwarded-tcpip` 通道的默认处理是**全部接受**——意味着只要服务器
|
||||||
|
//! 愿意，任何一条 forwarded 通道都会被接受并挂起等数据。本模块的 Handler
|
||||||
|
//! 覆写为**白名单匹配**：只有注册过的 `-R` 规则（按监听端口）才放行，其余拒绝。
|
||||||
|
//!
|
||||||
|
//! # 已知取舍
|
||||||
|
//!
|
||||||
|
//! - `-D`（SOCKS5 动态转发）不在本模块：需要实现 SOCKS5 握手协议，独立成项再做；
|
||||||
|
//! - 转发规则不持久化：每次连接后按需添加。若后续要「主机级自动转发」，
|
||||||
|
//! 在主机配置里存模板并在会话 Established 后逐条调 `add_local`/`add_remote` 即可。
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::sync::{Mutex, OnceLock};
|
||||||
|
|
||||||
|
use serde::Serialize;
|
||||||
|
use specta::Type;
|
||||||
|
|
||||||
|
use super::{Channel, Msg, SshInner};
|
||||||
|
use super::super::session::now_millis;
|
||||||
|
|
||||||
|
/// 转发规则视图（发往前端）。
|
||||||
|
#[derive(Debug, Clone, Serialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct ForwardView {
|
||||||
|
pub id: String,
|
||||||
|
/// `"local"`（-L）| `"remote"`（-R）
|
||||||
|
pub kind: String,
|
||||||
|
/// -L：本机监听地址；-R：**服务器端**监听地址
|
||||||
|
pub bind_host: String,
|
||||||
|
pub bind_port: u16,
|
||||||
|
/// -L：从**服务器**视角要连接的目标；-R：从**服务器**视角连接的目标
|
||||||
|
pub target_host: String,
|
||||||
|
pub target_port: u16,
|
||||||
|
/// `"active"` | `"error"`
|
||||||
|
pub status: String,
|
||||||
|
/// 人类可读状态（实际监听地址 / 错误原因）
|
||||||
|
pub detail: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 注册表条目。
|
||||||
|
pub(crate) struct ForwardEntry {
|
||||||
|
pub rule: ForwardView,
|
||||||
|
/// `-L` 的监听循环任务（remove 时 abort 以释放端口）；`-R` 为 None。
|
||||||
|
pub task: Option<tauri::async_runtime::JoinHandle<()>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 会话 → (转发 id → 条目)。
|
||||||
|
///
|
||||||
|
/// 全局静态表的理由与 `PENDING_HOST_KEYS` 相同：转发管道任务的 spawn 点
|
||||||
|
/// 分散在命令层与 Handler 回调里，拿不到统一的会话对象引用。
|
||||||
|
/// 键直接用 `String`（`SessionId` 是它的别名，此处不依赖别名语义）。
|
||||||
|
static REGISTRY: OnceLock<Mutex<HashMap<String, HashMap<String, ForwardEntry>>>> =
|
||||||
|
OnceLock::new();
|
||||||
|
|
||||||
|
fn registry() -> &'static Mutex<HashMap<String, HashMap<String, ForwardEntry>>> {
|
||||||
|
REGISTRY.get_or_init(|| Mutex::new(HashMap::new()))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn next_id() -> String {
|
||||||
|
format!("fw{}", now_millis())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 列出某会话的全部转发规则。
|
||||||
|
pub fn list_for_session(session_id: &str) -> Vec<ForwardView> {
|
||||||
|
registry()
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.get(session_id)
|
||||||
|
.map(|m| m.values().map(|e| e.rule.clone()).collect())
|
||||||
|
.unwrap_or_default()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Handler 回调用：按监听端口做**全局**匹配 `-R` 规则。
|
||||||
|
///
|
||||||
|
/// # 为什么是全局而不是按会话
|
||||||
|
///
|
||||||
|
/// P2 连接复用之后，入站的 forwarded-tcpip 通道总是从**连接级** Handler
|
||||||
|
/// 回调进来，而该 Handler 的 session_id 属于**第一个**建立连接的会话；
|
||||||
|
/// 第二个会话添加的 -R 规则若只查自己的 session_id 就永远匹配不上。
|
||||||
|
/// 端口的全局唯一性在 `add_remote` 时已强制（重复绑定端口被拒绝），
|
||||||
|
/// 因此这里按端口全局查找是安全的。
|
||||||
|
///
|
||||||
|
/// 返回 `(规则所属会话 id, 目标主机, 目标端口)`；无匹配 = 服务器来了一条
|
||||||
|
/// 没有对应规则的转发连接，调用方应拒绝。
|
||||||
|
pub(crate) fn match_remote_rule(connected_port: u32) -> Option<(String, String, u16)> {
|
||||||
|
let reg = registry().lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
for entries in reg.values() {
|
||||||
|
for e in entries.values() {
|
||||||
|
if e.rule.kind == "remote"
|
||||||
|
&& e.rule.status == "active"
|
||||||
|
&& e.rule.bind_port as u32 == connected_port
|
||||||
|
{
|
||||||
|
return Some((
|
||||||
|
e.rule.id.clone(),
|
||||||
|
e.rule.target_host.clone(),
|
||||||
|
e.rule.target_port,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 检查远程监听端口是否已被（任何会话的）规则占用。
|
||||||
|
///
|
||||||
|
/// 共享连接下两个会话各自 -R 同一端口会让路由产生歧义，必须在添加时拒绝。
|
||||||
|
pub(crate) fn remote_port_taken(bind_port: u16) -> bool {
|
||||||
|
let reg = registry().lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
reg.values().any(|entries| {
|
||||||
|
entries.values().any(|e| {
|
||||||
|
e.rule.kind == "remote" && e.rule.status == "active" && e.rule.bind_port == bind_port
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 标记规则出错（如 `-L` 监听套接字意外失效）。
|
||||||
|
fn mark_error(session_id: &str, forward_id: &str, detail: String) {
|
||||||
|
if let Some(e) = registry()
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|x| x.into_inner())
|
||||||
|
.get_mut(session_id)
|
||||||
|
.and_then(|m| m.get_mut(forward_id))
|
||||||
|
{
|
||||||
|
e.rule.status = "error".to_string();
|
||||||
|
e.rule.detail = detail;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 添加 `-L` 本地转发。
|
||||||
|
///
|
||||||
|
/// 先 `bind` 再 spawn：端口被占用时**立刻**报错返回（fail-fast），
|
||||||
|
/// 而不是存了一条永远没有流量的死规则。
|
||||||
|
pub async fn add_local(
|
||||||
|
session_id: &str,
|
||||||
|
inner: std::sync::Arc<SshInner>,
|
||||||
|
bind_host: &str,
|
||||||
|
bind_port: u16,
|
||||||
|
target_host: &str,
|
||||||
|
target_port: u16,
|
||||||
|
) -> Result<ForwardView, String> {
|
||||||
|
let listener = tokio::net::TcpListener::bind((bind_host, bind_port))
|
||||||
|
.await
|
||||||
|
.map_err(|e| {
|
||||||
|
format!(
|
||||||
|
"监听 {bind_host}:{bind_port} 失败: {e}。常见原因：端口已被其他程序占用。"
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
let actual = listener
|
||||||
|
.local_addr()
|
||||||
|
.map(|a| a.to_string())
|
||||||
|
.unwrap_or_else(|_| format!("{bind_host}:{bind_port}"));
|
||||||
|
|
||||||
|
let view = ForwardView {
|
||||||
|
id: next_id(),
|
||||||
|
kind: "local".to_string(),
|
||||||
|
bind_host: bind_host.to_string(),
|
||||||
|
bind_port,
|
||||||
|
target_host: target_host.to_string(),
|
||||||
|
target_port,
|
||||||
|
status: "active".to_string(),
|
||||||
|
detail: format!("本机监听 {actual}"),
|
||||||
|
};
|
||||||
|
|
||||||
|
let sid = session_id.to_string();
|
||||||
|
let target = target_host.to_string();
|
||||||
|
let fw_id = view.id.clone();
|
||||||
|
let task = tauri::async_runtime::spawn(async move {
|
||||||
|
local_accept_loop(&sid, &fw_id, listener, inner, &target, target_port).await;
|
||||||
|
});
|
||||||
|
|
||||||
|
registry()
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.entry(session_id.to_string())
|
||||||
|
.or_default()
|
||||||
|
.insert(
|
||||||
|
view.id.clone(),
|
||||||
|
ForwardEntry {
|
||||||
|
rule: view.clone(),
|
||||||
|
task: Some(task),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
Ok(view)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `-L` 的接受循环：每条连接开一条独立 `direct-tcpip` 通道。
|
||||||
|
///
|
||||||
|
/// 通道开启用 sftp 同款的 `spawn_blocking + block_on` 模式借出
|
||||||
|
/// `Mutex` 里的 `Handle`（不可克隆、不能跨 `.await` 持锁）——
|
||||||
|
/// 每条连接只占用阻塞线程一个 RTT，数据对拷是纯异步的。
|
||||||
|
async fn local_accept_loop(
|
||||||
|
session_id: &str,
|
||||||
|
forward_id: &str,
|
||||||
|
listener: tokio::net::TcpListener,
|
||||||
|
inner: std::sync::Arc<SshInner>,
|
||||||
|
target_host: &str,
|
||||||
|
target_port: u16,
|
||||||
|
) {
|
||||||
|
loop {
|
||||||
|
let accepted = listener.accept().await;
|
||||||
|
let (tcp, peer) = match accepted {
|
||||||
|
Ok(v) => v,
|
||||||
|
Err(e) => {
|
||||||
|
// 监听套接字级错误（极少见，如句柄耗尽）：标记错误并退出循环，
|
||||||
|
// 端口随即释放，前端列表里能看到 status 变为 error
|
||||||
|
mark_error(
|
||||||
|
session_id,
|
||||||
|
forward_id,
|
||||||
|
format!("监听异常，转发已停止: {e}"),
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let inner = inner.clone();
|
||||||
|
let target = target_host.to_string();
|
||||||
|
let peer_ip = peer.ip().to_string();
|
||||||
|
let peer_port = peer.port();
|
||||||
|
let target_port_u32 = target_port as u32;
|
||||||
|
tauri::async_runtime::spawn(async move {
|
||||||
|
match open_direct_tcpip(&inner, &target, target_port_u32, &peer_ip, peer_port).await {
|
||||||
|
Ok(channel) => {
|
||||||
|
// 通道转成流后与本地 TCP 对拷；任一侧关闭即结束
|
||||||
|
let mut ch = channel.into_stream();
|
||||||
|
let mut tcp = tcp;
|
||||||
|
if let Err(e) = tokio::io::copy_bidirectional(&mut ch, &mut tcp).await {
|
||||||
|
crate::logger::log_warn(
|
||||||
|
"terminal",
|
||||||
|
&format!("转发数据管道中断（{peer}）: {e}"),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
// 开通道失败：直接 drop 本地 TCP，让发起方立刻看到连接被断开，
|
||||||
|
// 而不是挂死等超时
|
||||||
|
crate::logger::log_warn(
|
||||||
|
"terminal",
|
||||||
|
&format!("转发开通道失败（{peer} → {target}:{target_port_u32}）: {e}"),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 在 SSH 会话上开一条 `direct-tcpip` 通道（sftp 同款的借锁模式）。
|
||||||
|
async fn open_direct_tcpip(
|
||||||
|
inner: &std::sync::Arc<SshInner>,
|
||||||
|
host: &str,
|
||||||
|
port: u32,
|
||||||
|
originator_ip: &str,
|
||||||
|
originator_port: u16,
|
||||||
|
) -> Result<Channel<Msg>, String> {
|
||||||
|
let inner = inner.clone();
|
||||||
|
let host = host.to_string();
|
||||||
|
let originator_ip = originator_ip.to_string();
|
||||||
|
tokio::task::spawn_blocking(move || {
|
||||||
|
let rt = tokio::runtime::Handle::current();
|
||||||
|
rt.block_on(async {
|
||||||
|
// 槽位为 tokio Mutex（P2 连接复用）：锁的获取也放进 block_on
|
||||||
|
let guard = inner.handle.lock().await;
|
||||||
|
let handle = guard
|
||||||
|
.as_ref()
|
||||||
|
.ok_or_else(|| "SSH 会话已断开，转发不可用".to_string())?;
|
||||||
|
handle
|
||||||
|
.channel_open_direct_tcpip(host, port, originator_ip, originator_port as u32)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("打开转发通道失败: {e}"))
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("转发任务异常: {e}"))?
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 添加 `-R` 远程转发。
|
||||||
|
///
|
||||||
|
/// 请求**服务器**在 `bind_host:bind_port` 监听；后续连接经
|
||||||
|
/// `server_channel_open_forwarded_tcpip` 回调回到本机（见 Handler 覆写）。
|
||||||
|
pub async fn add_remote(
|
||||||
|
session_id: &str,
|
||||||
|
inner: &std::sync::Arc<SshInner>,
|
||||||
|
bind_host: &str,
|
||||||
|
bind_port: u16,
|
||||||
|
target_host: &str,
|
||||||
|
target_port: u16,
|
||||||
|
) -> Result<ForwardView, String> {
|
||||||
|
// 共享连接下监听端口是**全局**资源：另一个会话已用同一端口时，
|
||||||
|
// 入站路由无法区分归属，必须在添加时拒绝而不是静默错乱
|
||||||
|
if remote_port_taken(bind_port) {
|
||||||
|
return Err(format!(
|
||||||
|
"远程监听端口 {bind_port} 已被占用（可能是其他会话的远程转发）"
|
||||||
|
));
|
||||||
|
}
|
||||||
|
request_remote_listen(inner, bind_host, bind_port).await?;
|
||||||
|
|
||||||
|
let view = ForwardView {
|
||||||
|
id: next_id(),
|
||||||
|
kind: "remote".to_string(),
|
||||||
|
bind_host: bind_host.to_string(),
|
||||||
|
bind_port,
|
||||||
|
target_host: target_host.to_string(),
|
||||||
|
target_port,
|
||||||
|
status: "active".to_string(),
|
||||||
|
detail: format!("服务器监听 {bind_host}:{bind_port}"),
|
||||||
|
};
|
||||||
|
|
||||||
|
registry()
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.entry(session_id.to_string())
|
||||||
|
.or_default()
|
||||||
|
.insert(
|
||||||
|
view.id.clone(),
|
||||||
|
ForwardEntry {
|
||||||
|
rule: view.clone(),
|
||||||
|
task: None,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
Ok(view)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 请求服务器开始监听（`tcpip_forward`）。
|
||||||
|
async fn request_remote_listen(
|
||||||
|
inner: &std::sync::Arc<SshInner>,
|
||||||
|
bind_host: &str,
|
||||||
|
bind_port: u16,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let inner = inner.clone();
|
||||||
|
let host = bind_host.to_string();
|
||||||
|
tokio::task::spawn_blocking(move || {
|
||||||
|
let rt = tokio::runtime::Handle::current();
|
||||||
|
rt.block_on(async {
|
||||||
|
// 槽位为 tokio Mutex（P2 连接复用）：锁的获取也放进 block_on
|
||||||
|
let guard = inner.handle.lock().await;
|
||||||
|
let handle = guard
|
||||||
|
.as_ref()
|
||||||
|
.ok_or_else(|| "SSH 会话已断开，无法建立远程转发".to_string())?;
|
||||||
|
// 返回值是服务器确认的绑定端口（u32）；我们只关心成败
|
||||||
|
handle
|
||||||
|
.tcpip_forward(&host, bind_port as u32)
|
||||||
|
.await
|
||||||
|
.map(|_| ())
|
||||||
|
.map_err(|e| {
|
||||||
|
format!(
|
||||||
|
"服务器拒绝在 {host}:{bind_port} 监听: {e}。\
|
||||||
|
常见原因：端口已被占用、或服务器禁用了 TCP 转发（AllowTcpForwarding no）。"
|
||||||
|
)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("转发任务异常: {e}"))?
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 删除一条转发。
|
||||||
|
///
|
||||||
|
/// `-L`：abort 监听任务（端口立即释放）；`-R`：向服务器发 `cancel_tcpip_forward`
|
||||||
|
/// （服务器停止监听；已建立的连接自然消亡）。
|
||||||
|
pub async fn remove(
|
||||||
|
inner: &std::sync::Arc<SshInner>,
|
||||||
|
session_id: &str,
|
||||||
|
forward_id: &str,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let removed = registry()
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.get_mut(session_id)
|
||||||
|
.and_then(|m| m.remove(forward_id));
|
||||||
|
let Some(entry) = removed else {
|
||||||
|
return Err(format!("转发规则 {forward_id} 不存在"));
|
||||||
|
};
|
||||||
|
|
||||||
|
if let Some(task) = entry.task {
|
||||||
|
task.abort(); // `-L`：监听循环停止，端口释放
|
||||||
|
} else if entry.rule.kind == "remote" {
|
||||||
|
// `-R`：取消服务器端监听。失败不阻断（会话断开时服务器也会清理），
|
||||||
|
// 但要记日志——否则「删了还在监听」的问题无从排查
|
||||||
|
let inner = inner.clone();
|
||||||
|
let host = entry.rule.bind_host.clone();
|
||||||
|
let port = entry.rule.bind_port;
|
||||||
|
let r = tokio::task::spawn_blocking(move || {
|
||||||
|
let rt = tokio::runtime::Handle::current();
|
||||||
|
rt.block_on(async {
|
||||||
|
let guard = inner.handle.lock().await;
|
||||||
|
let Some(handle) = guard.as_ref() else {
|
||||||
|
return Ok(());
|
||||||
|
};
|
||||||
|
handle.cancel_tcpip_forward(&host, port as u32).await
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("转发任务异常: {e}"));
|
||||||
|
match r {
|
||||||
|
Ok(Ok(())) => {}
|
||||||
|
Ok(Err(e)) => crate::logger::log_warn(
|
||||||
|
"terminal",
|
||||||
|
&format!("取消远程转发 {}:{} 失败（会话断开时会自动清理）: {e}", entry.rule.bind_host, port),
|
||||||
|
),
|
||||||
|
Err(e) => crate::logger::log_warn("terminal", &format!("取消远程转发任务异常: {e}")),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 会话关闭时的清理：abort 全部 `-L` 任务并清空条目。
|
||||||
|
///
|
||||||
|
/// `-R` 不需要显式 cancel：SSH 会话断开时服务器会停掉该会话的所有监听。
|
||||||
|
pub fn cleanup_session(session_id: &str) {
|
||||||
|
if let Some(m) = registry()
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.remove(session_id)
|
||||||
|
{
|
||||||
|
for (_, entry) in m {
|
||||||
|
if let Some(task) = entry.task {
|
||||||
|
task.abort();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Handler 回调里的管道任务：`forwarded-tcpip` 通道 → 本机目标。
|
||||||
|
///
|
||||||
|
/// 供 `ssh/mod.rs` 的 `server_channel_open_forwarded_tcpip` 覆写调用。
|
||||||
|
pub(crate) fn pipe_forwarded_channel(
|
||||||
|
channel: Channel<Msg>,
|
||||||
|
target_host: String,
|
||||||
|
target_port: u16,
|
||||||
|
) {
|
||||||
|
tauri::async_runtime::spawn(async move {
|
||||||
|
match tokio::net::TcpStream::connect((target_host.as_str(), target_port)).await {
|
||||||
|
Ok(mut tcp) => {
|
||||||
|
let mut ch = channel.into_stream();
|
||||||
|
if let Err(e) = tokio::io::copy_bidirectional(&mut ch, &mut tcp).await {
|
||||||
|
crate::logger::log_warn(
|
||||||
|
"terminal",
|
||||||
|
&format!("远程转发管道中断（{target_host}:{target_port}）: {e}"),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
crate::logger::log_warn(
|
||||||
|
"terminal",
|
||||||
|
&format!("远程转发目标 {target_host}:{target_port} 连接失败: {e}"),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -0,0 +1,405 @@
|
|||||||
|
//! 主机密钥库（known_hosts）与指纹校验。
|
||||||
|
//!
|
||||||
|
//! # 为什么自己实现而不是复用 `~/.ssh/known_hosts`
|
||||||
|
//!
|
||||||
|
//! 三个理由：
|
||||||
|
//! 1. **写入冲突**：OpenSSH 的 `known_hosts` 是追加式文本文件，多进程并发写入
|
||||||
|
//! 会互相破坏（这也是为什么 OpenSSH 自己做文件锁）。我们的应用与用户的
|
||||||
|
//! `ssh` 命令行会同时改它。
|
||||||
|
//! 2. **无法表达「拒绝」**：用户在我们的 UI 上选了「不接受」时，OpenSSH 格式里
|
||||||
|
//! 没有对应的记录形态（只能不写，等于下次又问）。
|
||||||
|
//! 3. **需要附加信息**：我们要记「首次见到时间」「上次确认时间」「变更历史」
|
||||||
|
//! 以便审计与提示，这些在 OpenSSH 格式里无处安放。
|
||||||
|
//!
|
||||||
|
//! 因此用自有 JSON 存储，同时**提供导入/导出到 OpenSSH 格式**的能力，
|
||||||
|
//! 让用户的既有记录可以迁移，且不与命令行工具形成两套互不相知的信任库。
|
||||||
|
//!
|
||||||
|
//! # 安全姿态
|
||||||
|
//!
|
||||||
|
//! - 指纹变更**默认阻断**（不是警告）：TOFU 疲劳是 MITM 的主要入口，
|
||||||
|
//! 把它做成一个需要主动点开的红色阻断界面，是这里唯一有效的防御。
|
||||||
|
//! - 超时/未响应 = 拒绝（安全侧默认值）。
|
||||||
|
//! - known_hosts 是**非机密**数据，明文 JSON 存储、可导出、可人工审阅。
|
||||||
|
|
||||||
|
use std::collections::BTreeMap;
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use std::sync::{Mutex, OnceLock};
|
||||||
|
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use specta::Type;
|
||||||
|
|
||||||
|
/// 单条已知主机记录。
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase", default)]
|
||||||
|
pub struct KnownHost {
|
||||||
|
/// 主机地址（不含端口，端口单独存）
|
||||||
|
pub host: String,
|
||||||
|
pub port: u16,
|
||||||
|
/// 密钥算法（如 "ssh-ed25519" / "rsa-sha2-512" / "ssh-rsa"）
|
||||||
|
///
|
||||||
|
/// 同一主机可能有多种算法的密钥（服务器同时提供 ed25519 与 rsa），
|
||||||
|
/// 因此按 (host, port, key_type) 三元组建索引，而不是 (host, port)。
|
||||||
|
pub key_type: String,
|
||||||
|
/// SHA256 指纹（OpenSSH 展示格式，如 `SHA256:Abc...`）
|
||||||
|
pub fingerprint: String,
|
||||||
|
/// 首次见到时间（RFC3339）
|
||||||
|
pub first_seen: String,
|
||||||
|
/// 最近一次确认时间（RFC3339）
|
||||||
|
pub last_confirmed: String,
|
||||||
|
/// 指纹变更历史（最新在前）。
|
||||||
|
///
|
||||||
|
/// 保留历史的价值：用户点「接受新指纹」之后，回看历史能判断这到底是
|
||||||
|
/// 服务器重装（一次性变更）还是持续的中间人（每次都变）。
|
||||||
|
pub history: Vec<FingerprintChange>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase", default)]
|
||||||
|
pub struct FingerprintChange {
|
||||||
|
/// 被替换掉的旧指纹
|
||||||
|
pub old_fingerprint: String,
|
||||||
|
/// 变更发生时间
|
||||||
|
pub changed_at: String,
|
||||||
|
/// 用户是否接受了这次变更
|
||||||
|
pub accepted: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for FingerprintChange {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
old_fingerprint: String::new(),
|
||||||
|
changed_at: String::new(),
|
||||||
|
accepted: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for KnownHost {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
host: String::new(),
|
||||||
|
port: 22,
|
||||||
|
key_type: String::new(),
|
||||||
|
fingerprint: String::new(),
|
||||||
|
first_seen: String::new(),
|
||||||
|
last_confirmed: String::new(),
|
||||||
|
history: Vec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 校验结论。
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub enum Verdict {
|
||||||
|
/// 指纹与记录一致 → 可信，直接放行
|
||||||
|
Trusted,
|
||||||
|
/// 该主机对此算法**没有记录** → 首次连接，需用户确认
|
||||||
|
Unknown,
|
||||||
|
/// 有记录但指纹不同 → 高危，需用户显式确认
|
||||||
|
Changed { previous: String },
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 主机密钥库（内存缓存 + 文件持久化）。
|
||||||
|
struct Store {
|
||||||
|
path: PathBuf,
|
||||||
|
/// `(host, port, key_type)` → 记录
|
||||||
|
entries: BTreeMap<String, KnownHost>,
|
||||||
|
/// 是否需要落盘
|
||||||
|
dirty: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
static STORE: OnceLock<Mutex<Option<Store>>> = OnceLock::new();
|
||||||
|
|
||||||
|
fn store_slot() -> &'static Mutex<Option<Store>> {
|
||||||
|
STORE.get_or_init(|| Mutex::new(None))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 初始化存储路径（应用启动时调用一次）。
|
||||||
|
pub fn init(path: PathBuf) {
|
||||||
|
let mut slot = store_slot().lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
if slot.is_some() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let entries = match std::fs::read_to_string(&path) {
|
||||||
|
Ok(raw) => match serde_json::from_str::<Vec<KnownHost>>(&raw) {
|
||||||
|
Ok(list) => list
|
||||||
|
.into_iter()
|
||||||
|
.map(|h| (key_of(&h.host, h.port, &h.key_type), h))
|
||||||
|
.collect(),
|
||||||
|
Err(e) => {
|
||||||
|
crate::logger::log_error(
|
||||||
|
"terminal",
|
||||||
|
&format!("known_hosts 解析失败（将以空库启动）: {e}"),
|
||||||
|
);
|
||||||
|
BTreeMap::new()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
Err(_) => BTreeMap::new(),
|
||||||
|
};
|
||||||
|
*slot = Some(Store {
|
||||||
|
path,
|
||||||
|
entries,
|
||||||
|
dirty: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
fn key_of(host: &str, port: u16, key_type: &str) -> String {
|
||||||
|
format!("{host}:{port}:{key_type}")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 校验主机密钥。
|
||||||
|
///
|
||||||
|
/// 注意「同主机多算法」的处理：服务器同时提供 ed25519 与 rsa 时，我们按
|
||||||
|
/// `key_type` 分别记录。若用户上次连的是 ed25519、这次服务器（因客户端算法
|
||||||
|
/// 偏好变化）用了 rsa，**不应判为指纹变更**——那是不同算法的两把不同密钥，
|
||||||
|
/// 属于正常情况。因此这里的比对严格限定在同一 key_type 内。
|
||||||
|
pub fn verify(host: &str, port: u16, fingerprint: &str, key_type: &str) -> Verdict {
|
||||||
|
let slot = store_slot().lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
let Some(store) = slot.as_ref() else {
|
||||||
|
// 未初始化：保守起见按「未知」处理，要求用户确认
|
||||||
|
return Verdict::Unknown;
|
||||||
|
};
|
||||||
|
|
||||||
|
// 先查同算法记录
|
||||||
|
if let Some(rec) = store.entries.get(&key_of(host, port, key_type)) {
|
||||||
|
if fingerprints_equal(&rec.fingerprint, fingerprint) {
|
||||||
|
return Verdict::Trusted;
|
||||||
|
}
|
||||||
|
return Verdict::Changed {
|
||||||
|
previous: rec.fingerprint.clone(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// 同算法无记录，但同主机其它算法有记录：说明这个主机我们见过，
|
||||||
|
// 只是这次协商出了不同算法。仍按「未知」处理（要求确认），
|
||||||
|
// 但这是正常现象，日志里降级为 info 而非 warn。
|
||||||
|
let has_other_algo = store
|
||||||
|
.entries
|
||||||
|
.keys()
|
||||||
|
.any(|k| k.starts_with(&format!("{host}:{port}:")));
|
||||||
|
if has_other_algo {
|
||||||
|
crate::logger::log_info(
|
||||||
|
"terminal",
|
||||||
|
&format!("主机 {host}:{port} 提供了新的密钥算法 {key_type}，需确认指纹"),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Verdict::Unknown
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 指纹比较：忽略大小写与前缀差异。
|
||||||
|
///
|
||||||
|
/// SHA256 指纹在不同工具里可能表现为 `SHA256:AbC...` / `AbC...` / 末尾带 `=`，
|
||||||
|
/// 这些差异不该被当作「指纹不同」（那会让用户看到惊悚的变更告警）。
|
||||||
|
fn fingerprints_equal(a: &str, b: &str) -> bool {
|
||||||
|
let norm = |s: &str| {
|
||||||
|
s.trim()
|
||||||
|
.trim_start_matches("SHA256:")
|
||||||
|
.trim_start_matches("MD5:")
|
||||||
|
.trim_end_matches('=')
|
||||||
|
.replace(':', "")
|
||||||
|
.to_lowercase()
|
||||||
|
};
|
||||||
|
norm(a) == norm(b)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 接受并记录指纹（首次或变更后）。
|
||||||
|
pub fn accept(host: &str, port: u16, fingerprint: &str, key_type: &str) -> Result<(), String> {
|
||||||
|
let mut slot = store_slot().lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
let Some(store) = slot.as_mut() else {
|
||||||
|
return Err("known_hosts 存储未初始化".to_string());
|
||||||
|
};
|
||||||
|
|
||||||
|
let k = key_of(host, port, key_type);
|
||||||
|
let now = chrono::Local::now().to_rfc3339();
|
||||||
|
|
||||||
|
match store.entries.get_mut(&k) {
|
||||||
|
Some(rec) => {
|
||||||
|
if !fingerprints_equal(&rec.fingerprint, fingerprint) {
|
||||||
|
// 记入变更历史（保留最近 20 条，避免无限增长）
|
||||||
|
rec.history.insert(
|
||||||
|
0,
|
||||||
|
FingerprintChange {
|
||||||
|
old_fingerprint: rec.fingerprint.clone(),
|
||||||
|
changed_at: now.clone(),
|
||||||
|
accepted: true,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
rec.history.truncate(20);
|
||||||
|
rec.fingerprint = fingerprint.to_string();
|
||||||
|
}
|
||||||
|
rec.last_confirmed = now;
|
||||||
|
}
|
||||||
|
None => {
|
||||||
|
store.entries.insert(
|
||||||
|
k,
|
||||||
|
KnownHost {
|
||||||
|
host: host.to_string(),
|
||||||
|
port,
|
||||||
|
key_type: key_type.to_string(),
|
||||||
|
fingerprint: fingerprint.to_string(),
|
||||||
|
first_seen: now.clone(),
|
||||||
|
last_confirmed: now,
|
||||||
|
history: Vec::new(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
store.dirty = true;
|
||||||
|
persist(store)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 记录一次「拒绝」（仅记历史，不改指纹）。
|
||||||
|
///
|
||||||
|
/// 价值：用户拒绝后，下次连接还会弹出提示。历史里留下「曾在某时刻拒绝过」，
|
||||||
|
/// 便于事后审计——「谁在什么时候试图用新指纹冒充这台主机」。
|
||||||
|
pub fn record_rejection(host: &str, port: u16, fingerprint: &str, key_type: &str) {
|
||||||
|
let mut slot = store_slot().lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
let Some(store) = slot.as_mut() else { return };
|
||||||
|
let k = key_of(host, port, key_type);
|
||||||
|
if let Some(rec) = store.entries.get_mut(&k) {
|
||||||
|
rec.history.insert(
|
||||||
|
0,
|
||||||
|
FingerprintChange {
|
||||||
|
old_fingerprint: fingerprint.to_string(),
|
||||||
|
changed_at: chrono::Local::now().to_rfc3339(),
|
||||||
|
accepted: false,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
rec.history.truncate(20);
|
||||||
|
store.dirty = true;
|
||||||
|
let _ = persist(store);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 列出全部记录（含历史），供设置页展示。
|
||||||
|
pub fn list() -> Vec<KnownHost> {
|
||||||
|
let slot = store_slot().lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
slot.as_ref()
|
||||||
|
.map(|s| s.entries.values().cloned().collect())
|
||||||
|
.unwrap_or_default()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 删除某条记录（用户清理失效主机时用）。
|
||||||
|
pub fn forget(host: &str, port: u16, key_type: &str) -> Result<(), String> {
|
||||||
|
let mut slot = store_slot().lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
let Some(store) = slot.as_mut() else {
|
||||||
|
return Err("known_hosts 存储未初始化".to_string());
|
||||||
|
};
|
||||||
|
store.entries.remove(&key_of(host, port, key_type));
|
||||||
|
store.dirty = true;
|
||||||
|
persist(store)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 清空全部记录（危险操作，前端需二次确认）。
|
||||||
|
pub fn clear() -> Result<(), String> {
|
||||||
|
let mut slot = store_slot().lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
let Some(store) = slot.as_mut() else {
|
||||||
|
return Err("known_hosts 存储未初始化".to_string());
|
||||||
|
};
|
||||||
|
store.entries.clear();
|
||||||
|
store.dirty = true;
|
||||||
|
persist(store)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 落盘（先写临时文件再 rename，避免半截 JSON）。
|
||||||
|
fn persist(store: &Store) -> Result<(), String> {
|
||||||
|
let list: Vec<&KnownHost> = store.entries.values().collect();
|
||||||
|
let json =
|
||||||
|
serde_json::to_string_pretty(&list).map_err(|e| format!("序列化 known_hosts 失败: {e}"))?;
|
||||||
|
if let Some(parent) = store.path.parent() {
|
||||||
|
std::fs::create_dir_all(parent).map_err(|e| format!("创建目录失败: {e}"))?;
|
||||||
|
}
|
||||||
|
let tmp = store.path.with_extension("json.tmp");
|
||||||
|
std::fs::write(&tmp, json).map_err(|e| format!("写入 known_hosts 失败: {e}"))?;
|
||||||
|
std::fs::rename(&tmp, &store.path).map_err(|e| format!("保存 known_hosts 失败: {e}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== OpenSSH 格式互操作 =====
|
||||||
|
|
||||||
|
/// 导出为 OpenSSH `known_hosts` 文本格式。
|
||||||
|
///
|
||||||
|
/// 用途：(a) 用户可把记录带进命令行 ssh；(b) 便于人工审阅。
|
||||||
|
/// 输出是标准 `host:port keytype base64comment` 形态的 **hashed 形式**
|
||||||
|
/// 还是明文形式？这里选 **明文**：用户要能读懂、能 diff，才有审阅价值。
|
||||||
|
/// OpenSSH 本身也接受明文（`HashKnownHosts no`）。
|
||||||
|
///
|
||||||
|
/// 注意：我们只有指纹（SHA256 base64），没有完整公钥 blob，因此导出的
|
||||||
|
/// 第二列写 `SHA256:...` 形式的注释，**不是**可直接被 ssh 使用的完整格式。
|
||||||
|
/// 这一点必须在 UI 上说明，避免用户以为导出的文件能直接给 ssh 用。
|
||||||
|
pub fn export_openssh_text() -> String {
|
||||||
|
let mut out = String::from(
|
||||||
|
"# 由 Thing 终端模块导出\n\
|
||||||
|
# 注意：本文件仅用于人工审阅与记录迁移，第二列是指纹而非公钥 blob，\n\
|
||||||
|
# 不能直接作为 OpenSSH 的 known_hosts 使用。\n",
|
||||||
|
);
|
||||||
|
for h in list() {
|
||||||
|
out.push_str(&format!(
|
||||||
|
"{}:{} {} {}\n",
|
||||||
|
h.host, h.port, h.key_type, h.fingerprint
|
||||||
|
));
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 从 OpenSSH `known_hosts` 文本导入指纹记录。
|
||||||
|
///
|
||||||
|
/// 支持的行形态（跳过注释与空行）：
|
||||||
|
/// - `host:port keytype fingerprint`（本模块自己的导出格式）
|
||||||
|
/// - `host keytype fingerprint`
|
||||||
|
///
|
||||||
|
/// 返回成功导入的条数。
|
||||||
|
pub fn import_openssh_text(text: &str) -> Result<usize, String> {
|
||||||
|
let mut slot = store_slot().lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
let Some(store) = slot.as_mut() else {
|
||||||
|
return Err("known_hosts 存储未初始化".to_string());
|
||||||
|
};
|
||||||
|
|
||||||
|
let now = chrono::Local::now().to_rfc3339();
|
||||||
|
let mut count = 0usize;
|
||||||
|
|
||||||
|
for line in text.lines() {
|
||||||
|
let line = line.trim();
|
||||||
|
if line.is_empty() || line.starts_with('#') {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let parts: Vec<&str> = line.split_whitespace().collect();
|
||||||
|
if parts.len() < 3 {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// 解析 host[:port]
|
||||||
|
let (host, port) = match parts[0].rsplit_once(':') {
|
||||||
|
Some((h, p)) => match p.parse::<u16>() {
|
||||||
|
Ok(port) => (h.to_string(), port),
|
||||||
|
Err(_) => (parts[0].to_string(), 22),
|
||||||
|
},
|
||||||
|
None => (parts[0].to_string(), 22),
|
||||||
|
};
|
||||||
|
let key_type = parts[1].to_string();
|
||||||
|
let fingerprint = parts[2].to_string();
|
||||||
|
// 只接受指纹形态（SHA256:...）——完整公钥 blob 需要另外的解析路径，
|
||||||
|
// 且我们无法从它反推指纹而不引入更多依赖
|
||||||
|
if !fingerprint.starts_with("SHA256:") && !fingerprint.starts_with("MD5:") {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
let k = key_of(&host, port, &key_type);
|
||||||
|
store.entries.insert(
|
||||||
|
k,
|
||||||
|
KnownHost {
|
||||||
|
host,
|
||||||
|
port,
|
||||||
|
key_type,
|
||||||
|
fingerprint,
|
||||||
|
first_seen: now.clone(),
|
||||||
|
last_confirmed: now.clone(),
|
||||||
|
history: Vec::new(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
count += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
store.dirty = true;
|
||||||
|
persist(store)?;
|
||||||
|
Ok(count)
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,255 @@
|
|||||||
|
//! SSH 连接池（P2 连接复用）。
|
||||||
|
//!
|
||||||
|
//! # 语义
|
||||||
|
//!
|
||||||
|
//! 同一「身份」（用户名 + 主机 + 端口 + 认证材料指纹）的多个会话
|
||||||
|
//! **共享同一条 SSH 连接**：第二个会话跳过 TCP / 握手 / 认证，直接在
|
||||||
|
//! 既有连接上开新的会话通道。与 OpenSSH ControlMaster 的行为一致：
|
||||||
|
//! - 打开：首个会话建立连接；
|
||||||
|
//! - 共享：后续会话引用计数 +1；
|
||||||
|
//! - 关闭：会话关闭只减引用并关闭**自己的 shell 通道**；
|
||||||
|
//! **最后一个引用释放时**才断开底层连接（含跳板机链）。
|
||||||
|
//!
|
||||||
|
//! # 为什么 Handle 必须经由池共享
|
||||||
|
//!
|
||||||
|
//! `russh::client::Handle` 不实现 `Clone`（内含 session actor 的接收端），
|
||||||
|
//! 此前每个 `SshSession` 独占一个 Handle，无从复用。池条目持有
|
||||||
|
//! `Arc<tokio::sync::Mutex<Option<Handle>>>` 槽位，会话间共享同一 Arc；
|
||||||
|
//! tokio Mutex（而非 std）是为了允许**连接建立期间跨 `.await` 持锁**——
|
||||||
|
//! 它天然串行化了「双击两个标签同时连同一主机」的竞态：后到者等待，
|
||||||
|
//! 先到者成功后直接复用。
|
||||||
|
//!
|
||||||
|
//! # 跳板机链的归属
|
||||||
|
//!
|
||||||
|
//! 经跳板链建立的连接，其跳板 Handle 挂在**池条目**上而不是首建会话上：
|
||||||
|
//! 否则首建会话关闭时会连带剪断仍在被其他会话使用的隧道。
|
||||||
|
//! 最后一个引用释放时，跳板与目标连接一起断开。
|
||||||
|
//!
|
||||||
|
//! # 已知取舍
|
||||||
|
//!
|
||||||
|
//! - 共享连接的 keepalive / 加密参数取自**首个**建立它的会话；
|
||||||
|
//! - 共享连接断开（网络故障）时，挂在上面的所有会话一起进入 Closed——
|
||||||
|
//! 这与「它们本来就在同一条 TCP 上」的物理事实一致；
|
||||||
|
//! - 远程转发（-R）的入站路由按端口做**全局**匹配（见 forward 模块），
|
||||||
|
//! 因为入站通道总是从属连接级 Handler，而 Handler 的 session_id 属于首建会话。
|
||||||
|
use std::collections::HashMap;
|
||||||
|
use std::sync::{Arc, Mutex};
|
||||||
|
|
||||||
|
use russh::client::Handle;
|
||||||
|
use russh::Disconnect;
|
||||||
|
|
||||||
|
use super::SshHandler;
|
||||||
|
|
||||||
|
/// 可克隆的池句柄（`TerminalManager` 持有一份，每个会话 clone 一份）。
|
||||||
|
#[derive(Clone, Default)]
|
||||||
|
pub struct ConnectionPool {
|
||||||
|
conns: Arc<Mutex<HashMap<String, PooledEntry>>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
struct PooledEntry {
|
||||||
|
/// 共享槽位：`None` = 连接建立中（或失败）；`Some` = 已就绪。
|
||||||
|
slot: Arc<tokio::sync::Mutex<Option<Handle<SshHandler>>>>,
|
||||||
|
/// 仍在使用此连接的会话数
|
||||||
|
refcount: usize,
|
||||||
|
/// 连接是否已就绪（同步可查；`has_handle` 用）
|
||||||
|
ready: bool,
|
||||||
|
/// 跳板机链的连接（经跳板建立时非空；随条目共享，最后释放时断开）
|
||||||
|
hops: Vec<Handle<SshHandler>>,
|
||||||
|
/// 日志用描述
|
||||||
|
label: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ConnectionPool {
|
||||||
|
/// 取（或创建）某身份的连接槽位，引用计数 +1。
|
||||||
|
///
|
||||||
|
/// 返回的 Arc 就是池条目里的槽位本身：会话把它存进 `SshInner.handle`，
|
||||||
|
/// 连接建立后写 `Some(handle)`，同键的其他会话即刻可见。
|
||||||
|
pub fn slot(&self, key: &str) -> Arc<tokio::sync::Mutex<Option<Handle<SshHandler>>>> {
|
||||||
|
let mut conns = self.conns.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
let entry = conns.entry(key.to_string()).or_insert_with(|| PooledEntry {
|
||||||
|
slot: Arc::new(tokio::sync::Mutex::new(None)),
|
||||||
|
refcount: 0,
|
||||||
|
ready: false,
|
||||||
|
hops: Vec::new(),
|
||||||
|
label: String::new(),
|
||||||
|
});
|
||||||
|
entry.refcount += 1;
|
||||||
|
entry.slot.clone()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 设置日志用描述（连接建立成功后调用）。
|
||||||
|
pub fn set_label(&self, key: &str, label: &str) {
|
||||||
|
if let Some(e) = self
|
||||||
|
.conns
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|x| x.into_inner())
|
||||||
|
.get_mut(key)
|
||||||
|
{
|
||||||
|
e.label = label.to_string();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 标记连接已就绪（do_connect 写入 Handle 之后）。
|
||||||
|
pub fn mark_ready(&self, key: &str) {
|
||||||
|
if let Some(e) = self
|
||||||
|
.conns
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|x| x.into_inner())
|
||||||
|
.get_mut(key)
|
||||||
|
{
|
||||||
|
e.ready = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 把跳板机连接挂到池条目上（fresh 连接路径、有跳板时调用一次）。
|
||||||
|
pub fn attach_hops(&self, key: &str, hops: Vec<Handle<SshHandler>>) {
|
||||||
|
if let Some(e) = self
|
||||||
|
.conns
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|x| x.into_inner())
|
||||||
|
.get_mut(key)
|
||||||
|
{
|
||||||
|
e.hops = hops;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 连接是否已就绪（同步可查；替代原 `SshSession::has_handle` 的语义）。
|
||||||
|
pub fn is_ready(&self, key: &str) -> bool {
|
||||||
|
self.conns
|
||||||
|
.lock()
|
||||||
|
.unwrap_or_else(|e| e.into_inner())
|
||||||
|
.get(key)
|
||||||
|
.is_some_and(|e| e.ready)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 释放一个会话的引用。
|
||||||
|
///
|
||||||
|
/// 返回 `Some((槽位, 跳板连接))` 表示这是**最后一个**引用——调用方负责
|
||||||
|
/// 断开底层连接与跳板（异步任务里做，见 `kill`）。非最后引用返回 `None`，
|
||||||
|
/// 调用方只需关闭自己的 shell 通道。
|
||||||
|
pub fn release(
|
||||||
|
&self,
|
||||||
|
key: &str,
|
||||||
|
) -> Option<(
|
||||||
|
Arc<tokio::sync::Mutex<Option<Handle<SshHandler>>>>,
|
||||||
|
Vec<Handle<SshHandler>>,
|
||||||
|
)> {
|
||||||
|
let mut conns = self.conns.lock().unwrap_or_else(|e| e.into_inner());
|
||||||
|
let Some(entry) = conns.get_mut(key) else {
|
||||||
|
return None;
|
||||||
|
};
|
||||||
|
entry.refcount = entry.refcount.saturating_sub(1);
|
||||||
|
if entry.refcount > 0 {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
// 最后一个引用：移除条目并交出断开责任
|
||||||
|
let entry = conns.remove(key)?;
|
||||||
|
Some((entry.slot, entry.hops))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 连接池身份键：用户名 + 主机 + 端口 + 认证方式 + 认证材料指纹。
|
||||||
|
///
|
||||||
|
/// 认证材料（密码或私钥文本）取短哈希入键——同一主机配置两份不同密钥/密码时
|
||||||
|
/// 不应共享连接（那等于用 A 的身份看了 B 的会话）。
|
||||||
|
pub fn pool_key_of(
|
||||||
|
username: &str,
|
||||||
|
host: &str,
|
||||||
|
port: u16,
|
||||||
|
auth_method: &str,
|
||||||
|
auth_material: Option<&str>,
|
||||||
|
) -> String {
|
||||||
|
let marker = match auth_material {
|
||||||
|
Some(m) => short_hash(m),
|
||||||
|
None => "none".to_string(),
|
||||||
|
};
|
||||||
|
format!("{username}|{host}:{port}|{auth_method}|{marker}")
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 材料指纹：SHA-256 前 8 字节的十六进制（16 字符）。
|
||||||
|
fn short_hash(material: &str) -> String {
|
||||||
|
use sha2::{Digest, Sha256};
|
||||||
|
let digest = Sha256::digest(material.as_bytes());
|
||||||
|
digest[..8].iter().map(|b| format!("{b:02x}")).collect()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 断开一个 Handle（kill 与最后引用释放共用的收尾动作）。
|
||||||
|
pub async fn disconnect(handle: Handle<SshHandler>) {
|
||||||
|
let _ = handle
|
||||||
|
.disconnect(Disconnect::ByApplication, "closed by user", "")
|
||||||
|
.await;
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
/// 条目级语义测试：不涉及真实 Handle（槽位保持 None 即可）。
|
||||||
|
#[test]
|
||||||
|
fn acquire_increments_and_release_removes_on_last() {
|
||||||
|
let pool = ConnectionPool::default();
|
||||||
|
let s1 = pool.slot("k");
|
||||||
|
let s2 = pool.slot("k");
|
||||||
|
// 同键两次 acquire 返回同一个 Arc（这才是「共享」）
|
||||||
|
assert!(Arc::ptr_eq(&s1, &s2));
|
||||||
|
assert!(pool.release("k").is_none(), "还有 1 个引用，不应触发拆除");
|
||||||
|
let (slot, hops) = pool.release("k").expect("最后一个引用应触发拆除");
|
||||||
|
assert!(Arc::ptr_eq(&slot, &s1));
|
||||||
|
assert!(hops.is_empty());
|
||||||
|
// 移除后再次 acquire 得到全新条目
|
||||||
|
let s3 = pool.slot("k");
|
||||||
|
assert!(!Arc::ptr_eq(&s3, &s1));
|
||||||
|
pool.release("k");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn independent_keys_are_independent() {
|
||||||
|
let pool = ConnectionPool::default();
|
||||||
|
let a = pool.slot("a");
|
||||||
|
let b = pool.slot("b");
|
||||||
|
assert!(!Arc::ptr_eq(&a, &b));
|
||||||
|
assert!(pool.release("a").is_some());
|
||||||
|
assert!(pool.release("b").is_some());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn ready_flag_and_hops_follow_entry_lifecycle() {
|
||||||
|
let pool = ConnectionPool::default();
|
||||||
|
assert!(!pool.is_ready("k"));
|
||||||
|
pool.slot("k");
|
||||||
|
pool.slot("k"); // 两个会话共享
|
||||||
|
pool.mark_ready("k");
|
||||||
|
assert!(pool.is_ready("k"));
|
||||||
|
pool.attach_hops("k", Vec::new());
|
||||||
|
// 释放一个引用后条目仍在（另一个会话还在用），ready 保持
|
||||||
|
assert!(pool.release("k").is_none());
|
||||||
|
assert!(pool.is_ready("k"));
|
||||||
|
// 最后一个引用释放后条目消失
|
||||||
|
assert!(pool.release("k").is_some());
|
||||||
|
assert!(!pool.is_ready("k"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn over_release_is_safe() {
|
||||||
|
let pool = ConnectionPool::default();
|
||||||
|
assert!(pool.release("ghost").is_none());
|
||||||
|
pool.slot("k");
|
||||||
|
pool.release("k");
|
||||||
|
// 多余的 release 不应 panic（saturating 语义）
|
||||||
|
let _ = pool.release("k");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn pool_key_distinguishes_identity() {
|
||||||
|
let k1 = pool_key_of("ops", "srv", 22, "key", Some("keytext"));
|
||||||
|
let k2 = pool_key_of("ops", "srv", 22, "key", Some("other-key"));
|
||||||
|
let k3 = pool_key_of("ops", "srv", 22, "key", Some("keytext"));
|
||||||
|
let k4 = pool_key_of("root", "srv", 22, "key", Some("keytext"));
|
||||||
|
assert_ne!(k1, k2, "不同认证材料不应共享连接");
|
||||||
|
assert_eq!(k1, k3, "相同身份应命中同一池条目");
|
||||||
|
assert_ne!(k1, k4, "不同用户不应共享连接");
|
||||||
|
// 无认证材料（理论上不出现）也不与他人混淆
|
||||||
|
let k5 = pool_key_of("ops", "srv", 22, "password", None);
|
||||||
|
assert_ne!(k1, k5);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,663 @@
|
|||||||
|
//! SFTP 文件管理：复用 SSH 会话连接的双栏文件传输。
|
||||||
|
//!
|
||||||
|
//! # 为什么 SFTP 挂在会话上而不是独立连接
|
||||||
|
//!
|
||||||
|
//! 一台主机开两个 SSH 连接（一个 shell、一个 SFTP）有三个实际代价：
|
||||||
|
//! 1. **认证两次**——公钥还好，密码/2FA 场景下用户要输两遍；
|
||||||
|
//! 2. **服务端 `MaxStartups` / `MaxSessions` 限制**——内网跳板机经常卡这条；
|
||||||
|
//! 3. 两条连接的主机密钥都要各自校验，known_hosts 里同一台机器两份记录。
|
||||||
|
//!
|
||||||
|
//! SSH 协议本身就为此设计了 **subsystem channel**：在已认证的连接上开新通道，
|
||||||
|
//! `request_subsystem(true, "sftp")` 即可。因此 SFTP 面板只对**活跃的 SSH 会话**
|
||||||
|
//! 开放——本地 ConPTY 会话没有这条路径（本地文件用系统的资源管理器更合适）。
|
||||||
|
//!
|
||||||
|
//! # 一个 SFTP 客户端只能串行用一条通道
|
||||||
|
//!
|
||||||
|
//! `SftpSession` 内部是「请求 → 等响应」的请求/响应模型，**并发调用会因为
|
||||||
|
//! 响应乱序而错配**。russh-sftp 内部做了请求 id 匹配，因此 `&SftpSession` 上
|
||||||
|
//! 并发 `.await` 是安全的；但同一时刻大量并发（如递归上传 1000 个文件全并发）
|
||||||
|
//! 会把服务端的窗口打满并触发限流。
|
||||||
|
//!
|
||||||
|
//! 因此上传/下载走**受控并发**：由 `SftpHandle::semaphore` 限制在 4 路。
|
||||||
|
//!
|
||||||
|
//! # 断点续传
|
||||||
|
//!
|
||||||
|
//! 用 `OpenFlags::WRITE | CREATE` 打开已存在的文件，再 `seek` 到本地已有的
|
||||||
|
//! 大小继续写。服务端不支持 `append` 语义时（部分紫光的 sftp-server），
|
||||||
|
//! 退化为「整文件重传」——由 `resume_supported` 探测决定。
|
||||||
|
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
use dashmap::DashMap;
|
||||||
|
use russh::client::Handle;
|
||||||
|
use russh_sftp::client::SftpSession;
|
||||||
|
use russh_sftp::protocol::OpenFlags;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use specta::Type;
|
||||||
|
use tokio::io::{AsyncReadExt, AsyncSeekExt, AsyncWriteExt};
|
||||||
|
use tokio::sync::{Mutex, Semaphore};
|
||||||
|
|
||||||
|
use super::{SshHandler, SshSession};
|
||||||
|
|
||||||
|
/// 受控并发的上限。
|
||||||
|
///
|
||||||
|
/// 为什么是 4：单个 SFTP 通道的吞吐已接近链路带宽（有 32KB 报文窗口），
|
||||||
|
/// 再高的并发只是把服务端的 inflight 队列堆长，收益递减而内存占用线性增长。
|
||||||
|
/// 4 路足以让「大量小文件」这条慢路径（每文件一次 round-trip）提速约 3 倍。
|
||||||
|
const MAX_CONCURRENT_TRANSFERS: usize = 4;
|
||||||
|
|
||||||
|
/// 单次传输的分块大小。
|
||||||
|
///
|
||||||
|
/// 32KB 是 SFTP 协议默认的最大读报文（部分服务端放宽到 256KB，但 32KB
|
||||||
|
/// 是所有实现的**安全下界**）。取 32KB 而非更大：大块在丢包链路上重传代价高，
|
||||||
|
/// 而 32KB 已足够跑满千兆内网。
|
||||||
|
const CHUNK_SIZE: usize = 32 * 1024;
|
||||||
|
|
||||||
|
// ===== 数据模型 =====
|
||||||
|
|
||||||
|
/// 一个远端目录项（回传前端渲染）。
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct RemoteEntry {
|
||||||
|
pub name: String,
|
||||||
|
/// 完整路径（服务端形态，`/` 分隔）
|
||||||
|
pub path: String,
|
||||||
|
/// "file" | "dir" | "symlink" | "other"
|
||||||
|
pub kind: String,
|
||||||
|
pub size: u64,
|
||||||
|
/// 修改时间（Unix 毫秒；服务端未提供时为 None）
|
||||||
|
pub modified_at: Option<u64>,
|
||||||
|
/// 权限位的八进制展示（如 "755"）；无权限信息时为空串
|
||||||
|
pub permissions: String,
|
||||||
|
/// 符号链接的目标（仅 kind == "symlink" 时非空）
|
||||||
|
pub link_target: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 目录列举结果。
|
||||||
|
///
|
||||||
|
/// 单独包一层而不是直接返回 `Vec`：前端需要 `cwd` 来确认「服务端实际解析到
|
||||||
|
/// 的目录」——符号链接目录下 `pwd` 与用户点的路径可能不同，这个字段让面包屑
|
||||||
|
/// 可以显示真实位置而不是用户以为的位置。
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct RemoteDir {
|
||||||
|
/// 服务端规范化之后的目录（`canonicalize` 结果）
|
||||||
|
pub cwd: String,
|
||||||
|
pub entries: Vec<RemoteEntry>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 传输进度事件负载。
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize, Type)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct TransferProgress {
|
||||||
|
/// 传输任务 id（前端据此更新对应行的进度条）
|
||||||
|
pub id: String,
|
||||||
|
pub session_id: String,
|
||||||
|
/// "upload" | "download"
|
||||||
|
pub direction: String,
|
||||||
|
/// 源路径（展示用）
|
||||||
|
pub source: String,
|
||||||
|
/// 目标路径（展示用）
|
||||||
|
pub target: String,
|
||||||
|
/// 已传输字节
|
||||||
|
pub transferred: u64,
|
||||||
|
/// 总字节（未知时为 0）
|
||||||
|
pub total: u64,
|
||||||
|
/// "running" | "done" | "failed" | "canceled"
|
||||||
|
pub state: String,
|
||||||
|
/// 失败原因
|
||||||
|
pub error: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 会话级 SFTP 句柄 =====
|
||||||
|
|
||||||
|
/// 一个会话的 SFTP 通道。
|
||||||
|
///
|
||||||
|
/// `SftpSession` 本身不是 `Sync` 的友好类型，且我们要在其上做「先查目录再写文件」
|
||||||
|
/// 这类多步操作，故用 `Mutex` 串行化**结构性操作**（建目录、删文件）；
|
||||||
|
/// 大数据传输则只借用不可变引用（`&SftpSession` 的分块读写在 russh-sftp 内部
|
||||||
|
/// 有请求 id 匹配，可安全并发）。
|
||||||
|
pub struct SftpHandle {
|
||||||
|
/// 打开面板的会话 id。
|
||||||
|
///
|
||||||
|
/// 当前只有注册表的 key 用到会话 id，结构体内这份冗余字段暂无读者；
|
||||||
|
/// 保留它是为了 P2 的「跨会话传输」与日志定位（错误信息里需要会话上下文）。
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub session_id: String,
|
||||||
|
/// 串行闸门：保证「建目录 → 上传」这类有先后依赖的操作不会被乱序执行。
|
||||||
|
///
|
||||||
|
/// P0 的传输命令都是单步操作，尚无读者；P2 的组合操作（模板上传、
|
||||||
|
/// 递归同步）落地时启用。
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub gate: Mutex<()>,
|
||||||
|
pub sftp: SftpSession,
|
||||||
|
/// 并发闸门：限制同时在跑的大数据传输数量
|
||||||
|
pub semaphore: Semaphore,
|
||||||
|
/// 远端当前目录的缓存（`cwd` 跟随用；避免每次都 round-trip 取）
|
||||||
|
pub last_dir: Mutex<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 所有活跃会话的 SFTP 通道表。
|
||||||
|
///
|
||||||
|
/// 与 `SessionRegistry` 同样的理由用 `DashMap`：查表极频繁（每个传输分块都要
|
||||||
|
/// 找 handle），而插入/删除只在打开/关闭面板时发生。
|
||||||
|
#[derive(Default)]
|
||||||
|
pub struct SftpRegistry {
|
||||||
|
handles: DashMap<String, Arc<SftpHandle>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl SftpRegistry {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
Self {
|
||||||
|
handles: DashMap::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get(&self, session_id: &str) -> Option<Arc<SftpHandle>> {
|
||||||
|
self.handles.get(session_id).map(|e| e.value().clone())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn insert(&self, session_id: String, handle: Arc<SftpHandle>) {
|
||||||
|
self.handles.insert(session_id, handle);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn remove(&self, session_id: &str) -> Option<Arc<SftpHandle>> {
|
||||||
|
self.handles.remove(session_id).map(|(_, v)| v)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn has(&self, session_id: &str) -> bool {
|
||||||
|
self.handles.contains_key(session_id)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 关闭某会话的 SFTP 通道（会话关闭时调用）。
|
||||||
|
pub fn close(&self, session_id: &str) {
|
||||||
|
self.handles.remove(session_id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 在已有 SSH 会话上打开 SFTP subsystem。
|
||||||
|
///
|
||||||
|
/// # 前置条件
|
||||||
|
///
|
||||||
|
/// 会话必须已 `Established` 且持有可用的 `Handle`。若会话是本地 ConPTY
|
||||||
|
/// 或 SSH 尚未认证完成，这里会返回可读的错误而不是 panic。
|
||||||
|
///
|
||||||
|
/// # 为什么用 `spawn_blocking` 而不是直接 await
|
||||||
|
///
|
||||||
|
/// `Handle` 不实现 `Clone`，因此开通道必须**持有 `MutexGuard` 跨 await**。
|
||||||
|
/// 而 `std::sync::MutexGuard` 不是 `Send`，这让整个 future 也不是 `Send`，
|
||||||
|
/// 无法交给 `tauri::async_runtime::spawn`（Tauri 命令要求 `Send`）。
|
||||||
|
///
|
||||||
|
/// 解法：把「持锁 + 开通道」这一小段放进 `spawn_blocking`。它内部是
|
||||||
|
/// **阻塞的 tokio runtime block_on**，锁与 await 都限制在那个线程里，
|
||||||
|
/// 对外只返回值（`Channel` 是 `Send`）。代价是占一个线程约握手 RTT 的时间，
|
||||||
|
/// 而这只在用户点「打开文件管理器」时发生一次。
|
||||||
|
pub async fn open_subsystem(session: &SshSession) -> Result<Arc<SftpHandle>, String> {
|
||||||
|
// 先在外部确认会话可用（避免为一个必然失败的请求去占线程）
|
||||||
|
if !session.has_handle() {
|
||||||
|
return Err("SSH 会话尚未建立连接，无法打开文件管理器".to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
let channel = {
|
||||||
|
let inner = session.inner_shared();
|
||||||
|
// 把「加锁 → 开通道 → 请求 subsystem」整段移出 async 上下文。
|
||||||
|
// 槽位是 tokio Mutex（P2 连接复用），锁 `.await` 放进 block_on 里。
|
||||||
|
tokio::task::spawn_blocking(move || {
|
||||||
|
let rt = tokio::runtime::Handle::current();
|
||||||
|
rt.block_on(async {
|
||||||
|
let guard = inner.handle.lock().await;
|
||||||
|
let handle = guard
|
||||||
|
.as_ref()
|
||||||
|
.ok_or_else(|| "SSH 会话连接已断开，无法打开文件管理器".to_string())?;
|
||||||
|
|
||||||
|
let channel = handle
|
||||||
|
.channel_open_session()
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("打开 SFTP 通道失败: {e}"))?;
|
||||||
|
channel
|
||||||
|
.request_subsystem(true, "sftp")
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("请求 sftp 子系统失败（服务端可能未启用 SFTP）: {e}"))?;
|
||||||
|
Ok::<_, String>(channel)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("打开 SFTP 通道的任务异常退出: {e}"))?
|
||||||
|
}?;
|
||||||
|
|
||||||
|
let sftp = SftpSession::new(channel.into_stream())
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("初始化 SFTP 会话失败（可能是版本协商不兼容）: {e}"))?;
|
||||||
|
|
||||||
|
// 初始目录：优先用户配置的 remote_cwd，否则用登录目录。
|
||||||
|
// `canonicalize(".")` 而不是直接用 "."：服务端的 SFTP 起点（chroot 场景下
|
||||||
|
// 是 `/`，普通场景下是 home）只有服务端知道，取回真实值前端才好画面包屑。
|
||||||
|
let initial = match sftp.canonicalize(".").await {
|
||||||
|
Ok(p) if !p.trim().is_empty() => p,
|
||||||
|
_ => ".".to_string(),
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(Arc::new(SftpHandle {
|
||||||
|
session_id: session.state.id.clone(),
|
||||||
|
gate: Mutex::new(()),
|
||||||
|
sftp,
|
||||||
|
semaphore: Semaphore::new(MAX_CONCURRENT_TRANSFERS),
|
||||||
|
last_dir: Mutex::new(initial),
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 目录操作 =====
|
||||||
|
|
||||||
|
/// 列举远端目录。
|
||||||
|
///
|
||||||
|
/// 排序在服务端做而不是让前端排：SFTP 的 `read_dir` 返回顺序是服务端的
|
||||||
|
/// 目录项物理顺序（通常是插入序），逐次调用结果不稳定；在这里排一次
|
||||||
|
/// 保证「刷新」不会让列表跳动。
|
||||||
|
pub async fn list_dir(handle: &SftpHandle, path: &str) -> Result<RemoteDir, String> {
|
||||||
|
// `read_dir` 返回 `ReadDir`（一个可迭代的句柄），**必须显式 collect**：
|
||||||
|
// 它的迭代会持续向服务端发 READDIR 报文直到服务端返回 EOF，
|
||||||
|
// 不 collect 的话句柄被丢弃时可能留下未读完的报文，污染后续请求的响应队列。
|
||||||
|
let iter = handle
|
||||||
|
.sftp
|
||||||
|
.read_dir(path)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("读取目录 {path} 失败: {e}"))?;
|
||||||
|
|
||||||
|
let mut list: Vec<RemoteEntry> = Vec::new();
|
||||||
|
for e in iter {
|
||||||
|
let name = e.file_name();
|
||||||
|
// `.` 与 `..` 由前端用面包屑表达，不混进列表（混进去会让「全选」误伤父目录）
|
||||||
|
if name == "." || name == ".." {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let meta = e.metadata();
|
||||||
|
// `file_type()` 来自协议 attrs；`metadata()` 里**没有** `is_file()`
|
||||||
|
// ——`FileAttributes` 只提供 `is_dir()` / `is_symlink()` / `file_type()`。
|
||||||
|
// 因此「是不是普通文件」的判定必须落到 `file_type()` 上（`is_file()` 是
|
||||||
|
// `FileType` 的方法，不是 attrs 的）。
|
||||||
|
let ft = e.file_type();
|
||||||
|
let is_symlink = ft.is_symlink() || meta.is_symlink();
|
||||||
|
let kind = if is_symlink {
|
||||||
|
"symlink"
|
||||||
|
} else if ft.is_dir() || meta.is_dir() {
|
||||||
|
"dir"
|
||||||
|
} else if ft.is_file() {
|
||||||
|
"file"
|
||||||
|
} else {
|
||||||
|
"other"
|
||||||
|
};
|
||||||
|
// `mtime` 是 Unix 秒（SFTP v3 的 attrs 无亚秒精度），统一乘 1000 成毫秒。
|
||||||
|
// 服务端未提供时保持 None，前端显示为「—」而不是伪造的 1970 年。
|
||||||
|
let mtime = meta.mtime.map(|s| (s as u64) * 1000);
|
||||||
|
let perms = meta
|
||||||
|
.permissions
|
||||||
|
.map(|p| format!("{:o}", p & 0o7777))
|
||||||
|
.unwrap_or_default();
|
||||||
|
|
||||||
|
list.push(RemoteEntry {
|
||||||
|
name: name.clone(),
|
||||||
|
path: join_remote(path, &name),
|
||||||
|
kind: kind.to_string(),
|
||||||
|
size: meta.size.unwrap_or(0),
|
||||||
|
modified_at: mtime,
|
||||||
|
permissions: perms,
|
||||||
|
// `read_dir` 不带 link target，符号链接的目标要单独 `read_link`。
|
||||||
|
// 这里不逐条调用：一个含 200 个符号链接的目录会变成 200 次 round-trip。
|
||||||
|
// 前端在用户点击/悬停时再单独请求（见 `read_link` 命令）。
|
||||||
|
link_target: String::new(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// 目录优先，其次按名称（用不区分大小写的比较，符合 Windows 用户直觉）
|
||||||
|
list.sort_by(|a, b| {
|
||||||
|
let a_dir = a.kind == "dir";
|
||||||
|
let b_dir = b.kind == "dir";
|
||||||
|
b_dir
|
||||||
|
.cmp(&a_dir)
|
||||||
|
.then_with(|| a.name.to_lowercase().cmp(&b.name.to_lowercase()))
|
||||||
|
});
|
||||||
|
|
||||||
|
let cwd = handle
|
||||||
|
.sftp
|
||||||
|
.canonicalize(path)
|
||||||
|
.await
|
||||||
|
.unwrap_or_else(|_| path.to_string());
|
||||||
|
*handle.last_dir.lock().await = cwd.clone();
|
||||||
|
|
||||||
|
Ok(RemoteDir {
|
||||||
|
cwd,
|
||||||
|
entries: list,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 拼接远端路径（POSIX 语义，注意不要产生 `//`）。
|
||||||
|
pub fn join_remote(base: &str, name: &str) -> String {
|
||||||
|
if base.is_empty() || base == "." {
|
||||||
|
return name.to_string();
|
||||||
|
}
|
||||||
|
if name.starts_with('/') {
|
||||||
|
return name.to_string();
|
||||||
|
}
|
||||||
|
if base.ends_with('/') {
|
||||||
|
format!("{base}{name}")
|
||||||
|
} else {
|
||||||
|
format!("{base}/{name}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 取远端路径的父目录（用于「上一级」与面包屑）。
|
||||||
|
pub fn parent_remote(path: &str) -> String {
|
||||||
|
let trimmed = path.trim_end_matches('/');
|
||||||
|
// 根目录的父目录还是自己，避免前端无限上溯
|
||||||
|
if trimmed.is_empty() {
|
||||||
|
return "/".to_string();
|
||||||
|
}
|
||||||
|
match trimmed.rfind('/') {
|
||||||
|
Some(0) => "/".to_string(),
|
||||||
|
Some(i) => trimmed[..i].to_string(),
|
||||||
|
// 相对路径（服务端未 canonicalize 时）：退化为当前目录
|
||||||
|
None => ".".to_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 读符号链接的目标。
|
||||||
|
pub async fn read_link(handle: &SftpHandle, path: &str) -> Result<String, String> {
|
||||||
|
handle
|
||||||
|
.sftp
|
||||||
|
.read_link(path)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("读取链接目标失败: {e}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 创建目录（递归）。
|
||||||
|
pub async fn create_dir_all(handle: &SftpHandle, path: &str) -> Result<(), String> {
|
||||||
|
// 逐级创建：SFTP 的 `create_dir` 不递归（与 `mkdir` 不同，没有 `-p`），
|
||||||
|
// 而 `create_dir_all` 在 russh-sftp 里不存在，只能自己走。
|
||||||
|
let mut cur = String::new();
|
||||||
|
for seg in path.trim_start_matches('/').split('/') {
|
||||||
|
if seg.is_empty() {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
cur = if cur.is_empty() {
|
||||||
|
if path.starts_with('/') {
|
||||||
|
format!("/{seg}")
|
||||||
|
} else {
|
||||||
|
seg.to_string()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
format!("{cur}/{seg}")
|
||||||
|
};
|
||||||
|
// 已存在是正常情况（多级创建的中途层级），忽略错误继续
|
||||||
|
let _ = handle.sftp.create_dir(&cur).await;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 删除远端文件。
|
||||||
|
pub async fn remove_file(handle: &SftpHandle, path: &str) -> Result<(), String> {
|
||||||
|
handle
|
||||||
|
.sftp
|
||||||
|
.remove_file(path)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("删除文件失败: {e}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 递归删除远端目录。
|
||||||
|
///
|
||||||
|
/// 手写递归而不是 `remove_dir_all`：后者在部分服务端实现上对符号链接的处理
|
||||||
|
/// 不一致（有的会跟随链接删掉目标内容，这是**数据事故**）。这里显式判断
|
||||||
|
/// `symlink_metadata`，遇到符号链接只删链接本身。
|
||||||
|
pub async fn remove_dir_all(handle: &SftpHandle, path: &str) -> Result<u64, String> {
|
||||||
|
let mut removed: u64 = 0;
|
||||||
|
let iter = handle
|
||||||
|
.sftp
|
||||||
|
.read_dir(path)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("读取目录 {path} 失败: {e}"))?;
|
||||||
|
|
||||||
|
let mut sub_dirs: Vec<String> = Vec::new();
|
||||||
|
let mut files: Vec<String> = Vec::new();
|
||||||
|
for e in iter {
|
||||||
|
let name = e.file_name();
|
||||||
|
if name == "." || name == ".." {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
let full = join_remote(path, &name);
|
||||||
|
let ft = e.file_type();
|
||||||
|
let meta = e.metadata();
|
||||||
|
// 符号链接**先于** is_dir 判断：SFTP 的 attrs 对链接常会报告目标类型，
|
||||||
|
// 若先判 is_dir 会把链接当目录递归进去（删掉链接目标的真内容）。
|
||||||
|
if ft.is_symlink() || meta.is_symlink() {
|
||||||
|
files.push(full);
|
||||||
|
} else if ft.is_dir() || meta.is_dir() {
|
||||||
|
sub_dirs.push(full);
|
||||||
|
} else {
|
||||||
|
files.push(full);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 先删文件再删子目录：先把当前层的文件清掉，收敛更快（失败时更容易定位）
|
||||||
|
for f in files {
|
||||||
|
handle
|
||||||
|
.sftp
|
||||||
|
.remove_file(&f)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("删除 {f} 失败: {e}"))?;
|
||||||
|
removed += 1;
|
||||||
|
}
|
||||||
|
for d in sub_dirs {
|
||||||
|
removed += Box::pin(remove_dir_all(handle, &d)).await?;
|
||||||
|
}
|
||||||
|
|
||||||
|
handle
|
||||||
|
.sftp
|
||||||
|
.remove_dir(path)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("删除目录 {path} 失败: {e}"))?;
|
||||||
|
Ok(removed + 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 重命名 / 移动。
|
||||||
|
pub async fn rename(handle: &SftpHandle, from: &str, to: &str) -> Result<(), String> {
|
||||||
|
handle
|
||||||
|
.sftp
|
||||||
|
.rename(from, to)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("重命名失败: {e}"))
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 上传 / 下载 =====
|
||||||
|
|
||||||
|
/// 上传本地文件到远端。
|
||||||
|
///
|
||||||
|
/// # 断点续传
|
||||||
|
///
|
||||||
|
/// 打开远端文件时**不加 `TRUNCATE`**，先 `metadata` 取已存在的大小，
|
||||||
|
/// 再 `seek` 到该位置继续写。若远端已有文件比本地大（本地被截断过），
|
||||||
|
/// 则退回整文件重传——继续写会得到一个「前长后短」的损坏文件。
|
||||||
|
pub async fn upload_file(
|
||||||
|
handle: &SftpHandle,
|
||||||
|
local: &str,
|
||||||
|
remote: &str,
|
||||||
|
on_progress: impl Fn(u64, u64),
|
||||||
|
) -> Result<u64, String> {
|
||||||
|
let _permit = handle
|
||||||
|
.semaphore
|
||||||
|
.acquire()
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("获取传输许可失败: {e}"))?;
|
||||||
|
|
||||||
|
let total = tokio::fs::metadata(local)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("读取本地文件 {local} 失败: {e}"))?
|
||||||
|
.len();
|
||||||
|
|
||||||
|
// 远端已有大小（用于续传判断）
|
||||||
|
let existing = handle
|
||||||
|
.sftp
|
||||||
|
.metadata(remote)
|
||||||
|
.await
|
||||||
|
.ok()
|
||||||
|
.and_then(|m| m.size)
|
||||||
|
.unwrap_or(0);
|
||||||
|
|
||||||
|
let resume_from = if existing > 0 && existing < total {
|
||||||
|
existing
|
||||||
|
} else {
|
||||||
|
0
|
||||||
|
};
|
||||||
|
|
||||||
|
let flags = if resume_from > 0 {
|
||||||
|
OpenFlags::WRITE
|
||||||
|
} else {
|
||||||
|
OpenFlags::WRITE | OpenFlags::CREATE | OpenFlags::TRUNCATE
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut remote_file = handle
|
||||||
|
.sftp
|
||||||
|
.open_with_flags(remote, flags)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("打开远端文件 {remote} 失败: {e}"))?;
|
||||||
|
|
||||||
|
let mut local_file = tokio::fs::File::open(local)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("打开本地文件 {local} 失败: {e}"))?;
|
||||||
|
|
||||||
|
if resume_from > 0 {
|
||||||
|
local_file
|
||||||
|
.seek(std::io::SeekFrom::Start(resume_from))
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("定位本地文件失败: {e}"))?;
|
||||||
|
remote_file
|
||||||
|
.seek(std::io::SeekFrom::Start(resume_from))
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("定位远端文件失败: {e}"))?;
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut buf = vec![0u8; CHUNK_SIZE];
|
||||||
|
let mut sent = resume_from;
|
||||||
|
on_progress(sent, total);
|
||||||
|
|
||||||
|
loop {
|
||||||
|
let n = local_file
|
||||||
|
.read(&mut buf)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("读取本地文件失败: {e}"))?;
|
||||||
|
if n == 0 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
remote_file
|
||||||
|
.write_all(&buf[..n])
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("写入远端失败: {e}"))?;
|
||||||
|
sent += n as u64;
|
||||||
|
on_progress(sent, total);
|
||||||
|
}
|
||||||
|
|
||||||
|
// `shutdown` 会把 SFTP 的 close 报文发出去；不调用的话服务端可能迟迟不落盘
|
||||||
|
// （尤其写的是网络文件系统上的文件）。
|
||||||
|
remote_file
|
||||||
|
.shutdown()
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("关闭远端文件失败（数据可能未完整落盘）: {e}"))?;
|
||||||
|
|
||||||
|
Ok(sent)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 从远端下载文件到本地。
|
||||||
|
///
|
||||||
|
/// 断点续传逻辑与上传对称：本地已有一部分则从该偏移继续。
|
||||||
|
pub async fn download_file(
|
||||||
|
handle: &SftpHandle,
|
||||||
|
remote: &str,
|
||||||
|
local: &str,
|
||||||
|
on_progress: impl Fn(u64, u64),
|
||||||
|
) -> Result<u64, String> {
|
||||||
|
let _permit = handle
|
||||||
|
.semaphore
|
||||||
|
.acquire()
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("获取传输许可失败: {e}"))?;
|
||||||
|
|
||||||
|
let total = handle
|
||||||
|
.sftp
|
||||||
|
.metadata(remote)
|
||||||
|
.await
|
||||||
|
.ok()
|
||||||
|
.and_then(|m| m.size)
|
||||||
|
.unwrap_or(0);
|
||||||
|
|
||||||
|
let existing = tokio::fs::metadata(local)
|
||||||
|
.await
|
||||||
|
.map(|m| m.len())
|
||||||
|
.unwrap_or(0);
|
||||||
|
|
||||||
|
let resume_from = if existing > 0 && total > 0 && existing < total {
|
||||||
|
existing
|
||||||
|
} else {
|
||||||
|
0
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut remote_file = handle
|
||||||
|
.sftp
|
||||||
|
.open(remote)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("打开远端文件 {remote} 失败: {e}"))?;
|
||||||
|
|
||||||
|
// 确保父目录存在（下载到新目录时很常见）
|
||||||
|
if let Some(parent) = std::path::Path::new(local).parent() {
|
||||||
|
let _ = tokio::fs::create_dir_all(parent).await;
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut local_file = tokio::fs::OpenOptions::new()
|
||||||
|
.create(true)
|
||||||
|
.write(true)
|
||||||
|
.truncate(resume_from == 0)
|
||||||
|
.open(local)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("创建本地文件 {local} 失败: {e}"))?;
|
||||||
|
|
||||||
|
if resume_from > 0 {
|
||||||
|
remote_file
|
||||||
|
.seek(std::io::SeekFrom::Start(resume_from))
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("定位远端文件失败: {e}"))?;
|
||||||
|
local_file
|
||||||
|
.seek(std::io::SeekFrom::Start(resume_from))
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("定位本地文件失败: {e}"))?;
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut buf = vec![0u8; CHUNK_SIZE];
|
||||||
|
let mut got = resume_from;
|
||||||
|
on_progress(got, total);
|
||||||
|
|
||||||
|
loop {
|
||||||
|
let n = remote_file
|
||||||
|
.read(&mut buf)
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("读取远端失败: {e}"))?;
|
||||||
|
if n == 0 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
local_file
|
||||||
|
.write_all(&buf[..n])
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("写入本地文件失败: {e}"))?;
|
||||||
|
got += n as u64;
|
||||||
|
on_progress(got, total);
|
||||||
|
}
|
||||||
|
|
||||||
|
local_file
|
||||||
|
.flush()
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("刷新本地文件失败: {e}"))?;
|
||||||
|
|
||||||
|
Ok(got)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 类型占位：确保 `SshHandler` 与 `Handle<SshHandler>` 的关联在编译期成立。
|
||||||
|
#[allow(dead_code)]
|
||||||
|
fn _assert_handle_type(h: &Handle<SshHandler>) -> &Handle<SshHandler> {
|
||||||
|
h
|
||||||
|
}
|
||||||
@@ -0,0 +1,153 @@
|
|||||||
|
//! 终端窗口管理。
|
||||||
|
//!
|
||||||
|
//! # 设计取舍：一个会话一个窗口，而非一个窗口多个会话
|
||||||
|
//!
|
||||||
|
//! 有两条路可走：
|
||||||
|
//!
|
||||||
|
//! | 方案 | 优势 | 代价 |
|
||||||
|
//! |---|---|---|
|
||||||
|
//! | 一个独立窗口承载全部会话（把主窗口的终端 UI 整体搬出去） | 实现简单，复用全部前端组件 | 无法「只把一个会话拖出来」；两处 UI 状态要同步 |
|
||||||
|
//! | **一个会话一个窗口** | 符合「拖出标签成窗」的直觉；窗口粒度与会话粒度一致，状态无歧义 | 每窗口一个 WebView，内存开销更大 |
|
||||||
|
//!
|
||||||
|
//! 选后者。理由：终端的核心使用场景就是「同时盯几台机器的输出」，把其中一个
|
||||||
|
//! 会话丢到第二块屏幕是所有终端工具的刚需；而窗口粒度与会话粒度一致，意味着
|
||||||
|
//! 「关闭窗口」= 「关闭会话」，没有隐藏状态，心智负担最小。
|
||||||
|
//!
|
||||||
|
//! 内存开销通过限制窗口数量（[`MAX_DETACHED_WINDOWS`]）来控制。
|
||||||
|
//!
|
||||||
|
//! # 会话与窗口的关系
|
||||||
|
//!
|
||||||
|
//! 会话**不随窗口创建而创建**。用户点「在新窗口打开」时，会话已经在主窗口里
|
||||||
|
//! 跑着（进程在 Rust 侧），窗口只是**另一个 attach 到这个会话的视图**。
|
||||||
|
//! 这带来两个后果：
|
||||||
|
//! 1. 主窗口关闭（隐藏到托盘）不影响终端窗口 —— 会话在 Rust 侧，与窗口无关。
|
||||||
|
//! 2. 同一个会话可以同时显示在主窗口与独立窗口（输出事件是广播的）。
|
||||||
|
//! 这是刻意的：用户可以在主窗口把某个会话放进分屏、同时另开一个窗口放大看。
|
||||||
|
|
||||||
|
use tauri::{AppHandle, Manager, WebviewUrl, WebviewWindowBuilder};
|
||||||
|
|
||||||
|
use super::session::SessionId;
|
||||||
|
use crate::constants::windows as W;
|
||||||
|
|
||||||
|
/// 同时存在的独立终端窗口上限。
|
||||||
|
///
|
||||||
|
/// 8 是个经验值：每个终端窗口都是一个独立 WebView（各自约 40~80MB），
|
||||||
|
/// 再多会明显吃内存；而「同时盯 8 个终端」已覆盖绝大多数实际需求。
|
||||||
|
/// 超出时明确报错而不是静默失败——用户需要知道是上限拦住了他。
|
||||||
|
pub const MAX_DETACHED_WINDOWS: usize = 8;
|
||||||
|
|
||||||
|
/// 计算会话对应的窗口 label。
|
||||||
|
pub fn label_for(session_id: &str) -> String {
|
||||||
|
format!("{}-{}", W::TERMINAL_WINDOW, session_id)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 当前有多少个终端独立窗口。
|
||||||
|
pub fn count_windows(app: &AppHandle) -> usize {
|
||||||
|
app.webview_windows()
|
||||||
|
.keys()
|
||||||
|
.filter(|k| k.starts_with(&format!("{}-", W::TERMINAL_WINDOW)))
|
||||||
|
.count()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 打开（或聚焦）某会话的独立窗口。
|
||||||
|
///
|
||||||
|
/// 幂等：窗口已存在时只做 `show` + `set_focus`，不重建 WebView。
|
||||||
|
/// 重建会丢失 xterm 的滚动缓冲（虽然内容可从会话快照恢复，但没必要多此一举）。
|
||||||
|
pub fn open_for_session(
|
||||||
|
app: &AppHandle,
|
||||||
|
session_id: &SessionId,
|
||||||
|
title: &str,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let label = label_for(session_id);
|
||||||
|
|
||||||
|
if let Some(win) = app.get_webview_window(&label) {
|
||||||
|
win.show().map_err(|e| format!("显示窗口失败: {e}"))?;
|
||||||
|
win.set_focus().map_err(|e| format!("聚焦窗口失败: {e}"))?;
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
let n = count_windows(app);
|
||||||
|
if n >= MAX_DETACHED_WINDOWS {
|
||||||
|
return Err(format!(
|
||||||
|
"已达独立终端窗口上限（{MAX_DETACHED_WINDOWS} 个）。\
|
||||||
|
请先关闭一些窗口，或改为在主窗口内使用标签页。"
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
// 窗口尺寸：终端是「宽而扁」的，给一个偏宽的默认值，接近常见终端习惯
|
||||||
|
let win = WebviewWindowBuilder::new(
|
||||||
|
app,
|
||||||
|
&label,
|
||||||
|
// 路由到前端的 terminal 独立窗口入口（main.ts 中按 hash 分派）
|
||||||
|
WebviewUrl::App(format!("index.html#terminal-window/{session_id}").into()),
|
||||||
|
)
|
||||||
|
.title(format!("终端 · {title}"))
|
||||||
|
.inner_size(1000.0, 620.0)
|
||||||
|
.min_inner_size(420.0, 240.0)
|
||||||
|
.resizable(true)
|
||||||
|
// 无系统边框：窗口内自绘标题栏（TerminalWindow.vue），系统标题栏会与之叠加
|
||||||
|
.decorations(false)
|
||||||
|
// 无边框窗口默认没有投影，加上以保持与系统窗口一致的层次感
|
||||||
|
.shadow(true)
|
||||||
|
.center()
|
||||||
|
// **隐藏创建**：窗口的初始底色是白的，而深浅色主题由前端读 localStorage 后
|
||||||
|
// 才应用 —— 直接显示会先闪一下纯白窗口再变深色（深色模式下尤其刺眼）。
|
||||||
|
// 因此这里先隐藏，由 TerminalWindow.vue 应用完主题（含 setBackgroundColor）
|
||||||
|
// 再 show + setFocus。同 translate/clipboard 弹窗的预创建做法。
|
||||||
|
.visible(false)
|
||||||
|
.focused(false)
|
||||||
|
.build()
|
||||||
|
.map_err(|e| format!("创建终端窗口失败: {e}"))?;
|
||||||
|
|
||||||
|
// 关闭窗口时：**只关窗口，不关会话**。
|
||||||
|
//
|
||||||
|
// 这是刻意的语义选择。若「关窗即关会话」，用户移动窗口时误点关闭就会
|
||||||
|
// 丢掉一个正在跑长任务的 SSH 连接；而保留会话的代价只是列表里多一个标签。
|
||||||
|
// 需要在窗口里显式提供「关闭会话」按钮，让两个动作分离。
|
||||||
|
let app_handle = app.clone();
|
||||||
|
let sid = session_id.clone();
|
||||||
|
win.on_window_event(move |event| {
|
||||||
|
if let tauri::WindowEvent::Destroyed = event {
|
||||||
|
// 把会话标记回「未分离」状态，前端的标签列表据此恢复显示
|
||||||
|
if let Ok(state) = super::manager(&app_handle) {
|
||||||
|
if let Some(s) = state.sessions.get(&sid) {
|
||||||
|
s.set_detached(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 关闭某会话的独立窗口（会话本身保留）。
|
||||||
|
pub fn close_for_session(app: &AppHandle, session_id: &SessionId) -> Result<(), String> {
|
||||||
|
let label = label_for(session_id);
|
||||||
|
if let Some(win) = app.get_webview_window(&label) {
|
||||||
|
win.close().map_err(|e| format!("关闭窗口失败: {e}"))?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 把会话的 `detached` 标记与窗口状态对齐。
|
||||||
|
///
|
||||||
|
/// 应用启动后（或窗口被外部关闭后）可能存在不一致：标记说已分离但窗口不在。
|
||||||
|
/// 由命令层在查询会话列表前调用一次，保证前端拿到的状态是准确的。
|
||||||
|
///
|
||||||
|
/// 返回**是否有任何标记被修正**：调用方（`terminal_list_sessions`）据此决定
|
||||||
|
/// 是否需要再取一次列表——无变更时直接复用第一次的结果，省掉一次全表遍历。
|
||||||
|
pub fn reconcile_flags(app: &AppHandle, sessions: &[(SessionId, bool)]) -> bool {
|
||||||
|
let mut changed = false;
|
||||||
|
for (id, marked) in sessions {
|
||||||
|
let exists = app.get_webview_window(&label_for(id)).is_some();
|
||||||
|
if *marked != exists {
|
||||||
|
if let Ok(state) = super::manager(app) {
|
||||||
|
if let Some(s) = state.sessions.get(id) {
|
||||||
|
s.set_detached(exists);
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
changed
|
||||||
|
}
|
||||||
@@ -43,12 +43,12 @@ impl AiEngine {
|
|||||||
/// API 根地址。容错处理：用户常把完整端点（`.../chat/completions`）直接粘进来，
|
/// API 根地址。容错处理：用户常把完整端点（`.../chat/completions`）直接粘进来，
|
||||||
/// 若不在末尾剥掉，就会拼出 `.../chat/completions/chat/completions`，
|
/// 若不在末尾剥掉，就会拼出 `.../chat/completions/chat/completions`，
|
||||||
/// 而这类错误在上游表现为 404，排查成本远高于此处一行判断。
|
/// 而这类错误在上游表现为 404，排查成本远高于此处一行判断。
|
||||||
fn api_root(&self) -> Result<String, TranslateError> {
|
fn api_root(cfg: &TranslateEngineConfig) -> Result<String, TranslateError> {
|
||||||
let raw = self.cfg.base_url.trim();
|
let raw = cfg.base_url.trim();
|
||||||
if raw.is_empty() {
|
if raw.is_empty() {
|
||||||
return Err(TranslateError::config(format!(
|
return Err(TranslateError::config(format!(
|
||||||
"引擎「{}」尚未配置 Base URL",
|
"引擎「{}」尚未配置 Base URL",
|
||||||
self.cfg.name
|
cfg.name
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
if !(raw.starts_with("http://") || raw.starts_with("https://")) {
|
if !(raw.starts_with("http://") || raw.starts_with("https://")) {
|
||||||
@@ -66,36 +66,36 @@ impl AiEngine {
|
|||||||
Ok(root)
|
Ok(root)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn chat_endpoint(&self) -> Result<String, TranslateError> {
|
fn chat_endpoint(cfg: &TranslateEngineConfig) -> Result<String, TranslateError> {
|
||||||
Ok(format!("{}/chat/completions", self.api_root()?))
|
Ok(format!("{}/chat/completions", Self::api_root(cfg)?))
|
||||||
}
|
}
|
||||||
|
|
||||||
fn models_endpoint(&self) -> Result<String, TranslateError> {
|
fn models_endpoint(cfg: &TranslateEngineConfig) -> Result<String, TranslateError> {
|
||||||
Ok(format!("{}/models", self.api_root()?))
|
Ok(format!("{}/models", Self::api_root(cfg)?))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 密钥只从系统凭据管理器读，不进配置文件、不经前端。
|
/// 密钥只从系统凭据管理器读，不进配置文件、不经前端。
|
||||||
fn api_key(&self) -> String {
|
fn api_key(cfg: &TranslateEngineConfig) -> String {
|
||||||
crate::translate::engine_api_key(&self.cfg.id)
|
crate::translate::engine_api_key(&cfg.id)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn require_key(&self) -> Result<String, TranslateError> {
|
fn require_key(cfg: &TranslateEngineConfig) -> Result<String, TranslateError> {
|
||||||
let key = self.api_key();
|
let key = Self::api_key(cfg);
|
||||||
if key.trim().is_empty() {
|
if key.trim().is_empty() {
|
||||||
return Err(TranslateError::auth(format!(
|
return Err(TranslateError::auth(format!(
|
||||||
"引擎「{}」尚未配置 API Key，请在翻译设置中填写",
|
"引擎「{}」尚未配置 API Key，请在翻译设置中填写",
|
||||||
self.cfg.name
|
cfg.name
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
Ok(key)
|
Ok(key)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn require_model(&self) -> Result<String, TranslateError> {
|
fn require_model(cfg: &TranslateEngineConfig) -> Result<String, TranslateError> {
|
||||||
let model = self.cfg.model.trim();
|
let model = cfg.model.trim();
|
||||||
if model.is_empty() {
|
if model.is_empty() {
|
||||||
return Err(TranslateError::config(format!(
|
return Err(TranslateError::config(format!(
|
||||||
"引擎「{}」尚未选择模型，可在设置中拉取模型列表后选择",
|
"引擎「{}」尚未选择模型，可在设置中拉取模型列表后选择",
|
||||||
self.cfg.name
|
cfg.name
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
Ok(model.to_string())
|
Ok(model.to_string())
|
||||||
@@ -162,9 +162,9 @@ impl TranslateEngine for AiEngine {
|
|||||||
if req.text.trim().is_empty() {
|
if req.text.trim().is_empty() {
|
||||||
return Err(TranslateError::empty());
|
return Err(TranslateError::empty());
|
||||||
}
|
}
|
||||||
let key = self.require_key()?;
|
let key = Self::require_key(&self.cfg)?;
|
||||||
let model = self.require_model()?;
|
let model = Self::require_model(&self.cfg)?;
|
||||||
let endpoint = self.chat_endpoint()?;
|
let endpoint = Self::chat_endpoint(&self.cfg)?;
|
||||||
|
|
||||||
let mut body = serde_json::Map::new();
|
let mut body = serde_json::Map::new();
|
||||||
body.insert("model".to_string(), json!(model));
|
body.insert("model".to_string(), json!(model));
|
||||||
@@ -267,9 +267,9 @@ impl TranslateEngine for AiEngine {
|
|||||||
if req.text.trim().is_empty() && req.image_png.is_none() {
|
if req.text.trim().is_empty() && req.image_png.is_none() {
|
||||||
return Err(TranslateError::empty());
|
return Err(TranslateError::empty());
|
||||||
}
|
}
|
||||||
let key = self.require_key()?;
|
let key = Self::require_key(&self.cfg)?;
|
||||||
let model = self.require_model()?;
|
let model = Self::require_model(&self.cfg)?;
|
||||||
let endpoint = self.chat_endpoint()?;
|
let endpoint = Self::chat_endpoint(&self.cfg)?;
|
||||||
|
|
||||||
let mut body = serde_json::Map::new();
|
let mut body = serde_json::Map::new();
|
||||||
body.insert("model".to_string(), json!(model));
|
body.insert("model".to_string(), json!(model));
|
||||||
@@ -389,8 +389,8 @@ impl TranslateEngine for AiEngine {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn list_models(&self) -> Result<Vec<String>, TranslateError> {
|
async fn list_models(&self) -> Result<Vec<String>, TranslateError> {
|
||||||
let key = self.require_key()?;
|
let key = Self::require_key(&self.cfg)?;
|
||||||
let endpoint = self.models_endpoint()?;
|
let endpoint = Self::models_endpoint(&self.cfg)?;
|
||||||
let resp = self
|
let resp = self
|
||||||
.client
|
.client
|
||||||
.get(&endpoint)
|
.get(&endpoint)
|
||||||
@@ -591,3 +591,71 @@ struct ModelEntry {
|
|||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
id: String,
|
id: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 通用（非翻译语义）的对话补全入口：供终端 AI 助手等模块复用引擎配置。
|
||||||
|
///
|
||||||
|
/// 与翻译路径共享端点归一（剥 `/chat/completions` 后缀）、密钥存取
|
||||||
|
/// （凭据管理器）、`apply_common_params`（temperature / max_tokens / extra_body）
|
||||||
|
/// 与响应解析，但 **消息由调用方全量给定**——这里不含任何翻译提示词语义。
|
||||||
|
///
|
||||||
|
/// 刻意做成关联函数而不是 `AiEngine` 的实例方法：调用方（终端助手）只持有
|
||||||
|
/// `TranslateEngineConfig`，为它构造 `AiEngine` 还要 PromptTemplates 与 client，
|
||||||
|
/// 属于无谓的耦合。
|
||||||
|
pub async fn chat_once(
|
||||||
|
cfg: &TranslateEngineConfig,
|
||||||
|
messages: Vec<(&str, String)>,
|
||||||
|
) -> Result<String, String> {
|
||||||
|
let key = AiEngine::require_key(cfg).map_err(|e| e.to_string())?;
|
||||||
|
let model = AiEngine::require_model(cfg).map_err(|e| e.to_string())?;
|
||||||
|
let endpoint = AiEngine::chat_endpoint(cfg).map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
|
let mut body = serde_json::Map::new();
|
||||||
|
body.insert("model".to_string(), json!(model));
|
||||||
|
body.insert("stream".to_string(), json!(false));
|
||||||
|
body.insert(
|
||||||
|
"messages".to_string(),
|
||||||
|
json!(messages
|
||||||
|
.into_iter()
|
||||||
|
.map(|(role, content)| json!({ "role": role, "content": content }))
|
||||||
|
.collect::<Vec<_>>()),
|
||||||
|
);
|
||||||
|
apply_common_params(&mut body, cfg);
|
||||||
|
|
||||||
|
let client = reqwest::Client::new();
|
||||||
|
let resp = client
|
||||||
|
.post(&endpoint)
|
||||||
|
.bearer_auth(&key)
|
||||||
|
.timeout(Duration::from_millis(cfg.timeout_ms.max(1000)))
|
||||||
|
.json(&serde_json::Value::Object(body))
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| classify_reqwest(e, &cfg.name).to_string())?;
|
||||||
|
|
||||||
|
let status = resp.status();
|
||||||
|
let raw = resp
|
||||||
|
.text()
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("读取「{}」响应失败: {e}", cfg.name))?;
|
||||||
|
if !status.is_success() {
|
||||||
|
return Err(classify_http(status.as_u16(), &raw, &cfg.name, &model).to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
let parsed: ChatResponse = serde_json::from_str(&raw)
|
||||||
|
.map_err(|e| format!("「{}」响应不是预期的 JSON: {e}", cfg.name))?;
|
||||||
|
if let Some(err) = parsed.error {
|
||||||
|
let msg = err
|
||||||
|
.message
|
||||||
|
.filter(|m| !m.trim().is_empty())
|
||||||
|
.unwrap_or_else(|| "上游返回了错误对象".to_string());
|
||||||
|
return Err(format!("「{}」返回错误：{msg}", cfg.name));
|
||||||
|
}
|
||||||
|
|
||||||
|
parsed
|
||||||
|
.choices
|
||||||
|
.into_iter()
|
||||||
|
.next()
|
||||||
|
.and_then(|c| c.message.content)
|
||||||
|
.map(|s| s.trim().to_string())
|
||||||
|
.filter(|s| !s.is_empty())
|
||||||
|
.ok_or_else(|| format!("「{}」返回了空内容", cfg.name))
|
||||||
|
}
|
||||||
|
|||||||
@@ -50,9 +50,12 @@ pub use engines::{TranslateEngine, TranslateError, TranslateResult};
|
|||||||
// `engines::` / `settings::` 下，等真正用到时再提升到此处——提前摆出一堆无人消费的再导出，
|
// `engines::` / `settings::` 下，等真正用到时再提升到此处——提前摆出一堆无人消费的再导出，
|
||||||
// 只会让「谁在用」更难判断。
|
// 只会让「谁在用」更难判断。
|
||||||
pub use settings::TranslateSettings;
|
pub use settings::TranslateSettings;
|
||||||
|
// 终端 AI 助手（terminal/assistant.rs）复用引擎配置与通用对话补全——
|
||||||
|
// 「现在真正用到了」，按上面的原则提升到此处。
|
||||||
|
pub use settings::TranslateEngineConfig;
|
||||||
|
pub use engines::ai::chat_once;
|
||||||
|
|
||||||
use engines::EngineRequest;
|
use engines::EngineRequest;
|
||||||
use settings::TranslateEngineConfig;
|
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use std::sync::Mutex;
|
use std::sync::Mutex;
|
||||||
use std::time::{Duration, Instant};
|
use std::time::{Duration, Instant};
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import TitleBar from '@/components/layout/TitleBar.vue'
|
|||||||
import Sidebar from '@/components/layout/Sidebar.vue'
|
import Sidebar from '@/components/layout/Sidebar.vue'
|
||||||
import ModuleContainer from '@/components/layout/ModuleContainer.vue'
|
import ModuleContainer from '@/components/layout/ModuleContainer.vue'
|
||||||
import NowPlayingDialog from '@/components/layout/NowPlayingDialog.vue'
|
import NowPlayingDialog from '@/components/layout/NowPlayingDialog.vue'
|
||||||
|
import TerminalQuickLaunch from '@/modules/terminal/TerminalQuickLaunch.vue'
|
||||||
import { Toaster } from '@/components/ui/sonner'
|
import { Toaster } from '@/components/ui/sonner'
|
||||||
import { useAppStore } from '@/stores/appStore'
|
import { useAppStore } from '@/stores/appStore'
|
||||||
import { useFeiniuStore } from '@/stores/feiniuStore'
|
import { useFeiniuStore } from '@/stores/feiniuStore'
|
||||||
@@ -299,6 +300,7 @@ onUnmounted(() => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<NowPlayingDialog />
|
<NowPlayingDialog />
|
||||||
|
<TerminalQuickLaunch />
|
||||||
<Toaster position="bottom-right" rich-colors close-button :style="{ zIndex: 99999 }" />
|
<Toaster position="bottom-right" rich-colors close-button :style="{ zIndex: 99999 }" />
|
||||||
</TooltipProvider>
|
</TooltipProvider>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -0,0 +1,61 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import {
|
||||||
|
Dialog,
|
||||||
|
DialogContent,
|
||||||
|
DialogDescription,
|
||||||
|
DialogFooter,
|
||||||
|
DialogHeader,
|
||||||
|
DialogTitle,
|
||||||
|
} from '@/components/ui/dialog'
|
||||||
|
import { Button } from '@/components/ui/button'
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 破坏性 / 重要操作确认框 —— 规范 P4 的落地件。
|
||||||
|
*
|
||||||
|
* variant="danger" 用于不可逆动作（停止内核、删除记录、清空历史）。
|
||||||
|
* 不要用 window.confirm：它无法承载「这次操作具体影响什么」的说明。
|
||||||
|
*/
|
||||||
|
withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
open: boolean
|
||||||
|
title: string
|
||||||
|
description?: string
|
||||||
|
confirmText?: string
|
||||||
|
cancelText?: string
|
||||||
|
variant?: 'default' | 'danger'
|
||||||
|
loading?: boolean
|
||||||
|
}>(),
|
||||||
|
{ confirmText: '确认', cancelText: '取消', variant: 'default', loading: false }
|
||||||
|
)
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
'update:open': [value: boolean]
|
||||||
|
confirm: []
|
||||||
|
}>()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<Dialog :open="open" @update:open="emit('update:open', $event)">
|
||||||
|
<DialogContent class="sm:max-w-md">
|
||||||
|
<DialogHeader>
|
||||||
|
<DialogTitle>{{ title }}</DialogTitle>
|
||||||
|
<DialogDescription v-if="description">{{ description }}</DialogDescription>
|
||||||
|
</DialogHeader>
|
||||||
|
|
||||||
|
<slot />
|
||||||
|
|
||||||
|
<DialogFooter>
|
||||||
|
<Button variant="outline" :disabled="loading" @click="emit('update:open', false)">
|
||||||
|
{{ cancelText }}
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
:variant="variant === 'danger' ? 'destructive' : 'default'"
|
||||||
|
:disabled="loading"
|
||||||
|
@click="emit('confirm')"
|
||||||
|
>
|
||||||
|
{{ confirmText }}
|
||||||
|
</Button>
|
||||||
|
</DialogFooter>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { onUnmounted, ref } from 'vue'
|
||||||
|
import { Check, Copy } from '@lucide/vue'
|
||||||
|
import { toast } from 'vue-sonner'
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 可复制文本（路径、版本号、ID）。
|
||||||
|
* 复制后图标短暂切换为对勾 —— 比只弹 toast 的反馈更即时。
|
||||||
|
*/
|
||||||
|
const props = withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
value: string
|
||||||
|
mono?: boolean
|
||||||
|
toastText?: string
|
||||||
|
}>(),
|
||||||
|
{ mono: false, toastText: '已复制' }
|
||||||
|
)
|
||||||
|
|
||||||
|
const copied = ref(false)
|
||||||
|
let timer: ReturnType<typeof setTimeout> | undefined
|
||||||
|
|
||||||
|
async function copy() {
|
||||||
|
try {
|
||||||
|
await navigator.clipboard.writeText(props.value)
|
||||||
|
copied.value = true
|
||||||
|
toast.success(props.toastText)
|
||||||
|
clearTimeout(timer)
|
||||||
|
timer = setTimeout(() => (copied.value = false), 1500)
|
||||||
|
} catch {
|
||||||
|
toast.error('复制失败')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onUnmounted(() => clearTimeout(timer))
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="group inline-flex min-w-0 max-w-full items-center gap-1.5 rounded-sm px-1.5 py-0.5 text-left transition-colors duration-150 outline-none hover:bg-hover focus-visible:ring-2 focus-visible:ring-ring/40"
|
||||||
|
:title="value"
|
||||||
|
@click="copy"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
class="truncate text-[13px] text-foreground"
|
||||||
|
:class="mono && 'font-mono tabular-nums'"
|
||||||
|
>
|
||||||
|
{{ value }}
|
||||||
|
</span>
|
||||||
|
<Check v-if="copied" class="size-3 shrink-0 text-success" :stroke-width="1.75" />
|
||||||
|
<Copy
|
||||||
|
v-else
|
||||||
|
class="size-3 shrink-0 text-muted-foreground opacity-0 transition-opacity duration-150 group-hover:opacity-100"
|
||||||
|
:stroke-width="1.75"
|
||||||
|
/>
|
||||||
|
</button>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
/**
|
||||||
|
* 列表行 —— 主从分栏（模式 B）左栏的条目。
|
||||||
|
* 选中态用 primary-soft，hover 态用中性 hover，两者不要混用同一个色。
|
||||||
|
*/
|
||||||
|
defineProps<{
|
||||||
|
title: string
|
||||||
|
subtitle?: string
|
||||||
|
active?: boolean
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const emit = defineEmits<{ select: [] }>()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
class="flex w-full items-center gap-3 px-3 py-2 text-left transition-colors duration-150 outline-none focus-visible:ring-2 focus-visible:ring-ring/40 focus-visible:ring-inset"
|
||||||
|
:class="active ? 'bg-primary-soft' : 'hover:bg-hover'"
|
||||||
|
@click="emit('select')"
|
||||||
|
>
|
||||||
|
<span class="flex min-w-0 flex-1 flex-col gap-0.5">
|
||||||
|
<span
|
||||||
|
class="truncate text-[13px]"
|
||||||
|
:class="active ? 'font-medium text-primary-soft-text' : 'text-foreground'"
|
||||||
|
>
|
||||||
|
{{ title }}
|
||||||
|
</span>
|
||||||
|
<span v-if="subtitle" class="truncate text-xs text-muted-foreground">{{ subtitle }}</span>
|
||||||
|
</span>
|
||||||
|
<span v-if="$slots.trailing" class="shrink-0">
|
||||||
|
<slot name="trailing" />
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
/**
|
||||||
|
* 信息分组 —— 概览类页面的组织单元（规范 4.4「平铺分组」）。
|
||||||
|
*
|
||||||
|
* 用「组标题 + 1px 分隔线 + 键值区」替代卡片：
|
||||||
|
* - 去掉卡片外框与 16px 内边距，纵向密度提升约 40%
|
||||||
|
* - 彻底避开「两列卡片高度不齐 → 矮的那列下方留空」的问题
|
||||||
|
*
|
||||||
|
* 与 StatCard 的分工：StatCard 用于「每块内容量接近、需要视觉分组」的场景；
|
||||||
|
* InfoGroup 用于「键值快照」类概览页，密度优先。
|
||||||
|
*/
|
||||||
|
withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
title: string
|
||||||
|
/** 键值区列数：1 = 单列（默认，一行一条、值有完整宽度）；2 = 双列（仅内容极短时用） */
|
||||||
|
columns?: 1 | 2
|
||||||
|
/** plain = 平铺无容器；card = 卡片形态（概览网格用，规范 4.4 D2 结构） */
|
||||||
|
variant?: 'plain' | 'card'
|
||||||
|
}>(),
|
||||||
|
{ columns: 1, variant: 'plain' }
|
||||||
|
)
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<section
|
||||||
|
class="flex flex-col"
|
||||||
|
:class="variant === 'card' && 'rounded-lg border border-border bg-card p-4 shadow-sm'"
|
||||||
|
>
|
||||||
|
<header class="flex min-h-8 items-center justify-between gap-3">
|
||||||
|
<h2 class="text-sm font-semibold text-foreground">{{ title }}</h2>
|
||||||
|
<div v-if="$slots.action" class="flex shrink-0 items-center gap-1.5">
|
||||||
|
<slot name="action" />
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div class="mt-2 border-t border-divider" />
|
||||||
|
|
||||||
|
<div
|
||||||
|
class="grid gap-x-10 pt-2"
|
||||||
|
:class="columns === 2 ? 'grid-cols-1 md:grid-cols-2' : 'grid-cols-1'"
|
||||||
|
>
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div v-if="$slots.footer" class="pt-3">
|
||||||
|
<slot name="footer" />
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
/**
|
||||||
|
* 键值行：左侧键名（次要色），右侧值（主文字色）。
|
||||||
|
*
|
||||||
|
* 这是「状态 / 当前版本 / 路径 / 模式」这类信息的统一承载方式，
|
||||||
|
* 此前各模块各自手写 flex + truncate，间距和对齐都不一致。
|
||||||
|
*
|
||||||
|
* 需要放徽章、开关、复制按钮等复杂内容时用默认插槽。
|
||||||
|
*/
|
||||||
|
withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
label: string
|
||||||
|
value?: string | number
|
||||||
|
/** 值用等宽数字（版本号、ID、计数） */
|
||||||
|
mono?: boolean
|
||||||
|
}>(),
|
||||||
|
{ mono: false }
|
||||||
|
)
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="flex min-h-8 items-center justify-between gap-3 py-1.5">
|
||||||
|
<span class="shrink-0 text-[13px] text-fg-secondary">{{ label }}</span>
|
||||||
|
<span
|
||||||
|
class="min-w-0 truncate text-right text-[13px] text-foreground"
|
||||||
|
:class="mono && 'font-mono tabular-nums'"
|
||||||
|
>
|
||||||
|
<slot>{{ value }}</slot>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { computed } from 'vue'
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 关键数值（速率、容量、计数）。
|
||||||
|
*
|
||||||
|
* 数字必须 tabular-nums —— 否则高频刷新时宽度会抖动，整行跟着跳。
|
||||||
|
* trend 只用于「有方向语义」的数值（下载/上传、收入/支出），不要拿它当状态色用。
|
||||||
|
*/
|
||||||
|
const props = withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
value: string | number
|
||||||
|
unit?: string
|
||||||
|
label?: string
|
||||||
|
trend?: 'down' | 'up'
|
||||||
|
size?: 'md' | 'lg'
|
||||||
|
}>(),
|
||||||
|
{ size: 'md' }
|
||||||
|
)
|
||||||
|
|
||||||
|
const valueClass = computed(() => {
|
||||||
|
if (props.trend === 'down') return 'text-data-down'
|
||||||
|
if (props.trend === 'up') return 'text-data-up'
|
||||||
|
return 'text-foreground'
|
||||||
|
})
|
||||||
|
|
||||||
|
const sizeClass = computed(() =>
|
||||||
|
props.size === 'lg' ? 'text-[26px] leading-8' : 'text-[22px] leading-7'
|
||||||
|
)
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="flex min-w-0 flex-col gap-1">
|
||||||
|
<span v-if="label" class="text-[11px] text-muted-foreground">{{ label }}</span>
|
||||||
|
<span class="flex items-baseline gap-1">
|
||||||
|
<span class="font-semibold tabular-nums" :class="[valueClass, sizeClass]">
|
||||||
|
{{ value }}
|
||||||
|
</span>
|
||||||
|
<span v-if="unit" class="text-xs text-muted-foreground">{{ unit }}</span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,96 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { computed } from 'vue'
|
||||||
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 模块外壳 —— 页面框架的唯一落地件，见 UI_DESIGN_SYSTEM.md 第 4 章。
|
||||||
|
*
|
||||||
|
* 它固定三件事，缺一就会出现「底部贴边」或「内容被裁」：
|
||||||
|
* 1. 高度约束链：h-full + min-h-0 一路传下去
|
||||||
|
* 2. 滚动归属：只有内容区滚动，Tab 行固定
|
||||||
|
* 3. padding 位置：加在滚动容器内部的 wrapper 上
|
||||||
|
*
|
||||||
|
* 模块自身不要再套 overflow 容器，否则会变成嵌套滚动。
|
||||||
|
*/
|
||||||
|
const props = withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
/** 内置 Tab 行（可选）。需要 TabsContent 这类面板切换时，改用 #header 插槽自带 */
|
||||||
|
tabs?: { value: string; label: string; count?: number }[]
|
||||||
|
activeTab?: string
|
||||||
|
/** 内容区布局，见规范 4.2 */
|
||||||
|
layout?: 'grid' | 'split' | 'workbench' | 'settings' | 'plain'
|
||||||
|
/** 内容区是否带内边距；split 与全出血布局传 false */
|
||||||
|
padded?: boolean
|
||||||
|
/** 内容区最大宽度，超出居中 —— 避免大屏上卡片被拉得过宽 */
|
||||||
|
maxWidth?: number
|
||||||
|
}>(),
|
||||||
|
{ layout: 'plain', padded: true, maxWidth: 0 }
|
||||||
|
)
|
||||||
|
|
||||||
|
const emit = defineEmits<{ 'update:activeTab': [value: string] }>()
|
||||||
|
|
||||||
|
const LAYOUT_CLASS = {
|
||||||
|
grid: 'grid grid-cols-1 content-start gap-4 md:grid-cols-2',
|
||||||
|
workbench: 'flex flex-col gap-3',
|
||||||
|
settings: 'flex flex-col gap-6',
|
||||||
|
split: 'flex h-full min-h-0',
|
||||||
|
plain: 'flex flex-col gap-3',
|
||||||
|
} as const
|
||||||
|
|
||||||
|
/** split 需要撑满高度、由内部分栏各自滚动，外壳不能再包一层滚动 */
|
||||||
|
const isFill = computed(() => props.layout === 'split')
|
||||||
|
|
||||||
|
const innerClass = computed(() =>
|
||||||
|
cn(props.padded && !isFill.value && 'p-5', LAYOUT_CLASS[props.layout])
|
||||||
|
)
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="flex h-full min-h-0 flex-col">
|
||||||
|
<!-- 固定层 #1：模块自定义头部（通常由 ModuleToolbar 填充） -->
|
||||||
|
<slot name="toolbar" />
|
||||||
|
|
||||||
|
<!-- 固定层 #2：Tab 行。自定义内容走 #header，否则用内置 tabs -->
|
||||||
|
<slot name="header">
|
||||||
|
<nav
|
||||||
|
v-if="tabs?.length"
|
||||||
|
class="flex h-12 shrink-0 items-center gap-1 border-b border-border px-5"
|
||||||
|
role="tablist"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
v-for="tab in tabs"
|
||||||
|
:key="tab.value"
|
||||||
|
type="button"
|
||||||
|
role="tab"
|
||||||
|
:aria-selected="activeTab === tab.value"
|
||||||
|
class="tab-underline relative inline-flex shrink-0 items-center gap-1.5 rounded-md px-3 py-2 text-[13px] transition-colors duration-150 outline-none hover:bg-hover focus-visible:ring-2 focus-visible:ring-ring/40"
|
||||||
|
:class="
|
||||||
|
activeTab === tab.value
|
||||||
|
? 'font-medium text-primary'
|
||||||
|
: 'text-fg-secondary hover:text-foreground'
|
||||||
|
"
|
||||||
|
@click="emit('update:activeTab', tab.value)"
|
||||||
|
>
|
||||||
|
{{ tab.label }}
|
||||||
|
<span v-if="tab.count" class="tabular-nums opacity-70">{{ tab.count }}</span>
|
||||||
|
</button>
|
||||||
|
</nav>
|
||||||
|
</slot>
|
||||||
|
|
||||||
|
<!-- split：撑满，由内部分栏自己滚 -->
|
||||||
|
<div v-if="isFill" class="min-h-0 flex-1">
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 其余：内容区滚动，padding 在内层 wrapper 上（否则底部 padding 会被内容盖掉） -->
|
||||||
|
<div v-else class="min-h-0 flex-1 overflow-y-auto">
|
||||||
|
<div
|
||||||
|
class="mx-auto w-full"
|
||||||
|
:class="innerClass"
|
||||||
|
:style="maxWidth ? { maxWidth: `${maxWidth}px` } : undefined"
|
||||||
|
>
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
/**
|
||||||
|
* 模块内容区顶部的操作条。
|
||||||
|
* 统一 48px 高、20px 左右内边距、底部 1px 分隔，避免各模块自定高度和间距。
|
||||||
|
*/
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="flex h-12 shrink-0 items-center justify-between gap-3 border-b border-border px-5">
|
||||||
|
<div class="flex min-w-0 items-center gap-2">
|
||||||
|
<slot name="left" />
|
||||||
|
</div>
|
||||||
|
<div class="flex shrink-0 items-center gap-1.5">
|
||||||
|
<slot name="right" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
/**
|
||||||
|
* 区块标题（h1 = 16px）。
|
||||||
|
* 用在内容区里做分组标题，区别于卡片内的 h2(14px)。
|
||||||
|
*/
|
||||||
|
defineProps<{
|
||||||
|
title: string
|
||||||
|
description?: string
|
||||||
|
}>()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="flex items-start justify-between gap-3">
|
||||||
|
<div class="flex min-w-0 flex-col gap-1">
|
||||||
|
<h2 class="truncate text-base font-semibold text-foreground">{{ title }}</h2>
|
||||||
|
<p v-if="description" class="text-xs text-muted-foreground">{{ description }}</p>
|
||||||
|
</div>
|
||||||
|
<div v-if="$slots.action" class="shrink-0">
|
||||||
|
<slot name="action" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -33,11 +33,11 @@ const emit = defineEmits<{ 'update:modelValue': [value: string] }>()
|
|||||||
type="button"
|
type="button"
|
||||||
role="tab"
|
role="tab"
|
||||||
:aria-selected="modelValue === item.value"
|
:aria-selected="modelValue === item.value"
|
||||||
class="flex min-w-0 flex-1 items-center justify-center gap-1.5 rounded-[7px] px-3 py-1.5 text-[13px] transition-colors duration-150 outline-none focus-visible:ring-2 focus-visible:ring-ring/50"
|
class="flex min-w-0 flex-1 items-center justify-center gap-1.5 rounded-md px-3 py-1.5 text-[13px] transition-colors duration-150 outline-none focus-visible:ring-2 focus-visible:ring-ring/40"
|
||||||
:class="
|
:class="
|
||||||
modelValue === item.value
|
modelValue === item.value
|
||||||
? 'bg-background font-medium text-foreground shadow-sm'
|
? 'bg-primary-soft font-medium text-primary-soft-text'
|
||||||
: 'text-muted-foreground hover:text-foreground'
|
: 'text-fg-secondary hover:bg-hover hover:text-foreground'
|
||||||
"
|
"
|
||||||
@click="emit('update:modelValue', item.value)"
|
@click="emit('update:modelValue', item.value)"
|
||||||
>
|
>
|
||||||
@@ -45,8 +45,12 @@ const emit = defineEmits<{ 'update:modelValue': [value: string] }>()
|
|||||||
<span class="truncate">{{ item.label }}</span>
|
<span class="truncate">{{ item.label }}</span>
|
||||||
<span
|
<span
|
||||||
v-if="item.count"
|
v-if="item.count"
|
||||||
class="shrink-0 rounded-full bg-muted px-1.5 text-[10px] tabular-nums text-muted-foreground"
|
class="shrink-0 rounded-full px-1.5 text-[10px] tabular-nums"
|
||||||
:class="modelValue === item.value ? 'bg-muted' : 'bg-background/70'"
|
:class="
|
||||||
|
modelValue === item.value
|
||||||
|
? 'bg-primary-soft-text/15 text-primary-soft-text'
|
||||||
|
: 'bg-card/70 text-fg-secondary'
|
||||||
|
"
|
||||||
>
|
>
|
||||||
{{ item.count }}
|
{{ item.count }}
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
/**
|
||||||
|
* 设置分组：标题 + 一组 SettingRow。
|
||||||
|
*
|
||||||
|
* # 卡片化承载
|
||||||
|
*
|
||||||
|
* 组内容用项目的 `Card` + `CardContent` 承载，而不是手写
|
||||||
|
* `rounded-lg border bg-card`：项目里「卡片」的统一口径是
|
||||||
|
* `rounded-xl + shadow-sm`（见 UI_DESIGN_SYSTEM 与各模块横幅），手写那份
|
||||||
|
* 既少了阴影、圆角也小一号 —— 结果是同一个设置页里，用 SettingGroup 的分组
|
||||||
|
* 没有阴影、直接用 Card 的分组（Shell / 快捷键）有阴影，看着像两套体系。
|
||||||
|
*
|
||||||
|
* 行的分隔（1px divider）与内边距留在这里：Card 默认的 `py-6 gap-6`
|
||||||
|
* 对「一叠设置行」来说过宽，用 `!py-0 !gap-0` 让行自己掌控垂直间距。
|
||||||
|
*/
|
||||||
|
import { Card, CardContent } from '@/components/ui/card'
|
||||||
|
|
||||||
|
defineProps<{
|
||||||
|
title: string
|
||||||
|
description?: string
|
||||||
|
}>()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<section class="flex flex-col gap-3">
|
||||||
|
<div class="flex min-w-0 flex-col gap-1">
|
||||||
|
<h2 class="text-sm font-semibold text-foreground">{{ title }}</h2>
|
||||||
|
<p v-if="description" class="text-xs text-muted-foreground">{{ description }}</p>
|
||||||
|
</div>
|
||||||
|
<Card class="!py-0 !gap-0">
|
||||||
|
<CardContent class="flex flex-col divide-y divide-divider px-4">
|
||||||
|
<slot />
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
</section>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
/**
|
||||||
|
* 设置行：左标签（可带说明），右控件。
|
||||||
|
* 行高 44px，分组内由 SettingGroup 用 1px divider 分隔。
|
||||||
|
*/
|
||||||
|
withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
label: string
|
||||||
|
description?: string
|
||||||
|
/** wide = 控件固定 200px，用于下拉/输入框对齐；auto = 自适应（开关、按钮） */
|
||||||
|
controlWidth?: 'auto' | 'wide'
|
||||||
|
}>(),
|
||||||
|
{ controlWidth: 'auto' }
|
||||||
|
)
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="flex min-h-11 items-center justify-between gap-4 py-2">
|
||||||
|
<div class="flex min-w-0 flex-col gap-0.5">
|
||||||
|
<span class="text-[13px] text-foreground">{{ label }}</span>
|
||||||
|
<span v-if="description" class="text-xs text-muted-foreground">{{ description }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="shrink-0" :class="controlWidth === 'wide' && 'w-50'">
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
/**
|
||||||
|
* 键值/指标卡片 —— 概览类内容区（模式 A 卡片网格）的最小单元。
|
||||||
|
*
|
||||||
|
* 默认无阴影，靠 1px 描边与 --canvas 底色区分层级（规范 P7）。
|
||||||
|
* 卡片内边距 16px、标题与内容间距 12px，不要逐处覆盖。
|
||||||
|
*/
|
||||||
|
defineProps<{
|
||||||
|
title: string
|
||||||
|
description?: string
|
||||||
|
}>()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<section class="flex flex-col gap-3 rounded-lg border border-border bg-card p-4 shadow-sm">
|
||||||
|
<header class="flex items-center justify-between gap-2">
|
||||||
|
<h3 class="truncate text-sm font-semibold text-foreground">{{ title }}</h3>
|
||||||
|
<div v-if="$slots.action" class="shrink-0">
|
||||||
|
<slot name="action" />
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<p v-if="description" class="text-xs text-muted-foreground">{{ description }}</p>
|
||||||
|
|
||||||
|
<div class="flex min-w-0 flex-col">
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { computed } from 'vue'
|
||||||
|
import { Inbox, Loader2, ShieldOff, TriangleAlert } from '@lucide/vue'
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 四态占位块 —— 规范 P3 的落地件。
|
||||||
|
*
|
||||||
|
* 任何数据驱动的界面都必须能从这四态里选一个渲染，不允许留白。
|
||||||
|
* 使用方式：v-if 链上按 loading → error → empty → 内容 的顺序判断。
|
||||||
|
*/
|
||||||
|
const props = withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
variant: 'loading' | 'empty' | 'error' | 'denied'
|
||||||
|
title?: string
|
||||||
|
description?: string
|
||||||
|
/** 占位高度，默认 140；放在卡片里可传更小值 */
|
||||||
|
minHeight?: number
|
||||||
|
}>(),
|
||||||
|
{ minHeight: 140 }
|
||||||
|
)
|
||||||
|
|
||||||
|
const PRESET = {
|
||||||
|
loading: { icon: Loader2, title: '加载中…', spin: true },
|
||||||
|
empty: { icon: Inbox, title: '暂无数据', spin: false },
|
||||||
|
error: { icon: TriangleAlert, title: '加载失败', spin: false },
|
||||||
|
denied: { icon: ShieldOff, title: '无访问权限', spin: false },
|
||||||
|
} as const
|
||||||
|
|
||||||
|
const preset = computed(() => PRESET[props.variant])
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div
|
||||||
|
class="flex w-full flex-col items-center justify-center gap-2 px-6 text-center"
|
||||||
|
:style="{ minHeight: `${minHeight}px` }"
|
||||||
|
>
|
||||||
|
<component
|
||||||
|
:is="preset.icon"
|
||||||
|
class="size-8 shrink-0"
|
||||||
|
:class="[variant === 'error' ? 'text-danger' : 'text-fg-disabled', preset.spin && 'animate-spin']"
|
||||||
|
:stroke-width="1.75"
|
||||||
|
/>
|
||||||
|
<p class="text-[13px] font-medium text-foreground">{{ title ?? preset.title }}</p>
|
||||||
|
<p v-if="description" class="max-w-xs text-xs text-muted-foreground">{{ description }}</p>
|
||||||
|
<div v-if="$slots.action" class="mt-1">
|
||||||
|
<slot name="action" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { computed } from 'vue'
|
||||||
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 语义徽章。
|
||||||
|
*
|
||||||
|
* 三件套用法：底色取 --<state>-soft，文字取 --<state>-text。
|
||||||
|
* 禁止用实心状态色做徽章底（那是状态点的用法）。
|
||||||
|
*/
|
||||||
|
const props = withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
variant?: 'success' | 'warning' | 'danger' | 'info' | 'neutral' | 'accent'
|
||||||
|
size?: 'sm' | 'md'
|
||||||
|
}>(),
|
||||||
|
{ variant: 'neutral', size: 'md' }
|
||||||
|
)
|
||||||
|
|
||||||
|
const variantClass = computed(
|
||||||
|
() =>
|
||||||
|
({
|
||||||
|
success: 'bg-success-soft text-success-text',
|
||||||
|
warning: 'bg-warning-soft text-warning-text',
|
||||||
|
danger: 'bg-danger-soft text-danger-text',
|
||||||
|
info: 'bg-info-soft text-info-text',
|
||||||
|
neutral: 'bg-neutral-soft text-neutral-text',
|
||||||
|
accent: 'bg-primary-soft text-primary-soft-text',
|
||||||
|
})[props.variant]
|
||||||
|
)
|
||||||
|
|
||||||
|
const sizeClass = computed(() =>
|
||||||
|
props.size === 'sm' ? 'h-5 px-2 text-[11px]' : 'h-6 px-2.5 text-xs'
|
||||||
|
)
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<span
|
||||||
|
class="inline-flex shrink-0 items-center gap-1 rounded-sm font-medium whitespace-nowrap"
|
||||||
|
:class="cn(variantClass, sizeClass)"
|
||||||
|
>
|
||||||
|
<slot />
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { computed } from 'vue'
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 状态点 + 文字。
|
||||||
|
*
|
||||||
|
* 状态色只表达「系统状态」，不得用在可点击元素上（规范 P1）——
|
||||||
|
* 需要表达「可点击」时用 --primary，需要表达状态时用这里。
|
||||||
|
*/
|
||||||
|
const props = withDefaults(
|
||||||
|
defineProps<{
|
||||||
|
state?: 'success' | 'warning' | 'danger' | 'info' | 'neutral'
|
||||||
|
label?: string
|
||||||
|
/** 持续态（运行中 / 连接中）才开呼吸动效；瞬时状态不要开 */
|
||||||
|
pulse?: boolean
|
||||||
|
}>(),
|
||||||
|
{ state: 'neutral', pulse: false }
|
||||||
|
)
|
||||||
|
|
||||||
|
const dotClass = computed(
|
||||||
|
() =>
|
||||||
|
({
|
||||||
|
success: 'bg-success',
|
||||||
|
warning: 'bg-warning',
|
||||||
|
danger: 'bg-danger',
|
||||||
|
info: 'bg-info',
|
||||||
|
neutral: 'bg-neutral',
|
||||||
|
})[props.state]
|
||||||
|
)
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<span class="inline-flex min-w-0 items-center gap-1.5">
|
||||||
|
<span
|
||||||
|
class="size-2 shrink-0 rounded-full"
|
||||||
|
:class="[dotClass, pulse && 'status-dot-pulse']"
|
||||||
|
aria-hidden="true"
|
||||||
|
/>
|
||||||
|
<span v-if="label" class="truncate text-[13px] text-foreground">{{ label }}</span>
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
/**
|
||||||
|
* 业务组件层 —— 规范见 UI_DESIGN_SYSTEM.md 第 5 章。
|
||||||
|
*
|
||||||
|
* 这一层负责「把 token 组装成模块能直接用的结构」。
|
||||||
|
* 模块内不得再手写状态点、徽章、卡片标题、键值行、四态占位等结构，
|
||||||
|
* 一律从这里取 —— 否则又会退回各写各的状态。
|
||||||
|
*/
|
||||||
|
|
||||||
|
export { default as ConfirmDialog } from './ConfirmDialog.vue'
|
||||||
|
export { default as CopyField } from './CopyField.vue'
|
||||||
|
export { default as DataListRow } from './DataListRow.vue'
|
||||||
|
export { default as InfoGroup } from './InfoGroup.vue'
|
||||||
|
export { default as KeyValueRow } from './KeyValueRow.vue'
|
||||||
|
export { default as MetricValue } from './MetricValue.vue'
|
||||||
|
export { default as ModuleShell } from './ModuleShell.vue'
|
||||||
|
export { default as ModuleToolbar } from './ModuleToolbar.vue'
|
||||||
|
export { default as SectionHeader } from './SectionHeader.vue'
|
||||||
|
export { default as SettingGroup } from './SettingGroup.vue'
|
||||||
|
export { default as SettingRow } from './SettingRow.vue'
|
||||||
|
export { default as StatCard } from './StatCard.vue'
|
||||||
|
export { default as StateBlock } from './StateBlock.vue'
|
||||||
|
export { default as StatusBadge } from './StatusBadge.vue'
|
||||||
|
export { default as StatusDot } from './StatusDot.vue'
|
||||||
|
|
||||||
|
export { default as SegmentedNav } from './SegmentedNav.vue'
|
||||||
@@ -35,7 +35,7 @@ watch(
|
|||||||
<div
|
<div
|
||||||
v-if="activeComponent"
|
v-if="activeComponent"
|
||||||
:key="activeModule"
|
:key="activeModule"
|
||||||
class="min-h-full w-full"
|
class="h-full w-full"
|
||||||
>
|
>
|
||||||
<component :is="activeComponent" />
|
<component :is="activeComponent" />
|
||||||
</div>
|
</div>
|
||||||
@@ -76,6 +76,20 @@ watch(
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
|
/*
|
||||||
|
* 穿透 reka-ui ScrollArea 的内部 content wrapper。
|
||||||
|
*
|
||||||
|
* reka 的 viewport（overflow 滚动容器）与我们的内容之间还有一层**无高度样式的
|
||||||
|
* div**，百分比高度链在这里断掉——模块根的 `h-full` 解析为 auto，全高模块
|
||||||
|
* （终端/翻译）塌缩成内容高度，表现为卡片下方留白。给它显式 100%：
|
||||||
|
* 内容矮于视口时撑满，高于视口时溢出仍由 viewport 滚动（scrollHeight 计入
|
||||||
|
* 后代溢出），两种场景都不破坏。限定 data-main-scroll 只作用于主滚动区，
|
||||||
|
* 不影响模块内部的局部 ScrollArea。
|
||||||
|
*/
|
||||||
|
:deep([data-main-scroll] [data-reka-scroll-area-viewport] > div) {
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
.fade-slide-enter-active,
|
.fade-slide-enter-active,
|
||||||
.fade-slide-leave-active {
|
.fade-slide-leave-active {
|
||||||
transition: all 0.3s ease;
|
transition: all 0.3s ease;
|
||||||
|
|||||||
@@ -0,0 +1,56 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
/**
|
||||||
|
* 模块内子页的工具条（页壳的头部）。
|
||||||
|
*
|
||||||
|
* # 它替代了什么
|
||||||
|
*
|
||||||
|
* 此前终端模块的六个子页各自套一层 `rounded-lg border bg-background` 的容器，
|
||||||
|
* 容器顶端再放一条 `h-11 + border-b` 的标题栏 —— 合起来读作「模块里嵌了一个
|
||||||
|
* 独立窗口」。而其它模块（proxy / monitor / music / clipboard / downloader）
|
||||||
|
* 的页内一致是「一条漂浮的工具条 + 直接铺开的内容」，没有任何容器边框。
|
||||||
|
*
|
||||||
|
* 这个组件就是那条漂浮工具条：**无边框、无底部分隔线、无内边距**，
|
||||||
|
* 靠 `mb-3` 与下方内容留出间距。各页只需保证自己的内容区是
|
||||||
|
* `flex-1 min-h-0`，整页的层次就与其它模块一致。
|
||||||
|
*
|
||||||
|
* # 为什么标题不删
|
||||||
|
*
|
||||||
|
* 模块级 Tabs 已经写了「主机」「凭据」，页内再写一遍标题看似冗余，
|
||||||
|
* 但合并页（凭据 = 密钥 + 已知主机）里工具条还承载分区开关与计数，
|
||||||
|
* 且这些页面会被全局搜索直接跳到 —— 标题是「我落在哪一页」的确认。
|
||||||
|
* 保留标题、去掉边框，才是这次改动要的效果。
|
||||||
|
*
|
||||||
|
* # 用法
|
||||||
|
*
|
||||||
|
* ```vue
|
||||||
|
* <div class="flex flex-col h-full overflow-hidden">
|
||||||
|
* <PageToolbar :icon="Globe" title="SSH 主机" :meta="`共 ${n} 台`">
|
||||||
|
* <Button size="sm">新建主机</Button> <!-- 默认插槽 = 右侧动作区 -->
|
||||||
|
* </PageToolbar>
|
||||||
|
* <ScrollArea class="flex-1 min-h-0">…</ScrollArea>
|
||||||
|
* </div>
|
||||||
|
* ```
|
||||||
|
*
|
||||||
|
* 需要放在标题与动作之间的信息（如历史页的筛选摘要、分区开关）用 `info` 具名插槽。
|
||||||
|
*/
|
||||||
|
import type { Component } from 'vue'
|
||||||
|
|
||||||
|
defineProps<{
|
||||||
|
/** lucide 图标组件 */
|
||||||
|
icon: Component
|
||||||
|
title: string
|
||||||
|
/** 标题右侧的次要信息（数量、状态等）。为空则不渲染 */
|
||||||
|
meta?: string
|
||||||
|
}>()
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<div class="shrink-0 flex items-center gap-2 mb-3 min-h-8">
|
||||||
|
<component :is="icon" class="size-4 text-muted-foreground shrink-0" />
|
||||||
|
<h3 class="text-sm font-medium shrink-0">{{ title }}</h3>
|
||||||
|
<span v-if="meta" class="text-xs text-muted-foreground shrink-0">{{ meta }}</span>
|
||||||
|
<slot name="info" />
|
||||||
|
<div class="flex-1 min-w-0" />
|
||||||
|
<slot />
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
@@ -328,7 +328,7 @@ const handleBlur = () => {
|
|||||||
:class="
|
:class="
|
||||||
tabsStore.activeTab === tab.value
|
tabsStore.activeTab === tab.value
|
||||||
? 'bg-primary text-primary-foreground'
|
? 'bg-primary text-primary-foreground'
|
||||||
: 'text-muted-foreground hover:text-foreground hover:bg-secondary/60'
|
: 'text-muted-foreground hover:bg-primary-soft hover:text-primary-soft-text'
|
||||||
"
|
"
|
||||||
@click="tabsStore.setActiveTab(tab.value)"
|
@click="tabsStore.setActiveTab(tab.value)"
|
||||||
@mousedown.stop
|
@mousedown.stop
|
||||||
|
|||||||
@@ -3,31 +3,41 @@ import { cva } from "class-variance-authority"
|
|||||||
|
|
||||||
export { default as Button } from "./Button.vue"
|
export { default as Button } from "./Button.vue"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 按钮变体 —— 约束见 UI_DESIGN_SYSTEM.md 第 5.2 节
|
||||||
|
*
|
||||||
|
* hover 语义（这里曾经是界面最大的观感问题）：
|
||||||
|
* 主按钮 → 底色变深（--primary-hover），不用透明度方案（/90 在深色上方向是反的）
|
||||||
|
* 次按钮 → 中性加深（--hover）
|
||||||
|
* 幽灵按钮 → 带强调色的淡底（--primary-soft），让"可点击"一眼可见
|
||||||
|
*
|
||||||
|
* 尺寸统一 28 / 34 / 40。基础组件是实现尺寸标尺的地方，允许等值任意值；
|
||||||
|
* 业务代码不得照抄这种写法。
|
||||||
|
*/
|
||||||
export const buttonVariants = cva(
|
export const buttonVariants = cva(
|
||||||
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-3 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
|
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-[13px] font-medium transition-[background-color,border-color,color,box-shadow,transform] duration-150 outline-none focus-visible:ring-2 focus-visible:ring-ring/40 aria-invalid:ring-destructive/20 aria-invalid:border-destructive active:scale-[0.97] disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0",
|
||||||
{
|
{
|
||||||
variants: {
|
variants: {
|
||||||
variant: {
|
variant: {
|
||||||
default:
|
/** 主操作：同屏仅允许一个 */
|
||||||
"bg-primary text-primary-foreground hover:bg-primary/90",
|
default: "bg-primary text-primary-foreground hover:bg-primary-hover active:bg-primary-active",
|
||||||
destructive:
|
/** 破坏性操作：必须配合 ConfirmDialog */
|
||||||
"bg-destructive text-white hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
|
destructive: "bg-danger text-white hover:bg-danger/90 focus-visible:ring-danger/30",
|
||||||
outline:
|
/** 次操作：描边卡片底，中性 hover */
|
||||||
"border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50",
|
outline: "border border-border-strong bg-card text-foreground hover:bg-hover active:bg-active",
|
||||||
secondary:
|
secondary: "bg-secondary text-secondary-foreground hover:bg-hover active:bg-active",
|
||||||
"bg-secondary text-secondary-foreground hover:bg-secondary/80",
|
/** 幽灵操作：工具栏、图标按钮。hover 带强调色 */
|
||||||
ghost:
|
ghost: "text-fg-secondary hover:bg-primary-soft hover:text-primary-soft-text",
|
||||||
"hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
|
|
||||||
link: "text-primary underline-offset-4 hover:underline",
|
link: "text-primary underline-offset-4 hover:underline",
|
||||||
},
|
},
|
||||||
size: {
|
size: {
|
||||||
"default": "h-9 px-4 py-2 has-[>svg]:px-3",
|
"default": "h-[34px] px-3.5 py-2 has-[>svg]:px-3",
|
||||||
"xs": "h-6 gap-1 rounded-md px-2 text-xs has-[>svg]:px-1.5 [&_svg:not([class*='size-'])]:size-3",
|
"xs": "h-6 gap-1 rounded-sm px-2 text-[11px] has-[>svg]:px-1.5 [&_svg:not([class*='size-'])]:size-3",
|
||||||
"sm": "h-8 rounded-md gap-1.5 px-3 has-[>svg]:px-2.5",
|
"sm": "h-7 gap-1.5 rounded-md px-2.5 text-xs has-[>svg]:px-2",
|
||||||
"lg": "h-10 rounded-md px-6 has-[>svg]:px-4",
|
"lg": "h-10 rounded-md px-6 has-[>svg]:px-4",
|
||||||
"icon": "size-9",
|
"icon": "size-[34px]",
|
||||||
"icon-xs": "size-6 rounded-md [&_svg:not([class*='size-'])]:size-3",
|
"icon-xs": "size-6 rounded-sm [&_svg:not([class*='size-'])]:size-3",
|
||||||
"icon-sm": "size-8",
|
"icon-sm": "size-7",
|
||||||
"icon-lg": "size-10",
|
"icon-lg": "size-10",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import { cn } from "@/lib/utils"
|
|||||||
const props = defineProps<CalendarHeadingProps & { class?: HTMLAttributes["class"] }>()
|
const props = defineProps<CalendarHeadingProps & { class?: HTMLAttributes["class"] }>()
|
||||||
|
|
||||||
defineSlots<{
|
defineSlots<{
|
||||||
default: (props: { headingValue: string }) => any
|
default: (props: { headingValue: string }) => unknown
|
||||||
}>()
|
}>()
|
||||||
|
|
||||||
const delegatedProps = reactiveOmit(props, "class")
|
const delegatedProps = reactiveOmit(props, "class")
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits)
|
|||||||
data-slot="switch"
|
data-slot="switch"
|
||||||
v-bind="forwarded"
|
v-bind="forwarded"
|
||||||
:class="cn(
|
:class="cn(
|
||||||
'peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:ring-3 disabled:cursor-not-allowed disabled:opacity-50 cursor-pointer hover:data-[state=checked]:bg-primary/90 hover:data-[state=unchecked]:bg-input/70 active:scale-95',
|
'peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/40 inline-flex h-[18px] w-8 shrink-0 cursor-pointer items-center rounded-full border border-transparent outline-none transition-colors focus-visible:ring-2 disabled:cursor-not-allowed disabled:opacity-50 hover:data-[state=checked]:bg-primary-hover hover:data-[state=unchecked]:bg-active',
|
||||||
props.class,
|
props.class,
|
||||||
)"
|
)"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ const forwardedProps = useForwardProps(delegatedProps)
|
|||||||
<TabsTrigger
|
<TabsTrigger
|
||||||
data-slot="tabs-trigger"
|
data-slot="tabs-trigger"
|
||||||
:class="cn(
|
:class="cn(
|
||||||
'data-[state=active]:bg-background dark:data-[state=active]:text-foreground focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:outline-ring dark:data-[state=active]:border-input dark:data-[state=active]:bg-input/30 text-foreground dark:text-muted-foreground inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-2 py-1 text-sm font-medium whitespace-nowrap transition-[color,background-color,box-shadow] duration-200 ease-out focus-visible:ring-3 focus-visible:outline-1 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4',
|
'tab-underline relative text-fg-secondary hover:bg-hover hover:text-foreground data-[state=active]:font-medium data-[state=active]:text-primary data-[state=active]:hover:bg-transparent focus-visible:ring-ring/40 inline-flex h-full flex-1 items-center justify-center gap-1.5 rounded-md border-0 px-3 py-2 text-[13px] whitespace-nowrap transition-colors duration-150 outline-none focus-visible:ring-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*=\'size-\'])]:size-4',
|
||||||
props.class,
|
props.class,
|
||||||
)"
|
)"
|
||||||
v-bind="forwardedProps"
|
v-bind="forwardedProps"
|
||||||
|
|||||||
@@ -0,0 +1,538 @@
|
|||||||
|
import { computed, ref, watch, type Ref } from 'vue'
|
||||||
|
import { useTerminalStore } from '@/stores/terminalStore'
|
||||||
|
import { createLogger } from '@/lib/logger'
|
||||||
|
import type { ShortcutBinding, TerminalSettings } from '@/types/terminal'
|
||||||
|
import { TERMINAL_ACTIONS } from '@/lib/terminalActions'
|
||||||
|
import { appIsDark, effectiveThemeName } from '@/lib/terminalThemes'
|
||||||
|
|
||||||
|
const logger = createLogger('terminal')
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 终端会话的窗口级编排。
|
||||||
|
*
|
||||||
|
* # 职责划分
|
||||||
|
*
|
||||||
|
* | 层 | 职责 |
|
||||||
|
* |---|---|
|
||||||
|
* | `TerminalPane` | 一个 xterm 实例 ↔ 一个 sessionId 的绑定（渲染与输入） |
|
||||||
|
* | `useTerminalStream`（本文件） | 窗口级状态：标签顺序、活跃标签、分屏布局、快捷键解析 |
|
||||||
|
* | `TerminalModule` | 主窗口的页面骨架（侧栏 + 标签 + 面板） |
|
||||||
|
* | `TerminalWindow` | 独立窗口的骨架（单个会话，无侧栏） |
|
||||||
|
*
|
||||||
|
* 抽出来是因为主窗口与独立窗口需要**同一套**会话状态与快捷键逻辑，
|
||||||
|
* 差别只在「渲染什么」。若各自实现一遍，两边行为迟早分叉。
|
||||||
|
*/
|
||||||
|
export function useTerminalStream(options?: { fixedSessionId?: Ref<string | null> }) {
|
||||||
|
const store = useTerminalStore()
|
||||||
|
|
||||||
|
/** 主窗口下「当前聚焦」的会话（独立窗口下恒为 fixedSessionId） */
|
||||||
|
const activeSessionId = ref<string | null>(null)
|
||||||
|
/** 标签展示顺序（用户可拖动重排；与 store.sessions 解耦，避免后端刷新打乱用户排序） */
|
||||||
|
const tabOrder = ref<string[]>([])
|
||||||
|
|
||||||
|
/** 分屏：当前标签内并列展示的会话（长度为 1 时即普通单面板） */
|
||||||
|
const panes = ref<Array<{ id: string; sessionId: string }>>([])
|
||||||
|
|
||||||
|
// 这里曾有一份 `overlay`（当前打开的浮层）与 `searchTerm` 状态：模块 Tabs 与
|
||||||
|
// 控制栏浮层接管导航之后，它们既没有被写入也没有被读取，是「内嵌独立应用」
|
||||||
|
// 时期的残留，2026-09-22 清理。浮层开合现在分别归属模块根（tab）与
|
||||||
|
// `modules/terminal/useRecordPopovers`（控制栏上的历史/片段）。
|
||||||
|
|
||||||
|
// ===== 标签 =====
|
||||||
|
|
||||||
|
/** 按标签顺序排列的会话列表 */
|
||||||
|
const orderedSessions = computed(() => {
|
||||||
|
const byId = new Map(store.sessions.map(s => [s.id, s]))
|
||||||
|
const ordered = tabOrder.value.map(id => byId.get(id)).filter(Boolean) as typeof store.sessions
|
||||||
|
// 后端新增但还没进 tabOrder 的会话（如从独立窗口或快捷键新建）追加到末尾，
|
||||||
|
// 否则会出现「新建了会话但标签栏看不到」的迷惑现象
|
||||||
|
for (const s of store.sessions) {
|
||||||
|
if (!tabOrder.value.includes(s.id)) ordered.push(s)
|
||||||
|
}
|
||||||
|
return ordered
|
||||||
|
})
|
||||||
|
|
||||||
|
const activeSession = computed(() =>
|
||||||
|
activeSessionId.value ? store.sessionById(activeSessionId.value) : undefined
|
||||||
|
)
|
||||||
|
|
||||||
|
/** 同步 tabOrder：加入新会话、剔除已删除的 */
|
||||||
|
function syncTabOrder() {
|
||||||
|
const alive = new Set(store.sessions.map(s => s.id))
|
||||||
|
// 先剔除消失的
|
||||||
|
const next = tabOrder.value.filter(id => alive.has(id))
|
||||||
|
// 再追加新增的（保持后端返回顺序）
|
||||||
|
for (const s of store.sessions) {
|
||||||
|
if (!next.includes(s.id)) next.push(s.id)
|
||||||
|
}
|
||||||
|
tabOrder.value = next
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 写回用户拖动后的标签顺序。
|
||||||
|
*
|
||||||
|
* 必须过滤掉不在当前会话集合里的 id：若不做这层校验，用户在拖动过程中
|
||||||
|
* 恰好有会话退出，传进来的 ids 会包含一个已消失的会话，
|
||||||
|
* 而 `orderedSessions` 会把它当成「tabOrder 里查不到的 id」反复过滤 ——
|
||||||
|
* 结果是标签顺序看起来正常，但 syncTabOrder 之后又被打乱。
|
||||||
|
*/
|
||||||
|
function applyOrder(ids: string[]) {
|
||||||
|
const alive = new Set(store.sessions.map(s => s.id))
|
||||||
|
const next = ids.filter(id => alive.has(id))
|
||||||
|
for (const s of store.sessions) {
|
||||||
|
if (!next.includes(s.id)) next.push(s.id)
|
||||||
|
}
|
||||||
|
tabOrder.value = next
|
||||||
|
}
|
||||||
|
|
||||||
|
function selectSession(id: string) {
|
||||||
|
activeSessionId.value = id
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 关闭标签：先判断是否需要二次确认。
|
||||||
|
*
|
||||||
|
* 标签内含分屏时，关闭标签会连带关掉其中的**所有**会话 ——
|
||||||
|
* 因此确认文案必须提这一点，否则用户会以为只关掉当前聚焦的那一个。
|
||||||
|
*/
|
||||||
|
async function closeTab(sessionId: string) {
|
||||||
|
// 收集本标签（分屏容器）里的全部会话。
|
||||||
|
// **只有被关的会话本身在当前分屏组里**才按组关闭——
|
||||||
|
// 此前的实现只看 `panes.length > 1`，在分屏激活时从标签栏
|
||||||
|
// 关闭一个无关的后台标签，会误把分屏组里的会话全部关掉。
|
||||||
|
const inCurrentGroup = panes.value.some(p => p.sessionId === sessionId)
|
||||||
|
const group =
|
||||||
|
inCurrentGroup && panes.value.length > 1
|
||||||
|
? panes.value.map(p => p.sessionId)
|
||||||
|
: [sessionId]
|
||||||
|
const groupSet = new Set(group)
|
||||||
|
|
||||||
|
// 「关闭运行中会话前确认」关闭时直接关：连 alive 查询都不发
|
||||||
|
// （那是一次 IPC + 后端进程存活探测，用户已经明确表示不要这道确认）
|
||||||
|
if (store.settings?.layout.confirmCloseRunning ?? true) {
|
||||||
|
try {
|
||||||
|
// 只要组里有任意一个仍活跃就要确认（而不是只看被点的那一个）
|
||||||
|
let anyAlive = false
|
||||||
|
for (const id of group) {
|
||||||
|
try {
|
||||||
|
if (await store.sessionAlive(id)) {
|
||||||
|
anyAlive = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
/* 单个查询失败按不活跃处理，下面还有整体兜底 */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (anyAlive) {
|
||||||
|
const info = store.sessionById(sessionId)
|
||||||
|
const extra = group.length > 1 ? `（该标签含 ${group.length} 个分屏面板）` : ''
|
||||||
|
const ok = await requestConfirm(
|
||||||
|
sessionId,
|
||||||
|
info?.title || '会话',
|
||||||
|
`该会话中可能有正在运行的任务${extra}。关闭后无法恢复，确定继续？`
|
||||||
|
)
|
||||||
|
if (!ok) return
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
// 会话可能已经断开（alive 查询本身失败）——此时无需确认，直接关
|
||||||
|
logger.warn(`查询会话存活状态失败，直接关闭：${String(e)}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const id of group) {
|
||||||
|
try {
|
||||||
|
await store.closeSession(id)
|
||||||
|
} catch (e) {
|
||||||
|
logger.warn(`关闭会话 ${id} 失败：${String(e)}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 关闭后把焦点移到相邻标签，而不是留一个空面板
|
||||||
|
const idx = tabOrder.value.indexOf(sessionId)
|
||||||
|
syncTabOrder()
|
||||||
|
const fallback = tabOrder.value[Math.min(idx, tabOrder.value.length - 1)] ?? null
|
||||||
|
activeSessionId.value = fallback
|
||||||
|
// 分屏容器随之重置到新焦点：跨标签保留分屏组合没有意义
|
||||||
|
resetPanesTo(fallback)
|
||||||
|
void groupSet
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 关闭标签的确认请求（由 TerminalModule 渲染模态框） */
|
||||||
|
const confirmDialog = ref<{
|
||||||
|
title: string
|
||||||
|
message: string
|
||||||
|
resolve: (ok: boolean) => void
|
||||||
|
} | null>(null)
|
||||||
|
|
||||||
|
function requestConfirm(sessionId: string, title: string, message: string): Promise<boolean> {
|
||||||
|
return new Promise(resolve => {
|
||||||
|
confirmDialog.value = { title: `${title} · ${sessionId}`, message, resolve }
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function resolveConfirm(ok: boolean) {
|
||||||
|
confirmDialog.value?.resolve(ok)
|
||||||
|
confirmDialog.value = null
|
||||||
|
}
|
||||||
|
|
||||||
|
function cycleTab(delta: number) {
|
||||||
|
const list = orderedSessions.value
|
||||||
|
if (list.length === 0) return
|
||||||
|
const cur = activeSessionId.value ? list.findIndex(s => s.id === activeSessionId.value) : -1
|
||||||
|
// 取模保证在 [0, len) 内循环（JS 的 % 对负数返回负值，需修正）
|
||||||
|
const next = (((cur + delta) % list.length) + list.length) % list.length
|
||||||
|
activeSessionId.value = list[next].id
|
||||||
|
}
|
||||||
|
|
||||||
|
function selectTabByIndex(i: number) {
|
||||||
|
const s = orderedSessions.value[i]
|
||||||
|
if (s) activeSessionId.value = s.id
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 新建会话 =====
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 新建本地会话。
|
||||||
|
*
|
||||||
|
* `shellId` 为空时用「上次使用的 shell」，其次第一个启用项 —— 这与
|
||||||
|
* 「新建」（一个按钮）的预期一致：不动脑子点下去就该起来最常用的那个。
|
||||||
|
* 传入具体 id 的场合是终端页的「新建」下拉（用户明确选了某个 shell）。
|
||||||
|
*/
|
||||||
|
async function newLocalTab(opts: { shellId?: string; cwd?: string } = {}) {
|
||||||
|
const shellId =
|
||||||
|
opts.shellId ||
|
||||||
|
store.settings?.lastShellId ||
|
||||||
|
store.shells.find(s => s.enabled)?.id
|
||||||
|
if (!shellId) {
|
||||||
|
logger.error('没有可用的 Shell，无法新建会话')
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
// 「新会话继承当前目录」：显式传了 cwd 就以调用方为准；
|
||||||
|
// 否则在开启该项时取**当前激活会话**的 cwd。
|
||||||
|
// 只对本地会话生效 —— SSH 会话的 cwd 是远端路径，本地 shell 起不来
|
||||||
|
// （Windows 上 `/home/ops` 会被当成非法目录，会话直接失败）。
|
||||||
|
let cwd = opts.cwd
|
||||||
|
if (cwd === undefined && (store.settings?.layout.inheritCwd ?? false)) {
|
||||||
|
const cur = activeSession.value
|
||||||
|
if (cur?.kind === 'local' && cur.cwd) cwd = cur.cwd
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// 尺寸给一个合理初值：真实值由 xterm 的 fit 在挂载后立即上报，
|
||||||
|
// 这里的作用只是让 PTY 在首帧有正确的行列数，避免 shell 先按 80x24 画一遍提示符再重排
|
||||||
|
const info = await store.openLocal(shellId, cwd, 120, 30)
|
||||||
|
syncTabOrder()
|
||||||
|
activeSessionId.value = info.id
|
||||||
|
return info
|
||||||
|
} catch (e) {
|
||||||
|
logger.error(`新建本地会话失败：${String(e)}`)
|
||||||
|
throw e
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 新建 SSH 会话 */
|
||||||
|
async function newSshTab(hostId: string) {
|
||||||
|
try {
|
||||||
|
const info = await store.openSsh(hostId, 120, 30)
|
||||||
|
syncTabOrder()
|
||||||
|
activeSessionId.value = info.id
|
||||||
|
return info
|
||||||
|
} catch (e) {
|
||||||
|
logger.error(`连接主机 ${hostId} 失败：${String(e)}`)
|
||||||
|
throw e
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 分屏 =====
|
||||||
|
//
|
||||||
|
// # 为什么分屏面板**共享同一个会话**而不是各自开新会话
|
||||||
|
//
|
||||||
|
// 用户的诉求通常是「同一个目录下，一边跑构建一边看日志」——需要的是
|
||||||
|
// **两条独立 shell**（各自有独立的进程组、独立的中断语义），但若为此
|
||||||
|
// 复制一个 xterm 实例，两块画面会争抢输出、互相覆盖。
|
||||||
|
//
|
||||||
|
// 所以这里的设计是：分屏 = **新建会话 + 在同一标签内并排渲染**。
|
||||||
|
// 每条分屏有自己的 sessionId、自己的 xterm 实例，只是共享标签页的容器。
|
||||||
|
// 这与 tmux 的「split 出一个新 pane」是同一语义。
|
||||||
|
//
|
||||||
|
// # 上限为什么是 2×2 而不是「无限分屏」
|
||||||
|
//
|
||||||
|
// 每个面板持有一个 WebGL 上下文（见 TerminalModule 的说明），
|
||||||
|
// 4 个已经是常见集显的舒适上限；再多会出现上下文丢失导致画面变黑。
|
||||||
|
// 设置里的 `layout.maxPanes` 允许下调（不能上调超过 4）。
|
||||||
|
|
||||||
|
/** 分屏上限（后端 settings 封顶 4，此处再兜一次） */
|
||||||
|
function maxPanes(): number {
|
||||||
|
const v = store.settings?.layout.maxPanes ?? 4
|
||||||
|
return Math.min(Math.max(1, v), 4)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 当前分屏布局（1 = 单面板；2 = 左右或上下；3~4 = 2×2） */
|
||||||
|
const splitLayout = computed(() => {
|
||||||
|
const n = panes.value.length
|
||||||
|
if (n <= 1) return 'single'
|
||||||
|
if (n === 2) return splitDirection.value === 'down' ? 'v-split' : 'h-split'
|
||||||
|
return 'grid'
|
||||||
|
})
|
||||||
|
|
||||||
|
/** 两分屏时的方向（由首次分屏的动作决定，后续沿用） */
|
||||||
|
const splitDirection = ref<'right' | 'down'>('right')
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 在分屏中追加一个面板。
|
||||||
|
*
|
||||||
|
* 新面板要新建会话还是复用已有会话由调用方决定 —— 这里只负责容器布局。
|
||||||
|
* 返回 null 表示已达上限（调用方据此提示用户，而不是静默失败）。
|
||||||
|
*/
|
||||||
|
function addPane(sessionId: string): boolean {
|
||||||
|
if (panes.value.length >= maxPanes()) return false
|
||||||
|
panes.value = [...panes.value, { id: `pane-${sessionId}`, sessionId }]
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 关闭一个分屏面板。
|
||||||
|
*
|
||||||
|
* 只从布局里移除，**不关闭会话** —— 分屏是视图层概念，
|
||||||
|
* 「关掉这块画面」与「杀掉这个 shell」是两个不同的意图，
|
||||||
|
* 后者应该走 closeTab（带运行中确认）。
|
||||||
|
*/
|
||||||
|
function removePane(sessionId: string) {
|
||||||
|
panes.value = panes.value.filter(p => p.sessionId !== sessionId)
|
||||||
|
// 焦点落在被移除的面板上时，转移到剩下的第一个
|
||||||
|
if (activeSessionId.value === sessionId) {
|
||||||
|
activeSessionId.value = panes.value[0]?.sessionId ?? null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 把布局重置为「只有当前激活会话」。
|
||||||
|
*
|
||||||
|
* 切换标签时必须做这件事：`panes` 是**标签级**的容器状态，
|
||||||
|
* 若切标签后仍保留上一个标签的分屏组合，用户会看到一组
|
||||||
|
* 与当前标签无关的会话并排出现。
|
||||||
|
*/
|
||||||
|
function resetPanesTo(sessionId: string | null) {
|
||||||
|
panes.value = sessionId ? [{ id: `pane-${sessionId}`, sessionId }] : []
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 分屏模式是否开启（>1 个面板） */
|
||||||
|
const isSplit = computed(() => panes.value.length > 1)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 向右分屏：新建一个会话作为右侧面板。
|
||||||
|
*
|
||||||
|
* # 为什么新面板默认是本地 Shell 而不是复制当前 SSH 主机
|
||||||
|
*
|
||||||
|
* 「复制当前会话」听起来更贴心，但真正需要的场景（远端作业 + 本地看日志）
|
||||||
|
* 反而更常见，而复制一个 SSH 连接要多付一次认证与一条 TCP。
|
||||||
|
* 想要第二个 SSH 面板的用户可以点侧栏里的主机 —— 一次点击，无需确认。
|
||||||
|
*/
|
||||||
|
async function splitRight() {
|
||||||
|
return splitTo('right')
|
||||||
|
}
|
||||||
|
|
||||||
|
async function splitDown() {
|
||||||
|
return splitTo('down')
|
||||||
|
}
|
||||||
|
|
||||||
|
async function splitTo(dir: 'right' | 'down') {
|
||||||
|
if (panes.value.length >= maxPanes()) {
|
||||||
|
return { ok: false, message: `分屏数已达上限（${maxPanes()} 个），请先关闭一些面板` }
|
||||||
|
}
|
||||||
|
if (panes.value.length === 0 && activeSessionId.value) {
|
||||||
|
// 首次分屏：把当前会话放进容器
|
||||||
|
resetPanesTo(activeSessionId.value)
|
||||||
|
}
|
||||||
|
splitDirection.value = dir
|
||||||
|
|
||||||
|
const anchor = activeSessionId.value
|
||||||
|
const info = await newLocalTab()
|
||||||
|
if (!info) {
|
||||||
|
return { ok: false, message: '没有可用的 Shell，无法新建分屏面板' }
|
||||||
|
}
|
||||||
|
if (!addPane(info.id)) {
|
||||||
|
// 已达上限：把刚建的会话收掉，不留一个看不见的孤儿会话
|
||||||
|
await store.closeSession(info.id)
|
||||||
|
return { ok: false, message: `分屏数已达上限（${maxPanes()} 个）` }
|
||||||
|
}
|
||||||
|
// 焦点留在原面板（分屏的语义是「增加视野」，不是「切换过去」）；
|
||||||
|
// 用户按 Ctrl+Tab 或点击即可切换。若原面板不存在才落到新面板。
|
||||||
|
activeSessionId.value = anchor && store.sessionById(anchor) ? anchor : info.id
|
||||||
|
return { ok: true, message: '' }
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 关闭当前分屏（保留会话） */
|
||||||
|
function closePane() {
|
||||||
|
if (!isSplit.value) {
|
||||||
|
return { ok: false, message: '当前没有分屏' }
|
||||||
|
}
|
||||||
|
const id = activeSessionId.value
|
||||||
|
if (!id) return { ok: false, message: '没有可关闭的面板' }
|
||||||
|
removePane(id)
|
||||||
|
return { ok: true, message: '' }
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 切换分屏布局方向（两面板时有效） */
|
||||||
|
function toggleSplitDirection() {
|
||||||
|
if (panes.value.length !== 2) return
|
||||||
|
splitDirection.value = splitDirection.value === 'right' ? 'down' : 'right'
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 字号 =====
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 字号缩放是**视图级**的临时覆盖，不写回设置。
|
||||||
|
*
|
||||||
|
* 理由：用户按 Ctrl+= 通常是「这个文件的行太长，临时放大看看」，
|
||||||
|
* 而不是「我要永久改字号」。写回设置会让 Ctrl+0 的语义变成
|
||||||
|
* 「恢复到我上次临时调的值」，失去「重置」的意义。
|
||||||
|
*/
|
||||||
|
const fontOverride = ref<number | null>(null)
|
||||||
|
|
||||||
|
async function bumpFont(delta: number) {
|
||||||
|
const base = fontOverride.value ?? store.settings?.appearance.fontSize ?? 14
|
||||||
|
const next = Math.min(48, Math.max(6, base + delta))
|
||||||
|
fontOverride.value = next
|
||||||
|
}
|
||||||
|
|
||||||
|
function resetFont() {
|
||||||
|
fontOverride.value = null
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 生效的外观（把字号覆盖 + 「跟随应用主题」解析后的配色一起并进去，供 TerminalPane 使用） */
|
||||||
|
const effectiveAppearance = computed(() => {
|
||||||
|
const a = store.settings?.appearance
|
||||||
|
if (!a) return null
|
||||||
|
// 「跟随应用主题」要跟着应用深浅实时变：开了就用响应式的 appIsDark，
|
||||||
|
// 关了就只按此刻的深浅解析一次（此后应用改深浅不再带着终端变，见字段说明）。
|
||||||
|
const theme = effectiveThemeName(
|
||||||
|
a.theme,
|
||||||
|
a.followAppTheme,
|
||||||
|
a.followAppTheme ? appIsDark.value : document.documentElement.classList.contains('dark')
|
||||||
|
)
|
||||||
|
if (fontOverride.value === null) return { ...a, theme }
|
||||||
|
return { ...a, theme, fontSize: fontOverride.value }
|
||||||
|
})
|
||||||
|
|
||||||
|
// ===== 快捷键 =====
|
||||||
|
|
||||||
|
/** 当前生效的快捷键绑定（后端下发；未取到时用具前端默认值兜底） */
|
||||||
|
const bindings = computed<ShortcutBinding[]>(() => {
|
||||||
|
const fromSettings = store.settings?.shortcuts
|
||||||
|
if (fromSettings && fromSettings.length > 0) return fromSettings
|
||||||
|
return TERMINAL_ACTIONS.map(a => ({ action: a.id, keys: a.defaultKeys, enabled: true }))
|
||||||
|
})
|
||||||
|
|
||||||
|
function shortcutKeysOf(action: string): string {
|
||||||
|
return bindings.value.find(b => b.action === action)?.keys ?? ''
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 初始化 =====
|
||||||
|
|
||||||
|
let inited = false
|
||||||
|
|
||||||
|
async function init() {
|
||||||
|
if (inited) return
|
||||||
|
inited = true
|
||||||
|
await store.init()
|
||||||
|
if (options?.fixedSessionId?.value) {
|
||||||
|
// 独立窗口：固定单个会话，不需要标签顺序
|
||||||
|
activeSessionId.value = options.fixedSessionId.value
|
||||||
|
} else if (!activeSessionId.value && store.sessions.length > 0) {
|
||||||
|
// 主窗口：默认聚焦第一个会话
|
||||||
|
activeSessionId.value = store.sessions[0].id
|
||||||
|
}
|
||||||
|
syncTabOrder()
|
||||||
|
}
|
||||||
|
|
||||||
|
// 后端会话列表变化时保持标签顺序同步
|
||||||
|
watch(
|
||||||
|
() => store.sessions.map(s => s.id).join(','),
|
||||||
|
() => {
|
||||||
|
syncTabOrder()
|
||||||
|
// 分屏容器里可能有关闭标签时连带关掉的会话，剔除掉
|
||||||
|
const alive = new Set(store.sessions.map(s => s.id))
|
||||||
|
const pruned = panes.value.filter(p => alive.has(p.sessionId))
|
||||||
|
if (pruned.length !== panes.value.length) {
|
||||||
|
panes.value = pruned
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
// 切换标签时把分屏容器重置为该标签的单一会话（见 resetPanesTo 的说明）
|
||||||
|
watch(activeSessionId, (id, prev) => {
|
||||||
|
if (!id || id === prev) return
|
||||||
|
if (!panes.value.some(p => p.sessionId === id)) {
|
||||||
|
resetPanesTo(id)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
// 活动会话关闭后自动兜底到相邻标签
|
||||||
|
watch(
|
||||||
|
() => store.sessions.length,
|
||||||
|
len => {
|
||||||
|
if (len === 0) {
|
||||||
|
activeSessionId.value = null
|
||||||
|
panes.value = []
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (activeSessionId.value && !store.sessionById(activeSessionId.value)) {
|
||||||
|
const next = store.sessions[0].id
|
||||||
|
activeSessionId.value = next
|
||||||
|
resetPanesTo(next)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
return {
|
||||||
|
// 状态
|
||||||
|
activeSessionId,
|
||||||
|
activeSession,
|
||||||
|
orderedSessions,
|
||||||
|
panes,
|
||||||
|
fontOverride,
|
||||||
|
effectiveAppearance,
|
||||||
|
confirmDialog,
|
||||||
|
// 标签
|
||||||
|
selectSession,
|
||||||
|
closeTab,
|
||||||
|
cycleTab,
|
||||||
|
selectTabByIndex,
|
||||||
|
syncTabOrder,
|
||||||
|
applyOrder,
|
||||||
|
// 分屏
|
||||||
|
isSplit,
|
||||||
|
splitLayout,
|
||||||
|
splitDirection,
|
||||||
|
addPane,
|
||||||
|
removePane,
|
||||||
|
resetPanesTo,
|
||||||
|
splitRight,
|
||||||
|
splitDown,
|
||||||
|
closePane,
|
||||||
|
toggleSplitDirection,
|
||||||
|
// 新建
|
||||||
|
newLocalTab,
|
||||||
|
newSshTab,
|
||||||
|
// 字号
|
||||||
|
bumpFont,
|
||||||
|
resetFont,
|
||||||
|
// 快捷键
|
||||||
|
bindings,
|
||||||
|
shortcutKeysOf,
|
||||||
|
// 确认框
|
||||||
|
resolveConfirm,
|
||||||
|
requestConfirm,
|
||||||
|
// 生命周期
|
||||||
|
init
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export type TerminalStream = ReturnType<typeof useTerminalStream>
|
||||||
|
|
||||||
|
/** 供设置页展示「有效设置」用（独立窗口与主窗口共用同一份 settings） */
|
||||||
|
export function appearanceOf(settings: TerminalSettings | null) {
|
||||||
|
return settings?.appearance ?? null
|
||||||
|
}
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
import { onBeforeUnmount, onMounted } from 'vue'
|
||||||
|
import { matchesShortcut } from '@/lib/terminalActions'
|
||||||
|
import type { ShortcutBinding } from '@/types/terminal'
|
||||||
|
|
||||||
|
export type TerminalActionHandler = (actionId: string) => void
|
||||||
|
|
||||||
|
export interface UseTerminalKeysOptions {
|
||||||
|
/**
|
||||||
|
* 当前生效的快捷键绑定（来自设置页）。
|
||||||
|
* 传函数而非数组：快捷键可能随时被用户改动，用取值函数保证总能拿到最新值，
|
||||||
|
* 避免「改了键位要重启才生效」。
|
||||||
|
*/
|
||||||
|
bindings: () => ShortcutBinding[]
|
||||||
|
/** 动作被触发时的回调（由父组件实现具体行为） */
|
||||||
|
onAction: TerminalActionHandler
|
||||||
|
/** 是否启用（终端隐藏时挂起，避免抢走其他输入框的按键） */
|
||||||
|
enabled?: () => boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 终端内的快捷键拦截。
|
||||||
|
*
|
||||||
|
* # 为什么用捕获阶段的 document 监听，而不是 xterm 的 attachCustomKeyEventHandler
|
||||||
|
*
|
||||||
|
* `attachCustomKeyEventHandler` 只能挂在**单个 Terminal 实例**上，而快捷键里有
|
||||||
|
* 一半以上是**窗口级**动作（切标签、分屏、开关侧栏）——这些动作必须由父组件处理，
|
||||||
|
* 且应当在「焦点不在任何终端面板内」时也不生效（否则会和主应用其他输入框打架）。
|
||||||
|
*
|
||||||
|
* 因此这里用 document 上的捕获监听，配合两层判断：
|
||||||
|
* 1. `enabled()` —— 终端模块是否可见
|
||||||
|
* 2. 焦点是否在 `.xterm` 容器内 —— 决定「终端内」语义
|
||||||
|
*
|
||||||
|
* 注册在**捕获阶段**（`capture: true`）：xterm 自己在冒泡阶段处理按键，
|
||||||
|
* 若我们晚了就会被 shell 先消费（例如 Ctrl+Shift+W 会变成写入终端的字节）。
|
||||||
|
*
|
||||||
|
* # 为什么必须 preventDefault + stopPropagation
|
||||||
|
*
|
||||||
|
* 不阻止传播的话，`Ctrl+Shift+T` 会被浏览器当成「恢复关闭的标签页」、
|
||||||
|
* `Ctrl+Tab` 会被 WebView 用于窗口级切换，动作重复触发。
|
||||||
|
*/
|
||||||
|
export function useTerminalKeys(options: UseTerminalKeysOptions) {
|
||||||
|
/** 焦点是否位于某个 xterm 实例内 */
|
||||||
|
function focusInTerminal(): boolean {
|
||||||
|
const el = document.activeElement
|
||||||
|
if (!el) return false
|
||||||
|
return !!(el.closest && el.closest('.xterm'))
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleKeydown(e: KeyboardEvent) {
|
||||||
|
if (options.enabled && !options.enabled()) return
|
||||||
|
// 「终端内快捷键」的语义边界：焦点必须在终端里。
|
||||||
|
// 否则用户在设置页的输入框里打字时按 Ctrl+Shift+F 会被当成搜索。
|
||||||
|
if (!focusInTerminal()) return
|
||||||
|
|
||||||
|
// 输入法组合中（拼音候选框开着）不要抢按键，否则无法选中文字
|
||||||
|
if (e.isComposing) return
|
||||||
|
|
||||||
|
const list = options.bindings()
|
||||||
|
if (!list || list.length === 0) return
|
||||||
|
|
||||||
|
for (const b of list) {
|
||||||
|
if (!b.enabled || !b.keys) continue
|
||||||
|
if (matchesShortcut(e, b.keys)) {
|
||||||
|
// 阻止默认行为与传播：既防止浏览器/WebView 的内建快捷键，
|
||||||
|
// 也防止按键继续流向 xterm（否则「复制」会同时写入一个 \x03 之类的控制字符）
|
||||||
|
e.preventDefault()
|
||||||
|
e.stopPropagation()
|
||||||
|
options.onAction(b.action)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
// capture: true —— 必须抢在 xterm 与 WebView 之前
|
||||||
|
document.addEventListener('keydown', handleKeydown, true)
|
||||||
|
})
|
||||||
|
|
||||||
|
onBeforeUnmount(() => {
|
||||||
|
document.removeEventListener('keydown', handleKeydown, true)
|
||||||
|
})
|
||||||
|
|
||||||
|
return { focusInTerminal }
|
||||||
|
}
|
||||||
@@ -0,0 +1,527 @@
|
|||||||
|
import { onBeforeUnmount, ref, shallowRef, watch, type Ref } from 'vue'
|
||||||
|
import { Terminal } from '@xterm/xterm'
|
||||||
|
import { FitAddon } from '@xterm/addon-fit'
|
||||||
|
import { SearchAddon } from '@xterm/addon-search'
|
||||||
|
import { WebLinksAddon } from '@xterm/addon-web-links'
|
||||||
|
import { Unicode11Addon } from '@xterm/addon-unicode11'
|
||||||
|
import { WebglAddon } from '@xterm/addon-webgl'
|
||||||
|
import { useTerminalStore } from '@/stores/terminalStore'
|
||||||
|
import { resolveTheme, themeWithOpacity } from '@/lib/terminalThemes'
|
||||||
|
import { createLogger } from '@/lib/logger'
|
||||||
|
import type { AppearanceSettings } from '@/types/terminal'
|
||||||
|
|
||||||
|
const logger = createLogger('terminal')
|
||||||
|
|
||||||
|
/** xterm 需要显式 import 样式，否则光标/滚动条都不显示 */
|
||||||
|
import '@xterm/xterm/css/xterm.css'
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 取（并缓存）某个编码对应的 `TextDecoder`。
|
||||||
|
*
|
||||||
|
* # 为什么要缓存
|
||||||
|
*
|
||||||
|
* `TextDecoder` 的构造会做一次编码表查找，且**不能跨批次复用同一个实例做流式解码**
|
||||||
|
* 之外的用途。这里缓存的是「非流式」实例：每次 `decode()` 都传入完整批次。
|
||||||
|
*
|
||||||
|
* # 为什么不用 `{ stream: true }` 做跨批次增量解码
|
||||||
|
*
|
||||||
|
* 看起来更「正确」，但终端输出有个关键约束：**我们会在批次边界插入控制序列**
|
||||||
|
* （`flush_output` 每批次独立、前端 `term.write` 每次调用也可能触发重绘）。
|
||||||
|
* 增量解码会把「上一批末尾的半个字符」留到下一批，而下一批可能承载的是
|
||||||
|
* `OSC` 之类需要立即解析的数据 —— 缓冲半个字符会让控制序列的前置字节错位。
|
||||||
|
* 终端场景下「极少数跨批截断的多字节字符显示为替换符」比「控制序列错位」代价小得多。
|
||||||
|
*
|
||||||
|
* 注意 xterm 自身的 UTF-8 解码**始终是流式的**，所以即便我们传入的是字符串，
|
||||||
|
* 那些被我们替换掉的坏字节也不会影响后续正常字节的渲染。
|
||||||
|
*/
|
||||||
|
const decoderCache = new Map<string, TextDecoder>()
|
||||||
|
|
||||||
|
function decoderFor(encoding: string): TextDecoder {
|
||||||
|
const key = encoding || 'utf-8'
|
||||||
|
let d = decoderCache.get(key)
|
||||||
|
if (!d) {
|
||||||
|
try {
|
||||||
|
d = new TextDecoder(key, { fatal: false })
|
||||||
|
} catch {
|
||||||
|
// 浏览器不认这个编码名（如某些精简构建去掉了 big5）。
|
||||||
|
// 退回 UTF-8 而不是抛出：显示乱码远好于整条输出流断掉。
|
||||||
|
logger.warn(`浏览器不支持编码 ${key}，已退回 utf-8`)
|
||||||
|
d = new TextDecoder('utf-8', { fatal: false })
|
||||||
|
}
|
||||||
|
decoderCache.set(key, d)
|
||||||
|
}
|
||||||
|
return d
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface UseXtermOptions {
|
||||||
|
/** 容器元素 ref */
|
||||||
|
container: Ref<HTMLElement | null>
|
||||||
|
/** 要绑定的会话 id */
|
||||||
|
sessionId: Ref<string | null>
|
||||||
|
/** 外观设置（响应式；变化时热更新而不重建实例） */
|
||||||
|
appearance: Ref<AppearanceSettings | null>
|
||||||
|
/** 是否只读（已结束的会话保留回放，不允许输入） */
|
||||||
|
readonly?: Ref<boolean>
|
||||||
|
/** 会话输出被消费时回调（用于「有新输出」标记） */
|
||||||
|
onData?: (bytes: string) => void
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 把一个 xterm 实例绑定到某个终端会话。
|
||||||
|
*
|
||||||
|
* # 关键设计：为什么绕开 Vue 响应式
|
||||||
|
*
|
||||||
|
* 会话输出是高频字节流（`cat` 大文件时每秒数 MB）。若经 `ref` 传递，
|
||||||
|
* Vue 会为每批数据做依赖追踪 / 触发重渲染，代价与收益完全不成比例。
|
||||||
|
* 这里改为向 store 的**订阅表**注册回调，输出批次直接进 `term.write()`：
|
||||||
|
* 从 Rust 事件到屏幕像素，中间只有一次回调转发。
|
||||||
|
*
|
||||||
|
* # 生命周期
|
||||||
|
*
|
||||||
|
* - 挂载后：创建 Terminal → 打开 fit/weblink/unicode11 插件 → 尝试加载 webgl → 上报初始尺寸
|
||||||
|
* - `sessionId` 变化：退订旧会话、清屏、订阅新会话、重新 fit
|
||||||
|
* - 卸载：注销订阅、dispose 实例、移除 ResizeObserver
|
||||||
|
*
|
||||||
|
* 注意：**不**在卸载时关闭会话。会话存活在 Rust 侧，切换标签只是换一个视图，
|
||||||
|
* 把「视图销毁」等同「会话结束」会导致切标签就断连。
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 把设置里的光标样式收窄到 xterm 接受的联合类型。
|
||||||
|
*
|
||||||
|
* `AppearanceSettings.cursorStyle` 是 `string`（设置文件是用户可改的 JSON，
|
||||||
|
* 不能用字面量联合类型去约束持久化格式），而 `Terminal.options.cursorStyle`
|
||||||
|
* 只接受 `'block' | 'underline' | 'bar'`。中间必须有一层收窄，
|
||||||
|
* 否则设置文件里一个拼错的 `"Block"` 就会让 xterm 的行为未定义。
|
||||||
|
*/
|
||||||
|
function normalizeCursorStyle(raw: string | undefined): 'block' | 'underline' | 'bar' {
|
||||||
|
if (raw === 'bar' || raw === 'underline' || raw === 'block') return raw
|
||||||
|
return 'block'
|
||||||
|
}
|
||||||
|
|
||||||
|
export function useXterm(options: UseXtermOptions) {
|
||||||
|
const store = useTerminalStore()
|
||||||
|
|
||||||
|
const term = shallowRef<Terminal | null>(null)
|
||||||
|
const fitAddon = shallowRef<FitAddon | null>(null)
|
||||||
|
const searchAddon = shallowRef<SearchAddon | null>(null)
|
||||||
|
const webglAddon = shallowRef<WebglAddon | null>(null)
|
||||||
|
const isReady = ref(false)
|
||||||
|
/** 首个输出是否已到达（用于「等待首个输出」的加载态） */
|
||||||
|
const hasOutput = ref(false)
|
||||||
|
|
||||||
|
/** 当前订阅的取消函数（会话切换时先调用） */
|
||||||
|
let unsubscribeOutput: (() => void) | null = null
|
||||||
|
let unsubscribeExit: (() => void) | null = null
|
||||||
|
let resizeObserver: ResizeObserver | null = null
|
||||||
|
/** 上一次上报的尺寸，避免重复发送相同的 resize IPC */
|
||||||
|
let lastCols = 0
|
||||||
|
let lastRows = 0
|
||||||
|
|
||||||
|
// ===== 实例创建 =====
|
||||||
|
|
||||||
|
function createTerminal() {
|
||||||
|
const el = options.container.value
|
||||||
|
if (!el || term.value) return
|
||||||
|
|
||||||
|
const app = options.appearance.value
|
||||||
|
const t = new Terminal({
|
||||||
|
// 主题/字体在创建时给初值，之后由 applyAppearance 热更新
|
||||||
|
theme: resolveTheme(app?.theme ?? 'vscode-dark'),
|
||||||
|
fontFamily: app?.fontFamily || 'Cascadia Mono, Consolas, monospace',
|
||||||
|
fontSize: app?.fontSize || 14,
|
||||||
|
lineHeight: app?.lineHeight || 1.2,
|
||||||
|
letterSpacing: app?.letterSpacing || 0,
|
||||||
|
cursorBlink: app?.cursorBlink ?? true,
|
||||||
|
cursorStyle: normalizeCursorStyle(app?.cursorStyle),
|
||||||
|
scrollback: app?.scrollback || 5000,
|
||||||
|
// 允许应用（如 vim、htop）用鼠标上报事件；同时在应用未捕获鼠标时支持文本选择
|
||||||
|
// ——这是 xterm 的标准做法，Ctrl+拖选仍能强制进入选择模式
|
||||||
|
macOptionIsMeta: false,
|
||||||
|
allowProposedApi: true,
|
||||||
|
// 允许透明背景（「背景不透明度」设置项依赖它）。只能在构造时设定：
|
||||||
|
// 它决定渲染器是否按 alpha 混合，运行中改会被 xterm 忽略。
|
||||||
|
// 代价是渲染稍慢，因此不透明度 < 100 时还会关掉 WebGL（见 ensureRenderer）。
|
||||||
|
allowTransparency: true,
|
||||||
|
// 转换宽字符（中日韩）的正确显示；配合 unicode11 插件使用 Unicode 11 宽度表
|
||||||
|
convertEol: false
|
||||||
|
})
|
||||||
|
|
||||||
|
const fit = new FitAddon()
|
||||||
|
const search = new SearchAddon()
|
||||||
|
t.loadAddon(fit)
|
||||||
|
t.loadAddon(search)
|
||||||
|
t.loadAddon(new WebLinksAddon())
|
||||||
|
// Unicode11：正确计算 emoji 与部分 CJK 字符宽度（默认宽度表是过时的 Unicode 6）
|
||||||
|
try {
|
||||||
|
const u11 = new Unicode11Addon()
|
||||||
|
t.loadAddon(u11)
|
||||||
|
t.unicode.activeVersion = '11'
|
||||||
|
} catch (e) {
|
||||||
|
logger.warn(`Unicode11 插件加载失败，回落到默认宽度表：${String(e)}`)
|
||||||
|
}
|
||||||
|
|
||||||
|
t.open(el)
|
||||||
|
fit.fit()
|
||||||
|
|
||||||
|
// Web 字体（Cascadia Mono 等）是异步加载的：上面的首次 fit 用回退字体度量
|
||||||
|
// 计算行列，字体换装后行高变化会让 rows 偏小 —— 面板底部多出一条无字符
|
||||||
|
// 网格覆盖的裸背景（表现为「终端下方多出一截黑色块」）。字体就绪后补一次
|
||||||
|
// fit 把行列数校准到真实度量。
|
||||||
|
if (typeof document !== 'undefined' && document.fonts?.ready) {
|
||||||
|
void document.fonts.ready.then(() => safeFit())
|
||||||
|
}
|
||||||
|
|
||||||
|
// WebGL 渲染：见 ensureRenderer（按 GPU 开关 + 不透明度决定是否启用）
|
||||||
|
ensureRenderer(app)
|
||||||
|
|
||||||
|
// 用户输入 → Rust（base64 保字节完整性）
|
||||||
|
t.onData(data => {
|
||||||
|
const id = options.sessionId.value
|
||||||
|
if (!id || options.readonly?.value) return
|
||||||
|
void store.write(id, data).catch(e => {
|
||||||
|
logger.error(`写入会话 ${id} 失败：${String(e)}`)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
// 终端尺寸变化（字体缩放、窗口 resize、分屏比例变化都会触发）
|
||||||
|
t.onResize(({ cols, rows }) => {
|
||||||
|
const id = options.sessionId.value
|
||||||
|
if (!id) return
|
||||||
|
if (cols === lastCols && rows === lastRows) return
|
||||||
|
lastCols = cols
|
||||||
|
lastRows = rows
|
||||||
|
void store.resize(id, cols, rows).catch(e => {
|
||||||
|
logger.error(`调整会话 ${id} 尺寸失败：${String(e)}`)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
// 选中文本变化：把选区同步到 store，供「复制」菜单项判断是否有内容
|
||||||
|
t.onSelectionChange(() => {
|
||||||
|
const id = options.sessionId.value
|
||||||
|
if (id) selectionMap.set(id, t.getSelection())
|
||||||
|
})
|
||||||
|
|
||||||
|
term.value = t
|
||||||
|
fitAddon.value = fit
|
||||||
|
searchAddon.value = search
|
||||||
|
isReady.value = true
|
||||||
|
|
||||||
|
setupResizeObserver(el)
|
||||||
|
bindSession(options.sessionId.value)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 选区缓存。
|
||||||
|
*
|
||||||
|
* 放在模块级而非组件级：右键菜单由父组件（TerminalPane）渲染，
|
||||||
|
* 需要读取「当前焦点面板」的选区，逐层透传 ref 会把组件树搞得很脏。
|
||||||
|
*/
|
||||||
|
const selectionMap = new Map<string, string>()
|
||||||
|
|
||||||
|
// ===== 尺寸自适应 =====
|
||||||
|
|
||||||
|
function setupResizeObserver(el: HTMLElement) {
|
||||||
|
// ResizeObserver 而不是 window.resize：终端面板可能因分屏拖动而改变尺寸，
|
||||||
|
// 此时窗口大小根本没变，只听 window.resize 会漏掉。
|
||||||
|
resizeObserver = new ResizeObserver(() => {
|
||||||
|
// 下一帧再 fit：ResizeObserver 回调时布局可能还没稳定
|
||||||
|
requestAnimationFrame(() => safeFit())
|
||||||
|
})
|
||||||
|
resizeObserver.observe(el)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** fit 会抛异常的场景：容器 display:none（非激活标签）、尺寸为 0、实例已 dispose */
|
||||||
|
function safeFit() {
|
||||||
|
const t = term.value
|
||||||
|
const f = fitAddon.value
|
||||||
|
if (!t || !f) return
|
||||||
|
const el = options.container.value
|
||||||
|
if (!el || el.offsetWidth === 0 || el.offsetHeight === 0) return
|
||||||
|
try {
|
||||||
|
f.fit()
|
||||||
|
} catch {
|
||||||
|
/* 忽略：容器暂时不可测量，下次 resize 会重试 */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 会话绑定 =====
|
||||||
|
|
||||||
|
function unbindSession() {
|
||||||
|
unsubscribeOutput?.()
|
||||||
|
unsubscribeExit?.()
|
||||||
|
unsubscribeOutput = null
|
||||||
|
unsubscribeExit = null
|
||||||
|
}
|
||||||
|
|
||||||
|
function bindSession(id: string | null) {
|
||||||
|
unbindSession()
|
||||||
|
if (!id || !term.value) return
|
||||||
|
|
||||||
|
// 输出批次 → xterm。
|
||||||
|
//
|
||||||
|
// # 编码在此处（前端）而非 Rust 侧完成
|
||||||
|
//
|
||||||
|
// Rust 侧 `flush_output` 发的是**原样字节**（base64 编码后的 TCP 载荷），
|
||||||
|
// 不做任何转码。原因：`TextDecoder` 只有浏览器环境有，而「用户是否临时切了
|
||||||
|
// 编码」这个状态也只存在于前端。若在 Rust 侧转码，用户切编码时后端要重放
|
||||||
|
// 历史字节才能纠正画面，而前端本就在每次批次到达时现取编码 —— 零额外成本。
|
||||||
|
//
|
||||||
|
// 本地 ConPTY 会话的字节已是 UTF-8（Windows 控制台内部是 UTF-16，转换由
|
||||||
|
// 系统完成），走 UTF-8 分支等价于旧的直接 `term.write(bytes)`。
|
||||||
|
unsubscribeOutput = store.subscribeOutput(id, batch => {
|
||||||
|
if (!term.value) return
|
||||||
|
hasOutput.value = true
|
||||||
|
// 用 TextDecoder 而不是手写字节循环：它能正确处理多字节序列
|
||||||
|
const bytes = store.base64ToBytes(batch.data)
|
||||||
|
const enc = store.sessionEncoding(id)
|
||||||
|
if (enc === 'utf-8') {
|
||||||
|
// 快路径：直接把字节交给 xterm，省掉「字节→字符串→再编码」的往返
|
||||||
|
term.value.write(bytes)
|
||||||
|
} else {
|
||||||
|
term.value.write(decoderFor(enc).decode(bytes))
|
||||||
|
}
|
||||||
|
options.onData?.(batch.data)
|
||||||
|
})
|
||||||
|
|
||||||
|
unsubscribeExit = store.subscribeExit(id, payload => {
|
||||||
|
if (!term.value) return
|
||||||
|
const code = payload.exitCode
|
||||||
|
const why = payload.reason ?? 'unknown'
|
||||||
|
// 用 ANSI 灰字写一行提示，不污染用户的终端内容语义
|
||||||
|
term.value.write(
|
||||||
|
`\r\n\x1b[90m── 会话已结束（${why}${code !== undefined && code !== null ? `，退出码 ${code}` : ''}）──\x1b[0m\r\n`
|
||||||
|
)
|
||||||
|
hasOutput.value = true
|
||||||
|
})
|
||||||
|
|
||||||
|
// 切换会话时清屏：xterm 的 buffer 是实例级的，不清会串台
|
||||||
|
term.value.reset()
|
||||||
|
hasOutput.value = false
|
||||||
|
// reset 会丢主题，需要重新应用
|
||||||
|
applyAppearance(options.appearance.value)
|
||||||
|
requestAnimationFrame(() => {
|
||||||
|
safeFit()
|
||||||
|
term.value?.focus()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 渲染器与外观热更新 =====
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 按需启用 / 关闭 WebGL 渲染。
|
||||||
|
*
|
||||||
|
* 两个条件缺一不可：
|
||||||
|
* - `gpuRendering` 开关（默认开）：WebGL 在大吞吐场景（`cat` 大文件、编译日志）
|
||||||
|
* 下 CPU 占用远低于 canvas，但它在少数虚拟机 / 远程桌面 / 老显卡上会黑屏，
|
||||||
|
* 所以**必须可回退**：加载失败就留在默认渲染器，功能不受影响。
|
||||||
|
* - **不透明度 100%**：WebGL 渲染器不支持透明背景（`allowTransparency` 只被
|
||||||
|
* DOM/canvas 渲染器认），半透明时继续用它会让「背景不透明度」看起来完全没反应。
|
||||||
|
* 于是拉低不透明度时主动丢弃 WebGL，回到支持 alpha 的渲染器。
|
||||||
|
*/
|
||||||
|
function ensureRenderer(app: AppearanceSettings | null) {
|
||||||
|
const t = term.value
|
||||||
|
if (!t) return
|
||||||
|
|
||||||
|
const wantWebgl = app?.gpuRendering !== false && (app?.opacity ?? 100) >= 100
|
||||||
|
|
||||||
|
if (wantWebgl && !webglAddon.value) {
|
||||||
|
try {
|
||||||
|
const webgl = new WebglAddon()
|
||||||
|
// 上下文丢失（切换显卡、系统休眠唤醒）时必须丢弃，否则画面永久卡死
|
||||||
|
webgl.onContextLoss(() => {
|
||||||
|
logger.warn('WebGL 上下文丢失，回退到默认渲染器')
|
||||||
|
webgl.dispose()
|
||||||
|
webglAddon.value = null
|
||||||
|
})
|
||||||
|
t.loadAddon(webgl)
|
||||||
|
webglAddon.value = webgl
|
||||||
|
} catch (e) {
|
||||||
|
logger.warn(`WebGL 渲染不可用，回退到默认渲染器：${String(e)}`)
|
||||||
|
}
|
||||||
|
} else if (!wantWebgl && webglAddon.value) {
|
||||||
|
webglAddon.value.dispose()
|
||||||
|
webglAddon.value = null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function applyAppearance(app: AppearanceSettings | null) {
|
||||||
|
const t = term.value
|
||||||
|
if (!t || !app) return
|
||||||
|
t.options.theme = themeWithOpacity(resolveTheme(app.theme), app.opacity ?? 100)
|
||||||
|
t.options.fontFamily = app.fontFamily || 'Cascadia Mono, Consolas, monospace'
|
||||||
|
t.options.fontSize = app.fontSize || 14
|
||||||
|
t.options.lineHeight = app.lineHeight || 1.2
|
||||||
|
t.options.letterSpacing = app.letterSpacing || 0
|
||||||
|
t.options.cursorBlink = app.cursorBlink ?? true
|
||||||
|
t.options.cursorStyle = normalizeCursorStyle(app.cursorStyle)
|
||||||
|
t.options.scrollback = app.scrollback || 5000
|
||||||
|
// 不透明度或 GPU 开关变了都可能要换渲染器（半透明必须离开 WebGL）
|
||||||
|
ensureRenderer(app)
|
||||||
|
// 字体变化会改变字符宽高 → 行列数变了 → 必须重新 fit 并上报
|
||||||
|
requestAnimationFrame(() => safeFit())
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 监视 =====
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => options.sessionId.value,
|
||||||
|
id => bindSession(id)
|
||||||
|
)
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => options.appearance.value,
|
||||||
|
app => applyAppearance(app),
|
||||||
|
{ deep: true }
|
||||||
|
)
|
||||||
|
|
||||||
|
// ===== 对外接口 =====
|
||||||
|
|
||||||
|
/** 聚焦终端（切换标签、点击面板时调用） */
|
||||||
|
function focus() {
|
||||||
|
term.value?.focus()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 当前选区文本 */
|
||||||
|
function getSelection(): string {
|
||||||
|
return term.value?.getSelection() ?? ''
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 搜索（返回是否命中；调用方据此提示用户） */
|
||||||
|
function findNext(keyword: string, caseSensitive = false): boolean {
|
||||||
|
if (!searchAddon.value || !keyword) return false
|
||||||
|
return searchAddon.value.findNext(keyword, { caseSensitive })
|
||||||
|
}
|
||||||
|
|
||||||
|
function findPrevious(keyword: string, caseSensitive = false): boolean {
|
||||||
|
if (!searchAddon.value || !keyword) return false
|
||||||
|
return searchAddon.value.findPrevious(keyword, { caseSensitive })
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearSearch() {
|
||||||
|
searchAddon.value?.clearDecorations()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 选中全部缓冲内容 */
|
||||||
|
function selectAll() {
|
||||||
|
term.value?.selectAll()
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 选中视口中某个屏幕坐标处的「词」。
|
||||||
|
*
|
||||||
|
* xterm 没有 `selectWordAt`，只有按行列的 `select(col, row, length)`，
|
||||||
|
* 因此需要自己把像素坐标换算成行列。这里刻意**不**去读 xterm 的内部
|
||||||
|
* 渲染服务（`_core._renderService`）取字符尺寸 —— 那是私有 API，
|
||||||
|
* 不在 d.ts 里，版本升级随时可能改名或改变形状。
|
||||||
|
*
|
||||||
|
* 改用公开且稳定的方式：xterm 会生成一个 `.xterm-rows` 容器，
|
||||||
|
* 每行是一个 `<div>`。用其中一行的 `getBoundingClientRect()` 就能得到
|
||||||
|
* 实际行高；列宽则由「行宽 ÷ cols」推出。这两者都是渲染后的真实值，
|
||||||
|
* 已经包含了字体、缩放、内边距的全部影响。
|
||||||
|
*
|
||||||
|
* 之所以做这个功能：终端里最常见的操作是选中一个路径 / URL / commit hash，
|
||||||
|
* 而用鼠标精确拖选一个长串很难 —— 右键选词能省掉一次失败的拖选。
|
||||||
|
*/
|
||||||
|
function selectWordAt(clientX: number, clientY: number) {
|
||||||
|
const t = term.value
|
||||||
|
if (!t) return
|
||||||
|
const root = t.element
|
||||||
|
if (!root) return
|
||||||
|
|
||||||
|
const rowsEl = root.querySelector('.xterm-rows') as HTMLElement | null
|
||||||
|
if (!rowsEl) return
|
||||||
|
|
||||||
|
const rowEls = rowsEl.children
|
||||||
|
if (rowEls.length === 0) return
|
||||||
|
|
||||||
|
const firstRow = rowEls[0] as HTMLElement
|
||||||
|
const rowRect = firstRow.getBoundingClientRect()
|
||||||
|
if (rowRect.width <= 0 || rowRect.height <= 0) return
|
||||||
|
|
||||||
|
const cols = t.cols
|
||||||
|
if (cols <= 0) return
|
||||||
|
const cellW = rowRect.width / cols
|
||||||
|
const cellH = rowRect.height
|
||||||
|
if (cellW <= 0 || cellH <= 0) return
|
||||||
|
|
||||||
|
const col = Math.floor((clientX - rowRect.left) / cellW)
|
||||||
|
const row = Math.floor((clientY - rowRect.top) / cellH)
|
||||||
|
if (col < 0 || row < 0 || col >= cols || row >= rowEls.length) return
|
||||||
|
|
||||||
|
const line = t.buffer.active.getLine(t.buffer.active.viewportY + row)
|
||||||
|
if (!line) return
|
||||||
|
const text = line.translateToString(true)
|
||||||
|
if (!text.trim()) return
|
||||||
|
|
||||||
|
// 词边界：以空白和终端里高频出现的语法分隔符切分。
|
||||||
|
// 刻意不用 \b —— 它对 `/`、`-`、`.` 不构成边界，会把整条路径当成一个词，
|
||||||
|
// 而「选中路径的一段」恰恰是这个功能最常见的用途。
|
||||||
|
const isWordChar = (c: string) => c !== '' && !/[\s|&;<>()[\]{}'"]/.test(c)
|
||||||
|
|
||||||
|
let start = col
|
||||||
|
let end = col
|
||||||
|
while (start > 0 && isWordChar(text[start - 1] ?? '')) start--
|
||||||
|
while (end < text.length && isWordChar(text[end] ?? '')) end++
|
||||||
|
if (end <= start) return
|
||||||
|
|
||||||
|
t.select(start, row, end - start)
|
||||||
|
// 选完把焦点交给终端：否则用户接着按 Ctrl+Shift+C 时，
|
||||||
|
// 事件落不到 `.xterm` 上，快捷键的「焦点在终端内」判断会失败
|
||||||
|
t.focus()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 把视口滚动到底部（新输出到达、用户按 Ctrl+End 时） */
|
||||||
|
function scrollToBottom() {
|
||||||
|
term.value?.scrollToBottom()
|
||||||
|
}
|
||||||
|
|
||||||
|
function clear() {
|
||||||
|
term.value?.clear()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 重新适配尺寸（外部在容器显示后调用） */
|
||||||
|
function fit() {
|
||||||
|
safeFit()
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 销毁 =====
|
||||||
|
|
||||||
|
onBeforeUnmount(() => {
|
||||||
|
unbindSession()
|
||||||
|
resizeObserver?.disconnect()
|
||||||
|
resizeObserver = null
|
||||||
|
// WebGL 需要先手动 dispose：它持有 WebGL context，不释放会累积泄漏
|
||||||
|
try {
|
||||||
|
webglAddon.value?.dispose()
|
||||||
|
} catch {
|
||||||
|
/* 忽略 */
|
||||||
|
}
|
||||||
|
webglAddon.value = null
|
||||||
|
term.value?.dispose()
|
||||||
|
term.value = null
|
||||||
|
fitAddon.value = null
|
||||||
|
searchAddon.value = null
|
||||||
|
isReady.value = false
|
||||||
|
})
|
||||||
|
|
||||||
|
return {
|
||||||
|
term,
|
||||||
|
isReady,
|
||||||
|
hasOutput,
|
||||||
|
createTerminal,
|
||||||
|
focus,
|
||||||
|
fit,
|
||||||
|
getSelection,
|
||||||
|
findNext,
|
||||||
|
findPrevious,
|
||||||
|
clearSearch,
|
||||||
|
selectAll,
|
||||||
|
selectWordAt,
|
||||||
|
scrollToBottom,
|
||||||
|
clear,
|
||||||
|
applyAppearance,
|
||||||
|
/** 读取某会话的选区缓存（供右键菜单判断「复制」是否可用） */
|
||||||
|
selectionOf: (id: string) => selectionMap.get(id) ?? ''
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -507,14 +507,248 @@ export const commands = {
|
|||||||
* 在翻译期间一直保持原样。回填前校验原窗口仍然存活，避免粘贴进毫不相干的窗口。
|
* 在翻译期间一直保持原样。回填前校验原窗口仍然存活，避免粘贴进毫不相干的窗口。
|
||||||
*/
|
*/
|
||||||
translatePasteBack: (text: string, hwnd: number) => __TAURI_INVOKE<null>("translate_paste_back", { text, hwnd }),
|
translatePasteBack: (text: string, hwnd: number) => __TAURI_INVOKE<null>("translate_paste_back", { text, hwnd }),
|
||||||
|
/** 读取终端设置。 */
|
||||||
|
terminalGetSettings: () => __TAURI_INVOKE<TerminalSettings>("terminal_get_settings"),
|
||||||
|
/**
|
||||||
|
* 保存终端设置（整份覆盖）。
|
||||||
|
*
|
||||||
|
* 前端只在「设置页」用它；主机/密钥的增删改用下面的细粒度命令，
|
||||||
|
* 避免「前端旧快照覆盖后端新值」的竞态。
|
||||||
|
*/
|
||||||
|
terminalSaveSettings: (settings: TerminalSettings) => __TAURI_INVOKE<TerminalSettings>("terminal_save_settings", { settings }),
|
||||||
|
/** 保存外观设置（细粒度：只改外观，不碰主机与密钥）。 */
|
||||||
|
terminalSaveAppearance: (appearance: AppearanceSettings) => __TAURI_INVOKE<TerminalSettings>("terminal_save_appearance", { appearance }),
|
||||||
|
/** 保存布局设置。 */
|
||||||
|
terminalSaveLayout: (layout: LayoutSettings) => __TAURI_INVOKE<TerminalSettings>("terminal_save_layout", { layout }),
|
||||||
|
/** 保存终端内选中行为。 */
|
||||||
|
terminalSaveSelection: (selection: TerminalSelectionSettings) => __TAURI_INVOKE<TerminalSettings>("terminal_save_selection", { selection }),
|
||||||
|
/** 保存安全设置。 */
|
||||||
|
terminalSaveSecurity: (security: SecuritySettings) => __TAURI_INVOKE<TerminalSettings>("terminal_save_security", { security }),
|
||||||
|
/** 保存快捷键绑定（整组覆盖）。 */
|
||||||
|
terminalSaveShortcuts: (shortcuts: ShortcutBinding[]) => __TAURI_INVOKE<TerminalSettings>("terminal_save_shortcuts", { shortcuts }),
|
||||||
|
/** 列出本机可用的 Shell。 */
|
||||||
|
terminalListShells: () => __TAURI_INVOKE<ShellProfile[]>("terminal_list_shells"),
|
||||||
|
/** 重新探测 Shell。 */
|
||||||
|
terminalRefreshShells: () => __TAURI_INVOKE<ShellProfile[]>("terminal_refresh_shells"),
|
||||||
|
/** 新增自定义 Shell。 */
|
||||||
|
terminalSaveShell: (shellProfile: ShellProfile) => __TAURI_INVOKE<ShellProfile[]>("terminal_save_shell", { shellProfile }),
|
||||||
|
/** 删除自定义 Shell（自动探测项不允许删除）。 */
|
||||||
|
terminalDeleteShell: (shellId: string) => __TAURI_INVOKE<ShellProfile[]>("terminal_delete_shell", { shellId }),
|
||||||
|
/** 设为默认 Shell（新建会话时预选）。 */
|
||||||
|
terminalSetLastShell: (shellId: string) => __TAURI_INVOKE<null>("terminal_set_last_shell", { shellId }),
|
||||||
|
/** 检查 Shell 是否能正常启动（用于设置页的「测试」按钮）。 */
|
||||||
|
terminalTestShell: (shellId: string) => __TAURI_INVOKE<ActionOutcome>("terminal_test_shell", { shellId }),
|
||||||
|
/** 探测某个 shell 的默认工作目录（用于「打开到主目录」）。 */
|
||||||
|
terminalDefaultCwd: () => __TAURI_INVOKE<string>("terminal_default_cwd"),
|
||||||
|
/** 新建本地 Shell 会话。 */
|
||||||
|
terminalOpenLocal: (shellId: string, cwd: string | null, cols: number | null, rows: number | null) => __TAURI_INVOKE<SessionInfo>("terminal_open_local", { shellId, cwd, cols, rows }),
|
||||||
|
/** 新建 SSH 会话。 */
|
||||||
|
terminalOpenSsh: (hostId: string, cols: number | null, rows: number | null) => __TAURI_INVOKE<SessionInfo>("terminal_open_ssh", { hostId, cols, rows }),
|
||||||
|
/** 列出全部会话。 */
|
||||||
|
terminalListSessions: () => __TAURI_INVOKE<SessionInfo[]>("terminal_list_sessions"),
|
||||||
|
/** 关闭会话。 */
|
||||||
|
terminalCloseSession: (sessionId: string) => __TAURI_INVOKE<null>("terminal_close_session", { sessionId }),
|
||||||
|
/**
|
||||||
|
* 向会话写入数据。
|
||||||
|
*
|
||||||
|
* `data` 用 base64：前端键入的字符、粘贴内容、以及二进制序列（如 Ctrl+C 的
|
||||||
|
* `\x03`、鼠标上报序列）都要能传，用字符串会在非 UTF-8 字节上出问题。
|
||||||
|
*/
|
||||||
|
terminalWrite: (sessionId: string, data: string) => __TAURI_INVOKE<null>("terminal_write", { sessionId, data }),
|
||||||
|
/** 通知会话尺寸变化。 */
|
||||||
|
terminalResize: (sessionId: string, cols: number, rows: number) => __TAURI_INVOKE<null>("terminal_resize", { sessionId, cols, rows }),
|
||||||
|
/**
|
||||||
|
* 重命名会话（同时更新标签与独立窗口标题）。
|
||||||
|
*
|
||||||
|
* # 为什么用 `set_title_by_user` 而不是直接写 `title`
|
||||||
|
*
|
||||||
|
* 重命名会把标题**锁定**，此后 shell 通过 OSC 0/2 上报的标题一律被忽略。
|
||||||
|
* 不锁的话，用户重命名后下一条提示符就把名字覆盖回去了 ——
|
||||||
|
* 表现为「重命名无效」，且只在有输出时才复现，很难归因。
|
||||||
|
*/
|
||||||
|
terminalRenameSession: (sessionId: string, title: string) => __TAURI_INVOKE<null>("terminal_rename_session", { sessionId, title }),
|
||||||
|
/** 在独立窗口中打开会话。 */
|
||||||
|
terminalDetachSession: (sessionId: string) => __TAURI_INVOKE<null>("terminal_detach_session", { sessionId }),
|
||||||
|
/** 关闭某会话的独立窗口（会话保留）。 */
|
||||||
|
terminalAttachSession: (sessionId: string) => __TAURI_INVOKE<null>("terminal_attach_session", { sessionId }),
|
||||||
|
/** 查询某会话当前工作目录（供「继承 cwd」与 SFTP 跟随使用）。 */
|
||||||
|
terminalSessionCwd: (sessionId: string) => __TAURI_INVOKE<string>("terminal_session_cwd", { sessionId }),
|
||||||
|
/**
|
||||||
|
* 发送特殊按键序列（如 Ctrl+C / Tab / 方向键）。
|
||||||
|
*
|
||||||
|
* 存在的理由：某些按键在 WebView 里会被浏览器或拼音输入法吞掉，
|
||||||
|
* 前端拦截后改由这个命令直接注入原始字节，保证行为与原生终端一致。
|
||||||
|
*/
|
||||||
|
terminalSendKey: (sessionId: string, key: string) => __TAURI_INVOKE<null>("terminal_send_key", { sessionId, key }),
|
||||||
|
/** 清屏（按 shell 类型选择命令）。 */
|
||||||
|
terminalClearSession: (sessionId: string, shellKind: string | null) => __TAURI_INVOKE<null>("terminal_clear_session", { sessionId, shellKind }),
|
||||||
|
/** 是否存在活跃会话（供「关闭标签二次确认」判断）。 */
|
||||||
|
terminalSessionAlive: (sessionId: string) => __TAURI_INVOKE<boolean>("terminal_session_alive", { sessionId }),
|
||||||
|
/**
|
||||||
|
* 切换会话的字符编码。
|
||||||
|
*
|
||||||
|
* # 为什么是会话级而不是全局设置
|
||||||
|
*
|
||||||
|
* GBK 与否取决于**对端**：同一台机器上连着 5 台服务器，可能 2 台是 GBK。
|
||||||
|
* 做成全局设置意味着「切一次全变」，用户得来回改；做成主机配置又不够用 ——
|
||||||
|
* 连上之前不知道对端是什么编码，往往要敲一条 `ls` 看到乱码才反应过来。
|
||||||
|
* 所以放在状态栏，改完立即作用于当前会话。
|
||||||
|
*
|
||||||
|
* # 为什么改编码后要重绘
|
||||||
|
*
|
||||||
|
* 已经渲染进 xterm 的字符是**按旧编码的解释结果**，它们在字节层面已经丢失
|
||||||
|
* （解码有损）。切换编码只能保证「之后新输出的字节」正确解释，历史画面无法
|
||||||
|
* 追溯复原。前端收到本命令的返回后会带 `redraw: true` 触发一次全量重绘，
|
||||||
|
* 但重绘用的是**后端保留的原始字节缓冲**（见 `OutputBatch` 的 ring buffer），
|
||||||
|
* 因此清屏重放可以纠正历史 —— 这是保留原始字节流的直接收益。
|
||||||
|
*/
|
||||||
|
terminalSetEncoding: (sessionId: string, encoding: string) => __TAURI_INVOKE<string>("terminal_set_encoding", { sessionId, encoding }),
|
||||||
|
/** 列出所有 SSH 主机（含凭据状态）。 */
|
||||||
|
terminalListHosts: () => __TAURI_INVOKE<HostView[]>("terminal_list_hosts"),
|
||||||
|
/** 保存 SSH 主机（新增或更新）。 */
|
||||||
|
terminalSaveHost: (host: SshHost) => __TAURI_INVOKE<HostView[]>("terminal_save_host", { host }),
|
||||||
|
/** 删除 SSH 主机（连带清理其密码凭据）。 */
|
||||||
|
terminalDeleteHost: (hostId: string) => __TAURI_INVOKE<HostView[]>("terminal_delete_host", { hostId }),
|
||||||
|
/**
|
||||||
|
* 设置（或清除）主机密码。
|
||||||
|
*
|
||||||
|
* 空串表示清除。密码写入系统凭据管理器，**不落盘到 settings.json**。
|
||||||
|
*/
|
||||||
|
terminalSetHostPassword: (hostId: string, password: string) => __TAURI_INVOKE<ActionOutcome>("terminal_set_host_password", { hostId, password }),
|
||||||
|
/**
|
||||||
|
* 从 `~/.ssh/config` 导入主机。
|
||||||
|
*
|
||||||
|
* 只做 P0 能覆盖的部分：Host 别名、HostName、Port、User、IdentityFile。
|
||||||
|
* 跳板机（ProxyJump）与通配符 Host 明确跳过并计数，提示用户手工补录——
|
||||||
|
* 静默忽略会让用户以为全导入了。
|
||||||
|
*/
|
||||||
|
terminalImportSshConfig: () => __TAURI_INVOKE<ActionOutcome>("terminal_import_ssh_config"),
|
||||||
|
/** 列出所有密钥（含派生状态，**不含明文**）。 */
|
||||||
|
terminalListKeys: () => __TAURI_INVOKE<KeyView[]>("terminal_list_keys"),
|
||||||
|
/** 生成新密钥。 */
|
||||||
|
terminalGenerateKey: (params: KeyGenParams) => __TAURI_INVOKE<[KeyView, ActionOutcome]>("terminal_generate_key", { params }),
|
||||||
|
/** 导入密钥。 */
|
||||||
|
terminalImportKey: (name: string, content: string, passphrase: string) => __TAURI_INVOKE<[KeyView, ActionOutcome]>("terminal_import_key", { name, content, passphrase }),
|
||||||
|
/** 删除密钥。 */
|
||||||
|
terminalDeleteKey: (keyId: string) => __TAURI_INVOKE<KeyView[]>("terminal_delete_key", { keyId }),
|
||||||
|
/** 重命名密钥。 */
|
||||||
|
terminalRenameKey: (keyId: string, name: string) => __TAURI_INVOKE<KeyView[]>("terminal_rename_key", { keyId, name }),
|
||||||
|
/**
|
||||||
|
* 设置或更新密钥 passphrase。
|
||||||
|
*
|
||||||
|
* 需要重新加密私钥文件，因此要读原 passphrase 解密 → 用新 passphrase 加密 → 落盘。
|
||||||
|
*/
|
||||||
|
terminalSetKeyPassphrase: (keyId: string, oldPassphrase: string, newPassphrase: string) => __TAURI_INVOKE<ActionOutcome>("terminal_set_key_passphrase", { keyId, oldPassphrase, newPassphrase }),
|
||||||
|
/**
|
||||||
|
* 读取密钥公钥（供「复制公钥」与「写入 authorized_keys」使用）。
|
||||||
|
*
|
||||||
|
* 只返回公钥部分——公钥本就是可公开的，不涉及明文私钥泄露。
|
||||||
|
*/
|
||||||
|
terminalKeyPublic: (keyId: string) => __TAURI_INVOKE<string>("terminal_key_public", { keyId }),
|
||||||
|
/**
|
||||||
|
* 生成一个 SSH 主机的 id。
|
||||||
|
*
|
||||||
|
* 前端在「新建主机」对话框里需要先拿到 id 才能保存密码（密码按 host_id 存取），
|
||||||
|
* 因此把 id 生成放到后端，保证与 `terminal_save_host` 的生成规则一致。
|
||||||
|
*/
|
||||||
|
terminalNewHostId: () => __TAURI_INVOKE<string>("terminal_new_host_id"),
|
||||||
|
/** 列出已知主机记录。 */
|
||||||
|
terminalListKnownHosts: () => __TAURI_INVOKE<KnownHost[]>("terminal_list_known_hosts"),
|
||||||
|
/** 遗忘某条主机记录（下次连接会重新弹指纹确认）。 */
|
||||||
|
terminalForgetHost: (host: string, port: number, keyType: string) => __TAURI_INVOKE<KnownHost[]>("terminal_forget_host", { host, port, keyType }),
|
||||||
|
/** 清空全部主机记录（危险操作，前端需二次确认）。 */
|
||||||
|
terminalClearKnownHosts: () => __TAURI_INVOKE<KnownHost[]>("terminal_clear_known_hosts"),
|
||||||
|
/** 导出 known_hosts 文本（供人工审阅或迁移）。 */
|
||||||
|
terminalExportKnownHosts: () => __TAURI_INVOKE<string>("terminal_export_known_hosts"),
|
||||||
|
/** 导入 known_hosts 文本。 */
|
||||||
|
terminalImportKnownHosts: (text: string) => __TAURI_INVOKE<ActionOutcome>("terminal_import_known_hosts", { text }),
|
||||||
|
/**
|
||||||
|
* 回传主机密钥确认决定。
|
||||||
|
*
|
||||||
|
* 由前端在用户点击「接受」/「拒绝」后调用。会话侧的握手正在阻塞等待这个回传，
|
||||||
|
* 因此超时（120 秒）后会视为拒绝。
|
||||||
|
*
|
||||||
|
* `app` 只用于安全事件日志（`security.auditLog`）——用户的每个决定都要留痕：
|
||||||
|
* 「谁在什么时候接受了新指纹」是事后审计里最关键的一条。specta 会把
|
||||||
|
* `AppHandle` 参数从生成的 JS 签名里剔除，因此前端调用方式不变。
|
||||||
|
*/
|
||||||
|
terminalConfirmHostKey: (sessionId: string, accept: boolean, host: string, port: number, keyType: string, fingerprint: string) => __TAURI_INVOKE<null>("terminal_confirm_host_key", { sessionId, accept, host, port, keyType, fingerprint }),
|
||||||
|
/** 分页 + 搜索命令历史。 */
|
||||||
|
terminalHistoryQuery: (query: HistoryQuery) => __TAURI_INVOKE<TerminalHistoryPage>("terminal_history_query", { query }),
|
||||||
|
/** 列出所有历史来源（供筛选下拉）。 */
|
||||||
|
terminalHistorySources: () => __TAURI_INVOKE<HistorySource[]>("terminal_history_sources"),
|
||||||
|
/** 收藏 / 取消收藏。返回切换后的值。 */
|
||||||
|
terminalHistoryToggleFavorite: (id: number) => __TAURI_INVOKE<boolean>("terminal_history_toggle_favorite", { id }),
|
||||||
|
/** 删除一条历史。 */
|
||||||
|
terminalHistoryDelete: (id: number) => __TAURI_INVOKE<ActionOutcome>("terminal_history_delete", { id }),
|
||||||
|
/**
|
||||||
|
* 清空历史。
|
||||||
|
*
|
||||||
|
* `keep_favorites` 默认为真 —— 破坏性操作的默认值应当是最保守的那个。
|
||||||
|
* 用户点的若是「清空」，看到「收藏还在」不会觉得被冒犯；
|
||||||
|
* 但若默认连收藏一起清掉，那份损失不可逆。
|
||||||
|
*/
|
||||||
|
terminalHistoryClear: (keepFavorites: boolean | null) => __TAURI_INVOKE<ActionOutcome>("terminal_history_clear", { keepFavorites }),
|
||||||
|
/**
|
||||||
|
* 把一条历史命令送入会话的命令行。
|
||||||
|
*
|
||||||
|
* 与 `terminal_run_snippet` 同构（`submit` 决定是否追加回车），
|
||||||
|
* 但**刻意拆成两个命令**而不是给后者加一个「来源」参数：
|
||||||
|
* 片段携带占位符需要渲染，历史命令是已定型字符串。合并会让
|
||||||
|
* `terminal_run_snippet` 多出一个只在历史场景有意义的字段。
|
||||||
|
*
|
||||||
|
* # 安全姿态
|
||||||
|
*
|
||||||
|
* 历史命令一律 `submit = false`（只填入不执行）为默认 —— 从历史里翻出
|
||||||
|
* `rm -rf` 并回车执行，是这类功能最常见的事故来源。用户要执行就再按一次回车，
|
||||||
|
* 多按一次回车的成本远低于一次误执行。
|
||||||
|
*/
|
||||||
|
terminalHistoryRun: (sessionId: string, command: string, submit: boolean | null) => __TAURI_INVOKE<ActionOutcome>("terminal_history_run", { sessionId, command, submit }),
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Types */
|
/* Types */
|
||||||
|
/**
|
||||||
|
* 带提示语的操作结果。
|
||||||
|
*
|
||||||
|
* 部分操作「成功但需告知用户一些事」（如凭据管理器写入失败但密钥已生成），
|
||||||
|
* 用这个结构承载，避免为此另开一个命令。
|
||||||
|
*/
|
||||||
|
export type ActionOutcome = {
|
||||||
|
ok: boolean,
|
||||||
|
/** 给用户看的提示（成功时的附加说明，或失败原因） */
|
||||||
|
message: string,
|
||||||
|
};
|
||||||
|
|
||||||
export type AppRecord = {
|
export type AppRecord = {
|
||||||
name: string,
|
name: string,
|
||||||
path: string,
|
path: string,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/** 终端外观设置。 */
|
||||||
|
export type AppearanceSettings = {
|
||||||
|
/** 配色主题 id（内置若干，见前端 terminalThemes.ts） */
|
||||||
|
theme?: string,
|
||||||
|
/** 是否跟随应用亮暗主题（开启时 `theme` 只作为亮/暗的取色基准） */
|
||||||
|
followAppTheme?: boolean,
|
||||||
|
/** 字体族（逗号分隔的 CSS font-family） */
|
||||||
|
fontFamily?: string,
|
||||||
|
fontSize?: number,
|
||||||
|
/** 行高倍数 */
|
||||||
|
lineHeight?: number | null,
|
||||||
|
/** 字母间距 */
|
||||||
|
letterSpacing?: number | null,
|
||||||
|
/** 光标样式："block" | "bar" | "underline" */
|
||||||
|
cursorStyle?: string,
|
||||||
|
/** 光标是否闪烁 */
|
||||||
|
cursorBlink?: boolean,
|
||||||
|
/** 滚动缓冲区行数。上限 200000：再高会显著吃内存且滚动查找变慢。 */
|
||||||
|
scrollback?: number,
|
||||||
|
/** 背景不透明度百分比（100 = 不透明） */
|
||||||
|
opacity?: number,
|
||||||
|
/** 是否启用 GPU 渲染（addon-webgl）。极少数显卡驱动下有花屏问题，故给开关。 */
|
||||||
|
gpuRendering?: boolean,
|
||||||
|
};
|
||||||
|
|
||||||
export type ArchiveInfo = {
|
export type ArchiveInfo = {
|
||||||
name: string,
|
name: string,
|
||||||
path: string,
|
path: string,
|
||||||
@@ -603,6 +837,80 @@ export type ClipboardStatus = {
|
|||||||
count: number,
|
count: number,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/** 一条命令历史。 */
|
||||||
|
export type CommandHistoryItem = {
|
||||||
|
id: number,
|
||||||
|
/** 毫秒时间戳（最后一次执行） */
|
||||||
|
ts: number,
|
||||||
|
command: string,
|
||||||
|
/** 执行时的工作目录（可能为空 —— OSC 7 未被远端 shell 上报时） */
|
||||||
|
cwd: string,
|
||||||
|
/**
|
||||||
|
* 会话来源：本地 shell 的 id，或 SSH 主机的 id。
|
||||||
|
* 为空串表示「来源未知」（如手工录入的历史）。
|
||||||
|
*/
|
||||||
|
hostId: string,
|
||||||
|
/**
|
||||||
|
* 显示用的来源名（「PowerShell」/「生产服务器」），随记录一起存。
|
||||||
|
*
|
||||||
|
* # 为什么冗余存名字而不只存 id
|
||||||
|
*
|
||||||
|
* 主机被删除后，若只有 id，历史列表里那一列会变成一串无意义的 hash。
|
||||||
|
* 存名字的代价是「主机改名后历史里的旧名字不会更新」—— 这里选择
|
||||||
|
* **保留历史当时的名字**，因为「我在那台现在叫 X 的机器上跑过什么」
|
||||||
|
* 本来就是一个有时间性的问题。
|
||||||
|
*/
|
||||||
|
hostName: string,
|
||||||
|
/** 是否为 SSH 会话 */
|
||||||
|
ssh: boolean,
|
||||||
|
/** 累计执行次数（同一命令在同一目录重复执行时累加） */
|
||||||
|
count: number,
|
||||||
|
/** 用户收藏（收藏项不参与容量淘汰） */
|
||||||
|
favorited: boolean,
|
||||||
|
/** 退出码。`None` 表示未捕获（如会话结束时命令仍在运行） */
|
||||||
|
exitCode: number | null,
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 一条命令片段。
|
||||||
|
*
|
||||||
|
* # 为什么 `command` 里允许变量占位符
|
||||||
|
*
|
||||||
|
* 常用命令的差异往往只在少数字段（路径、主机名、分支名）。若每条变体都要
|
||||||
|
* 单独存一条，片段库会迅速退化成「一堆几乎一样的条目」，反而找不到东西。
|
||||||
|
* 因此支持 `${name}` 形式占位符，执行前弹出表单逐个填写。
|
||||||
|
*
|
||||||
|
* 占位符语法刻意用 `${name}` 而不是 `{name}`：shell 自身大量使用 `{}`
|
||||||
|
* （`${VAR}`、`awk '{print}'`、brace expansion），单花括号会与用户的正常
|
||||||
|
* 命令冲突，导致片段存进去就「被替换掉了」。
|
||||||
|
*/
|
||||||
|
export type CommandSnippet = {
|
||||||
|
id?: string,
|
||||||
|
/** 展示名称（列表主标题） */
|
||||||
|
name?: string,
|
||||||
|
/** 命令内容（可含 `${name}` 占位符） */
|
||||||
|
command?: string,
|
||||||
|
/** 说明（列表副标题，讲清这条命令做什么、有什么前提） */
|
||||||
|
description?: string,
|
||||||
|
/** 分组名（空串归入「未分组」） */
|
||||||
|
group?: string,
|
||||||
|
/** 占位符的默认值：name → 默认值。未列出的占位符默认空串。 */
|
||||||
|
defaults?: { [key in string]: string },
|
||||||
|
/**
|
||||||
|
* 适用的 shell kind（空数组表示所有 shell 都适用）。
|
||||||
|
* 例：`Get-ChildItem` 只对 powershell 有意义，不该出现在 cmd 的列表里。
|
||||||
|
*/
|
||||||
|
shellKinds?: string[],
|
||||||
|
/** 仅对 SSH 会话显示（如 `sudo systemctl restart` 类远端操作） */
|
||||||
|
sshOnly?: boolean,
|
||||||
|
/** 是否需要二次确认（危险命令，如 `rm -rf`） */
|
||||||
|
confirm?: boolean,
|
||||||
|
/** 是否在片段面板中置顶 */
|
||||||
|
pinned?: boolean,
|
||||||
|
/** 创建时间（Unix 毫秒，用于列表排序） */
|
||||||
|
createdAt?: number,
|
||||||
|
};
|
||||||
|
|
||||||
/** 自定义命令 */
|
/** 自定义命令 */
|
||||||
export type CustomCommand = {
|
export type CustomCommand = {
|
||||||
id: string,
|
id: string,
|
||||||
@@ -734,6 +1042,11 @@ export type EngineView = {
|
|||||||
issue: string | null,
|
issue: string | null,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type EnvVar = {
|
||||||
|
key?: string,
|
||||||
|
value?: string,
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 错误分类。区分它们的意义在于**前端能给出可操作的提示**：
|
* 错误分类。区分它们的意义在于**前端能给出可操作的提示**：
|
||||||
* `Auth` 要用户去改 Key，`Network` 要用户查网络/代理，`RateLimit` 只需等待。
|
* `Auth` 要用户去改 Key，`Network` 要用户查网络/代理，`RateLimit` 只需等待。
|
||||||
@@ -811,6 +1124,15 @@ export type FileRecord = {
|
|||||||
isDir: boolean,
|
isDir: boolean,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type FingerprintChange = {
|
||||||
|
/** 被替换掉的旧指纹 */
|
||||||
|
oldFingerprint?: string,
|
||||||
|
/** 变更发生时间 */
|
||||||
|
changedAt?: string,
|
||||||
|
/** 用户是否接受了这次变更 */
|
||||||
|
accepted?: boolean,
|
||||||
|
};
|
||||||
|
|
||||||
/** 一条历史记录 */
|
/** 一条历史记录 */
|
||||||
export type HistoryItem = {
|
export type HistoryItem = {
|
||||||
id: number,
|
id: number,
|
||||||
@@ -834,6 +1156,26 @@ export type HistoryPage = {
|
|||||||
total: number,
|
total: number,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询参数。
|
||||||
|
*
|
||||||
|
* 用结构体而不是一长串位置参数：命令层要把前端 payload 原样转发，
|
||||||
|
* 而 5 个 `Option<String>` 的位置参数在调用点极易顺序写错，且编译器
|
||||||
|
* 无法发现（全是同类型）。
|
||||||
|
*/
|
||||||
|
export type HistoryQuery = {
|
||||||
|
/** 关键词（对 command 做匹配；空则不过滤） */
|
||||||
|
keyword?: string,
|
||||||
|
/** 只看某个来源（host_id；空则全部） */
|
||||||
|
hostId?: string,
|
||||||
|
/** 只看收藏 */
|
||||||
|
favoritedOnly?: boolean,
|
||||||
|
/** 分页偏移 */
|
||||||
|
offset?: number,
|
||||||
|
/** 分页大小 */
|
||||||
|
limit?: number,
|
||||||
|
};
|
||||||
|
|
||||||
/** 翻译历史设置（P2 生效）。 */
|
/** 翻译历史设置（P2 生效）。 */
|
||||||
export type HistorySettings = {
|
export type HistorySettings = {
|
||||||
enabled?: boolean,
|
enabled?: boolean,
|
||||||
@@ -841,6 +1183,36 @@ export type HistorySettings = {
|
|||||||
maxItems?: number,
|
maxItems?: number,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 历史来源（供前端做筛选下拉）。
|
||||||
|
*
|
||||||
|
* 单独定义而不是用元组：元组序列化成 JSON 会变成数组，前端得靠下标取值
|
||||||
|
* （`s[0]`/`s[1]`/`s[2]`），改一次顺序就静默错位。具名字段让前后端
|
||||||
|
* 各自独立演进而不怕顺序变动。
|
||||||
|
*/
|
||||||
|
export type HistorySource = {
|
||||||
|
hostId: string,
|
||||||
|
hostName: string,
|
||||||
|
/** 该来源的命令条数 */
|
||||||
|
count: number,
|
||||||
|
ssh: boolean,
|
||||||
|
};
|
||||||
|
|
||||||
|
/** SSH 主机的前端视图：配置 + 派生凭据状态。 */
|
||||||
|
export type HostView = {
|
||||||
|
config: SshHost,
|
||||||
|
/** 是否已保存密码（**不返回密码本身**） */
|
||||||
|
hasPassword: boolean,
|
||||||
|
/** 密码掩码（未保存时为空串） */
|
||||||
|
passwordMasked: string,
|
||||||
|
/** 关联密钥是否存在且文件齐备 */
|
||||||
|
keyReady: boolean,
|
||||||
|
/** 是否具备发起连接的条件 */
|
||||||
|
ready: boolean,
|
||||||
|
/** 不可用原因（ready 为 true 时为空） */
|
||||||
|
issue: string | null,
|
||||||
|
};
|
||||||
|
|
||||||
/** 索引状态（返回给前端） */
|
/** 索引状态（返回给前端） */
|
||||||
export type IndexStats = {
|
export type IndexStats = {
|
||||||
total: number,
|
total: number,
|
||||||
@@ -861,6 +1233,104 @@ export type KernelUpdateInfo = {
|
|||||||
hasUpdate: boolean,
|
hasUpdate: boolean,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/** 生成密钥时的参数。 */
|
||||||
|
export type KeyGenParams = {
|
||||||
|
/** 展示名称（留空则用算法名 + 时间戳） */
|
||||||
|
name: string,
|
||||||
|
/** 算法："ed25519"（默认）| "rsa" | "ecdsa" */
|
||||||
|
algorithm: string,
|
||||||
|
/** RSA 位数（2048 / 3072 / 4096）。其他算法忽略此字段。 */
|
||||||
|
bits: number,
|
||||||
|
/** 注释（会写进公钥末尾，通常填 用户@主机） */
|
||||||
|
comment: string,
|
||||||
|
/** passphrase。**只用于写入凭据管理器，不落盘、不回传**。 */
|
||||||
|
passphrase: string,
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 密钥库的单个条目（元数据，**不含私钥内容**）。
|
||||||
|
*
|
||||||
|
* 私钥本体存放在 `{app_data_dir}/terminal/keys/` 的独立文件里（可能是几 KB，
|
||||||
|
* 塞进 Windows 凭据管理器不可靠——单条有大小上限），passphrase 才进凭据管理器。
|
||||||
|
*/
|
||||||
|
export type KeyMeta = {
|
||||||
|
id?: string,
|
||||||
|
/** 展示名称 */
|
||||||
|
name?: string,
|
||||||
|
/** 算法："ed25519" | "rsa" | "ecdsa" */
|
||||||
|
algorithm?: string,
|
||||||
|
/** 位数 / 曲线（RSA 2048/3072/4096；ECDSA P-256/P-384/P-521；ed25519 固定空串） */
|
||||||
|
bits?: number,
|
||||||
|
/** 公钥指纹（SHA256，OpenSSH 展示格式 `SHA256:xxxx`） */
|
||||||
|
fingerprint?: string,
|
||||||
|
/** 公钥内容（`ssh-ed25519 AAAA... comment`），用于一键复制 */
|
||||||
|
publicKey?: string,
|
||||||
|
/** 注释 */
|
||||||
|
comment?: string,
|
||||||
|
/** 私钥文件名（`keys/` 目录下，相对名） */
|
||||||
|
fileName?: string,
|
||||||
|
/** 创建时间（RFC3339） */
|
||||||
|
createdAt?: string,
|
||||||
|
/** 是否由 ssh-agent 托管（P1） */
|
||||||
|
inAgent?: boolean,
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 密钥视图：元数据 + 派生状态。
|
||||||
|
*
|
||||||
|
* 拆成「meta + 派生」而不是直接回传元数据，理由与 translate 模块的 `EngineView`
|
||||||
|
* 一致：让前端保存时能原样回传 `view.meta`，不必自己拼装结构，
|
||||||
|
* 也不会误把派生字段写回配置。
|
||||||
|
*/
|
||||||
|
export type KeyView = {
|
||||||
|
meta: KeyMeta,
|
||||||
|
/** 是否已设置 passphrase（**不返回 passphrase 本身，本模块无此命令**） */
|
||||||
|
hasPassphrase: boolean,
|
||||||
|
/** 私钥文件是否实际存在（元数据与文件不同步时能立刻发现，如用户手工删了文件） */
|
||||||
|
fileExists: boolean,
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 单条已知主机记录。 */
|
||||||
|
export type KnownHost = {
|
||||||
|
/** 主机地址（不含端口，端口单独存） */
|
||||||
|
host?: string,
|
||||||
|
port?: number,
|
||||||
|
/**
|
||||||
|
* 密钥算法（如 "ssh-ed25519" / "rsa-sha2-512" / "ssh-rsa"）
|
||||||
|
*
|
||||||
|
* 同一主机可能有多种算法的密钥（服务器同时提供 ed25519 与 rsa），
|
||||||
|
* 因此按 (host, port, key_type) 三元组建索引，而不是 (host, port)。
|
||||||
|
*/
|
||||||
|
keyType?: string,
|
||||||
|
/** SHA256 指纹（OpenSSH 展示格式，如 `SHA256:Abc...`） */
|
||||||
|
fingerprint?: string,
|
||||||
|
/** 首次见到时间（RFC3339） */
|
||||||
|
firstSeen?: string,
|
||||||
|
/** 最近一次确认时间（RFC3339） */
|
||||||
|
lastConfirmed?: string,
|
||||||
|
/**
|
||||||
|
* 指纹变更历史（最新在前）。
|
||||||
|
*
|
||||||
|
* 保留历史的价值：用户点「接受新指纹」之后，回看历史能判断这到底是
|
||||||
|
* 服务器重装（一次性变更）还是持续的中间人（每次都变）。
|
||||||
|
*/
|
||||||
|
history?: FingerprintChange[],
|
||||||
|
};
|
||||||
|
|
||||||
|
export type LayoutSettings = {
|
||||||
|
/** 关闭标签页时若会话仍有活跃进程，是否二次确认 */
|
||||||
|
confirmCloseRunning?: boolean,
|
||||||
|
/** 新建标签页时是否继承当前会话的工作目录 */
|
||||||
|
inheritCwd?: boolean,
|
||||||
|
/** 是否显示底部状态栏 */
|
||||||
|
showStatusBar?: boolean,
|
||||||
|
/**
|
||||||
|
* 分屏上限（1 = 不分屏，2 = 2×1，4 = 2×2）。
|
||||||
|
* 上限刻意封在 4：分屏 × 标签 × 会话的组合复杂度会爆炸。
|
||||||
|
*/
|
||||||
|
maxPanes?: number,
|
||||||
|
};
|
||||||
|
|
||||||
/** 环境状态（返回前端，设置页「环境检查」面板展示） */
|
/** 环境状态（返回前端，设置页「环境检查」面板展示） */
|
||||||
export type MusicEnvStatus = {
|
export type MusicEnvStatus = {
|
||||||
/** 系统 Python 版本（如 "3.14.5"），无则 None */
|
/** 系统 Python 版本（如 "3.14.5"），无则 None */
|
||||||
@@ -1096,6 +1566,39 @@ export type ScrollRegion = {
|
|||||||
height: number,
|
height: number,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type SecuritySettings = {
|
||||||
|
/**
|
||||||
|
* 主机密钥策略："ask"（默认，首次连接必须显式确认指纹）。
|
||||||
|
*
|
||||||
|
* **不提供 "auto-accept" 选项**：TOFU 静默接受是 MITM 的入口，
|
||||||
|
* 属于代码层不该给用户的开关。
|
||||||
|
*
|
||||||
|
* 读取方（`ssh::SshHandler::check_server_key`）**显式读取本字段而不是写死**：
|
||||||
|
* 唯一支持的取值是 `"ask"`，其它取值（配置文件被手工改过）一律按 `"ask"`
|
||||||
|
* 处理 —— 安全开关的失败方向必须朝更严的一侧，绝不能因为出现了一个
|
||||||
|
* 没见过的字符串就放宽。
|
||||||
|
*/
|
||||||
|
hostKeyPolicy?: string,
|
||||||
|
/**
|
||||||
|
* 指纹变更时是否阻断（**默认 true**）。关掉会让中间人攻击无声通过，
|
||||||
|
* 因此前端需以红色风险提示呈现该开关。
|
||||||
|
*
|
||||||
|
* 关闭时的行为不是「照旧弹窗」而是「自动接受并记入变更历史」：
|
||||||
|
* 开关的语义是「不再拦截」，若关掉后仍弹阻断弹窗，用户会以为没生效。
|
||||||
|
*/
|
||||||
|
blockOnFingerprintChange?: boolean,
|
||||||
|
/**
|
||||||
|
* 是否把**安全事件**写入日志（默认开）。
|
||||||
|
*
|
||||||
|
* 记录对象是主机密钥相关的事件：指纹已信任 / 首次见到被接受 / 指纹变更
|
||||||
|
* 被接受或拒绝 / 自动接受（阻断关闭时）。与「会话日志」（输出字节流落盘，
|
||||||
|
* 由工具栏的 `terminal_toggle_logging` 按会话显式开启，见 `audit` 模块的
|
||||||
|
* 取舍说明）**是两件事**：这里只写事件行，不含屏幕内容，因此没有隐私代价，
|
||||||
|
* 默认开启才能保证「发生过什么」事后可查。
|
||||||
|
*/
|
||||||
|
auditLog?: boolean,
|
||||||
|
};
|
||||||
|
|
||||||
/** 下载分段（多线程 Range 下载 / 断点续传用） */
|
/** 下载分段（多线程 Range 下载 / 断点续传用） */
|
||||||
export type Segment = {
|
export type Segment = {
|
||||||
/** 分段索引 */
|
/** 分段索引 */
|
||||||
@@ -1139,6 +1642,135 @@ export type SelectionSettings = {
|
|||||||
blacklist?: string[],
|
blacklist?: string[],
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/** 会话元信息（回传前端；**不含任何 I/O 句柄**）。 */
|
||||||
|
export type SessionInfo = {
|
||||||
|
id: string,
|
||||||
|
kind: SessionKind,
|
||||||
|
/** 标题（本地为 Shell 名，SSH 为 用户@主机） */
|
||||||
|
title: string,
|
||||||
|
state: SessionState,
|
||||||
|
/** 终端当前列数 */
|
||||||
|
cols: number,
|
||||||
|
/** 终端当前行数 */
|
||||||
|
rows: number,
|
||||||
|
/** 当前工作目录（由 OSC 7 hook 上报；未知为空串） */
|
||||||
|
cwd: string,
|
||||||
|
/** 会话创建时间（Unix 毫秒） */
|
||||||
|
createdAt: number,
|
||||||
|
/** 进程退出码（本地可拿到；SSH 通常为 None） */
|
||||||
|
exitCode: number | null,
|
||||||
|
/** 失败原因（state 为 Failed 时非空） */
|
||||||
|
error: string | null,
|
||||||
|
/** 远端标识（本地为 shell id，SSH 为 host id） */
|
||||||
|
targetId: string,
|
||||||
|
/** 是否由独立窗口承载（决定了关闭窗口时销毁还是保留会话） */
|
||||||
|
detached: boolean,
|
||||||
|
/**
|
||||||
|
* 会话的字符编码（规范名，如 `gbk` / `utf-8`）。
|
||||||
|
*
|
||||||
|
* 回传前端的原因：**终端画面的字节→文本转换在前端做**。xterm 的
|
||||||
|
* `write` 接受 `Uint8Array`，解码策略由前端按这个字段决定。若放在 Rust 侧
|
||||||
|
* 转换，前端就失去了「用户临时切编码重看历史内容」的能力——
|
||||||
|
* 而重看历史恰恰是老服务器场景下最常用的操作。
|
||||||
|
*/
|
||||||
|
encoding: string,
|
||||||
|
/** 是否正在记录会话日志（`audit` 模块）。前端据此显示工具栏开关状态。 */
|
||||||
|
logging: boolean,
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 会话类型（决定前端展示哪些能力）。 */
|
||||||
|
export type SessionKind = "local" | "ssh";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 会话状态机。
|
||||||
|
*
|
||||||
|
* `degraded` 专为 SSH 保留：TCP 断了但会话对象还在（可以尝试重连），
|
||||||
|
* 与 `closed`（已终结，需重开）是两回事。本地会话不会进入此态。
|
||||||
|
*/
|
||||||
|
export type SessionState =
|
||||||
|
/** 已创建，尚未开始握手/启动 */
|
||||||
|
"idle" |
|
||||||
|
/** 正在连接（SSH 握手 / 本地启动进程） */
|
||||||
|
"connecting" |
|
||||||
|
/** 正在认证（仅 SSH） */
|
||||||
|
"authenticating" |
|
||||||
|
/** 已建立，可交互 */
|
||||||
|
"established" |
|
||||||
|
/** 连接降级（SSH 断线，可尝试重连） */
|
||||||
|
"degraded" |
|
||||||
|
/** 已关闭（进程退出或用户主动关闭） */
|
||||||
|
"closed" |
|
||||||
|
/** 异常（启动失败、握手失败、致命错误） */
|
||||||
|
"failed";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 会话模板：一键拉起一组会话并排成布局。
|
||||||
|
*
|
||||||
|
* 拉起语义：`entries[0]` 作为主面板，其余依次以分屏面板加入
|
||||||
|
* （受 `layout.maxPanes` 上限约束，超过 4 个的条目被忽略——
|
||||||
|
* WebGL 上下文上限决定了可见面板不可能超过 4，见 useSessionStream 说明）。
|
||||||
|
*/
|
||||||
|
export type SessionTemplate = {
|
||||||
|
id?: string,
|
||||||
|
name?: string,
|
||||||
|
/** 创建时间（Unix 毫秒；模板列表按此排序） */
|
||||||
|
createdAt?: number,
|
||||||
|
entries?: TemplateEntry[],
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 本地 Shell 配置。
|
||||||
|
*
|
||||||
|
* 探测到的 Shell 与用户自定义的 Shell 用同一结构表达：`detected` 为 true 表示
|
||||||
|
* 由 [`super::shell::detect_shells`] 自动发现，前端只允许改启动参数而不可改路径
|
||||||
|
* （路径已被验证存在，改错会让会话起不来）。
|
||||||
|
*/
|
||||||
|
export type ShellProfile = {
|
||||||
|
/** 唯一标识（同时是新建会话时的 shellKey） */
|
||||||
|
id?: string,
|
||||||
|
/**
|
||||||
|
* 展示名称，如 "PowerShell 7" / "Windows PowerShell"。
|
||||||
|
*
|
||||||
|
* **设置页里的描述名，不是标签上显示的名字** —— 后者取
|
||||||
|
* [`super::shell::session_label`]（按可执行文件名归一的短名）。
|
||||||
|
* 两者刻意分开：描述名可编辑、可很长，而标签要能一行放下多个会话。
|
||||||
|
*/
|
||||||
|
name?: string,
|
||||||
|
/** 可执行文件绝对路径 */
|
||||||
|
path?: string,
|
||||||
|
/** 启动参数 */
|
||||||
|
args?: string[],
|
||||||
|
/** 启动时的工作目录（空串表示用用户主目录） */
|
||||||
|
cwd?: string,
|
||||||
|
/** 环境变量覆盖（键值对；值为空串表示删除该变量） */
|
||||||
|
env?: EnvVar[],
|
||||||
|
/**
|
||||||
|
* Shell 类型："powershell" | "cmd" | "bash" | "wsl"
|
||||||
|
*
|
||||||
|
* 决定三件事：cwd 跟踪 hook 的注入方式、清屏命令、以及 OSC 7 的解析口径。
|
||||||
|
*/
|
||||||
|
kind?: string,
|
||||||
|
/** 是否由自动探测得到（true 时前端不可编辑 path） */
|
||||||
|
detected?: boolean,
|
||||||
|
/** 是否在新建会话菜单中显示 */
|
||||||
|
enabled?: boolean,
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 一条终端内快捷键绑定。
|
||||||
|
*
|
||||||
|
* 只覆盖**终端内**（第二层）快捷键：全局快捷键（第一层）由 `crate::shortcut` 统一
|
||||||
|
* 注册并做应用内冲突检测，不走这里；shell 原生快捷键（第三层）不做拦截。
|
||||||
|
*/
|
||||||
|
export type ShortcutBinding = {
|
||||||
|
/** 动作标识，见前端 `terminalActions.ts`（如 "copy" / "newTab"） */
|
||||||
|
action?: string,
|
||||||
|
/** 键位字符串，格式与 `crate::shortcut::parse_shortcut` 一致（如 "Ctrl+Shift+C"） */
|
||||||
|
keys?: string,
|
||||||
|
/** 是否启用（关掉后该动作无快捷键，但仍可从菜单触发） */
|
||||||
|
enabled?: boolean,
|
||||||
|
};
|
||||||
|
|
||||||
/** 快捷位置条目 */
|
/** 快捷位置条目 */
|
||||||
export type SpecialLocation = {
|
export type SpecialLocation = {
|
||||||
id: string,
|
id: string,
|
||||||
@@ -1151,6 +1783,74 @@ export type SpecialLocation = {
|
|||||||
args: string[],
|
args: string[],
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* SSH 主机条目。
|
||||||
|
*
|
||||||
|
* `id` 是凭据键名的一部分（`terminal-ssh-password-{id}`），**创建后不应修改**：
|
||||||
|
* 改了会让已存进凭据管理器的密码读不到。前端在编辑态需禁用该字段。
|
||||||
|
*/
|
||||||
|
export type SshHost = {
|
||||||
|
id?: string,
|
||||||
|
/** 展示别名（列表主标题） */
|
||||||
|
name?: string,
|
||||||
|
host?: string,
|
||||||
|
port?: number,
|
||||||
|
username?: string,
|
||||||
|
/** 认证方式："key"（公钥，默认）| "password" | "agent"（P1）| "keyboard"（P1） */
|
||||||
|
authMethod?: string,
|
||||||
|
/** 公钥认证使用的密钥 id（指向 [`super::keys`] 的密钥库） */
|
||||||
|
keyId?: string,
|
||||||
|
/** 分组名（侧栏按此分组） */
|
||||||
|
group?: string,
|
||||||
|
/** 备注 */
|
||||||
|
note?: string,
|
||||||
|
/** 标签色（前端用于状态点/分组标识） */
|
||||||
|
color?: string,
|
||||||
|
/** 是否收藏（置顶显示） */
|
||||||
|
favorited?: boolean,
|
||||||
|
/** 连接超时（毫秒） */
|
||||||
|
connectTimeoutMs?: number,
|
||||||
|
/** keep-alive 间隔（秒，0 表示关闭） */
|
||||||
|
keepaliveSecs?: number,
|
||||||
|
/** 启动目录（空串表示登录后进入默认目录） */
|
||||||
|
remoteCwd?: string,
|
||||||
|
/** 登录后自动执行的命令 */
|
||||||
|
startupCommand?: string,
|
||||||
|
/** 是否走代理模块（mihomo）。默认关闭：内网主机不该被绕进代理。 */
|
||||||
|
useProxy?: boolean,
|
||||||
|
/**
|
||||||
|
* 跳板机链（ProxyJump）：按连接顺序排列的主机 id。
|
||||||
|
*
|
||||||
|
* 每一项引用**本主机列表里的另一台主机**（复用它的地址、账号与凭据），
|
||||||
|
* 连接方向为 `本机 → jump_ids[0] → jump_ids[1] → … → 本主机`。
|
||||||
|
* 空 = 直连。约束（命令层校验）：不能引用自己、不能有环、
|
||||||
|
* 链长上限 5、每一跳的认证方式必须是 key/password。
|
||||||
|
*
|
||||||
|
* 用 id 引用而不是内联一份地址+凭据的理由：跳板机自己的密码/密钥
|
||||||
|
* 存在凭据管理器里，按 id 复用可以避免同一台跳板机在多处配置里
|
||||||
|
* 留下多份凭据副本（改密码时漏改一处就是连接事故）。
|
||||||
|
*/
|
||||||
|
jumpIds?: string[],
|
||||||
|
/** 终端的字符编码（"utf-8" 默认 | "gbk" 等）。老服务器常见 GBK，中文环境刚需。 */
|
||||||
|
encoding?: string,
|
||||||
|
/**
|
||||||
|
* 是否在远端注入 shell 集成 hook（命令历史 + cwd 跟踪）。
|
||||||
|
*
|
||||||
|
* # 为什么默认必须是 true
|
||||||
|
*
|
||||||
|
* 本结构是容器级 `#[serde(default)]`：老配置里缺这个字段时，serde 不是填
|
||||||
|
* 「零值」而是取 [`SshHost::default()`] 的值。因此**默认值决定老主机是否自动
|
||||||
|
* 开启注入** —— 填 `false` 会让所有既有主机静默不注入（表现为历史永远为空，
|
||||||
|
* 而开关在界面上看着是关的，用户根本不会去动它）。填 `true` 则无需改
|
||||||
|
* `heal()`、无需升 `version`。
|
||||||
|
*
|
||||||
|
* 关掉它的场景：远端 shell 集成会与 `startup_command` 里 `exec` 换 shell 的
|
||||||
|
* 配置冲突，或服务器对会话环境有洁癖要求（注入会改本次会话的 `PROMPT_COMMAND`／
|
||||||
|
* `precmd`，但不落盘、不影响其它会话）。
|
||||||
|
*/
|
||||||
|
injectShellIntegration?: boolean,
|
||||||
|
};
|
||||||
|
|
||||||
/** 任务下载协议类型 */
|
/** 任务下载协议类型 */
|
||||||
export type TaskProtocol =
|
export type TaskProtocol =
|
||||||
/** HTTP/HTTPS 直链 */
|
/** HTTP/HTTPS 直链 */
|
||||||
@@ -1173,6 +1873,92 @@ export type TaskStatus =
|
|||||||
/** 已取消（用户取消：进度与文件已清除，仅保留记录，只能再次下载） */
|
/** 已取消（用户取消：进度与文件已清除，仅保留记录，只能再次下载） */
|
||||||
"cancelled";
|
"cancelled";
|
||||||
|
|
||||||
|
/** 模板中的一个会话条目。 */
|
||||||
|
export type TemplateEntry = {
|
||||||
|
/** `"local"`（shell）| `"ssh"`（主机） */
|
||||||
|
kind?: string,
|
||||||
|
/**
|
||||||
|
* 本地 = shell id；SSH = host id。拉起时实时解析——
|
||||||
|
* 模板只存引用，不快照账号密码（那些在凭据管理器里按 id 存取）。
|
||||||
|
*/
|
||||||
|
targetId?: string,
|
||||||
|
/** 保存时的展示名快照（仅用于模板列表显示；target 失效时前端据此标注） */
|
||||||
|
label?: string,
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 一次查询的结果（含总数，供前端显示「共 N 条」）。
|
||||||
|
*
|
||||||
|
* # 为什么叫 `TerminalHistoryPage` 而不是 `HistoryPage`
|
||||||
|
*
|
||||||
|
* `tauri-specta` 给 `Type` 派生的类型注册表是**全局按类型名索引**的，重名会让
|
||||||
|
* `export_bindings()` 直接 panic（`Detected multiple types with the same name`）。
|
||||||
|
* `clipboard::commands::HistoryPage`（`items: Vec<ClipboardItem>`）已占用这个名字。
|
||||||
|
*
|
||||||
|
* specta 2.0.0-rc.25 **没有**给 struct 提供重命名手段 —— `#[specta(rename = ...)]`
|
||||||
|
* 只对**函数**宏生效（`specta-macros/src/specta.rs` 的 `parse_name_attrs`）；
|
||||||
|
* derive 路径下导出名直接取自 Rust 标识符
|
||||||
|
* （`specta-macros/src/type/mod.rs`：`let name = unraw_raw_ident(&format_ident!("{}", raw_ident.to_string()))`），
|
||||||
|
* 而 `ContainerAttr` 只认 `crate` / `type` / `inline` / `remote` / `collect` /
|
||||||
|
* `skip_attr` / `transparent`，且 `reject_unknown_specta_attrs` 会让未知属性直接编译失败。
|
||||||
|
* 因此**改名是唯一可行解**。
|
||||||
|
*/
|
||||||
|
export type TerminalHistoryPage = {
|
||||||
|
items: CommandHistoryItem[],
|
||||||
|
/** 满足筛选条件的总条数（**不受 limit/offset 影响**） */
|
||||||
|
total: number,
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 终端内选中行为。
|
||||||
|
*
|
||||||
|
* # 为什么叫 `TerminalSelectionSettings` 而不是 `SelectionSettings`
|
||||||
|
*
|
||||||
|
* 与 `translate::settings::SelectionSettings` 撞名。`tauri-specta` 的类型注册表
|
||||||
|
* **全局按类型名索引**，重名会让 `export_bindings()` panic
|
||||||
|
* （`Detected multiple types with the same name`）。
|
||||||
|
* specta 2.0.0-rc.25 的 derive 路径无法重命名导出类型
|
||||||
|
* （详见 `history::TerminalHistoryPage` 的注释），只能改 Rust 标识符本身。
|
||||||
|
*
|
||||||
|
* 注意：这是**第二个**独立引入的 `SelectionSettings`。新增跨模块共享名之前，
|
||||||
|
* 先确认没有同名 `Type` 已存在 —— 否则会在**运行时启动阶段**才炸，
|
||||||
|
* 而不是编译期（见 `TERMINAL_MODULE_PLAN.md` 坑 27）。
|
||||||
|
*/
|
||||||
|
export type TerminalSelectionSettings = {
|
||||||
|
/** 选中即复制（受 Linux/macOS 习惯影响的用户会开；默认关，避免误触） */
|
||||||
|
copyOnSelect?: boolean,
|
||||||
|
/** 中键粘贴（X11 习惯；Windows 下默认关） */
|
||||||
|
middleClickPaste?: boolean,
|
||||||
|
/** 右键行为："menu"（默认，弹菜单）| "paste"（直接粘贴）| "select-word" */
|
||||||
|
rightClick?: string,
|
||||||
|
/** 复制时是否去掉尾部空行 */
|
||||||
|
trimTrailingNewline?: boolean,
|
||||||
|
};
|
||||||
|
|
||||||
|
export type TerminalSettings = {
|
||||||
|
/** 结构版本号（用于后续迁移判断） */
|
||||||
|
version?: number,
|
||||||
|
/** 本地 Shell 配置（探测结果 + 用户自定义，合并存放） */
|
||||||
|
shells?: ShellProfile[],
|
||||||
|
/** SSH 主机条目 */
|
||||||
|
hosts?: SshHost[],
|
||||||
|
/** 密钥元数据 */
|
||||||
|
keys?: KeyMeta[],
|
||||||
|
appearance?: AppearanceSettings,
|
||||||
|
layout?: LayoutSettings,
|
||||||
|
shortcuts?: ShortcutBinding[],
|
||||||
|
selection?: TerminalSelectionSettings,
|
||||||
|
security?: SecuritySettings,
|
||||||
|
/** 「关闭标签页时确认」等行为的白名单：某些会话可豁免确认 */
|
||||||
|
closeConfirmExempt?: string[],
|
||||||
|
/** 上次使用的 Shell id（新建会话时的默认选中项） */
|
||||||
|
lastShellId?: string,
|
||||||
|
/** 命令片段库 */
|
||||||
|
snippets?: CommandSnippet[],
|
||||||
|
/** 会话模板（一键拉起一组会话 + 布局） */
|
||||||
|
templates?: SessionTemplate[],
|
||||||
|
};
|
||||||
|
|
||||||
/** Token 用量（AI 引擎返回；其余引擎为 None） */
|
/** Token 用量（AI 引擎返回；其余引擎为 None） */
|
||||||
export type TokenUsage = {
|
export type TokenUsage = {
|
||||||
promptTokens: number,
|
promptTokens: number,
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ export const WINDOWS = {
|
|||||||
downloadWindow: 'download-window',
|
downloadWindow: 'download-window',
|
||||||
/** 取词翻译悬浮窗（非激活显示，由 Rust 预创建） */
|
/** 取词翻译悬浮窗（非激活显示，由 Rust 预创建） */
|
||||||
translatePopup: 'translate-popup',
|
translatePopup: 'translate-popup',
|
||||||
|
/** 单个终端独立窗口，实际 label = `terminal-window-<sessionId>` */
|
||||||
|
terminalWindow: 'terminal-window',
|
||||||
} as const
|
} as const
|
||||||
|
|
||||||
/** Tauri 事件名（前端 emit / listen 与 Rust constants::events 对应） */
|
/** Tauri 事件名（前端 emit / listen 与 Rust constants::events 对应） */
|
||||||
@@ -77,6 +79,22 @@ export const EVENTS = {
|
|||||||
proxyAutoSwitch: 'proxy-auto-switch',
|
proxyAutoSwitch: 'proxy-auto-switch',
|
||||||
// 应用更新进度
|
// 应用更新进度
|
||||||
updateProgress: 'update-progress',
|
updateProgress: 'update-progress',
|
||||||
|
// 终端：会话输出批次（按 8~16ms 窗口聚合，前端用 seq 校验连续性）
|
||||||
|
terminalOutput: 'terminal-output',
|
||||||
|
/** 终端：会话结束 */
|
||||||
|
terminalExit: 'terminal-exit',
|
||||||
|
/** 终端：会话状态变更（负载为 SessionInfo） */
|
||||||
|
terminalState: 'terminal-state',
|
||||||
|
/** 终端：工作目录变化（OSC 7 hook 上报） */
|
||||||
|
terminalCwd: 'terminal-cwd',
|
||||||
|
/** 终端：SSH 主机密钥需用户确认（阻塞式，握手在等待回传） */
|
||||||
|
terminalHostKeyPrompt: 'terminal-host-key-prompt',
|
||||||
|
/** 终端：SFTP 传输进度（上传/下载，节流 200ms 推送一次） */
|
||||||
|
terminalTransferProgress: 'terminal-transfer-progress',
|
||||||
|
/** 终端：请求对「关闭仍在运行的会话」二次确认 */
|
||||||
|
terminalConfirmClose: 'terminal-confirm-close',
|
||||||
|
/** 终端：设置已保存（无负载）。各窗口据此重读设置，实现跨窗口同步 */
|
||||||
|
terminalSettings: 'terminal-settings',
|
||||||
// 监控 OSD
|
// 监控 OSD
|
||||||
osdStateUpdate: 'osd-state-update',
|
osdStateUpdate: 'osd-state-update',
|
||||||
/** OSD 数据通道：仅推送显示项 key→value 映射 + 网速（高频，每秒） */
|
/** OSD 数据通道：仅推送显示项 key→value 映射 + 网速（高频，每秒） */
|
||||||
|
|||||||
@@ -0,0 +1,309 @@
|
|||||||
|
/**
|
||||||
|
* 终端内快捷键的动作定义表。
|
||||||
|
*
|
||||||
|
* # 三层快捷键的边界
|
||||||
|
*
|
||||||
|
* | 层级 | 范围 | 注册方式 | 举例 |
|
||||||
|
* |---|---|---|---|
|
||||||
|
* | 全局 | 任何应用前台时都能触发 | `crate::shortcut`（Rust） | 全局唤起终端窗口 |
|
||||||
|
* | **终端内** | **焦点在终端面板内时** | **本文件（前端 keydown）** | 复制粘贴、标签、分屏 |
|
||||||
|
* | shell 原生 | 被 PTY 消费 | 不做拦截，原样透传 | Ctrl+C（SIGINT）、Tab 补全 |
|
||||||
|
*
|
||||||
|
* 本文件只管第二层。
|
||||||
|
*
|
||||||
|
* # 键位设计的两条硬约束
|
||||||
|
*
|
||||||
|
* 1. **`Ctrl+C` 与 `Ctrl+V` 绝不能被终端内快捷键占用**。终端里 `Ctrl+C` 必须是
|
||||||
|
* SIGINT（中断当前命令），这是不可协商的——把它映射成「复制」会让所有用户
|
||||||
|
* 失去中断能力。因此复制粘贴用 `Ctrl+Shift+C/V`（Windows Terminal 惯例）。
|
||||||
|
*
|
||||||
|
* 2. **避开项目已有的全局快捷键**。`Ctrl+2` 已被翻译模块占用（取词翻译面板），
|
||||||
|
* 所以标签跳转用 `Alt+1..9` —— 在终端里 `Alt+数字` 通常不产生控制字符，
|
||||||
|
* 冲突面最小，且符合「切标签」的直觉。
|
||||||
|
*
|
||||||
|
* # 唯一一条「全局」动作：`newDetachedWindow`
|
||||||
|
*
|
||||||
|
* 这一条不在第二层生效，而是由 `TerminalQuickLaunch` 用 `plugin-global-shortcut`
|
||||||
|
* 注册成**系统级**热键（任意应用前台时都能按）。它放在这张表里，是为了让键位
|
||||||
|
* 跟着终端设置一起存、一起改（设置 → 快捷键 → 会话 → 新建独立窗口）。
|
||||||
|
* 因此终端内的按键分发（`useTerminalKeys`）刻意**不处理**它 —— 免得同一次按键
|
||||||
|
* 既被全局注册触发、又被终端内分发触发，开出两个窗口。
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** 快捷键动作定义 */
|
||||||
|
export interface TerminalAction {
|
||||||
|
/** 动作标识，与 Rust 侧 `default_shortcuts()` 的 action 字符串一致 */
|
||||||
|
id: string
|
||||||
|
/** 展示名（设置页显示） */
|
||||||
|
label: string
|
||||||
|
/** 分组（设置页按组呈现） */
|
||||||
|
group: string
|
||||||
|
/** 说明（展示在设置页的副标题，讲清「做了什么」） */
|
||||||
|
description: string
|
||||||
|
/** 默认键位（后端也会下发一份，此处用于未取到设置时的兜底与展示） */
|
||||||
|
defaultKeys: string
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 全部终端内快捷键动作。
|
||||||
|
*
|
||||||
|
* 顺序即设置页的展示顺序。分组名刻意用「文本操作 / 标签 / 分屏 / 视图 / 会话」
|
||||||
|
* 这种动词短语，而不是「分类1」这类无信息量的标签。
|
||||||
|
*/
|
||||||
|
export const TERMINAL_ACTIONS: TerminalAction[] = [
|
||||||
|
{
|
||||||
|
id: 'copy',
|
||||||
|
label: '复制',
|
||||||
|
group: '文本操作',
|
||||||
|
description: '复制当前选中内容到剪贴板',
|
||||||
|
defaultKeys: 'Ctrl+Shift+C'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'paste',
|
||||||
|
label: '粘贴',
|
||||||
|
group: '文本操作',
|
||||||
|
description: '把剪贴板内容写入终端（多行粘贴会触发确认）',
|
||||||
|
defaultKeys: 'Ctrl+Shift+V'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'search',
|
||||||
|
label: '搜索',
|
||||||
|
group: '文本操作',
|
||||||
|
description: '在滚动缓冲中查找文本',
|
||||||
|
defaultKeys: 'Ctrl+Shift+F'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'newTab',
|
||||||
|
label: '新建标签',
|
||||||
|
group: '标签',
|
||||||
|
description: '新建一个本地 Shell 会话',
|
||||||
|
defaultKeys: 'Ctrl+Shift+T'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'closeTab',
|
||||||
|
label: '关闭标签',
|
||||||
|
group: '标签',
|
||||||
|
description: '关闭当前会话（有活跃进程时会二次确认）',
|
||||||
|
defaultKeys: 'Ctrl+Shift+W'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'nextTab',
|
||||||
|
label: '下一个标签',
|
||||||
|
group: '标签',
|
||||||
|
description: '切换到右侧标签',
|
||||||
|
defaultKeys: 'Ctrl+Tab'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'prevTab',
|
||||||
|
label: '上一个标签',
|
||||||
|
group: '标签',
|
||||||
|
description: '切换到左侧标签',
|
||||||
|
defaultKeys: 'Ctrl+Shift+Tab'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'renameTab',
|
||||||
|
label: '重命名标签',
|
||||||
|
group: '标签',
|
||||||
|
description: '修改当前会话显示名称',
|
||||||
|
defaultKeys: 'F2'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'splitRight',
|
||||||
|
label: '向右分屏',
|
||||||
|
group: '分屏',
|
||||||
|
description: '在当前面板右侧新建一个面板',
|
||||||
|
defaultKeys: 'Ctrl+Shift+D'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'splitDown',
|
||||||
|
label: '向下分屏',
|
||||||
|
group: '分屏',
|
||||||
|
description: '在当前面板下方新建一个面板',
|
||||||
|
defaultKeys: 'Ctrl+Shift+E'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'closePane',
|
||||||
|
label: '关闭面板',
|
||||||
|
group: '分屏',
|
||||||
|
description: '关闭当前分屏（保留会话）',
|
||||||
|
defaultKeys: 'Ctrl+Shift+Q'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'clear',
|
||||||
|
label: '清屏',
|
||||||
|
group: '视图',
|
||||||
|
description: '清空显示内容（向 shell 发送清屏命令）',
|
||||||
|
defaultKeys: 'Ctrl+Shift+K'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'fontIncrease',
|
||||||
|
label: '放大字号',
|
||||||
|
group: '视图',
|
||||||
|
description: '增大终端字体',
|
||||||
|
defaultKeys: 'Ctrl+='
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'fontDecrease',
|
||||||
|
label: '缩小字号',
|
||||||
|
group: '视图',
|
||||||
|
description: '减小终端字体',
|
||||||
|
defaultKeys: 'Ctrl+-'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'fontReset',
|
||||||
|
label: '重置字号',
|
||||||
|
group: '视图',
|
||||||
|
description: '恢复设置中的默认字号',
|
||||||
|
defaultKeys: 'Ctrl+0'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'toggleSftp',
|
||||||
|
label: '文件面板',
|
||||||
|
group: '视图',
|
||||||
|
description: '显示/隐藏当前 SSH 会话的文件管理面板（P1）',
|
||||||
|
defaultKeys: 'Ctrl+Shift+P'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'snippets',
|
||||||
|
label: '代码片段',
|
||||||
|
group: '会话',
|
||||||
|
description: '打开常用命令片段列表',
|
||||||
|
defaultKeys: 'Ctrl+Shift+S'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'history',
|
||||||
|
label: '命令历史',
|
||||||
|
group: '会话',
|
||||||
|
description: '打开命令历史面板（从已记录的历史里检索、复用）',
|
||||||
|
defaultKeys: 'Ctrl+Shift+H'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'sessionSwitcher',
|
||||||
|
label: '会话切换器',
|
||||||
|
group: '会话',
|
||||||
|
description: '列出全部会话并快速跳转',
|
||||||
|
defaultKeys: 'Ctrl+Shift+O'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'detachWindow',
|
||||||
|
label: '独立窗口打开',
|
||||||
|
group: '会话',
|
||||||
|
description: '把当前会话放到独立窗口中（需终端独立窗口支持）',
|
||||||
|
defaultKeys: 'Ctrl+Shift+N'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'newDetachedWindow',
|
||||||
|
label: '新建独立窗口',
|
||||||
|
group: '会话',
|
||||||
|
description: '全局生效（任意界面按下）：打开独立终端窗口并选择要启动的会话',
|
||||||
|
defaultKeys: 'Ctrl+3'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
|
||||||
|
/** 动作 id → 定义 的索引 */
|
||||||
|
export const ACTION_MAP: Record<string, TerminalAction> = Object.fromEntries(
|
||||||
|
TERMINAL_ACTIONS.map(a => [a.id, a])
|
||||||
|
)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 设置页的分组顺序。
|
||||||
|
*
|
||||||
|
* 显式列出而不是从 TERMINAL_ACTIONS 推导：我们希望分组顺序稳定，
|
||||||
|
* 而不是随着动作增删而漂移。
|
||||||
|
*/
|
||||||
|
export const ACTION_GROUPS = ['文本操作', '标签', '分屏', '视图', '会话'] as const
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 判断一个键盘事件是否匹配某个键位字符串。
|
||||||
|
*
|
||||||
|
* 键位字符串格式与 Rust 侧 `crate::shortcut::parse_shortcut` 保持一致：
|
||||||
|
* `Ctrl+Shift+C`、`Alt+1`、`F2`、`Ctrl+=`。
|
||||||
|
*
|
||||||
|
* 匹配规则（与浏览器/系统惯例对齐）：
|
||||||
|
* - 修饰键必须**精确**匹配（多按或少按都算不匹配）。
|
||||||
|
* 例：绑定了 `Ctrl+Shift+C` 时，只按 `Ctrl+C` 不应触发。
|
||||||
|
* - 主键比较不区分大小写（`Ctrl+Shift+C` 与 `Ctrl+Shift+c` 等价）。
|
||||||
|
* - `Tab` 作为主键时，`Shift` 参与区分（`Ctrl+Tab` ≠ `Ctrl+Shift+Tab`）。
|
||||||
|
*/
|
||||||
|
export function matchesShortcut(e: KeyboardEvent, keys: string): boolean {
|
||||||
|
if (!keys) return false
|
||||||
|
|
||||||
|
const parts = keys
|
||||||
|
.split('+')
|
||||||
|
.map(p => p.trim())
|
||||||
|
.filter(Boolean)
|
||||||
|
if (parts.length === 0) return false
|
||||||
|
|
||||||
|
const wantCtrl = parts.some(p => p.toLowerCase() === 'ctrl')
|
||||||
|
const wantShift = parts.some(p => p.toLowerCase() === 'shift')
|
||||||
|
const wantAlt = parts.some(p => p.toLowerCase() === 'alt')
|
||||||
|
const wantMeta = parts.some(p => p.toLowerCase() === 'meta' || p.toLowerCase() === 'win')
|
||||||
|
|
||||||
|
// 修饰键精确匹配：避免「绑了 Ctrl+Shift+T，按 Ctrl+T 也触发」这类误触
|
||||||
|
if (e.ctrlKey !== wantCtrl) return false
|
||||||
|
if (e.shiftKey !== wantShift) return false
|
||||||
|
if (e.altKey !== wantAlt) return false
|
||||||
|
if (e.metaKey !== wantMeta) return false
|
||||||
|
|
||||||
|
const main = parts.find(
|
||||||
|
p => !['ctrl', 'shift', 'alt', 'meta', 'win'].includes(p.toLowerCase())
|
||||||
|
)
|
||||||
|
if (!main) return false
|
||||||
|
|
||||||
|
// 主键比较：兼容 e.key 的多种写法（'=' vs '+', ' ' vs 'Space'）
|
||||||
|
const key = normalizeKey(e.key)
|
||||||
|
const target = normalizeKey(main)
|
||||||
|
return key === target
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 把 KeyboardEvent.key 规整成键位字符串里的写法 */
|
||||||
|
function normalizeKey(raw: string): string {
|
||||||
|
const k = raw.length === 1 ? raw.toUpperCase() : raw
|
||||||
|
const alias: Record<string, string> = {
|
||||||
|
' ': 'Space',
|
||||||
|
Spacebar: 'Space',
|
||||||
|
Esc: 'Escape',
|
||||||
|
Del: 'Delete',
|
||||||
|
Ins: 'Insert',
|
||||||
|
Return: 'Enter',
|
||||||
|
Add: '+',
|
||||||
|
Subtract: '-',
|
||||||
|
Equal: '=',
|
||||||
|
Minus: '-',
|
||||||
|
// Shift+数字 时 e.key 会变成符号（Shift+1 → '!'），而键位表里写的是 '1'。
|
||||||
|
// 这里做一次反向映射，让 `Alt+1` 在按住 Shift 的意外情况下也能识别。
|
||||||
|
'!': '1',
|
||||||
|
'@': '2',
|
||||||
|
'#': '3',
|
||||||
|
$: '4',
|
||||||
|
'%': '5',
|
||||||
|
'^': '6',
|
||||||
|
'&': '7',
|
||||||
|
'*': '8',
|
||||||
|
'(': '9',
|
||||||
|
')': '0',
|
||||||
|
_: '-',
|
||||||
|
'+': '='
|
||||||
|
}
|
||||||
|
return alias[k] ?? k
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 把 KeyboardEvent 转成键位字符串（设置页录制新键位时用）。
|
||||||
|
*
|
||||||
|
* 返回空串表示「只按了修饰键」，调用方应忽略这种中间状态。
|
||||||
|
*/
|
||||||
|
export function eventToShortcut(e: KeyboardEvent): string {
|
||||||
|
const parts: string[] = []
|
||||||
|
if (e.ctrlKey) parts.push('Ctrl')
|
||||||
|
if (e.shiftKey) parts.push('Shift')
|
||||||
|
if (e.altKey) parts.push('Alt')
|
||||||
|
if (e.metaKey) parts.push('Meta')
|
||||||
|
|
||||||
|
const key = e.key
|
||||||
|
// 只按修饰键时 e.key 就是修饰键本身，此时不应产出绑定
|
||||||
|
if (['Control', 'Shift', 'Alt', 'Meta'].includes(key)) return ''
|
||||||
|
|
||||||
|
parts.push(normalizeKey(key))
|
||||||
|
return parts.join('+')
|
||||||
|
}
|
||||||
@@ -0,0 +1,266 @@
|
|||||||
|
import { ref } from 'vue'
|
||||||
|
import type { ITheme } from '@xterm/xterm'
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 终端配色方案。
|
||||||
|
*
|
||||||
|
* # 为什么自己定义而不是引第三方包
|
||||||
|
*
|
||||||
|
* 常见的 `xterm-theme` 包把几十套主题硬编码在一个文件里，其中大部分用不上，
|
||||||
|
* 且它的配色值与 VS Code / Windows Terminal 的官方定义常有小幅偏差
|
||||||
|
* （导致同一个主题在两个终端里看起来不一样）。这里只保留项目实际提供的几套，
|
||||||
|
* 数值取自各主题官方定义，保证「选了 solarized-dark 就和别处一致」。
|
||||||
|
*
|
||||||
|
* # 命名与 Rust 侧一致
|
||||||
|
*
|
||||||
|
* key 必须与 `terminal/settings.rs` 中 `AppearanceSettings.theme` 的取值一致，
|
||||||
|
* 否则用户选了主题却回落到默认（且不会有任何报错，属于静默失效）。
|
||||||
|
*/
|
||||||
|
export const TERMINAL_THEMES: Record<string, ITheme> = {
|
||||||
|
/** VS Code 默认深色（最通用，作为默认值） */
|
||||||
|
'vscode-dark': {
|
||||||
|
background: '#1e1e1e',
|
||||||
|
foreground: '#cccccc',
|
||||||
|
cursor: '#ffffff',
|
||||||
|
cursorAccent: '#1e1e1e',
|
||||||
|
selectionBackground: '#264f78',
|
||||||
|
black: '#000000',
|
||||||
|
red: '#cd3131',
|
||||||
|
green: '#0dbc79',
|
||||||
|
yellow: '#e5e510',
|
||||||
|
blue: '#2472c8',
|
||||||
|
magenta: '#bc3fbc',
|
||||||
|
cyan: '#11a8cd',
|
||||||
|
white: '#e5e5e5',
|
||||||
|
brightBlack: '#666666',
|
||||||
|
brightRed: '#f14c4c',
|
||||||
|
brightGreen: '#23d18b',
|
||||||
|
brightYellow: '#f5f543',
|
||||||
|
brightBlue: '#3b8eea',
|
||||||
|
brightMagenta: '#d670d6',
|
||||||
|
brightCyan: '#29b8db',
|
||||||
|
brightWhite: '#e5e5e5'
|
||||||
|
},
|
||||||
|
|
||||||
|
/** VS Code 浅色 */
|
||||||
|
'vscode-light': {
|
||||||
|
background: '#ffffff',
|
||||||
|
foreground: '#333333',
|
||||||
|
cursor: '#000000',
|
||||||
|
cursorAccent: '#ffffff',
|
||||||
|
selectionBackground: '#add6ff',
|
||||||
|
black: '#000000',
|
||||||
|
red: '#cd3131',
|
||||||
|
green: '#00bc00',
|
||||||
|
yellow: '#949800',
|
||||||
|
blue: '#0451a5',
|
||||||
|
magenta: '#bc05bc',
|
||||||
|
cyan: '#0598bc',
|
||||||
|
white: '#555555',
|
||||||
|
brightBlack: '#666666',
|
||||||
|
brightRed: '#cd3131',
|
||||||
|
brightGreen: '#14ce14',
|
||||||
|
brightYellow: '#b5ba00',
|
||||||
|
brightBlue: '#0451a5',
|
||||||
|
brightMagenta: '#bc05bc',
|
||||||
|
brightCyan: '#0598bc',
|
||||||
|
brightWhite: '#a5a5a5'
|
||||||
|
},
|
||||||
|
|
||||||
|
/** Solarized Dark（长时间阅读友好，低对比度） */
|
||||||
|
'solarized-dark': {
|
||||||
|
background: '#002b36',
|
||||||
|
foreground: '#839496',
|
||||||
|
cursor: '#93a1a1',
|
||||||
|
cursorAccent: '#002b36',
|
||||||
|
selectionBackground: '#073642',
|
||||||
|
black: '#073642',
|
||||||
|
red: '#dc322f',
|
||||||
|
green: '#859900',
|
||||||
|
yellow: '#b58900',
|
||||||
|
blue: '#268bd2',
|
||||||
|
magenta: '#d33682',
|
||||||
|
cyan: '#2aa198',
|
||||||
|
white: '#eee8d5',
|
||||||
|
brightBlack: '#002b36',
|
||||||
|
brightRed: '#cb4b16',
|
||||||
|
brightGreen: '#586e75',
|
||||||
|
brightYellow: '#657b83',
|
||||||
|
brightBlue: '#839496',
|
||||||
|
brightMagenta: '#6c71c4',
|
||||||
|
brightCyan: '#93a1a1',
|
||||||
|
brightWhite: '#fdf6e3'
|
||||||
|
},
|
||||||
|
|
||||||
|
/** Solarized Light */
|
||||||
|
'solarized-light': {
|
||||||
|
background: '#fdf6e3',
|
||||||
|
foreground: '#657b83',
|
||||||
|
cursor: '#586e75',
|
||||||
|
cursorAccent: '#fdf6e3',
|
||||||
|
selectionBackground: '#eee8d5',
|
||||||
|
black: '#073642',
|
||||||
|
red: '#dc322f',
|
||||||
|
green: '#859900',
|
||||||
|
yellow: '#b58900',
|
||||||
|
blue: '#268bd2',
|
||||||
|
magenta: '#d33682',
|
||||||
|
cyan: '#2aa198',
|
||||||
|
white: '#eee8d5',
|
||||||
|
brightBlack: '#002b36',
|
||||||
|
brightRed: '#cb4b16',
|
||||||
|
brightGreen: '#586e75',
|
||||||
|
brightYellow: '#657b83',
|
||||||
|
brightBlue: '#839496',
|
||||||
|
brightMagenta: '#6c71c4',
|
||||||
|
brightCyan: '#93a1a1',
|
||||||
|
brightWhite: '#fdf6e3'
|
||||||
|
},
|
||||||
|
|
||||||
|
/** Dracula（高对比度深色，护眼配色） */
|
||||||
|
dracula: {
|
||||||
|
background: '#282a36',
|
||||||
|
foreground: '#f8f8f2',
|
||||||
|
cursor: '#f8f8f2',
|
||||||
|
cursorAccent: '#282a36',
|
||||||
|
selectionBackground: '#44475a',
|
||||||
|
black: '#21222c',
|
||||||
|
red: '#ff5555',
|
||||||
|
green: '#50fa7b',
|
||||||
|
yellow: '#f1fa8c',
|
||||||
|
blue: '#bd93f9',
|
||||||
|
magenta: '#ff79c6',
|
||||||
|
cyan: '#8be9fd',
|
||||||
|
white: '#f8f8f2',
|
||||||
|
brightBlack: '#6272a4',
|
||||||
|
brightRed: '#ff6e6e',
|
||||||
|
brightGreen: '#69ff94',
|
||||||
|
brightYellow: '#ffffa5',
|
||||||
|
brightBlue: '#d6acff',
|
||||||
|
brightMagenta: '#ff92df',
|
||||||
|
brightCyan: '#a4ffff',
|
||||||
|
brightWhite: '#ffffff'
|
||||||
|
},
|
||||||
|
|
||||||
|
/** One Dark（Atom/VS Code 经典深色） */
|
||||||
|
'one-dark': {
|
||||||
|
background: '#282c34',
|
||||||
|
foreground: '#abb2bf',
|
||||||
|
cursor: '#528bff',
|
||||||
|
cursorAccent: '#282c34',
|
||||||
|
selectionBackground: '#3e4451',
|
||||||
|
black: '#282c34',
|
||||||
|
red: '#e06c75',
|
||||||
|
green: '#98c379',
|
||||||
|
yellow: '#e5c07b',
|
||||||
|
blue: '#61afef',
|
||||||
|
magenta: '#c678dd',
|
||||||
|
cyan: '#56b6c2',
|
||||||
|
white: '#abb2bf',
|
||||||
|
brightBlack: '#5c6370',
|
||||||
|
brightRed: '#e06c75',
|
||||||
|
brightGreen: '#98c379',
|
||||||
|
brightYellow: '#e5c07b',
|
||||||
|
brightBlue: '#61afef',
|
||||||
|
brightMagenta: '#c678dd',
|
||||||
|
brightCyan: '#56b6c2',
|
||||||
|
brightWhite: '#ffffff'
|
||||||
|
},
|
||||||
|
|
||||||
|
/** 跟随主应用（用 CSS 变量解析，见 resolveTheme） */
|
||||||
|
system: {
|
||||||
|
// 占位：真实值在 resolveTheme 中按当前亮暗模式填入
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 供设置页下拉展示的选项（key + 中文标签） */
|
||||||
|
export const TERMINAL_THEME_OPTIONS: Array<{ value: string; label: string }> = [
|
||||||
|
{ value: 'vscode-dark', label: 'VS Code 深色' },
|
||||||
|
{ value: 'vscode-light', label: 'VS Code 浅色' },
|
||||||
|
{ value: 'solarized-dark', label: 'Solarized 深色' },
|
||||||
|
{ value: 'solarized-light', label: 'Solarized 浅色' },
|
||||||
|
{ value: 'dracula', label: 'Dracula' },
|
||||||
|
{ value: 'one-dark', label: 'One Dark' },
|
||||||
|
{ value: 'system', label: '跟随主应用' }
|
||||||
|
]
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 应用当前是否深色。
|
||||||
|
*
|
||||||
|
* 各窗口的 `applyTheme`（主窗口 appStore、独立窗口 / 选择窗口）在切换
|
||||||
|
* `documentElement` 的 `dark` class 时写入这里。终端主题要「跟随应用」就必须有
|
||||||
|
* 一个**响应式**输入 —— 只读 DOM class 的话，应用切浅色时终端不会重算
|
||||||
|
* （这正是「跟随应用主题」此前形同摆设的原因）。
|
||||||
|
*/
|
||||||
|
export const appIsDark = ref(false)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 亮暗成对的主题。
|
||||||
|
*
|
||||||
|
* 「跟随应用主题」打开时，`theme` 只作为**取色基准**（见 Rust `AppearanceSettings`
|
||||||
|
* 的字段说明）：应用是深色取 `dark`，浅色取 `light`。只有深色变体的主题
|
||||||
|
* （Dracula / One Dark）在浅色下回落到 VS Code 浅色 —— 与其在浅色背景上硬套深色
|
||||||
|
* 配色，不如换一套能看清的。
|
||||||
|
*/
|
||||||
|
const THEME_PAIRS: Record<string, { light: string; dark: string }> = {
|
||||||
|
'vscode-dark': { light: 'vscode-light', dark: 'vscode-dark' },
|
||||||
|
'vscode-light': { light: 'vscode-light', dark: 'vscode-dark' },
|
||||||
|
'solarized-dark': { light: 'solarized-light', dark: 'solarized-dark' },
|
||||||
|
'solarized-light': { light: 'solarized-light', dark: 'solarized-dark' },
|
||||||
|
dracula: { light: 'vscode-light', dark: 'dracula' },
|
||||||
|
'one-dark': { light: 'vscode-light', dark: 'one-dark' },
|
||||||
|
system: { light: 'vscode-light', dark: 'vscode-dark' }
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 求「实际生效」的主题名。
|
||||||
|
*
|
||||||
|
* - `followAppTheme` 开：按应用深浅取对应侧（见 THEME_PAIRS）
|
||||||
|
* - `followAppTheme` 关：用所选主题本身；选「跟随主应用」时按传入的深浅解析一次
|
||||||
|
* （调用方传的是当前值快照，因此之后应用改深浅不会带着终端一起变）
|
||||||
|
*/
|
||||||
|
export function effectiveThemeName(theme: string, followAppTheme: boolean, isDark: boolean): string {
|
||||||
|
if (followAppTheme) {
|
||||||
|
const pair = THEME_PAIRS[theme] ?? THEME_PAIRS.system
|
||||||
|
return isDark ? pair.dark : pair.light
|
||||||
|
}
|
||||||
|
if (theme === 'system') return isDark ? 'vscode-dark' : 'vscode-light'
|
||||||
|
return theme
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 按「背景不透明度」把主题背景色改成半透明。
|
||||||
|
*
|
||||||
|
* xterm 的 `theme.background` 支持带 alpha 的 8 位 hex —— 这是实现背景不透明度的
|
||||||
|
* 正确方式：**文字颜色不受影响**（给容器加 CSS `opacity` 会把字也一起变淡）。
|
||||||
|
* 前置条件是构造时 `allowTransparency: true`（见 useXterm）。
|
||||||
|
*/
|
||||||
|
export function themeWithOpacity(theme: ITheme, opacity: number): ITheme {
|
||||||
|
const p = Math.min(100, Math.max(0, Math.round(opacity)))
|
||||||
|
if (p >= 100) return theme
|
||||||
|
|
||||||
|
const bg = theme.background ?? '#000000'
|
||||||
|
// 只处理 #RRGGBB / #RRGGBBAA；其它写法原样返回（宁可不透明，也不要变成无效色值）
|
||||||
|
let rgb: string
|
||||||
|
if (bg.length === 7) rgb = bg
|
||||||
|
else if (bg.length === 9) rgb = bg.slice(0, 7)
|
||||||
|
else return theme
|
||||||
|
|
||||||
|
const alpha = Math.round((p / 100) * 255)
|
||||||
|
.toString(16)
|
||||||
|
.padStart(2, '0')
|
||||||
|
return { ...theme, background: `${rgb}${alpha}` }
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 解析主题名到具体的 xterm 主题对象。
|
||||||
|
*
|
||||||
|
* `system` 读取 `appIsDark`（由各窗口的主题应用逻辑维护），映射到
|
||||||
|
* vscode-dark / vscode-light，避免终端在主应用切到浅色时突兀地保持全黑。
|
||||||
|
*/
|
||||||
|
export function resolveTheme(name: string): ITheme {
|
||||||
|
if (name === 'system') {
|
||||||
|
return TERMINAL_THEMES[appIsDark.value ? 'vscode-dark' : 'vscode-light']
|
||||||
|
}
|
||||||
|
return TERMINAL_THEMES[name] ?? TERMINAL_THEMES['vscode-dark']
|
||||||
|
}
|
||||||
@@ -0,0 +1,114 @@
|
|||||||
|
/**
|
||||||
|
* 主题色派生单测（Node 内置 test runner）。
|
||||||
|
*
|
||||||
|
* 重点不是「算得对不对」，而是「任何预设色在两种模式下都可读」——
|
||||||
|
* 对比度是这条链路上唯一会真正伤到用户的指标。
|
||||||
|
*/
|
||||||
|
import { test } from 'node:test'
|
||||||
|
import assert from 'node:assert/strict'
|
||||||
|
import {
|
||||||
|
ACCENT_PRESETS,
|
||||||
|
ACCENT_VAR_KEYS,
|
||||||
|
contrastRatio,
|
||||||
|
deriveAccent,
|
||||||
|
hexToOklch,
|
||||||
|
oklchToHex,
|
||||||
|
resolveAccentHex,
|
||||||
|
type ThemeMode
|
||||||
|
} from './theme.ts'
|
||||||
|
|
||||||
|
const MODES: ThemeMode[] = ['light', 'dark']
|
||||||
|
/** 深色模式的对比度基准（与实现里的 DARK_REFERENCE 一致） */
|
||||||
|
const DARK_REFERENCE = '#1e1e22'
|
||||||
|
|
||||||
|
test('hex → OKLCH → hex 往返稳定', () => {
|
||||||
|
for (const preset of ACCENT_PRESETS) {
|
||||||
|
const back = oklchToHex(hexToOklch(preset.hex))
|
||||||
|
const [r1, g1, b1] = [1, 3, 5].map(i => parseInt(preset.hex.slice(i, i + 2), 16))
|
||||||
|
const [r2, g2, b2] = [1, 3, 5].map(i => parseInt(back.slice(i, i + 2), 16))
|
||||||
|
// 允许 ±1/255 的取整误差
|
||||||
|
assert.ok(Math.abs(r1 - r2) <= 1, `${preset.id} R: ${preset.hex} → ${back}`)
|
||||||
|
assert.ok(Math.abs(g1 - g2) <= 1, `${preset.id} G: ${preset.hex} → ${back}`)
|
||||||
|
assert.ok(Math.abs(b1 - b2) <= 1, `${preset.id} B: ${preset.hex} → ${back}`)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
test('默认蓝派生结果贴近现有手调值', () => {
|
||||||
|
const light = deriveAccent('#0066cc', 'light')
|
||||||
|
assert.equal(light['--primary'], '#0066cc')
|
||||||
|
// 现有 --primary-soft / --primary-soft-text = #e8f1fc / #004f9e，只要求同一色族与量级
|
||||||
|
assert.equal(hexToOklch(light['--primary-soft']).l > 0.9, true)
|
||||||
|
assert.equal(contrastRatio(light['--primary-soft-text'], light['--primary-soft']) >= 4.5, true)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('所有预设 × 两种模式：强调色对底色、浅底文字对浅底、按钮文字对按钮底 均 ≥ 4.5:1', () => {
|
||||||
|
for (const preset of ACCENT_PRESETS) {
|
||||||
|
for (const mode of MODES) {
|
||||||
|
const vars = deriveAccent(preset.hex, mode)
|
||||||
|
const reference = mode === 'light' ? '#ffffff' : DARK_REFERENCE
|
||||||
|
const label = `${preset.id}/${mode}`
|
||||||
|
|
||||||
|
assert.ok(
|
||||||
|
contrastRatio(vars['--primary'], reference) >= 4.5,
|
||||||
|
`${label} primary 对底对比度不足: ${contrastRatio(vars['--primary'], reference).toFixed(2)}`
|
||||||
|
)
|
||||||
|
assert.ok(
|
||||||
|
contrastRatio(vars['--primary-soft-text'], vars['--primary-soft']) >= 4.5,
|
||||||
|
`${label} soft-text 对 soft 对比度不足: ${contrastRatio(
|
||||||
|
vars['--primary-soft-text'],
|
||||||
|
vars['--primary-soft']
|
||||||
|
).toFixed(2)}`
|
||||||
|
)
|
||||||
|
// 填充上的文字：浅色模式必然 ≥4.5:1；深色模式强调色偏亮，白字约 2.7–3:1
|
||||||
|
//（与现有 #2997ff + 白字 的取舍一致），门槛按 UI 组件的 2.5:1 兜底
|
||||||
|
const fillMin = mode === 'light' ? 4.5 : 2.5
|
||||||
|
assert.ok(
|
||||||
|
contrastRatio(vars['--primary-foreground'], vars['--primary']) >= fillMin,
|
||||||
|
`${label} foreground 对 primary 对比度不足: ${contrastRatio(
|
||||||
|
vars['--primary-foreground'],
|
||||||
|
vars['--primary']
|
||||||
|
).toFixed(2)}`
|
||||||
|
)
|
||||||
|
assert.equal(vars['--ring'], vars['--primary'], `${label} ring 应等于 primary`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
test('亮色（青柠）在浅色模式下被自动压暗', () => {
|
||||||
|
const base = hexToOklch('#65a30d')
|
||||||
|
const derived = hexToOklch(deriveAccent('#65a30d', 'light')['--primary'])
|
||||||
|
// 青柠原色在白底上只有约 2.8:1，派生后必须达标且比原色暗
|
||||||
|
assert.ok(derived.l < base.l, `未压暗: ${base.l} → ${derived.l}`)
|
||||||
|
assert.ok(contrastRatio(oklchToHex(derived), '#ffffff') >= 4.5)
|
||||||
|
})
|
||||||
|
|
||||||
|
test('色相保留（除被 sRGB 色域裁剪的极端彩度）', () => {
|
||||||
|
for (const preset of ACCENT_PRESETS) {
|
||||||
|
for (const mode of MODES) {
|
||||||
|
const base = hexToOklch(preset.hex)
|
||||||
|
const derived = hexToOklch(deriveAccent(preset.hex, mode)['--primary'])
|
||||||
|
if (derived.c < 0.02) continue // 石墨这类近无彩色，色相无意义
|
||||||
|
const diff = Math.abs(((derived.h - base.h + 540) % 360) - 180)
|
||||||
|
assert.ok(diff < 12, `${preset.id}/${mode} 色相偏移过大: ${base.h} → ${derived.h}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
test('派生结果都是合法 hex，且每个变量都有值', () => {
|
||||||
|
for (const preset of ACCENT_PRESETS) {
|
||||||
|
for (const mode of MODES) {
|
||||||
|
const vars = deriveAccent(preset.hex, mode)
|
||||||
|
for (const key of ACCENT_VAR_KEYS) {
|
||||||
|
assert.match(vars[key], /^#[0-9a-f]{6}$/, `${preset.id}/${mode} ${key} 非法: ${vars[key]}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
test('resolveAccentHex：默认与非法自定义都回落到内置默认', () => {
|
||||||
|
assert.equal(resolveAccentHex('blue', null), null)
|
||||||
|
assert.equal(resolveAccentHex('custom', null), null)
|
||||||
|
assert.equal(resolveAccentHex('custom', 'not-a-color'), null)
|
||||||
|
assert.equal(resolveAccentHex('custom', '#ffd60a'), '#ffd60a')
|
||||||
|
assert.equal(resolveAccentHex('violet', null), '#7c3aed')
|
||||||
|
})
|
||||||
@@ -0,0 +1,345 @@
|
|||||||
|
/**
|
||||||
|
* 主题色（强调色）派生与应用。
|
||||||
|
*
|
||||||
|
* # 为什么只改 7 个变量就够
|
||||||
|
*
|
||||||
|
* 全应用的「可交互色」早已收敛到 `--primary` 单点（见 UI_DESIGN_SYSTEM.md §P1）：
|
||||||
|
* 按钮、开关、焦点环、选中态都走它。因此换色不需要动任何组件，只要覆盖这一族变量。
|
||||||
|
*
|
||||||
|
* # 为什么用 OKLCH 而不是 HSL
|
||||||
|
*
|
||||||
|
* HSL 的「明度」感知不均匀：换色相后同一个 L 有的发亮有的发暗（黄色 L=50% 已经很亮，
|
||||||
|
* 蓝色 L=50% 却很暗）。OKLCH 的 L 是感知均匀的，锁住 L/C 只换 H，才能保证
|
||||||
|
* 「换任意色相后对比度一致」。
|
||||||
|
*
|
||||||
|
* # 深浅两套为什么必须分别派生
|
||||||
|
*
|
||||||
|
* 深色底上直接用浅色值不可读（`#0066cc` 在 `#1e1e22` 上只有约 3.2:1）。
|
||||||
|
* 所以同一基色按模式重定 L：浅色压暗到能在白底上当文字用，深色提亮到能在深底上读。
|
||||||
|
*
|
||||||
|
* # 与样式表的关系
|
||||||
|
*
|
||||||
|
* 这些变量写在 `document.documentElement` 的行内样式上 —— 行内优先级高于
|
||||||
|
* `:root` 与 `.dark` 两条规则，因此：
|
||||||
|
* - 切模式必须**整组 7 个重写**（否则浅色的行内值会残留到深色模式）
|
||||||
|
* - 恢复默认必须 `removeProperty`（写空串仍算「已设置」，会继续压住样式表）
|
||||||
|
*
|
||||||
|
* # 为什么这个文件零依赖
|
||||||
|
*
|
||||||
|
* 它要能被 `node --test` 直接跑（`theme.test.ts` 校验全部预设的对比度），
|
||||||
|
* 而 Node 不解析 `@/` 路径别名 —— 所以这里不 import 任何项目模块。
|
||||||
|
* 需要读 localStorage 的独立窗口请用 `@/lib/accentStorage`。
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** 强调色变量名（顺序固定，整组写入/整组清除） */
|
||||||
|
export const ACCENT_VAR_KEYS = [
|
||||||
|
'--primary',
|
||||||
|
'--primary-hover',
|
||||||
|
'--primary-active',
|
||||||
|
'--primary-soft',
|
||||||
|
'--primary-soft-text',
|
||||||
|
'--ring',
|
||||||
|
'--primary-foreground'
|
||||||
|
] as const
|
||||||
|
|
||||||
|
export type AccentVarKey = (typeof ACCENT_VAR_KEYS)[number]
|
||||||
|
|
||||||
|
export interface AccentPreset {
|
||||||
|
id: string
|
||||||
|
name: string
|
||||||
|
/** 基色（浅色模式取值）。深色模式由派生算法提亮，不需要另给 */
|
||||||
|
hex: string
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 预设色板：覆盖色相环主要区间，纯自由取色很容易选出对比度不达标的颜色 */
|
||||||
|
export const ACCENT_PRESETS: AccentPreset[] = [
|
||||||
|
{ id: 'blue', name: '默认蓝', hex: '#0066cc' },
|
||||||
|
{ id: 'indigo', name: '靛蓝', hex: '#4f46e5' },
|
||||||
|
{ id: 'violet', name: '紫罗兰', hex: '#7c3aed' },
|
||||||
|
{ id: 'rose', name: '玫红', hex: '#e11d48' },
|
||||||
|
{ id: 'orange', name: '橙', hex: '#ea580c' },
|
||||||
|
{ id: 'amber', name: '琥珀', hex: '#d97706' },
|
||||||
|
{ id: 'lime', name: '青柠', hex: '#65a30d' },
|
||||||
|
{ id: 'green', name: '翠绿', hex: '#059669' },
|
||||||
|
{ id: 'teal', name: '青绿', hex: '#0d9488' },
|
||||||
|
{ id: 'graphite', name: '石墨', hex: '#5b6472' }
|
||||||
|
]
|
||||||
|
|
||||||
|
export const DEFAULT_ACCENT_ID = 'blue'
|
||||||
|
/** 自定义色的 id（hex 单独存放） */
|
||||||
|
export const CUSTOM_ACCENT_ID = 'custom'
|
||||||
|
|
||||||
|
export type ThemeMode = 'light' | 'dark'
|
||||||
|
|
||||||
|
/** 浅色模式：基色需在白卡上同时胜任「文字」与「填充」，亮度压在这个区间 */
|
||||||
|
const LIGHT_L_MIN = 0.42
|
||||||
|
const LIGHT_L_MAX = 0.58
|
||||||
|
/** 深色模式：深底上要提亮 */
|
||||||
|
const DARK_L_MIN = 0.68
|
||||||
|
const DARK_L_MAX = 0.8
|
||||||
|
/** 彩度上下限：太低会「灰得没有强调感」，太高在深底上发刺 */
|
||||||
|
const C_MIN = 0.06
|
||||||
|
const C_MAX_LIGHT = 0.2
|
||||||
|
const C_MAX_DARK = 0.18
|
||||||
|
/** 正文可读性门槛（WCAG AA，用于「强调色当文字用」的场合） */
|
||||||
|
const CONTRAST_AA = 4.5
|
||||||
|
/**
|
||||||
|
* 填充色上文字的最低门槛。
|
||||||
|
*
|
||||||
|
* 比 AA 低是有意的：深色模式下强调色必须够亮才能在深底上当文字用（≥4.5:1），
|
||||||
|
* 而同一颜色做填充时白字必然只能到 2.7–3:1 —— 现有主题就是这个取舍
|
||||||
|
* （`#2997ff` + 白字 ≈ 2.98:1）。这里只兜住「自定义极亮色导致白字几乎不可读」的极端情况。
|
||||||
|
*/
|
||||||
|
const CONTRAST_FILL_MIN = 2.5
|
||||||
|
/** 深色模式的对比度基准：卡片底（比画布 #16161a 略亮，取更严的一侧） */
|
||||||
|
const DARK_REFERENCE = '#1e1e22'
|
||||||
|
const WHITE = '#ffffff'
|
||||||
|
const INK = '#1d1d1f'
|
||||||
|
|
||||||
|
export interface Oklch {
|
||||||
|
/** 感知明度 0–1 */
|
||||||
|
l: number
|
||||||
|
/** 彩度 */
|
||||||
|
c: number
|
||||||
|
/** 色相角（度） */
|
||||||
|
h: number
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 色彩空间换算 =====
|
||||||
|
|
||||||
|
const clamp = (v: number, min: number, max: number) => Math.min(max, Math.max(min, v))
|
||||||
|
|
||||||
|
const toLinear = (channel: number) =>
|
||||||
|
channel <= 0.04045 ? channel / 12.92 : Math.pow((channel + 0.055) / 1.055, 2.4)
|
||||||
|
|
||||||
|
const toGamma = (channel: number) =>
|
||||||
|
channel <= 0.0031308 ? 12.92 * channel : 1.055 * Math.pow(channel, 1 / 2.4) - 0.055
|
||||||
|
|
||||||
|
/** `#rrggbb` → 0–1 的 sRGB 三元组；非法输入返回 null */
|
||||||
|
export function parseHex(hex: string): [number, number, number] | null {
|
||||||
|
const m = /^#?([0-9a-f]{6})$/i.exec(hex.trim())
|
||||||
|
if (!m) return null
|
||||||
|
const n = parseInt(m[1], 16)
|
||||||
|
return [((n >> 16) & 255) / 255, ((n >> 8) & 255) / 255, (n & 255) / 255]
|
||||||
|
}
|
||||||
|
|
||||||
|
const toHex = (rgb: [number, number, number]) =>
|
||||||
|
'#' +
|
||||||
|
rgb
|
||||||
|
.map(v => Math.round(clamp(v, 0, 1) * 255).toString(16).padStart(2, '0'))
|
||||||
|
.join('')
|
||||||
|
|
||||||
|
export function hexToOklch(hex: string): Oklch {
|
||||||
|
const parsed = parseHex(hex)
|
||||||
|
if (!parsed) return { l: 0.5, c: 0.1, h: 250 }
|
||||||
|
const [r, g, b] = parsed.map(toLinear) as [number, number, number]
|
||||||
|
|
||||||
|
const l = 0.4122214708 * r + 0.5363325363 * g + 0.0514459929 * b
|
||||||
|
const m = 0.2119034982 * r + 0.6806995451 * g + 0.1073969566 * b
|
||||||
|
const s = 0.0883024619 * r + 0.2817188376 * g + 0.6299787005 * b
|
||||||
|
|
||||||
|
const l_ = Math.cbrt(l)
|
||||||
|
const m_ = Math.cbrt(m)
|
||||||
|
const s_ = Math.cbrt(s)
|
||||||
|
|
||||||
|
const L = 0.2104542553 * l_ + 0.793617785 * m_ - 0.0040720468 * s_
|
||||||
|
const A = 1.9779984951 * l_ - 2.428592205 * m_ + 0.4505937099 * s_
|
||||||
|
const B = 0.0259040371 * l_ + 0.7827717662 * m_ - 0.808675766 * s_
|
||||||
|
|
||||||
|
const c = Math.hypot(A, B)
|
||||||
|
// 无彩色时色相无意义，给 0 避免 atan2 噪声
|
||||||
|
const h = c < 1e-4 ? 0 : ((Math.atan2(B, A) * 180) / Math.PI + 360) % 360
|
||||||
|
return { l: L, c, h }
|
||||||
|
}
|
||||||
|
|
||||||
|
/** OKLCH → `#rrggbb`；越出 sRGB 色域时逐步降彩度，保证颜色有效 */
|
||||||
|
export function oklchToHex(value: Oklch): string {
|
||||||
|
const { l, h } = value
|
||||||
|
let c = Math.max(0, value.c)
|
||||||
|
for (let i = 0; i < 200; i++) {
|
||||||
|
const rgb = oklchToRgb(l, c, h)
|
||||||
|
if (rgb.every(v => v >= -0.0005 && v <= 1.0005)) return toHex(rgb)
|
||||||
|
c -= 0.005
|
||||||
|
if (c <= 0) return toHex(oklchToRgb(l, 0, h))
|
||||||
|
}
|
||||||
|
return toHex(oklchToRgb(l, 0, h))
|
||||||
|
}
|
||||||
|
|
||||||
|
const oklchToRgb = (l: number, c: number, hDeg: number): [number, number, number] => {
|
||||||
|
const hRad = (hDeg * Math.PI) / 180
|
||||||
|
const A = c * Math.cos(hRad)
|
||||||
|
const B = c * Math.sin(hRad)
|
||||||
|
|
||||||
|
const l_ = l + 0.3963377774 * A + 0.2158037573 * B
|
||||||
|
const m_ = l - 0.1055613458 * A - 0.0638541728 * B
|
||||||
|
const s_ = l - 0.0894841775 * A - 1.291485548 * B
|
||||||
|
|
||||||
|
const lc = l_ ** 3
|
||||||
|
const mc = m_ ** 3
|
||||||
|
const sc = s_ ** 3
|
||||||
|
|
||||||
|
return [
|
||||||
|
toGamma(4.0767416621 * lc - 3.3077115913 * mc + 0.2309699292 * sc),
|
||||||
|
toGamma(-1.2684380046 * lc + 2.6097574011 * mc - 0.3413193965 * sc),
|
||||||
|
toGamma(-0.0041960863 * lc - 0.7034186147 * mc + 1.707614701 * sc)
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 对比度（WCAG） =====
|
||||||
|
|
||||||
|
export function relativeLuminance(hex: string): number {
|
||||||
|
const parsed = parseHex(hex)
|
||||||
|
if (!parsed) return 0
|
||||||
|
const [r, g, b] = parsed.map(toLinear) as [number, number, number]
|
||||||
|
return 0.2126 * r + 0.7152 * g + 0.0722 * b
|
||||||
|
}
|
||||||
|
|
||||||
|
export function contrastRatio(a: string, b: string): number {
|
||||||
|
const la = relativeLuminance(a)
|
||||||
|
const lb = relativeLuminance(b)
|
||||||
|
const [hi, lo] = la >= lb ? [la, lb] : [lb, la]
|
||||||
|
return (hi + 0.05) / (lo + 0.05)
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 在给定色相/彩度下，把明度朝目标方向推进到满足对比度为止 */
|
||||||
|
function fitLuminance(
|
||||||
|
startL: number,
|
||||||
|
c: number,
|
||||||
|
h: number,
|
||||||
|
reference: string,
|
||||||
|
direction: 1 | -1
|
||||||
|
): number {
|
||||||
|
let l = startL
|
||||||
|
for (let i = 0; i < 40; i++) {
|
||||||
|
if (contrastRatio(oklchToHex({ l, c, h }), reference) >= CONTRAST_AA) break
|
||||||
|
const next = l + direction * 0.02
|
||||||
|
if (next < 0.2 || next > 0.98) break
|
||||||
|
l = next
|
||||||
|
}
|
||||||
|
return l
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 填充色上的文字色。
|
||||||
|
*
|
||||||
|
* 浅色模式的强调色已被亮度拟合压到对白底 ≥4.5:1，因此白字必然达标；
|
||||||
|
* 深色模式的强调色偏亮，白字约 2.7–3:1 —— 与现有主题一致，保持白字。
|
||||||
|
* 只有白字低到不可读（自定义极亮色）才改深墨。
|
||||||
|
*/
|
||||||
|
function foregroundFor(primary: string): string {
|
||||||
|
const onWhite = contrastRatio(primary, WHITE)
|
||||||
|
if (onWhite >= CONTRAST_FILL_MIN) return WHITE
|
||||||
|
return contrastRatio(primary, INK) > onWhite ? INK : WHITE
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 由单一基色派生某个模式下的全套强调色变量。
|
||||||
|
*
|
||||||
|
* 色相 H 原样保留（用户选的就是色相），只按模式重定 L/C，并在必要时继续推进 L
|
||||||
|
* 直到对比度达标 —— 这就是「选到黄/浅绿时自动压暗」的实现。
|
||||||
|
*/
|
||||||
|
export function deriveAccent(baseHex: string, mode: ThemeMode): Record<AccentVarKey, string> {
|
||||||
|
const base = hexToOklch(baseHex)
|
||||||
|
const h = base.h
|
||||||
|
|
||||||
|
if (mode === 'light') {
|
||||||
|
const c = clamp(base.c, C_MIN, C_MAX_LIGHT)
|
||||||
|
const l = fitLuminance(
|
||||||
|
clamp(base.l, LIGHT_L_MIN, LIGHT_L_MAX),
|
||||||
|
c,
|
||||||
|
h,
|
||||||
|
WHITE,
|
||||||
|
-1
|
||||||
|
)
|
||||||
|
const primary = oklchToHex({ l, c, h })
|
||||||
|
const soft = oklchToHex({ l: 0.95, c: c * 0.3, h })
|
||||||
|
// 浅底上的文字：从基色加深起步，不足 4.5:1 继续压暗
|
||||||
|
const softTextL = fitLuminance(clamp(l - 0.1, 0.3, 0.48), c, h, soft, -1)
|
||||||
|
return {
|
||||||
|
'--primary': primary,
|
||||||
|
'--primary-hover': oklchToHex({ l: clamp(l - 0.08, 0.2, 1), c, h }),
|
||||||
|
'--primary-active': oklchToHex({ l: clamp(l - 0.16, 0.15, 1), c, h }),
|
||||||
|
'--primary-soft': soft,
|
||||||
|
'--primary-soft-text': oklchToHex({ l: softTextL, c, h }),
|
||||||
|
'--ring': primary,
|
||||||
|
'--primary-foreground': foregroundFor(primary)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const c = clamp(base.c, C_MIN, C_MAX_DARK)
|
||||||
|
const l = fitLuminance(clamp(base.l, DARK_L_MIN, DARK_L_MAX), c, h, DARK_REFERENCE, 1)
|
||||||
|
const primary = oklchToHex({ l, c, h })
|
||||||
|
const soft = oklchToHex({ l: 0.3, c: c * 0.45, h })
|
||||||
|
const softTextL = fitLuminance(clamp(l + 0.2, 0.72, 0.9), c * 0.7, h, soft, 1)
|
||||||
|
return {
|
||||||
|
'--primary': primary,
|
||||||
|
'--primary-hover': oklchToHex({ l: clamp(l + 0.06, 0, 0.96), c, h }),
|
||||||
|
'--primary-active': oklchToHex({ l: clamp(l - 0.1, 0, 1), c, h }),
|
||||||
|
'--primary-soft': soft,
|
||||||
|
'--primary-soft-text': oklchToHex({ l: softTextL, c: c * 0.7, h }),
|
||||||
|
'--ring': primary,
|
||||||
|
'--primary-foreground': foregroundFor(primary)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ===== 应用 / 清除 =====
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 把强调色写到 `documentElement` 的行内样式（`baseHex` 为 null 表示恢复内置默认）。
|
||||||
|
*
|
||||||
|
* 必须传入当前模式：行内值会压住 `.dark` 规则，所以每次都要按模式整组重写。
|
||||||
|
*/
|
||||||
|
export function applyAccent(root: HTMLElement, baseHex: string | null, mode: ThemeMode): void {
|
||||||
|
if (!baseHex || !parseHex(baseHex)) {
|
||||||
|
clearAccent(root)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const vars = deriveAccent(baseHex, mode)
|
||||||
|
for (const key of ACCENT_VAR_KEYS) {
|
||||||
|
root.style.setProperty(key, vars[key])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 清除行内强调色，回落到 style.css 里手调的默认值 */
|
||||||
|
export function clearAccent(root: HTMLElement): void {
|
||||||
|
for (const key of ACCENT_VAR_KEYS) {
|
||||||
|
root.style.removeProperty(key)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 由设置值解析出实际基色。
|
||||||
|
*
|
||||||
|
* 返回 null 表示「用内置默认」—— 此时不写任何行内变量，
|
||||||
|
* 保留 style.css 里手调的蓝，老用户与未改设置的用户零视觉变化。
|
||||||
|
*/
|
||||||
|
export function resolveAccentHex(accentId: string, accentHex: string | null): string | null {
|
||||||
|
if (accentId === CUSTOM_ACCENT_ID) return accentHex && parseHex(accentHex) ? accentHex : null
|
||||||
|
if (accentId === DEFAULT_ACCENT_ID) return null
|
||||||
|
return ACCENT_PRESETS.find(p => p.id === accentId)?.hex ?? null
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 独立窗口用：从 localStorage 的设置里读出主题色。
|
||||||
|
*
|
||||||
|
* 独立窗口（快速面板 / 托盘菜单 / 截图编辑器…）不加载 appStore，各自有一套
|
||||||
|
* applyTheme 副本，只共享同一份 localStorage 设置。
|
||||||
|
*
|
||||||
|
* `storageKey` 由调用方传入（`STORAGE_KEYS.appSettings`）—— 本文件不 import 项目模块，
|
||||||
|
* 是为了能被 `node --test` 直接加载。
|
||||||
|
*/
|
||||||
|
export function readStoredAccent(storageKey: string): string | null {
|
||||||
|
try {
|
||||||
|
const raw = localStorage.getItem(storageKey)
|
||||||
|
if (!raw) return null
|
||||||
|
const settings = JSON.parse(raw) as { accentId?: string; accentHex?: string | null }
|
||||||
|
return resolveAccentHex(settings.accentId ?? DEFAULT_ACCENT_ID, settings.accentHex ?? null)
|
||||||
|
} catch {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 独立窗口用：读设置并应用主题色（在各自 applyTheme 里 class 切换之后调用） */
|
||||||
|
export function applyStoredAccent(root: HTMLElement, mode: ThemeMode, storageKey: string): void {
|
||||||
|
applyAccent(root, readStoredAccent(storageKey), mode)
|
||||||
|
}
|
||||||
@@ -29,12 +29,13 @@ import { useModuleTabsStore, type ModuleTab } from '@/stores/moduleTabsStore'
|
|||||||
* ```
|
* ```
|
||||||
*
|
*
|
||||||
* ## 工作原理
|
* ## 工作原理
|
||||||
* 1. onMounted 时注册标签到 moduleTabsStore（**并复用该模块上次停留的 tab**），
|
* 1. **setup 阶段（首帧之前）** 定下要显示的 tab：搜索跳转 > 上次停留 > 声明时的初始值
|
||||||
* TitleBar 据此渲染浮动切换器
|
* —— 模块切回来是重新挂载，等到 onMounted 再改就会先渲染一帧初始页（闪一下）
|
||||||
* 2. 用 IntersectionObserver 监听 TabsList 可见性（rootMargin 裁剪 TitleBar 高度）
|
* 2. onMounted 时注册标签到 moduleTabsStore，TitleBar 据此渲染浮动切换器
|
||||||
* 3. 双向 watch 同步本地 activeTab 与 store.activeTab
|
* 3. 用 IntersectionObserver 监听 TabsList 可见性（rootMargin 裁剪 TitleBar 高度）
|
||||||
* 4. 消费搜索导航的待跳转 tab（模块尚未挂载的场景）
|
* 4. 双向 watch 同步本地 activeTab 与 store.activeTab
|
||||||
* 5. onUnmounted 时清理 observer 并把当前 tab 记到 store（按模块）后注销标签
|
* 5. 消费搜索导航的待跳转 tab（模块尚未挂载的场景）
|
||||||
|
* 6. onUnmounted 时清理 observer 并把当前 tab 记到 store（按模块）后注销标签
|
||||||
*
|
*
|
||||||
* ## 约束
|
* ## 约束
|
||||||
* - TitleBar 高度固定为 40px (h-10)，composable 内部已用 44px 裁剪（含缓冲）
|
* - TitleBar 高度固定为 40px (h-10)，composable 内部已用 44px 裁剪（含缓冲）
|
||||||
@@ -45,11 +46,32 @@ import { useModuleTabsStore, type ModuleTab } from '@/stores/moduleTabsStore'
|
|||||||
export function useModuleTabs(
|
export function useModuleTabs(
|
||||||
moduleId: string,
|
moduleId: string,
|
||||||
activeTab: Ref<string>,
|
activeTab: Ref<string>,
|
||||||
tabs: ModuleTab[]
|
tabs: ModuleTab[],
|
||||||
|
/** alwaysVisible: 模块自身不渲染 TabsList，标题栏切换器常驻（内容最大化模式） */
|
||||||
|
options: { alwaysVisible?: boolean } = {}
|
||||||
): Ref<HTMLElement | null> {
|
): Ref<HTMLElement | null> {
|
||||||
const tabsStore = useModuleTabsStore()
|
const tabsStore = useModuleTabsStore()
|
||||||
const tabsListRef = ref<HTMLElement | null>(null)
|
const tabsListRef = ref<HTMLElement | null>(null)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 首次渲染前就定下要显示的 tab：搜索跳转 > 上次停留 > 声明时的初始值。
|
||||||
|
*
|
||||||
|
* 必须在 setup 里做。模块切走时组件被卸载、`activeTab` 随之丢失，切回来重新挂载
|
||||||
|
* 时它是声明时的初始值（如 proxy 的 `'overview'`）；若等到 onMounted 才恢复，
|
||||||
|
* 首帧已经按初始值渲染过一次 —— 表现为「先闪一下第一页，再跳到上次停留页」，
|
||||||
|
* 而不是一次干净的进入动画。
|
||||||
|
*
|
||||||
|
* 这里只**读** store（rememberedTab / peekPendingTab 都不改状态）：注册仍留在
|
||||||
|
* onMounted，避免从未挂载的组件污染 store 的当前模块。
|
||||||
|
*/
|
||||||
|
const pendingTab = tabsStore.peekPendingTab(moduleId)
|
||||||
|
if (pendingTab && tabs.some(t => t.value === pendingTab)) {
|
||||||
|
activeTab.value = pendingTab
|
||||||
|
} else {
|
||||||
|
const restored = tabsStore.rememberedTab(moduleId, tabs, activeTab.value)
|
||||||
|
if (restored !== activeTab.value) activeTab.value = restored
|
||||||
|
}
|
||||||
|
|
||||||
let observer: IntersectionObserver | null = null
|
let observer: IntersectionObserver | null = null
|
||||||
|
|
||||||
/** 应用待跳转 tab（若属于当前模块的 tab 列表） */
|
/** 应用待跳转 tab（若属于当前模块的 tab 列表） */
|
||||||
@@ -103,7 +125,12 @@ export function useModuleTabs(
|
|||||||
const restored = tabsStore.registerTabs(moduleId, tabs, activeTab.value)
|
const restored = tabsStore.registerTabs(moduleId, tabs, activeTab.value)
|
||||||
if (restored !== activeTab.value) activeTab.value = restored
|
if (restored !== activeTab.value) activeTab.value = restored
|
||||||
await nextTick()
|
await nextTick()
|
||||||
setupObserver()
|
// 常驻模式：模块不渲染 TabsList，直接让标题栏切换器显示
|
||||||
|
if (options.alwaysVisible) {
|
||||||
|
tabsStore.setFloatingVisible(true)
|
||||||
|
} else {
|
||||||
|
setupObserver()
|
||||||
|
}
|
||||||
// 搜索导航跳转：模块刚挂载，消费待跳转 tab（优先级高于上次停留）
|
// 搜索导航跳转：模块刚挂载，消费待跳转 tab（优先级高于上次停留）
|
||||||
applyPendingTab()
|
applyPendingTab()
|
||||||
})
|
})
|
||||||
|
|||||||
+11
-2
@@ -40,16 +40,20 @@ const standaloneWindowApps: Array<[hash: string, label: string, loader: () => Pr
|
|||||||
['#screenshot-scroll', '滚动截图', () => import('./modules/screenshot/ScrollControl.vue')],
|
['#screenshot-scroll', '滚动截图', () => import('./modules/screenshot/ScrollControl.vue')],
|
||||||
['#download-window', '下载窗口', () => import('./modules/downloader/DownloadWindow.vue')],
|
['#download-window', '下载窗口', () => import('./modules/downloader/DownloadWindow.vue')],
|
||||||
['#translate-popup', '翻译悬浮窗', () => import('./modules/translate/TranslatePopup.vue')],
|
['#translate-popup', '翻译悬浮窗', () => import('./modules/translate/TranslatePopup.vue')],
|
||||||
|
['#terminal-window', '终端独立窗口', () => import('./modules/terminal/TerminalWindow.vue')],
|
||||||
|
['#new-terminal-window', '新建终端窗口', () => import('./modules/terminal/NewTerminalWindow.vue')],
|
||||||
]
|
]
|
||||||
|
|
||||||
const winHash = window.location.hash
|
const winHash = window.location.hash
|
||||||
|
|
||||||
// #screenshot-overlay 带窗口号参数（多屏）、#download-window 带 ?task= 参数，按前缀匹配；其余精确匹配
|
// #screenshot-overlay 带窗口号参数（多屏）、#download-window 带 ?task= 参数，
|
||||||
|
// #terminal-window 带 /{session_id} 路径参数，均按前缀匹配；其余精确匹配
|
||||||
const matched = standaloneWindowApps.find(([hash]) => {
|
const matched = standaloneWindowApps.find(([hash]) => {
|
||||||
if (
|
if (
|
||||||
hash === '#screenshot-overlay' ||
|
hash === '#screenshot-overlay' ||
|
||||||
hash === '#screenshot-scroll' ||
|
hash === '#screenshot-scroll' ||
|
||||||
hash === '#download-window'
|
hash === '#download-window' ||
|
||||||
|
hash === '#terminal-window'
|
||||||
)
|
)
|
||||||
return winHash.startsWith(hash)
|
return winHash.startsWith(hash)
|
||||||
return winHash === hash
|
return winHash === hash
|
||||||
@@ -60,6 +64,11 @@ if (matched) {
|
|||||||
logger.info(`${label}窗口启动: ${winHash}`)
|
logger.info(`${label}窗口启动: ${winHash}`)
|
||||||
void loader().then(({ default: Comp }) => {
|
void loader().then(({ default: Comp }) => {
|
||||||
const app = createApp(Comp)
|
const app = createApp(Comp)
|
||||||
|
// 独立窗口也要装一份自己的 Pinia：Pinia 是**窗口级**的，每个 WebView 有独立
|
||||||
|
// JS 运行时，store 实例互不可见；后端状态经 IPC 共享，前端缓存分叉无碍
|
||||||
|
//（见 TerminalWindow.vue 头注释）。终端独立窗口在 setup 里调 useTerminalStore，
|
||||||
|
// 缺这一步会直接抛「getActivePinia() was called but there was no active Pinia」。
|
||||||
|
app.use(createPinia())
|
||||||
app.mount('#app')
|
app.mount('#app')
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -1,15 +1,14 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, computed, onMounted, onUnmounted, watch, nextTick } from 'vue'
|
import { ref, computed, onMounted, onUnmounted, watch, nextTick } from 'vue'
|
||||||
import {
|
import {
|
||||||
ClipboardList, Copy, Pin, PinOff, Trash2, Search, Image as ImageIcon,
|
ClipboardList, Copy, Database, Pin, PinOff, Trash2, Search, Image as ImageIcon,
|
||||||
FileText, Files, Settings as SettingsIcon, Loader2, Eraser, Keyboard,
|
FileText, Files, Settings as SettingsIcon, Loader2, Eraser, Keyboard,
|
||||||
} from '@lucide/vue'
|
} from '@lucide/vue'
|
||||||
import { toast } from 'vue-sonner'
|
import { toast } from 'vue-sonner'
|
||||||
import { useClipboardStore, type ClipboardItem, type ClipboardKind, type ClipboardItemDetail } from '@/stores/clipboardStore'
|
import { useClipboardStore, type ClipboardItem, type ClipboardKind, type ClipboardItemDetail } from '@/stores/clipboardStore'
|
||||||
import { useModuleTabs } from '@/lib/use-module-tabs'
|
import { useModuleTabs } from '@/lib/use-module-tabs'
|
||||||
import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs'
|
import { Tabs, TabsContent } from '@/components/ui/tabs'
|
||||||
import { ScrollArea } from '@/components/ui/scroll-area'
|
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
|
||||||
import { Card, CardContent } from '@/components/ui/card'
|
|
||||||
import { Button } from '@/components/ui/button'
|
import { Button } from '@/components/ui/button'
|
||||||
import { Input } from '@/components/ui/input'
|
import { Input } from '@/components/ui/input'
|
||||||
import { Switch } from '@/components/ui/switch'
|
import { Switch } from '@/components/ui/switch'
|
||||||
@@ -33,11 +32,11 @@ import {
|
|||||||
const store = useClipboardStore()
|
const store = useClipboardStore()
|
||||||
|
|
||||||
const activeTab = ref('history')
|
const activeTab = ref('history')
|
||||||
const tabsListRef = useModuleTabs('clipboard', activeTab, [
|
useModuleTabs('clipboard', activeTab, [
|
||||||
{ value: 'history', label: '历史' },
|
{ value: 'history', label: '历史' },
|
||||||
{ value: 'pinned', label: '固定' },
|
{ value: 'pinned', label: '固定' },
|
||||||
{ value: 'settings', label: '设置' },
|
{ value: 'settings', label: '设置' },
|
||||||
])
|
], { alwaysVisible: true })
|
||||||
|
|
||||||
// 历史搜索/过滤
|
// 历史搜索/过滤
|
||||||
const searchQuery = ref('')
|
const searchQuery = ref('')
|
||||||
@@ -276,10 +275,10 @@ const kindIcon = (k: string) => {
|
|||||||
const kindLabel = (k: string) => (k === 'text' ? '文本' : k === 'image' ? '图片' : '文件')
|
const kindLabel = (k: string) => (k === 'text' ? '文本' : k === 'image' ? '图片' : '文件')
|
||||||
const kindBadgeClass = (k: string) =>
|
const kindBadgeClass = (k: string) =>
|
||||||
k === 'text'
|
k === 'text'
|
||||||
? 'border-blue-500/40 bg-blue-500/10 text-blue-600 dark:text-blue-400'
|
? 'border-info/40 bg-info-soft text-info-text'
|
||||||
: k === 'image'
|
: k === 'image'
|
||||||
? 'border-emerald-500/40 bg-emerald-500/10 text-emerald-600 dark:text-emerald-400'
|
? 'border-success/40 bg-success-soft text-success-text'
|
||||||
: 'border-amber-500/40 bg-amber-500/10 text-amber-600 dark:text-amber-400'
|
: 'border-warning/40 bg-warning-soft text-warning-text'
|
||||||
const formatSize = (bytes: number) => {
|
const formatSize = (bytes: number) => {
|
||||||
if (!bytes) return ''
|
if (!bytes) return ''
|
||||||
if (bytes < 1024) return `${bytes} B`
|
if (bytes < 1024) return `${bytes} B`
|
||||||
@@ -320,18 +319,10 @@ onUnmounted(() => {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="h-full p-6 overflow-hidden flex flex-col">
|
<div class="min-h-full p-5 flex flex-col">
|
||||||
<Tabs v-model="activeTab" class="flex-1 min-h-0 flex flex-col">
|
<Tabs v-model="activeTab" class="flex-1 min-h-0 flex flex-col">
|
||||||
<div ref="tabsListRef" class="shrink-0">
|
|
||||||
<TabsList class="grid w-full max-w-md grid-cols-3 !bg-transparent !p-0 !shadow-none">
|
|
||||||
<TabsTrigger value="history" class="gap-1.5"><ClipboardList class="size-3.5" />历史</TabsTrigger>
|
|
||||||
<TabsTrigger value="pinned" class="gap-1.5"><Pin class="size-3.5" />固定</TabsTrigger>
|
|
||||||
<TabsTrigger value="settings" class="gap-1.5"><SettingsIcon class="size-3.5" />设置</TabsTrigger>
|
|
||||||
</TabsList>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 历史 -->
|
<!-- 历史 -->
|
||||||
<TabsContent value="history" class="flex-1 min-h-0 flex flex-col mt-4 tab-animate">
|
<TabsContent value="history" class="flex-1 min-h-0 flex flex-col tab-animate">
|
||||||
<div class="flex items-center gap-2 mb-3 shrink-0">
|
<div class="flex items-center gap-2 mb-3 shrink-0">
|
||||||
<div class="relative flex-1 max-w-sm">
|
<div class="relative flex-1 max-w-sm">
|
||||||
<Search class="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-muted-foreground" />
|
<Search class="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-muted-foreground" />
|
||||||
@@ -392,7 +383,7 @@ onUnmounted(() => {
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ScrollArea class="flex-1 min-h-0">
|
<div class="flex-1 min-h-0">
|
||||||
<div class="space-y-1.5 pr-2">
|
<div class="space-y-1.5 pr-2">
|
||||||
<!-- 加载骨架：数据异步返回前撑起画面，避免误显示"暂无历史" -->
|
<!-- 加载骨架：数据异步返回前撑起画面，避免误显示"暂无历史" -->
|
||||||
<div v-if="store.loading" class="space-y-1.5">
|
<div v-if="store.loading" class="space-y-1.5">
|
||||||
@@ -450,12 +441,17 @@ onUnmounted(() => {
|
|||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</ScrollArea>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
<!-- 固定 -->
|
<!-- 固定 -->
|
||||||
<TabsContent value="pinned" class="flex-1 min-h-0 flex flex-col mt-4 tab-animate">
|
<TabsContent value="pinned" class="flex-1 min-h-0 flex flex-col tab-animate">
|
||||||
<div class="flex-1 min-h-0 overflow-y-auto space-y-1.5 pr-1">
|
<!--
|
||||||
|
这份列表是模块内的独立滚动区：视口会裁掉超出自身的阴影，而这里的卡片
|
||||||
|
悬停时是 shadow-md（比 shadow-sm 更大）。`-mx-3` + 内层 `px-3 pb-2`
|
||||||
|
让视口两侧各多出 12px、底部多出 8px 的余量，卡片位置与宽度不变。
|
||||||
|
-->
|
||||||
|
<div class="flex-1 min-h-0 overflow-y-auto -mx-3">
|
||||||
<Empty v-if="!pinnedList.length" class="h-full py-8">
|
<Empty v-if="!pinnedList.length" class="h-full py-8">
|
||||||
<EmptyHeader>
|
<EmptyHeader>
|
||||||
<EmptyMedia variant="icon">
|
<EmptyMedia variant="icon">
|
||||||
@@ -467,6 +463,8 @@ onUnmounted(() => {
|
|||||||
<EmptyDescription>鼠标悬停历史条目，点击图钉按钮即可固定</EmptyDescription>
|
<EmptyDescription>鼠标悬停历史条目，点击图钉按钮即可固定</EmptyDescription>
|
||||||
</EmptyContent>
|
</EmptyContent>
|
||||||
</Empty>
|
</Empty>
|
||||||
|
|
||||||
|
<div v-else class="space-y-1.5 px-3 pb-2">
|
||||||
<Card v-for="item in pinnedList" :key="item.id" class="group hover:shadow-md transition-shadow py-0">
|
<Card v-for="item in pinnedList" :key="item.id" class="group hover:shadow-md transition-shadow py-0">
|
||||||
<CardContent class="flex items-center gap-3 px-3 py-2">
|
<CardContent class="flex items-center gap-3 px-3 py-2">
|
||||||
<component :is="kindIcon(item.kind)" class="size-4 text-primary shrink-0" />
|
<component :is="kindIcon(item.kind)" class="size-4 text-primary shrink-0" />
|
||||||
@@ -491,20 +489,29 @@ onUnmounted(() => {
|
|||||||
</div>
|
</div>
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
<!-- 设置 -->
|
<!--
|
||||||
<TabsContent value="settings" class="flex-1 min-h-0 overflow-y-auto mt-4 tab-animate">
|
设置页同样自带滚动（只有内容区滚，Tab 行固定）。内层 `px-3 pb-3` 是
|
||||||
<div class="max-w-xl space-y-4">
|
必须的：卡片阴影贴着这个视口的边缘会被裁，而根元素上的内边距不属于
|
||||||
<div class="flex items-center">
|
滚动内容（滚到底时最后一张卡片的底部阴影照样没了）。
|
||||||
<h3 class="text-base font-medium flex items-center gap-2">
|
|
||||||
<SettingsIcon class="size-4" />基本设置
|
|
||||||
</h3>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
卡片形态对齐下载器/监控等模块的设置页：标题进卡片（CardHeader +
|
||||||
|
CardTitle，图标用主题色），卡片铺满内容宽度（此前是 max-w-xl 的窄栏 +
|
||||||
|
一个页级 h3，读起来像「页面上浮着一个标题 + 三张无标题的卡片」）。
|
||||||
|
-->
|
||||||
|
<TabsContent value="settings" class="flex-1 min-h-0 overflow-y-auto tab-animate -mx-3">
|
||||||
|
<div class="space-y-4 px-3 pb-3">
|
||||||
|
<!-- 基本设置 -->
|
||||||
<Card>
|
<Card>
|
||||||
<CardContent class="space-y-4 p-4">
|
<CardHeader>
|
||||||
|
<CardTitle class="flex items-center gap-2 text-base">
|
||||||
|
<SettingsIcon class="size-4 text-primary" />基本设置
|
||||||
|
</CardTitle>
|
||||||
|
</CardHeader>
|
||||||
|
<CardContent class="space-y-4">
|
||||||
<div class="flex items-center justify-between">
|
<div class="flex items-center justify-between">
|
||||||
<div>
|
<div>
|
||||||
<Label>启用剪贴板监听</Label>
|
<Label>启用剪贴板监听</Label>
|
||||||
@@ -546,9 +553,16 @@ onUnmounted(() => {
|
|||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
|
<!-- 容量与上限 -->
|
||||||
<Card>
|
<Card>
|
||||||
<CardContent class="space-y-4 p-4">
|
<CardHeader>
|
||||||
<div class="grid grid-cols-2 gap-4">
|
<CardTitle class="flex items-center gap-2 text-base">
|
||||||
|
<Database class="size-4 text-primary" />容量与上限
|
||||||
|
</CardTitle>
|
||||||
|
</CardHeader>
|
||||||
|
<CardContent>
|
||||||
|
<!-- 数值输入限宽：卡片铺满后让输入框跟着拉到六百多像素只是难读 -->
|
||||||
|
<div class="grid grid-cols-2 gap-4 max-w-xl">
|
||||||
<div class="space-y-2">
|
<div class="space-y-2">
|
||||||
<Label>最大历史条数</Label>
|
<Label>最大历史条数</Label>
|
||||||
<Input v-model.number="form.maxItems" type="number" min="50" max="10000" />
|
<Input v-model.number="form.maxItems" type="number" min="50" max="10000" />
|
||||||
@@ -563,13 +577,17 @@ onUnmounted(() => {
|
|||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
|
<!-- 快捷弹窗 -->
|
||||||
<Card>
|
<Card>
|
||||||
<CardContent class="space-y-4 p-4">
|
<CardHeader>
|
||||||
|
<CardTitle class="flex items-center gap-2 text-base">
|
||||||
|
<Keyboard class="size-4 text-primary" />快捷弹窗
|
||||||
|
</CardTitle>
|
||||||
|
</CardHeader>
|
||||||
|
<CardContent class="space-y-4">
|
||||||
<div class="flex items-center justify-between">
|
<div class="flex items-center justify-between">
|
||||||
<div>
|
<div>
|
||||||
<Label class="flex items-center gap-2">
|
<Label>快捷弹窗快捷键</Label>
|
||||||
<Keyboard class="size-4" />快捷弹窗快捷键
|
|
||||||
</Label>
|
|
||||||
<p class="text-xs text-muted-foreground mt-1">全局快捷键触发鼠标位置历史弹窗，留空禁用</p>
|
<p class="text-xs text-muted-foreground mt-1">全局快捷键触发鼠标位置历史弹窗，留空禁用</p>
|
||||||
</div>
|
</div>
|
||||||
<Button variant="outline" size="sm" @click="handleTestPopup">测试弹窗</Button>
|
<Button variant="outline" size="sm" @click="handleTestPopup">测试弹窗</Button>
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { ref, computed, onMounted, onUnmounted, nextTick, watch } from 'vue'
|
|||||||
import { listen, type UnlistenFn } from '@tauri-apps/api/event'
|
import { listen, type UnlistenFn } from '@tauri-apps/api/event'
|
||||||
import { getCurrentWindow } from '@tauri-apps/api/window'
|
import { getCurrentWindow } from '@tauri-apps/api/window'
|
||||||
import { EVENTS, STORAGE_KEYS } from '@/lib/constants'
|
import { EVENTS, STORAGE_KEYS } from '@/lib/constants'
|
||||||
|
import { applyStoredAccent } from '@/lib/theme'
|
||||||
import { Effect, EffectState } from '@tauri-apps/api/window'
|
import { Effect, EffectState } from '@tauri-apps/api/window'
|
||||||
// Rust 端通过 tauri-specta 生成的命令绑定（bindings.ts）
|
// Rust 端通过 tauri-specta 生成的命令绑定（bindings.ts）
|
||||||
import { commands } from '@/lib/bindings'
|
import { commands } from '@/lib/bindings'
|
||||||
@@ -36,7 +37,7 @@ const kindFilter = ref<'all' | 'text' | 'image' | 'files'>('all')
|
|||||||
const selectedIndex = ref(0)
|
const selectedIndex = ref(0)
|
||||||
const loading = ref(false)
|
const loading = ref(false)
|
||||||
const searchInputRef = ref<HTMLInputElement | null>(null)
|
const searchInputRef = ref<HTMLInputElement | null>(null)
|
||||||
let unlistenFns: UnlistenFn[] = []
|
const unlistenFns: UnlistenFn[] = []
|
||||||
let searchTimer: ReturnType<typeof setTimeout> | null = null
|
let searchTimer: ReturnType<typeof setTimeout> | null = null
|
||||||
|
|
||||||
const totalPages = computed(() => Math.max(1, Math.ceil(total.value / PAGE_SIZE)))
|
const totalPages = computed(() => Math.max(1, Math.ceil(total.value / PAGE_SIZE)))
|
||||||
@@ -356,6 +357,8 @@ async function applyTheme() {
|
|||||||
root.classList.remove('dark', 'effect-mica', 'effect-acrylic', 'effect-normal')
|
root.classList.remove('dark', 'effect-mica', 'effect-acrylic', 'effect-normal')
|
||||||
root.classList.add(`effect-${effect}`)
|
root.classList.add(`effect-${effect}`)
|
||||||
if (isDark) root.classList.add('dark')
|
if (isDark) root.classList.add('dark')
|
||||||
|
// 主题色：与主窗口共用同一份设置
|
||||||
|
applyStoredAccent(root, isDark ? 'dark' : 'light', STORAGE_KEYS.appSettings)
|
||||||
|
|
||||||
// 4. 设置窗口效果与背景色
|
// 4. 设置窗口效果与背景色
|
||||||
// 弹窗窗口创建时 transparent=true，透明窗口下原生背景色不显示，
|
// 弹窗窗口创建时 transparent=true，透明窗口下原生背景色不显示，
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { ref, onMounted, onUnmounted } from 'vue'
|
|||||||
import { listen, emit, type UnlistenFn } from '@tauri-apps/api/event'
|
import { listen, emit, type UnlistenFn } from '@tauri-apps/api/event'
|
||||||
import { getCurrentWindow, Effect, EffectState } from '@tauri-apps/api/window'
|
import { getCurrentWindow, Effect, EffectState } from '@tauri-apps/api/window'
|
||||||
import { EVENTS, STORAGE_KEYS } from '@/lib/constants'
|
import { EVENTS, STORAGE_KEYS } from '@/lib/constants'
|
||||||
|
import { applyStoredAccent } from '@/lib/theme'
|
||||||
import { commands } from '@/lib/bindings'
|
import { commands } from '@/lib/bindings'
|
||||||
import { ZoomIn, ZoomOut, FileText, Image as ImageIcon } from '@lucide/vue'
|
import { ZoomIn, ZoomOut, FileText, Image as ImageIcon } from '@lucide/vue'
|
||||||
import { ScrollArea } from '@/components/ui/scroll-area'
|
import { ScrollArea } from '@/components/ui/scroll-area'
|
||||||
@@ -14,7 +15,7 @@ const thumbSrc = ref('')
|
|||||||
const fullSrc = ref('')
|
const fullSrc = ref('')
|
||||||
const enlarged = ref(false)
|
const enlarged = ref(false)
|
||||||
const loading = ref(false)
|
const loading = ref(false)
|
||||||
let unlistenFns: UnlistenFn[] = []
|
const unlistenFns: UnlistenFn[] = []
|
||||||
// 加载序号：连续悬停快速切换时丢弃过期请求结果
|
// 加载序号：连续悬停快速切换时丢弃过期请求结果
|
||||||
let loadSeq = 0
|
let loadSeq = 0
|
||||||
|
|
||||||
@@ -208,6 +209,8 @@ async function applyTheme() {
|
|||||||
root.classList.remove('dark', 'effect-mica', 'effect-acrylic', 'effect-normal')
|
root.classList.remove('dark', 'effect-mica', 'effect-acrylic', 'effect-normal')
|
||||||
root.classList.add(`effect-${effect}`)
|
root.classList.add(`effect-${effect}`)
|
||||||
if (isDark) root.classList.add('dark')
|
if (isDark) root.classList.add('dark')
|
||||||
|
// 主题色：与主窗口共用同一份设置
|
||||||
|
applyStoredAccent(root, isDark ? 'dark' : 'light', STORAGE_KEYS.appSettings)
|
||||||
try {
|
try {
|
||||||
const tauriWin = getCurrentWindow()
|
const tauriWin = getCurrentWindow()
|
||||||
await tauriWin.clearEffects()
|
await tauriWin.clearEffects()
|
||||||
|
|||||||
@@ -55,5 +55,5 @@ export const moduleConfig: ModuleConfig = {
|
|||||||
defaultEnabled: true,
|
defaultEnabled: true,
|
||||||
loader: () => import('./ClipboardModule.vue'),
|
loader: () => import('./ClipboardModule.vue'),
|
||||||
searchItems,
|
searchItems,
|
||||||
order: 20
|
order: 80
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import { ArrowLeft, Search } from '@lucide/vue'
|
|||||||
import { Input } from '@/components/ui/input'
|
import { Input } from '@/components/ui/input'
|
||||||
import { Button } from '@/components/ui/button'
|
import { Button } from '@/components/ui/button'
|
||||||
import { Card, CardContent } from '@/components/ui/card'
|
import { Card, CardContent } from '@/components/ui/card'
|
||||||
import { ScrollArea } from '@/components/ui/scroll-area'
|
|
||||||
import { Separator } from '@/components/ui/separator'
|
import { Separator } from '@/components/ui/separator'
|
||||||
import { useSearchStore } from '@/stores/searchStore'
|
import { useSearchStore } from '@/stores/searchStore'
|
||||||
import { registerAllTools, TOOLS_META } from './tools'
|
import { registerAllTools, TOOLS_META } from './tools'
|
||||||
@@ -77,21 +76,46 @@ watch(selectedId, () => {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="h-full p-6 overflow-hidden flex flex-col">
|
<!--
|
||||||
|
# 滚动归属：只有主滚动区滚（2026-09-22 由内滚动改为外滚动）
|
||||||
|
|
||||||
|
此前本模块的列表页与详情页各自套一层 `ScrollArea`（`h-full overflow-hidden`
|
||||||
|
的模块根 + 内部滚动），与 monitor / music / clipboard / 设置页的形态不一致 ——
|
||||||
|
那些模块的模块根是 `min-h-full p-*`，整页在 ModuleContainer 的主滚动区里滚。
|
||||||
|
两套滚动归属混用会带来一串副作用：Tab 行/工具条要不要固定、内边距该加在
|
||||||
|
滚动容器根还是内层、卡片阴影被视口裁（`-mx-3 px-3` 就是在补这个）。
|
||||||
|
|
||||||
|
现在统一到外滚动：模块根 `min-h-full p-5`，内容自然增高，滚动交给主滚动区。
|
||||||
|
p-5 属于**滚动内容**（模块根在主滚动区内部），因此卡片阴影四周都有余量，
|
||||||
|
不再需要任何负外边距补偿。
|
||||||
|
|
||||||
|
工具自身需要限高的地方（正则结果、diff 输出等）仍保留各自的 `max-h-*` 内滚动
|
||||||
|
盒子 —— 那是「一块有边界的输出区」，与页面级滚动不是一回事。
|
||||||
|
-->
|
||||||
|
<div class="min-h-full p-5 flex flex-col">
|
||||||
<!-- 列表视图 -->
|
<!-- 列表视图 -->
|
||||||
<template v-if="!selectedTool">
|
<template v-if="!selectedTool">
|
||||||
<div class="flex items-center gap-3 mb-4 shrink-0 flex-wrap">
|
<div class="flex items-center gap-3 mb-4 flex-wrap">
|
||||||
<div class="relative flex-1 min-w-[180px] max-w-xs">
|
<div class="relative flex-1 min-w-[180px] max-w-xs">
|
||||||
<Search class="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-muted-foreground" />
|
<Search class="absolute left-2.5 top-1/2 -translate-y-1/2 size-4 text-muted-foreground" />
|
||||||
<Input v-model="query" placeholder="搜索工具..." class="h-8 pl-8 text-sm" />
|
<Input v-model="query" placeholder="搜索工具..." class="h-8 pl-8 text-sm" />
|
||||||
</div>
|
</div>
|
||||||
|
<!--
|
||||||
|
分类筛选：选中态用主题色软底（与 SegmentedNav 及其余模块的筛选 chip 同一
|
||||||
|
口径）。此前写的是 `bg-secondary text-foreground` —— 灰底黑字读起来像
|
||||||
|
「禁用」，也是全项目唯一用实心灰表达选中的地方。
|
||||||
|
-->
|
||||||
<Button
|
<Button
|
||||||
v-for="cat in (['all', ...CATEGORY_ORDER] as const)"
|
v-for="cat in (['all', ...CATEGORY_ORDER] as const)"
|
||||||
:key="cat"
|
:key="cat"
|
||||||
size="sm"
|
size="sm"
|
||||||
variant="ghost"
|
variant="ghost"
|
||||||
class="h-7 px-2.5 text-xs"
|
class="h-7 px-2.5 text-xs"
|
||||||
:class="category === cat ? 'bg-secondary text-foreground' : 'text-muted-foreground'"
|
:class="
|
||||||
|
category === cat
|
||||||
|
? 'bg-primary-soft font-medium text-primary-soft-text'
|
||||||
|
: 'text-fg-secondary hover:text-foreground'
|
||||||
|
"
|
||||||
@click="category = cat as typeof category"
|
@click="category = cat as typeof category"
|
||||||
>
|
>
|
||||||
{{ cat === 'all' ? '全部' : CATEGORY_LABEL[cat as DevTool['category']] }}
|
{{ cat === 'all' ? '全部' : CATEGORY_LABEL[cat as DevTool['category']] }}
|
||||||
@@ -99,12 +123,16 @@ watch(selectedId, () => {
|
|||||||
<span class="text-xs text-muted-foreground ml-auto">{{ (category === 'all' ? allTools : filteredTools).length }} 个工具</span>
|
<span class="text-xs text-muted-foreground ml-auto">{{ (category === 'all' ? allTools : filteredTools).length }} 个工具</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ScrollArea class="flex-1 min-h-0 -mr-3 pr-3">
|
<!-- 空态：flex-1 撑住剩余高度，短页面时也能垂直居中 -->
|
||||||
<div v-if="filteredTools.length === 0" class="h-full flex items-center justify-center text-muted-foreground text-sm">
|
<div
|
||||||
没有找到匹配的工具
|
v-if="filteredTools.length === 0"
|
||||||
</div>
|
class="flex-1 flex items-center justify-center text-muted-foreground text-sm"
|
||||||
|
>
|
||||||
|
没有找到匹配的工具
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- 按分类分组 -->
|
<!-- 按分类分组 -->
|
||||||
|
<div v-else>
|
||||||
<div v-for="group in groupedTools" :key="group.category" class="mb-5">
|
<div v-for="group in groupedTools" :key="group.category" class="mb-5">
|
||||||
<div class="flex items-center gap-2 mb-2">
|
<div class="flex items-center gap-2 mb-2">
|
||||||
<span class="text-xs font-medium text-muted-foreground">{{ group.label }}</span>
|
<span class="text-xs font-medium text-muted-foreground">{{ group.label }}</span>
|
||||||
@@ -129,12 +157,12 @@ watch(selectedId, () => {
|
|||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ScrollArea>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<!-- 工具详情视图 -->
|
<!-- 工具详情视图 -->
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<div class="flex items-center gap-3 mb-4 shrink-0">
|
<div class="flex items-center gap-3 mb-4">
|
||||||
<Button size="sm" variant="ghost" class="gap-1 h-8" @click="selectedId = null">
|
<Button size="sm" variant="ghost" class="gap-1 h-8" @click="selectedId = null">
|
||||||
<ArrowLeft class="size-4" />
|
<ArrowLeft class="size-4" />
|
||||||
返回
|
返回
|
||||||
@@ -147,11 +175,7 @@ watch(selectedId, () => {
|
|||||||
<span class="text-xs text-muted-foreground leading-snug">{{ selectedTool.description }}</span>
|
<span class="text-xs text-muted-foreground leading-snug">{{ selectedTool.description }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<ScrollArea class="flex-1 min-h-0 -mr-3 pr-3">
|
<component :is="selectedTool.component" />
|
||||||
<div class="max-w-3xl px-1 pb-6">
|
|
||||||
<component :is="selectedTool.component" />
|
|
||||||
</div>
|
|
||||||
</ScrollArea>
|
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -58,7 +58,7 @@ const onInput = (v: string | number) => {
|
|||||||
:title="copied ? '已复制' : '复制'"
|
:title="copied ? '已复制' : '复制'"
|
||||||
@click="copy"
|
@click="copy"
|
||||||
>
|
>
|
||||||
<Check v-if="copied" class="size-3.5 text-green-500" />
|
<Check v-if="copied" class="size-3.5 text-success" />
|
||||||
<Copy v-else class="size-3.5" />
|
<Copy v-else class="size-3.5" />
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -23,5 +23,5 @@ export const moduleConfig: ModuleConfig = {
|
|||||||
onEnable: async () => {},
|
onEnable: async () => {},
|
||||||
onDisable: async () => {}
|
onDisable: async () => {}
|
||||||
},
|
},
|
||||||
order: 60
|
order: 100
|
||||||
}
|
}
|
||||||
@@ -12,7 +12,6 @@ type Tab = 'convert' | 'file'
|
|||||||
const tab = ref<Tab>('convert')
|
const tab = ref<Tab>('convert')
|
||||||
const mode = ref<'encode' | 'decode'>('encode')
|
const mode = ref<'encode' | 'decode'>('encode')
|
||||||
const input = ref('')
|
const input = ref('')
|
||||||
const error = ref('')
|
|
||||||
|
|
||||||
function encode(s: string): string {
|
function encode(s: string): string {
|
||||||
const bytes = new TextEncoder().encode(s)
|
const bytes = new TextEncoder().encode(s)
|
||||||
@@ -28,17 +27,18 @@ function decode(s: string): string {
|
|||||||
return new TextDecoder().decode(bytes)
|
return new TextDecoder().decode(bytes)
|
||||||
}
|
}
|
||||||
|
|
||||||
const output = computed(() => {
|
// 一次试算同时产出结果与错误，computed 内保持无副作用
|
||||||
error.value = ''
|
const result = computed(() => {
|
||||||
const v = input.value
|
const v = input.value
|
||||||
if (!v) return ''
|
if (!v) return { out: '', err: '' }
|
||||||
try {
|
try {
|
||||||
return mode.value === 'encode' ? encode(v) : decode(v)
|
return { out: mode.value === 'encode' ? encode(v) : decode(v), err: '' }
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
error.value = '解码失败：' + String(e)
|
return { out: '', err: '解码失败：' + String(e) }
|
||||||
return ''
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
const output = computed(() => result.value.out)
|
||||||
|
const error = computed(() => result.value.err)
|
||||||
|
|
||||||
const swap = () => {
|
const swap = () => {
|
||||||
if (output.value) {
|
if (output.value) {
|
||||||
|
|||||||
@@ -111,11 +111,11 @@ const unifiedText = computed(() => {
|
|||||||
<div class="flex flex-col gap-4">
|
<div class="flex flex-col gap-4">
|
||||||
<div class="grid grid-cols-2 gap-3">
|
<div class="grid grid-cols-2 gap-3">
|
||||||
<div class="flex flex-col gap-1.5">
|
<div class="flex flex-col gap-1.5">
|
||||||
<Label class="text-xs text-red-500">旧文本（删除 {{ stats.dels }} 行）</Label>
|
<Label class="text-xs text-danger">旧文本（删除 {{ stats.dels }} 行）</Label>
|
||||||
<Textarea v-model="oldText" placeholder="旧文本..." class="min-h-[140px] font-mono text-xs resize-y" />
|
<Textarea v-model="oldText" placeholder="旧文本..." class="min-h-[140px] font-mono text-xs resize-y" />
|
||||||
</div>
|
</div>
|
||||||
<div class="flex flex-col gap-1.5">
|
<div class="flex flex-col gap-1.5">
|
||||||
<Label class="text-xs text-green-500">新文本（新增 {{ stats.adds }} 行）</Label>
|
<Label class="text-xs text-success">新文本（新增 {{ stats.adds }} 行）</Label>
|
||||||
<Textarea v-model="newText" placeholder="新文本..." class="min-h-[140px] font-mono text-xs resize-y" />
|
<Textarea v-model="newText" placeholder="新文本..." class="min-h-[140px] font-mono text-xs resize-y" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -130,8 +130,8 @@ const unifiedText = computed(() => {
|
|||||||
:key="i"
|
:key="i"
|
||||||
class="flex whitespace-pre px-2 py-0.5"
|
class="flex whitespace-pre px-2 py-0.5"
|
||||||
:class="{
|
:class="{
|
||||||
'bg-red-500/10 text-red-600 dark:text-red-400': l.op === 'del',
|
'bg-danger-soft text-danger-text': l.op === 'del',
|
||||||
'bg-green-500/10 text-green-600 dark:text-green-400': l.op === 'add',
|
'bg-success-soft text-success-text': l.op === 'add',
|
||||||
'text-muted-foreground': l.op === 'equal'
|
'text-muted-foreground': l.op === 'equal'
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
|
|||||||
@@ -118,11 +118,11 @@ const MIMES: MimeDef[] = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
const STATUS_CLASS: Record<string, string> = {
|
const STATUS_CLASS: Record<string, string> = {
|
||||||
'1xx': 'bg-sky-500/10 text-sky-600 dark:text-sky-400 border-sky-500/30',
|
'1xx': 'bg-info-soft text-info-text border-info/30',
|
||||||
'2xx': 'bg-green-500/10 text-green-600 dark:text-green-400 border-green-500/30',
|
'2xx': 'bg-success-soft text-success-text border-success/30',
|
||||||
'3xx': 'bg-blue-500/10 text-blue-600 dark:text-blue-400 border-blue-500/30',
|
'3xx': 'bg-info-soft text-info-text border-info/30',
|
||||||
'4xx': 'bg-amber-500/10 text-amber-600 dark:text-amber-400 border-amber-500/30',
|
'4xx': 'bg-warning-soft text-warning-text border-warning/30',
|
||||||
'5xx': 'bg-red-500/10 text-red-600 dark:text-red-400 border-red-500/30'
|
'5xx': 'bg-danger-soft text-danger-text border-danger/30'
|
||||||
}
|
}
|
||||||
|
|
||||||
const statusGroups = computed(() => {
|
const statusGroups = computed(() => {
|
||||||
|
|||||||
@@ -128,7 +128,7 @@ const converted = computed(() => {
|
|||||||
<template v-if="cidr">
|
<template v-if="cidr">
|
||||||
<p v-if="cidr.error" class="text-xs text-destructive">{{ cidr.error }}</p>
|
<p v-if="cidr.error" class="text-xs text-destructive">{{ cidr.error }}</p>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<p v-if="!cidr.ipIsNetwork" class="text-xs text-amber-600 dark:text-amber-400">
|
<p v-if="!cidr.ipIsNetwork" class="text-xs text-warning-text">
|
||||||
注意：输入地址不是该子网的网络地址，已按网络 {{ cidr.network }}/{{ cidr.prefix }} 计算。
|
注意：输入地址不是该子网的网络地址，已按网络 {{ cidr.network }}/{{ cidr.prefix }} 计算。
|
||||||
</p>
|
</p>
|
||||||
<div class="rounded-md border border-border divide-y divide-border text-xs">
|
<div class="rounded-md border border-border divide-y divide-border text-xs">
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ function normalizeReplacer(sort: boolean): (this: unknown, key: string, value: u
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="isValid !== false" class="flex items-center gap-2 text-xs">
|
<div v-if="isValid !== false" class="flex items-center gap-2 text-xs">
|
||||||
<span v-if="isValid === true" class="text-green-600 dark:text-green-400">✓ 合法 JSON</span>
|
<span v-if="isValid === true" class="text-success-text">✓ 合法 JSON</span>
|
||||||
</div>
|
</div>
|
||||||
<ResultArea :text="output" placeholder="结果" />
|
<ResultArea :text="output" placeholder="结果" />
|
||||||
<p v-if="error" class="text-xs text-destructive break-all">{{ error }}</p>
|
<p v-if="error" class="text-xs text-destructive break-all">{{ error }}</p>
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import { Badge } from '@/components/ui/badge'
|
|||||||
import ResultArea from '../components/ResultArea.vue'
|
import ResultArea from '../components/ResultArea.vue'
|
||||||
|
|
||||||
const token = ref('')
|
const token = ref('')
|
||||||
const error = ref('')
|
|
||||||
|
|
||||||
function base64UrlDecode(s: string): string {
|
function base64UrlDecode(s: string): string {
|
||||||
const cleaned = s.replace(/-/g, '+').replace(/_/g, '/')
|
const cleaned = s.replace(/-/g, '+').replace(/_/g, '/')
|
||||||
@@ -24,30 +23,33 @@ interface TimeClaim {
|
|||||||
status: 'ok' | 'expired' | 'not-yet' | 'unknown'
|
status: 'ok' | 'expired' | 'not-yet' | 'unknown'
|
||||||
}
|
}
|
||||||
|
|
||||||
const parsed = computed<{
|
// 一次解析同时产出数据与错误，computed 内保持无副作用
|
||||||
|
const parsedResult = computed<{ data: {
|
||||||
header: string
|
header: string
|
||||||
payload: string
|
payload: string
|
||||||
signature: string
|
signature: string
|
||||||
timeClaims: TimeClaim[]
|
timeClaims: TimeClaim[]
|
||||||
} | null>(() => {
|
} | null; err: string }>(() => {
|
||||||
error.value = ''
|
|
||||||
const t = token.value.trim()
|
const t = token.value.trim()
|
||||||
if (!t) return null
|
if (!t) return { data: null, err: '' }
|
||||||
const parts = t.split('.')
|
const parts = t.split('.')
|
||||||
if (parts.length < 2) {
|
if (parts.length < 2) {
|
||||||
error.value = 'JWT 格式不正确（应为 header.payload.signature）'
|
return { data: null, err: 'JWT 格式不正确（应为 header.payload.signature）' }
|
||||||
return null
|
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
const header = formatJson(base64UrlDecode(parts[0]))
|
const header = formatJson(base64UrlDecode(parts[0]))
|
||||||
const payload = formatJson(base64UrlDecode(parts[1]))
|
const payload = formatJson(base64UrlDecode(parts[1]))
|
||||||
const signature = parts[2] ?? ''
|
const signature = parts[2] ?? ''
|
||||||
return { header, payload, signature, timeClaims: parseTimeClaims(payload) }
|
return {
|
||||||
|
data: { header, payload, signature, timeClaims: parseTimeClaims(payload) },
|
||||||
|
err: ''
|
||||||
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
error.value = '解码失败：' + String(e)
|
return { data: null, err: '解码失败：' + String(e) }
|
||||||
return null
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
const parsed = computed(() => parsedResult.value.data)
|
||||||
|
const error = computed(() => parsedResult.value.err)
|
||||||
|
|
||||||
function formatJson(s: string): string {
|
function formatJson(s: string): string {
|
||||||
let pretty = s
|
let pretty = s
|
||||||
@@ -90,9 +92,9 @@ function parseTimeClaims(payload: string): TimeClaim[] {
|
|||||||
|
|
||||||
const STATUS_BADGE: Record<TimeClaim['status'], { label: string; class: string } | null> = {
|
const STATUS_BADGE: Record<TimeClaim['status'], { label: string; class: string } | null> = {
|
||||||
ok: null,
|
ok: null,
|
||||||
expired: { label: '已过期', class: 'bg-red-500/10 text-red-600 dark:text-red-400 border-red-500/30' },
|
expired: { label: '已过期', class: 'bg-danger-soft text-danger-text border-danger/30' },
|
||||||
'not-yet': { label: '尚未生效', class: 'bg-amber-500/10 text-amber-600 dark:text-amber-400 border-amber-500/30' },
|
'not-yet': { label: '尚未生效', class: 'bg-warning-soft text-warning-text border-warning/30' },
|
||||||
unknown: { label: '签发时间在未来（时钟偏差？）', class: 'bg-amber-500/10 text-amber-600 dark:text-amber-400 border-amber-500/30' }
|
unknown: { label: '签发时间在未来（时钟偏差？）', class: 'bg-warning-soft text-warning-text border-warning/30' }
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -73,10 +73,10 @@ const entropy = computed(() => {
|
|||||||
|
|
||||||
const strength = computed(() => {
|
const strength = computed(() => {
|
||||||
const e = entropy.value
|
const e = entropy.value
|
||||||
if (e >= 128) return { label: '极强（128+ bit）', class: 'text-green-600 dark:text-green-400' }
|
if (e >= 128) return { label: '极强（128+ bit）', class: 'text-success-text' }
|
||||||
if (e >= 80) return { label: '强（80-127 bit）', class: 'text-green-600 dark:text-green-400' }
|
if (e >= 80) return { label: '强（80-127 bit）', class: 'text-success-text' }
|
||||||
if (e >= 60) return { label: '中等（60-79 bit）', class: 'text-amber-600 dark:text-amber-400' }
|
if (e >= 60) return { label: '中等（60-79 bit）', class: 'text-warning-text' }
|
||||||
return { label: '弱（<60 bit）', class: 'text-red-600 dark:text-red-400' }
|
return { label: '弱（<60 bit）', class: 'text-danger-text' }
|
||||||
})
|
})
|
||||||
|
|
||||||
function generate() {
|
function generate() {
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ const bases: { value: Radix; label: string }[] = [
|
|||||||
const from = ref<Radix>('10')
|
const from = ref<Radix>('10')
|
||||||
const to = ref<Radix>('16')
|
const to = ref<Radix>('16')
|
||||||
const input = ref('')
|
const input = ref('')
|
||||||
const error = ref('')
|
|
||||||
|
|
||||||
const RADIX_MAP: Record<Radix, number> = { '2': 2, '8': 8, '10': 10, '16': 16 }
|
const RADIX_MAP: Record<Radix, number> = { '2': 2, '8': 8, '10': 10, '16': 16 }
|
||||||
|
|
||||||
@@ -37,23 +36,29 @@ function parseBigInt(s: string, radix: number): bigint {
|
|||||||
return negative ? -n : n
|
return negative ? -n : n
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 一次试算同时产出结果与错误，computed 内保持无副作用
|
||||||
const result = computed(() => {
|
const result = computed(() => {
|
||||||
error.value = ''
|
|
||||||
const v = input.value.trim()
|
const v = input.value.trim()
|
||||||
if (!v) return { dec: null, output: '', outputUppercase: '' }
|
if (!v) return { dec: null, output: '', outputUppercase: '', err: '' }
|
||||||
try {
|
try {
|
||||||
const parsed = parseBigInt(v, RADIX_MAP[from.value])
|
const parsed = parseBigInt(v, RADIX_MAP[from.value])
|
||||||
const out = parsed.toString(RADIX_MAP[to.value])
|
const out = parsed.toString(RADIX_MAP[to.value])
|
||||||
return {
|
return {
|
||||||
dec: parsed,
|
dec: parsed,
|
||||||
output: out,
|
output: out,
|
||||||
outputUppercase: to.value === '16' ? out.toUpperCase() : out
|
outputUppercase: to.value === '16' ? out.toUpperCase() : out,
|
||||||
|
err: ''
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
error.value = '输入不合法，请确认数字与当前进制匹配（如十六进制仅含 0-9a-f）'
|
return {
|
||||||
return { dec: null, output: '', outputUppercase: '' }
|
dec: null,
|
||||||
|
output: '',
|
||||||
|
outputUppercase: '',
|
||||||
|
err: '输入不合法，请确认数字与当前进制匹配（如十六进制仅含 0-9a-f）'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
const error = computed(() => result.value.err)
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { listen, type UnlistenFn } from '@tauri-apps/api/event'
|
|||||||
import { Pause, Play, X, Minus, FolderOpen, AlertCircle, Loader2, XCircle } from '@lucide/vue'
|
import { Pause, Play, X, Minus, FolderOpen, AlertCircle, Loader2, XCircle } from '@lucide/vue'
|
||||||
import { commands, type DownloadTask, type Segment, type TaskStatus } from '@/lib/bindings'
|
import { commands, type DownloadTask, type Segment, type TaskStatus } from '@/lib/bindings'
|
||||||
import { STORAGE_KEYS } from '@/lib/constants'
|
import { STORAGE_KEYS } from '@/lib/constants'
|
||||||
|
import { applyStoredAccent } from '@/lib/theme'
|
||||||
import { createLogger } from '@/lib/logger'
|
import { createLogger } from '@/lib/logger'
|
||||||
|
|
||||||
const logger = createLogger('download-window')
|
const logger = createLogger('download-window')
|
||||||
@@ -68,6 +69,7 @@ const statusText = computed(() => {
|
|||||||
case 'complete': return '已完成'
|
case 'complete': return '已完成'
|
||||||
case 'error': return '出错'
|
case 'error': return '出错'
|
||||||
case 'cancelled': return '已取消'
|
case 'cancelled': return '已取消'
|
||||||
|
default: return ''
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
const statusTone = computed(() => {
|
const statusTone = computed(() => {
|
||||||
@@ -175,6 +177,8 @@ async function applyTheme() {
|
|||||||
root.classList.remove('dark', 'effect-mica', 'effect-acrylic', 'effect-normal')
|
root.classList.remove('dark', 'effect-mica', 'effect-acrylic', 'effect-normal')
|
||||||
root.classList.add(`effect-${effect}`)
|
root.classList.add(`effect-${effect}`)
|
||||||
if (isDark) root.classList.add('dark')
|
if (isDark) root.classList.add('dark')
|
||||||
|
// 主题色：与主窗口共用同一份设置
|
||||||
|
applyStoredAccent(root, isDark ? 'dark' : 'light', STORAGE_KEYS.appSettings)
|
||||||
|
|
||||||
// 4. 设置窗口效果：mica/acrylic 下卡片透明，普通模式用不透明背景
|
// 4. 设置窗口效果：mica/acrylic 下卡片透明，普通模式用不透明背景
|
||||||
try {
|
try {
|
||||||
@@ -297,7 +301,7 @@ onUnmounted(() => {
|
|||||||
<div class="dlw-titlebar" data-tauri-drag-region>
|
<div class="dlw-titlebar" data-tauri-drag-region>
|
||||||
<div class="dlw-title-left" data-tauri-drag-region>
|
<div class="dlw-title-left" data-tauri-drag-region>
|
||||||
<Loader2 v-if="status === 'active'" class="size-3 shrink-0 animate-spin text-primary" />
|
<Loader2 v-if="status === 'active'" class="size-3 shrink-0 animate-spin text-primary" />
|
||||||
<XCircle v-else-if="status === 'error'" class="size-3 shrink-0 text-red-500" />
|
<XCircle v-else-if="status === 'error'" class="size-3 shrink-0 text-danger" />
|
||||||
<Pause v-else class="size-3 shrink-0 text-muted-foreground" />
|
<Pause v-else class="size-3 shrink-0 text-muted-foreground" />
|
||||||
<span v-if="loading" class="text-xs font-medium text-muted-foreground">下载</span>
|
<span v-if="loading" class="text-xs font-medium text-muted-foreground">下载</span>
|
||||||
<span v-else-if="task" class="dlw-title-name" :title="task.filename"
|
<span v-else-if="task" class="dlw-title-name" :title="task.filename"
|
||||||
@@ -363,7 +367,7 @@ onUnmounted(() => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="actionError" class="mt-1.5 truncate text-right text-[10px] text-red-500" @click="clearErrorSoon">
|
<div v-if="actionError" class="mt-1.5 truncate text-right text-[10px] text-danger" @click="clearErrorSoon">
|
||||||
{{ actionError }}
|
{{ actionError }}
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -460,8 +464,8 @@ onUnmounted(() => {
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
.dlw-status-badge.tone-active { background: var(--primary); color: var(--primary-foreground); }
|
.dlw-status-badge.tone-active { background: var(--primary); color: var(--primary-foreground); }
|
||||||
.dlw-status-badge.tone-success { background: #10b981; color: #fff; }
|
.dlw-status-badge.tone-success { background: var(--success); color: #fff; }
|
||||||
.dlw-status-badge.tone-destructive { background: #ef4444; color: #fff; }
|
.dlw-status-badge.tone-destructive { background: var(--danger); color: #fff; }
|
||||||
.dlw-status-badge.tone-muted { background: var(--muted); color: var(--muted-foreground); }
|
.dlw-status-badge.tone-muted { background: var(--muted); color: var(--muted-foreground); }
|
||||||
|
|
||||||
.dlw-bar { height: 7px; border-radius: 999px; background: var(--muted); overflow: hidden; }
|
.dlw-bar { height: 7px; border-radius: 999px; background: var(--muted); overflow: hidden; }
|
||||||
@@ -487,8 +491,8 @@ onUnmounted(() => {
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
.dlw-btn:hover { background: var(--accent); color: var(--accent-foreground); }
|
.dlw-btn:hover { background: var(--accent); color: var(--accent-foreground); }
|
||||||
.dlw-btn-danger { color: #ef4444; }
|
.dlw-btn-danger { color: var(--danger); }
|
||||||
.dlw-btn-danger:hover { background: rgb(239 68 68 / 0.12); color: #dc2626; }
|
.dlw-btn-danger:hover { background: rgb(239 68 68 / 0.12); color: var(--danger); }
|
||||||
.dlw-btn-primary { background: var(--primary); color: var(--primary-foreground); border-color: transparent; }
|
.dlw-btn-primary { background: var(--primary); color: var(--primary-foreground); border-color: transparent; }
|
||||||
/* hover 时显式保持前景色，避免被上面的 .dlw-btn:hover 覆盖成深色导致黑字黑底不可见 */
|
/* hover 时显式保持前景色，避免被上面的 .dlw-btn:hover 覆盖成深色导致黑字黑底不可见 */
|
||||||
.dlw-btn-primary:hover { background: var(--primary); color: var(--primary-foreground); filter: brightness(1.05); }
|
.dlw-btn-primary:hover { background: var(--primary); color: var(--primary-foreground); filter: brightness(1.05); }
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import { Input } from '@/components/ui/input'
|
|||||||
import { Textarea } from '@/components/ui/textarea'
|
import { Textarea } from '@/components/ui/textarea'
|
||||||
import { Label } from '@/components/ui/label'
|
import { Label } from '@/components/ui/label'
|
||||||
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
|
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
|
||||||
import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs'
|
import { Tabs, TabsContent } from '@/components/ui/tabs'
|
||||||
import { ScrollArea } from '@/components/ui/scroll-area'
|
import { ScrollArea } from '@/components/ui/scroll-area'
|
||||||
import { Separator } from '@/components/ui/separator'
|
import { Separator } from '@/components/ui/separator'
|
||||||
import { Progress } from '@/components/ui/progress'
|
import { Progress } from '@/components/ui/progress'
|
||||||
@@ -44,11 +44,11 @@ const logger = createLogger('downloader')
|
|||||||
// ===== 主 Tab 状态 =====
|
// ===== 主 Tab 状态 =====
|
||||||
const activeTab = ref('tasks')
|
const activeTab = ref('tasks')
|
||||||
|
|
||||||
const tabsListRef = useModuleTabs('downloader', activeTab, [
|
useModuleTabs('downloader', activeTab, [
|
||||||
{ value: 'tasks', label: '下载任务' },
|
{ value: 'tasks', label: '下载任务' },
|
||||||
{ value: 'settings', label: '设置' },
|
{ value: 'settings', label: '设置' },
|
||||||
{ value: 'extension', label: '浏览器扩展' }
|
{ value: 'extension', label: '浏览器扩展' }
|
||||||
])
|
], { alwaysVisible: true })
|
||||||
|
|
||||||
// 添加下载表单
|
// 添加下载表单
|
||||||
const addUriText = ref('')
|
const addUriText = ref('')
|
||||||
@@ -237,8 +237,6 @@ const SORT_OPTIONS: { label: string; value: SortField }[] = [
|
|||||||
{ label: '下载大小', value: 'size' }
|
{ label: '下载大小', value: 'size' }
|
||||||
]
|
]
|
||||||
|
|
||||||
const running = computed(() => store.status.running)
|
|
||||||
|
|
||||||
// ===== 工具函数 =====
|
// ===== 工具函数 =====
|
||||||
/** BT 第 i 个文件已下载字节（progress 事件把每文件进度写入 segments[i].completed） */
|
/** BT 第 i 个文件已下载字节（progress 事件把每文件进度写入 segments[i].completed） */
|
||||||
const btFileDownloaded = (task: DownloadTask, i: number): number =>
|
const btFileDownloaded = (task: DownloadTask, i: number): number =>
|
||||||
@@ -347,7 +345,7 @@ const handleResume = async (id: string) => {
|
|||||||
|
|
||||||
// ===== 取消下载（参考下载窗口：二次点击确认，3 秒内未二次点击则取消）=====
|
// ===== 取消下载（参考下载窗口：二次点击确认，3 秒内未二次点击则取消）=====
|
||||||
const cancelArmed = ref<Record<string, boolean>>({})
|
const cancelArmed = ref<Record<string, boolean>>({})
|
||||||
let cancelArmTimers: Record<string, number> = {}
|
const cancelArmTimers: Record<string, number> = {}
|
||||||
const handleCancel = (id: string) => {
|
const handleCancel = (id: string) => {
|
||||||
if (cancelArmed.value[id]) {
|
if (cancelArmed.value[id]) {
|
||||||
// 二次点击：执行取消
|
// 二次点击：执行取消
|
||||||
@@ -813,13 +811,6 @@ onUnmounted(() => {
|
|||||||
|
|
||||||
const allTasks = computed<DownloadTask[]>(() => store.tasks)
|
const allTasks = computed<DownloadTask[]>(() => store.tasks)
|
||||||
|
|
||||||
// 状态栏计数：单次遍历统计各状态任务数（替代模板内 4 次 filter 全量扫描）
|
|
||||||
const statusCounts = computed(() => {
|
|
||||||
const counts: Record<TaskStatus, number> = { queued: 0, active: 0, paused: 0, complete: 0, error: 0, cancelled: 0 }
|
|
||||||
for (const t of allTasks.value) counts[t.status]++
|
|
||||||
return counts
|
|
||||||
})
|
|
||||||
|
|
||||||
// 状态筛选
|
// 状态筛选
|
||||||
const filteredByStatus = computed<DownloadTask[]>(() => {
|
const filteredByStatus = computed<DownloadTask[]>(() => {
|
||||||
if (statusFilter.value === 'all') return allTasks.value
|
if (statusFilter.value === 'all') return allTasks.value
|
||||||
@@ -878,79 +869,11 @@ const toggleSortOrder = () => {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="h-full p-6 overflow-hidden flex flex-col">
|
<div class="min-h-full p-5 flex flex-col">
|
||||||
<Tabs v-model="activeTab" class="h-full flex flex-col">
|
<Tabs v-model="activeTab" class="flex flex-col">
|
||||||
<div ref="tabsListRef">
|
|
||||||
<TabsList class="grid w-full grid-cols-3 max-w-md !bg-transparent !p-0 !shadow-none">
|
|
||||||
<TabsTrigger value="tasks" class="gap-1.5">
|
|
||||||
<ListChecks class="size-4" />
|
|
||||||
下载任务
|
|
||||||
</TabsTrigger>
|
|
||||||
<TabsTrigger value="settings" class="gap-1.5">
|
|
||||||
<SettingsIcon class="size-4" />
|
|
||||||
设置
|
|
||||||
</TabsTrigger>
|
|
||||||
<TabsTrigger value="extension" class="gap-1.5">
|
|
||||||
<Puzzle class="size-4" />
|
|
||||||
浏览器扩展
|
|
||||||
</TabsTrigger>
|
|
||||||
</TabsList>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- ===== 下载任务 ===== -->
|
<!-- ===== 下载任务 ===== -->
|
||||||
<TabsContent value="tasks" class="flex-1 mt-4 min-h-0 min-w-0 tab-animate">
|
<TabsContent value="tasks" class="flex-1 min-h-0 min-w-0 tab-animate">
|
||||||
<div class="h-full flex flex-col gap-4 min-w-0">
|
<div class="h-full flex flex-col gap-4 min-w-0">
|
||||||
<!-- 状态栏 -->
|
|
||||||
<Card class="shrink-0 !py-0 !gap-0">
|
|
||||||
<CardContent class="pl-4 pr-4 py-3">
|
|
||||||
<div class="flex items-center justify-between flex-wrap gap-3">
|
|
||||||
<div class="flex items-center gap-3">
|
|
||||||
<div class="flex items-center gap-2">
|
|
||||||
<div
|
|
||||||
class="h-2.5 w-2.5 rounded-full"
|
|
||||||
:class="running ? 'bg-green-500 animate-pulse' : 'bg-muted-foreground'"
|
|
||||||
/>
|
|
||||||
<span class="text-sm font-medium">
|
|
||||||
下载引擎 {{ running ? '运行中' : '已停止' }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<Separator orientation="vertical" class="h-5" />
|
|
||||||
<div v-if="running" class="flex items-center gap-2 text-xs">
|
|
||||||
<Badge variant="secondary" class="gap-1">
|
|
||||||
<Download class="size-3" />
|
|
||||||
下载中 {{ statusCounts.active }}
|
|
||||||
</Badge>
|
|
||||||
<Badge variant="secondary" class="gap-1">
|
|
||||||
<Clock class="size-3" />
|
|
||||||
等待 {{ statusCounts.queued }}
|
|
||||||
</Badge>
|
|
||||||
<Badge v-if="statusCounts.paused > 0" variant="secondary" class="gap-1">
|
|
||||||
<Pause class="size-3" />
|
|
||||||
已暂停 {{ statusCounts.paused }}
|
|
||||||
</Badge>
|
|
||||||
<Badge variant="secondary" class="gap-1">
|
|
||||||
<Check class="size-3" />
|
|
||||||
已完成 {{ statusCounts.complete }}
|
|
||||||
</Badge>
|
|
||||||
<Badge v-if="statusCounts.cancelled > 0" variant="secondary" class="gap-1">
|
|
||||||
<XCircle class="size-3" />
|
|
||||||
已取消 {{ statusCounts.cancelled }}
|
|
||||||
</Badge>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="flex items-center gap-2">
|
|
||||||
<Button
|
|
||||||
size="sm"
|
|
||||||
variant="ghost"
|
|
||||||
@click="store.refreshTasks()"
|
|
||||||
>
|
|
||||||
<RefreshCw class="size-4" />
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</CardContent>
|
|
||||||
</Card>
|
|
||||||
|
|
||||||
<!-- 工具栏：筛选 / 排序 / 搜索 -->
|
<!-- 工具栏：筛选 / 排序 / 搜索 -->
|
||||||
<div class="shrink-0 flex items-center gap-2 flex-wrap">
|
<div class="shrink-0 flex items-center gap-2 flex-wrap">
|
||||||
<!-- 新建下载按钮 -->
|
<!-- 新建下载按钮 -->
|
||||||
@@ -1052,13 +975,28 @@ const toggleSortOrder = () => {
|
|||||||
下载设置
|
下载设置
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
|
<!-- 手动刷新任务列表（横幅移除后保留，事件漏收时可兜底） -->
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger as-child>
|
||||||
|
<Button
|
||||||
|
size="sm"
|
||||||
|
variant="outline"
|
||||||
|
class="size-8 p-0 bg-transparent"
|
||||||
|
@click="store.refreshTasks()"
|
||||||
|
>
|
||||||
|
<RefreshCw class="size-4" />
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent>刷新任务列表</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
|
||||||
<span class="text-xs text-muted-foreground ml-auto">
|
<span class="text-xs text-muted-foreground ml-auto">
|
||||||
共 {{ sortedTasks.length }} 个任务
|
共 {{ sortedTasks.length }} 个任务
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 任务列表 -->
|
<!-- 任务列表 -->
|
||||||
<ScrollArea class="flex-1 min-h-0 min-w-0">
|
<div class="flex-1 min-h-0 min-w-0">
|
||||||
<div v-if="pagedTasks.length === 0" key="empty" class="h-full flex flex-col items-center justify-center text-muted-foreground gap-2 pt-10">
|
<div v-if="pagedTasks.length === 0" key="empty" class="h-full flex flex-col items-center justify-center text-muted-foreground gap-2 pt-10">
|
||||||
<CheckCircle2 class="size-16 opacity-30" />
|
<CheckCircle2 class="size-16 opacity-30" />
|
||||||
<p>暂无符合条件的任务</p>
|
<p>暂无符合条件的任务</p>
|
||||||
@@ -1093,7 +1031,7 @@ const toggleSortOrder = () => {
|
|||||||
<span>
|
<span>
|
||||||
{{ formatSize(task.completedSize) }} / {{ formatTotalSize(task.totalSize) }}
|
{{ formatSize(task.completedSize) }} / {{ formatTotalSize(task.totalSize) }}
|
||||||
</span>
|
</span>
|
||||||
<span v-if="task.status === 'active'" class="flex items-center gap-1 text-green-600 dark:text-green-400">
|
<span v-if="task.status === 'active'" class="flex items-center gap-1 text-success-text">
|
||||||
<Download class="size-3" />
|
<Download class="size-3" />
|
||||||
{{ formatSpeed(task.speed) }}
|
{{ formatSpeed(task.speed) }}
|
||||||
</span>
|
</span>
|
||||||
@@ -1287,14 +1225,14 @@ const toggleSortOrder = () => {
|
|||||||
<TooltipContent>最后一页</TooltipContent>
|
<TooltipContent>最后一页</TooltipContent>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
</div>
|
</div>
|
||||||
</ScrollArea>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
<!-- ===== 设置 ===== -->
|
<!-- ===== 设置 ===== -->
|
||||||
<TabsContent value="settings" class="flex-1 mt-4 min-h-0 tab-animate">
|
<TabsContent value="settings" class="flex-1 min-h-0 tab-animate">
|
||||||
<ScrollArea class="h-full pr-3">
|
<div>
|
||||||
<div class="flex flex-col gap-4 pb-4 max-w-2xl">
|
<div class="flex flex-col gap-4 pb-4">
|
||||||
<!-- 下载设置 -->
|
<!-- 下载设置 -->
|
||||||
<Card>
|
<Card>
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
@@ -1482,13 +1420,13 @@ const toggleSortOrder = () => {
|
|||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</ScrollArea>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
<!-- ===== 浏览器扩展 ===== -->
|
<!-- ===== 浏览器扩展 ===== -->
|
||||||
<TabsContent value="extension" class="flex-1 mt-4 min-h-0 tab-animate">
|
<TabsContent value="extension" class="flex-1 min-h-0 tab-animate">
|
||||||
<ScrollArea class="h-full pr-3">
|
<div>
|
||||||
<div class="flex flex-col gap-4 pb-4 max-w-2xl">
|
<div class="flex flex-col gap-4 pb-4">
|
||||||
<Card>
|
<Card>
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
<CardTitle class="flex items-center gap-2 text-base">
|
<CardTitle class="flex items-center gap-2 text-base">
|
||||||
@@ -1623,7 +1561,7 @@ const toggleSortOrder = () => {
|
|||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</ScrollArea>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
|
|
||||||
@@ -1879,7 +1817,7 @@ const toggleSortOrder = () => {
|
|||||||
<AlertDialogContent class="max-w-md">
|
<AlertDialogContent class="max-w-md">
|
||||||
<AlertDialogHeader>
|
<AlertDialogHeader>
|
||||||
<AlertDialogTitle class="flex items-center gap-2">
|
<AlertDialogTitle class="flex items-center gap-2">
|
||||||
<AlertCircle class="size-4 text-amber-500" />
|
<AlertCircle class="size-4 text-warning" />
|
||||||
下载重复提醒
|
下载重复提醒
|
||||||
</AlertDialogTitle>
|
</AlertDialogTitle>
|
||||||
<AlertDialogDescription class="text-xs">
|
<AlertDialogDescription class="text-xs">
|
||||||
|
|||||||
@@ -64,5 +64,5 @@ export const moduleConfig: ModuleConfig = {
|
|||||||
// 模块禁用时不停止引擎（引擎在应用退出时统一清理）
|
// 模块禁用时不停止引擎（引擎在应用退出时统一清理）
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
order: 50
|
order: 30
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,8 @@ import {
|
|||||||
Command,
|
Command,
|
||||||
Wrench,
|
Wrench,
|
||||||
Music,
|
Music,
|
||||||
Languages
|
Languages,
|
||||||
|
SquareTerminal
|
||||||
} from '@lucide/vue'
|
} from '@lucide/vue'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -29,7 +30,8 @@ export const moduleIconMap: Record<string, Component> = {
|
|||||||
quickpanel: Command,
|
quickpanel: Command,
|
||||||
devtools: Wrench,
|
devtools: Wrench,
|
||||||
music: Music,
|
music: Music,
|
||||||
translate: Languages
|
translate: Languages,
|
||||||
|
terminal: SquareTerminal
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 获取模块图标组件，未找到时回退到 Settings 图标 */
|
/** 获取模块图标组件，未找到时回退到 Settings 图标 */
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import { moduleConfig as devtools } from './devtools'
|
|||||||
import { moduleConfig as settings } from './settings'
|
import { moduleConfig as settings } from './settings'
|
||||||
import { moduleConfig as music } from './music'
|
import { moduleConfig as music } from './music'
|
||||||
import { moduleConfig as translate } from './translate'
|
import { moduleConfig as translate } from './translate'
|
||||||
|
import { moduleConfig as terminal } from './terminal'
|
||||||
|
|
||||||
const allModules: ModuleConfig[] = [
|
const allModules: ModuleConfig[] = [
|
||||||
proxy,
|
proxy,
|
||||||
@@ -23,7 +24,8 @@ const allModules: ModuleConfig[] = [
|
|||||||
devtools,
|
devtools,
|
||||||
settings,
|
settings,
|
||||||
music,
|
music,
|
||||||
translate
|
translate,
|
||||||
|
terminal
|
||||||
]
|
]
|
||||||
|
|
||||||
// 启动时注册所有模块
|
// 启动时注册所有模块
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import {
|
|||||||
ShieldCheck, ShieldOff, Zap, Thermometer, Clock, ChevronDown,
|
ShieldCheck, ShieldOff, Zap, Thermometer, Clock, ChevronDown,
|
||||||
ArrowDown, ArrowUp, Wifi, FolderOpen, Copy, ListChecks,
|
ArrowDown, ArrowUp, Wifi, FolderOpen, Copy, ListChecks,
|
||||||
Monitor as MonitorIcon, GripVertical, SlidersHorizontal,
|
Monitor as MonitorIcon, GripVertical, SlidersHorizontal,
|
||||||
Eye, EyeOff, MousePointerClick, Plus, PencilLine,
|
Eye, EyeOff, MousePointerClick, Check, PencilLine,
|
||||||
CircuitBoard, BatteryFull, Gamepad2,
|
CircuitBoard, BatteryFull, Gamepad2,
|
||||||
} from '@lucide/vue'
|
} from '@lucide/vue'
|
||||||
import type { LucideIcon } from '@lucide/vue'
|
import type { LucideIcon } from '@lucide/vue'
|
||||||
@@ -33,7 +33,7 @@ import OverviewCard, { type OverviewCardView } from './OverviewCard.vue'
|
|||||||
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
|
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
|
||||||
import { Button } from '@/components/ui/button'
|
import { Button } from '@/components/ui/button'
|
||||||
import { Badge } from '@/components/ui/badge'
|
import { Badge } from '@/components/ui/badge'
|
||||||
import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs'
|
import { Tabs, TabsContent } from '@/components/ui/tabs'
|
||||||
import { ScrollArea } from '@/components/ui/scroll-area'
|
import { ScrollArea } from '@/components/ui/scroll-area'
|
||||||
import { Accordion, AccordionItem, AccordionTrigger, AccordionContent } from '@/components/ui/accordion'
|
import { Accordion, AccordionItem, AccordionTrigger, AccordionContent } from '@/components/ui/accordion'
|
||||||
import { Progress } from '@/components/ui/progress'
|
import { Progress } from '@/components/ui/progress'
|
||||||
@@ -50,12 +50,12 @@ const store = useMonitorStore()
|
|||||||
|
|
||||||
// ===== Tab 配置（注册到 TitleBar 浮动切换器） =====
|
// ===== Tab 配置（注册到 TitleBar 浮动切换器） =====
|
||||||
const activeTab = ref('overview')
|
const activeTab = ref('overview')
|
||||||
const tabsListRef = useModuleTabs('monitor', activeTab, [
|
useModuleTabs('monitor', activeTab, [
|
||||||
{ value: 'overview', label: '概览' },
|
{ value: 'overview', label: '概览' },
|
||||||
{ value: 'details', label: '详细' },
|
{ value: 'details', label: '详细' },
|
||||||
{ value: 'osd', label: 'OSD 显示' },
|
{ value: 'osd', label: 'OSD 显示' },
|
||||||
{ value: 'settings', label: '设置' },
|
{ value: 'settings', label: '设置' },
|
||||||
])
|
], { alwaysVisible: true })
|
||||||
|
|
||||||
// ===== 关键指标 computed =====
|
// ===== 关键指标 computed =====
|
||||||
|
|
||||||
@@ -248,8 +248,14 @@ function saveOverviewCards() {
|
|||||||
|
|
||||||
/** 编辑模式：显示拖拽把手/移除按钮，启用拖拽排序 */
|
/** 编辑模式：显示拖拽把手/移除按钮，启用拖拽排序 */
|
||||||
const overviewEditing = ref(false)
|
const overviewEditing = ref(false)
|
||||||
/** 添加卡片 Popover 开关 */
|
/**
|
||||||
const overviewAddOpen = ref(false)
|
* 「布局」Popover 开关（编辑模式 + 添加卡片）。
|
||||||
|
*
|
||||||
|
* 两件事合并进同一个 popover：它们都是**对概览卡片集合的操作**，此前各占一个
|
||||||
|
* 文字按钮（「编辑布局」「添加卡片」），把横幅挤成了两行 —— 而横幅的规范是
|
||||||
|
* 「状态区 → 指标区 → 操作区」一行常驻（UI_DESIGN_SYSTEM §3.4）。
|
||||||
|
*/
|
||||||
|
const overviewEditOpen = ref(false)
|
||||||
|
|
||||||
/** 尚未添加的卡片（添加菜单内容） */
|
/** 尚未添加的卡片（添加菜单内容） */
|
||||||
const addableOverviewCards = computed(() =>
|
const addableOverviewCards = computed(() =>
|
||||||
@@ -260,7 +266,7 @@ function addOverviewCard(id: OverviewCardId) {
|
|||||||
if (overviewCards.value.includes(id)) return
|
if (overviewCards.value.includes(id)) return
|
||||||
overviewCards.value.push(id)
|
overviewCards.value.push(id)
|
||||||
saveOverviewCards()
|
saveOverviewCards()
|
||||||
overviewAddOpen.value = false
|
overviewEditOpen.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
function removeOverviewCard(id: string) {
|
function removeOverviewCard(id: string) {
|
||||||
@@ -330,8 +336,8 @@ function buildOverviewCardView(id: OverviewCardId): OverviewCardView {
|
|||||||
case 'network':
|
case 'network':
|
||||||
return {
|
return {
|
||||||
id, title: '网络', icon: Wifi,
|
id, title: '网络', icon: Wifi,
|
||||||
main: { label: '下载', labelIcon: ArrowDown, text: downSpeed.value.value, unit: downSpeed.value.unit, colorClass: 'text-sky-500' },
|
main: { label: '下载', labelIcon: ArrowDown, text: downSpeed.value.value, unit: downSpeed.value.unit, colorClass: 'text-info' },
|
||||||
subs: [{ label: '上传', labelIcon: ArrowUp, text: upSpeed.value.value, unit: upSpeed.value.unit, colorClass: 'text-violet-500' }],
|
subs: [{ label: '上传', labelIcon: ArrowUp, text: upSpeed.value.value, unit: upSpeed.value.unit, colorClass: 'text-data-up' }],
|
||||||
load: null,
|
load: null,
|
||||||
}
|
}
|
||||||
case 'storage':
|
case 'storage':
|
||||||
@@ -376,12 +382,13 @@ const overviewCardViews = computed<OverviewCardView[]>(() =>
|
|||||||
)
|
)
|
||||||
|
|
||||||
// ===== 连接状态徽章 =====
|
// ===== 连接状态徽章 =====
|
||||||
const stateMeta: Record<ConnectionState, { text: string; class: string }> = {
|
/** 横幅状态区用：状态点颜色 + 状态文字颜色（规范 §3.4 = 状态点 8px + 状态文字 13px/500） */
|
||||||
idle: { text: '未启动', class: 'bg-muted text-muted-foreground' },
|
const stateMeta: Record<ConnectionState, { text: string; dot: string; textClass: string }> = {
|
||||||
loading: { text: '启动中', class: 'bg-yellow-500/15 text-yellow-600 dark:text-yellow-400' },
|
idle: { text: '未启动', dot: 'bg-muted-foreground', textClass: 'text-muted-foreground' },
|
||||||
connected: { text: '已连接', class: 'bg-emerald-500/15 text-emerald-600 dark:text-emerald-400' },
|
loading: { text: '启动中', dot: 'bg-warning', textClass: 'text-warning' },
|
||||||
disconnected: { text: '已断开', class: 'bg-orange-500/15 text-orange-600 dark:text-orange-400' },
|
connected: { text: '已连接', dot: 'bg-success', textClass: 'text-success' },
|
||||||
error: { text: '错误', class: 'bg-red-500/15 text-red-600 dark:text-red-400' },
|
disconnected: { text: '已断开', dot: 'bg-warning', textClass: 'text-warning' },
|
||||||
|
error: { text: '错误', dot: 'bg-danger', textClass: 'text-danger' },
|
||||||
}
|
}
|
||||||
|
|
||||||
// ===== 分组列表（详细页用） =====
|
// ===== 分组列表（详细页用） =====
|
||||||
@@ -1342,20 +1349,11 @@ watch(() => store.status?.ready, (ready, prev) => {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="h-full p-6">
|
<div class="min-h-full p-5">
|
||||||
<Tabs v-model="activeTab" class="h-full flex flex-col">
|
<Tabs v-model="activeTab" class="flex flex-col">
|
||||||
<div ref="tabsListRef">
|
|
||||||
<TabsList class="grid w-full max-w-md grid-cols-4 !bg-transparent !p-0 !shadow-none">
|
|
||||||
<TabsTrigger value="overview" class="gap-1.5"><Activity class="size-3.5" />概览</TabsTrigger>
|
|
||||||
<TabsTrigger value="details" class="gap-1.5"><Gauge class="size-3.5" />详细</TabsTrigger>
|
|
||||||
<TabsTrigger value="osd" class="gap-1.5"><MonitorIcon class="size-3.5" />OSD</TabsTrigger>
|
|
||||||
<TabsTrigger value="settings" class="gap-1.5"><SettingsIcon class="size-3.5" />设置</TabsTrigger>
|
|
||||||
</TabsList>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- ===== 概览 ===== -->
|
<!-- ===== 概览 ===== -->
|
||||||
<TabsContent value="overview" class="flex-1 mt-4 tab-animate">
|
<TabsContent value="overview" class="flex-1 tab-animate">
|
||||||
<ScrollArea class="h-full pr-3">
|
<div>
|
||||||
<!-- 加载中占位（仅首次初始化前显示） -->
|
<!-- 加载中占位（仅首次初始化前显示） -->
|
||||||
<div v-if="!store.initialized" key="initializing" class="h-full flex flex-col items-center justify-center text-muted-foreground gap-2 pt-10">
|
<div v-if="!store.initialized" key="initializing" class="h-full flex flex-col items-center justify-center text-muted-foreground gap-2 pt-10">
|
||||||
<Loader2 class="size-8 animate-spin" />
|
<Loader2 class="size-8 animate-spin" />
|
||||||
@@ -1363,40 +1361,59 @@ watch(() => store.status?.ready, (ready, prev) => {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<!-- ===== Kernel 状态栏（置顶紧凑横条） ===== -->
|
<!-- ===== Kernel 状态横幅：状态区 → 指标区 → 操作区（UI_DESIGN_SYSTEM §3.4） ===== -->
|
||||||
<Card class="py-0 gap-0 mb-2.5">
|
<Card class="!py-0 !gap-0 mb-2.5">
|
||||||
<CardContent class="px-3.5 py-2 flex flex-wrap items-center gap-x-3 gap-y-1.5 text-xs">
|
<CardContent class="flex flex-wrap items-center gap-x-6 gap-y-3 px-4 py-4">
|
||||||
<span class="flex items-center gap-1.5 font-medium text-sm">
|
<!-- 状态区：状态点 8px + 状态文字 13px/500 + 进程名 13px 次要色 -->
|
||||||
<Activity class="size-4 text-primary" />Kernel
|
<div class="flex flex-wrap items-center gap-2.5">
|
||||||
</span>
|
<span class="flex items-center gap-1.5 text-[13px] font-medium" :class="stateMeta[store.connState].textClass">
|
||||||
<span :class="['px-2 py-0.5 rounded-full', stateMeta[store.connState].class]">
|
<span
|
||||||
{{ stateMeta[store.connState].text }}
|
class="size-2 rounded-full"
|
||||||
</span>
|
:class="[stateMeta[store.connState].dot, store.connState === 'connected' && 'status-dot-pulse']"
|
||||||
<Badge :variant="store.snapshot?.isAdmin ? 'default' : 'outline'" :class="store.snapshot?.isAdmin ? 'bg-emerald-500 hover:bg-emerald-500' : ''">
|
/>{{ stateMeta[store.connState].text }}
|
||||||
{{ store.snapshot?.isAdmin ? '管理员' : '普通' }}
|
</span>
|
||||||
</Badge>
|
<span class="text-[13px] text-fg-secondary">ThingHK</span>
|
||||||
<Badge v-if="store.status?.thingElevated" variant="outline" class="border-emerald-500/50 text-emerald-600 dark:text-emerald-400">
|
<Badge :variant="store.snapshot?.isAdmin ? 'default' : 'outline'" :class="store.snapshot?.isAdmin ? 'bg-success hover:bg-success' : ''">
|
||||||
<ShieldCheck class="size-2.5 mr-0.5" />提权
|
{{ store.snapshot?.isAdmin ? '管理员' : '普通' }}
|
||||||
</Badge>
|
</Badge>
|
||||||
<span class="text-muted-foreground">PID: <span class="font-mono text-foreground">{{ store.status?.pid ?? '--' }}</span></span>
|
<Badge v-if="store.status?.thingElevated" variant="outline" class="border-success/50 text-success-text">
|
||||||
<span class="text-muted-foreground">传感器: <span class="font-mono text-foreground">{{ store.status?.sensorCount ?? '--' }}</span></span>
|
<ShieldCheck class="size-2.5 mr-0.5" />提权
|
||||||
<span class="text-muted-foreground">重启: <span class="font-mono text-foreground">{{ store.status?.restartCount ?? 0 }}</span></span>
|
</Badge>
|
||||||
<span class="text-muted-foreground">事件: <span class="font-mono text-foreground">{{ store.eventCount }}</span></span>
|
</div>
|
||||||
<div class="flex items-center gap-1.5 ml-auto">
|
<!-- 指标区：核心属性同样占一个指标位（label 11px 灰 + 数值 18px/600 tabular-nums） -->
|
||||||
|
<div class="flex flex-wrap items-center gap-6">
|
||||||
|
<div class="flex min-w-20 flex-col gap-0.5">
|
||||||
|
<span class="text-[11px] text-muted-foreground">PID</span>
|
||||||
|
<span class="text-lg font-semibold tabular-nums text-foreground">{{ store.status?.pid ?? '—' }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="flex min-w-12 flex-col gap-0.5">
|
||||||
|
<span class="text-[11px] text-muted-foreground">传感器</span>
|
||||||
|
<span class="text-lg font-semibold tabular-nums text-foreground">{{ store.status?.sensorCount ?? 0 }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="flex min-w-12 flex-col gap-0.5">
|
||||||
|
<span class="text-[11px] text-muted-foreground">重启</span>
|
||||||
|
<span class="text-lg font-semibold tabular-nums text-foreground">{{ store.status?.restartCount ?? 0 }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="flex min-w-12 flex-col gap-0.5">
|
||||||
|
<span class="text-[11px] text-muted-foreground">事件</span>
|
||||||
|
<span class="text-lg font-semibold tabular-nums text-foreground">{{ store.eventCount }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="ml-auto flex flex-wrap items-center gap-1.5">
|
||||||
<!-- 启动中 loading（starting=true 但状态还没变为 loading 时显示） -->
|
<!-- 启动中 loading（starting=true 但状态还没变为 loading 时显示） -->
|
||||||
<Button v-if="store.starting && store.connState === 'idle'" size="xs" variant="outline" disabled>
|
<Button v-if="store.starting && store.connState === 'idle'" size="sm" variant="outline" disabled>
|
||||||
<Loader2 class="size-3 animate-spin" />启动中
|
<Loader2 class="size-3.5 animate-spin" />启动中
|
||||||
</Button>
|
</Button>
|
||||||
<!-- 启动按钮（未运行且非启动中时显示） -->
|
<!-- 启动按钮（未运行且非启动中时显示） -->
|
||||||
<Button v-if="store.connState === 'idle' && !store.starting" size="xs" :disabled="store.starting" @click="handleStart">
|
<Button v-if="store.connState === 'idle' && !store.starting" size="sm" :disabled="store.starting" @click="handleStart">
|
||||||
<Play class="size-3" />启动
|
<Play class="size-3.5" />启动
|
||||||
</Button>
|
</Button>
|
||||||
<!-- 提权按钮（标志未启用时显示：设置标志 + 以管理员权限重启 Thing） -->
|
<!-- 提权按钮（标志未启用时显示：设置标志 + 以管理员权限重启 Thing） -->
|
||||||
<Tooltip v-if="!store.elevateOnLaunch">
|
<Tooltip v-if="!store.elevateOnLaunch">
|
||||||
<TooltipTrigger as-child>
|
<TooltipTrigger as-child>
|
||||||
<Button size="xs" variant="outline" class="gap-1 text-emerald-600 dark:text-emerald-400 border-emerald-500/40 hover:bg-emerald-500/10" :disabled="store.starting" @click="handleElevateSelf">
|
<Button size="sm" variant="outline" class="gap-1 text-success-text border-success/40 hover:bg-success/10" :disabled="store.starting" @click="handleElevateSelf">
|
||||||
<Loader2 v-if="store.starting" class="size-3 animate-spin" />
|
<Loader2 v-if="store.starting" class="size-3.5 animate-spin" />
|
||||||
<ShieldCheck v-else class="size-3" />提权
|
<ShieldCheck v-else class="size-3.5" />提权
|
||||||
</Button>
|
</Button>
|
||||||
</TooltipTrigger>
|
</TooltipTrigger>
|
||||||
<TooltipContent class="max-w-[480px] break-words">以管理员权限重启 Thing（弹 UAC，ThingHK 子进程继承权限，后续启动自动提权，崩溃自动重启）</TooltipContent>
|
<TooltipContent class="max-w-[480px] break-words">以管理员权限重启 Thing（弹 UAC，ThingHK 子进程继承权限，后续启动自动提权，崩溃自动重启）</TooltipContent>
|
||||||
@@ -1404,36 +1421,70 @@ watch(() => store.status?.ready, (ready, prev) => {
|
|||||||
<!-- 取消提权按钮（标志已启用时显示：清除标志，下次启动不触发 UAC） -->
|
<!-- 取消提权按钮（标志已启用时显示：清除标志，下次启动不触发 UAC） -->
|
||||||
<Tooltip v-else>
|
<Tooltip v-else>
|
||||||
<TooltipTrigger as-child>
|
<TooltipTrigger as-child>
|
||||||
<Button size="xs" variant="outline" class="gap-1 text-muted-foreground hover:text-foreground" @click="handleCancelElevation">
|
<Button size="sm" variant="outline" class="gap-1 text-muted-foreground hover:text-foreground" @click="handleCancelElevation">
|
||||||
<ShieldOff class="size-3" />取消提权
|
<ShieldOff class="size-3.5" />取消提权
|
||||||
</Button>
|
</Button>
|
||||||
</TooltipTrigger>
|
</TooltipTrigger>
|
||||||
<TooltipContent class="max-w-[480px] break-words">取消提权，下次启动将以普通权限运行（不影响当前会话）</TooltipContent>
|
<TooltipContent class="max-w-[480px] break-words">取消提权，下次启动将以普通权限运行（不影响当前会话）</TooltipContent>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
<Button size="xs" variant="outline" :disabled="store.starting || store.stopping || store.connState === 'idle'" @click="handleRefresh">
|
<!--
|
||||||
<RefreshCw class="size-3" />刷新
|
刷新：图标按钮（原来是与启动/停止同级的文字按钮，把操作区撑宽
|
||||||
|
近一个按钮的宽度）。语义交给 Tooltip，与其它图标按钮一致。
|
||||||
|
-->
|
||||||
|
<Tooltip>
|
||||||
|
<TooltipTrigger as-child>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
size="icon-sm"
|
||||||
|
:disabled="store.starting || store.stopping || store.connState === 'idle'"
|
||||||
|
@click="handleRefresh"
|
||||||
|
>
|
||||||
|
<RefreshCw class="size-3.5" />
|
||||||
|
</Button>
|
||||||
|
</TooltipTrigger>
|
||||||
|
<TooltipContent>刷新传感器数据</TooltipContent>
|
||||||
|
</Tooltip>
|
||||||
|
<Button size="sm" variant="destructive" :disabled="store.starting || store.stopping || store.connState === 'idle'" @click="handleStop">
|
||||||
|
<Square class="size-3.5" />停止
|
||||||
</Button>
|
</Button>
|
||||||
<Button size="xs" variant="outline" :disabled="store.starting || store.stopping || store.connState === 'idle'" @click="handleStop">
|
<Separator orientation="vertical" class="h-5 mx-0.5" />
|
||||||
<Square class="size-3" />停止
|
<!--
|
||||||
</Button>
|
布局：编辑模式（拖拽排序 / 移除）+ 添加卡片 收进一个图标按钮的
|
||||||
<Separator orientation="vertical" class="h-4 mx-0.5" />
|
popover。两件事都属于「卡片集合的操作」，低频且互斥于运行控制，
|
||||||
<!-- 编辑布局开关：拖拽排序 / 删除卡片 -->
|
各占一个文字按钮只会把横幅挤成两行。
|
||||||
<Button
|
按钮在编辑态用主题色软底提示「正在编辑」。
|
||||||
size="xs"
|
-->
|
||||||
:variant="overviewEditing ? 'default' : 'outline'"
|
<Popover v-model:open="overviewEditOpen">
|
||||||
:title="overviewEditing ? '完成编辑' : '编辑卡片布局（拖拽排序 / 删除）'"
|
|
||||||
@click="overviewEditing = !overviewEditing"
|
|
||||||
>
|
|
||||||
<PencilLine class="size-3" />{{ overviewEditing ? '完成' : '编辑布局' }}
|
|
||||||
</Button>
|
|
||||||
<!-- 添加卡片 -->
|
|
||||||
<Popover v-model:open="overviewAddOpen">
|
|
||||||
<PopoverTrigger as-child>
|
<PopoverTrigger as-child>
|
||||||
<Button size="xs" variant="outline" :disabled="!addableOverviewCards.length" title="添加硬件卡片">
|
<Button
|
||||||
<Plus class="size-3" />添加卡片
|
variant="outline"
|
||||||
|
size="icon-sm"
|
||||||
|
title="编辑卡片布局 / 添加卡片"
|
||||||
|
:class="
|
||||||
|
overviewEditing
|
||||||
|
? 'border-primary/40 bg-primary-soft text-primary-soft-text'
|
||||||
|
: ''
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<PencilLine class="size-3.5" />
|
||||||
</Button>
|
</Button>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent class="w-64 p-1.5" align="end">
|
<PopoverContent class="w-64 p-1.5" align="end">
|
||||||
|
<!-- 编辑布局开关：点完即收起 popover（编辑态的反馈在卡片本身：把手与移除按钮出现） -->
|
||||||
|
<button
|
||||||
|
class="w-full flex items-center gap-2.5 rounded-md px-2.5 py-2 text-sm hover:bg-accent transition-colors text-left"
|
||||||
|
@click="overviewEditing = !overviewEditing; overviewEditOpen = false"
|
||||||
|
>
|
||||||
|
<PencilLine class="size-4 text-primary shrink-0" />
|
||||||
|
<span class="min-w-0 flex-1">
|
||||||
|
<span class="block">{{ overviewEditing ? '完成编辑' : '编辑卡片布局' }}</span>
|
||||||
|
<span class="block text-xs text-muted-foreground">拖拽排序、移除卡片</span>
|
||||||
|
</span>
|
||||||
|
<Check v-if="overviewEditing" class="size-4 text-primary shrink-0" />
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<Separator class="my-1" />
|
||||||
|
<p class="px-2.5 pb-0.5 pt-1 text-[11px] font-medium text-muted-foreground">添加卡片</p>
|
||||||
<button
|
<button
|
||||||
v-for="c in addableOverviewCards"
|
v-for="c in addableOverviewCards"
|
||||||
:key="c.id"
|
:key="c.id"
|
||||||
@@ -1454,11 +1505,11 @@ watch(() => store.status?.ready, (ready, prev) => {
|
|||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
<!-- PawnIO 驱动缺失提示（提权但驱动未装 → CPU 温度/功耗无法读取） -->
|
<!-- PawnIO 驱动缺失提示（提权但驱动未装 → CPU 温度/功耗无法读取） -->
|
||||||
<Card v-if="store.pawnIoMissing" class="py-0 gap-0 mb-2.5 !border-amber-500/40 bg-amber-500/10">
|
<Card v-if="store.pawnIoMissing" class="py-0 gap-0 mb-2.5 !border-warning/40 bg-warning-soft">
|
||||||
<CardContent class="px-3.5 py-2 flex flex-wrap items-center gap-2 text-xs text-amber-600 dark:text-amber-400">
|
<CardContent class="px-3.5 py-2 flex flex-wrap items-center gap-2 text-xs text-warning-text">
|
||||||
<AlertTriangle class="size-4 shrink-0" />
|
<AlertTriangle class="size-4 shrink-0" />
|
||||||
<span class="flex-1 min-w-[200px]">检测到 PawnIO 驱动未安装，CPU 温度/功耗可能无法读取（误卸载过 PawnIO 等情况会触发）。点击下方按钮自动安装并重启监控内核。</span>
|
<span class="flex-1 min-w-[200px]">检测到 PawnIO 驱动未安装，CPU 温度/功耗可能无法读取（误卸载过 PawnIO 等情况会触发）。点击下方按钮自动安装并重启监控内核。</span>
|
||||||
<Button size="xs" variant="outline" class="shrink-0 text-amber-600 dark:text-amber-400 border-amber-500/40 hover:bg-amber-500/10" :disabled="store.starting || store.stopping || repairingPawnio" @click="handleRepairPawnio">
|
<Button size="xs" variant="outline" class="shrink-0 text-warning-text border-warning/40 hover:bg-warning/10" :disabled="store.starting || store.stopping || repairingPawnio" @click="handleRepairPawnio">
|
||||||
<Loader2 v-if="repairingPawnio" class="size-3 mr-1 animate-spin" />
|
<Loader2 v-if="repairingPawnio" class="size-3 mr-1 animate-spin" />
|
||||||
<RefreshCw v-else class="size-3 mr-1" />
|
<RefreshCw v-else class="size-3 mr-1" />
|
||||||
{{ repairingPawnio ? '修复中...' : '检测并修复' }}
|
{{ repairingPawnio ? '修复中...' : '检测并修复' }}
|
||||||
@@ -1523,32 +1574,32 @@ watch(() => store.status?.ready, (ready, prev) => {
|
|||||||
</VueDraggable>
|
</VueDraggable>
|
||||||
|
|
||||||
<!-- 断线提示 -->
|
<!-- 断线提示 -->
|
||||||
<Card v-if="store.connState === 'disconnected'" class="mt-2.5 border-orange-500/40 py-0 gap-0">
|
<Card v-if="store.connState === 'disconnected'" class="mt-2.5 border-warning/40 py-0 gap-0">
|
||||||
<CardContent class="pt-3 flex items-start gap-2 text-sm">
|
<CardContent class="pt-3 flex items-start gap-2 text-sm">
|
||||||
<AlertTriangle class="size-4 text-orange-500 mt-0.5 shrink-0" />
|
<AlertTriangle class="size-4 text-warning mt-0.5 shrink-0" />
|
||||||
<div>
|
<div>
|
||||||
<div class="font-medium text-orange-600 dark:text-orange-400">SSE 连接断开</div>
|
<div class="font-medium text-warning-text">SSE 连接断开</div>
|
||||||
<div class="text-xs text-muted-foreground mt-0.5">Kernel 可能正在重启，等待自动重连...</div>
|
<div class="text-xs text-muted-foreground mt-0.5">Kernel 可能正在重启，等待自动重连...</div>
|
||||||
</div>
|
</div>
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
<!-- 错误提示 -->
|
<!-- 错误提示 -->
|
||||||
<Card v-if="store.errorMsg" class="mt-2.5 border-red-500/40 py-0 gap-0">
|
<Card v-if="store.errorMsg" class="mt-2.5 border-danger/40 py-0 gap-0">
|
||||||
<CardContent class="pt-3 flex items-start gap-2 text-sm">
|
<CardContent class="pt-3 flex items-start gap-2 text-sm">
|
||||||
<AlertTriangle class="size-4 text-red-500 mt-0.5 shrink-0" />
|
<AlertTriangle class="size-4 text-danger mt-0.5 shrink-0" />
|
||||||
<div>
|
<div>
|
||||||
<div class="font-medium text-red-600 dark:text-red-400">错误</div>
|
<div class="font-medium text-danger-text">错误</div>
|
||||||
<div class="text-xs font-mono mt-0.5 break-all">{{ store.errorMsg }}</div>
|
<div class="text-xs font-mono mt-0.5 break-all">{{ store.errorMsg }}</div>
|
||||||
</div>
|
</div>
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
</template>
|
</template>
|
||||||
</ScrollArea>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
<!-- ===== 详细 ===== -->
|
<!-- ===== 详细 ===== -->
|
||||||
<TabsContent value="details" class="flex-1 mt-4 tab-animate">
|
<TabsContent value="details" class="flex-1 tab-animate">
|
||||||
<div v-if="!store.snapshot" key="no-snapshot" class="h-full flex flex-col items-center justify-center text-muted-foreground gap-2 pt-10">
|
<div v-if="!store.snapshot" key="no-snapshot" class="h-full flex flex-col items-center justify-center text-muted-foreground gap-2 pt-10">
|
||||||
<Gauge class="size-12 opacity-30" />
|
<Gauge class="size-12 opacity-30" />
|
||||||
<p class="text-sm">无快照数据</p>
|
<p class="text-sm">无快照数据</p>
|
||||||
@@ -1558,7 +1609,7 @@ watch(() => store.status?.ready, (ready, prev) => {
|
|||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ScrollArea v-else key="details-list" class="h-full pr-3">
|
<div v-else key="details-list">
|
||||||
<div class="flex items-center justify-between mb-3">
|
<div class="flex items-center justify-between mb-3">
|
||||||
<p class="text-sm text-muted-foreground">{{ groups.length }} 个分组 / {{ store.status?.sensorCount ?? 0 }} 个传感器</p>
|
<p class="text-sm text-muted-foreground">{{ groups.length }} 个分组 / {{ store.status?.sensorCount ?? 0 }} 个传感器</p>
|
||||||
<Button size="xs" variant="outline" @click="store.fetchSnapshot()">
|
<Button size="xs" variant="outline" @click="store.fetchSnapshot()">
|
||||||
@@ -1582,7 +1633,7 @@ watch(() => store.status?.ready, (ready, prev) => {
|
|||||||
<AccordionContent class="px-4 pb-3 pt-0">
|
<AccordionContent class="px-4 pb-3 pt-0">
|
||||||
<!-- 无传感器数据占位（硬件已启用但 LHB 未检测到传感器，通常因权限不足或硬件不支持） -->
|
<!-- 无传感器数据占位（硬件已启用但 LHB 未检测到传感器，通常因权限不足或硬件不支持） -->
|
||||||
<div v-if="!g.sensors.length" class="py-3 flex items-center gap-2 text-xs text-muted-foreground">
|
<div v-if="!g.sensors.length" class="py-3 flex items-center gap-2 text-xs text-muted-foreground">
|
||||||
<AlertTriangle class="size-3.5 shrink-0 text-amber-500" />
|
<AlertTriangle class="size-3.5 shrink-0 text-warning" />
|
||||||
<span>未检测到传感器数据（可能需要管理员权限或硬件不支持）</span>
|
<span>未检测到传感器数据（可能需要管理员权限或硬件不支持）</span>
|
||||||
</div>
|
</div>
|
||||||
<div v-for="hwGroup in groupSensors(g.sensors)" :key="hwGroup.hardware" class="py-2 border-t first:border-t-0">
|
<div v-for="hwGroup in groupSensors(g.sensors)" :key="hwGroup.hardware" class="py-2 border-t first:border-t-0">
|
||||||
@@ -1611,13 +1662,13 @@ watch(() => store.status?.ready, (ready, prev) => {
|
|||||||
</AccordionItem>
|
</AccordionItem>
|
||||||
</Card>
|
</Card>
|
||||||
</Accordion>
|
</Accordion>
|
||||||
</ScrollArea>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
<!-- ===== OSD 显示 ===== -->
|
<!-- ===== OSD 显示 ===== -->
|
||||||
<TabsContent value="osd" class="flex-1 mt-4 tab-animate">
|
<TabsContent value="osd" class="flex-1 tab-animate">
|
||||||
<ScrollArea class="h-full pr-3">
|
<div>
|
||||||
<div class="max-w-2xl space-y-4 pb-4">
|
<div class="space-y-4 pb-4">
|
||||||
<!-- 悬浮窗开关 -->
|
<!-- 悬浮窗开关 -->
|
||||||
<Card>
|
<Card>
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
@@ -1665,7 +1716,7 @@ watch(() => store.status?.ready, (ready, prev) => {
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="!store.snapshot?.ready" class="flex items-start gap-2 text-xs text-amber-600 dark:text-amber-400 rounded-md border border-amber-500/30 bg-amber-500/5 p-2.5">
|
<div v-if="!store.snapshot?.ready" class="flex items-start gap-2 text-xs text-warning-text rounded-md border border-warning/30 bg-warning-soft p-2.5">
|
||||||
<AlertTriangle class="size-3.5 mt-0.5 shrink-0" />
|
<AlertTriangle class="size-3.5 mt-0.5 shrink-0" />
|
||||||
<span>Kernel 未就绪，无法获取可用传感器列表。请先在概览页启动 Kernel。</span>
|
<span>Kernel 未就绪，无法获取可用传感器列表。请先在概览页启动 Kernel。</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -2234,13 +2285,13 @@ watch(() => store.status?.ready, (ready, prev) => {
|
|||||||
|
|
||||||
<!-- 预览卡片已移除（用户可在桌面悬浮窗直接看实际效果） -->
|
<!-- 预览卡片已移除（用户可在桌面悬浮窗直接看实际效果） -->
|
||||||
</div>
|
</div>
|
||||||
</ScrollArea>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
<!-- ===== 设置 ===== -->
|
<!-- ===== 设置 ===== -->
|
||||||
<TabsContent value="settings" class="flex-1 mt-4 tab-animate">
|
<TabsContent value="settings" class="flex-1 tab-animate">
|
||||||
<ScrollArea class="h-full pr-3">
|
<div>
|
||||||
<div class="max-w-2xl space-y-4 pb-4">
|
<div class="space-y-4 pb-4">
|
||||||
<!-- 控制 -->
|
<!-- 控制 -->
|
||||||
<Card>
|
<Card>
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
@@ -2296,7 +2347,7 @@ watch(() => store.status?.ready, (ready, prev) => {
|
|||||||
</div>
|
</div>
|
||||||
<div class="flex justify-between">
|
<div class="flex justify-between">
|
||||||
<span class="text-muted-foreground">已安装</span>
|
<span class="text-muted-foreground">已安装</span>
|
||||||
<Badge :variant="store.kernelInfo.exists ? 'default' : 'destructive'" :class="store.kernelInfo.exists ? 'bg-emerald-500 hover:bg-emerald-500' : ''">
|
<Badge :variant="store.kernelInfo.exists ? 'default' : 'destructive'" :class="store.kernelInfo.exists ? 'bg-success hover:bg-success' : ''">
|
||||||
{{ store.kernelInfo.exists ? '是' : '否' }}
|
{{ store.kernelInfo.exists ? '是' : '否' }}
|
||||||
</Badge>
|
</Badge>
|
||||||
</div>
|
</div>
|
||||||
@@ -2347,10 +2398,10 @@ watch(() => store.status?.ready, (ready, prev) => {
|
|||||||
<div class="flex items-center justify-between">
|
<div class="flex items-center justify-between">
|
||||||
<span>当前权限</span>
|
<span>当前权限</span>
|
||||||
<div class="flex items-center gap-1.5">
|
<div class="flex items-center gap-1.5">
|
||||||
<Badge :variant="store.snapshot?.isAdmin ? 'default' : 'outline'" :class="store.snapshot?.isAdmin ? 'bg-emerald-500 hover:bg-emerald-500' : ''">
|
<Badge :variant="store.snapshot?.isAdmin ? 'default' : 'outline'" :class="store.snapshot?.isAdmin ? 'bg-success hover:bg-success' : ''">
|
||||||
{{ store.snapshot?.isAdmin ? '管理员' : '普通' }}
|
{{ store.snapshot?.isAdmin ? '管理员' : '普通' }}
|
||||||
</Badge>
|
</Badge>
|
||||||
<Badge v-if="store.status?.thingElevated" variant="outline" class="border-emerald-500/50 text-emerald-600 dark:text-emerald-400">
|
<Badge v-if="store.status?.thingElevated" variant="outline" class="border-success/50 text-success-text">
|
||||||
<ShieldCheck class="size-2.5 mr-0.5" />提权
|
<ShieldCheck class="size-2.5 mr-0.5" />提权
|
||||||
</Badge>
|
</Badge>
|
||||||
</div>
|
</div>
|
||||||
@@ -2363,13 +2414,13 @@ watch(() => store.status?.ready, (ready, prev) => {
|
|||||||
<!-- 提权说明 -->
|
<!-- 提权说明 -->
|
||||||
<div class="space-y-2">
|
<div class="space-y-2">
|
||||||
<div class="flex items-start gap-2">
|
<div class="flex items-start gap-2">
|
||||||
<ShieldCheck class="size-3.5 mt-0.5 shrink-0 text-emerald-500" />
|
<ShieldCheck class="size-3.5 mt-0.5 shrink-0 text-success" />
|
||||||
<div class="text-xs">
|
<div class="text-xs">
|
||||||
<span class="font-medium text-foreground">提权</span>：以管理员权限重启 Thing 自身，ThingHK 子进程继承权限。标志持久化，后续每次启动自动触发 UAC；可在概览页点击"取消提权"关闭。ThingHK 崩溃由 ProcessManager 自动重启，避免数据停止后 Thing 不感知。
|
<span class="font-medium text-foreground">提权</span>：以管理员权限重启 Thing 自身，ThingHK 子进程继承权限。标志持久化，后续每次启动自动触发 UAC；可在概览页点击"取消提权"关闭。ThingHK 崩溃由 ProcessManager 自动重启，避免数据停止后 Thing 不感知。
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<p v-if="store.status?.thingElevated" class="text-xs leading-relaxed text-emerald-600 dark:text-emerald-400 flex items-start gap-1.5">
|
<p v-if="store.status?.thingElevated" class="text-xs leading-relaxed text-success-text flex items-start gap-1.5">
|
||||||
<ShieldCheck class="size-3.5 mt-0.5 shrink-0" />
|
<ShieldCheck class="size-3.5 mt-0.5 shrink-0" />
|
||||||
<span>提权模式：Thing 与 ThingHK 均以管理员权限运行，ProcessManager 可直接 kill，崩溃自动重启可用。</span>
|
<span>提权模式：Thing 与 ThingHK 均以管理员权限运行，ProcessManager 可直接 kill，崩溃自动重启可用。</span>
|
||||||
</p>
|
</p>
|
||||||
@@ -2396,7 +2447,7 @@ watch(() => store.status?.ready, (ready, prev) => {
|
|||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</ScrollArea>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
</div>
|
</div>
|
||||||
@@ -2433,7 +2484,7 @@ watch(() => store.status?.ready, (ready, prev) => {
|
|||||||
<label :for="'hw-' + hw.key" class="text-sm cursor-pointer truncate">{{ hw.name }}</label>
|
<label :for="'hw-' + hw.key" class="text-sm cursor-pointer truncate">{{ hw.name }}</label>
|
||||||
<span v-if="hw.key === 'motherboard'" class="text-[10px] text-muted-foreground/60">含 SuperIO/EC（自动联动）</span>
|
<span v-if="hw.key === 'motherboard'" class="text-[10px] text-muted-foreground/60">含 SuperIO/EC（自动联动）</span>
|
||||||
</div>
|
</div>
|
||||||
<Badge v-if="hw.requiresAdmin" variant="outline" class="text-[10px] shrink-0 text-amber-600 border-amber-500/40">
|
<Badge v-if="hw.requiresAdmin" variant="outline" class="text-[10px] shrink-0 text-warning-text border-warning/40">
|
||||||
需管理员
|
需管理员
|
||||||
</Badge>
|
</Badge>
|
||||||
</div>
|
</div>
|
||||||
@@ -2478,7 +2529,7 @@ watch(() => store.status?.ready, (ready, prev) => {
|
|||||||
<DialogContent class="max-w-md">
|
<DialogContent class="max-w-md">
|
||||||
<DialogHeader>
|
<DialogHeader>
|
||||||
<DialogTitle class="flex items-center gap-2">
|
<DialogTitle class="flex items-center gap-2">
|
||||||
<TriangleAlert class="size-4 text-amber-500" />
|
<TriangleAlert class="size-4 text-warning" />
|
||||||
需先启动监控内核
|
需先启动监控内核
|
||||||
</DialogTitle>
|
</DialogTitle>
|
||||||
<DialogDescription>
|
<DialogDescription>
|
||||||
|
|||||||
@@ -325,7 +325,7 @@ const config = ref<OsdConfig | null>(null)
|
|||||||
/** 数据通道：显示项 key→value 映射（由主窗口每秒推送，替代全量快照） */
|
/** 数据通道：显示项 key→value 映射（由主窗口每秒推送，替代全量快照） */
|
||||||
const dataMap = ref<Record<string, number | null>>({})
|
const dataMap = ref<Record<string, number | null>>({})
|
||||||
const networkSpeed = ref<NetworkSpeed | null>(null)
|
const networkSpeed = ref<NetworkSpeed | null>(null)
|
||||||
let unlistenFns: UnlistenFn[] = []
|
const unlistenFns: UnlistenFn[] = []
|
||||||
|
|
||||||
// ===== 数据查询 =====
|
// ===== 数据查询 =====
|
||||||
function getOsdItemValue(item: OsdItem): number | null {
|
function getOsdItemValue(item: OsdItem): number | null {
|
||||||
|
|||||||
@@ -13,18 +13,18 @@ export function fmt(v: number | null, digits = 1): string {
|
|||||||
/** 温度颜色：绿(<50) → 黄(<70) → 橙(<85) → 红(>=85) */
|
/** 温度颜色：绿(<50) → 黄(<70) → 橙(<85) → 红(>=85) */
|
||||||
export function tempColor(t: number | null): string {
|
export function tempColor(t: number | null): string {
|
||||||
if (t == null) return 'text-muted-foreground'
|
if (t == null) return 'text-muted-foreground'
|
||||||
if (t < 50) return 'text-emerald-500'
|
if (t < 50) return 'text-success'
|
||||||
if (t < 70) return 'text-yellow-500'
|
if (t < 70) return 'text-warning'
|
||||||
if (t < 85) return 'text-orange-500'
|
if (t < 85) return 'text-warning'
|
||||||
return 'text-red-500'
|
return 'text-danger'
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 负载颜色：蓝(<50) → 紫(<80) → 红(>=80) */
|
/** 负载颜色：蓝(<50) → 紫(<80) → 红(>=80) */
|
||||||
export function loadColor(v: number | null): string {
|
export function loadColor(v: number | null): string {
|
||||||
if (v == null) return 'text-muted-foreground'
|
if (v == null) return 'text-muted-foreground'
|
||||||
if (v < 50) return 'text-sky-500'
|
if (v < 50) return 'text-info'
|
||||||
if (v < 80) return 'text-violet-500'
|
if (v < 80) return 'text-warning'
|
||||||
return 'text-red-500'
|
return 'text-danger'
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 格式化网速（bytes/s → 自适应 KB/s 或 MB/s） */
|
/** 格式化网速（bytes/s → 自适应 KB/s 或 MB/s） */
|
||||||
|
|||||||
@@ -107,5 +107,5 @@ export const moduleConfig: ModuleConfig = {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
order: 40
|
order: 60
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import {
|
|||||||
HardDriveDownload,
|
HardDriveDownload,
|
||||||
History,
|
History,
|
||||||
Info,
|
Info,
|
||||||
Library,
|
|
||||||
Link2,
|
Link2,
|
||||||
ListMusic,
|
ListMusic,
|
||||||
Loader2,
|
Loader2,
|
||||||
@@ -20,7 +19,6 @@ import {
|
|||||||
Plus,
|
Plus,
|
||||||
RotateCw,
|
RotateCw,
|
||||||
Search,
|
Search,
|
||||||
Settings as SettingsIcon,
|
|
||||||
Square,
|
Square,
|
||||||
Trash2,
|
Trash2,
|
||||||
Upload,
|
Upload,
|
||||||
@@ -61,7 +59,7 @@ import { Separator } from '@/components/ui/separator'
|
|||||||
import { Progress } from '@/components/ui/progress'
|
import { Progress } from '@/components/ui/progress'
|
||||||
import { ScrollArea } from '@/components/ui/scroll-area'
|
import { ScrollArea } from '@/components/ui/scroll-area'
|
||||||
import { Checkbox } from '@/components/ui/checkbox'
|
import { Checkbox } from '@/components/ui/checkbox'
|
||||||
import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs'
|
import { Tabs, TabsContent } from '@/components/ui/tabs'
|
||||||
import { Empty, EmptyDescription, EmptyMedia, EmptyTitle } from '@/components/ui/empty'
|
import { Empty, EmptyDescription, EmptyMedia, EmptyTitle } from '@/components/ui/empty'
|
||||||
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
|
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
|
||||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
|
||||||
@@ -75,11 +73,11 @@ const logger = createLogger('music')
|
|||||||
|
|
||||||
// ===== 模块导航 =====
|
// ===== 模块导航 =====
|
||||||
const activeTab = ref('mymusic')
|
const activeTab = ref('mymusic')
|
||||||
const tabsListRef = useModuleTabs('music', activeTab, [
|
useModuleTabs('music', activeTab, [
|
||||||
{ value: 'mymusic', label: '曲库' },
|
{ value: 'mymusic', label: '曲库' },
|
||||||
{ value: 'discover', label: '发现音乐' },
|
{ value: 'discover', label: '发现音乐' },
|
||||||
{ value: 'settings', label: '设置' }
|
{ value: 'settings', label: '设置' }
|
||||||
])
|
], { alwaysVisible: true })
|
||||||
|
|
||||||
// ===== 发现音乐：下载目标 =====
|
// ===== 发现音乐：下载目标 =====
|
||||||
const downloadTarget = ref<'local' | 'feiniu'>('local')
|
const downloadTarget = ref<'local' | 'feiniu'>('local')
|
||||||
@@ -540,7 +538,7 @@ const taskStatusInfo = (
|
|||||||
case 'cancelling':
|
case 'cancelling':
|
||||||
return { label: '取消中', variant: 'outline' }
|
return { label: '取消中', variant: 'outline' }
|
||||||
case 'done':
|
case 'done':
|
||||||
return { label: '完成', variant: 'outline', class: 'bg-emerald-500/15 text-emerald-700 border-emerald-500/30 dark:text-emerald-400' }
|
return { label: '完成', variant: 'outline', class: 'bg-success-soft text-success-text border-success/30' }
|
||||||
case 'error':
|
case 'error':
|
||||||
return { label: '出错', variant: 'destructive' }
|
return { label: '出错', variant: 'destructive' }
|
||||||
case 'cancelled':
|
case 'cancelled':
|
||||||
@@ -788,7 +786,7 @@ const envBadgeText = computed(() => {
|
|||||||
})
|
})
|
||||||
const envBadgeClass = computed(() =>
|
const envBadgeClass = computed(() =>
|
||||||
!store.envLoading && store.env?.musicdlOutdated
|
!store.envLoading && store.env?.musicdlOutdated
|
||||||
? 'border-amber-500/40 text-amber-700 dark:text-amber-400'
|
? 'border-warning/40 text-warning-text'
|
||||||
: ''
|
: ''
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -801,24 +799,15 @@ const RESULT_GRID = { gridTemplateColumns: '24px 36px minmax(0,1fr) 108px 52px 9
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="h-full p-6 overflow-hidden flex flex-col">
|
<div class="min-h-full p-5 flex flex-col">
|
||||||
<Tabs v-model="activeTab" class="min-h-0 flex-1 flex flex-col">
|
<Tabs v-model="activeTab" class="min-h-0 flex-1 flex flex-col">
|
||||||
<!-- ===== 模块导航（与其他模块保持一致的 Tabs 写法） ===== -->
|
|
||||||
<div ref="tabsListRef" class="shrink-0">
|
|
||||||
<TabsList class="grid w-full max-w-md grid-cols-3 !bg-transparent !p-0 !shadow-none">
|
|
||||||
<TabsTrigger value="mymusic" class="gap-1.5"><Library class="size-3.5" />曲库</TabsTrigger>
|
|
||||||
<TabsTrigger value="discover" class="gap-1.5"><Search class="size-3.5" />发现音乐</TabsTrigger>
|
|
||||||
<TabsTrigger value="settings" class="gap-1.5"><SettingsIcon class="size-3.5" />设置</TabsTrigger>
|
|
||||||
</TabsList>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- ===== 曲库 ===== -->
|
<!-- ===== 曲库 ===== -->
|
||||||
<TabsContent value="mymusic" class="mt-4 min-h-0 flex-1 tab-animate">
|
<TabsContent value="mymusic" class="min-h-0 flex-1 tab-animate">
|
||||||
<MyMusicLibrary />
|
<MyMusicLibrary />
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
<!-- ===== 发现音乐 ===== -->
|
<!-- ===== 发现音乐 ===== -->
|
||||||
<TabsContent value="discover" class="mt-4 min-h-0 flex-1 flex flex-col tab-animate">
|
<TabsContent value="discover" class="min-h-0 flex-1 flex flex-col tab-animate">
|
||||||
<!-- 工具栏：搜索主操作留在首行 -->
|
<!-- 工具栏：搜索主操作留在首行 -->
|
||||||
<header class="flex shrink-0 items-center gap-2 border-b pb-3">
|
<header class="flex shrink-0 items-center gap-2 border-b pb-3">
|
||||||
<div ref="searchBoxRef" class="relative min-w-0 flex-1 max-w-md" @focusin="historyOpen = true" @focusout="onHistoryFocusOut">
|
<div ref="searchBoxRef" class="relative min-w-0 flex-1 max-w-md" @focusin="historyOpen = true" @focusout="onHistoryFocusOut">
|
||||||
@@ -1089,7 +1078,7 @@ const RESULT_GRID = { gridTemplateColumns: '24px 36px minmax(0,1fr) 108px 52px 9
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 结果列表 -->
|
<!-- 结果列表 -->
|
||||||
<ScrollArea class="min-h-0 flex-1">
|
<div class="min-h-0 flex-1">
|
||||||
<div class="pb-4">
|
<div class="pb-4">
|
||||||
<div v-if="store.searching" class="space-y-1.5 pt-3">
|
<div v-if="store.searching" class="space-y-1.5 pt-3">
|
||||||
<div v-for="i in 8" :key="i" class="h-11 animate-pulse rounded-md bg-muted/40" />
|
<div v-for="i in 8" :key="i" class="h-11 animate-pulse rounded-md bg-muted/40" />
|
||||||
@@ -1271,13 +1260,13 @@ const RESULT_GRID = { gridTemplateColumns: '24px 36px minmax(0,1fr) 108px 52px 9
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
</ScrollArea>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
<!-- ===== 设置（与其他模块一致的 Card 卡片式布局） ===== -->
|
<!-- ===== 设置（与其他模块一致的 Card 卡片式布局） ===== -->
|
||||||
<TabsContent value="settings" class="mt-4 min-h-0 flex-1 tab-animate">
|
<TabsContent value="settings" class="min-h-0 flex-1 tab-animate">
|
||||||
<ScrollArea class="h-full pr-3">
|
<div>
|
||||||
<div class="flex max-w-2xl flex-col gap-4 pb-4">
|
<div class="flex flex-col gap-4 pb-4">
|
||||||
<!-- 连接 -->
|
<!-- 连接 -->
|
||||||
<Card>
|
<Card>
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
@@ -1679,7 +1668,7 @@ const RESULT_GRID = { gridTemplateColumns: '24px 36px minmax(0,1fr) 108px 52px 9
|
|||||||
"
|
"
|
||||||
:class="
|
:class="
|
||||||
!store.envLoading && store.env?.musicdlOutdated
|
!store.envLoading && store.env?.musicdlOutdated
|
||||||
? 'border-amber-500/40 text-amber-700 dark:text-amber-400'
|
? 'border-warning/40 text-warning-text'
|
||||||
: ''
|
: ''
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
@@ -1695,7 +1684,7 @@ const RESULT_GRID = { gridTemplateColumns: '24px 36px minmax(0,1fr) 108px 52px 9
|
|||||||
</Badge>
|
</Badge>
|
||||||
<span
|
<span
|
||||||
class="text-[12.5px] tabular-nums"
|
class="text-[12.5px] tabular-nums"
|
||||||
:class="!store.envLoading && store.env?.musicdlOutdated ? 'text-amber-700 dark:text-amber-400' : ''"
|
:class="!store.envLoading && store.env?.musicdlOutdated ? 'text-warning-text' : ''"
|
||||||
>
|
>
|
||||||
<template v-if="store.envLoading">探测中…</template>
|
<template v-if="store.envLoading">探测中…</template>
|
||||||
<template v-else-if="!store.env?.musicdlInstalled">—</template>
|
<template v-else-if="!store.env?.musicdlInstalled">—</template>
|
||||||
@@ -1798,7 +1787,7 @@ const RESULT_GRID = { gridTemplateColumns: '24px 36px minmax(0,1fr) 108px 52px 9
|
|||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</ScrollArea>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
|
|
||||||
|
|||||||
@@ -177,7 +177,7 @@ onMounted(() => store.refreshConnections())
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="flex shrink-0 items-center gap-1">
|
<div class="flex shrink-0 items-center gap-1">
|
||||||
<span v-if="c.loggedIn" class="mr-1 flex items-center gap-1 text-xs text-emerald-600">
|
<span v-if="c.loggedIn" class="mr-1 flex items-center gap-1 text-xs text-success-text">
|
||||||
<Check class="size-3.5" /> 已登录
|
<Check class="size-3.5" /> 已登录
|
||||||
</span>
|
</span>
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
@@ -43,6 +43,6 @@ export const moduleConfig: ModuleConfig = {
|
|||||||
.catch(() => {})
|
.catch(() => {})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 默认排在「代理」之后、整体第二位（proxy=10、clipboard=20）
|
// 默认第一位（音乐是常驻后台的播放器，入口最靠前）
|
||||||
order: 15
|
order: 10
|
||||||
}
|
}
|
||||||
|
|||||||
+316
-435
@@ -1,9 +1,9 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import {
|
import {
|
||||||
Globe, Play, Square, RotateCw, Power, Zap, Plus, RefreshCw, Trash2,
|
Play, Square, RotateCw, Zap, Plus, RefreshCw, Trash2,
|
||||||
Check, AlertCircle, Server, Settings as SettingsIcon, ListChecks,
|
Check, AlertCircle, Server, Settings as SettingsIcon,
|
||||||
Upload, Link2, Loader2, Download, Timer, Target, FolderOpen, Copy, DownloadCloud,
|
Upload, Link2, Loader2, Download, Target, FolderOpen, Copy, DownloadCloud,
|
||||||
Waypoints, ArrowDown, ArrowUp, Activity, X
|
Waypoints, X
|
||||||
} from '@lucide/vue'
|
} from '@lucide/vue'
|
||||||
import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
|
import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
|
||||||
import { toast } from 'vue-sonner'
|
import { toast } from 'vue-sonner'
|
||||||
@@ -21,8 +21,7 @@ import { Badge } from '@/components/ui/badge'
|
|||||||
import { Switch } from '@/components/ui/switch'
|
import { Switch } from '@/components/ui/switch'
|
||||||
import { Input } from '@/components/ui/input'
|
import { Input } from '@/components/ui/input'
|
||||||
import { Label } from '@/components/ui/label'
|
import { Label } from '@/components/ui/label'
|
||||||
import { Tabs, TabsList, TabsTrigger, TabsContent } from '@/components/ui/tabs'
|
import { Tabs, TabsContent } from '@/components/ui/tabs'
|
||||||
import { ScrollArea } from '@/components/ui/scroll-area'
|
|
||||||
import { Separator } from '@/components/ui/separator'
|
import { Separator } from '@/components/ui/separator'
|
||||||
import { Accordion, AccordionItem, AccordionTrigger, AccordionContent } from '@/components/ui/accordion'
|
import { Accordion, AccordionItem, AccordionTrigger, AccordionContent } from '@/components/ui/accordion'
|
||||||
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
|
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
|
||||||
@@ -33,6 +32,7 @@ import {
|
|||||||
AlertDialogContent, AlertDialogDescription, AlertDialogFooter,
|
AlertDialogContent, AlertDialogDescription, AlertDialogFooter,
|
||||||
AlertDialogHeader, AlertDialogTitle
|
AlertDialogHeader, AlertDialogTitle
|
||||||
} from '@/components/ui/alert-dialog'
|
} from '@/components/ui/alert-dialog'
|
||||||
|
import { InfoGroup, KeyValueRow, StatusBadge } from '@/components/common'
|
||||||
|
|
||||||
const store = useProxyStore()
|
const store = useProxyStore()
|
||||||
const logger = createLogger('proxy')
|
const logger = createLogger('proxy')
|
||||||
@@ -80,14 +80,19 @@ const onConfirmOpenChange = (open: boolean) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const activeTab = ref('overview')
|
const activeTab = ref('overview')
|
||||||
// 浮动标签切换器：注册到 TitleBar，滚动遮挡时自动显示
|
// 标签切换器注册到 TitleBar 且常驻 —— 模块内不再渲染 Tab 行，把纵向空间还给内容
|
||||||
const tabsListRef = useModuleTabs('proxy', activeTab, [
|
useModuleTabs(
|
||||||
{ value: 'overview', label: '概览' },
|
'proxy',
|
||||||
{ value: 'connections', label: '连接' },
|
activeTab,
|
||||||
{ value: 'proxies', label: '节点' },
|
[
|
||||||
{ value: 'profiles', label: '订阅' },
|
{ value: 'overview', label: '概览' },
|
||||||
{ value: 'settings', label: '设置' }
|
{ value: 'connections', label: '连接' },
|
||||||
])
|
{ value: 'proxies', label: '节点' },
|
||||||
|
{ value: 'profiles', label: '订阅' },
|
||||||
|
{ value: 'settings', label: '设置' }
|
||||||
|
],
|
||||||
|
{ alwaysVisible: true }
|
||||||
|
)
|
||||||
const starting = ref(false)
|
const starting = ref(false)
|
||||||
const stopping = ref(false)
|
const stopping = ref(false)
|
||||||
const restarting = ref(false)
|
const restarting = ref(false)
|
||||||
@@ -177,11 +182,6 @@ const scopeFilterOptions: { value: 'all' | ConnScope; label: string }[] = [
|
|||||||
{ value: 'direct', label: '国内' },
|
{ value: 'direct', label: '国内' },
|
||||||
{ value: 'proxy', label: '国外' }
|
{ value: 'proxy', label: '国外' }
|
||||||
]
|
]
|
||||||
/** 顶部下载/上传速率（复用实时流量快照的整体速率） */
|
|
||||||
const connTotalDownloadSec = computed(() => store.traffic?.downloadSpeed ?? 0)
|
|
||||||
const connTotalUploadSec = computed(() => store.traffic?.uploadSpeed ?? 0)
|
|
||||||
/** 命中规则总数 = 活跃连接数（每条连接命中一条规则） */
|
|
||||||
const ruleHitCount = computed(() => connList.value.length)
|
|
||||||
/** 按规则聚合当前连接，便于观察哪些规则被频繁命中 */
|
/** 按规则聚合当前连接，便于观察哪些规则被频繁命中 */
|
||||||
const ruleHits = computed(() => {
|
const ruleHits = computed(() => {
|
||||||
const map = new Map<string, number>()
|
const map = new Map<string, number>()
|
||||||
@@ -455,13 +455,14 @@ const openFolder = async () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 延迟 Badge 样式（超时用醒目红色）
|
// 延迟分级样式。四级全部落在规范语义色上，不再直接引 Tailwind 色阶：
|
||||||
|
// 快=成功 / 中=警告 / 慢=危险浅底 / 超时=危险实心（最醒目）
|
||||||
const delayBadgeClass = (delay: number | undefined) => {
|
const delayBadgeClass = (delay: number | undefined) => {
|
||||||
if (delay === undefined) return 'border-transparent bg-muted text-muted-foreground'
|
if (delay === undefined) return 'border-transparent bg-neutral-soft text-neutral-text'
|
||||||
if (delay === 0) return 'border-transparent bg-red-500 text-white'
|
if (delay === 0) return 'border-transparent bg-danger text-white'
|
||||||
if (delay < 150) return 'border-transparent bg-emerald-100 text-emerald-700'
|
if (delay < 150) return 'border-transparent bg-success-soft text-success-text'
|
||||||
if (delay < 400) return 'border-transparent bg-amber-100 text-amber-700'
|
if (delay < 400) return 'border-transparent bg-warning-soft text-warning-text'
|
||||||
return 'border-transparent bg-orange-100 text-orange-700'
|
return 'border-transparent bg-danger-soft text-danger-text'
|
||||||
}
|
}
|
||||||
|
|
||||||
const delayText = (delay: number | undefined) => {
|
const delayText = (delay: number | undefined) => {
|
||||||
@@ -562,12 +563,24 @@ watch(running, async (val, old) => {
|
|||||||
await store.waitForApi()
|
await store.waitForApi()
|
||||||
await store.refreshVersion()
|
await store.refreshVersion()
|
||||||
await loadProxiesWithError()
|
await loadProxiesWithError()
|
||||||
|
// 进程刚起来时如果用户就停在连接页，立刻补一次：否则要等下一轮 3s 轮询，
|
||||||
|
// 而 mihomo 起来后的头几秒 API 往往还没热身，轮询会连续失败（见 connTimer）
|
||||||
|
if (activeTab.value === 'connections') await store.refreshConnections()
|
||||||
|
}
|
||||||
|
if (!val && old) {
|
||||||
|
// 进程已停：清掉上一轮快照，否则连接页会一直列着那个已经结束的进程的连接
|
||||||
|
store.connections = null
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
// 切换到节点 Tab 时，加载节点列表并自动测速（10s 节流：快速切换 Tab 时避免重复 IPC 洪峰）
|
// 切换到节点 Tab 时，加载节点列表并自动测速（10s 节流：快速切换 Tab 时避免重复 IPC 洪峰）
|
||||||
let lastAutoTestAt = 0
|
let lastAutoTestAt = 0
|
||||||
watch(activeTab, async (tab) => {
|
watch(activeTab, async (tab) => {
|
||||||
|
// 连接页：进入即拉，不等 3s 轮询 —— 轮询只在停留期间跑，首次进入的空窗期
|
||||||
|
// 会让用户以为「没有连接」（实际是还没查过）
|
||||||
|
if (tab === 'connections' && running.value) {
|
||||||
|
await store.refreshConnections()
|
||||||
|
}
|
||||||
if (tab === 'proxies' && running.value) {
|
if (tab === 'proxies' && running.value) {
|
||||||
if (!Object.keys(store.proxies).length) {
|
if (!Object.keys(store.proxies).length) {
|
||||||
await loadProxiesWithError()
|
await loadProxiesWithError()
|
||||||
@@ -640,6 +653,9 @@ const onToggleSystemProxy = async (on: boolean) => {
|
|||||||
sysProxyLoading.value = true
|
sysProxyLoading.value = true
|
||||||
try {
|
try {
|
||||||
await store.toggleSystemProxy(on)
|
await store.toggleSystemProxy(on)
|
||||||
|
// 开启系统代理是「流量开始经过 mihomo」的时刻，立即拉一次连接快照：
|
||||||
|
// 用户多半接着就去连接页看效果，不该在那里等轮询（也不该看到上一轮的空结果）
|
||||||
|
if (on) await store.refreshConnections()
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
toast.error('操作失败', { description: String(e) })
|
toast.error('操作失败', { description: String(e) })
|
||||||
} finally {
|
} finally {
|
||||||
@@ -777,9 +793,9 @@ const installStageText = computed(() => {
|
|||||||
|
|
||||||
const installStageColor = computed(() => {
|
const installStageColor = computed(() => {
|
||||||
const stage = store.installProgress?.stage
|
const stage = store.installProgress?.stage
|
||||||
if (stage === 'done') return 'text-emerald-500'
|
if (stage === 'done') return 'text-success'
|
||||||
if (stage === 'error') return 'text-destructive'
|
if (stage === 'error') return 'text-danger'
|
||||||
if (stage === 'need_stop') return 'text-amber-500'
|
if (stage === 'need_stop') return 'text-warning'
|
||||||
return 'text-primary'
|
return 'text-primary'
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -1148,104 +1164,87 @@ watch(
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="h-full p-6">
|
<div class="min-h-full p-5">
|
||||||
<Tabs v-model="activeTab" class="h-full flex flex-col">
|
<Tabs v-model="activeTab" class="flex min-h-full w-full flex-col">
|
||||||
<div ref="tabsListRef">
|
|
||||||
<TabsList class="grid w-full grid-cols-5 max-w-md !bg-transparent !p-0 !shadow-none">
|
|
||||||
<TabsTrigger value="overview" class="gap-1.5"><Globe class="size-3.5" />概览</TabsTrigger>
|
|
||||||
<TabsTrigger value="connections" class="gap-1.5"><Waypoints class="size-3.5" />连接</TabsTrigger>
|
|
||||||
<TabsTrigger value="proxies" class="gap-1.5"><Server class="size-3.5" />节点</TabsTrigger>
|
|
||||||
<TabsTrigger value="profiles" class="gap-1.5"><ListChecks class="size-3.5" />订阅</TabsTrigger>
|
|
||||||
<TabsTrigger value="settings" class="gap-1.5"><SettingsIcon class="size-3.5" />设置</TabsTrigger>
|
|
||||||
</TabsList>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 概览 -->
|
<!-- 概览 -->
|
||||||
<TabsContent value="overview" class="flex-1 mt-4 tab-animate">
|
<TabsContent value="overview" class="tab-animate">
|
||||||
<ScrollArea class="h-full pr-3">
|
<div class="flex flex-col gap-4">
|
||||||
<div class="columns-1 md:columns-2 gap-4 [&>*]:mb-4 [&>*]:break-inside-avoid">
|
<!-- 状态横幅：状态区 → 指标区 → 操作区，一行常驻（UI_DESIGN_SYSTEM §3.4） -->
|
||||||
<!-- 实时流量 -->
|
<Card class="!py-0 !gap-0">
|
||||||
<Card>
|
<CardContent class="flex flex-wrap items-center gap-x-6 gap-y-3 px-4 py-4">
|
||||||
<CardHeader>
|
<div class="flex items-center gap-2.5">
|
||||||
<CardTitle class="flex items-center justify-between text-base">
|
<span v-if="!store.initialized" class="flex items-center gap-1.5 text-[13px] text-muted-foreground">
|
||||||
<span class="flex items-center gap-2"><Activity class="size-4 text-primary" />实时流量</span>
|
<Loader2 class="size-3.5 animate-spin" />加载中
|
||||||
<Badge v-if="running" variant="outline" class="gap-1 text-xs">
|
</span>
|
||||||
<span class="size-1.5 rounded-full bg-emerald-500" />实时更新
|
<template v-else>
|
||||||
</Badge>
|
<span v-if="running" class="flex items-center gap-1.5 text-[13px] text-success">
|
||||||
</CardTitle>
|
<span class="size-2 rounded-full bg-success status-dot-pulse" />运行中
|
||||||
</CardHeader>
|
</span>
|
||||||
<CardContent class="space-y-4 text-sm">
|
<span v-else class="flex items-center gap-1.5 text-[13px] text-muted-foreground">
|
||||||
<div class="grid grid-cols-2 gap-4">
|
<span class="size-2 rounded-full bg-muted-foreground" />已停止
|
||||||
<div>
|
</span>
|
||||||
<div class="flex items-center gap-1 text-muted-foreground text-xs mb-1">
|
</template>
|
||||||
<ArrowDown class="size-3.5 text-emerald-500" />下载
|
<span class="text-[13px] text-fg-secondary">mihomo</span>
|
||||||
</div>
|
</div>
|
||||||
<p class="text-lg font-semibold tabular-nums">{{ fmtSpeed(store.traffic?.downloadSpeed ?? 0) }}</p>
|
<div class="flex min-w-20 flex-col gap-0.5">
|
||||||
<p class="text-xs text-muted-foreground tabular-nums">累计 {{ store.traffic ? fmtBytes(store.traffic.downloadTotal) : '--' }}</p>
|
<span class="text-[11px] text-muted-foreground">内核</span>
|
||||||
|
<span
|
||||||
|
class="text-lg font-semibold tabular-nums"
|
||||||
|
:class="store.kernel?.exists ? 'text-foreground' : 'text-danger'"
|
||||||
|
>{{ store.kernel?.exists ? versionShort : '未安装' }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="flex flex-wrap items-center gap-6">
|
||||||
|
<div class="flex min-w-24 flex-col gap-0.5">
|
||||||
|
<span class="text-[11px] text-muted-foreground">下载</span>
|
||||||
|
<span class="text-lg font-semibold tabular-nums text-data-down">{{ fmtSpeed(store.traffic?.downloadSpeed ?? 0) }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div class="flex min-w-24 flex-col gap-0.5">
|
||||||
<div class="flex items-center gap-1 text-muted-foreground text-xs mb-1">
|
<span class="text-[11px] text-muted-foreground">上传</span>
|
||||||
<ArrowUp class="size-3.5 text-rose-500" />上传
|
<span class="text-lg font-semibold tabular-nums text-data-up">{{ fmtSpeed(store.traffic?.uploadSpeed ?? 0) }}</span>
|
||||||
</div>
|
</div>
|
||||||
<p class="text-lg font-semibold tabular-nums">{{ fmtSpeed(store.traffic?.uploadSpeed ?? 0) }}</p>
|
<div class="flex min-w-20 flex-col gap-0.5">
|
||||||
<p class="text-xs text-muted-foreground tabular-nums">累计 {{ store.traffic ? fmtBytes(store.traffic.uploadTotal) : '--' }}</p>
|
<span class="text-[11px] text-muted-foreground">累计流量</span>
|
||||||
|
<span class="text-lg font-semibold tabular-nums text-foreground">{{ store.traffic ? fmtBytes((store.traffic.downloadTotal ?? 0) + (store.traffic.uploadTotal ?? 0)) : '—' }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="flex min-w-12 flex-col gap-0.5">
|
||||||
|
<span class="text-[11px] text-muted-foreground">活跃连接</span>
|
||||||
|
<span class="text-lg font-semibold tabular-nums text-foreground">{{ store.traffic?.activeConnections ?? '—' }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<Separator />
|
<div class="ml-auto flex gap-2">
|
||||||
<div class="flex items-center justify-between">
|
<Button v-if="!running" size="sm" :disabled="starting" @click="handleStart">
|
||||||
<span class="flex items-center gap-1.5 text-muted-foreground">
|
<Loader2 v-if="starting" class="size-3.5 animate-spin" />
|
||||||
<Waypoints class="size-3.5" />活跃连接
|
<Play v-else class="size-3.5" />启动
|
||||||
</span>
|
</Button>
|
||||||
<span class="font-semibold tabular-nums">{{ store.traffic?.activeConnections ?? '--' }}</span>
|
<template v-else>
|
||||||
|
<Button size="sm" variant="outline" :disabled="restarting" @click="handleRestart">
|
||||||
|
<Loader2 v-if="restarting" class="size-3.5 animate-spin" />
|
||||||
|
<RotateCw v-else class="size-3.5" />重启
|
||||||
|
</Button>
|
||||||
|
<Button size="sm" variant="destructive" :disabled="stopping" @click="handleStop">
|
||||||
|
<Loader2 v-if="stopping" class="size-3.5 animate-spin" />
|
||||||
|
<Square v-else class="size-3.5" />停止
|
||||||
|
</Button>
|
||||||
|
</template>
|
||||||
</div>
|
</div>
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
|
<div class="columns-1 gap-4 md:columns-2 [&>*]:mb-4 [&>*:last-child]:mb-0 [&>*]:break-inside-avoid">
|
||||||
<!-- 内核状态 -->
|
<!-- 内核状态 -->
|
||||||
<Card>
|
<InfoGroup variant="card" title="内核">
|
||||||
<CardHeader>
|
<template #action>
|
||||||
<CardTitle class="flex items-center justify-between text-base">
|
<Button
|
||||||
<span class="flex items-center gap-2"><Server class="size-4 text-primary" />内核</span>
|
v-if="store.kernel?.exists"
|
||||||
<Button
|
size="xs" variant="outline"
|
||||||
v-if="store.kernel?.exists"
|
:disabled="checkingUpdate"
|
||||||
size="xs" variant="outline"
|
@click="handleCheckUpdate"
|
||||||
:disabled="checkingUpdate"
|
>
|
||||||
@click="handleCheckUpdate"
|
<Loader2 v-if="checkingUpdate" class="size-3 animate-spin" />
|
||||||
>
|
<Download v-else key="icon-download" class="size-3" />检查更新
|
||||||
<Loader2 v-if="checkingUpdate" class="size-3 animate-spin" />
|
</Button>
|
||||||
<Download v-else key="icon-download" class="size-3" />检查更新
|
</template>
|
||||||
</Button>
|
<KeyValueRow v-if="kernelUpdateInfo" label="最新版本">
|
||||||
</CardTitle>
|
|
||||||
</CardHeader>
|
|
||||||
<CardContent class="space-y-3 text-sm">
|
|
||||||
<div class="flex items-center justify-between">
|
|
||||||
<span class="text-muted-foreground">状态</span>
|
|
||||||
<template v-if="!store.initialized">
|
|
||||||
<span class="flex items-center gap-1.5 text-xs text-muted-foreground">
|
|
||||||
<Loader2 class="size-3 animate-spin" />加载中...
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
<Badge v-if="store.kernel?.exists" variant="default" class="gap-1 bg-emerald-500 hover:bg-emerald-500">
|
|
||||||
<Check class="size-3" />已安装
|
|
||||||
</Badge>
|
|
||||||
<Badge v-else variant="destructive" class="gap-1">
|
|
||||||
<AlertCircle class="size-3" />未安装
|
|
||||||
</Badge>
|
|
||||||
</template>
|
|
||||||
</div>
|
|
||||||
<div v-if="store.kernel?.exists" class="flex items-center justify-between">
|
|
||||||
<span class="text-muted-foreground">当前版本</span>
|
|
||||||
<Tooltip>
|
|
||||||
<TooltipTrigger as-child>
|
|
||||||
<Badge variant="secondary" class="font-mono text-xs cursor-default">
|
|
||||||
{{ versionShort }}
|
|
||||||
</Badge>
|
|
||||||
</TooltipTrigger>
|
|
||||||
<TooltipContent>{{ store.kernel?.version ?? '' }}</TooltipContent>
|
|
||||||
</Tooltip>
|
|
||||||
</div>
|
|
||||||
<div v-if="kernelUpdateInfo" class="flex items-center justify-between">
|
|
||||||
<span class="text-muted-foreground">最新版本</span>
|
|
||||||
<span class="font-mono text-xs flex items-center gap-2">
|
<span class="font-mono text-xs flex items-center gap-2">
|
||||||
{{ kernelUpdateInfo.latestVersion }}
|
{{ kernelUpdateInfo.latestVersion }}
|
||||||
<Button
|
<Button
|
||||||
@@ -1257,12 +1256,11 @@ watch(
|
|||||||
>
|
>
|
||||||
<Download key="icon-download" class="size-3" />更新
|
<Download key="icon-download" class="size-3" />更新
|
||||||
</Button>
|
</Button>
|
||||||
<Check v-else key="icon-updated" class="size-3 text-emerald-500" />
|
<Check v-else key="icon-updated" class="size-3 text-success" />
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</KeyValueRow>
|
||||||
<div class="flex items-center justify-between gap-3">
|
<KeyValueRow label="路径">
|
||||||
<span class="text-muted-foreground shrink-0">路径</span>
|
<span class="flex min-w-0 items-center gap-1.5">
|
||||||
<div class="flex items-center gap-1.5 min-w-0">
|
|
||||||
<Tooltip>
|
<Tooltip>
|
||||||
<TooltipTrigger as-child>
|
<TooltipTrigger as-child>
|
||||||
<span class="font-mono text-xs text-right truncate cursor-default">{{ pathDisplay || pathShort }}</span>
|
<span class="font-mono text-xs text-right truncate cursor-default">{{ pathDisplay || pathShort }}</span>
|
||||||
@@ -1287,8 +1285,11 @@ watch(
|
|||||||
<TooltipContent>在文件夹中显示</TooltipContent>
|
<TooltipContent>在文件夹中显示</TooltipContent>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</span>
|
||||||
</div>
|
</KeyValueRow>
|
||||||
|
<KeyValueRow label="PID" :value="store.status.pid ?? '—'" mono />
|
||||||
|
<KeyValueRow label="API 版本" :value="store.version || '—'" mono />
|
||||||
|
<KeyValueRow label="重启次数" :value="store.status.restartCount" mono />
|
||||||
|
|
||||||
<!-- 更新内核区块：检查到更新且用户点击"更新"后展开（复用首次安装的下载源选择 UI） -->
|
<!-- 更新内核区块：检查到更新且用户点击"更新"后展开（复用首次安装的下载源选择 UI） -->
|
||||||
<div
|
<div
|
||||||
@@ -1448,274 +1449,150 @@ watch(
|
|||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</CardContent>
|
</InfoGroup>
|
||||||
</Card>
|
|
||||||
|
|
||||||
<!-- 运行状态 -->
|
|
||||||
<Card>
|
|
||||||
<CardHeader>
|
|
||||||
<CardTitle class="flex items-center gap-2 text-base">
|
|
||||||
<Zap class="size-4 text-primary" />运行状态
|
|
||||||
</CardTitle>
|
|
||||||
</CardHeader>
|
|
||||||
<CardContent class="space-y-3 text-sm">
|
|
||||||
<div class="flex items-center justify-between">
|
|
||||||
<span class="text-muted-foreground">mihomo</span>
|
|
||||||
<template v-if="!store.initialized">
|
|
||||||
<span class="flex items-center gap-1.5 text-xs text-muted-foreground">
|
|
||||||
<Loader2 class="size-3 animate-spin" />加载中...
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
<template v-else>
|
|
||||||
<span v-if="running" class="flex items-center gap-1 text-emerald-500">
|
|
||||||
<span class="size-2 rounded-full bg-emerald-500" />运行中
|
|
||||||
</span>
|
|
||||||
<span v-else class="flex items-center gap-1 text-muted-foreground">
|
|
||||||
<span class="size-2 rounded-full bg-muted-foreground" />已停止
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
</div>
|
|
||||||
<div class="flex items-center justify-between">
|
|
||||||
<span class="text-muted-foreground">PID</span>
|
|
||||||
<span class="font-mono text-xs">{{ store.status.pid ?? '—' }}</span>
|
|
||||||
</div>
|
|
||||||
<div class="flex items-center justify-between">
|
|
||||||
<span class="text-muted-foreground">API 版本</span>
|
|
||||||
<span class="font-mono text-xs">{{ store.version || '—' }}</span>
|
|
||||||
</div>
|
|
||||||
<div class="flex items-center justify-between">
|
|
||||||
<span class="text-muted-foreground">重启次数</span>
|
|
||||||
<span class="font-mono text-xs">{{ store.status.restartCount }}</span>
|
|
||||||
</div>
|
|
||||||
<Separator />
|
|
||||||
<div class="flex gap-2">
|
|
||||||
<Button v-if="!running" key="btn-start" size="sm" :disabled="starting" @click="handleStart">
|
|
||||||
<Loader2 v-if="starting" key="starting-loading" class="size-3.5 animate-spin" />
|
|
||||||
<Play v-else key="starting-icon" class="size-3.5" />启动
|
|
||||||
</Button>
|
|
||||||
<template v-else key="btn-stop-group">
|
|
||||||
<Button size="sm" variant="destructive" :disabled="stopping" @click="handleStop">
|
|
||||||
<Loader2 v-if="stopping" key="stopping-loading" class="size-3.5 animate-spin" />
|
|
||||||
<Square v-else key="stopping-icon" class="size-3.5" />停止
|
|
||||||
</Button>
|
|
||||||
<Button size="sm" variant="outline" :disabled="restarting" @click="handleRestart">
|
|
||||||
<Loader2 v-if="restarting" key="restarting-loading" class="size-3.5 animate-spin" />
|
|
||||||
<RotateCw v-else key="restarting-icon" class="size-3.5" />重启
|
|
||||||
</Button>
|
|
||||||
</template>
|
|
||||||
</div>
|
|
||||||
</CardContent>
|
|
||||||
</Card>
|
|
||||||
|
|
||||||
<!-- 当前订阅 & 模式 -->
|
|
||||||
<Card>
|
|
||||||
<CardHeader>
|
|
||||||
<CardTitle class="flex items-center gap-2 text-base">
|
|
||||||
<ListChecks class="size-4 text-primary" />订阅与模式
|
|
||||||
</CardTitle>
|
|
||||||
</CardHeader>
|
|
||||||
<CardContent class="space-y-3 text-sm">
|
|
||||||
<div class="flex items-center justify-between gap-3">
|
|
||||||
<span class="text-muted-foreground shrink-0">当前订阅</span>
|
|
||||||
<span class="text-right truncate">{{ currentProfile?.name ?? '无' }}</span>
|
|
||||||
</div>
|
|
||||||
<Separator />
|
|
||||||
<div class="flex items-center justify-between">
|
|
||||||
<span class="text-muted-foreground">运行模式</span>
|
|
||||||
<div class="flex gap-1">
|
|
||||||
<Button
|
|
||||||
v-for="m in modeOptions" :key="m.value"
|
|
||||||
size="xs"
|
|
||||||
:variant="store.settings?.mode === m.value ? 'default' : 'outline'"
|
|
||||||
:disabled="!running && store.settings?.mode !== m.value"
|
|
||||||
@click="changeMode(m.value)"
|
|
||||||
>{{ m.label }}</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</CardContent>
|
|
||||||
</Card>
|
|
||||||
|
|
||||||
<!-- 当前节点 -->
|
<!-- 当前节点 -->
|
||||||
<Card>
|
<InfoGroup variant="card" title="当前节点">
|
||||||
<CardHeader>
|
<KeyValueRow label="代理组" :value="mainGroupName || '—'" />
|
||||||
<CardTitle class="flex items-center gap-2 text-base">
|
<KeyValueRow label="当前节点" :value="mainGroupNow || '—'" />
|
||||||
<Target class="size-4 text-primary" />当前节点
|
<KeyValueRow label="延迟">
|
||||||
</CardTitle>
|
<Badge v-if="mainGroupName" variant="outline" :class="delayBadgeClass(currentNodeDelay)">{{ delayText(currentNodeDelay) }}</Badge>
|
||||||
</CardHeader>
|
<span v-else class="text-[13px] text-muted-foreground">—</span>
|
||||||
<CardContent class="space-y-3 text-sm">
|
</KeyValueRow>
|
||||||
<template v-if="mainGroupName" key="has-main">
|
<template #footer>
|
||||||
<div class="flex items-center justify-between">
|
<div class="space-y-2">
|
||||||
<span class="text-muted-foreground">代理组</span>
|
<Label class="text-xs text-muted-foreground">快捷切换</Label>
|
||||||
<span class="font-medium">{{ mainGroupName }}</span>
|
<Select :disabled="!running || !mainGroupName" :model-value="mainGroupNow" @update:model-value="(v) => quickSwitchNode(String(v))">
|
||||||
</div>
|
<SelectTrigger class="w-full">
|
||||||
<div class="flex items-center justify-between gap-3">
|
<SelectValue :placeholder="mainGroupNow || '选择节点'" />
|
||||||
<span class="text-muted-foreground shrink-0">当前节点</span>
|
</SelectTrigger>
|
||||||
<span class="text-right truncate">{{ mainGroupNow || '—' }}</span>
|
<SelectContent>
|
||||||
</div>
|
<SelectItem v-for="node in mainGroupNodes" :key="node" :value="node">
|
||||||
<div class="flex items-center justify-between">
|
{{ node }}
|
||||||
<span class="text-muted-foreground">延迟</span>
|
</SelectItem>
|
||||||
<Badge variant="outline" :class="delayBadgeClass(currentNodeDelay)">{{ delayText(currentNodeDelay) }}</Badge>
|
</SelectContent>
|
||||||
</div>
|
</Select>
|
||||||
<Separator />
|
|
||||||
<div class="space-y-2">
|
|
||||||
<Label class="text-xs text-muted-foreground">快捷切换</Label>
|
|
||||||
<Select :model-value="mainGroupNow" @update:model-value="(v) => quickSwitchNode(String(v))">
|
|
||||||
<SelectTrigger class="w-full">
|
|
||||||
<SelectValue :placeholder="mainGroupNow || '选择节点'" />
|
|
||||||
</SelectTrigger>
|
|
||||||
<SelectContent>
|
|
||||||
<SelectItem v-for="node in mainGroupNodes" :key="node" :value="node">
|
|
||||||
{{ node }}
|
|
||||||
</SelectItem>
|
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
<div v-else key="no-main" class="text-center text-muted-foreground py-4 text-xs">
|
|
||||||
{{ running ? '暂无可选节点，请先导入订阅' : 'mihomo 未运行' }}
|
|
||||||
</div>
|
</div>
|
||||||
</CardContent>
|
</template>
|
||||||
</Card>
|
</InfoGroup>
|
||||||
|
|
||||||
<!-- 自动切换 -->
|
<!-- 订阅与代理 -->
|
||||||
<Card :class="{ 'opacity-60': !running && autoSwitchEnabled }">
|
<InfoGroup variant="card" title="订阅与代理">
|
||||||
<CardHeader>
|
<KeyValueRow label="当前订阅" :value="currentProfile?.name ?? '—'" />
|
||||||
<CardTitle class="flex items-center justify-between text-base">
|
<KeyValueRow label="运行模式">
|
||||||
<span class="flex items-center gap-2">
|
<div class="flex gap-1">
|
||||||
<Timer class="size-4 text-primary" />自动切换节点
|
<Button
|
||||||
|
v-for="m in modeOptions" :key="m.value"
|
||||||
|
size="xs"
|
||||||
|
:variant="store.settings?.mode === m.value ? 'default' : 'outline'"
|
||||||
|
:disabled="!running && store.settings?.mode !== m.value"
|
||||||
|
@click="changeMode(m.value)"
|
||||||
|
>{{ m.label }}</Button>
|
||||||
|
</div>
|
||||||
|
</KeyValueRow>
|
||||||
|
<KeyValueRow label="系统代理">
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<span class="text-[13px] text-muted-foreground">
|
||||||
|
{{ store.systemProxy ? `指向 127.0.0.1:${store.settings?.mixedPort ?? 7890}` : '已关闭' }}
|
||||||
</span>
|
</span>
|
||||||
<Switch
|
<Switch
|
||||||
:model-value="autoSwitchEnabled"
|
:model-value="store.systemProxy"
|
||||||
:disabled="!running"
|
:disabled="sysProxyLoading || !running"
|
||||||
@update:model-value="onToggleAutoSwitch"
|
@update:model-value="onToggleSystemProxy"
|
||||||
/>
|
/>
|
||||||
</CardTitle>
|
|
||||||
</CardHeader>
|
|
||||||
<CardContent class="space-y-3 text-sm" :class="{ 'pointer-events-none': !autoSwitchEnabled }">
|
|
||||||
<div class="grid grid-cols-3 gap-3">
|
|
||||||
<div class="grid gap-1.5">
|
|
||||||
<Label class="text-xs text-muted-foreground">目标代理组</Label>
|
|
||||||
<Select :model-value="autoSwitchTargetGroup || '__default__'" @update:model-value="(v) => { autoSwitchTargetGroup = v === '__default__' ? '' : String(v); saveAutoSwitchSettings() }">
|
|
||||||
<SelectTrigger class="w-full">
|
|
||||||
<SelectValue placeholder="主代理组" />
|
|
||||||
</SelectTrigger>
|
|
||||||
<SelectContent>
|
|
||||||
<SelectItem value="__default__">主代理组</SelectItem>
|
|
||||||
<SelectItem v-for="[gname] in selectorGroups" :key="gname" :value="gname">{{ gname }}</SelectItem>
|
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
</div>
|
|
||||||
<div class="grid gap-1.5">
|
|
||||||
<Label class="text-xs text-muted-foreground">测试间隔</Label>
|
|
||||||
<Select :model-value="autoSwitchInterval" @update:model-value="(v) => onAutoSwitchIntervalChange(v)">
|
|
||||||
<SelectTrigger class="w-full">
|
|
||||||
<SelectValue placeholder="选择间隔" />
|
|
||||||
</SelectTrigger>
|
|
||||||
<SelectContent>
|
|
||||||
<SelectItem :value="1">每 1 分钟</SelectItem>
|
|
||||||
<SelectItem :value="5">每 5 分钟</SelectItem>
|
|
||||||
<SelectItem :value="10">每 10 分钟</SelectItem>
|
|
||||||
<SelectItem :value="30">每 30 分钟</SelectItem>
|
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
</div>
|
|
||||||
<div class="grid gap-1.5">
|
|
||||||
<Label class="text-xs text-muted-foreground">地区筛选</Label>
|
|
||||||
<Select :model-value="autoSwitchRegion || '__all__'" @update:model-value="(v) => { autoSwitchRegion = v === '__all__' ? '' : String(v); saveAutoSwitchSettings() }">
|
|
||||||
<SelectTrigger class="w-full">
|
|
||||||
<SelectValue placeholder="全部地区" />
|
|
||||||
</SelectTrigger>
|
|
||||||
<SelectContent>
|
|
||||||
<SelectItem value="__all__">全部地区</SelectItem>
|
|
||||||
<SelectItem v-for="r in regionOptions" :key="r" :value="r">{{ r }}</SelectItem>
|
|
||||||
</SelectContent>
|
|
||||||
</Select>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<p class="text-xs text-muted-foreground leading-relaxed">
|
</KeyValueRow>
|
||||||
|
</InfoGroup>
|
||||||
|
|
||||||
|
<!-- 自动切换 -->
|
||||||
|
<InfoGroup variant="card" title="自动切换节点" :class="{ 'opacity-60': !running && autoSwitchEnabled }">
|
||||||
|
<template #action>
|
||||||
|
<Switch
|
||||||
|
:model-value="autoSwitchEnabled"
|
||||||
|
:disabled="!running"
|
||||||
|
@update:model-value="onToggleAutoSwitch"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
<div class="space-y-3" :class="{ 'pointer-events-none': !autoSwitchEnabled }">
|
||||||
|
<div class="grid gap-1.5">
|
||||||
|
<Label class="text-xs text-muted-foreground">目标代理组</Label>
|
||||||
|
<Select :model-value="autoSwitchTargetGroup || '__default__'" @update:model-value="(v) => { autoSwitchTargetGroup = v === '__default__' ? '' : String(v); saveAutoSwitchSettings() }">
|
||||||
|
<SelectTrigger size="sm" class="w-full">
|
||||||
|
<SelectValue placeholder="主代理组" />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="__default__">主代理组</SelectItem>
|
||||||
|
<SelectItem v-for="[gname] in selectorGroups" :key="gname" :value="gname">{{ gname }}</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
<div class="grid gap-1.5">
|
||||||
|
<Label class="text-xs text-muted-foreground">测试间隔</Label>
|
||||||
|
<Select :model-value="autoSwitchInterval" @update:model-value="(v) => onAutoSwitchIntervalChange(v)">
|
||||||
|
<SelectTrigger size="sm" class="w-full">
|
||||||
|
<SelectValue placeholder="选择间隔" />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem :value="1">每 1 分钟</SelectItem>
|
||||||
|
<SelectItem :value="5">每 5 分钟</SelectItem>
|
||||||
|
<SelectItem :value="10">每 10 分钟</SelectItem>
|
||||||
|
<SelectItem :value="30">每 30 分钟</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
<div class="grid gap-1.5">
|
||||||
|
<Label class="text-xs text-muted-foreground">地区筛选</Label>
|
||||||
|
<Select :model-value="autoSwitchRegion || '__all__'" @update:model-value="(v) => { autoSwitchRegion = v === '__all__' ? '' : String(v); saveAutoSwitchSettings() }">
|
||||||
|
<SelectTrigger size="sm" class="w-full">
|
||||||
|
<SelectValue placeholder="全部地区" />
|
||||||
|
</SelectTrigger>
|
||||||
|
<SelectContent>
|
||||||
|
<SelectItem value="__all__">全部地区</SelectItem>
|
||||||
|
<SelectItem v-for="r in regionOptions" :key="r" :value="r">{{ r }}</SelectItem>
|
||||||
|
</SelectContent>
|
||||||
|
</Select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<template #footer>
|
||||||
|
<p class="text-xs leading-relaxed text-muted-foreground">
|
||||||
定时测试「{{ autoSwitchTargetGroup || mainGroupName || '主代理组' }}」{{ autoSwitchRegion ? `中「${autoSwitchRegion}」地区` : '全部' }}有效节点的延迟，
|
定时测试「{{ autoSwitchTargetGroup || mainGroupName || '主代理组' }}」{{ autoSwitchRegion ? `中「${autoSwitchRegion}」地区` : '全部' }}有效节点的延迟，
|
||||||
自动切换至最优节点。当前 {{ filteredNodes.length }} 个节点在候选范围内。
|
自动切换至最优节点。当前 {{ filteredNodes.length }} 个节点在候选范围内。
|
||||||
</p>
|
</p>
|
||||||
</CardContent>
|
</template>
|
||||||
</Card>
|
</InfoGroup>
|
||||||
|
|
||||||
<!-- 系统代理 -->
|
</div>
|
||||||
<Card :class="{ 'opacity-60': sysProxyLoading }">
|
|
||||||
<CardHeader>
|
|
||||||
<CardTitle class="flex items-center gap-2 text-base">
|
|
||||||
<Power class="size-4 text-primary" />系统代理
|
|
||||||
</CardTitle>
|
|
||||||
</CardHeader>
|
|
||||||
<CardContent class="flex items-center justify-between">
|
|
||||||
<div class="space-y-1">
|
|
||||||
<p class="text-sm">Windows 系统代理</p>
|
|
||||||
<p class="text-xs text-muted-foreground">
|
|
||||||
{{ store.systemProxy ? `指向 127.0.0.1:${store.settings?.mixedPort ?? 7890}` : '已关闭' }}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<Switch
|
|
||||||
:model-value="store.systemProxy"
|
|
||||||
:disabled="sysProxyLoading || !running"
|
|
||||||
@update:model-value="onToggleSystemProxy"
|
|
||||||
/>
|
|
||||||
</CardContent>
|
|
||||||
</Card>
|
|
||||||
</div>
|
</div>
|
||||||
</ScrollArea>
|
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
<!-- 连接 -->
|
<!-- 连接 -->
|
||||||
<TabsContent value="connections" class="flex-1 mt-4 tab-animate">
|
<TabsContent value="connections" class="tab-animate">
|
||||||
<div v-if="!running" key="conn-not-running" class="h-full flex flex-col items-center justify-center text-muted-foreground gap-2 pt-10 pr-10">
|
<div class="flex min-h-full flex-col gap-4">
|
||||||
<Waypoints class="size-12 opacity-30" />
|
<!-- 指标行：与概览横幅同构；活跃连接后紧跟规则命中 chips，随内容向右延伸 -->
|
||||||
<p class="text-sm">mihomo 未运行，请先在概览页启动</p>
|
<Card class="!py-0 !gap-0">
|
||||||
</div>
|
<CardContent class="flex flex-wrap items-center gap-x-6 gap-y-3 px-4 py-4">
|
||||||
<div v-else class="h-full flex flex-col gap-4 pr-3">
|
<div class="flex min-w-12 flex-col gap-0.5">
|
||||||
<!-- 顶部统计 -->
|
<span class="text-[11px] text-muted-foreground">活跃连接</span>
|
||||||
<div class="grid grid-cols-2 md:grid-cols-4 gap-2">
|
<span class="text-lg font-semibold tabular-nums" :class="running ? 'text-foreground' : 'text-muted-foreground'">{{ connList.length }}</span>
|
||||||
<Card>
|
</div>
|
||||||
<CardContent class="py-3">
|
<!-- 规则命中：内联摘要（chips），紧挨活跃连接，命中项变化时向右延伸（超出后块内换行） -->
|
||||||
<div class="flex items-center gap-1.5 text-muted-foreground text-xs mb-1"><Waypoints class="size-3.5" />活跃连接</div>
|
<div class="flex min-w-0 flex-1 flex-wrap items-center gap-x-3 gap-y-1.5 text-xs">
|
||||||
<p class="text-xl font-semibold tabular-nums">{{ connList.length }}</p>
|
<span class="flex items-center gap-1.5 font-medium text-fg-secondary">
|
||||||
</CardContent>
|
<Target class="size-3.5" />规则命中
|
||||||
</Card>
|
</span>
|
||||||
<Card>
|
<template v-if="ruleHits.length">
|
||||||
<CardContent class="py-3">
|
<span
|
||||||
<div class="flex items-center gap-1.5 text-muted-foreground text-xs mb-1"><ArrowDown class="size-3.5 text-emerald-500" />下载速率</div>
|
v-for="r in ruleHits.slice(0, 6)"
|
||||||
<p class="text-xl font-semibold tabular-nums">{{ fmtSpeed(connTotalDownloadSec) }}</p>
|
:key="r.rule"
|
||||||
</CardContent>
|
class="flex items-center gap-1.5 rounded-sm bg-neutral-soft px-2 py-0.5 text-neutral-text"
|
||||||
</Card>
|
:title="ruleDesc(r.rule)"
|
||||||
<Card>
|
>
|
||||||
<CardContent class="py-3">
|
{{ translateRule(r.rule) }}
|
||||||
<div class="flex items-center gap-1.5 text-muted-foreground text-xs mb-1"><ArrowUp class="size-3.5 text-rose-500" />上传速率</div>
|
<span class="tabular-nums opacity-70">×{{ r.count }}</span>
|
||||||
<p class="text-xl font-semibold tabular-nums">{{ fmtSpeed(connTotalUploadSec) }}</p>
|
</span>
|
||||||
</CardContent>
|
</template>
|
||||||
</Card>
|
<span v-else class="text-muted-foreground">暂无连接</span>
|
||||||
<Card>
|
</div>
|
||||||
<CardContent class="py-3">
|
|
||||||
<div class="flex items-center gap-1.5 text-muted-foreground text-xs mb-1"><Target class="size-3.5" />命中规则</div>
|
|
||||||
<p class="text-xl font-semibold tabular-nums">{{ ruleHitCount }}</p>
|
|
||||||
</CardContent>
|
|
||||||
</Card>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 规则命中分布 -->
|
|
||||||
<Card>
|
|
||||||
<CardHeader class="pb-2">
|
|
||||||
<CardTitle class="text-sm flex items-center gap-2"><Target class="size-3.5 text-primary" />规则命中</CardTitle>
|
|
||||||
</CardHeader>
|
|
||||||
<CardContent class="pt-0">
|
|
||||||
<div v-if="!ruleHits.length" class="text-xs text-muted-foreground py-2">暂无连接</div>
|
|
||||||
<div v-else class="space-y-1.5">
|
|
||||||
<div v-for="r in ruleHits.slice(0, 6)" :key="r.rule" class="flex items-baseline gap-2 text-xs">
|
|
||||||
<span class="w-1.5 h-1.5 rounded-full bg-primary shrink-0 self-center" />
|
|
||||||
<span class="font-medium shrink-0">{{ translateRule(r.rule) }}</span>
|
|
||||||
<span class="flex-1 min-w-0 truncate text-muted-foreground">
|
|
||||||
<template v-if="ruleDesc(r.rule)">（{{ ruleDesc(r.rule) }}）</template>
|
|
||||||
</span>
|
|
||||||
<span class="shrink-0 tabular-nums">×{{ r.count }}</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
|
|
||||||
@@ -1725,7 +1602,7 @@ watch(
|
|||||||
<div class="flex items-center justify-between gap-3">
|
<div class="flex items-center justify-between gap-3">
|
||||||
<CardTitle class="text-sm flex items-center gap-2"><Waypoints class="size-3.5 text-primary" />当前连接</CardTitle>
|
<CardTitle class="text-sm flex items-center gap-2"><Waypoints class="size-3.5 text-primary" />当前连接</CardTitle>
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
<Input v-model="connFilter" placeholder="按进程/域名/规则过滤" class="h-8 w-56" />
|
<Input v-model="connFilter" placeholder="按进程/域名/规则过滤" class="h-8 w-56" :disabled="!running" />
|
||||||
<Button size="xs" variant="outline" :disabled="!connList.length" @click="closeAllConnections">
|
<Button size="xs" variant="outline" :disabled="!connList.length" @click="closeAllConnections">
|
||||||
<Square class="size-3" />断开全部
|
<Square class="size-3" />断开全部
|
||||||
</Button>
|
</Button>
|
||||||
@@ -1743,7 +1620,7 @@ watch(
|
|||||||
</div>
|
</div>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardContent class="flex-1 min-h-0 overflow-hidden pt-0">
|
<CardContent class="flex-1 min-h-0 overflow-hidden pt-0">
|
||||||
<ScrollArea class="h-full">
|
<div>
|
||||||
<table class="w-full text-xs">
|
<table class="w-full text-xs">
|
||||||
<thead class="sticky top-0 z-10 bg-card text-muted-foreground">
|
<thead class="sticky top-0 z-10 bg-card text-muted-foreground">
|
||||||
<tr class="border-b">
|
<tr class="border-b">
|
||||||
@@ -1756,21 +1633,18 @@ watch(
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr v-for="c in filteredConnections" :key="c.id" class="border-b last:border-0 hover:bg-muted/40">
|
<tr v-for="c in filteredConnections" :key="c.id" class="border-b last:border-0 hover:bg-hover">
|
||||||
<td class="py-2 px-2 align-baseline">
|
<td class="py-2 px-2 align-baseline">
|
||||||
<span class="font-medium truncate block max-w-[140px]">{{ connProcess(c) }}</span>
|
<span class="font-medium truncate block max-w-[140px]">{{ connProcess(c) }}</span>
|
||||||
<span class="text-muted-foreground">{{ connSource(c) }}</span>
|
<span class="text-muted-foreground">{{ connSource(c) }}</span>
|
||||||
</td>
|
</td>
|
||||||
<td class="py-2 px-2 align-baseline">
|
<td class="py-2 px-2 align-baseline">
|
||||||
<div class="flex items-center gap-1.5">
|
<div class="flex items-center gap-1.5">
|
||||||
<Badge
|
<StatusBadge
|
||||||
v-if="connScopeOf(c) === 'direct'"
|
v-if="connScopeOf(c) === 'direct'"
|
||||||
variant="outline" class="h-4 px-1.5 text-[10px] shrink-0 border-emerald-500 text-emerald-500"
|
variant="success" size="sm"
|
||||||
>国内</Badge>
|
>国内</StatusBadge>
|
||||||
<Badge
|
<StatusBadge v-else variant="info" size="sm">国外</StatusBadge>
|
||||||
v-else
|
|
||||||
variant="outline" class="h-4 px-1.5 text-[10px] shrink-0 border-sky-500 text-sky-500"
|
|
||||||
>国外</Badge>
|
|
||||||
<span class="truncate block max-w-[140px]">{{ connHost(c) }}</span>
|
<span class="truncate block max-w-[140px]">{{ connHost(c) }}</span>
|
||||||
</div>
|
</div>
|
||||||
<span class="text-muted-foreground">{{ c.metadata?.network }} / {{ c.metadata?.type }}</span>
|
<span class="text-muted-foreground">{{ c.metadata?.network }} / {{ c.metadata?.type }}</span>
|
||||||
@@ -1781,29 +1655,37 @@ watch(
|
|||||||
<td class="py-2 px-2 text-right tabular-nums align-baseline">{{ fmtBytes(c.download) }}</td>
|
<td class="py-2 px-2 text-right tabular-nums align-baseline">{{ fmtBytes(c.download) }}</td>
|
||||||
<td class="py-2 px-2 text-right tabular-nums align-baseline">{{ fmtBytes(c.upload) }}</td>
|
<td class="py-2 px-2 text-right tabular-nums align-baseline">{{ fmtBytes(c.upload) }}</td>
|
||||||
<td class="py-2 px-2 text-center align-baseline">
|
<td class="py-2 px-2 text-center align-baseline">
|
||||||
<Button size="icon" variant="ghost" class="size-6" title="断开连接" @click="store.closeConnection(c.id)">
|
<Button size="icon-sm" variant="ghost" title="断开连接" @click="store.closeConnection(c.id)">
|
||||||
<X class="size-3.5" />
|
<X class="size-3.5" />
|
||||||
</Button>
|
</Button>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<!--
|
||||||
|
空态分三种，别让用户把「还没查过」当成「没有连接」：
|
||||||
|
未运行 / 查询中（store.connections 仍为 null）/ 确实为空
|
||||||
|
-->
|
||||||
<tr v-if="!connList.length">
|
<tr v-if="!connList.length">
|
||||||
<td colspan="6" class="text-center text-muted-foreground py-8">暂无活跃连接</td>
|
<td colspan="6" class="text-center text-muted-foreground py-8">
|
||||||
|
{{
|
||||||
|
!running
|
||||||
|
? 'mihomo 未运行 — 启动后这里会显示经过代理的连接'
|
||||||
|
: store.connections === null
|
||||||
|
? '正在读取连接…'
|
||||||
|
: '暂无活跃连接'
|
||||||
|
}}
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</ScrollArea>
|
</div>
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
<!-- 节点 -->
|
<!-- 节点 -->
|
||||||
<TabsContent value="proxies" class="flex-1 mt-4 tab-animate">
|
<TabsContent value="proxies" class="tab-animate">
|
||||||
<div v-if="!running" key="not-running" class="h-full flex flex-col items-center justify-center text-muted-foreground gap-2 pt-10 pr-10">
|
<div>
|
||||||
<Server class="size-12 opacity-30" />
|
|
||||||
<p class="text-sm">mihomo 未运行，请先在概览页启动</p>
|
|
||||||
</div>
|
|
||||||
<ScrollArea v-else key="proxy-list" class="h-full pr-3">
|
|
||||||
<div class="flex items-center justify-between mb-3">
|
<div class="flex items-center justify-between mb-3">
|
||||||
<p v-if="!groups.length" class="text-sm text-muted-foreground">暂无代理组</p>
|
<p v-if="!groups.length" class="text-sm text-muted-foreground">暂无代理组</p>
|
||||||
<p v-else class="text-sm text-muted-foreground">{{ groups.length }} 个代理组</p>
|
<p v-else class="text-sm text-muted-foreground">{{ groups.length }} 个代理组</p>
|
||||||
@@ -1828,7 +1710,7 @@ watch(
|
|||||||
<AccordionTrigger class="px-4 py-2.5 hover:no-underline">
|
<AccordionTrigger class="px-4 py-2.5 hover:no-underline">
|
||||||
<div class="flex items-center justify-between w-full pr-2">
|
<div class="flex items-center justify-between w-full pr-2">
|
||||||
<span class="flex items-center gap-2">
|
<span class="flex items-center gap-2">
|
||||||
<Server class="size-4 text-primary" />
|
<Server class="size-4 text-fg-secondary" />
|
||||||
<span class="font-medium">{{ gname }}</span>
|
<span class="font-medium">{{ gname }}</span>
|
||||||
<span class="text-xs font-normal text-muted-foreground">{{ group.type }}</span>
|
<span class="text-xs font-normal text-muted-foreground">{{ group.type }}</span>
|
||||||
<span v-if="group.now" class="text-xs text-primary truncate max-w-32">{{ group.now }}</span>
|
<span v-if="group.now" class="text-xs text-primary truncate max-w-32">{{ group.now }}</span>
|
||||||
@@ -1851,8 +1733,8 @@ watch(
|
|||||||
<button
|
<button
|
||||||
v-for="node in group.all" :key="node"
|
v-for="node in group.all" :key="node"
|
||||||
type="button"
|
type="button"
|
||||||
class="flex items-center justify-between gap-2 rounded-md border px-2.5 py-1.5 text-xs transition-colors hover:bg-accent disabled:opacity-50 disabled:cursor-not-allowed"
|
class="flex items-center justify-between gap-2 rounded-md border px-2.5 py-1.5 text-xs transition-colors hover:bg-hover disabled:opacity-50 disabled:cursor-not-allowed"
|
||||||
:class="group.now === node ? 'border-primary bg-primary/10' : 'border-border'"
|
:class="group.now === node ? 'border-primary bg-primary-soft' : 'border-border'"
|
||||||
:disabled="group.type !== 'Selector'"
|
:disabled="group.type !== 'Selector'"
|
||||||
@click="selectNode(gname, node)"
|
@click="selectNode(gname, node)"
|
||||||
>
|
>
|
||||||
@@ -1866,13 +1748,13 @@ watch(
|
|||||||
</AccordionItem>
|
</AccordionItem>
|
||||||
</Card>
|
</Card>
|
||||||
</Accordion>
|
</Accordion>
|
||||||
</ScrollArea>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
<!-- 订阅 -->
|
<!-- 订阅 -->
|
||||||
<TabsContent value="profiles" class="flex-1 mt-4 tab-animate">
|
<TabsContent value="profiles" class="flex-1 min-h-0 tab-animate">
|
||||||
<ScrollArea class="h-full pr-3">
|
<div>
|
||||||
<div class="space-y-4 max-w-3xl">
|
<div class="space-y-4">
|
||||||
<Card>
|
<Card>
|
||||||
<CardHeader class="pb-3">
|
<CardHeader class="pb-3">
|
||||||
<CardTitle class="flex items-center gap-2 text-base">
|
<CardTitle class="flex items-center gap-2 text-base">
|
||||||
@@ -1907,7 +1789,7 @@ watch(
|
|||||||
<div
|
<div
|
||||||
v-for="p in store.settings.profiles" :key="p.id"
|
v-for="p in store.settings.profiles" :key="p.id"
|
||||||
class="flex items-center gap-3 rounded-md border p-3"
|
class="flex items-center gap-3 rounded-md border p-3"
|
||||||
:class="store.settings.currentProfile === p.id ? 'border-primary bg-primary/5' : 'border-border'"
|
:class="store.settings.currentProfile === p.id ? 'border-primary bg-primary-soft' : 'border-border'"
|
||||||
>
|
>
|
||||||
<div class="flex-1 min-w-0 space-y-1">
|
<div class="flex-1 min-w-0 space-y-1">
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
@@ -1953,13 +1835,13 @@ watch(
|
|||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
</div>
|
</div>
|
||||||
</ScrollArea>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
|
|
||||||
<!-- 设置 -->
|
<!-- 设置 -->
|
||||||
<TabsContent value="settings" class="flex-1 mt-4 tab-animate">
|
<TabsContent value="settings" class="tab-animate">
|
||||||
<ScrollArea class="h-full pr-3">
|
<div>
|
||||||
<Card class="max-w-2xl">
|
<Card>
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
<CardTitle class="flex items-center gap-2 text-base">
|
<CardTitle class="flex items-center gap-2 text-base">
|
||||||
<SettingsIcon class="size-4 text-primary" />基础设置
|
<SettingsIcon class="size-4 text-primary" />基础设置
|
||||||
@@ -1967,11 +1849,10 @@ watch(
|
|||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardContent class="space-y-4">
|
<CardContent class="space-y-4">
|
||||||
<!-- 说明文字（保存按钮已移至顶部标签栏） -->
|
<!-- 说明文字（保存按钮已移至顶部标签栏） -->
|
||||||
<p class="text-xs text-muted-foreground rounded-md border border-primary/30 bg-primary/5 p-3">
|
<p class="rounded-md border border-primary/30 bg-primary-soft p-3 text-xs text-primary-soft-text">
|
||||||
修改端口/接口/密钥/模式后需重启 mihomo 生效。DNS、规则等高级配置请直接编辑订阅文件。
|
修改端口/接口/密钥/模式后需重启 mihomo 生效。DNS、规则等高级配置请直接编辑订阅文件。
|
||||||
</p>
|
</p>
|
||||||
<Separator />
|
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||||
<div class="grid grid-cols-2 gap-4">
|
|
||||||
<div class="grid gap-2">
|
<div class="grid gap-2">
|
||||||
<Label for="mixed-port">混合代理端口</Label>
|
<Label for="mixed-port">混合代理端口</Label>
|
||||||
<Input id="mixed-port" v-model.number="localSettings.mixedPort" type="number" />
|
<Input id="mixed-port" v-model.number="localSettings.mixedPort" type="number" />
|
||||||
@@ -1985,29 +1866,7 @@ watch(
|
|||||||
<Label for="secret">API 密钥（留空则不鉴权）</Label>
|
<Label for="secret">API 密钥（留空则不鉴权）</Label>
|
||||||
<Input id="secret" v-model="localSettings.secret" placeholder="可选" />
|
<Input id="secret" v-model="localSettings.secret" placeholder="可选" />
|
||||||
</div>
|
</div>
|
||||||
<div class="flex items-center justify-between rounded-md border p-3">
|
<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
|
||||||
<div>
|
|
||||||
<p class="text-sm">允许局域网连接</p>
|
|
||||||
<p class="text-xs text-muted-foreground">允许其他设备通过本机代理上网</p>
|
|
||||||
</div>
|
|
||||||
<Switch v-model="localSettings.allowLan" />
|
|
||||||
</div>
|
|
||||||
<div class="flex items-center justify-between rounded-md border p-3">
|
|
||||||
<div>
|
|
||||||
<p class="text-sm">应用启动时自动启动 mihomo</p>
|
|
||||||
<p class="text-xs text-muted-foreground">软件启动时自动运行内核</p>
|
|
||||||
</div>
|
|
||||||
<Switch v-model="localSettings.autoStart" />
|
|
||||||
</div>
|
|
||||||
<div class="flex items-center justify-between rounded-md border p-3">
|
|
||||||
<div>
|
|
||||||
<p class="text-sm">启动时自动开启系统代理</p>
|
|
||||||
<p class="text-xs text-muted-foreground">mihomo 启动后自动设置 Windows 系统代理，退出时自动关闭</p>
|
|
||||||
</div>
|
|
||||||
<Switch v-model="localSettings.autoSystemProxy" />
|
|
||||||
</div>
|
|
||||||
<Separator />
|
|
||||||
<div class="grid grid-cols-2 gap-4">
|
|
||||||
<div class="grid gap-2">
|
<div class="grid gap-2">
|
||||||
<Label for="mode-select">运行模式</Label>
|
<Label for="mode-select">运行模式</Label>
|
||||||
<Select v-model="localSettings.mode">
|
<Select v-model="localSettings.mode">
|
||||||
@@ -2037,9 +1896,31 @@ watch(
|
|||||||
</Select>
|
</Select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<Separator />
|
||||||
|
<div class="flex items-center justify-between gap-4">
|
||||||
|
<div>
|
||||||
|
<p class="text-sm">允许局域网连接</p>
|
||||||
|
<p class="text-xs text-muted-foreground">允许其他设备通过本机代理上网</p>
|
||||||
|
</div>
|
||||||
|
<Switch v-model="localSettings.allowLan" />
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center justify-between gap-4">
|
||||||
|
<div>
|
||||||
|
<p class="text-sm">应用启动时自动启动 mihomo</p>
|
||||||
|
<p class="text-xs text-muted-foreground">软件启动时自动运行内核</p>
|
||||||
|
</div>
|
||||||
|
<Switch v-model="localSettings.autoStart" />
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center justify-between gap-4">
|
||||||
|
<div>
|
||||||
|
<p class="text-sm">启动时自动开启系统代理</p>
|
||||||
|
<p class="text-xs text-muted-foreground">mihomo 启动后自动设置 Windows 系统代理，退出时自动关闭</p>
|
||||||
|
</div>
|
||||||
|
<Switch v-model="localSettings.autoSystemProxy" />
|
||||||
|
</div>
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
</ScrollArea>
|
</div>
|
||||||
</TabsContent>
|
</TabsContent>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user