25 Commits
Author SHA1 Message Date
miaomiao 4c67bf269a chore: bump version 2.3.0 2026-08-10 19:44:21 +08:00
miaomiao ed40a040e3 feat: RainID 配置入后台站点设置(secret 双通道可写不可读)+ site_url 域名 2026-08-10 19:34:45 +08:00
miaomiao 4200826120 feat: RainID 单点登录接入(ROPC 密码登录 + 授权码 PKCE + 影子账号 + 注册跳转 + 登出联动) 2026-08-10 18:20:42 +08:00
miaomiao 6ce6438854 feat: 代理内网白名单(proxy_allowed_hosts CIDR)+ fix: Cloudflare 验证码首次加载卡死/登录注册失败后验证码状态重置 2026-08-09 03:48:19 +08:00
miaomiao 0def382511 chore: bump version 2.2.0 2026-08-08 16:50:15 +08:00
miaomiao 636d13407f chore: 终端前端入口临时下线归档(archive/,后端保留,后续恢复) 2026-08-08 16:31:04 +08:00
miaomiao f9abb877e7 fix: 面板id类型统一(重复标签/关不掉/星标/reload)+ 终端解锁白屏(dev WS代理+xterm守卫)+ 图标首字母降级 2026-08-08 16:19:40 +08:00
miaomiao c947e62364 fix: 右侧侧边栏程序化控制(setLayout 绕开 pivot 刚性邻居)+ 折叠箭头常驻可见 2026-08-08 04:57:20 +08:00
miaomiao ded6fdb753 fix: 右侧侧边栏打不开(RRP 亚像素卡死→状态阈值+resize 默认宽度)+ 折叠箭头显眼化 2026-08-08 04:29:54 +08:00
miaomiao 9c34374b95 feat: 工作区自动恢复(主区激活标签持久化)+ 侧边栏折叠箭头 + X 关闭整栏 2026-08-08 04:18:16 +08:00
miaomiao 8a3e213e40 fix: 工作台布局占满/侧边栏刷新空白/地址栏填满/Logo 加大(RRP block 容器+order 校验 bug) 2026-08-08 04:03:31 +08:00
miaomiao 2de07710da fix: 工作台布局高度修复(Fragment→Box 100vh flex column) 2026-08-08 03:51:45 +08:00
miaomiao e16130bf8f fix: 记事本 hook TDZ 白屏(saveContent 声明后移,依赖数组渲染期求值报错) 2026-08-08 03:30:29 +08:00
miaomiao 2b748fc48e fix: 工作台审计修复(终端流控/exit重生/无障碍/ARIA/cookie token/安全纵深)+ 前后端联调整合 2026-08-08 03:14:51 +08:00
miaomiao 717ebc44f4 feat: 工作台 VSCode 风格改造 + Web 终端(双侧栏/活动栏/xterm/dnd-kit/resizable-panels/终端 API) 2026-08-08 02:31:42 +08:00
miaomiao f2740afe50 fix: 密码箱弹窗改回前台 dialog-overlay 风格(深浅色适配,保留顶层渲染修复) 2026-08-08 00:36:08 +08:00
miaomiao d9d2ad3f7d fix: 密码箱设置 PIN 弹窗无反应(弹窗仅渲染于已解锁分支 → MUI Dialog 提升顶层渲染) 2026-08-07 23:27:49 +08:00
miaomiao 0ae8815f33 feat: 工作台记事本(浮窗↔固定侧边栏双形态/自动保存/文件管理器/实体文件存储)
- routes/notes.js CRUD + 文件名安全校验 + 实体 .txt 存储 workspace/
- NoteEditor 浮窗(可拖拽)↔固定(280px)切换,📌 工具栏入口
- 编辑器 900ms 防抖自动保存 + Ctrl+S + dirty 指示
- 文件管理器:新建/重命名/删除/空态/错误态
- server 挂载 /api/notes,gitignore workspace/
2026-08-07 22:38:10 +08:00
miaomiao 9400f76c7e fix: 工作台审查修复 - 短 TTL proxy token/沙箱剥离/加载提示/独立刷新/键盘导航/懒加载分包 2026-08-07 21:57:56 +08:00
miaomiao 03d5c97315 feat: 面板工作台模块(tools/workbench)- 浏览器式侧边栏/工具栏/iframe 管理/密码库抽屉
- Workbench 独立页(/admin/workbench,adminOnly 守卫,全屏布局,MUI 风格)
- 工具栏:历史栈/刷新/地址栏/搜索/添加/密码库/侧栏折叠/返回
- 侧边栏:分组+固定区+折叠+拖拽调宽+打开方式(内嵌/新标签/弹窗)
- PanelFrame:懒加载/保留切换/LRU(3)/15s 超时失败回退/proxy 模式
- VaultDrawer:PIN 解锁/搜索/详情复制/锁定(复用 passwords API)
- 后台顶栏「工作台」入口 + 路由注册;localStorage 持久化
2026-08-07 21:43:06 +08:00
miaomiao 2cb9592d56 v2.1.0: 版本号更新 2026-08-07 20:09:06 +08:00
miaomiao 8a08932d78 fix: 控件三态统一(forum-cat-item/chip/toggle 对齐 surface-container→surface-variant→primary-container 体系) 2026-08-07 20:04:44 +08:00
miaomiao b152a2a9c9 fix: 论坛分类按钮点击后深色背景丢失(基础态 surface-container 主题化底色) 2026-08-07 19:56:14 +08:00
miaomiao 4af71185d5 feat: Markdown Indigo 定制主题(文本级渲染/背景透明走磨砂玻璃/主题色变量/深浅色/okaidia 代码块) 2026-08-07 19:50:29 +08:00
miaomiao 6d60b10c14 fix: 论坛板块按钮深色模式白底(button UA 默认样清除,基础态透明) 2026-08-07 19:24:58 +08:00
50 changed files with 6567 additions and 121 deletions
+1
View File
@@ -8,3 +8,4 @@ server.pid
releases/ releases/
public/dist/ public/dist/
backups/ backups/
workspace/
+1 -1
View File
@@ -1 +1 @@
2.0.3 2.3.0
+23
View File
@@ -122,6 +122,20 @@ function initTables() {
db.exec(`CREATE TABLE IF NOT EXISTS site_settings ( db.exec(`CREATE TABLE IF NOT EXISTS site_settings (
key TEXT PRIMARY KEY, value TEXT DEFAULT '')`); key TEXT PRIMARY KEY, value TEXT DEFAULT '')`);
// 审计日志表(终端会话/密码失败等安全事件落库)
db.exec(`CREATE TABLE IF NOT EXISTS audit_logs (
id INTEGER PRIMARY KEY AUTOINCREMENT,
action TEXT NOT NULL,
user_id INTEGER DEFAULT 0,
username TEXT DEFAULT '',
detail TEXT DEFAULT '',
ip TEXT DEFAULT '',
created_at DATETIME DEFAULT (datetime('now')))`);
db.exec('CREATE INDEX IF NOT EXISTS idx_audit_logs_created ON audit_logs(created_at)');
// 审计保留策略:启动时惰性清理 90 天前的记录,防止无限增长
//(写入路径上 terminal.js 每 50 条也会触发一次同规则清理)
db.exec("DELETE FROM audit_logs WHERE created_at < datetime('now','-90 day')");
// Indexes for performance // Indexes for performance
db.exec('CREATE INDEX IF NOT EXISTS idx_blog_published ON blog_posts(published)'); db.exec('CREATE INDEX IF NOT EXISTS idx_blog_published ON blog_posts(published)');
db.exec('CREATE INDEX IF NOT EXISTS idx_blog_comments_post ON blog_comments(post_id)'); db.exec('CREATE INDEX IF NOT EXISTS idx_blog_comments_post ON blog_comments(post_id)');
@@ -154,6 +168,11 @@ function migrateSchema() {
try { db.exec("ALTER TABLE blog_comments ADD COLUMN status TEXT DEFAULT 'approved'"); } catch {} try { db.exec("ALTER TABLE blog_comments ADD COLUMN status TEXT DEFAULT 'approved'"); } catch {}
try { db.exec("CREATE TABLE IF NOT EXISTS post_likes (post_id INTEGER NOT NULL, user_id INTEGER NOT NULL, created_at DATETIME DEFAULT (datetime('now')), PRIMARY KEY (post_id, user_id))"); } catch {} try { db.exec("CREATE TABLE IF NOT EXISTS post_likes (post_id INTEGER NOT NULL, user_id INTEGER NOT NULL, created_at DATETIME DEFAULT (datetime('now')), PRIMARY KEY (post_id, user_id))"); } catch {}
} }, } },
// v3: RainID 单点登录——影子账号绑定键(sub)。部分唯一索引:空串(本地账号)不参与唯一约束
{ version: 3, up: () => {
try { db.exec("ALTER TABLE users ADD COLUMN rainid_user_id TEXT DEFAULT ''"); } catch {}
try { db.exec("CREATE UNIQUE INDEX IF NOT EXISTS idx_users_rainid ON users(rainid_user_id) WHERE rainid_user_id <> ''"); } catch {}
} },
]; ];
for (const m of migrations) { for (const m of migrations) {
if (current < m.version) { m.up(); db.exec('PRAGMA user_version = ' + m.version); } if (current < m.version) { m.up(); db.exec('PRAGMA user_version = ' + m.version); }
@@ -195,6 +214,10 @@ function seedDefaults() {
captcha_register: '0', captcha_register: '0',
captcha_forum: '0', captcha_forum: '0',
captcha_type: 'builtin', captcha_type: 'builtin',
rainid_enabled: '0',
rainid_client_id: '',
rainid_discovery_url: 'https://rainid.rainnya.asia/oauth',
rainid_register_redirect: '0',
site_favicon: 'data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>🌧</text></svg>', site_favicon: 'data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>🌧</text></svg>',
music_embed_enabled: '0', music_embed_enabled: '0',
music_embed_code: '', music_embed_code: '',
+83
View File
@@ -0,0 +1,83 @@
# 工作台模块项目计划(tools/workbench
> 独立完整项目流程:调研 ✓ → 设计规范 ✓ → 本计划 → 实现 → 审查 → 验证。
> 布局调研:lib-1VSCode 四层 / Dashy Workspace / Vivaldi Web Panels / Arc pinned / Homepage groups + iframe 技术建议)。
> 设计规范:frontend-pack/design skill8px 网格、语义色 token、层次/留白/焦点环/深浅色/加载空错误态)。
## 1. 模块定位
「面板工作台」:浏览器式多面板聚合界面(左侧侧边栏 + 顶部工具栏 + 右侧 iframe 内容区),叠加密码库快捷取用。仅管理员(adminOnly)可进入。
## 2. 技术方案
| 项 | 决定 |
|---|---|
| 风格 | **MUI**(与后台一致,MD3 主题复用 frontend/src/admin/theme.js |
| 路由 | 独立页面 `/workbench`React Router,挂管理后台路由树外或独立 BrowserRouter 区——用后台同一入口 admin 应用内加路由最简,basename /admin 下 `/admin/workbench`?——**决定:独立入口**(admin.html 已有),路由挂 `/admin/workbench`,与 Dashboard 等并列,顶栏入口按钮跳转;整页全屏布局不带 AdminLayout 侧栏(工作台自带侧边栏) |
| 代码位置 | `frontend/src/tools/workbench/`(独立工具区,页面+组件+密码库组件+工具函数全在这,方便后续升级) |
| 鉴权 | 入口守卫:无 token → 跳 /login.html;非 admin → 403 提示返回(复用后台守卫模式) |
| 数据 | admin_links API(复用 frontend/src/api/adminLinks.js+ passwords API(复用) |
| proxy | `/api/proxy/fetch?url=&token=`iframe query token,复用 Embed.jsx 的 needsProxy 逻辑) |
## 3. 文件结构
```
frontend/src/tools/workbench/
├── Workbench.jsx # 页面入口(路由挂载点 + 鉴权守卫 + 布局组装)
├── components/
│ ├── Toolbar.jsx # 顶部工具栏(◀▶↻ 地址栏 搜索 添加 密码库 侧栏开关 返回)
│ ├── Sidebar.jsx # 左侧边栏(固定区 + 分组列表 + 折叠 + 拖拽调宽可选)
│ ├── PanelFrame.jsx # iframe 内容区(加载态/超时/失败回退/LRU 保留)
│ ├── AddPanelDialog.jsx # 添加面板弹窗(URL/命名/分组/图标 + 打开方式)
│ └── VaultDrawer.jsx # 密码库抽屉(PIN 解锁/搜索/复制,MUI)
├── hooks/
│ ├── usePanels.js # 面板数据/打开集合/历史栈/持久化(localStorage)
│ └── useVault.js # 密码库解锁状态/条目加载(复用 passwords API
└── index.js # 模块导出(便于未来升级替换)
```
## 4. 功能清单
### 核心(必须)
- [ ] 鉴权守卫(adminOnly
- [ ] 工具栏:◀ 后退 / ▶ 前进(当前面板历史栈)、↻ 刷新、只读地址栏、🔍 搜索(面板名/URL/分组)、+添加、🔑 密码库、侧边栏折叠、返回前台
- [ ] 侧边栏:admin_links 按 category 分组 + 固定区(pin),点击切换,当前项左侧 2px primary 指示条 + surface-container 底(MUI 化:ListItemButton selected 态)
- [ ] iframe 区:懒加载(首次激活创建)、display:none 切换保留状态、**超时+load 双保险加载态**、失败(超时/空白启发式)显示「在新标签打开」回退按钮
- [ ] 打开方式:内嵌(默认)/ 新标签(target=_blank/ 弹窗(modal)——面板项右键或添加时选择,存面板设置
- [ ] 添加面板弹窗:URL + 标题 + 分组 + 图标(favicon 预览)+ 打开方式;保存到 admin_links(复用现有 API
- [ ] localStorage 持久化:打开面板集合、当前面板、历史栈、侧边栏折叠态
- [ ] 密码库抽屉:PIN 解锁(复用 /api/passwords/unlock,服务端会话互通)→ 条目列表(标题/用户名)+ 搜索 + 详情(密码明文)+ 一键复制(clipboard);未设 PIN 引导去 /passwords.html;只读取用不编辑
- [ ] 空态/加载态/错误态:无面板引导添加、加载骨架、加载失败重试
### 进阶(尽力)
- [ ] LRU iframe 保留(最多 3 个活跃,超出销毁最久未用,记录 URL 重建)
- [ ] 每面板定时刷新(可选 30s/5min/30min
- [ ] 侧边栏拖拽调宽 + 记忆
- [ ] 分组折叠状态持久化
## 5. 设计规范(design skill + 调研要点)
- 8px 网格间距;一屏内不超过 2 种圆角(MUI 默认 8px/20px pill
- 语义色 tokenMD3):工具栏/侧边栏 surface-container、选中 primary-container、hover surface-variant
- 选中态:左侧 2px primary 指示条(VSCode 模式)或 MUI selected 态,二选一统一
- 深色模式默认适配(后台已有 data-theme 机制)
- 焦点环(focus-visible)、语义 HTMLnav/main/aside/button)、触控目标 ≥40px
- 加载态用骨架/居中 spinner;空态带图标+CTA;错误态带重试
- iframe title 属性必须;allow 权限策略按面板
- 工具栏高度 48-56px、侧边栏默认 240px(可 180-360 拖拽)
## 6. 实施与质量流程
1. 派 designer 按本计划实现(一个会话,MUI + 复用后台主题/api)
2. ora 审查(鉴权/安全/iframe 处理/状态管理/无障碍)→ 修复
3. 验证:npm run build + 后台入口跳转 + admin 权限拦截 + 面板切换/proxy/密码库全链路冒烟
4. commit + 用户验收
## 7. 验收标准
- [ ] 非 admin 无法进入(无 token 跳登录、非 admin 403
- [ ] 面板分组/固定/切换/关闭/添加/持久化全部可用
- [ ] proxy 面板正常嵌入;X-Frame-Options 拒绝的面板有回退提示
- [ ] 密码库解锁→搜索→复制链路通(与服务端会话互通)
- [ ] 深浅色、320/768/1440 三档响应式正常
- [ ] build 通过、无 console 错误
+5
View File
@@ -15,6 +15,7 @@ import ListItemIcon from '@mui/material/ListItemIcon';
import ListItemText from '@mui/material/ListItemText'; import ListItemText from '@mui/material/ListItemText';
import MenuIcon from '@mui/icons-material/Menu'; import MenuIcon from '@mui/icons-material/Menu';
import HomeIcon from '@mui/icons-material/Home'; import HomeIcon from '@mui/icons-material/Home';
import GridViewIcon from '@mui/icons-material/GridView';
import LogoutIcon from '@mui/icons-material/Logout'; import LogoutIcon from '@mui/icons-material/Logout';
import DashboardIcon from '@mui/icons-material/Dashboard'; import DashboardIcon from '@mui/icons-material/Dashboard';
import SettingsIcon from '@mui/icons-material/Settings'; import SettingsIcon from '@mui/icons-material/Settings';
@@ -88,6 +89,10 @@ export default function AdminLayout() {
</IconButton> </IconButton>
)} )}
<Typography variant="h6" sx={{ flexGrow: 1 }}>管理后台</Typography> <Typography variant="h6" sx={{ flexGrow: 1 }}>管理后台</Typography>
<Button color="inherit" onClick={() => navigate('/workbench')} title="面板工作台" sx={{ minWidth: 0, px: { xs: 1, sm: 1.5 } }}>
<GridViewIcon sx={{ fontSize: 18, mr: { xs: 0, sm: 0.5 } }} />
<Box component="span" sx={{ display: { xs: 'none', sm: 'inline' } }}>工作台</Box>
</Button>
<Button color="inherit" href="/" title="返回前台"> <Button color="inherit" href="/" title="返回前台">
<HomeIcon sx={{ mr: 0.5, fontSize: 18 }} />返回前台 <HomeIcon sx={{ mr: 0.5, fontSize: 18 }} />返回前台
</Button> </Button>
+18 -1
View File
@@ -1,4 +1,4 @@
import React, { useEffect, useState } from 'react'; import React, { lazy, Suspense, useEffect, useState } from 'react';
import { createRoot } from 'react-dom/client'; import { createRoot } from 'react-dom/client';
import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom'; import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom';
import { ThemeProvider } from '@mui/material/styles'; import { ThemeProvider } from '@mui/material/styles';
@@ -25,6 +25,8 @@ import Announcements from './pages/Announcements.jsx';
import Links from './pages/Links.jsx'; import Links from './pages/Links.jsx';
import Uploads from './pages/Uploads.jsx'; import Uploads from './pages/Uploads.jsx';
import ImportDb from './pages/ImportDb.jsx'; import ImportDb from './pages/ImportDb.jsx';
// 工作台独立分包:仅访问 /admin/workbench 时才加载(vite 自动 code-split
const Workbench = lazy(() => import('../tools/workbench/Workbench.jsx'));
// 生产:/admin/* 由后端 fallback 到 dist/admin.htmlPhase 6 需求),basename=/admin // 生产:/admin/* 由后端 fallback 到 dist/admin.htmlPhase 6 需求),basename=/admin
// 开发:vite 多入口直接访问 /admin.htmlbasename 自适应为空。 // 开发:vite 多入口直接访问 /admin.htmlbasename 自适应为空。
@@ -76,6 +78,21 @@ function AdminApp() {
<CssBaseline /> <CssBaseline />
<BrowserRouter basename={basename}> <BrowserRouter basename={basename}>
<Routes> <Routes>
{/* 工作台:独立全屏布局,不套 AdminLayout(自带 Toolbar+Sidebar+内容区);懒加载分包 */}
<Route
path="/workbench"
element={
<Suspense
fallback={
<Box sx={{ display: 'flex', alignItems: 'center', justifyContent: 'center', height: '100vh' }}>
<CircularProgress />
</Box>
}
>
<Workbench />
</Suspense>
}
/>
<Route element={<AdminLayout />}> <Route element={<AdminLayout />}>
<Route index element={<Navigate to="/dashboard" replace />} /> <Route index element={<Navigate to="/dashboard" replace />} />
<Route path="/dashboard" element={<Dashboard />} /> <Route path="/dashboard" element={<Dashboard />} />
+96 -2
View File
@@ -10,6 +10,10 @@ import FormHelperText from '@mui/material/FormHelperText';
import Radio from '@mui/material/Radio'; import Radio from '@mui/material/Radio';
import RadioGroup from '@mui/material/RadioGroup'; import RadioGroup from '@mui/material/RadioGroup';
import Switch from '@mui/material/Switch'; import Switch from '@mui/material/Switch';
import InputAdornment from '@mui/material/InputAdornment';
import IconButton from '@mui/material/IconButton';
import VisibilityIcon from '@mui/icons-material/Visibility';
import VisibilityOffIcon from '@mui/icons-material/VisibilityOff';
import { getSettings, saveSettings } from '../../api/settings.js'; import { getSettings, saveSettings } from '../../api/settings.js';
import { showSnack } from '../snack.jsx'; import { showSnack } from '../snack.jsx';
@@ -20,7 +24,7 @@ const FOOTER_STYLES = [
{ value: 'glass', label: '玻璃卡片', desc: '磨砂玻璃卡片,与玻璃导航质感呼应' }, { value: 'glass', label: '玻璃卡片', desc: '磨砂玻璃卡片,与玻璃导航质感呼应' },
]; ];
/** 基本设置 + 页脚设置(v2:页脚样式 / 版权 / Powered by 均支持自定义 */ /** 基本设置 + 页脚设置 + 面板代理 + RainID 单点登录(v2 */
export default function Settings() { export default function Settings() {
const [form, setForm] = useState({ const [form, setForm] = useState({
site_name: '', site_name: '',
@@ -33,8 +37,15 @@ export default function Settings() {
footer_desc: '', footer_desc: '',
comment_moderate: '0', comment_moderate: '0',
comment_notify: '0', comment_notify: '0',
proxy_allowed_hosts: '',
rainid_enabled: '0',
rainid_client_id: '',
rainid_client_secret: '',
rainid_discovery_url: 'https://rainid.rainnya.asia/oauth',
rainid_register_redirect: '0',
}); });
const [saving, setSaving] = useState(false); const [saving, setSaving] = useState(false);
const [showSecret, setShowSecret] = useState(false);
useEffect(() => { useEffect(() => {
getSettings() getSettings()
@@ -49,6 +60,13 @@ export default function Settings() {
footer_desc: s.footer_desc || '', footer_desc: s.footer_desc || '',
comment_moderate: s.comment_moderate === '1' ? '1' : '0', comment_moderate: s.comment_moderate === '1' ? '1' : '0',
comment_notify: s.comment_notify === '1' ? '1' : '0', comment_notify: s.comment_notify === '1' ? '1' : '0',
proxy_allowed_hosts: s.proxy_allowed_hosts || '',
rainid_enabled: s.rainid_enabled === '1' ? '1' : '0',
rainid_client_id: s.rainid_client_id || '',
// secret 后端不回读(ALLOWED_SET 可写不可读),始终为空,留空提交=不修改
rainid_client_secret: '',
rainid_discovery_url: s.rainid_discovery_url || 'https://rainid.rainnya.asia/oauth',
rainid_register_redirect: s.rainid_register_redirect === '1' ? '1' : '0',
})) }))
.catch((e) => showSnack(e.message, 'error')); .catch((e) => showSnack(e.message, 'error'));
}, []); }, []);
@@ -59,7 +77,10 @@ export default function Settings() {
const save = async () => { const save = async () => {
setSaving(true); setSaving(true);
try { try {
await saveSettings(form); const body = { ...form };
// secret 空值处理:留空 = 不修改(后端不回读、空串会覆盖已有值,故从提交中移除该 key)
if (!body.rainid_client_secret) delete body.rainid_client_secret;
await saveSettings(body);
showSnack('设置已保存'); showSnack('设置已保存');
} catch (e) { } catch (e) {
showSnack(e.message, 'error'); showSnack(e.message, 'error');
@@ -142,6 +163,79 @@ export default function Settings() {
)} )}
</Paper> </Paper>
<Paper sx={{ p: 3, mt: 2 }}>
<Typography variant="h6" sx={{ mb: 1 }}>面板代理</Typography>
<TextField
fullWidth
label="代理允许的内网地址(白名单)"
value={form.proxy_allowed_hosts}
onChange={set('proxy_allowed_hosts')}
margin="normal"
multiline
minRows={3}
placeholder={'每行或逗号分隔一个地址/网段,例如:\n192.168.0.0/16\n10.0.0.0/8\n192.168.3.1:8080'}
helperText="https 页面无法嵌入 http 内网面板,把可信内网地址/网段加入白名单后可经面板代理放行。支持单 IP、IPv4 CIDR(如 192.168.0.0/16)与主机名;默认拦截所有内网地址,请谨慎配置。"
/>
</Paper>
<Paper sx={{ p: 3, mt: 2 }}>
<Typography variant="h6" sx={{ mb: 1 }}>RainID 单点登录</Typography>
<Typography variant="body2" sx={{ mb: 1.5, color: 'text.secondary', fontSize: 13 }}>
通过 RainID 统一身份认证支持 ROPC 密码登录与授权码 SSO
</Typography>
<FormControlLabel
control={<Switch checked={form.rainid_enabled === '1'} onChange={toggle('rainid_enabled')} />}
label={(
<Box sx={{ py: 0.5 }}>
<Box sx={{ fontSize: 14, fontWeight: 500 }}>启用 RainID 登录</Box>
<Box sx={{ fontSize: 12, color: 'text.secondary' }}>登录页显示使用 RainID 登录密码登录自动转发 ROPC 校验</Box>
</Box>
)}
/>
<FormControlLabel
control={<Switch checked={form.rainid_register_redirect === '1'} onChange={toggle('rainid_register_redirect')} />}
label={(
<Box sx={{ py: 0.5 }}>
<Box sx={{ fontSize: 14, fontWeight: 500 }}>注册跳转 RainID</Box>
<Box sx={{ fontSize: 12, color: 'text.secondary' }}>开启后注册页直接跳转 RainID 注册不再显示本地注册表单</Box>
</Box>
)}
/>
<TextField fullWidth label="Client ID" value={form.rainid_client_id} onChange={set('rainid_client_id')} margin="normal" placeholder="RainID 应用 Client ID(非机密)" />
<TextField
fullWidth
label="Client Secret(机密)"
type={showSecret ? 'text' : 'password'}
value={form.rainid_client_secret}
onChange={set('rainid_client_secret')}
margin="normal"
placeholder="••••••••••••"
autoComplete="new-password"
helperText="保存在服务端且不回读;留空提交则保持原值不变"
slotProps={{
htmlInput: { 'aria-label': 'RainID Client Secret' },
input: {
endAdornment: (
<InputAdornment position="end">
<IconButton
edge="end"
aria-label={showSecret ? '隐藏 Secret' : '显示 Secret'}
onClick={() => setShowSecret((v) => !v)}
>
{showSecret ? <VisibilityOffIcon fontSize="small" /> : <VisibilityIcon fontSize="small" />}
</IconButton>
</InputAdornment>
),
},
}}
/>
<TextField fullWidth label="Discovery URL" type="url" value={form.rainid_discovery_url} onChange={set('rainid_discovery_url')} margin="normal" placeholder="https://rainid.rainnya.asia/oauth" helperText="RainID OIDC 配置地址,默认即可" />
</Paper>
<Box sx={{ mt: 2 }}> <Box sx={{ mt: 2 }}>
<Button variant="contained" onClick={save} disabled={saving}>保存设置</Button> <Button variant="contained" onClick={save} disabled={saving}>保存设置</Button>
</Box> </Box>
+11
View File
@@ -20,6 +20,17 @@ export function me() {
return request('/auth/me'); return request('/auth/me');
} }
// ── RainID 单点登录(OIDC) ──────────────────────────────
/** 发起授权码登录:整页跳转到后端 /api/auth/oidc/login(后端 302 至 RainID */
export function oidcLoginRedirect() {
window.location.href = '/api/auth/oidc/login';
}
/** RainID 回跳:用一次性过渡码(30s)换取会话 token → {token, username, role} */
export function oidcExchange(ticket) {
return request('/auth/oidc/exchange', { method: 'POST', body: { ticket } });
}
/** 退出登录:后端无对应接口,仅清除本地 token 并通知登录态变更 */ /** 退出登录:后端无对应接口,仅清除本地 token 并通知登录态变更 */
export function logout() { export function logout() {
setToken(null); setToken(null);
+23
View File
@@ -0,0 +1,23 @@
import { request } from './client.js';
// ── 工作台「记事本」(routes/notes.js,仅管理员) ────────────
/** 文件列表:[{ name, size, mtime }],按修改时间倒序 */
export function listNotes() {
return request('/notes');
}
/** 读取内容:{ name, content, size, mtime } */
export function getNote(filename) {
return request('/notes/' + encodeURIComponent(filename));
}
/** 创建:{ filename, content },同名返回 409 */
export function createNote(filename, content) {
return request('/notes', { method: 'POST', body: { filename, content } });
}
/** 更新内容:{ content } */
export function updateNote(filename, content) {
return request('/notes/' + encodeURIComponent(filename), { method: 'PUT', body: { content } });
}
/** 删除 */
export function deleteNote(filename) {
return request('/notes/' + encodeURIComponent(filename), { method: 'DELETE' });
}
+19
View File
@@ -0,0 +1,19 @@
import { request } from './client.js';
// ── Web 终端(安全敏感:root shellPIN + 短 TTL token 双认证) ──
// 后端契约见 routes/terminal.js
// GET /api/terminal/status → { hasPin, sessions, maxSessions, idleTimeoutMs }
// POST /api/terminal/auth → { token, expiresIn, setup?, needs_setup?, message? }
/** 检查终端专用密码是否已设置 + 当前会话数 */
export function terminalStatus() {
return request('/terminal/status');
}
/**
* 设置(首次)/校验终端密码,成功发放 5 分钟短 TTL 终端 token。
* 失败抛错:400 密码不合法 / 401 密码错误 / 429 尝试次数过多
*/
export function terminalAuth(pin) {
return request('/terminal/auth', { method: 'POST', body: { pin } });
}
+33 -15
View File
@@ -31,10 +31,23 @@ export function showCaptcha(action) {
}); });
} }
// 执行并清空排队中的渲染回调(供 onload 全局与竞态兜底共用)
function flushCallbacks(type) {
const key = type === 'recaptcha' ? 'recaptchaCallbacks' : 'turnstileCallbacks';
const q = window[key] || [];
window[key] = [];
q.forEach((cb) => { try { cb(); } catch { /* 单条失败不影响其余 */ } });
}
// 加载第三方验证码脚本(recaptcha / turnstile // 加载第三方验证码脚本(recaptcha / turnstile
// 注意:脚本通过 ?onload=onTurnstileLoad / onRecaptchaLoad 回调通知就绪,
// 必须在注入脚本之前定义好全局 onload 函数(事件丢失 → 排队回调永不触发 → 永久卡「正在加载」)。
function ensureThirdPartyScript(type) { function ensureThirdPartyScript(type) {
if (type === 'recaptcha') { if (type === 'recaptcha') {
window.recaptchaCallbacks = window.recaptchaCallbacks || []; window.recaptchaCallbacks = window.recaptchaCallbacks || [];
if (!window.onRecaptchaLoad) {
window.onRecaptchaLoad = () => flushCallbacks('recaptcha');
}
if (typeof window.grecaptcha === 'undefined' && !document.querySelector('script[src*="recaptcha/api"]')) { if (typeof window.grecaptcha === 'undefined' && !document.querySelector('script[src*="recaptcha/api"]')) {
const s = document.createElement('script'); const s = document.createElement('script');
s.src = 'https://www.recaptcha.net/recaptcha/api.js?onload=onRecaptchaLoad&render=explicit'; s.src = 'https://www.recaptcha.net/recaptcha/api.js?onload=onRecaptchaLoad&render=explicit';
@@ -43,6 +56,9 @@ function ensureThirdPartyScript(type) {
} }
} else { } else {
window.turnstileCallbacks = window.turnstileCallbacks || []; window.turnstileCallbacks = window.turnstileCallbacks || [];
if (!window.onTurnstileLoad) {
window.onTurnstileLoad = () => flushCallbacks('turnstile');
}
if (typeof window.turnstile === 'undefined' && !document.querySelector('script[src*="turnstile"]')) { if (typeof window.turnstile === 'undefined' && !document.querySelector('script[src*="turnstile"]')) {
const s = document.createElement('script'); const s = document.createElement('script');
s.src = 'https://challenges.cloudflare.com/turnstile/v0/api.js?onload=onTurnstileLoad&render=explicit'; s.src = 'https://challenges.cloudflare.com/turnstile/v0/api.js?onload=onTurnstileLoad&render=explicit';
@@ -52,6 +68,20 @@ function ensureThirdPartyScript(type) {
} }
} }
// 注册渲染回调:库就绪立即执行,未就绪排队等 onload 冲刷;加 300ms 竞态兜底
// (脚本恰好在「检查就绪」与「入队」之间加载完成、onload 已错过时重放队列)。
function queueRender(type, render) {
const lib = type === 'recaptcha' ? 'grecaptcha' : 'turnstile';
if (typeof window[lib] !== 'undefined') { render(); return; }
const key = type === 'recaptcha' ? 'recaptchaCallbacks' : 'turnstileCallbacks';
window[key] = window[key] || [];
window[key].push(render);
ensureThirdPartyScript(type);
setTimeout(() => {
if (typeof window[lib] !== 'undefined') flushCallbacks(type);
}, 300);
}
// SHA-256Proof of Work 使用) // SHA-256Proof of Work 使用)
async function sha256(str) { async function sha256(str) {
const buf = new TextEncoder().encode(str); const buf = new TextEncoder().encode(str);
@@ -185,6 +215,7 @@ function ThirdPartyCaptcha({ type, onFinish }) {
if (!siteKey) { onFinish(null); return; } if (!siteKey) { onFinish(null); return; }
const container = widgetRef.current; const container = widgetRef.current;
const render = () => { const render = () => {
if (doneRef.current) return; // 弹窗已取消/卸载,不再向已移除的容器渲染
try { try {
if (type === 'recaptcha') { if (type === 'recaptcha') {
const wid = window.grecaptcha.render(container, { const wid = window.grecaptcha.render(container, {
@@ -215,21 +246,8 @@ function ThirdPartyCaptcha({ type, onFinish }) {
setTimeout(() => onFinish(null), 2000); setTimeout(() => onFinish(null), 2000);
} }
}; };
if (type === 'recaptcha') { // 就绪立即渲染;未就绪排队等 onload 冲刷(含 300ms 竞态兜底)
if (typeof window.grecaptcha !== 'undefined') render(); queueRender(type, render);
else {
window.recaptchaCallbacks = window.recaptchaCallbacks || [];
window.recaptchaCallbacks.push(render);
ensureThirdPartyScript(type);
}
} else {
if (typeof window.turnstile !== 'undefined') render();
else {
window.turnstileCallbacks = window.turnstileCallbacks || [];
window.turnstileCallbacks.push(render);
ensureThirdPartyScript(type);
}
}
// 卸载时不触发重复回调 // 卸载时不触发重复回调
return () => { doneRef.current = true; }; return () => { doneRef.current = true; };
}, []); }, []);
+5
View File
@@ -118,6 +118,11 @@ export default function Layout() {
setToken(null); setToken(null);
setUser(null); setUser(null);
notifyAuthChange(); notifyAuthChange();
if (settings.rainid_enabled === '1') {
// RainID 单点登录:清本地后联动登出 RainID 端会话(整页跳转,不显示本地提示)
window.location.href = '/api/auth/oidc/logout';
return;
}
showSnackbar('已退出登录'); showSnackbar('已退出登录');
}; };
+3 -3
View File
@@ -177,7 +177,7 @@ export default function Forum() {
<div style={{ marginBottom: 16 }}> <div style={{ marginBottom: 16 }}>
<div style={{ display: 'flex', alignItems: 'center', gap: 8, marginBottom: 4 }}> <div style={{ display: 'flex', alignItems: 'center', gap: 8, marginBottom: 4 }}>
<h3 style={{ fontWeight: 600, fontSize: 20, margin: 0 }}>{currentCat.name}</h3> <h3 style={{ fontWeight: 600, fontSize: 20, margin: 0 }}>{currentCat.name}</h3>
<span className="chip" style={{ cursor: 'default', fontSize: 12, padding: '1px 8px', color: 'var(--md-ref-on-surface-variant)', border: '1px solid var(--md-ref-outline-variant)' }}>板块</span> <span className="chip chip-static">板块</span>
</div> </div>
<p className="text-muted" style={{ fontSize: 14 }}>{currentCat.description || ''}</p> <p className="text-muted" style={{ fontSize: 14 }}>{currentCat.description || ''}</p>
{currentCat.announcement && ( {currentCat.announcement && (
@@ -214,9 +214,9 @@ export default function Forum() {
<span>{p.created_at}</span> <span>{p.created_at}</span>
<span>{p.reply_count || 0} 回复</span> <span>{p.reply_count || 0} 回复</span>
<span style={{ color: 'var(--md-ref-outline)', margin: '0 4px' }}>|</span> <span style={{ color: 'var(--md-ref-outline)', margin: '0 4px' }}>|</span>
<span className="chip" style={{ cursor: 'default', fontSize: 11, padding: '1px 8px', background: 'transparent', border: '1px solid var(--md-ref-outline-variant)', color: 'var(--md-ref-on-surface-variant)' }}>{catName}</span> <span className="chip chip-static">{catName}</span>
{p.sub_category ? ( {p.sub_category ? (
<span className="chip" style={{ cursor: 'default', fontSize: 11, padding: '1px 8px', background: 'var(--md-ref-secondary-container)', color: 'var(--md-ref-on-secondary-container)' }}>{p.sub_category}</span> <span className="chip chip-tonal">{p.sub_category}</span>
) : null} ) : null}
</div> </div>
</Link> </Link>
+82 -1
View File
@@ -1,14 +1,28 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { Link, useLocation, useNavigate } from 'react-router-dom'; import { Link, useLocation, useNavigate } from 'react-router-dom';
import * as authApi from '../api/auth.js'; import * as authApi from '../api/auth.js';
import * as settingsApi from '../api/settings.js';
import { required as captchaRequired } from '../api/captcha.js'; import { required as captchaRequired } from '../api/captcha.js';
import { showCaptcha } from '../components/CaptchaModal.jsx'; import { showCaptcha } from '../components/CaptchaModal.jsx';
import { getToken, setToken, notifyAuthChange } from '../api/client.js'; import { getToken, setToken, notifyAuthChange } from '../api/client.js';
/** RainID OIDC 回跳错误码 → 用户可读文案 */
const OIDC_ERROR_TEXT = {
access_denied: '已在 RainID 拒绝授权,可重新登录',
consent_required: '请重新完整走 RainID 登录',
login_required: '请重新完整走 RainID 登录',
invalid_grant: '登录状态已失效,请重新登录',
rate_limited: '请求过于频繁,请稍后再试',
invalid_scope: '配置错误,请联系管理员',
invalid_request: '配置错误,请联系管理员',
};
/** /**
* 登录页(迁移自 login.html): * 登录页(迁移自 login.html):
* captcha.required('login') 判断 → 需要则显示"点击进行人机验证"按钮 → showCaptcha('login') 拿 proof * captcha.required('login') 判断 → 需要则显示"点击进行人机验证"按钮 → showCaptcha('login') 拿 proof
* 成功后 setToken + 通知登录态变更 + 跳转来源页或首页。 * 成功后 setToken + 通知登录态变更 + 跳转来源页或首页。
* RainID 单点登录:rainid_enabled 时显示「使用 RainID 登录」按钮;回跳(?oidc_ticket / ?oidc_error
* 在此页面收尾——一次性过渡码换 token / 错误码映射提示。ROPC 表单逻辑不变(后端已转发)。
*/ */
export default function Login() { export default function Login() {
const navigate = useNavigate(); const navigate = useNavigate();
@@ -21,19 +35,69 @@ export default function Login() {
const [capRequired, setCapRequired] = useState(false); const [capRequired, setCapRequired] = useState(false);
const [capDone, setCapDone] = useState(false); const [capDone, setCapDone] = useState(false);
const [capResult, setCapResult] = useState(null); const [capResult, setCapResult] = useState(null);
const [rainidEnabled, setRainidEnabled] = useState(false);
const [oidcBusy, setOidcBusy] = useState(false);
/** 清理地址栏的 oidc 过渡参数(替换为纯路径,避免残留/刷新重复兑换) */
const clearOidcParams = () => {
window.history.replaceState({}, '', window.location.pathname);
};
/** RainID 回跳收尾:一次性过渡码换 token → 复用本地登录成功逻辑 */
const handleOidcTicket = async (ticket) => {
setBusy(true);
try {
const data = await authApi.oidcExchange(ticket);
setToken(data.token);
notifyAuthChange();
clearOidcParams();
const from = location.state && location.state.from;
navigate(from || '/');
} catch (e) {
clearOidcParams();
setError(e.message || 'RainID 登录失败,请重试');
setBusy(false);
}
};
useEffect(() => { useEffect(() => {
// 1) RainID 回跳优先处理(一次性码 30s 有效,须先兑换)
// 注意:OIDC 走整页跳转,此 effect 仅在页面挂载时执行一次;
// 兑换后 navigate 触发 location 变化时不再重跑(避免覆盖 from 目标)。
const params = new URLSearchParams(window.location.search);
const ticket = params.get('oidc_ticket');
const oidcError = params.get('oidc_error');
if (ticket) { handleOidcTicket(ticket); return; }
if (oidcError) {
setError(OIDC_ERROR_TEXT[oidcError] || 'RainID 登录失败,请重试');
clearOidcParams();
return;
}
// 2) 已登录直接回首页
if (getToken()) { navigate('/', { replace: true }); return; } if (getToken()) { navigate('/', { replace: true }); return; }
// 3) 公开设置:rainid_enabled → 显示 RainID 按钮
settingsApi.getPublicSettings()
.then((s) => { if (s.rainid_enabled === '1') setRainidEnabled(true); })
.catch(() => {});
// 4) 人机验证需求
captchaRequired('login') captchaRequired('login')
.then((r) => { if (r && r.required) setCapRequired(true); }) .then((r) => { if (r && r.required) setCapRequired(true); })
.catch(() => {}); .catch(() => {});
}, [navigate]); // eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
const doCaptcha = async () => { const doCaptcha = async () => {
const result = await showCaptcha('login'); const result = await showCaptcha('login');
if (result) { setCapResult(result); setCapDone(true); } if (result) { setCapResult(result); setCapDone(true); }
}; };
/** RainID 整页跳转(loading 防重复点击) */
const handleRainId = () => {
if (oidcBusy) return;
setOidcBusy(true);
authApi.oidcLoginRedirect();
};
const handleLogin = async () => { const handleLogin = async () => {
if (!username.trim() || !password) { setError('请输入用户名和密码'); return; } if (!username.trim() || !password) { setError('请输入用户名和密码'); return; }
if (capRequired && !capDone) { setError('请先点击验证按钮完成验证'); return; } if (capRequired && !capDone) { setError('请先点击验证按钮完成验证'); return; }
@@ -46,8 +110,13 @@ export default function Login() {
const from = location.state && location.state.from; const from = location.state && location.state.from;
navigate(from || '/'); navigate(from || '/');
} catch (e) { } catch (e) {
// 401 文案透传(含 RainID 已开启时的 2FA 提示:"该账号已开启二次验证,请使用 RainID 登录"
setError(e.message || '登录失败'); setError(e.message || '登录失败');
setBusy(false); setBusy(false);
// 验证码 proof 为一次性消费:无论密码错还是 proof 已被使用,登录失败后均作废,
// 重置「已验证」标记允许用户重新完成验证,否则按钮保持 disabled 死锁。
setCapDone(false);
setCapResult(null);
} }
}; };
@@ -115,6 +184,18 @@ export default function Login() {
</button> </button>
)} )}
{rainidEnabled && (
<button
className="btn btn-outline w-full"
onClick={handleRainId}
disabled={busy || oidcBusy}
style={{ display: 'inline-flex', marginBottom: 8, justifyContent: 'center', height: 44, gap: 8, alignItems: 'center' }}
>
<span className="material-icons" style={{ fontSize: 20 }}>fingerprint</span>
<span>{oidcBusy ? '正在跳转 RainID…' : '使用 RainID 登录'}</span>
</button>
)}
<button className="btn btn-filled w-full" onClick={handleLogin} disabled={busy}> <button className="btn btn-filled w-full" onClick={handleLogin} disabled={busy}>
{busy ? '登录中...' : '登录'} {busy ? '登录中...' : '登录'}
</button> </button>
+77 -74
View File
@@ -263,86 +263,89 @@ export default function Passwords() {
return <div className="loading"><div className="spinner"></div></div>; return <div className="loading"><div className="spinner"></div></div>;
} }
// PIN 屏(设置 或 解锁)
if (phase === 'setup' || phase === 'locked') {
return (
<div className="pin-overlay">
<div className="pin-icon"><span className="material-icons" style={{ fontSize: 40 }}>lock</span></div>
<div style={{ fontSize: 18, fontWeight: 500 }}>
{phase === 'setup' ? '首次使用,请设置 PIN 码' : '请输入 PIN 码解锁'}
</div>
{pinError && <div style={{ color: 'var(--md-ref-error)', fontSize: 14, marginBottom: 8 }}>{pinError}</div>}
{phase === 'locked' && (
<input
type="password"
className="pin-input"
maxLength={6}
inputMode="numeric"
autoComplete="off"
value={pinInput}
onChange={(e) => setPinInput(e.target.value)}
onKeyDown={(e) => { if (e.key === 'Enter') submitPin(); }}
/>
)}
<div style={{ display: 'flex', gap: 8, flexWrap: 'wrap', justifyContent: 'center' }}>
<button className="btn btn-filled" onClick={phase === 'setup' ? openPinDialog : submitPin} disabled={pinBusy}>
{phase === 'setup' ? '设置' : (pinBusy ? '解锁中...' : '解锁')}
</button>
</div>
</div>
);
}
// 已解锁:密码箱
return ( return (
<div> <>
<div className="admin-header"> {/* PIN 屏(设置 或 解锁)——全屏覆盖页,非弹窗 */}
<h2>已保存的密码</h2> {phase === 'setup' || phase === 'locked' ? (
<div style={{ display: 'flex', gap: 8 }}> <div className="pin-overlay">
<button className="btn btn-tonal" onClick={lockVault}> <div className="pin-icon"><span className="material-icons" style={{ fontSize: 40 }}>lock</span></div>
<span className="material-icons">lock</span> 锁定 <div style={{ fontSize: 18, fontWeight: 500 }}>
</button> {phase === 'setup' ? '首次使用,请设置 PIN 码' : '请输入 PIN 码解锁'}
<button className="btn btn-text" onClick={openPinChange}> </div>
<span className="material-icons">edit</span> 修改 PIN {pinError && <div style={{ color: 'var(--md-ref-error)', fontSize: 14, marginBottom: 8 }}>{pinError}</div>}
</button> {phase === 'locked' && (
<button className="btn btn-filled" onClick={openAddDialog}> <input
<span className="material-icons">add</span> 添加 type="password"
</button> className="pin-input"
maxLength={6}
inputMode="numeric"
autoComplete="off"
value={pinInput}
onChange={(e) => setPinInput(e.target.value)}
onKeyDown={(e) => { if (e.key === 'Enter') submitPin(); }}
/>
)}
<div style={{ display: 'flex', gap: 8, flexWrap: 'wrap', justifyContent: 'center' }}>
<button className="btn btn-filled" onClick={phase === 'setup' ? openPinDialog : submitPin} disabled={pinBusy}>
{phase === 'setup' ? '设置' : (pinBusy ? '解锁中...' : '解锁')}
</button>
</div>
</div> </div>
</div> ) : (
/* 已解锁:密码箱 */
{entries === null && <div className="loading"><div className="spinner"></div></div>} <div>
{entriesError && ( <div className="admin-header">
<div className="empty-state"><div className="empty-icon"></div><p>加载失败: {entriesError}</p></div> <h2>已保存的密码</h2>
)} <div style={{ display: 'flex', gap: 8 }}>
{entries && entries.length === 0 && ( <button className="btn btn-tonal" onClick={lockVault}>
<div className="empty-state"><div className="empty-icon">🔒</div><p>暂无密码记录</p></div> <span className="material-icons">lock</span> 锁定
)} </button>
{entries && entries.length > 0 && ( <button className="btn btn-text" onClick={openPinChange}>
<div className="password-grid"> <span className="material-icons">edit</span> 修改 PIN
{entries.map((p) => ( </button>
<div key={p.id} className="password-card-wrap"> <button className="btn btn-filled" onClick={openAddDialog}>
<button type="button" className="card password-card" onClick={() => setDetailId(p.id)}> <span className="material-icons">add</span> 添加
<div className="pw-title">{p.title}</div>
<div className="pw-username">{p.username || '无用户名'}</div>
</button> </button>
<div className="pw-actions">
<button
type="button"
className="btn-icon"
style={{ width: 40, height: 40, fontSize: 16 }}
title="复制密码"
aria-label={`复制 ${p.title} 的密码`}
onClick={(e) => { e.stopPropagation(); copyToClipboard(p.password, '密码'); }}
>
<span className="material-icons" style={{ fontSize: 16 }}>content_copy</span>
</button>
</div>
</div> </div>
))} </div>
{entries === null && <div className="loading"><div className="spinner"></div></div>}
{entriesError && (
<div className="empty-state"><div className="empty-icon"></div><p>加载失败: {entriesError}</p></div>
)}
{entries && entries.length === 0 && (
<div className="empty-state"><div className="empty-icon">🔒</div><p>暂无密码记录</p></div>
)}
{entries && entries.length > 0 && (
<div className="password-grid">
{entries.map((p) => (
<div key={p.id} className="password-card-wrap">
<button type="button" className="card password-card" onClick={() => setDetailId(p.id)}>
<div className="pw-title">{p.title}</div>
<div className="pw-username">{p.username || '无用户名'}</div>
</button>
<div className="pw-actions">
<button
type="button"
className="btn-icon"
style={{ width: 40, height: 40, fontSize: 16 }}
title="复制密码"
aria-label={`复制 ${p.title} 的密码`}
onClick={(e) => { e.stopPropagation(); copyToClipboard(p.password, '密码'); }}
>
<span className="material-icons" style={{ fontSize: 16 }}>content_copy</span>
</button>
</div>
</div>
))}
</div>
)}
</div> </div>
)} )}
{/* ===== 弹窗统一挂载在顶层(setup/locked 阶段也能弹出——功能修复关键,勿移入 phase 分支) ===== */}
{/* 结构与论坛发帖弹窗一致:.dialog-overlay + .dialogMD3 CSS 变量天然适配浅/深色模式 */}
{/* 设置/修改 PIN 弹窗 */} {/* 设置/修改 PIN 弹窗 */}
{pinDialog && ( {pinDialog && (
<div <div
@@ -528,6 +531,6 @@ export default function Passwords() {
</div> </div>
</div> </div>
)} )}
</div> </>
); );
} }
+60 -3
View File
@@ -2,15 +2,21 @@ import React, { useEffect, useState } from 'react';
import { Link, useNavigate } from 'react-router-dom'; import { Link, useNavigate } from 'react-router-dom';
import * as authApi from '../api/auth.js'; import * as authApi from '../api/auth.js';
import * as emailApi from '../api/email.js'; import * as emailApi from '../api/email.js';
import * as settingsApi from '../api/settings.js';
import { required as captchaRequired } from '../api/captcha.js'; import { required as captchaRequired } from '../api/captcha.js';
import { showCaptcha } from '../components/CaptchaModal.jsx'; import { showCaptcha } from '../components/CaptchaModal.jsx';
import { getToken } from '../api/client.js'; import { getToken } from '../api/client.js';
import { showSnackbar } from '../lib/utils.js'; import { showSnackbar } from '../lib/utils.js';
/** RainID 注册页地址(后端 rainid_register_redirect=1 时整页跳转) */
const RAINID_REGISTER_URL = 'https://rainid.rainnya.asia/register';
/** /**
* 注册页(迁移自 register.html): * 注册页(迁移自 register.html):
* 注册 → 后端返回 requires_verification 时进入邮箱验证步骤(8 位验证码 → /api/email/complete-register), * 注册 → 后端返回 requires_verification 时进入邮箱验证步骤(8 位验证码 → /api/email/complete-register),
* 支持重新发送验证码(/api/email/send-verify);验证码 proof 流转与登录一致。 * 支持重新发送验证码(/api/email/send-verify);验证码 proof 流转与登录一致。
* RainIDrainid_register_redirect=1 → 整页跳转 RainID 注册(不显示本地表单);
* 否则保留本地注册,表单下方提供「使用 RainID 登录」入口。
*/ */
export default function Register() { export default function Register() {
const navigate = useNavigate(); const navigate = useNavigate();
@@ -25,12 +31,27 @@ export default function Register() {
const [capRequired, setCapRequired] = useState(false); const [capRequired, setCapRequired] = useState(false);
const [capDone, setCapDone] = useState(false); const [capDone, setCapDone] = useState(false);
const [capResult, setCapResult] = useState(null); const [capResult, setCapResult] = useState(null);
const [rainidEnabled, setRainidEnabled] = useState(false);
const [redirecting, setRedirecting] = useState(false); // 正在跳转 RainID 注册
useEffect(() => { useEffect(() => {
if (getToken()) { navigate('/', { replace: true }); return; } if (getToken()) { navigate('/', { replace: true }); return; }
captchaRequired('register') settingsApi.getPublicSettings()
.then((r) => { if (r && r.required) setCapRequired(true); }) .then((s) => {
.catch(() => {}); if (s.rainid_register_redirect === '1') {
// 注册托管给 RainID:短暂提示后整页替换(避免白屏感)
setRedirecting(true);
setTimeout(() => { window.location.replace(RAINID_REGISTER_URL); }, 400);
return;
}
if (s.rainid_enabled === '1') setRainidEnabled(true);
})
.catch(() => {})
.finally(() => {
captchaRequired('register')
.then((r) => { if (r && r.required) setCapRequired(true); })
.catch(() => {});
});
}, [navigate]); }, [navigate]);
const doCaptcha = async () => { const doCaptcha = async () => {
@@ -38,6 +59,11 @@ export default function Register() {
if (result) { setCapResult(result); setCapDone(true); } if (result) { setCapResult(result); setCapDone(true); }
}; };
/** RainID 登录入口(与登录页同逻辑) */
const handleRainId = () => {
authApi.oidcLoginRedirect();
};
const handleRegister = async () => { const handleRegister = async () => {
if (!username.trim() || !email.trim() || !password) { setError('请填写所有必填项'); return; } if (!username.trim() || !email.trim() || !password) { setError('请填写所有必填项'); return; }
if (password.length < 6) { setError('密码至少6位'); return; } if (password.length < 6) { setError('密码至少6位'); return; }
@@ -60,6 +86,9 @@ export default function Register() {
} }
} catch (e) { } catch (e) {
setError(e.message || '注册失败'); setError(e.message || '注册失败');
// 与登录一致:验证码 proof 一次性消费,注册失败后重置验证状态允许重新验证
setCapDone(false);
setCapResult(null);
} }
setBusy(false); setBusy(false);
}; };
@@ -85,6 +114,21 @@ export default function Register() {
} }
}; };
// RainID 注册托管:整页跳转前短暂显示提示
if (redirecting) {
return (
<div className="register-page" style={{ minHeight: '70vh' }}>
<div className="card register-card" style={{ width: '100%', maxWidth: 420, padding: '40px 32px', textAlign: 'center' }}>
<span className="material-icons" style={{ fontSize: 36, color: 'var(--md-ref-primary)' }}>fingerprint</span>
<h1 style={{ fontSize: 22, fontWeight: 500, marginTop: 12 }}>正在跳转 RainID 注册</h1>
<p className="text-muted" style={{ fontSize: 14, marginTop: 8 }}>
本平台注册已由 RainID 单点登录托管即将跳转
</p>
</div>
</div>
);
}
return ( return (
<div className="register-page" style={{ minHeight: '70vh' }}> <div className="register-page" style={{ minHeight: '70vh' }}>
<div className="card register-card" style={{ width: '100%', maxWidth: 420, padding: '40px 32px' }}> <div className="card register-card" style={{ width: '100%', maxWidth: 420, padding: '40px 32px' }}>
@@ -167,6 +211,19 @@ export default function Register() {
<span className="text-muted">已有账户</span> <span className="text-muted">已有账户</span>
<Link to="/login.html" className="btn-text btn" style={{ fontSize: 14 }}>登录</Link> <Link to="/login.html" className="btn-text btn" style={{ fontSize: 14 }}>登录</Link>
</div> </div>
{rainidEnabled && (
<div style={{ textAlign: 'center', marginTop: 8 }}>
<button
type="button"
className="btn btn-text btn-sm"
onClick={handleRainId}
style={{ fontSize: 14, display: 'inline-flex', alignItems: 'center', gap: 4 }}
>
<span className="material-icons" style={{ fontSize: 16 }}>fingerprint</span>
已有 RainID 账号使用 RainID 登录
</button>
</div>
)}
</> </>
)} )}
<div style={{ textAlign: 'center', marginTop: verifyMode ? 16 : 8 }}> <div style={{ textAlign: 'center', marginTop: verifyMode ? 16 : 8 }}>
+799
View File
@@ -0,0 +1,799 @@
import React, { useCallback, useEffect, useRef, useState } from 'react';
import Box from '@mui/material/Box';
import Typography from '@mui/material/Typography';
import Button from '@mui/material/Button';
import CircularProgress from '@mui/material/CircularProgress';
import Dialog from '@mui/material/Dialog';
import DialogTitle from '@mui/material/DialogTitle';
import DialogContent from '@mui/material/DialogContent';
import DialogActions from '@mui/material/DialogActions';
import IconButton from '@mui/material/IconButton';
import Tooltip from '@mui/material/Tooltip';
import OpenInNewIcon from '@mui/icons-material/OpenInNew';
import CloseIcon from '@mui/icons-material/Close';
import RefreshIcon from '@mui/icons-material/Refresh';
import ErrorIcon from '@mui/icons-material/Error';
import LockIcon from '@mui/icons-material/Lock';
import HomeIcon from '@mui/icons-material/Home';
import WidgetsIcon from '@mui/icons-material/Widgets';
import AddIcon from '@mui/icons-material/Add';
import SearchIcon from '@mui/icons-material/Search';
import ViewSidebarIcon from '@mui/icons-material/ViewSidebar';
import TerminalIcon from '@mui/icons-material/Terminal';
import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
import SettingsIcon from '@mui/icons-material/Settings';
import { Group, Panel, Separator } from 'react-resizable-panels';
import { useTheme } from '@mui/material/styles';
import {
DndContext, DragOverlay, PointerSensor, useSensor, useSensors, closestCenter,
} from '@dnd-kit/core';
import { getToken } from '../../api/client.js';
import { me } from '../../api/auth.js';
import usePanels from './hooks/usePanels.js';
import useWorkbenchLayout, {
VIEWS, VIEW_IDS, VIEW_MODE_SIDEBAR, VIEW_MODE_TAB,
} from './hooks/useWorkbenchLayout.js';
import Toolbar from './components/Toolbar.jsx';
import PanelsView from './components/Sidebar.jsx';
import NotesView from './components/NoteEditor.jsx';
import VaultView from './components/VaultDrawer.jsx';
import SidebarPane from './components/SidebarPane.jsx';
import ActivityBar from './components/ActivityBar.jsx';
import CollapseArrow from './components/CollapseArrow.jsx';
import ToolWindow from './components/ToolWindow.jsx';
import TabStrip from './components/TabStrip.jsx';
import ContentView from './components/ContentView.jsx';
import StatusBar from './components/StatusBar.jsx';
import PanelFrame from './components/PanelFrame.jsx';
import AddPanelDialog from './components/AddPanelDialog.jsx';
import PanelIcon from './components/PanelIcon.jsx';
import SnackHost, { showSnack } from '../../admin/snack.jsx';
/* ============================================================
* Workbench:工作台页面(VSCode 风格改造,Lane A
*
* 布局(react-resizable-panelsv4 APIGroup/Panel/Separator):
* 顶栏 56 | 活动栏48 侧栏(可拖 180-360,可折叠) 主区(标签+内容+底部终端) 侧栏 活动栏48 | 状态栏 24
* - 左侧活动栏=主控视图(面板),右侧=功能视图(记事本/密码箱)+ 底部终端按钮
* - dnd-kit:视图标签可在左右活动栏之间拖拽换边(workbench.viewOrder 持久化)
* - 视图双模式:侧边栏(默认)/ 标签页(进主区 TabStrip);浮动为 P2 占位
* - 面板 iframe 仍走 PanelFrameLRU 3),弹窗方式走 Dialog
* ============================================================ */
const LAYOUT_KEY = 'workbench.layout';
const MAIN_ACTIVE_KEY = 'workbench.mainActive'; // 主区激活标签(刷新后恢复上次激活项)
/** 侧边栏默认宽度(px):箭头/活动栏图标展开时的目标宽度 */
const SIDEBAR_DEFAULT_WIDTH = { left: 240, right: 300 };
/** 视为「已折叠」的宽度阈值(px)。RRP v4 isCollapsed 用零容差比较(尺寸必须精确等于 0),
* 布局归一化把面板挤到亚像素宽度时会误判为「未折叠」,导致 expand() 失效、侧栏卡死。
* 右侧栏是布局末尾的柔性面板最易被挤压,因此用阈值 + resize() 兜底。 */
const SIDEBAR_COLLAPSED_PX = 24;
function persistMainActive(key) {
try {
if (key) localStorage.setItem(MAIN_ACTIVE_KEY, key);
else localStorage.removeItem(MAIN_ACTIVE_KEY);
} catch { /* 隐私模式忽略 */ }
}
/** 布局持久化:{left, main, right} 三栏百分比(0-100),活动栏固定 48px 不入库 */
function readLayout() {
try {
const raw = localStorage.getItem(LAYOUT_KEY);
const a = raw ? JSON.parse(raw) : null;
if (!a || typeof a !== 'object') return null;
return {
left: Number(a.left) || 0,
main: Number(a.main) || 0,
right: Number(a.right) || 0,
};
} catch { return null; }
}
function writeLayout(v) {
try { localStorage.setItem(LAYOUT_KEY, JSON.stringify(v)); } catch { /* 隐私模式忽略 */ }
}
function AdminGuard({ children }) {
const [state, setState] = useState('checking'); // checking | denied | ok
useEffect(() => {
if (!getToken()) { window.location.href = '/login.html'; return; }
me()
.then((u) => {
if (u.role !== 'admin') setState('denied');
else setState('ok');
})
.catch(() => { window.location.href = '/login.html'; });
}, []);
if (state === 'checking') {
return (
<Box sx={{ display: 'flex', alignItems: 'center', justifyContent: 'center', height: '100vh' }}>
<CircularProgress />
</Box>
);
}
if (state === 'denied') {
return (
<Box
sx={{
height: '100vh', display: 'flex', flexDirection: 'column',
alignItems: 'center', justifyContent: 'center', gap: 2, px: 3, textAlign: 'center',
}}
>
<LockIcon sx={{ fontSize: 48, color: 'error.main' }} />
<Typography variant="h6">需要管理员权限</Typography>
<Typography variant="body2" sx={{ color: 'text.secondary', maxWidth: 360 }}>
面板工作台仅对管理员开放如需使用请使用管理员账号登录或返回前台
</Typography>
<Box sx={{ display: 'flex', gap: 1 }}>
<Button variant="outlined" startIcon={<HomeIcon />} href="/">返回前台</Button>
<Button variant="contained" href="/login.html">重新登录</Button>
</Box>
</Box>
);
}
return children;
}
function EmptyState({ icon, title, hint, action, onAction }) {
return (
<Box
sx={{
flex: 1, display: 'flex', flexDirection: 'column',
alignItems: 'center', justifyContent: 'center', gap: 1.5, px: 3, textAlign: 'center',
}}
>
{icon}
<Box>
<Typography sx={{ fontWeight: 600, mb: 0.5 }}>{title}</Typography>
<Typography variant="body2" sx={{ color: 'text.secondary' }}>{hint}</Typography>
</Box>
{action && <Button variant="contained" startIcon={<AddIcon />} onClick={onAction}>{action}</Button>}
</Box>
);
}
function AboutDialog({ open, onClose }) {
return (
<Dialog open={open} onClose={onClose} maxWidth="xs">
<DialogTitle>关于 Rain Work</DialogTitle>
<DialogContent>
<Typography variant="body2" sx={{ mb: 1 }}>
Rain Work 工作台 v2.1.0 管理面板记事本密码箱与终端的一体化工作区
</Typography>
<Typography variant="body2" sx={{ color: 'text.secondary' }}>
终端为管理员 Root Shell需单独设置终端密码记事本文件保存在服务器 workspace 目录
面板可拖拽到左右任一活动栏按你的习惯排布
</Typography>
</DialogContent>
<DialogActions>
<Button onClick={onClose}>关闭</Button>
</DialogActions>
</Dialog>
);
}
/** 面板分隔条:可拖拽 = 4px 命中区 + 悬停高亮;不可拖拽 = 1px 细线 */
function ResizeSeparator({ disabled = false }) {
const muiTheme = useTheme();
const [hover, setHover] = useState(false);
return (
<Separator
disabled={disabled}
onMouseEnter={() => setHover(true)}
onMouseLeave={() => setHover(false)}
style={{
width: disabled ? 1 : 4,
background: hover ? muiTheme.palette.primary.main : 'transparent',
transition: 'background .12s ease',
}}
/>
);
}
function WorkbenchContent() {
const panels = usePanels();
const layout = useWorkbenchLayout();
const {
links, loadError, reload,
openPanels, renderedIds,
activeId, activePanel, modalPanel, closeModal,
canBack, canForward, goBack, goForward,
openPanel, closePanel, togglePin, toggleGroup, setMode,
pinned, groups, modes,
search, setSearch, filteredPanels, openFirstMatch,
} = panels;
const [addOpen, setAddOpen] = useState(false);
const [aboutOpen, setAboutOpen] = useState(false);
const [mainRefresh, setMainRefresh] = useState(0);
const [modalRefresh, setModalRefresh] = useState(0);
// 主区激活标签:同步从 localStorage 恢复(workbench.mainActive),刷新后回到上次激活项
const mainActiveInit = useRef(null);
const [activeMainKey, setActiveMainKey] = useState(() => {
let v = null;
try { v = localStorage.getItem(MAIN_ACTIVE_KEY); } catch { /* ignore */ }
mainActiveInit.current = v;
return v;
});
const [activeDrag, setActiveDrag] = useState(null); // dnd overlay {id,label}
const searchRef = useRef(null);
// ---- react-resizable-panels 引用 ----
const groupRef = useRef(null);
const mainRef = useRef(null); // 主面板(始终 ≥minSize 可见),用作 setLayout 像素↔百分比换算探针
const leftRef = useRef(null);
const rightRef = useRef(null);
const savedLayout = useRef(readLayout());
// 侧边栏折叠状态(供折叠箭头方向/语义;拖拽折叠也会经 onResize 同步)
const [leftCollapsed, setLeftCollapsed] = useState(
() => !!savedLayout.current && savedLayout.current.left === 0
);
const [rightCollapsed, setRightCollapsed] = useState(
() => !!savedLayout.current && savedLayout.current.right === 0
);
// v4 布局为 { PanelId: 百分比 };活动栏有 min/max 48px 硬约束,传多少都会被钳回 48
const defaultLayout = savedLayout.current
? {
'activity-l': 3,
'sidebar-l': Math.max(0, Math.min(40, savedLayout.current.left)),
// main 上限 75%:防止恢复时主区过大挤压两侧栏(右侧栏在布局末尾最易被挤到亚像素卡死)
main: Math.max(20, Math.min(75, savedLayout.current.main)),
'sidebar-r': Math.max(0, Math.min(40, savedLayout.current.right)),
'activity-r': 3,
}
: undefined;
const persistLayout = useCallback((l) => {
const v = (id) => Math.round(l?.[id] ?? 0);
writeLayout({ left: v('sidebar-l'), main: v('main'), right: v('sidebar-r') });
}, []);
/** 立即保存布局(折叠/展开等程序化变更时兜底,拖拽走 onLayoutChanged */
const saveLayoutNow = useCallback(() => {
try { persistLayout(groupRef.current?.getLayout()); } catch { /* 布局尚未就绪 */ }
}, [persistLayout]);
// 拖拽期间 onLayoutChanged 高频触发:200ms 防抖后再写 localStorage,避免阻塞主线程
const layoutTimer = useRef(null);
const handleLayoutChanged = useCallback((layout, { isUserInteraction }) => {
if (!isUserInteraction) return;
clearTimeout(layoutTimer.current);
layoutTimer.current = setTimeout(() => persistLayout(layout), 200);
}, [persistLayout]);
useEffect(() => () => clearTimeout(layoutTimer.current), []);
/** 程序化调整侧边栏宽度:走 groupRef.setLayout() 整体替换布局。
* 不能再依赖 ref.collapse()/resize()/expand()——RRP 命令式 API 按 pivot 相邻面板分配
* delta,右侧栏的右邻 activity-r 是刚性面板(minSize=maxSize=48px),delta 被其 clamp
* 全部吸收 → 布局不变 → 静默 no-op;拖拽走 Separator(邻面板 main 柔性)所以只有拖拽有效。
* setLayout() 不走 pivotK() 直接归一化 + 逐面板 clamp,目标尺寸落在目标面板上。 */
const applySidebarSize = useCallback((side, targetPx) => {
const group = groupRef.current;
if (!group) return;
const cur = group.getLayout();
// defaultLayoutDeferred 期间 getLayout() 返回 {}setLayout 也不应用——直接跳过
if (!cur || Object.keys(cur).length === 0) return;
// 用任一可见面板换算组宽度:groupPx = inPixels / (asPercentage/100)
let groupPx = 0;
for (const probe of [mainRef.current, rightRef.current, leftRef.current]) {
try {
const g = probe?.getSize();
if (g && g.inPixels > 0 && g.asPercentage > 0) {
groupPx = g.inPixels / (g.asPercentage / 100);
break;
}
} catch { /* 面板尚未就绪 */ }
}
const id = side === 'left' ? 'sidebar-l' : 'sidebar-r';
if (groupPx > 0) {
group.setLayout({ ...cur, [id]: (targetPx / groupPx) * 100 });
} else if (targetPx === 0) {
group.setLayout({ ...cur, [id]: 0 }); // 折叠:无法换算也直接置 0
} else {
group.setLayout({ ...cur, [id]: side === 'left' ? 20 : 25 }); // 退化固定百分比,K 的 clamp 兜底
}
}, []);
const toggleSidebar = useCallback((side) => {
// 用状态(阈值判定)而非 ref.isCollapsed()RRP 零容差比较在亚像素宽度下会误判
const collapsed = side === 'left' ? leftCollapsed : rightCollapsed;
applySidebarSize(side, collapsed ? SIDEBAR_DEFAULT_WIDTH[side] : 0);
setTimeout(saveLayoutNow, 0); // setLayout 的 onLayoutChanged 不带 isUserInteraction,须手动兜底写盘
}, [leftCollapsed, rightCollapsed, applySidebarSize, saveLayoutNow]);
// ---- 视图(活动栏 / 侧栏 / 标签页) ----
const leftActive = layout.activeViewOf('left');
const rightActive = layout.activeViewOf('right');
const leftBarViews = layout.order.left.map((id) => VIEWS[id]).filter(Boolean);
const rightBarViews = layout.order.right.map((id) => VIEWS[id]).filter(Boolean);
// 侧栏只渲染 sidebar 模式的视图(tab 模式的进主区标签页)
const leftPaneViews = leftBarViews.filter((v) => layout.mode[v.id] === VIEW_MODE_SIDEBAR);
const rightPaneViews = rightBarViews.filter((v) => layout.mode[v.id] === VIEW_MODE_SIDEBAR);
const isViewActive = (vid) => {
if (layout.mode[vid] === VIEW_MODE_TAB) return effectiveActiveKey === 'view:' + vid;
const side = layout.sideOf[vid];
return side ? layout.activeViewOf(side) === vid : false;
};
/** 主区标签列表(每次渲染重建,保证 render() 闭包拿到最新状态) */
const buildMainTabs = () => {
const tabs = [];
openPanels.forEach((p) => {
tabs.push({
key: 'panel:' + p.id,
type: 'panel',
title: p.title,
closable: true,
icon: <PanelIcon url={p.embed_url || p.url} title={p.title} size={14} />,
panel: p,
});
});
VIEW_IDS.forEach((id) => {
if (layout.mode[id] !== VIEW_MODE_TAB) return;
const v = VIEWS[id];
tabs.push({
key: 'view:' + id,
type: id,
title: v.label,
closable: true,
icon: <v.Icon sx={{ fontSize: 14, color: 'text.secondary' }} />,
render: () => renderViewContent(id),
});
});
return tabs;
};
// 视图内容渲染(先定义:buildMainTabs / renderPaneView 均依赖)
const renderViewContent = (viewId) => {
if (viewId === 'panels') {
return (
<PanelsView
loading={links === null && !loadError}
error={loadError}
onRetry={reload}
links={links || []}
filtered={filteredPanels}
search={search}
activeId={activeId}
pinned={pinned}
onSelect={openPanel}
onPin={togglePin}
groups={groups}
onToggleGroup={toggleGroup}
modes={modes}
onSetMode={setMode}
onAdd={() => setAddOpen(true)}
/>
);
}
if (viewId === 'notes') return <NotesView />;
if (viewId === 'vault') return <VaultView open={isViewActive('vault')} />;
return null;
};
const mainTabs = buildMainTabs();
// 活动主标签:优先记住的用户选择(含持久化的上次激活项),失效则回退到第一个
const effectiveActiveKey = mainTabs.some((t) => t.key === activeMainKey)
? activeMainKey
: (mainTabs[0]?.key ?? null);
// 打开面板 / 历史导航时自动切到对应 iframe 标签。
// 首次挂载若已有持久化激活项(可能指向 tab 模式视图)则尊重它,只消费一次;
// 之后每次 activeId 变化都同步并持久化。
useEffect(() => {
if (activeId == null) return;
if (mainActiveInit.current) { mainActiveInit.current = null; return; }
const key = 'panel:' + activeId;
setActiveMainKey(key);
persistMainActive(key);
}, [activeId]);
const panelRenderKeys = new Set(renderedIds.map((id) => 'panel:' + id));
const handleSelectTab = (key) => {
setActiveMainKey(key);
persistMainActive(key);
if (key.startsWith('panel:')) openPanel(key.slice('panel:'.length));
};
const handleCloseTab = (key) => {
if (key.startsWith('panel:')) closePanel(key.slice('panel:'.length));
else if (key.startsWith('view:')) setViewModeSafely(key.slice('view:'.length), VIEW_MODE_SIDEBAR);
};
/** 侧边栏 Panel onResize:阈值判定折叠状态(拖拽折叠/亚像素挤压都覆盖) */
const onSidebarResize = useCallback((side) => (size) => {
const px = size && typeof size === 'object' ? size.inPixels : size;
const collapsed = px < SIDEBAR_COLLAPSED_PX;
if (side === 'left') setLeftCollapsed(collapsed);
else setRightCollapsed(collapsed);
}, []);
const categories = [...new Set((links || []).map((p) => p.category || '默认'))];
const handleOpenExternal = () => {
if (activePanel) window.open(activePanel.embed_url || activePanel.url, '_blank', 'noopener');
};
const handleSaved = (panel) => {
showSnack(`已添加「${panel.title}`);
setAddOpen(false);
reload().then(() => openPanel(panel.id, panel));
};
/** 模式切换入口:切换前派发保存事件(记事本立即 flush 未落盘草稿),再切模式 */
const setViewModeSafely = useCallback((viewId, mode) => {
if (viewId === 'notes') {
try { window.dispatchEvent(new CustomEvent('workbench:notes-save-request')); } catch { /* ignore */ }
}
layout.setViewMode(viewId, mode);
}, [layout]);
/** 侧栏内单个视图:ToolWindow 标题栏 + 内容 */
const renderPaneView = (viewId) => {
const v = VIEWS[viewId];
const VIcon = v.Icon;
return (
<>
<ToolWindow
icon={<VIcon sx={{ fontSize: 17, color: 'primary.main' }} />}
title={v.label}
mode={layout.mode[viewId]}
onSetMode={(m) => setViewModeSafely(viewId, m)}
onFloat={() => showSnack('浮动模式即将上线', 'info')}
closeTitle="关闭侧边栏"
onClose={() => {
// X = 关闭整个侧边栏(折叠到 0 宽度),活动栏图标仍可重新展开
const side = layout.sideOf[viewId];
toggleSidebar(side);
}}
/>
<Box sx={{ flex: 1, minHeight: 0, display: 'flex', flexDirection: 'column' }}>
{renderViewContent(viewId)}
</Box>
</>
);
};
const renderPlaceholder = (side) => {
const vid = layout.activeViewOf(side);
const v = VIEWS[vid];
if (!v) return null;
return (
<>
<v.Icon sx={{ fontSize: 28, color: 'text.disabled' }} />
<Typography variant="caption" sx={{ color: 'text.secondary' }}>
{v.label}已在标签页中打开
</Typography>
<Button size="small" variant="outlined" onClick={() => setViewModeSafely(vid, VIEW_MODE_SIDEBAR)}>
移回侧边栏
</Button>
</>
);
};
/** 活动栏图标点击:激活视图 + 展开侧栏;已激活则收起(VSCode 语义) */
const handleActivateView = (viewId, side) => {
const collapsed = side === 'left' ? leftCollapsed : rightCollapsed;
const alreadyActive = layout.activeViewOf(side) === viewId;
setViewModeSafely(viewId, VIEW_MODE_SIDEBAR);
layout.activateView(viewId);
// setLayout 整体替换:展开到默认宽度 / 折叠到 0,绕开 pivot 刚性邻居吸收问题
if (alreadyActive && !collapsed) applySidebarSize(side, 0);
else applySidebarSize(side, SIDEBAR_DEFAULT_WIDTH[side]);
setTimeout(saveLayoutNow, 0);
};
// ---- 菜单栏配置 ----
const menus = [
{
label: '文件', items: [
{ label: '添加面板…', Icon: AddIcon, action: () => setAddOpen(true) },
{ label: '刷新面板列表', Icon: RefreshIcon, action: () => reload() },
{ divider: true },
{ label: '返回前台', Icon: HomeIcon, action: () => { window.location.href = '/'; } },
],
},
{
label: '编辑', items: [
{ label: '搜索面板', Icon: SearchIcon, action: () => searchRef.current?.focus() },
{ label: '刷新当前面板', Icon: RefreshIcon, action: () => { if (activePanel) setMainRefresh((n) => n + 1); } },
],
},
{
label: '视图', items: [
{ label: '切换左侧边栏', Icon: ViewSidebarIcon, action: () => toggleSidebar('left') },
{ label: '切换右侧边栏', Icon: ViewSidebarIcon, action: () => toggleSidebar('right') },
{ divider: true },
...VIEW_IDS.map((id) => ({
label: VIEWS[id].label,
Icon: VIEWS[id].Icon,
action: () => { setViewModeSafely(id, VIEW_MODE_SIDEBAR); layout.activateView(id); },
})),
],
},
{
label: '终端', items: [
// 终端功能临时下线(TerminalPanel 已归档到 archive/),保留占位提示,后续恢复
{ label: '终端功能即将回归', Icon: TerminalIcon },
],
},
{
label: '帮助', items: [
{ label: '关于工作台', Icon: InfoOutlinedIcon, action: () => setAboutOpen(true) },
{ label: '管理后台', Icon: SettingsIcon, action: () => { window.location.href = '/admin/dashboard'; } },
],
},
];
// ---- dnd-kit 拖拽(活动栏标签换边 / 同侧排序;键盘操作走 Tab+Enter 激活) ----
const sensors = useSensors(
useSensor(PointerSensor, { activationConstraint: { distance: 5 } })
);
const handleDragStart = (event) => {
const id = String(event.active.id);
if (!id.startsWith('view:')) return;
const v = VIEWS[id.slice('view:'.length)];
if (v) setActiveDrag({ id: v.id, label: v.label, Icon: v.Icon });
};
const handleDragEnd = (event) => {
setActiveDrag(null);
const { active, over } = event;
if (!over) return;
const vid = String(active.id).replace(/^view:/, '');
if (!VIEWS[vid]) return;
const overStr = String(over.id);
if (overStr.startsWith('activity:')) {
const side = overStr.slice('activity:'.length);
layout.moveView(vid, side);
} else if (overStr.startsWith('view:')) {
const overVid = overStr.slice('view:'.length);
const mySide = layout.sideOf[vid];
const overSide = layout.sideOf[overVid];
if (mySide && overSide && mySide === overSide) layout.reorderView(vid, overVid);
else if (overSide) layout.moveView(vid, overSide);
}
};
// ---- 主区内容(加载/错误/空态;有标签时一律走 ContentView 分发) ----
let mainBody;
if (links === null && !loadError) {
mainBody = (
<Box sx={{ flex: 1, display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
<CircularProgress size={36} />
</Box>
);
} else if (loadError) {
mainBody = (
<EmptyState
icon={<ErrorIcon sx={{ fontSize: 44, color: 'error.main' }} />}
title="面板列表加载失败"
hint={loadError}
action="重试"
onAction={reload}
/>
);
} else if (mainTabs.length === 0 && links.length === 0) {
mainBody = (
<EmptyState
icon={<WidgetsIcon sx={{ fontSize: 44, color: 'primary.main' }} />}
title="还没有任何面板"
hint="添加常用后台 / 监控 / 工具站到工作台,一个界面全部打开"
action="添加第一个面板"
onAction={() => setAddOpen(true)}
/>
);
} else if (mainTabs.length === 0) {
mainBody = (
<EmptyState
icon={<WidgetsIcon sx={{ fontSize: 44, color: 'text.disabled' }} />}
title="未打开面板"
hint="从左侧选择一个面板开始,或搜索后按 Enter 直达"
action="打开一个面板"
onAction={() => { if (filteredPanels[0]) openPanel(filteredPanels[0].id); }}
/>
);
} else {
mainBody = (
<ContentView
tabs={mainTabs}
activeKey={effectiveActiveKey}
refreshNonce={mainRefresh}
panelRenderKeys={panelRenderKeys}
/>
);
}
return (
<>
<Toolbar
menus={menus}
canBack={canBack}
canForward={canForward}
onBack={goBack}
onForward={goForward}
onRefresh={() => { if (activePanel) setMainRefresh((n) => n + 1); }}
currentPanel={activePanel}
onOpenExternal={handleOpenExternal}
search={search}
onSearchChange={setSearch}
onSearchEnter={() => {
if (!openFirstMatch() && search.trim()) showSnack('未找到匹配的面板', 'info');
}}
searchInputRef={searchRef}
onBackHome={() => { window.location.href = '/'; }}
/>
<DndContext
sensors={sensors}
collisionDetection={closestCenter}
onDragStart={handleDragStart}
onDragEnd={handleDragEnd}
onDragCancel={() => setActiveDrag(null)}
>
<Group
orientation="horizontal"
defaultLayout={defaultLayout}
onLayoutChanged={handleLayoutChanged}
groupRef={groupRef}
style={{ flex: 1, minHeight: 0, display: 'flex' }}
>
{/* 左侧活动栏 */}
<Panel id="activity-l" defaultSize={48} minSize={48} maxSize={48}>
<ActivityBar
side="left"
views={leftBarViews}
activeId={leftActive}
onActivate={(id) => handleActivateView(id, 'left')}
/>
</Panel>
<ResizeSeparator disabled />
{/* 左侧侧边栏 */}
<Panel id="sidebar-l" defaultSize={240} minSize={180} maxSize={360} collapsible collapsedSize={0} panelRef={leftRef} onResize={onSidebarResize('left')}>
<SidebarPane
side="left"
views={leftPaneViews}
activeId={leftActive}
renderView={renderPaneView}
renderPlaceholder={() => renderPlaceholder('left')}
/>
</Panel>
<ResizeSeparator />
{/* 主区:标签条 + 内容 + 底部终端 */}
<Panel id="main" minSize={320} panelRef={mainRef}>
{/* 注意:RRP Panel 内容容器是 block 布局(maxHeight:100% + flexGrow:1),
这里必须用 height:'100%' 而非 flex:1,否则高度塌陷导致内容挤顶部 */}
<Box sx={{ height: '100%', display: 'flex', flexDirection: 'column', minWidth: 0, overflow: 'hidden', position: 'relative' }}>
{mainTabs.length > 0 && (
<TabStrip
tabs={mainTabs}
activeKey={effectiveActiveKey}
onSelect={handleSelectTab}
onClose={handleCloseTab}
onAdd={() => setAddOpen(true)}
/>
)}
<Box sx={{ flex: 1, minHeight: 0, display: 'flex', position: 'relative', overflow: 'hidden' }}>
{mainBody}
</Box>
{/* 侧边栏折叠箭头:贴主区整高的边缘(即侧边栏与主区 Separator 位置)垂直居中,
折叠为 0 后主区仍在 → 箭头始终可点,支持再点击展开 */}
<CollapseArrow side="left" collapsed={leftCollapsed} onToggle={() => toggleSidebar('left')} />
<CollapseArrow side="right" collapsed={rightCollapsed} onToggle={() => toggleSidebar('right')} />
</Box>
</Panel>
<ResizeSeparator />
{/* 右侧侧边栏 */}
<Panel id="sidebar-r" defaultSize={300} minSize={200} maxSize={480} collapsible collapsedSize={0} panelRef={rightRef} onResize={onSidebarResize('right')}>
<SidebarPane
side="right"
views={rightPaneViews}
activeId={rightActive}
renderView={renderPaneView}
renderPlaceholder={() => renderPlaceholder('right')}
/>
</Panel>
<ResizeSeparator disabled />
{/* 右侧活动栏 */}
<Panel id="activity-r" defaultSize={48} minSize={48} maxSize={48}>
<ActivityBar
side="right"
views={rightBarViews}
activeId={rightActive}
onActivate={(id) => handleActivateView(id, 'right')}
/>
</Panel>
</Group>
{/* 拖拽浮层(纯展示,禁止渲染 useSortable 组件) */}
<DragOverlay dropAnimation={null}>
{activeDrag ? (
<Box
sx={{
px: 1.25, py: 1, borderRadius: 2,
bgcolor: 'background.paper', border: 1, borderColor: 'primary.main',
boxShadow: (t) => t.shadows[6],
display: 'flex', alignItems: 'center', gap: 1,
fontSize: 12.5, fontWeight: 600,
}}
>
<activeDrag.Icon sx={{ fontSize: 16, color: 'primary.main' }} />
{activeDrag.label}
</Box>
) : null}
</DragOverlay>
</DndContext>
<StatusBar left={`已打开 ${openPanels.length} 个面板${activePanel ? ` · ${activePanel.title}` : ''}`} />
<AddPanelDialog
open={addOpen}
onClose={() => setAddOpen(false)}
categories={categories}
onSaved={handleSaved}
onSetMode={setMode}
/>
{/* 弹窗打开方式:Dialog 内嵌 PanelFrame */}
{modalPanel && (
<Dialog
open
fullWidth
maxWidth="lg"
onClose={closeModal}
sx={{ '& .MuiDialog-paper': { height: '85vh', maxHeight: '85vh' } }}
>
<DialogTitle sx={{ display: 'flex', alignItems: 'center', gap: 1, py: 1.5, pr: 1 }}>
<PanelIcon url={modalPanel.embed_url || modalPanel.url} title={modalPanel.title} size={22} />
<Typography noWrap sx={{ flex: 1, fontSize: 16, fontWeight: 500 }}>
{modalPanel.title}
</Typography>
<Tooltip title="在新标签页打开">
<IconButton
size="small"
onClick={() => window.open(modalPanel.embed_url || modalPanel.url, '_blank', 'noopener')}
>
<OpenInNewIcon fontSize="small" />
</IconButton>
</Tooltip>
<Tooltip title="刷新">
<IconButton size="small" onClick={() => setModalRefresh((n) => n + 1)}>
<RefreshIcon fontSize="small" />
</IconButton>
</Tooltip>
<IconButton size="small" onClick={closeModal} aria-label="关闭弹窗">
<CloseIcon fontSize="small" />
</IconButton>
</DialogTitle>
<DialogContent sx={{ p: 0, display: 'flex', flex: 1, minHeight: 0 }}>
<PanelFrame panel={modalPanel} active refreshNonce={modalRefresh} />
</DialogContent>
</Dialog>
)}
<AboutDialog open={aboutOpen} onClose={() => setAboutOpen(false)} />
<SnackHost />
</>
);
}
export default function Workbench() {
return (
<AdminGuard>
<Box
sx={{
display: 'flex', flexDirection: 'column', height: '100vh', overflow: 'hidden',
bgcolor: 'background.default',
}}
>
<WorkbenchContent />
</Box>
</AdminGuard>
);
}
@@ -0,0 +1,752 @@
import React, {
forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState,
} from 'react';
import Box from '@mui/material/Box';
import Typography from '@mui/material/Typography';
import IconButton from '@mui/material/IconButton';
import Tooltip from '@mui/material/Tooltip';
import Button from '@mui/material/Button';
import TextField from '@mui/material/TextField';
import InputAdornment from '@mui/material/InputAdornment';
import CircularProgress from '@mui/material/CircularProgress';
import AddIcon from '@mui/icons-material/Add';
import CloseIcon from '@mui/icons-material/Close';
import LockIcon from '@mui/icons-material/Lock';
import LockOpenIcon from '@mui/icons-material/LockOpen';
import ErrorIcon from '@mui/icons-material/Error';
import VisibilityIcon from '@mui/icons-material/Visibility';
import VisibilityOffIcon from '@mui/icons-material/VisibilityOff';
import TerminalIcon from '@mui/icons-material/Terminal';
import RefreshIcon from '@mui/icons-material/Refresh';
import Stack from '@mui/material/Stack';
import { useTheme } from '@mui/material/styles';
import { Terminal } from '@xterm/xterm';
import '@xterm/xterm/css/xterm.css';
import { FitAddon } from '@xterm/addon-fit';
import { Unicode11Addon } from '@xterm/addon-unicode11';
import { terminalStatus, terminalAuth } from '../../../api/terminal.js';
import { showSnack } from '../../../admin/snack.jsx';
/* ============================================================
* TerminalPanel:底部终端面板(xterm.js v6
*
* 安全门禁(后端 routes/terminal.js 契约):
* /api/terminal/status → hasPin ? /api/terminal/auth(pin) → 短 TTL token
* → ws(s)://host/ws/terminal?token=…(Root shelladmin + 终端密码双认证)
*
* - 最多 3 个会话(标签页切换,keep-alivedisplay 显隐不销毁)
* - 消息协议:输入/输出二进制;控制 JSON {type:'auth'|'resize'|'ping'|'bye'}
* - 断线指数退避重连 [250,500,1000,2000,4000,8000],恢复后 term.reset()
* - 关闭码:4001 token 过期→回 PIN 门;1013/503 会话满;1011 node-pty 不可用;
* 1000(exit)/4000(空闲) 为服务端主动终止→会话结束,需用户显式「重新连接」
* (不自动重生 root shell);仅 1006 等网络异常自动重连
* - CJK 必装 unicode11,字体栈 JetBrains Mono + Noto Sans Mono CJK SC
* - 明暗主题由 MUI MD3 palette 派生,随 data-theme 切换自动更新
* ============================================================ */
const MAX_SESSIONS = 3;
const BACKOFF = [250, 500, 1000, 2000, 4000, 8000];
const PING_MS = 30000;
const TOKEN_MARGIN_MS = 4 * 60 * 1000; // 5 分钟 TTL,提前 1 分钟视为过期
const FONT = '"JetBrains Mono","Noto Sans Mono CJK SC","Microsoft YaHei",monospace';
/* ---------- 颜色工具(由 MD3 palette 派生,不硬编码) ---------- */
function hexToRgb(hex) {
let h = String(hex).replace('#', '');
if (h.length === 3) h = h.split('').map((c) => c + c).join('');
if (!/^[0-9a-f]{6}$/i.test(h)) return [128, 128, 128];
const n = parseInt(h, 16);
return [(n >> 16) & 255, (n >> 8) & 255, n & 255];
}
function mixHex(a, b, w) {
const ca = hexToRgb(a);
const cb = hexToRgb(b);
return `#${ca.map((v, i) => Math.round(v + (cb[i] - v) * w).toString(16).padStart(2, '0')).join('')}`;
}
function xtermTheme(muiTheme) {
const p = muiTheme.palette;
const dark = p.mode === 'dark';
const bg = p.background.paper;
const black = mixHex(p.text.primary, bg, 0.6);
const brightBlack = mixHex(p.text.primary, bg, 0.2);
const base = [
black, // 0 黑
p.error.main, // 1 红
p.success.main, // 2 绿
p.warning.main, // 3 黄
p.info.main, // 4 蓝
p.tertiary.main, // 5 品红
mixHex(p.secondary.main, p.info.main, 0.5), // 6 青
p.text.primary, // 7 白
];
const bright = base.map((c) => mixHex(c, dark ? '#ffffff' : '#000000', dark ? 0.55 : 0.45));
const name = ['black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white'];
const out = {
background: bg,
foreground: p.text.primary,
cursor: p.primary.main,
cursorAccent: bg,
selectionBackground: mixHex(p.primary.main, bg, 0.72),
brightBlack,
};
name.forEach((n, i) => { out[n] = base[i]; out['bright' + n[0].toUpperCase() + n.slice(1)] = bright[i]; });
return out;
}
/* ---------- WebSocket URL ---------- */
// 认证 token 由 /api/terminal/auth 种 HttpOnly cookieterminal_token5 分钟),
// WS 握手同源自动携带,不再拼 ?token= 到 URL(避免落入 access log)。
function wsUrl() {
const proto = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
return `${proto}//${window.location.host}/ws/terminal`;
}
/**
* 终端面板
* @param {{open: boolean}} props open=底部面板是否展开(展开才查状态;收起 keep-alive
* @ref newSession() / lock()
*/
const TerminalPanel = forwardRef(function TerminalPanel({ open = false }, ref) {
const muiTheme = useTheme();
const themeObj = useMemo(() => xtermTheme(muiTheme), [muiTheme]);
// ---- 门禁状态:checking | needs-setup | locked | ready | error ----
const [gate, setGate] = useState('checking');
const [gateError, setGateError] = useState('');
const [pinInput, setPinInput] = useState('');
const [showPin, setShowPin] = useState(false);
const [pinBusy, setPinBusy] = useState(false);
// ---- 会话:{id,title,status} + 底层实例(term/ws 等) ----
const [sessions, setSessions] = useState([]);
const [activeId, setActiveId] = useState(null);
const [banner, setBanner] = useState(null); // {type:'warn'|'error', text}
const instRef = useRef({}); // id → {term,fit,ro,ws,backoffIdx,timers,autoReconnect,closed}
const tokenRef = useRef({ value: null, expiresAt: 0 });
const seqRef = useRef(0);
const stripRef = useRef(null); // 会话标签条(方向键 roving tabindex 用)
const patchStatus = useCallback((id, status) => {
setSessions((prev) => prev.map((s) => (s.id === id ? { ...s, status } : s)));
}, []);
/* ---------- WS 连接层(一次性初始化,全走 ref,无陈旧闭包) ---------- */
const manager = useRef(null);
if (!manager.current) {
const M = {};
M.sendResize = (id) => {
const inst = instRef.current[id];
if (!inst || !inst.ws || inst.ws.readyState !== 1 || !inst.term) return;
try {
inst.ws.send(JSON.stringify({ type: 'resize', cols: inst.term.cols, rows: inst.term.rows }));
} catch { /* ignore */ }
};
M.handleControl = (id, text) => {
try {
const msg = JSON.parse(text);
if (msg.type === 'bye') { /* server 主动结束,交由 close 处理 */ }
// 'pong' / 未知控制消息忽略
} catch { /* 非 JSON 文本忽略 */ }
};
M.scheduleReconnect = (id) => {
const inst = instRef.current[id];
if (!inst || inst.closed) return;
const delay = BACKOFF[Math.min(inst.backoffIdx, BACKOFF.length - 1)];
inst.backoffIdx = Math.min(inst.backoffIdx + 1, BACKOFF.length - 1);
clearTimeout(inst.reconnectTimer);
inst.reconnectTimer = setTimeout(() => M.connectSession(id), delay);
};
M.connectSession = async (id) => {
const inst = instRef.current[id];
if (!inst || inst.closed) return;
// 防双 WS 竞态:关闭旧连接并置空其回调(避免旧 onclose 触发多余重连)
try {
if (inst.ws) { inst.ws.onclose = null; inst.ws.onerror = null; try { inst.ws.close(); } catch {} }
} catch {}
inst.ws = null;
clearTimeout(inst.reconnectTimer);
clearInterval(inst.pingTimer);
inst.gen = (inst.gen || 0) + 1;
const gen = inst.gen;
patchStatus(id, 'connecting');
// 无有效 token → 回 PIN 门(4001 过期或从未认证)
const token = tokenRef.current.value;
if (!token) {
inst.autoReconnect = false;
setGate('locked');
setGateError('终端密码已过期,请重新输入');
return;
}
// 先查状态:后端不可用 / 会话满 给明确提示,避免盲连
try {
const st = await terminalStatus();
if (st.sessions >= st.maxSessions) {
inst.autoReconnect = false;
patchStatus(id, 'error');
setBanner({ type: 'error', text: '终端会话数已达上限(最多 3 个),请稍后再试' });
return;
}
} catch {
if (!inst.closed && gen === inst.gen) {
setBanner({ type: 'warn', text: '终端服务未连接,正在重试…' });
patchStatus(id, 'reconnecting');
M.scheduleReconnect(id);
}
return;
}
let ws = null;
try { ws = new WebSocket(wsUrl()); } catch { /* 构造失败走 onerror/onclose */ }
if (!ws) { M.scheduleReconnect(id); return; }
inst.ws = ws;
ws.binaryType = 'arraybuffer';
ws.onopen = () => {
if (inst.closed || gen !== inst.gen) { try { ws.close(); } catch {} return; }
inst.backoffIdx = 0;
setBanner(null);
try { ws.send(JSON.stringify({ type: 'auth', token })); } catch {}
M.sendResize(id);
// 断线恢复后清屏,避免旧输出残留
try { inst.term?.reset(); } catch {}
patchStatus(id, 'connected');
inst.pingTimer = setInterval(() => {
if (inst.closed || gen !== inst.gen || ws.readyState !== 1) return;
try { ws.send(JSON.stringify({ type: 'ping' })); } catch {}
}, PING_MS);
};
ws.onmessage = (ev) => {
if (inst.closed || gen !== inst.gen) return;
if (typeof ev.data === 'string') { M.handleControl(id, ev.data); return; }
try {
inst.term?.write(ev.data instanceof ArrayBuffer ? new Uint8Array(ev.data) : ev.data);
} catch { /* ignore */ }
};
ws.onerror = () => { try { ws.close(); } catch {} };
ws.onclose = (ev) => {
if (inst.closed || gen !== inst.gen) return;
clearInterval(inst.pingTimer);
inst.ws = null;
// 关闭码语义(后端 routes/terminal.js 定义)
if (ev.code === 4001) { // token 无效/过期 → 回 PIN 门重新认证
tokenRef.current = { value: null, expiresAt: 0 };
inst.autoReconnect = false;
setGate('locked');
setGateError('终端密码已过期,请重新输入');
return;
}
if (ev.code === 1013 || ev.code === 503) { // 会话超限
inst.autoReconnect = false;
patchStatus(id, 'error');
setBanner({ type: 'error', text: '终端会话数已达上限(最多 3 个),请稍后再试' });
return;
}
if (ev.code === 1011) { // pty 启动失败 / node-pty 未安装
inst.autoReconnect = false;
patchStatus(id, 'error');
setBanner({ type: 'error', text: '终端服务不可用:node-pty 未安装或启动失败' });
return;
}
// 服务端主动结束会话:exit(1000) / 空闲超时(4000)
// 视为会话终止,不自动重生新 root shell;由用户显式「重新连接」
if (ev.code === 1000 || ev.code === 4000) {
inst.autoReconnect = false;
inst.endedReason = ev.code === 4000 ? 'idle' : 'exit';
patchStatus(id, 'ended');
return;
}
// 其余(1006 网络异常等)→ 指数退避自动重连
setBanner({ type: 'warn', text: '终端服务未连接,正在重试…' });
if (inst.autoReconnect) { patchStatus(id, 'reconnecting'); M.scheduleReconnect(id); }
else patchStatus(id, 'error');
};
};
manager.current = M;
}
/* ---------- 门禁 ---------- */
const checkGate = useCallback(async () => {
setGate('checking');
setGateError('');
try {
const st = await terminalStatus();
if (tokenRef.current.value && Date.now() < tokenRef.current.expiresAt) { setGate('ready'); return; }
setGate(st.hasPin ? 'locked' : 'needs-setup');
} catch (e) {
setGate('error');
setGateError(e.message || '无法连接终端服务');
}
}, []);
// 首次展开面板才查状态(收起时 keep-alive,不重复请求)
useEffect(() => {
if (open && gate === 'checking') checkGate();
}, [open, gate, checkGate]);
const submitPin = useCallback(async () => {
const pin = pinInput.trim();
if (!pin) { setGateError('请输入终端密码'); return; }
setPinBusy(true);
setGateError('');
try {
const res = await terminalAuth(pin);
tokenRef.current = { value: res.token, expiresAt: Date.now() + TOKEN_MARGIN_MS };
setPinInput('');
setShowPin(false);
setGate('ready');
// 有会话在等 token → 全部重新连接
Object.keys(instRef.current).forEach((id) => {
const inst = instRef.current[id];
if (inst && !inst.closed) { inst.autoReconnect = true; manager.current.connectSession(id); }
});
} catch (e) {
setGateError(e.message || '认证失败');
setPinInput('');
} finally {
setPinBusy(false);
}
}, [pinInput]);
/* ---------- 会话生命周期 ---------- */
const newSession = useCallback(() => {
if (gate !== 'ready') {
showSnack('请先解锁终端', 'info');
return;
}
const live = Object.keys(instRef.current).filter((k) => instRef.current[k] && !instRef.current[k].closed);
if (live.length >= MAX_SESSIONS) {
setBanner({ type: 'error', text: `终端会话数已达上限(最多 ${MAX_SESSIONS} 个)` });
return;
}
seqRef.current += 1;
const id = 't' + seqRef.current;
instRef.current[id] = {
id, term: null, fit: null, ro: null, ws: null,
backoffIdx: 0, reconnectTimer: null, pingTimer: null,
autoReconnect: true, closed: false, gen: 0,
};
setSessions((prev) => [...prev, { id, title: `终端 ${seqRef.current}`, status: 'connecting' }]);
setActiveId(id);
setBanner(null);
}, [gate]);
const closeSession = useCallback((id) => {
const inst = instRef.current[id];
if (!inst) return;
inst.closed = true;
clearTimeout(inst.reconnectTimer);
clearInterval(inst.pingTimer);
try { if (inst.ws && inst.ws.readyState === 1) inst.ws.send(JSON.stringify({ type: 'bye' })); } catch {}
try { inst.ws?.close(1000, 'bye'); } catch {}
try { inst.term?.dispose(); } catch {}
try { inst.ro?.disconnect(); } catch {}
instRef.current[id] = null;
// 状态更新不嵌套:先算剩余列表,再分别 set(避免 updater 内副作用)
const remaining = sessions.filter((s) => s.id !== id);
setSessions(remaining);
setActiveId((cur) => (cur === id ? (remaining[remaining.length - 1]?.id ?? null) : cur));
setBanner(null);
}, [sessions]);
const lockTerminal = useCallback(() => {
tokenRef.current = { value: null, expiresAt: 0 };
Object.keys(instRef.current).forEach((id) => {
const inst = instRef.current[id];
if (!inst) return;
inst.closed = true;
clearTimeout(inst.reconnectTimer);
clearInterval(inst.pingTimer);
try { inst.ws?.close(1000, 'bye'); } catch {}
try { inst.term?.dispose(); } catch {}
try { inst.ro?.disconnect(); } catch {}
instRef.current[id] = null;
});
setSessions([]);
setActiveId(null);
setBanner(null);
setGate('locked');
}, []);
useImperativeHandle(ref, () => ({ newSession, lock: lockTerminal }), [newSession, lockTerminal]);
// 解锁后自动建首个会话
useEffect(() => {
if (gate === 'ready' && sessions.length === 0) newSession();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [gate]);
// 卸载时统一销毁(keep-alive 场景下不触发)
useEffect(() => () => {
Object.keys(instRef.current).forEach((id) => {
const inst = instRef.current[id];
if (!inst) return;
inst.closed = true;
clearTimeout(inst.reconnectTimer);
clearInterval(inst.pingTimer);
try { inst.ws?.close(); } catch {}
try { inst.term?.dispose(); } catch {}
try { inst.ro?.disconnect(); } catch {}
});
}, []);
// 主题随 muiTheme / data-theme 更新(后台主题静态,运行期一般不触发)
useEffect(() => {
Object.keys(instRef.current).forEach((id) => {
const inst = instRef.current[id];
if (inst?.term) inst.term.options.theme = themeObj;
});
}, [themeObj]);
/** xterm 挂载点:会话创建后容器出现时调用;隐藏恢复时重新 fit */
const mountTerminal = useCallback((id, el) => {
const inst = instRef.current[id];
if (!inst || !el) return;
if (inst.term) {
requestAnimationFrame(() => {
try {
if (el.clientWidth > 0 && el.clientHeight > 0) { inst.fit?.fit(); manager.current.sendResize(id); }
} catch {}
});
return;
}
let term;
let fit = null;
try {
term = new Terminal({
fontSize: 13,
fontFamily: FONT,
lineHeight: 1.35,
cursorBlink: true,
scrollback: 3000,
theme: themeObj,
});
fit = new FitAddon();
term.loadAddon(fit);
term.loadAddon(new Unicode11Addon());
term.unicode.activeVersion = '11';
term.open(el);
inst.term = term;
inst.fit = fit;
} catch (e) {
// xterm 初始化异常:显式报错而非白屏/整树崩溃
console.error('[TerminalPanel] xterm 初始化失败:', e);
patchStatus(id, 'error');
setBanner({ type: 'error', text: `终端初始化失败:${e?.message || '未知错误'}` });
return;
}
term.onData((d) => {
const ws = inst.ws;
if (!ws || ws.readyState !== 1) return;
try { ws.send(new TextEncoder().encode(d)); } catch {}
});
term.onResize(({ cols, rows }) => {
const ws = inst.ws;
if (ws && ws.readyState === 1) {
try { ws.send(JSON.stringify({ type: 'resize', cols, rows })); } catch {}
}
});
const ro = new ResizeObserver(() => {
if (el.clientWidth > 0 && el.clientHeight > 0) {
try { fit.fit(); manager.current.sendResize(id); } catch {}
}
});
ro.observe(el);
inst.ro = ro;
// rAF fit 同样做尺寸守卫:容器零尺寸时跳过,避免 0 行列渲染成空白
requestAnimationFrame(() => {
try {
if (el.clientWidth > 0 && el.clientHeight > 0) { inst.fit.fit(); manager.current.sendResize(id); }
} catch {}
});
manager.current.connectSession(id);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [themeObj]);
/* ---------- 渲染 ---------- */
// PIN / 设置门禁
if (gate === 'checking' || gate === 'needs-setup' || gate === 'locked' || gate === 'error') {
return (
<Box sx={{ flex: 1, minHeight: 0, display: 'flex', flexDirection: 'column', bgcolor: 'background.paper' }}>
{gate === 'checking' && (
<Box sx={{ flex: 1, display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', gap: 1.5 }}>
<CircularProgress size={26} />
<Typography variant="caption" sx={{ color: 'text.secondary' }}>正在检查终端服务</Typography>
</Box>
)}
{gate === 'error' && (
<Box sx={{ flex: 1, display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', gap: 1.5, px: 3, textAlign: 'center' }}>
<ErrorIcon sx={{ fontSize: 38, color: 'error.main' }} />
<Typography variant="body2" sx={{ color: 'text.secondary' }}>{gateError || '无法连接终端服务'}</Typography>
<Button size="small" variant="outlined" onClick={checkGate}>重试</Button>
</Box>
)}
{(gate === 'needs-setup' || gate === 'locked') && (
<Box component="form" onSubmit={(e) => { e.preventDefault(); submitPin(); }} sx={{ flex: 1, display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', gap: 1, px: 3 }}>
<TerminalIcon sx={{ fontSize: 34, color: 'primary.main', mb: 0.5 }} />
<Typography sx={{ fontWeight: 600, fontSize: 15 }}>
{gate === 'needs-setup' ? '首次使用:设置终端密码' : '输入终端密码解锁'}
</Typography>
<Typography variant="caption" sx={{ color: 'text.secondary', textAlign: 'center', mb: 1 }}>
{gate === 'needs-setup'
? '终端为管理员 Root Shell,请设置专用密码(至少 8 位,与账号密码独立)'
: '终端密码与账号密码相互独立,仅管理员可访问'}
</Typography>
<TextField
autoFocus
size="small"
type={showPin ? 'text' : 'password'}
label="终端密码"
value={pinInput}
onChange={(e) => { setPinInput(e.target.value); if (gateError) setGateError(''); }}
error={!!gateError}
helperText={gateError || ' '}
autoComplete={gate === 'needs-setup' ? 'new-password' : 'current-password'}
slotProps={{
htmlInput: { maxLength: 128, 'aria-label': '终端密码' },
input: {
endAdornment: (
<InputAdornment position="end">
<IconButton size="small" edge="end" aria-label={showPin ? '隐藏密码' : '显示密码'} onClick={() => setShowPin((v) => !v)}>
{showPin ? <VisibilityOffIcon fontSize="small" /> : <VisibilityIcon fontSize="small" />}
</IconButton>
</InputAdornment>
),
},
}}
sx={{ width: 300, maxWidth: '100%' }}
/>
<Button
type="submit"
variant="contained"
disabled={pinBusy || !pinInput}
startIcon={pinBusy ? <CircularProgress size={16} color="inherit" /> : <LockOpenIcon />}
sx={{ mt: 1 }}
>
{pinBusy ? '处理中…' : gate === 'needs-setup' ? '设置并连接' : '解锁终端'}
</Button>
</Box>
)}
</Box>
);
}
// ready:会话标签栏 + 终端
const live = sessions.length;
const tabEls = () => Array.from(stripRef.current?.querySelectorAll('[role="tab"]') || []);
const moveSessionTab = (i) => {
const n = sessions.length;
if (n === 0) return;
const j = ((i % n) + n) % n;
setActiveId(sessions[j].id);
tabEls()[j]?.focus();
};
const handleTabKeyDown = (e, index) => {
if (e.key === 'ArrowRight') { e.preventDefault(); moveSessionTab(index + 1); }
else if (e.key === 'ArrowLeft') { e.preventDefault(); moveSessionTab(index - 1); }
else if (e.key === 'Home') { e.preventDefault(); moveSessionTab(0); }
else if (e.key === 'End') { e.preventDefault(); moveSessionTab(sessions.length - 1); }
};
/** 会话结束后显式重连:新建 WS 连接 = 服务端 spawn 新 shell */
const reconnectSession = (id) => {
const inst = instRef.current[id];
if (!inst) return;
inst.autoReconnect = true;
delete inst.endedReason;
manager.current.connectSession(id);
};
return (
<Box sx={{ flex: 1, minHeight: 0, display: 'flex', flexDirection: 'column', bgcolor: 'background.paper' }}>
{/* 会话标签栏 */}
<Box
ref={stripRef}
role="tablist"
aria-label="终端会话"
sx={{
display: 'flex', alignItems: 'center', gap: 0.25, px: 0.5, height: 32, flexShrink: 0,
borderBottom: 1, borderColor: 'divider',
}}
>
{sessions.map((s, index) => {
const active = s.id === activeId;
return (
<Box
key={s.id}
id={`wb-term-tab-${s.id}`}
role="tab"
aria-selected={active}
aria-controls={`wb-term-panel-${s.id}`}
tabIndex={active ? 0 : -1}
onClick={() => setActiveId(s.id)}
onKeyDown={(e) => handleTabKeyDown(e, index)}
sx={{
display: 'flex', alignItems: 'center', gap: 0.5, pl: 1, pr: 0.25,
height: 24, borderRadius: 0.5, cursor: 'pointer', flexShrink: 0, outline: 'none',
bgcolor: active ? 'action.selected' : 'transparent',
color: active ? 'text.primary' : 'text.secondary',
'&:hover': { bgcolor: active ? 'action.selected' : 'action.hover' },
'&:focus-visible': { boxShadow: (t) => `inset 0 0 0 2px ${t.palette.primary.main}` },
}}
>
<Box
component="span"
aria-hidden
sx={{
width: 7, height: 7, borderRadius: '50%', flexShrink: 0,
bgcolor: s.status === 'connected' ? 'success.main'
: s.status === 'error' ? 'error.main'
: s.status === 'ended' ? 'text.disabled' : 'warning.main',
}}
/>
<Typography sx={{ fontSize: 12, fontWeight: active ? 600 : 500 }}>{s.title}</Typography>
{live > 1 && (
<IconButton
size="small"
onClick={(e) => { e.stopPropagation(); closeSession(s.id); }}
aria-label={`关闭 ${s.title}`}
sx={{ width: 24, height: 24, borderRadius: 0.5, '& svg': { fontSize: 15 } }}
>
<CloseIcon />
</IconButton>
)}
</Box>
);
})}
{live < MAX_SESSIONS && (
<Tooltip title="新建终端会话">
<IconButton size="small" onClick={newSession} aria-label="新建终端会话" sx={{ ml: 0.25 }}>
<AddIcon sx={{ fontSize: 15 }} />
</IconButton>
</Tooltip>
)}
<Box sx={{ flex: 1 }} />
<Tooltip title="锁定终端(需重新输入密码)">
<IconButton size="small" onClick={lockTerminal} aria-label="锁定终端" sx={{ mr: 0.25 }}>
<LockIcon sx={{ fontSize: 15 }} />
</IconButton>
</Tooltip>
</Box>
{/* 连接状态横幅 */}
{banner && (
<Box
role="status"
sx={{
display: 'flex', alignItems: 'center', gap: 1, px: 1.5, py: 0.5, flexShrink: 0,
bgcolor: banner.type === 'error' ? 'error.main' : 'warning.main',
color: banner.type === 'error' ? 'error.contrastText' : 'warning.contrastText',
borderBottom: 1, borderColor: 'divider',
}}
>
<Box
component="span"
aria-hidden
sx={{ width: 7, height: 7, borderRadius: '50%', flexShrink: 0, bgcolor: 'currentColor', opacity: 0.8 }}
/>
<Typography variant="caption" sx={{ flex: 1, fontWeight: 500 }}>{banner.text}</Typography>
<Button
size="small"
onClick={() => Object.keys(instRef.current).forEach((id) => {
const inst = instRef.current[id];
if (inst && !inst.closed) { inst.autoReconnect = true; manager.current.connectSession(id); }
})}
sx={{ minHeight: 24, px: 1, color: 'inherit' }}
>
重试
</Button>
<IconButton size="small" onClick={() => setBanner(null)} aria-label="关闭提示" sx={{ color: 'inherit' }}>
<CloseIcon sx={{ fontSize: 15 }} />
</IconButton>
</Box>
)}
{/* 终端区 */}
<Box sx={{ flex: 1, minHeight: 0, position: 'relative', bgcolor: 'background.paper' }}>
{sessions.map((s) => (
<Box
key={s.id}
id={`wb-term-panel-${s.id}`}
role="tabpanel"
aria-labelledby={`wb-term-tab-${s.id}`}
sx={{
position: 'absolute', inset: 0,
display: activeId === s.id ? 'block' : 'none',
}}
>
<Box ref={(el) => mountTerminal(s.id, el)} sx={{ width: '100%', height: '100%' }} />
{/* 未连接状态条:防止"白屏"——始终可见的连接进度/错误提示(banner 可被关掉) */}
{s.status !== 'connected' && s.status !== 'ended' && (
<Box
role="status"
sx={{
position: 'absolute', left: 0, right: 0, bottom: 0, zIndex: 3,
display: 'flex', alignItems: 'center', gap: 1, px: 1.5, py: 0.5,
bgcolor: s.status === 'error' ? 'error.main' : 'warning.main',
color: s.status === 'error' ? 'error.contrastText' : 'warning.contrastText',
borderTop: 1, borderColor: 'divider',
}}
>
{s.status !== 'error' && <CircularProgress size={12} color="inherit" />}
<Typography variant="caption" sx={{ fontWeight: 500 }}>
{s.status === 'connecting' ? '正在连接终端服务…'
: s.status === 'reconnecting' ? '连接中断,正在重试…'
: '终端服务不可用'}
</Typography>
</Box>
)}
{/* 会话终止覆盖层:exit/空闲超时后不自动重生,显式重连 */}
{s.status === 'ended' && (
<Box
role="status"
sx={{
position: 'absolute', inset: 0, zIndex: 2,
display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', gap: 1.25,
bgcolor: 'background.paper', px: 3, textAlign: 'center',
}}
>
<TerminalIcon sx={{ fontSize: 28, color: 'text.disabled' }} />
<Typography sx={{ fontWeight: 600, fontSize: 14 }}>
{instRef.current[s.id]?.endedReason === 'idle' ? '会话已空闲断开' : '终端会话已结束'}
</Typography>
<Typography variant="caption" sx={{ color: 'text.secondary' }}>
{instRef.current[s.id]?.endedReason === 'idle'
? '长时间无输入,连接被服务端关闭。点击「重新连接」可新建会话。'
: '输入 exit 退出或进程已结束。点击「重新连接」可新建会话。'}
</Typography>
<Stack direction="row" spacing={1}>
<Button size="small" variant="contained" startIcon={<RefreshIcon fontSize="small" />} onClick={() => reconnectSession(s.id)}>
重新连接
</Button>
<Button size="small" variant="text" onClick={() => closeSession(s.id)}>
关闭会话
</Button>
</Stack>
</Box>
)}
</Box>
))}
{sessions.length === 0 && (
<Box sx={{ height: '100%', display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', gap: 1 }}>
<TerminalIcon sx={{ fontSize: 30, color: 'text.disabled' }} />
<Typography variant="caption" sx={{ color: 'text.secondary' }}>点击 新建终端会话</Typography>
</Box>
)}
</Box>
</Box>
);
});
export default TerminalPanel;
@@ -0,0 +1,124 @@
import React, { useRef } from 'react';
import Box from '@mui/material/Box';
import Tooltip from '@mui/material/Tooltip';
import { useDroppable } from '@dnd-kit/core';
import { SortableContext, verticalListSortingStrategy, useSortable } from '@dnd-kit/sortable';
/* ============================================================
* ActivityBarVSCode 风格活动栏(宽 48px,竖排图标)
*
* - 左侧:主控视图(面板…);右侧:功能视图(记事本/密码箱…)
* - 活动项左侧 2.5px primary 指示条 + selected 底
* - 点击:未激活 → 激活并展开侧栏;已激活 → 收起侧栏(VSCode 语义)
* - 拖拽(@dnd-kit sortable):标签可拖到对侧活动栏 → 视图换边;
* 同侧可排序。父级 DndContext 负责 moveView / reorderView 落库。
* - 无障碍:role=toolbar,仅活动项 tabIndex=0roving),
* ↑↓/Home/End 移动焦点、Enter/空格 激活;活动项 aria-controls 指向侧栏容器;
* 侧栏内由 aria-live 播报当前视图(见 SidebarPane
* ============================================================ */
function ActivityTab({ view, active, onActivate, side, index, moveFocus, count }) {
const {
attributes, listeners, setNodeRef, transform, transition, isDragging,
} = useSortable({ id: 'view:' + view.id });
const VIcon = view.Icon;
return (
<Tooltip title={view.label} placement="right">
<Box
ref={setNodeRef}
data-activity-item
{...attributes}
{...listeners}
role="button"
tabIndex={active ? 0 : -1}
aria-label={view.label}
aria-pressed={active}
aria-controls={active ? `wb-sidebar-${side}` : undefined}
onClick={() => onActivate(view.id)}
onKeyDown={(e) => {
if (e.key === 'Enter' || e.key === ' ') { e.preventDefault(); onActivate(view.id); }
else if (e.key === 'ArrowDown') { e.preventDefault(); moveFocus(index + 1); }
else if (e.key === 'ArrowUp') { e.preventDefault(); moveFocus(index - 1); }
else if (e.key === 'Home') { e.preventDefault(); moveFocus(0); }
else if (e.key === 'End') { e.preventDefault(); moveFocus(count - 1); }
}}
sx={{
position: 'relative', width: 48, height: 48, flexShrink: 0,
display: 'flex', alignItems: 'center', justifyContent: 'center',
cursor: 'grab', touchAction: 'none', outline: 'none',
color: active ? 'primary.onContainer' : 'text.secondary',
bgcolor: active ? 'action.selected' : 'transparent',
'&:hover': { bgcolor: active ? 'action.selected' : 'action.hover' },
'&:focus-visible': { outline: '2px solid', outlineColor: 'primary.main', outlineOffset: -3, outlineStyle: 'solid' },
opacity: isDragging ? 0.35 : 1,
transform: transform ? `translate3d(${transform.x}px, ${transform.y}px, 0)` : undefined,
transition,
}}
>
{active && (
<Box
aria-hidden
sx={{
position: 'absolute', left: 0, top: 10, bottom: 10, width: 2.5,
bgcolor: 'primary.main', borderRadius: 1,
}}
/>
)}
<VIcon sx={{ fontSize: 22 }} />
</Box>
</Tooltip>
);
}
export default function ActivityBar({
side, views, activeId, onActivate,
}) {
const right = side === 'right';
const { setNodeRef, isOver } = useDroppable({ id: 'activity:' + side });
const barRef = useRef(null);
const itemEls = () => Array.from(barRef.current?.querySelectorAll('[data-activity-item]') || []);
const moveFocus = (i) => {
const n = views.length;
if (n === 0) return;
const j = ((i % n) + n) % n;
itemEls()[j]?.focus();
};
return (
<Box
ref={setNodeRef}
role="toolbar"
aria-label={right ? '右侧活动栏' : '左侧活动栏'}
aria-orientation="vertical"
aria-controls={`wb-sidebar-${side}`}
sx={{
width: 48, height: '100%', flexShrink: 0,
display: 'flex', flexDirection: 'column', alignItems: 'center',
bgcolor: isOver ? 'action.hover' : 'background.paper',
borderRight: right ? 0 : 1,
borderLeft: right ? 1 : 0,
borderColor: 'divider',
}}
>
<SortableContext items={views.map((v) => 'view:' + v.id)} strategy={verticalListSortingStrategy}>
<Box ref={barRef} sx={{ display: 'flex', flexDirection: 'column', pt: 0.5 }}>
{views.map((v, index) => (
<ActivityTab
key={v.id}
view={v}
side={side}
index={index}
count={views.length}
moveFocus={moveFocus}
active={activeId === v.id}
onActivate={onActivate}
/>
))}
</Box>
</SortableContext>
<Box sx={{ flex: 1 }} />
</Box>
);
}
@@ -0,0 +1,192 @@
import React, { useMemo, useState } from 'react';
import Dialog from '@mui/material/Dialog';
import DialogTitle from '@mui/material/DialogTitle';
import DialogContent from '@mui/material/DialogContent';
import DialogActions from '@mui/material/DialogActions';
import Button from '@mui/material/Button';
import TextField from '@mui/material/TextField';
import ToggleButton from '@mui/material/ToggleButton';
import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
import FormControlLabel from '@mui/material/FormControlLabel';
import Switch from '@mui/material/Switch';
import Autocomplete from '@mui/material/Autocomplete';
import Box from '@mui/material/Box';
import Typography from '@mui/material/Typography';
import WebAssetIcon from '@mui/icons-material/WebAsset';
import OpenInNewIcon from '@mui/icons-material/OpenInNew';
import OpenInFullIcon from '@mui/icons-material/OpenInFull';
import { createAdminLink } from '../../../api/adminLinks.js';
import { OPEN_MODE_EMBED, OPEN_MODE_TAB, OPEN_MODE_MODAL } from '../hooks/usePanels.js';
/* ============================================================
* AddPanelDialog:添加面板
* URL + 标题 + 分组 + favicon 实时预览 + 打开方式(内嵌/新标签/弹窗)
* + 嵌入 URL + 代理开关;保存到 admin_links(复用现有 API
* ============================================================ */
const MODE_META = [
{ mode: OPEN_MODE_EMBED, label: '内嵌', Icon: WebAssetIcon },
{ mode: OPEN_MODE_TAB, label: '新标签', Icon: OpenInNewIcon },
{ mode: OPEN_MODE_MODAL, label: '弹窗', Icon: OpenInFullIcon },
];
function normalizeUrl(raw) {
const s = (raw || '').trim();
if (!s) return '';
return /^[a-z][a-z0-9+.-]*:\/\//i.test(s) ? s : 'https://' + s;
}
export default function AddPanelDialog({ open, onClose, categories = [], onSaved, onSetMode }) {
const [form, setForm] = useState({
title: '', url: '', category: '', openMode: OPEN_MODE_EMBED,
use_proxy: false, embed_url: '',
});
const [err, setErr] = useState('');
const host = useMemo(() => {
try { return new URL(normalizeUrl(form.url)).hostname; } catch { return ''; }
}, [form.url]);
const set = (k) => (e) => setForm((p) => ({ ...p, [k]: e.target.value }));
const save = async () => {
const title = form.title.trim();
const url = normalizeUrl(form.url);
if (!title) { setErr('请输入面板标题'); return; }
if (!url) { setErr('请输入面板链接'); return; }
try {
const panel = await createAdminLink({
title,
url,
embed_url: form.embed_url.trim(),
category: form.category.trim() || '默认',
use_proxy: form.use_proxy ? 1 : 0,
description: '',
icon: '',
sort_order: 0,
version: '',
});
if (form.openMode !== OPEN_MODE_EMBED) onSetMode(panel.id, form.openMode);
setErr('');
setForm({ title: '', url: '', category: '', openMode: OPEN_MODE_EMBED, use_proxy: false, embed_url: '' });
onSaved(panel);
} catch (e) {
setErr(e.message || '保存失败');
}
};
return (
<Dialog open={open} onClose={onClose} fullWidth maxWidth="sm">
<DialogTitle>添加面板</DialogTitle>
<DialogContent>
<TextField
fullWidth
label="标题 *"
value={form.title}
onChange={set('title')}
margin="normal"
placeholder="例如:服务器监控"
autoFocus
/>
<TextField
fullWidth
label="链接 URL *"
value={form.url}
onChange={set('url')}
margin="normal"
placeholder="example.com 或 https://…"
error={!!err && !form.url.trim()}
/>
{/* favicon 实时预览 */}
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1, mt: 1, mb: 0.5 }}>
<Box
sx={{
width: 32, height: 32, borderRadius: 1.5, border: 1, borderColor: 'divider',
display: 'flex', alignItems: 'center', justifyContent: 'center',
bgcolor: 'background.paper', overflow: 'hidden',
}}
>
{host ? (
<img
src={`https://www.google.com/s2/favicons?domain=${encodeURIComponent(host)}&sz=64`}
alt=""
width={20}
height={20}
loading="lazy"
style={{ display: 'block' }}
onError={(e) => { e.target.style.visibility = 'hidden'; }}
/>
) : (
<WebAssetIcon sx={{ fontSize: 18, color: 'text.disabled' }} />
)}
</Box>
<Typography variant="caption" sx={{ color: 'text.secondary' }}>
{host ? `站点:${host}` : '输入链接后预览站点图标'}
</Typography>
</Box>
<Autocomplete
freeSolo
fullWidth
value={form.category}
onChange={(e, v) => setForm((p) => ({ ...p, category: v || '' }))}
onInputChange={(e, v) => setForm((p) => ({ ...p, category: v }))}
options={categories}
renderInput={(params) => (
<TextField {...params} label="分组" margin="normal" placeholder="默认" />
)}
/>
<Typography variant="caption" sx={{ display: 'block', mt: 1, mb: 0.5, color: 'text.secondary' }}>
打开方式
</Typography>
<ToggleButtonGroup
exclusive
fullWidth
size="small"
value={form.openMode}
onChange={(e, v) => { if (v) setForm((p) => ({ ...p, openMode: v })); }}
aria-label="打开方式"
>
{MODE_META.map(({ mode, label, Icon }) => (
<ToggleButton key={mode} value={mode} sx={{ py: 0.75 }}>
<Icon fontSize="small" sx={{ mr: 0.5 }} />{label}
</ToggleButton>
))}
</ToggleButtonGroup>
{form.openMode === OPEN_MODE_EMBED && (
<Box sx={{ mt: 1.5 }}>
<FormControlLabel
control={
<Switch
checked={form.use_proxy}
onChange={(e) => setForm((p) => ({ ...p, use_proxy: e.target.checked }))}
/>
}
label="通过代理嵌入(绕过 X-Frame-Options 限制)"
/>
<TextField
fullWidth
label="嵌入 URL(可选,iframe 专用)"
value={form.embed_url}
onChange={set('embed_url')}
margin="dense"
placeholder="留空则使用上面的链接"
/>
</Box>
)}
{err && (
<Typography variant="body2" sx={{ mt: 1.5, color: 'error.main' }}>{err}</Typography>
)}
</DialogContent>
<DialogActions>
<Button onClick={onClose}>取消</Button>
<Button variant="contained" onClick={save}>添加</Button>
</DialogActions>
</Dialog>
);
}
@@ -0,0 +1,48 @@
import React from 'react';
import IconButton from '@mui/material/IconButton';
import Tooltip from '@mui/material/Tooltip';
import ChevronLeftIcon from '@mui/icons-material/ChevronLeft';
import ChevronRightIcon from '@mui/icons-material/ChevronRight';
/* ============================================================
* CollapseArrow:侧边栏折叠箭头(VSCode 风格)
*
* - 由父级绝对定位到主区边缘(即侧边栏与主区的 Separator 位置)垂直居中;
* 侧边栏折叠为 0 后主区仍在,箭头始终可见可点,支持"再点击展开"。
* - 箭头始终指向栏的方向:展开时指栏(点击收起),折叠后反向(点击展开)。
* - 可见性:**常驻可见**——不透明背景(background.paper+ 实心边框 + 阴影,
* opacity 展开 0.9 / 折叠 1,hover 全亮加深阴影;不再半透明叠加 iframe 混色。
* - 28x28 触控目标,zIndex 12 盖在 iframe 内容之上。
* ============================================================ */
export default function CollapseArrow({ side, collapsed = false, onToggle }) {
const right = side === 'right';
const label = collapsed ? `展开${right ? '右' : '左'}侧边栏` : `折叠${right ? '右' : '左'}侧边栏`;
// 展开 → 指向栏(收起动作);折叠 → 反向(展开动作)
const Icon = collapsed
? (right ? ChevronLeftIcon : ChevronRightIcon)
: (right ? ChevronRightIcon : ChevronLeftIcon);
return (
<Tooltip title={label} placement={right ? 'left' : 'right'}>
<IconButton
size="small"
aria-label={label}
onClick={onToggle}
sx={{
position: 'absolute', top: '50%', [right ? 'right' : 'left']: 2,
transform: 'translateY(-50%)', zIndex: 12,
width: 28, height: 28, minWidth: 28, p: 0,
opacity: collapsed ? 1 : 0.9,
bgcolor: 'background.paper', border: 1, borderColor: 'divider',
boxShadow: (t) => t.shadows[2],
transition: 'opacity .12s ease, background-color .12s ease, box-shadow .12s ease',
'&:hover': { opacity: 1, bgcolor: 'action.hover', boxShadow: (t) => t.shadows[4] },
'&:focus-visible': { outline: '2px solid', outlineColor: 'primary.main', outlineOffset: -2 },
}}
>
<Icon sx={{ fontSize: 18 }} />
</IconButton>
</Tooltip>
);
}
@@ -0,0 +1,53 @@
import React from 'react';
import Box from '@mui/material/Box';
import PanelFrame from './PanelFrame.jsx';
import { tabBtnId, tabPanelId } from './TabStrip.jsx';
/* ============================================================
* ContentView:主区内容分发(按标签 type)
*
* - 'panel' → PanelFrameiframeLRU 由 panelRenderKeys 控制挂载)
* - 其他 react 类型 → tab.render() 返回对应组件(记事本/密码箱/面板列表…)
* 仅激活标签可见,其余保持挂载(keep-alive 保留 iframe 与编辑状态)。
* 每个标签包一层 role=tabpanel,与 TabStrip 的 tab 通过 id 配对(ARIA)。
* ============================================================ */
export default function ContentView({ tabs, activeKey, refreshNonce = 0, panelRenderKeys = null }) {
return (
<>
{tabs.map((tab) => {
const active = tab.key === activeKey;
if (tab.type === 'panel') {
// LRU 裁剪:只渲染当前 + 最近使用的 iframe,其余卸载省内存
if (panelRenderKeys && !panelRenderKeys.has(tab.key)) return null;
return (
<Box
key={tab.key}
id={tabPanelId(tab.key)}
role="tabpanel"
aria-labelledby={tabBtnId(tab.key)}
sx={{ display: active ? 'block' : 'none', width: '100%', height: '100%' }}
>
<PanelFrame
panel={tab.panel}
active={active}
refreshNonce={refreshNonce}
/>
</Box>
);
}
return (
<Box
key={tab.key}
id={tabPanelId(tab.key)}
role="tabpanel"
aria-labelledby={tabBtnId(tab.key)}
sx={{ display: active ? 'block' : 'none', width: '100%', height: '100%' }}
>
{tab.render ? tab.render() : null}
</Box>
);
})}
</>
);
}
@@ -0,0 +1,118 @@
import React, { useRef, useState } from 'react';
import Box from '@mui/material/Box';
import Button from '@mui/material/Button';
import Menu from '@mui/material/Menu';
import MenuItem from '@mui/material/MenuItem';
import Divider from '@mui/material/Divider';
import Typography from '@mui/material/Typography';
import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
/* ============================================================
* MenuBarVSCode 风格菜单栏(MUI Menu,配置数组驱动)
*
* menus = [{ label, items: [{ label, Icon?, action?, shortcut?, divider? }] }]
* - role=menubar / menuitem,顶层 roving tabindex + 方向键导航:
* ← → / Home / End 移动焦点,↓ / Enter / 空格 打开菜单
* - 菜单内部导航由 MUI Menu 自带(方向键 + Enter/Esc
* ============================================================ */
export default function MenuBar({ menus = [] }) {
const [openIdx, setOpenIdx] = useState(null);
const [anchorEl, setAnchorEl] = useState(null);
const [focusIdx, setFocusIdx] = useState(0); // roving tabindex 停靠点
const barRef = useRef(null);
const btnEls = () => Array.from(barRef.current?.querySelectorAll('[data-menu-btn]') || []);
const focusBtn = (i) => {
const n = menus.length;
if (n === 0) return;
const j = ((i % n) + n) % n;
setFocusIdx(j);
btnEls()[j]?.focus();
};
const openMenu = (i) => {
setFocusIdx(i);
setAnchorEl(btnEls()[i]);
setOpenIdx(i);
};
const close = () => { setOpenIdx(null); setAnchorEl(null); };
const handleTopKeyDown = (e, i) => {
switch (e.key) {
case 'ArrowRight': e.preventDefault(); focusBtn(i + 1); break;
case 'ArrowLeft': e.preventDefault(); focusBtn(i - 1); break;
case 'Home': e.preventDefault(); focusBtn(0); break;
case 'End': e.preventDefault(); focusBtn(menus.length - 1); break;
case 'ArrowDown':
case 'Enter':
case ' ':
e.preventDefault();
openMenu(i); // MUI Menu 打开后自动聚焦首个菜单项
break;
default: break;
}
};
return (
<Box
ref={barRef}
component="nav"
role="menubar"
aria-label="主菜单"
sx={{ display: 'flex', alignItems: 'center' }}
>
{menus.map((menu, i) => (
<React.Fragment key={menu.label}>
<Button
data-menu-btn
role="menuitem"
aria-haspopup="true"
aria-expanded={openIdx === i}
tabIndex={focusIdx === i ? 0 : -1}
size="small"
onClick={(e) => {
setFocusIdx(i);
if (openIdx === i) { close(); return; }
setAnchorEl(e.currentTarget);
setOpenIdx(i);
}}
onKeyDown={(e) => handleTopKeyDown(e, i)}
sx={{
minWidth: 0, px: 1, height: 30, borderRadius: 1,
fontSize: 13, color: openIdx === i ? 'primary.main' : 'text.primary',
'&:hover': { bgcolor: openIdx === i ? 'action.selected' : 'action.hover' },
}}
>
{menu.label}
<KeyboardArrowDownIcon sx={{ fontSize: 14, ml: 0.25, color: 'text.disabled' }} />
</Button>
<Menu
open={openIdx === i}
anchorEl={anchorEl}
onClose={close}
anchorOrigin={{ vertical: 'bottom', horizontal: 'left' }}
MenuListProps={{ sx: { py: 0.5, minWidth: 200 } }}
>
{menu.items.map((item, j) => (
item.divider ? (
<Divider key={`d-${j}`} sx={{ my: 0.5 }} />
) : (
<MenuItem
key={item.label + j}
dense
onClick={() => { close(); item.action?.(); }}
>
{item.Icon && <item.Icon sx={{ fontSize: 16, mr: 1.25, color: 'text.secondary' }} />}
<span style={{ flex: 1 }}>{item.label}</span>
{item.shortcut && (
<Typography variant="caption" sx={{ ml: 3, color: 'text.disabled' }}>{item.shortcut}</Typography>
)}
</MenuItem>
)
))}
</Menu>
</React.Fragment>
))}
</Box>
);
}
@@ -0,0 +1,264 @@
import React, { useState } from 'react';
import Box from '@mui/material/Box';
import Typography from '@mui/material/Typography';
import IconButton from '@mui/material/IconButton';
import Tooltip from '@mui/material/Tooltip';
import TextField from '@mui/material/TextField';
import List from '@mui/material/List';
import ListItemButton from '@mui/material/ListItemButton';
import CircularProgress from '@mui/material/CircularProgress';
import Dialog from '@mui/material/Dialog';
import DialogTitle from '@mui/material/DialogTitle';
import DialogContent from '@mui/material/DialogContent';
import DialogActions from '@mui/material/DialogActions';
import Button from '@mui/material/Button';
import Menu from '@mui/material/Menu';
import MenuItem from '@mui/material/MenuItem';
import NoteAltIcon from '@mui/icons-material/NoteAlt';
import CloseIcon from '@mui/icons-material/Close';
import AddIcon from '@mui/icons-material/Add';
import DeleteOutlinedIcon from '@mui/icons-material/DeleteOutlined';
import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
import ErrorIcon from '@mui/icons-material/Error';
import useNotes from '../hooks/useNotes.js';
import ConfirmDialog from '../../../admin/ConfirmDialog.jsx';
/* ============================================================
* NotesView:记事本视图(VSCode 侧边栏 / 标签页内容)
*
* 由 NoteEditor 裁剪:去掉浮窗拖拽 / fixed 侧栏 / 自带标题栏,
* 标题栏由父级 ToolWindow 提供。保留:
* 状态条(当前文件 + 保存状态)→ 编辑器(自动保存,Ctrl+S)
* → 文件管理器(新建/双击重命名/右键菜单/删除)
* 常驻挂载(keep-alive),切换视图不丢草稿。
* ============================================================ */
/** 精简时间格式:今天 HH:mm / 今年 MM-DD / 往年 YYYY-MM-DD */
function fmtTime(ms) {
if (!ms) return '';
const d = new Date(ms);
const now = new Date();
const pad = (n) => String(n).padStart(2, '0');
const hm = `${pad(d.getHours())}:${pad(d.getMinutes())}`;
if (d.toDateString() === now.toDateString()) return hm;
if (d.getFullYear() === now.getFullYear()) return `${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${hm}`;
return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}`;
}
/** 新建/重命名弹窗 */
function NameDialog({ open, title, initial, confirmText, exists, busy, onClose, onConfirm }) {
const [value, setValue] = useState(initial);
const [err, setErr] = useState('');
React.useEffect(() => {
if (open) { setValue(initial); setErr(''); }
}, [open, initial]);
const submit = () => {
let name = value.trim();
if (!name) { setErr('请输入文件名'); return; }
if (!name.toLowerCase().endsWith('.txt')) name += '.txt';
if (exists.includes(name.toLowerCase())) { setErr('同名笔记已存在'); return; }
onConfirm(name);
};
return (
<Dialog open={open} onClose={onClose} fullWidth maxWidth="xs">
<DialogTitle>{title}</DialogTitle>
<DialogContent>
<TextField
fullWidth
autoFocus
size="small"
label="文件名"
value={value}
onChange={(e) => { setValue(e.target.value); setErr(''); }}
onKeyDown={(e) => { if (e.key === 'Enter') submit(); }}
error={!!err}
helperText={err || '仅支持 .txt 文本文件'}
inputProps={{ style: { fontSize: 14 } }}
/>
</DialogContent>
<DialogActions>
<Button onClick={onClose}>取消</Button>
<Button variant="contained" disabled={busy} onClick={submit}>{confirmText}</Button>
</DialogActions>
</Dialog>
);
}
export default function NotesView() {
const notes = useNotes();
const {
notes: list, loadError, refresh,
activeName, content, dirty, saving, busy,
open, updateContent, saveNow, create, rename, remove, nextUntitled,
} = notes;
const [newOpen, setNewOpen] = useState(false);
const [renameTarget, setRenameTarget] = useState(null);
const [delTarget, setDelTarget] = useState(null);
const [ctx, setCtx] = useState(null); // { name, anchorEl }
const handleCreate = (name) => { setNewOpen(false); create(name); };
const handleRename = (name) => { setRenameTarget(null); rename(ctx?.name || renameTarget, name); };
const handleDelete = async () => {
const name = delTarget;
setDelTarget(null);
await remove(name);
};
const statusText = saving ? '保存中…' : dirty ? '未保存' : '已保存';
return (
<Box component="section" aria-label="记事本" sx={{ flex: 1, minHeight: 0, display: 'flex', flexDirection: 'column' }}>
{/* 状态条 */}
<Box sx={{ px: 1.5, py: 0.5, display: 'flex', alignItems: 'center', gap: 1, bgcolor: 'background.default', borderBottom: 1, borderColor: 'divider', flexShrink: 0 }}>
<Typography variant="caption" noWrap sx={{ flex: 1, color: 'text.secondary' }} title={activeName || ''}>
{activeName || '未打开笔记'}
</Typography>
<Typography variant="caption" sx={{ flexShrink: 0, color: saving ? 'text.secondary' : dirty ? 'warning.main' : 'success.main', fontWeight: 500 }}>
{statusText}
</Typography>
</Box>
{/* 编辑器(上半) */}
<Box sx={{ flex: 1, minHeight: 0, display: 'flex', p: 0.5 }}>
<TextField
fullWidth
multiline
variant="outlined"
value={content}
onChange={(e) => updateContent(e.target.value)}
onKeyDown={(e) => {
if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === 's') { e.preventDefault(); saveNow(); }
}}
disabled={!activeName || busy}
placeholder={activeName ? '开始输入…(自动保存,Ctrl+S 立即保存)' : '从下方选择或新建一篇笔记'}
inputProps={{ 'aria-label': '笔记内容', style: { fontSize: 13, lineHeight: 1.6 } }}
sx={{
flex: 1, minHeight: 0,
'& .MuiInputBase-root': { height: '100%', alignItems: 'flex-start', borderRadius: 1 },
'& .MuiInputBase-inputMultiline': { height: '100% !important', overflow: 'auto !important', boxSizing: 'border-box' },
}}
/>
</Box>
{/* 文件管理器(下半) */}
<Box sx={{ flex: 1, minHeight: 0, display: 'flex', flexDirection: 'column', borderTop: 1, borderColor: 'divider' }}>
<Box sx={{ display: 'flex', alignItems: 'center', px: 1.25, py: 0.5, flexShrink: 0 }}>
<Typography sx={{ flex: 1, fontSize: 11, fontWeight: 700, letterSpacing: 0.5, color: 'text.secondary' }}>
笔记{list ? list.length : 0}
</Typography>
<Tooltip title="新建笔记">
<IconButton size="small" onClick={() => setNewOpen(true)} aria-label="新建笔记"><AddIcon fontSize="small" /></IconButton>
</Tooltip>
</Box>
<Box sx={{ flex: 1, minHeight: 0, overflowY: 'auto', overflowX: 'hidden' }}>
{list === null && !loadError ? (
<Box sx={{ display: 'flex', justifyContent: 'center', py: 2 }}><CircularProgress size={20} /></Box>
) : loadError ? (
<Box sx={{ px: 2, py: 2, textAlign: 'center' }}>
<ErrorIcon sx={{ fontSize: 24, color: 'error.main', mb: 0.5 }} />
<Typography variant="caption" sx={{ color: 'text.secondary', display: 'block', mb: 0.5 }}>{loadError}</Typography>
<Button size="small" variant="outlined" onClick={refresh}>重试</Button>
</Box>
) : list.length === 0 ? (
<Box sx={{ px: 2, py: 3, textAlign: 'center' }}>
<NoteAltIcon sx={{ fontSize: 28, color: 'text.disabled', mb: 0.5 }} />
<Typography variant="caption" sx={{ color: 'text.secondary', display: 'block' }}>暂无笔记点击上方 新建</Typography>
</Box>
) : (
<List dense disablePadding>
{list.map((n) => {
const active = n.name === activeName;
return (
<ListItemButton
key={n.name}
onClick={() => open(n.name)}
onDoubleClick={() => setRenameTarget(n.name)}
onContextMenu={(e) => { e.preventDefault(); setCtx({ name: n.name, anchorEl: e.currentTarget }); }}
onKeyDown={(e) => {
// F2 重命名(标准文件管理器约定,避免与 Enter 打开冲突)
if (e.key === 'F2') { e.preventDefault(); setRenameTarget(n.name); }
}}
aria-label={`打开笔记 ${n.name}`}
sx={{
minHeight: 40, borderRadius: 0, m: 0, px: 0,
bgcolor: active ? 'primary.container' : 'transparent',
color: active ? 'primary.onContainer' : 'text.primary',
'&:hover': { bgcolor: active ? 'primary.container' : 'action.hover' },
'&:hover .nb-del': { opacity: 1 },
'&:focus-visible .nb-del': { opacity: 1 },
}}
>
<NoteAltIcon fontSize="small" sx={{ mx: 1, flexShrink: 0, opacity: 0.7 }} />
<Box sx={{ flex: 1, minWidth: 0, py: 0.5 }}>
<Typography noWrap sx={{ fontSize: 12.5, fontWeight: active ? 600 : 500 }}>{n.name}</Typography>
<Typography variant="caption" sx={{ color: 'text.disabled', fontSize: 10 }}>
{fmtTime(n.mtime)}
</Typography>
</Box>
<IconButton
className="nb-del"
size="small"
onClick={(e) => { e.stopPropagation(); setDelTarget(n.name); }}
aria-label={`删除 ${n.name}`}
sx={{ opacity: 0, width: 28, height: 28, mr: 0.5, transition: 'opacity .12s' }}
>
<CloseIcon fontSize="small" />
</IconButton>
</ListItemButton>
);
})}
</List>
)}
</Box>
</Box>
{/* 右键菜单 */}
<Menu
open={!!ctx}
anchorEl={ctx?.anchorEl || null}
onClose={() => setCtx(null)}
anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}
>
<MenuItem dense onClick={() => { if (ctx) setRenameTarget(ctx.name); setCtx(null); }}>
<EditOutlinedIcon fontSize="small" sx={{ mr: 1, color: 'text.secondary' }} />重命名
</MenuItem>
<MenuItem dense onClick={() => { if (ctx) setDelTarget(ctx.name); setCtx(null); }}>
<DeleteOutlinedIcon fontSize="small" sx={{ mr: 1, color: 'error.main' }} />删除
</MenuItem>
</Menu>
<NameDialog
open={newOpen}
title="新建笔记"
initial={nextUntitled}
confirmText="创建"
exists={(list || []).map((n) => n.name.toLowerCase())}
busy={busy}
onClose={() => setNewOpen(false)}
onConfirm={handleCreate}
/>
<NameDialog
open={!!renameTarget}
title="重命名笔记"
initial={renameTarget || ''}
confirmText="保存"
exists={(list || []).map((n) => n.name.toLowerCase()).filter((n) => n !== renameTarget?.toLowerCase())}
busy={busy}
onClose={() => setRenameTarget(null)}
onConfirm={handleRename}
/>
<ConfirmDialog
open={!!delTarget}
title="删除笔记"
message={`确定要删除 "${delTarget || ''}" 吗?此操作不可恢复。`}
onClose={() => setDelTarget(null)}
onConfirm={handleDelete}
confirmText="删除"
/>
</Box>
);
}
@@ -0,0 +1,266 @@
import React, { useEffect, useRef, useState } from 'react';
import Box from '@mui/material/Box';
import CircularProgress from '@mui/material/CircularProgress';
import Typography from '@mui/material/Typography';
import Button from '@mui/material/Button';
import Stack from '@mui/material/Stack';
import IconButton from '@mui/material/IconButton';
import OpenInNewIcon from '@mui/icons-material/OpenInNew';
import RefreshIcon from '@mui/icons-material/Refresh';
import ErrorIcon from '@mui/icons-material/Error';
import CloseIcon from '@mui/icons-material/Close';
import { getToken } from '../../../api/client.js';
/* ============================================================
* PanelFrame:单个面板的 iframe 容器
*
* - 懒加载:首次激活才创建 iframe DOM,之后 display:none 保留状态
* - 超时 + load 双保险:加载中显示覆盖层;超时(X-Frame-Options
* 拒绝 / 目标无响应)显示失败提示 + 「在新标签页打开」回退
* - proxy 模式:use_proxy=1 或 HTTPS 页内嵌 HTTP 目标时走
* /api/proxy/fetch?url=&token=proxy 剥 X-Frame-Options/CSP)。
* token 用 /api/proxy/token 签发的 5 分钟短 TTL JWT,避免把 7 天
* 主 token 暴露在 iframe URL 中(模块级缓存,4 分钟刷新一次)。
* - 站内 URL(/ 开头)为同源内容:剥离 allow-same-origin 防其访问
* 父页面 DOM;跨源面板保留 allow-same-origin(多数站点依赖)。
* - LRU 由父级 Workbench 控制挂载/卸载(此组件不自行卸载)
* ============================================================ */
const LOAD_TIMEOUT_MS = 15000;
const TOKEN_TTL_MS = 4 * 60 * 1000; // 缓存 4 分钟(短 token 5 分钟有效)
const HINT_TTL_MS = 5000; // 加载成功后的「空白?新标签打开」提示条 5 秒自动消失
/* 短 TTL proxy token 的模块级缓存:多个 PanelFrame 共享,避免每帧都请求 */
let proxyTokenCache = { promise: null, expiresAt: 0 };
function fetchProxyToken() {
const now = Date.now();
if (proxyTokenCache.promise && now < proxyTokenCache.expiresAt) return proxyTokenCache.promise;
const p = fetch('/api/proxy/token', {
headers: { Authorization: 'Bearer ' + (getToken() || '') },
})
.then(async (res) => {
if (!res.ok) throw new Error('proxy token 获取失败');
const data = await res.json();
return data.token;
})
.catch((e) => {
proxyTokenCache.promise = null;
throw e;
});
proxyTokenCache.promise = p;
proxyTokenCache.expiresAt = now + TOKEN_TTL_MS;
return p;
}
export default function PanelFrame({ panel, active = false, refreshNonce = 0 }) {
const [mounted, setMounted] = useState(active);
const [status, setStatus] = useState('loading'); // loading | loaded | timeout
const [proxySrc, setProxySrc] = useState('');
const [showHint, setShowHint] = useState(false);
const iframeRef = useRef(null);
const timerRef = useRef(null);
const hintTimerRef = useRef(null);
const statusRef = useRef('loading');
const targetUrl = panel.embed_url || panel.url || '';
const isHttpsPage = typeof window !== 'undefined' && window.location.protocol === 'https:';
const needsProxy = !!panel.use_proxy || (isHttpsPage && targetUrl.startsWith('http:'));
// 站内 URL(同源内容):沙箱剥离 allow-same-origin,内容无法操作父页面 DOM
const isInternal = targetUrl.startsWith('/');
const sandbox = isInternal
? 'allow-scripts allow-forms allow-popups allow-popups-to-escape-sandbox'
: 'allow-scripts allow-same-origin allow-forms allow-popups allow-popups-to-escape-sandbox';
// proxy 模式:先取 5 分钟短 TTL token 再拼 iframe URL(失败进入超时回退态)
useEffect(() => {
let alive = true;
if (!needsProxy) { setProxySrc(targetUrl); return () => { alive = false; }; }
setProxySrc('');
fetchProxyToken()
.then((tok) => {
if (alive) {
setProxySrc('/api/proxy/fetch?url=' + encodeURIComponent(targetUrl) + '&token=' + encodeURIComponent(tok));
}
})
.catch(() => {
if (alive) {
statusRef.current = 'timeout';
setStatus('timeout');
}
});
return () => { alive = false; };
}, [needsProxy, targetUrl]);
const src = needsProxy ? proxySrc : targetUrl;
// 懒加载:首次激活才创建 iframe
useEffect(() => {
if (active) setMounted(true);
}, [active]);
const startTimer = () => {
clearTimeout(timerRef.current);
timerRef.current = setTimeout(() => {
if (statusRef.current === 'loading') {
statusRef.current = 'timeout';
setStatus('timeout');
}
}, LOAD_TIMEOUT_MS);
};
// 挂载 / 地址变化:进入加载态并启动超时
useEffect(() => {
if (!mounted || !src) return;
statusRef.current = 'loading';
setStatus('loading');
setShowHint(false);
startTimer();
return () => clearTimeout(timerRef.current);
}, [mounted, src]);
// 刷新信号(工具栏 ↻):仅对激活面板 reload,且重新进入加载态
const lastNonce = useRef(refreshNonce);
useEffect(() => {
if (!active || refreshNonce === lastNonce.current) return;
lastNonce.current = refreshNonce;
const iframe = iframeRef.current;
if (!iframe || !src) return;
statusRef.current = 'loading';
setStatus('loading');
startTimer();
try { iframe.contentWindow.location.reload(); }
catch { iframe.src = iframe.src; }
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [refreshNonce]);
const handleLoad = () => {
clearTimeout(timerRef.current);
statusRef.current = 'loaded';
setStatus('loaded');
// 直接嵌入(非 proxy)时,加载成功仍可能被 X-Frame-Options 拒成空白页,
// 浮动提示「在新标签打开」;非阻塞,5 秒自动消失或可关闭。
if (!needsProxy) {
setShowHint(true);
clearTimeout(hintTimerRef.current);
hintTimerRef.current = setTimeout(() => setShowHint(false), HINT_TTL_MS);
}
};
const handleRetry = () => {
const iframe = iframeRef.current;
if (!iframe || !src) return;
statusRef.current = 'loading';
setStatus('loading');
startTimer();
try { iframe.contentWindow.location.reload(); }
catch { iframe.src = iframe.src; }
};
useEffect(() => () => { clearTimeout(hintTimerRef.current); }, []);
return (
<Box
sx={{
position: 'relative', width: '100%', height: '100%', overflow: 'hidden',
display: active ? 'block' : 'none', bgcolor: 'background.paper', flexShrink: 0,
}}
>
{mounted && (
<iframe
ref={iframeRef}
title={panel.title || '面板'}
src={src}
onLoad={handleLoad}
sandbox={sandbox}
allow="fullscreen; accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
style={{ width: '100%', height: '100%', border: 'none', display: 'block', background: 'transparent' }}
/>
)}
{status === 'loading' && (
<Box
sx={{
position: 'absolute', inset: 0, zIndex: 2, display: 'flex',
flexDirection: 'column', alignItems: 'center', justifyContent: 'center', gap: 1.5,
bgcolor: 'background.default',
}}
>
<CircularProgress size={32} />
<Typography variant="caption" sx={{ color: 'text.secondary' }}>
正在加载 {panel.title || '面板'}
</Typography>
</Box>
)}
{status === 'timeout' && (
<Box
sx={{
position: 'absolute', inset: 0, zIndex: 2, display: 'flex',
flexDirection: 'column', alignItems: 'center', justifyContent: 'center', gap: 2,
bgcolor: 'background.default', px: 3, textAlign: 'center',
}}
>
<ErrorIcon sx={{ fontSize: 40, color: 'text.disabled' }} />
<Box>
<Typography sx={{ fontWeight: 600, mb: 0.5 }}>面板加载超时</Typography>
<Typography variant="body2" sx={{ color: 'text.secondary' }}>
目标站点可能拒绝嵌入X-Frame-Options或响应过慢
</Typography>
</Box>
<Stack direction="row" spacing={1}>
<Button
size="small"
variant="outlined"
startIcon={<OpenInNewIcon fontSize="small" />}
href={targetUrl}
target="_blank"
rel="noopener"
>
在新标签页打开
</Button>
<Button
size="small"
variant="text"
startIcon={<RefreshIcon fontSize="small" />}
onClick={handleRetry}
>
重试
</Button>
</Stack>
</Box>
)}
{/* 加载成功后的非阻塞提示条:空白页可能被 X-Frame-Options 拒绝 */}
{showHint && status === 'loaded' && !needsProxy && (
<Box
role="status"
sx={{
position: 'absolute', left: '50%', transform: 'translateX(-50%)', bottom: 16,
zIndex: 3, maxWidth: '92%', display: 'flex', alignItems: 'center', gap: 0.5,
px: 1.5, py: 0.5, borderRadius: 2,
bgcolor: 'primary.container', color: 'primary.onContainer',
border: 1, borderColor: 'divider', boxShadow: (t) => t.shadows[3],
}}
>
<Typography variant="caption" sx={{ fontWeight: 500 }}>
若页面空白可能被 X-Frame-Options 拒绝
</Typography>
<Button
size="small"
component="a"
href={targetUrl}
target="_blank"
rel="noopener"
sx={{ minHeight: 28, px: 1, color: 'primary.onContainer', fontWeight: 700 }}
>
在新标签打开
</Button>
<IconButton size="small" onClick={() => setShowHint(false)} aria-label="关闭提示" sx={{ color: 'inherit' }}>
<CloseIcon fontSize="small" />
</IconButton>
</Box>
)}
</Box>
);
}
@@ -0,0 +1,79 @@
import React, { useState } from 'react';
import Box from '@mui/material/Box';
/* ============================================================
* 面板图标:Google favicon 服务 + 失败回退(站点首字母 + 确定性 MD3 容器色)
*
* - 成功:显示 favicon(不变)
* - 失败/无 host:显示首字母色块(类似 Google Avatar)——
* 背景色从 MD3 容器色(primary/secondary/tertiary.container)按
* 域名/标题哈希确定性选取,比默认地球图标更可辨识。
* ============================================================ */
/** 确定性回退色板:MD3 token(不硬编码 hex),按哈希循环选取 */
const FALLBACK_PALETTE = [
{ bg: 'primary.container', fg: 'primary.onContainer' },
{ bg: 'secondary.container', fg: 'secondary.onContainer' },
{ bg: 'tertiary.container', fg: 'tertiary.onContainer' },
];
function hashString(s) {
let h = 0;
for (let i = 0; i < s.length; i += 1) h = (h * 31 + s.charCodeAt(i)) | 0;
return Math.abs(h);
}
function hostOf(url) {
try {
const u = /^[a-z][a-z0-9+.-]*:\/\//i.test(url) ? url : 'https://' + url;
return new URL(u).hostname;
} catch { return ''; }
}
export default function PanelIcon({ url, title = '', size = 20, sx = {} }) {
const [error, setError] = useState(false);
const host = hostOf(url);
// 首字母 + 确定性颜色
const letter = ((title && title[0]) || (host && host[0]) || '?').toUpperCase();
const { bg, fg } = FALLBACK_PALETTE[hashString(host || title || '?') % FALLBACK_PALETTE.length];
// 无 host(内部地址/空)或 favicon 加载失败(404/API 不可达)→ 首字母色块
if (!host || error) {
return (
<Box
aria-hidden
sx={{
width: size, height: size, borderRadius: size / 4, flexShrink: 0,
display: 'flex', alignItems: 'center', justifyContent: 'center',
bgcolor: bg, color: fg,
fontSize: size * 0.55, fontWeight: 600, lineHeight: 1,
...sx,
}}
>
{letter}
</Box>
);
}
return (
<Box
aria-hidden
sx={{
width: size, height: size, borderRadius: size / 4, overflow: 'hidden',
flexShrink: 0, display: 'flex', alignItems: 'center', justifyContent: 'center',
bgcolor: 'background.paper', ...sx,
}}
>
<img
src={`https://www.google.com/s2/favicons?domain=${encodeURIComponent(host)}&sz=64`}
alt=""
width={size}
height={size}
loading="lazy"
onError={() => setError(true)}
style={{ display: 'block' }}
/>
</Box>
);
}
@@ -0,0 +1,272 @@
import React, { Fragment, useMemo, useState } from 'react';
import Box from '@mui/material/Box';
import List from '@mui/material/List';
import ListItemButton from '@mui/material/ListItemButton';
import ListItemText from '@mui/material/ListItemText';
import ListItemIcon from '@mui/material/ListItemIcon';
import Collapse from '@mui/material/Collapse';
import Divider from '@mui/material/Divider';
import IconButton from '@mui/material/IconButton';
import Button from '@mui/material/Button';
import Menu from '@mui/material/Menu';
import MenuItem from '@mui/material/MenuItem';
import Typography from '@mui/material/Typography';
import Skeleton from '@mui/material/Skeleton';
import StarIcon from '@mui/icons-material/Star';
import StarBorderIcon from '@mui/icons-material/StarBorder';
import ExpandLessIcon from '@mui/icons-material/ExpandLess';
import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
import FolderOpenIcon from '@mui/icons-material/FolderOpen';
import AddIcon from '@mui/icons-material/Add';
import OpenInNewIcon from '@mui/icons-material/OpenInNew';
import WebAssetIcon from '@mui/icons-material/WebAsset';
import OpenInFullIcon from '@mui/icons-material/OpenInFull';
import WidgetsIcon from '@mui/icons-material/Widgets';
import ErrorIcon from '@mui/icons-material/Error';
import PanelIcon from './PanelIcon.jsx';
import { OPEN_MODE_EMBED, OPEN_MODE_TAB, OPEN_MODE_MODAL } from '../hooks/usePanels.js';
/* ============================================================
* PanelsView:面板列表视图(VSCode 侧边栏「面板」内容)
*
* - 固定区(pin+ admin_links 按 category 分组
* - 当前项:左侧 2px primary 指示条 + primary-container 选中底
* - 分组折叠(持久化)、右键切换打开方式、底部 + 添加
* - 搜索时展示扁平结果列表
* - 宽度/折叠由外部 react-resizable-panels 布局管理,本组件不再自持
* ============================================================ */
const MODE_META = [
{ mode: OPEN_MODE_EMBED, label: '内嵌打开', Icon: WebAssetIcon },
{ mode: OPEN_MODE_TAB, label: '新标签打开', Icon: OpenInNewIcon },
{ mode: OPEN_MODE_MODAL, label: '弹窗打开', Icon: OpenInFullIcon },
];
export default function PanelsView({
loading = false, error = '', onRetry,
links = [], filtered = [], search = '',
activeId = null, pinned = [], onSelect, onPin,
groups = {}, onToggleGroup,
modes = {}, onSetMode,
onAdd,
}) {
const [ctx, setCtx] = useState(null); // { id, anchorEl }
const groupOrder = useMemo(() => {
const order = []; const seen = new Set();
links.forEach((p) => {
const c = p.category || '默认';
if (!seen.has(c)) { seen.add(c); order.push(c); }
});
return order;
}, [links]);
const byGroup = useMemo(() => {
const m = {};
links.forEach((p) => {
const c = p.category || '默认';
(m[c] = m[c] || []).push(p);
});
return m;
}, [links]);
const pinnedPanels = links.filter((p) => pinned.includes(String(p.id)));
const renderItem = (p) => {
const selected = String(p.id) === String(activeId);
const isPinned = pinned.includes(String(p.id));
const mode = modes[p.id] || OPEN_MODE_EMBED;
return (
<Box
key={p.id}
sx={{
display: 'flex', alignItems: 'center', position: 'relative',
'&:hover .wb-pin': { opacity: 1 },
}}
>
<ListItemButton
selected={selected}
onClick={() => onSelect(p.id)}
onContextMenu={(e) => { e.preventDefault(); setCtx({ id: p.id, anchorEl: e.currentTarget }); }}
aria-label={`打开面板 ${p.title}`}
sx={{
flex: 1, minHeight: 40, borderRadius: 0, m: 0, pl: 2, pr: 4,
position: 'relative',
'&.Mui-selected': {
bgcolor: 'primary.container', color: 'primary.onContainer',
'&:hover': { bgcolor: 'primary.container' },
},
'&:hover': { bgcolor: 'action.hover' },
}}
>
{selected && (
<Box
aria-hidden
sx={{
position: 'absolute', left: 0, top: '22%', bottom: '22%',
width: 2, bgcolor: 'primary.main', borderRadius: 1,
}}
/>
)}
<PanelIcon url={p.embed_url || p.url} title={p.title} size={20} sx={{ mr: 1 }} />
<ListItemText
primary={p.title}
primaryTypographyProps={{ fontSize: 13, fontWeight: selected ? 600 : 500, noWrap: true }}
sx={{ my: 0, minWidth: 0 }}
/>
{mode !== OPEN_MODE_EMBED && (
<Box
component="span"
title={MODE_META.find((m) => m.mode === mode)?.label}
sx={{ mr: 0.5, fontSize: 10, color: 'text.disabled', whiteSpace: 'nowrap' }}
>
{mode === OPEN_MODE_TAB ? '新标签' : '弹窗'}
</Box>
)}
</ListItemButton>
<IconButton
className="wb-pin"
size="small"
onClick={() => onPin(p.id)}
aria-label={isPinned ? `取消固定 ${p.title}` : `固定 ${p.title}`}
sx={{
position: 'absolute', right: 4, opacity: isPinned ? 1 : 0,
transition: 'opacity .12s ease', color: isPinned ? 'warning.main' : 'text.secondary',
}}
>
{isPinned ? <StarIcon fontSize="small" /> : <StarBorderIcon fontSize="small" />}
</IconButton>
</Box>
);
};
const sectionLabel = (text) => (
<Typography
component="div"
sx={{
px: 2, pt: 1.25, pb: 0.5, fontSize: 11, fontWeight: 700,
letterSpacing: 0.6, color: 'text.secondary',
}}
>
{text}
</Typography>
);
const listBody = (() => {
if (loading) {
return (
<Box sx={{ px: 2, pt: 1 }}>
{[0, 1, 2, 3, 4, 5].map((i) => (
<Skeleton key={i} variant="rounded" height={36} sx={{ my: 1, bgcolor: 'action.hover' }} />
))}
</Box>
);
}
if (error) {
return (
<Box sx={{ px: 3, py: 4, textAlign: 'center' }}>
<ErrorIcon sx={{ fontSize: 32, color: 'error.main', mb: 1 }} />
<Typography variant="body2" sx={{ color: 'text.secondary', mb: 1.5 }}>面板加载失败</Typography>
<Button size="small" variant="outlined" onClick={onRetry}>重试</Button>
</Box>
);
}
if (links.length === 0) {
return (
<Box sx={{ px: 3, py: 4, textAlign: 'center' }}>
<WidgetsIcon sx={{ fontSize: 32, color: 'text.disabled', mb: 1 }} />
<Typography variant="body2" sx={{ color: 'text.secondary' }}>还没有面板点击下方按钮添加</Typography>
</Box>
);
}
if (search.trim()) {
return (
<>
{sectionLabel(`搜索结果(${filtered.length}`)}
{filtered.length === 0 ? (
<Typography variant="body2" sx={{ px: 2, py: 2, color: 'text.secondary' }}>无匹配面板</Typography>
) : (
<List dense disablePadding>{filtered.map(renderItem)}</List>
)}
</>
);
}
return (
<>
{pinnedPanels.length > 0 && (
<>
{sectionLabel('固定')}
<List dense disablePadding>{pinnedPanels.map(renderItem)}</List>
<Divider sx={{ mx: 2, my: 0.5 }} />
</>
)}
{groupOrder.map((name) => {
const collapsedGroup = !!groups[name];
const items = byGroup[name] || [];
return (
<Fragment key={name}>
<ListItemButton
onClick={() => onToggleGroup(name)}
aria-expanded={!collapsedGroup}
sx={{
minHeight: 36, borderRadius: 0, m: 0, px: 1.5,
'&:hover': { bgcolor: 'action.hover' },
}}
>
<ListItemIcon sx={{ minWidth: 30 }}>
<FolderOpenIcon fontSize="small" sx={{ color: 'text.secondary' }} />
</ListItemIcon>
<ListItemText
primary={name}
primaryTypographyProps={{ fontSize: 12, fontWeight: 700, letterSpacing: 0.4, color: 'text.secondary' }}
sx={{ my: 0 }}
/>
<Typography variant="caption" sx={{ mr: 0.5, color: 'text.disabled' }}>{items.length}</Typography>
{collapsedGroup
? <ExpandMoreIcon fontSize="small" sx={{ color: 'text.secondary' }} />
: <ExpandLessIcon fontSize="small" sx={{ color: 'text.secondary' }} />}
</ListItemButton>
<Collapse in={!collapsedGroup} unmountOnExit timeout={150}>
<List dense disablePadding>{items.map(renderItem)}</List>
</Collapse>
</Fragment>
);
})}
</>
);
})();
return (
<Box sx={{ flex: 1, minHeight: 0, display: 'flex', flexDirection: 'column' }}>
<Box sx={{ flex: 1, minHeight: 0, overflowY: 'auto', overflowX: 'hidden' }}>
{listBody}
</Box>
<Divider sx={{ flexShrink: 0 }} />
<Box sx={{ p: 1, flexShrink: 0 }}>
<Button fullWidth size="small" startIcon={<AddIcon />} onClick={onAdd}>添加面板</Button>
</Box>
{/* 右键菜单:切换打开方式 */}
<Menu
open={!!ctx}
anchorEl={ctx?.anchorEl || null}
onClose={() => setCtx(null)}
anchorOrigin={{ vertical: 'bottom', horizontal: 'left' }}
>
{MODE_META.map(({ mode, label, Icon }) => (
<MenuItem
key={mode}
selected={(modes[ctx?.id] || OPEN_MODE_EMBED) === mode}
onClick={() => {
if (ctx) { onSetMode(ctx.id, mode); onSelect(ctx.id); }
setCtx(null);
}}
>
<Icon fontSize="small" sx={{ mr: 1, color: 'text.secondary' }} />
{label}
</MenuItem>
))}
</Menu>
</Box>
);
}
@@ -0,0 +1,70 @@
import React from 'react';
import Box from '@mui/material/Box';
import Typography from '@mui/material/Typography';
import Button from '@mui/material/Button';
/* ============================================================
* SidebarPaneVSCode 风格侧边栏容器(一侧一个)
*
* - 该侧全部 sidebar 模式视图**常驻挂载**display 显隐切换),
* 切换视图/切标签页不丢编辑状态(记事本草稿、密码箱解锁态)
* - 每个视图由 ToolWindow 提供标题栏;内容按 activeView 显示
* - 视图处于 tab 模式时该视图不在侧栏 → 显示占位 + 「移回侧边栏」
* - 无障碍:容器 id=wb-sidebar-{side} 供活动栏 aria-controls
* aria-live 播报当前视图,配合活动栏焦点提示
* ============================================================ */
export default function SidebarPane({ side, views, activeId, renderView, renderPlaceholder }) {
const right = side === 'right';
const activeView = views.find((v) => v.id === activeId);
return (
<Box
component="aside"
id={`wb-sidebar-${side}`}
aria-label={right ? '右侧侧边栏' : '左侧侧边栏'}
sx={{
height: '100%', minWidth: 0, overflow: 'hidden', position: 'relative',
display: 'flex', flexDirection: 'column',
bgcolor: 'background.paper',
}}
>
{/* 活动栏激活后的屏幕阅读器播报(视觉隐藏) */}
<Box
aria-live="polite"
sx={{
position: 'absolute', width: 1, height: 1, overflow: 'hidden',
clip: 'rect(0 0 0 0)', whiteSpace: 'nowrap', m: -1, p: 0, border: 0,
}}
>
{activeView ? `当前视图:${activeView.label}` : '侧边栏为空'}
</Box>
{views.map((v) => {
const active = activeId === v.id;
return (
<Box
key={v.id}
sx={{
flex: 1, minHeight: 0, display: active ? 'flex' : 'none',
flexDirection: 'column',
}}
>
{renderView(v.id)}
</Box>
);
})}
{views.length === 0 && (
<Box sx={{ flex: 1, display: 'flex', alignItems: 'center', justifyContent: 'center', px: 3, textAlign: 'center' }}>
<Typography variant="caption" sx={{ color: 'text.disabled' }}>
从另一侧活动栏拖一个功能标签到这里
</Typography>
</Box>
)}
{views.length > 0 && !views.some((v) => v.id === activeId) && renderPlaceholder && (
<Box sx={{ flex: 1, minHeight: 0, display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', gap: 1, px: 3, textAlign: 'center' }}>
{renderPlaceholder()}
</Box>
)}
</Box>
);
}
@@ -0,0 +1,30 @@
import React from 'react';
import Box from '@mui/material/Box';
import Typography from '@mui/material/Typography';
/* ============================================================
* StatusBar:底部状态栏(可选,VSCode 风格)
* 左:当前上下文;右:主机:端口 + 版本
* ============================================================ */
export default function StatusBar({ left, right = null }) {
const host = typeof window !== 'undefined' ? window.location.host : '';
return (
<Box
role="status"
sx={{
height: 24, flexShrink: 0, display: 'flex', alignItems: 'center',
px: 1.5, gap: 1.5, bgcolor: 'primary.container', color: 'primary.onContainer',
fontSize: 11, borderTop: 1, borderColor: 'divider',
}}
>
<Box
component="span"
aria-hidden
sx={{ width: 7, height: 7, borderRadius: '50%', bgcolor: 'success.main', flexShrink: 0 }}
/>
<Typography noWrap sx={{ fontSize: 11, fontWeight: 500, flex: 1, minWidth: 0 }}>{left}</Typography>
<Typography noWrap sx={{ fontSize: 11, opacity: 0.85 }}>{right || host}</Typography>
</Box>
);
}
@@ -0,0 +1,113 @@
import React, { useRef } from 'react';
import Box from '@mui/material/Box';
import Typography from '@mui/material/Typography';
import IconButton from '@mui/material/IconButton';
import Tooltip from '@mui/material/Tooltip';
import CloseIcon from '@mui/icons-material/Close';
import AddIcon from '@mui/icons-material/Add';
/* ============================================================
* TabStrip:主区标签页条(VSCode 风格,浏览器标签交互)
*
* - tabs{ key, title, icon?, closable? }iframe 面板与
* tab 模式视图共用一套标签(由 Workbench 拼装)
* - 键盘:← → 切换、Home/End 首尾(roving tabindex
* - ARIA:每个 tab 与 ContentView 的 tabpanel 通过 id 配对
* tabBtnId / tabPanelId,冒号等字符已做无害化)
* ============================================================ */
/** tab 按钮元素 idtab.key 可能含 ':',替换为下划线保证合法 */
export function tabBtnId(key) {
return 'wb-tab-' + String(key).replace(/[^a-zA-Z0-9_-]/g, '_');
}
/** 对应 tabpanel 元素 id */
export function tabPanelId(key) {
return 'wb-panel-' + String(key).replace(/[^a-zA-Z0-9_-]/g, '_');
}
export default function TabStrip({ tabs, activeKey, onSelect, onClose, onAdd }) {
const stripRef = useRef(null);
const tabEls = () => Array.from(stripRef.current?.querySelectorAll('[role="tab"]') || []);
const moveTo = (i) => {
const n = tabs.length;
if (n === 0) return;
const j = ((i % n) + n) % n;
onSelect(tabs[j].key);
tabEls()[j]?.focus();
};
const handleKeyDown = (e, index) => {
if (e.key === 'ArrowRight') { e.preventDefault(); moveTo(index + 1); }
else if (e.key === 'ArrowLeft') { e.preventDefault(); moveTo(index - 1); }
else if (e.key === 'Home') { e.preventDefault(); moveTo(0); }
else if (e.key === 'End') { e.preventDefault(); moveTo(tabs.length - 1); }
};
return (
<Box
ref={stripRef}
role="tablist"
aria-label="已打开的面板与视图"
sx={{
display: 'flex', alignItems: 'center', gap: 0.25, px: 0.5, py: 0.5,
height: 40, flexShrink: 0, bgcolor: 'background.paper',
borderBottom: 1, borderColor: 'divider',
overflowX: 'auto', overflowY: 'hidden',
}}
>
{tabs.map((tab, index) => {
const active = tab.key === activeKey;
return (
<Box
key={tab.key}
id={tabBtnId(tab.key)}
role="tab"
aria-selected={active}
aria-label={tab.title}
aria-controls={tabPanelId(tab.key)}
tabIndex={active ? 0 : -1}
onClick={() => onSelect(tab.key)}
onKeyDown={(e) => handleKeyDown(e, index)}
sx={{
display: 'flex', alignItems: 'center', gap: 0.5, pl: 1, pr: 0.25,
height: 28, borderRadius: 1, cursor: 'pointer', flexShrink: 0, outline: 'none',
bgcolor: active ? 'primary.container' : 'transparent',
color: active ? 'primary.onContainer' : 'text.secondary',
'&:hover': { bgcolor: active ? 'primary.container' : 'action.hover' },
'&:focus-visible': { boxShadow: (t) => `inset 0 0 0 2px ${t.palette.primary.main}` },
}}
>
{tab.icon}
<Typography
noWrap
sx={{
fontSize: 12, fontWeight: active ? 600 : 500, maxWidth: 140,
overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap',
}}
>
{tab.title}
</Typography>
{tab.closable && (
<IconButton
size="small"
onClick={(e) => { e.stopPropagation(); onClose(tab.key); }}
aria-label={`关闭 ${tab.title}`}
sx={{ width: 20, height: 20, borderRadius: 0.5, '& svg': { fontSize: 14 } }}
>
<CloseIcon />
</IconButton>
)}
</Box>
);
})}
{onAdd && (
<Tooltip title="添加面板">
<IconButton size="small" onClick={onAdd} sx={{ ml: 0.25, flexShrink: 0 }} aria-label="添加面板">
<AddIcon sx={{ fontSize: 16 }} />
</IconButton>
</Tooltip>
)}
</Box>
);
}
@@ -0,0 +1,81 @@
import React from 'react';
import Box from '@mui/material/Box';
import Typography from '@mui/material/Typography';
import IconButton from '@mui/material/IconButton';
import Tooltip from '@mui/material/Tooltip';
import ViewSidebarIcon from '@mui/icons-material/ViewSidebar';
import TabIcon from '@mui/icons-material/Tab';
import OpenInFullIcon from '@mui/icons-material/OpenInFull';
import CloseIcon from '@mui/icons-material/Close';
import { VIEW_MODE_SIDEBAR, VIEW_MODE_TAB } from '../hooks/useWorkbenchLayout.js';
/* ============================================================
* ToolWindow:通用可停靠面板(侧边栏 / 标签页双模式 + 浮动占位)
*
* - 标题栏:图标 + 标题 + 模式切换(侧边栏/标签页)+ 浮动占位按钮
* (P2 未实现,点击只触发 onFloat 提示)+ 关闭按钮 + 自定义 actions
* - 纯展示组件,无内部状态;模式/关闭行为由父级注入
* ============================================================ */
export default function ToolWindow({ icon, title, mode, onSetMode, onFloat, onClose, closeTitle = '关闭', actions = null, children }) {
const modeBtn = (m, label, MIcon) => (
<Tooltip key={m} title={label}>
<IconButton
size="small"
onClick={() => onSetMode?.(m)}
aria-label={label}
aria-pressed={mode === m}
sx={{
width: 26, height: 26, borderRadius: 1,
color: mode === m ? 'primary.main' : 'text.secondary',
bgcolor: mode === m ? 'action.selected' : 'transparent',
'&:hover': { bgcolor: mode === m ? 'action.selected' : 'action.hover' },
}}
>
<MIcon sx={{ fontSize: 15 }} />
</IconButton>
</Tooltip>
);
return (
<Box
sx={{
display: 'flex', alignItems: 'center', gap: 0.25,
px: 1.25, height: 44, flexShrink: 0,
bgcolor: 'background.paper', borderBottom: 1, borderColor: 'divider',
}}
>
{icon}
<Typography noWrap sx={{ flex: 1, minWidth: 0, ml: 0.25, fontSize: 13, fontWeight: 600 }}>
{title}
</Typography>
{modeBtn(VIEW_MODE_SIDEBAR, '侧边栏模式', ViewSidebarIcon)}
{modeBtn(VIEW_MODE_TAB, '标签页模式', TabIcon)}
{onFloat && (
<Tooltip title="浮动模式(即将上线)">
<IconButton
size="small"
onClick={onFloat}
aria-label="浮动模式"
sx={{ width: 26, height: 26, borderRadius: 1 }}
>
<OpenInFullIcon sx={{ fontSize: 15 }} />
</IconButton>
</Tooltip>
)}
{actions}
{onClose && (
<Tooltip title={closeTitle}>
<IconButton
size="small"
onClick={onClose}
aria-label={closeTitle}
sx={{ width: 26, height: 26, borderRadius: 1 }}
>
<CloseIcon sx={{ fontSize: 15 }} />
</IconButton>
</Tooltip>
)}
</Box>
);
}
@@ -0,0 +1,143 @@
import React, { useRef } from 'react';
import Box from '@mui/material/Box';
import IconButton from '@mui/material/IconButton';
import Tooltip from '@mui/material/Tooltip';
import Button from '@mui/material/Button';
import Divider from '@mui/material/Divider';
import InputBase from '@mui/material/InputBase';
import { useTheme } from '@mui/material/styles';
import ArrowBackIcon from '@mui/icons-material/ArrowBack';
import ArrowForwardIcon from '@mui/icons-material/ArrowForward';
import RefreshIcon from '@mui/icons-material/Refresh';
import SearchIcon from '@mui/icons-material/Search';
import OpenInNewIcon from '@mui/icons-material/OpenInNew';
import HomeIcon from '@mui/icons-material/Home';
import MenuBar from './MenuBar.jsx';
import PanelIcon from './PanelIcon.jsx';
/* ============================================================
* ToolbarVSCode 风格顶栏(高度 56px
*
* Rain Work(渐变字标) | 菜单栏 | ← → ↻ | 地址栏(自适应填满) | 搜索 | 返回
* - 地址栏仅展示当前面板 URL(嵌入地址优先),只读、可点开新标签;
* flex:1 填满顶栏剩余空间,左侧内容变宽时自然缩减
* - 搜索框:面板名/URL/分组,Enter 直达(逻辑由 Workbench 注入)
* ============================================================ */
export default function Toolbar({
menus = [],
canBack = false, canForward = false, onBack, onForward, onRefresh,
currentPanel = null, onOpenExternal,
search = '', onSearchChange, onSearchEnter,
searchInputRef = null, onBackHome,
}) {
const muiTheme = useTheme();
const searchRef = useRef(null);
const inputRef = searchInputRef || searchRef;
const currentUrl = currentPanel ? (currentPanel.embed_url || currentPanel.url || '') : '';
const logoGradient = `linear-gradient(135deg, ${muiTheme.palette.primary.main} 0%, ${muiTheme.palette.tertiary.main} 100%)`;
return (
<Box
component="header"
sx={{
height: 56, flexShrink: 0, display: 'flex', alignItems: 'center',
gap: 0.5, px: 1, zIndex: 10,
bgcolor: 'background.paper', borderBottom: 1, borderColor: 'divider',
}}
>
{/* 品牌:纯文字 Logo,MD3 渐变字重 */}
<Box
component="span"
aria-label="Rain Work"
sx={{
fontSize: 19.5, fontWeight: 700, letterSpacing: 0.4, mr: 1, flexShrink: 0,
background: logoGradient, WebkitBackgroundClip: 'text', backgroundClip: 'text',
WebkitTextFillColor: 'transparent', color: 'transparent',
userSelect: 'none',
}}
>
Rain Work
</Box>
<MenuBar menus={menus} />
<Divider orientation="vertical" flexItem sx={{ mx: 0.5 }} />
{/* 导航:后退 / 前进 / 刷新 */}
<Tooltip title="后退">
<span><IconButton size="small" onClick={onBack} disabled={!canBack} aria-label="后退"><ArrowBackIcon fontSize="small" /></IconButton></span>
</Tooltip>
<Tooltip title="前进">
<span><IconButton size="small" onClick={onForward} disabled={!canForward} aria-label="前进"><ArrowForwardIcon fontSize="small" /></IconButton></span>
</Tooltip>
<Tooltip title="刷新当前面板">
<span><IconButton size="small" onClick={onRefresh} disabled={!currentPanel} aria-label="刷新"><RefreshIcon fontSize="small" /></IconButton></span>
</Tooltip>
{/* 地址栏(只读,flex:1 自适应填满顶栏剩余空间;无 maxWidth 上限,
左侧菜单/导航变宽时自然缩减,顶栏始终占满) */}
<Box
role="textbox"
aria-label="当前面板地址"
sx={{
flex: 1, minWidth: 120, maxWidth: 'none', display: 'flex', alignItems: 'center', gap: 0.75,
mx: 0.75, height: 34, px: 1.25,
bgcolor: 'background.default', border: 1, borderColor: 'divider', borderRadius: 1.25,
'&:focus-within': { borderColor: 'primary.main' },
}}
>
{currentPanel && <PanelIcon url={currentUrl} title={currentPanel.title} size={16} />}
<InputBase
readOnly
fullWidth
value={currentUrl}
placeholder="未打开面板"
inputProps={{ 'aria-label': '当前面板地址', style: { cursor: 'default', fontSize: 12.5 } }}
sx={{ color: 'text.secondary' }}
/>
{currentPanel && (
<Tooltip title="在新标签页打开原站">
<IconButton size="small" onClick={onOpenExternal} aria-label="在新标签页打开原站">
<OpenInNewIcon sx={{ fontSize: 16 }} />
</IconButton>
</Tooltip>
)}
</Box>
{/* 搜索 */}
<Box sx={{ position: 'relative', flexShrink: 0 }}>
<SearchIcon
sx={{
position: 'absolute', left: 9, top: '50%', transform: 'translateY(-50%)',
fontSize: 16, color: 'text.secondary', pointerEvents: 'none',
}}
/>
<InputBase
ref={inputRef}
value={search}
onChange={(e) => onSearchChange?.(e.target.value)}
onKeyDown={(e) => { if (e.key === 'Enter') { onSearchEnter?.(); inputRef.current?.blur(); } }}
placeholder="搜索面板"
inputProps={{ 'aria-label': '搜索面板', style: { paddingLeft: 30, fontSize: 12.5 } }}
sx={{
height: 34, width: { xs: 100, sm: 150 }, px: 0.5,
bgcolor: 'background.default', border: 1, borderColor: 'divider',
borderRadius: 20, '&:focus-within': { borderColor: 'primary.main' },
}}
/>
</Box>
{/* 返回前台 */}
<Button
color="inherit"
onClick={onBackHome}
startIcon={<HomeIcon sx={{ fontSize: 17 }} />}
sx={{ ml: 0.5, minWidth: 0, px: { xs: 1, sm: 1.25 }, flexShrink: 0, '& .MuiButton-startIcon': { mr: { xs: 0, sm: 0.5 } } }}
>
<Box component="span" sx={{ display: { xs: 'none', sm: 'inline' }, fontSize: 13 }}>返回</Box>
</Button>
</Box>
);
}
@@ -0,0 +1,390 @@
import React, { useCallback, useEffect, useState } from 'react';
import Box from '@mui/material/Box';
import Typography from '@mui/material/Typography';
import IconButton from '@mui/material/IconButton';
import Button from '@mui/material/Button';
import TextField from '@mui/material/TextField';
import InputAdornment from '@mui/material/InputAdornment';
import List from '@mui/material/List';
import ListItem from '@mui/material/ListItem';
import ListItemButton from '@mui/material/ListItemButton';
import ListItemIcon from '@mui/material/ListItemIcon';
import ListItemText from '@mui/material/ListItemText';
import Collapse from '@mui/material/Collapse';
import CircularProgress from '@mui/material/CircularProgress';
import Tooltip from '@mui/material/Tooltip';
import CloseIcon from '@mui/icons-material/Close';
import LockIcon from '@mui/icons-material/Lock';
import LockOpenIcon from '@mui/icons-material/LockOpen';
import KeyIcon from '@mui/icons-material/Key';
import SearchIcon from '@mui/icons-material/Search';
import ContentCopyIcon from '@mui/icons-material/ContentCopy';
import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
import VisibilityIcon from '@mui/icons-material/Visibility';
import VisibilityOffIcon from '@mui/icons-material/VisibilityOff';
import ErrorIcon from '@mui/icons-material/Error';
import useVault from '../hooks/useVault.js';
import { showSnack } from '../../../admin/snack.jsx';
/* ============================================================
* VaultView:密码箱视图(VSCode 侧边栏 / 标签页内容)
*
* 由 VaultDrawer 裁剪:去掉 MUI Drawer 壳与自带标题栏/关闭按钮
* (由父级 ToolWindow 提供),锁定按钮并入解锁后的搜索行。
* 标题栏之外全部逻辑保留:
* loading → noPin(引导设置)| lockedPIN 输入)→ unlocked(搜索+条目)
* 「锁定」走 lock API;切换视图不锁定,方便取用。
* @param {{open: boolean}} open 视图是否处于激活(激活时重新同步服务端状态)
* ============================================================ */
/** 剪贴板写入:优先 Async Clipboard,失败时降级 execCommand(非安全上下文/LAN 部署) */
async function copyText(text) {
if (!text) return false;
try {
await navigator.clipboard.writeText(text);
return true;
} catch {
try {
const ta = document.createElement('textarea');
ta.value = text;
ta.setAttribute('readonly', '');
ta.style.position = 'fixed';
ta.style.left = '-9999px';
ta.style.top = '0';
document.body.appendChild(ta);
ta.select();
const ok = document.execCommand('copy');
document.body.removeChild(ta);
return ok;
} catch { return false; }
}
}
/** 展开详情中的单字段行:标签 + 值(网址可点开)+ 复制按钮 */
function DetailField({ label, value, href, secret, onCopy }) {
// 防注入:仅放行 http(s)/mailto,其余协议降级为纯文本
const safeHref = href && /^(https?|mailto):/i.test(href) ? href : null;
return (
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1, py: 0.75, minWidth: 0 }}>
<Typography variant="caption" sx={{ color: 'text.secondary', width: 40, flexShrink: 0 }}>{label}</Typography>
{safeHref ? (
<Typography
variant="body2"
component="a"
href={safeHref}
target="_blank"
rel="noopener noreferrer"
title={value}
sx={{
flexGrow: 1, minWidth: 0, color: 'primary.main',
overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap',
}}
>
{value}
</Typography>
) : (
<Typography
variant="body2"
title={value}
sx={{
flexGrow: 1, minWidth: 0,
overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap',
fontFamily: secret ? 'ui-monospace, SFMono-Regular, Menlo, Consolas, monospace' : undefined,
letterSpacing: secret ? '0.04em' : undefined,
}}
>
{value || '—'}
</Typography>
)}
{onCopy ? (
<IconButton size="small" aria-label={`复制${label}`} onClick={onCopy} sx={{ flexShrink: 0 }}>
<ContentCopyIcon sx={{ fontSize: 15 }} />
</IconButton>
) : null}
</Box>
);
}
/** 单条密码:行内标题 + 用户名 + 复制密码,点击展开详情 */
function VaultEntryRow({ entry, expanded, onToggle, onCopy }) {
return (
<ListItem disablePadding sx={{ display: 'block' }}>
<ListItemButton
onClick={onToggle}
selected={expanded}
aria-expanded={expanded}
sx={{ pr: 1 }}
>
<ListItemIcon>
<KeyIcon fontSize="small" />
</ListItemIcon>
<ListItemText
primary={entry.title}
secondary={entry.username || '无用户名'}
primaryTypographyProps={{ noWrap: true, fontWeight: 500 }}
secondaryTypographyProps={{ noWrap: true }}
/>
<Tooltip title="复制密码">
<IconButton
size="small"
aria-label={`复制 ${entry.title} 的密码`}
onClick={(e) => { e.stopPropagation(); onCopy(entry.password, '密码'); }}
>
<ContentCopyIcon fontSize="small" />
</IconButton>
</Tooltip>
<ExpandMoreIcon
fontSize="small"
sx={{
color: 'text.secondary', ml: 0.25,
transform: expanded ? 'rotate(180deg)' : 'none',
transition: 'transform 0.2s ease',
}}
/>
</ListItemButton>
<Collapse in={expanded} unmountOnExit>
<Box sx={{ px: 2, py: 1, mx: 1, mb: 1, bgcolor: 'action.hover', borderRadius: 2 }}>
<DetailField
label="用户名"
value={entry.username}
onCopy={entry.username ? () => onCopy(entry.username, '用户名') : undefined}
/>
<DetailField
label="密码"
value={entry.password}
secret
onCopy={entry.password ? () => onCopy(entry.password, '密码') : undefined}
/>
{entry.url ? (
<DetailField label="网址" value={entry.url} href={entry.url} onCopy={() => onCopy(entry.url, '网址')} />
) : null}
{entry.notes ? <DetailField label="备注" value={entry.notes} /> : null}
</Box>
</Collapse>
</ListItem>
);
}
/**
* 密码箱视图
* @param {boolean} open 视图是否激活(激活时重新同步服务端会话状态)
*/
export default function VaultView({ open = false }) {
const vault = useVault({ open });
// PIN 输入屏的本地状态
const [pinInput, setPinInput] = useState('');
const [pinError, setPinError] = useState('');
const [showPin, setShowPin] = useState(false);
// 展开中的条目 id(重新打开时清空)
const [expandedId, setExpandedId] = useState(null);
useEffect(() => {
if (open) {
setPinInput('');
setPinError('');
setShowPin(false);
setExpandedId(null);
}
}, [open]);
const submitUnlock = useCallback(async () => {
const pin = pinInput.trim();
if (!pin) { setPinError('请输入 PIN 码'); return; }
setPinError('');
try {
await vault.unlock(pin);
setPinInput('');
setShowPin(false);
showSnack('已解锁');
} catch (e) {
setPinError(e.message || '解锁失败');
setPinInput('');
}
}, [pinInput, vault]);
const handleLock = useCallback(async () => {
try {
await vault.lock();
setExpandedId(null);
showSnack('已锁定');
} catch (e) {
showSnack(e.message || '锁定失败', 'error');
}
}, [vault]);
const copyToClipboard = useCallback(async (text, label) => {
const ok = await copyText(text);
if (ok) showSnack(`${label} 已复制`);
else showSnack('复制失败', 'error');
}, []);
/* ---------- 各状态下的主体 ---------- */
const renderBody = () => {
switch (vault.status) {
case 'loading':
return (
<Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', height: '100%', gap: 2 }}>
<CircularProgress size={28} />
<Typography variant="body2" color="text.secondary">正在检查密码库状态</Typography>
</Box>
);
case 'error':
return (
<Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', height: '100%', gap: 1.5, textAlign: 'center', px: 2 }}>
<ErrorIcon color="error" sx={{ fontSize: 40 }} />
<Typography variant="body2" color="text.secondary">{vault.statusError}</Typography>
<Button variant="outlined" onClick={vault.checkStatus} sx={{ mt: 1 }}>重试</Button>
</Box>
);
case 'noPin':
return (
<Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', height: '100%', gap: 1.5, textAlign: 'center', px: 2 }}>
<LockOpenIcon sx={{ fontSize: 44, color: 'text.disabled' }} />
<Typography variant="subtitle1" sx={{ fontWeight: 500 }}>未设置 PIN</Typography>
<Typography variant="body2" color="text.secondary">请先到密码库页设置 PIN 后再使用</Typography>
<Button variant="contained" component="a" href="/passwords.html" sx={{ mt: 1 }}>前往密码库页</Button>
</Box>
);
case 'locked':
return (
<Box component="form" onSubmit={(e) => { e.preventDefault(); submitUnlock(); }} sx={{ mt: 1 }}>
<Typography variant="subtitle1" sx={{ mb: 1.5, fontWeight: 500 }}>输入 PIN 码解锁</Typography>
<TextField
autoFocus
fullWidth
size="small"
type={showPin ? 'text' : 'password'}
label="PIN 码"
value={pinInput}
onChange={(e) => { setPinInput(e.target.value); if (pinError) setPinError(''); }}
onKeyDown={(e) => { if (e.key === 'Enter') submitUnlock(); }}
error={!!pinError}
helperText={pinError || ' '}
autoComplete="off"
spellCheck={false}
slotProps={{
htmlInput: { maxLength: 20, 'aria-label': 'PIN 码' },
input: {
endAdornment: (
<InputAdornment position="end">
<IconButton
size="small"
edge="end"
aria-label={showPin ? '隐藏 PIN' : '显示 PIN'}
onClick={() => setShowPin((v) => !v)}
>
{showPin ? <VisibilityOffIcon fontSize="small" /> : <VisibilityIcon fontSize="small" />}
</IconButton>
</InputAdornment>
),
},
}}
/>
<Button
variant="contained"
fullWidth
disabled={vault.unlocking || !pinInput}
onClick={submitUnlock}
startIcon={vault.unlocking ? <CircularProgress size={18} color="inherit" /> : <LockOpenIcon />}
sx={{ mt: 2 }}
>
{vault.unlocking ? '解锁中…' : '解锁'}
</Button>
</Box>
);
case 'unlocked':
default: {
const { entries, entriesError, filteredEntries, search, setSearch } = vault;
const empty = filteredEntries.length === 0;
return (
<Box>
{/* 搜索 + 锁定(标题栏由 ToolWindow 提供,锁定并入此行) */}
<Box sx={{ display: 'flex', alignItems: 'flex-start', gap: 0.5 }}>
<TextField
fullWidth
size="small"
placeholder="搜索标题或用户名"
value={search}
onChange={(e) => setSearch(e.target.value)}
slotProps={{
htmlInput: { 'aria-label': '搜索密码' },
input: {
startAdornment: (
<InputAdornment position="start">
<SearchIcon fontSize="small" sx={{ color: 'text.secondary' }} />
</InputAdornment>
),
endAdornment: search ? (
<InputAdornment position="end">
<IconButton size="small" edge="end" aria-label="清空搜索" onClick={() => setSearch('')}>
<CloseIcon fontSize="small" />
</IconButton>
</InputAdornment>
) : null,
},
}}
/>
<Tooltip title="锁定密码库">
<span>
<IconButton aria-label="锁定密码库" onClick={handleLock} disabled={vault.locking} size="small">
<LockIcon fontSize="small" />
</IconButton>
</span>
</Tooltip>
</Box>
{entries === null && (
<Box sx={{ display: 'flex', justifyContent: 'center', py: 4 }}>
<CircularProgress size={26} />
</Box>
)}
{entriesError && (
<Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: 1, py: 3, textAlign: 'center' }}>
<ErrorIcon color="error" />
<Typography variant="body2" color="text.secondary">加载失败{entriesError}</Typography>
<Button size="small" variant="outlined" onClick={vault.loadEntries}>重试</Button>
</Box>
)}
{entries && !entriesError && empty && (
<Box sx={{ textAlign: 'center', py: 4 }}>
<Typography variant="body2" color="text.secondary">
{search ? '无匹配的密码记录' : '暂无密码记录'}
</Typography>
</Box>
)}
{entries && !entriesError && !empty && (
<List disablePadding>
{filteredEntries.map((e) => (
<VaultEntryRow
key={e.id}
entry={e}
expanded={expandedId === e.id}
onToggle={() => setExpandedId(expandedId === e.id ? null : e.id)}
onCopy={copyToClipboard}
/>
))}
</List>
)}
</Box>
);
}
}
};
return (
<Box component="section" aria-label="密码箱" sx={{ flex: 1, minHeight: 0, display: 'flex', flexDirection: 'column' }}>
<Box sx={{ flex: 1, minHeight: 0, overflowY: 'auto', px: 1.5, py: 1.5 }}>
{renderBody()}
</Box>
</Box>
);
}
@@ -0,0 +1,231 @@
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import * as notesApi from '../../../api/notes.js';
import { showSnack } from '../../../admin/snack.jsx';
/* ============================================================
* useNotes:工作台「记事本」状态管理
*
* - 列表加载/错误态、当前编辑文件(activeName)、草稿内容 + 服务端快照
* - 自动保存:输入防抖 900msCtrl+S 立即保存(dirty = 草稿 ≠ 快照)
* - 新建 / 重命名(新文件 + 删旧文件)/ 删除,全程复用 notes API
* - 会话保持(sidebar↔tab 模式切换/切视图会重挂载组件):
* · 草稿存模块级 sessionCache,重挂载瞬间恢复,光标上下文不丢
* · activeName 持久化到 localStorageworkbench.notesActive),跨刷新恢复上次文件
* · 监听 window 'workbench:notes-save-request'Workbench 切换模式前派发),
* 立即 flush 未落盘的 <900ms 草稿
* ============================================================ */
const AUTOSAVE_MS = 900;
const NOTES_ACTIVE_KEY = 'workbench.notesActive';
/** 模块级草稿缓存:组件重挂载后直接恢复,不依赖服务端往返 */
const sessionCache = { name: null, text: '' };
export default function useNotes() {
const [notes, setNotes] = useState(null); // null = 加载中
const [loadError, setLoadError] = useState('');
const [activeName, setActiveName] = useState(() => {
try { return localStorage.getItem(NOTES_ACTIVE_KEY) || null; } catch { return null; }
});
// 草稿与快照初始化取自缓存(若缓存有同名文件),避免模式切换丢内容
const [content, setContent] = useState(() => (sessionCache.name ? sessionCache.text : ''));
const [savedContent, setSavedContent] = useState(() => (sessionCache.name ? sessionCache.text : ''));
const [saving, setSaving] = useState(false); // 保存请求进行中
const [busy, setBusy] = useState(false); // 打开/新建/重命名进行中
const draftRef = useRef({ name: null, text: '' }); // 最新草稿(供防抖回调读取)
const debounceRef = useRef(null);
const restoredRef = useRef(false); // 恢复会话只执行一次
// ---- 列表加载(静默刷新:保留现有列表,避免自动保存时闪烁) ----
const refresh = useCallback(() => {
setLoadError('');
return notesApi.listNotes()
.then((ls) => {
const arr = Array.isArray(ls) ? ls : [];
setNotes(arr);
setActiveName((prev) => (prev && arr.some((n) => n.name === prev) ? prev : null));
})
.catch((e) => { setLoadError(e.message || '加载失败'); });
}, []);
useEffect(() => { refresh(); }, [refresh]);
// ---- 保存(PUT ----
// 注意:必须声明在引用它的 useEffect(会话恢复 / save-request 监听)之前,
// 否则渲染期求值依赖数组会触发 TDZCannot access before initialization)。
const saveContent = useCallback((name, text) => {
setSaving(true);
return notesApi.updateNote(name, text)
.then((res) => {
setSavedContent(text);
sessionCache.text = text;
setNotes((prev) => (prev
? prev.map((n) => (n.name === res.name ? { ...n, size: res.size, mtime: res.mtime } : n))
: prev));
})
.catch((e) => showSnack(e.message, 'error'))
.finally(() => setSaving(false));
}, []);
// ---- 会话恢复(挂载一次):缓存有同名草稿→直接恢复并推给服务端(幂等);
// 无缓存但记住了文件名→从服务端读取 ----
useEffect(() => {
if (restoredRef.current) return;
if (activeName === null) { restoredRef.current = true; return; }
if (sessionCache.name === activeName) {
restoredRef.current = true;
saveContent(activeName, sessionCache.text);
return;
}
restoredRef.current = true;
open(activeName);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
// ---- activeName 持久化(模式切换/刷新后恢复上次文件) ----
useEffect(() => {
try {
if (activeName) localStorage.setItem(NOTES_ACTIVE_KEY, activeName);
else localStorage.removeItem(NOTES_ACTIVE_KEY);
} catch { /* 隐私模式忽略 */ }
}, [activeName]);
// ---- 模式切换前的显式保存:Workbench 派发 workbench:notes-save-request ----
useEffect(() => {
const handler = () => {
clearTimeout(debounceRef.current);
const d = draftRef.current;
if (d.name) saveContent(d.name, d.text);
};
window.addEventListener('workbench:notes-save-request', handler);
return () => window.removeEventListener('workbench:notes-save-request', handler);
}, [saveContent]);
// 当前文件被外部删除/失效时清空编辑器
useEffect(() => {
if (activeName === null) {
setContent('');
setSavedContent('');
draftRef.current = { name: null, text: '' };
}
}, [activeName]);
// ---- 打开文件 ----
const open = useCallback((name) => {
setBusy(true);
return notesApi.getNote(name)
.then((res) => {
const text = res.content || '';
setActiveName(name);
setContent(text);
setSavedContent(text);
draftRef.current = { name, text };
sessionCache.name = name;
sessionCache.text = text;
})
.catch((e) => showSnack(e.message, 'error'))
.finally(() => setBusy(false));
}, []);
// ---- 编辑(防抖自动保存 + 实时写缓存) ----
const updateContent = useCallback((text) => {
setContent(text);
draftRef.current = { name: activeName, text };
sessionCache.name = activeName;
sessionCache.text = text;
clearTimeout(debounceRef.current);
debounceRef.current = setTimeout(() => {
const d = draftRef.current;
if (d.name) saveContent(d.name, d.text);
}, AUTOSAVE_MS);
}, [activeName, saveContent]);
// ---- 立即保存(Ctrl+S / 切换文件前 / save-request ----
const saveNow = useCallback(() => {
clearTimeout(debounceRef.current);
const d = draftRef.current;
if (d.name) return saveContent(d.name, d.text);
return Promise.resolve();
}, [saveContent]);
// ---- 新建 ----
const create = useCallback((name) => {
setBusy(true);
return notesApi.createNote(name, '')
.then((res) => {
setActiveName(res.name);
setContent('');
setSavedContent('');
draftRef.current = { name: res.name, text: '' };
sessionCache.name = res.name;
sessionCache.text = '';
return refresh();
})
.catch((e) => showSnack(e.message, 'error'))
.finally(() => setBusy(false));
}, [refresh]);
// ---- 重命名(新文件写入旧内容 + 删旧文件) ----
const rename = useCallback(async (oldName, newName) => {
setBusy(true);
try {
// 若正在编辑该文件,用草稿内容;否则先读服务端内容
let text = draftRef.current.text;
if (activeName !== oldName) {
const res = await notesApi.getNote(oldName);
text = res.content || '';
}
await notesApi.createNote(newName, text);
await notesApi.deleteNote(oldName);
if (activeName === oldName) {
setActiveName(newName);
setSavedContent(text);
draftRef.current = { name: newName, text };
sessionCache.name = newName;
sessionCache.text = text;
}
await refresh();
showSnack('重命名成功');
} catch (e) {
showSnack(e.message, 'error');
} finally {
setBusy(false);
}
}, [activeName, refresh]);
// ---- 删除 ----
const remove = useCallback(async (name) => {
setBusy(true);
try {
await notesApi.deleteNote(name);
if (activeName === name) {
clearTimeout(debounceRef.current);
setActiveName(null);
sessionCache.name = null;
sessionCache.text = '';
}
await refresh();
} catch (e) {
showSnack(e.message, 'error');
} finally {
setBusy(false);
}
}, [activeName, refresh]);
// ---- 新建默认名:untitled-N.txt(避开已有名) ----
const nextUntitled = useMemo(() => {
const names = new Set((notes || []).map((n) => n.name.toLowerCase()));
let i = 1;
while (names.has(`untitled-${i}.txt`)) i += 1;
return `untitled-${i}.txt`;
}, [notes]);
const dirty = activeName !== null && content !== savedContent;
return {
notes, loadError, refresh,
activeName, content, dirty, saving, busy,
open, updateContent, saveNow, create, rename, remove, nextUntitled,
};
}
@@ -0,0 +1,254 @@
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { listAdminLinks } from '../../../api/adminLinks.js';
/* ============================================================
* 工作台面板状态(Lane A 核心 hook
*
* 管理:面板列表(admin_links)、打开集合、当前面板、历史栈(◀▶)、
* 固定(pin)、分组折叠、打开方式、侧边栏折叠、搜索。
* 打开集合 / 当前面板 / 历史栈 / 折叠态等持久化到 localStoragekey: workbench.*)。
* ============================================================ */
export const OPEN_MODE_EMBED = 'embed'; // 内嵌 iframe
export const OPEN_MODE_TAB = 'tab'; // 新标签页
export const OPEN_MODE_MODAL = 'modal'; // 弹窗打开
const STORE = {
open: 'workbench.open', // 打开的面板 id 数组
active: 'workbench.active', // 当前面板 id
history: 'workbench.history', // { ids: [], index: n } 历史栈
groups: 'workbench.collapsedGroups', // { 分组名: true } 折叠
pinned: 'workbench.pinned', // 固定面板 id 数组
modes: 'workbench.openModes', // { id: 'embed'|'tab'|'modal' }
};
function read(key, fallback) {
try {
const raw = localStorage.getItem(key);
return raw === null ? fallback : JSON.parse(raw);
} catch { return fallback; }
}
function write(key, value) {
try { localStorage.setItem(key, JSON.stringify(value)); } catch { /* 隐私模式等场景忽略 */ }
}
export default function usePanels() {
const [links, setLinks] = useState(null); // null = 加载中
const [loadError, setLoadError] = useState('');
// 初始化即清洗(治愈已污染的 localStorage 存量数据):
// 面板 id 统一为字符串 + 去重。此前 openPanel 被传入数字(p.id)与字符串
// (handleSelectTab 的 key.slice) 两种类型,prev.includes 严格比较漏判 →
// 同一面板以两份加入 openIds → 双 iframe 并排"分屏"、closePanel 关不掉。
const [openIds, setOpenIds] = useState(() => {
const a = read(STORE.open, []);
return Array.isArray(a) ? [...new Set(a.map(String))] : [];
});
const [activeId, setActiveId] = useState(() => {
const v = read(STORE.active, null);
return v == null ? null : String(v);
});
const [history, setHistory] = useState(() => {
const h = read(STORE.history, null);
if (h && Array.isArray(h.ids)) {
const ids = [...new Set(h.ids.map(String))];
return { ids, index: Math.min(Number(h.index) || -1, ids.length - 1) };
}
return { ids: [], index: -1 };
});
const [groups, setGroups] = useState(() => read(STORE.groups, {})); // name -> true 表示折叠
const [pinned, setPinned] = useState(() => {
const a = read(STORE.pinned, []);
return Array.isArray(a) ? [...new Set(a.map(String))] : [];
});
const [modes, setModes] = useState(() => read(STORE.modes, {}));
const [modalId, setModalId] = useState(null); // 弹窗打开的面板 id(不持久化)
const [search, setSearch] = useState('');
// LRU 引用(内存态,不需要持久化):面板 id -> 最近使用时间戳
const recency = useRef({});
// ---- 持久化 ----
useEffect(() => write(STORE.open, openIds), [openIds]);
useEffect(() => write(STORE.active, activeId), [activeId]);
useEffect(() => write(STORE.history, history), [history]);
useEffect(() => write(STORE.groups, groups), [groups]);
useEffect(() => write(STORE.pinned, pinned), [pinned]);
useEffect(() => write(STORE.modes, modes), [modes]);
// ---- 加载面板列表(reconcile 全部用函数式更新,消除陈旧闭包竞态) ----
const reload = useCallback(() => {
setLoadError('');
setLinks(null);
return listAdminLinks()
.then((ls) => {
const arr = Array.isArray(ls) ? ls : [];
setLinks(arr);
const valid = new Set(arr.map((p) => String(p.id)));
// String 归一化后再过滤,防止存量数字/字符串混杂 id 绕过校验
setOpenIds((prev) => prev.map(String).filter((id) => valid.has(id)));
setPinned((prev) => prev.map(String).filter((id) => valid.has(id)));
setModes((prev) => Object.fromEntries(Object.entries(prev).filter(([id]) => valid.has(id))));
setHistory((prev) => {
const ids = prev.ids.map(String).filter((id) => valid.has(id));
return { ids, index: Math.min(prev.index, ids.length - 1) };
});
return arr;
})
.catch((e) => { setLoadError(e.message || '加载失败'); });
}, []);
useEffect(() => { reload(); }, [reload]);
// activeId 兜底(派生逻辑):重载后当前面板已被删除时,
// 从历史栈 / 打开集合取最近一个,避免指向不存在的面板
useEffect(() => {
if (!links) return;
const valid = new Set(links.map((p) => String(p.id)));
if (activeId && valid.has(String(activeId))) return;
const fallback = (history.index >= 0 ? history.ids[history.index] : null)
?? openIds[0]
?? null;
setActiveId(fallback);
}, [links, activeId, history, openIds]);
const touch = useCallback((id) => { recency.current[id] = Date.now(); }, []);
// ---- 打开面板:按打开方式分发(tab 新标签 / modal 弹窗 / embed 内嵌) ----
// panelOverride:新建面板保存后(links 尚未包含)时直接传入对象
const openPanel = useCallback((id, panelOverride) => {
id = String(id); // 统一字符串,避免数字/字符串双份加入 openIds
const panel = panelOverride || (links && links.find((p) => String(p.id) === id));
if (!panel) return false;
touch(id);
const mode = modes[id] || OPEN_MODE_EMBED;
if (mode === OPEN_MODE_TAB) {
window.open(panel.embed_url || panel.url, '_blank', 'noopener');
return false;
}
if (mode === OPEN_MODE_MODAL) { setModalId(id); return false; }
if (activeId === id) return false;
setOpenIds((prev) => (prev.includes(id) ? prev : [...prev, id]));
setHistory((prev) => {
const ids = prev.ids.slice(0, prev.index + 1);
if (ids[ids.length - 1] === id) return prev;
ids.push(id);
return { ids, index: ids.length - 1 };
});
setActiveId(id);
return true;
}, [activeId, links, modes, touch]);
// ---- 历史栈:◀ 后退 / ▶ 前进 ----
const goBack = useCallback(() => {
if (history.index <= 0) return;
const index = history.index - 1;
const id = history.ids[index];
if (id == null) return;
setHistory({ ...history, index });
setActiveId(id);
touch(id);
}, [history, touch]);
const goForward = useCallback(() => {
if (history.index >= history.ids.length - 1) return;
const index = history.index + 1;
const id = history.ids[index];
if (id == null) return;
setHistory({ ...history, index });
setActiveId(id);
touch(id);
}, [history, touch]);
// ---- 关闭面板(当前面板被关时自动切到最近历史/其他打开面板) ----
const closePanel = useCallback((id) => {
id = String(id); // 统一字符串:此前数字/字符串混杂导致 filter 漏删、标签关不掉
const nextOpen = openIds.filter((x) => x !== id);
setOpenIds(nextOpen);
delete recency.current[id];
const histIds = history.ids.filter((x) => x !== id);
let index = history.index;
const removedAt = history.ids.indexOf(id);
if (removedAt !== -1 && removedAt < index) index -= 1;
if (index > histIds.length - 1) index = histIds.length - 1;
setHistory({ ids: histIds, index: index < 0 ? -1 : index });
const nextActive = histIds[index] ?? nextOpen[0] ?? null;
if (nextActive) setActiveId(nextActive); else setActiveId(null);
}, [history, openIds]);
const togglePin = useCallback((id) => {
id = String(id); // 防止固定集合再次被数字污染
setPinned((prev) => (prev.includes(id) ? prev.filter((x) => x !== id) : [...prev, id]));
}, []);
const toggleGroup = useCallback((name) => {
setGroups((prev) => ({ ...prev, [name]: !prev[name] }));
}, []);
const setMode = useCallback((id, mode) => {
setModes((prev) => ({ ...prev, [id]: mode }));
}, []);
const closeModal = useCallback(() => setModalId(null), []);
// ---- LRU 渲染集:当前面板 + 最近用过的 2 个(最多 3 个活跃 iframe ----
const renderedIds = useMemo(() => {
const active = activeId ? String(activeId) : null;
if (!active) return [];
const others = openIds.filter((id) => String(id) !== active);
const sorted = others
.map((id) => ({ id, ts: recency.current[id] || 0 }))
.sort((a, b) => b.ts - a.ts)
.map((x) => x.id);
return [active, ...sorted.slice(0, 2)];
}, [activeId, openIds]);
const panelsById = useMemo(() => {
const m = {};
(links || []).forEach((p) => { m[p.id] = p; });
return m;
}, [links]);
const activePanel = activeId ? (panelsById[activeId] || null) : null;
const modalPanel = modalId ? (panelsById[modalId] || null) : null;
const openPanels = openIds.map((id) => panelsById[id]).filter(Boolean);
// ---- 搜索过滤(面板名 / URL / 分组) ----
const filteredPanels = useMemo(() => {
if (!search.trim()) return links || [];
const q = search.trim().toLowerCase();
return (links || []).filter((p) =>
String(p.title || '').toLowerCase().includes(q)
|| String(p.url || '').toLowerCase().includes(q)
|| String(p.embed_url || '').toLowerCase().includes(q)
|| String(p.category || '').toLowerCase().includes(q)
);
}, [links, search]);
// 搜索框 Enter:直达第一个匹配面板(空搜索不触发)
const openFirstMatch = useCallback(() => {
if (!search.trim()) return false;
const first = filteredPanels[0];
if (first) { openPanel(first.id); setSearch(''); return true; }
return false;
}, [filteredPanels, openPanel, search]);
return {
// 数据
links, loadError, reload, panelsById,
// 打开集合
openIds, openCount: openIds.length, openPanels, renderedIds,
activeId, activePanel, modalId, modalPanel, closeModal,
// 历史栈
history,
canBack: history.index > 0,
canForward: history.index >= 0 && history.index < history.ids.length - 1,
goBack, goForward,
// 操作
openPanel, closePanel, togglePin, toggleGroup, setMode,
// 分组 / 固定 / 打开方式
pinned, groups, modes,
// 搜索
search, setSearch, filteredPanels, openFirstMatch,
};
}
@@ -0,0 +1,104 @@
import { useCallback, useEffect, useMemo, useState } from 'react';
import * as pwApi from '../../../api/passwords.js';
/**
* 密码库抽屉的状态管理(Lane B)。
*
* 状态机 status
* loading —— 正在检查 PIN 状态(pinStatus
* error —— 检查失败(可重试)
* noPin —— 未设置 PIN(引导去密码库页)
* locked —— 已设 PIN 但未解锁(PIN 输入屏)
* unlocked —— 已解锁(搜索 + 条目列表)
*
* 约定:关闭抽屉不锁定,只有 lock() 才锁定——方便切面板取用。
* 会话在服务端内存中滑动过期(1 小时),每次打开抽屉会重新同步一次状态。
*/
export default function useVault({ open } = {}) {
const [status, setStatus] = useState('loading');
const [statusError, setStatusError] = useState('');
const [entries, setEntries] = useState(null); // null = 条目加载中
const [entriesError, setEntriesError] = useState('');
const [search, setSearch] = useState('');
const [unlocking, setUnlocking] = useState(false);
const [locking, setLocking] = useState(false);
/** 拉取条目列表(解锁后),失败进入错误态并保留重试按钮 */
const loadEntries = useCallback(async () => {
setEntries(null);
setEntriesError('');
try {
const list = await pwApi.listEntries();
setEntries(list || []);
} catch (e) {
setEntriesError(e.message || '加载失败');
setEntries([]);
}
}, []);
/** 同步服务端 PIN / 会话状态 */
const checkStatus = useCallback(async () => {
setStatus('loading');
setStatusError('');
try {
const s = await pwApi.pinStatus();
if (!s.hasPin) setStatus('noPin');
else if (s.unlocked) { setStatus('unlocked'); loadEntries(); }
else setStatus('locked');
} catch (e) {
setStatusError(e.message || '检查密码库状态失败');
setStatus('error');
}
}, [loadEntries]);
// 每次抽屉打开(含重新打开)都同步一次状态;
// 若父组件保持挂载仅切换 open,也在这里触发。
useEffect(() => {
if (open) checkStatus();
}, [open, checkStatus]);
/** 解锁:成功则进入条目列表;失败抛出后端错误(401 PIN 错误 / 429 次数过多) */
const unlock = useCallback(async (pin) => {
setUnlocking(true);
try {
await pwApi.unlock(pin);
setStatus('unlocked');
setSearch('');
await loadEntries();
} finally {
setUnlocking(false);
}
}, [loadEntries]);
/** 锁定:清空本地条目与搜索,回到 PIN 输入屏 */
const lock = useCallback(async () => {
setLocking(true);
try {
await pwApi.lock();
setStatus('locked');
setEntries(null);
setEntriesError('');
setSearch('');
} finally {
setLocking(false);
}
}, []);
/** 按标题 / 用户名过滤(不区分大小写) */
const filteredEntries = useMemo(() => {
const q = search.trim().toLowerCase();
const base = entries || [];
if (!q) return base;
return base.filter((e) =>
(e.title || '').toLowerCase().includes(q) ||
(e.username || '').toLowerCase().includes(q));
}, [entries, search]);
return {
status, statusError,
entries, entriesError,
search, setSearch, filteredEntries,
unlocking, locking,
checkStatus, loadEntries, unlock, lock,
};
}
@@ -0,0 +1,187 @@
import { useCallback, useEffect, useMemo, useState } from 'react';
import WidgetsIcon from '@mui/icons-material/Widgets';
import NoteAltIcon from '@mui/icons-material/NoteAlt';
import KeyIcon from '@mui/icons-material/Key';
/* ============================================================
* useWorkbenchLayoutVSCode 风格工作台布局状态(Lane A 新增)
*
* - 视图注册表 VIEWS:左侧主控(面板)+ 右侧功能区(记事本/密码箱)
* - order{ left: [viewId], right: [viewId] } —— 视图在左右活动栏的归属
* (dnd-kit 拖拽换边后持久化,key: workbench.viewOrder
* - active{ left: viewId, right: viewId } —— 每侧当前显示的视图
* - mode{ [viewId]: 'sidebar' | 'tab' | 'float' } —— 展示模式
* sidebar 默认;tab 进主区标签页;float 为 P2 占位,本期不实现)
* - terminalOpen:底部终端面板是否展开
* ============================================================ */
/** 视图注册表:id → 元信息(新增视图只需在此登记 + Workbench 提供渲染) */
export const VIEWS = {
panels: { id: 'panels', label: '面板', Icon: WidgetsIcon, hint: '面板工作台' },
notes: { id: 'notes', label: '记事本', Icon: NoteAltIcon, hint: '笔记与文件' },
vault: { id: 'vault', label: '密码箱', Icon: KeyIcon, hint: '密码管理' },
};
export const VIEW_IDS = Object.keys(VIEWS);
export const VIEW_MODE_SIDEBAR = 'sidebar';
export const VIEW_MODE_TAB = 'tab';
export const VIEW_MODE_FLOAT = 'float'; // P2:本期仅占位
const STORE = {
order: 'workbench.viewOrder', // { left: [], right: [] }
active: 'workbench.viewActive', // { left: id, right: id }
mode: 'workbench.viewMode', // { id: 'sidebar'|'tab' }
terminal: 'workbench.terminalOpen',
};
const DEFAULT_ORDER = { left: ['panels'], right: ['notes', 'vault'] };
const DEFAULT_ACTIVE = { left: 'panels', right: 'notes' };
const DEFAULT_MODE = { panels: VIEW_MODE_SIDEBAR, notes: VIEW_MODE_SIDEBAR, vault: VIEW_MODE_SIDEBAR };
function read(key, fallback) {
try {
const raw = localStorage.getItem(key);
return raw === null ? fallback : JSON.parse(raw);
} catch { return fallback; }
}
function write(key, value) {
try { localStorage.setItem(key, JSON.stringify(value)); } catch { /* 隐私模式忽略 */ }
}
/** 校验 order 合法性:过滤未知/重复视图,遗漏的补到右侧,且保证每侧至少一个视图 */
function sanitizeOrder(saved) {
if (!saved || !Array.isArray(saved.left) || !Array.isArray(saved.right)) return DEFAULT_ORDER;
const seen = new Set();
const clean = (arr) => {
const out = [];
arr.forEach((id) => {
if (!VIEW_IDS.includes(id) || seen.has(id)) return; // 先查重,后登记
seen.add(id);
out.push(id);
});
return out;
};
const left = clean(saved.left);
const right = clean(saved.right);
VIEW_IDS.forEach((id) => { if (!seen.has(id)) right.push(id); });
// 兜底:持久化可能把视图全挪到一侧(或空数组),刷新后另一侧空白打不开。
// 保证每侧至少一个视图(panels 优先左侧,notes 次之)。
if (left.length === 0 && right.length > 0) {
const preferred = ['panels', 'notes'].find((id) => right.includes(id));
const move = preferred || right[0];
left.push(move);
right.splice(right.indexOf(move), 1);
}
if (right.length === 0 && left.length > 0) {
const preferred = ['notes', 'vault'].find((id) => left.includes(id));
const move = preferred || left[0];
right.push(move);
left.splice(left.indexOf(move), 1);
}
return { left, right };
}
/** 校验 active:指向的视图必须仍在本侧,否则回退到该侧第一个 */
function sanitizeActive(saved, order) {
if (!saved || typeof saved !== 'object') return { ...DEFAULT_ACTIVE };
const pick = (side, fallback) => (
order[side].includes(saved[side]) ? saved[side] : (order[side][0] || fallback)
);
return { left: pick('left', 'panels'), right: pick('right', 'notes') };
}
/** 校验 mode:只接受 sidebar/tabfloat 为保留值,不持久化激活) */
function sanitizeMode(saved) {
const out = { ...DEFAULT_MODE };
if (saved && typeof saved === 'object') {
VIEW_IDS.forEach((id) => {
if (saved[id] === VIEW_MODE_SIDEBAR || saved[id] === VIEW_MODE_TAB) out[id] = saved[id];
});
}
return out;
}
export default function useWorkbenchLayout() {
const [order, setOrder] = useState(() => sanitizeOrder(read(STORE.order, null)));
const [active, setActive] = useState(() => sanitizeActive(read(STORE.active, null), order));
const [mode, setMode] = useState(() => sanitizeMode(read(STORE.mode, null)));
const [terminalOpen, setTerminalOpen] = useState(() => read(STORE.terminal, false));
useEffect(() => write(STORE.order, order), [order]);
useEffect(() => write(STORE.active, active), [active]);
useEffect(() => write(STORE.mode, mode), [mode]);
useEffect(() => write(STORE.terminal, terminalOpen), [terminalOpen]);
/** 视图 id → 所在侧 */
const sideOf = useMemo(() => {
const m = {};
order.left.forEach((id) => { m[id] = 'left'; });
order.right.forEach((id) => { m[id] = 'right'; });
return m;
}, [order]);
const viewsOf = useCallback((side) => [...order[side]], [order]);
/** 每侧有效激活视图(active 指向已移走的视图时回退到第一个) */
const activeViewOf = useCallback(
(side) => (order[side].includes(active[side]) ? active[side] : order[side][0] || null),
[order, active]
);
/** 激活某视图(无论在哪侧) */
const activateView = useCallback((id) => {
const side = sideOf[id];
if (!side) return;
setActive((prev) => ({ ...prev, [side]: id }));
}, [sideOf]);
const setViewMode = useCallback((id, m) => {
if (!VIEW_IDS.includes(id)) return;
setMode((prev) => ({ ...prev, [id]: m }));
}, []);
/** 拖拽换边:视图从一侧移到另一侧,并激活目标侧 */
const moveView = useCallback((id, toSide) => {
if (toSide !== 'left' && toSide !== 'right') return;
setOrder((prev) => {
const fromSide = (['left', 'right']).find((s) => prev[s].includes(id));
if (!fromSide || fromSide === toSide) return prev;
const next = {
left: [...prev.left.filter((x) => x !== id)],
right: [...prev.right.filter((x) => x !== id)],
};
next[toSide].push(id);
return next;
});
setActive((prev) => ({ ...prev, [toSide]: id }));
}, []);
/** 同侧排序(dnd-kit arrayMove 语义) */
const reorderView = useCallback((id, overId) => {
setOrder((prev) => {
const side = (['left', 'right']).find((s) => prev[s].includes(id));
const overSide = (['left', 'right']).find((s) => prev[s].includes(overId));
if (!side || side !== overSide) return prev;
const list = prev[side];
const from = list.indexOf(id);
const to = list.indexOf(overId);
if (from < 0 || to < 0 || from === to) return prev;
const next = [...list];
next.splice(from, 1);
next.splice(to, 0, id);
return { ...prev, [side]: next };
});
}, []);
const toggleTerminal = useCallback(() => setTerminalOpen((v) => !v), []);
const openTerminal = useCallback(() => setTerminalOpen(true), []);
return {
order, sideOf, viewsOf,
active, activeViewOf, activateView,
mode, setViewMode,
moveView, reorderView,
terminalOpen, toggleTerminal, openTerminal,
};
}
+36
View File
@@ -0,0 +1,36 @@
/* ============================================================
* 工作台模块导出(frontend/src/tools/workbench
* 便于未来升级 / 替换 / 独立打包
*
* 组件命名与文件名的兼容说明:
* - Sidebar.jsx 导出 PanelsView(面板列表视图,VSCode 侧栏内容)
* - NoteEditor.jsx 导出 NotesView(记事本视图)
* - VaultDrawer.jsx 导出 VaultView(密码箱视图)
* ============================================================ */
export { default as Workbench } from './Workbench.jsx';
export { default as Toolbar } from './components/Toolbar.jsx';
export { default as PanelFrame } from './components/PanelFrame.jsx';
export { default as AddPanelDialog } from './components/AddPanelDialog.jsx';
export { default as PanelIcon } from './components/PanelIcon.jsx';
export { default as PanelsView } from './components/Sidebar.jsx';
export { default as NotesView } from './components/NoteEditor.jsx';
export { default as VaultView } from './components/VaultDrawer.jsx';
export { default as ActivityBar } from './components/ActivityBar.jsx';
export { default as SidebarPane } from './components/SidebarPane.jsx';
export { default as ToolWindow } from './components/ToolWindow.jsx';
export { default as TabStrip } from './components/TabStrip.jsx';
export { default as ContentView } from './components/ContentView.jsx';
// 终端面板临时下线:组件归档到 archive/(前端入口已移除,恢复时改回 components/ 路径)
export { default as TerminalPanel } from './archive/TerminalPanel.jsx';
export { default as StatusBar } from './components/StatusBar.jsx';
export { default as MenuBar } from './components/MenuBar.jsx';
export { default as useNotes } from './hooks/useNotes.js';
export { default as useWorkbenchLayout } from './hooks/useWorkbenchLayout.js';
export { VIEWS, VIEW_IDS, VIEW_MODE_SIDEBAR, VIEW_MODE_TAB, VIEW_MODE_FLOAT } from './hooks/useWorkbenchLayout.js';
export {
default as usePanels,
OPEN_MODE_EMBED,
OPEN_MODE_TAB,
OPEN_MODE_MODAL,
} from './hooks/usePanels.js';
+171
View File
@@ -0,0 +1,171 @@
// RainID OIDC 接入共享逻辑(routes/auth.js ROPC 密码登录 / routes/oidc.js 授权码流共用)
// 安全要点:
// - client_secret 双通道:优先 .env.jsongitignored),回退后台站点设置
// site_settings.rainid_client_secretroutes/settings.js ALLOWED_SET 可写、GET 不返回,不泄露)
// - rainid_enabled='1' 但 client_id/secret 任一通道均缺失 → enabled=falsefail-closed,本地登录不受影响)
// - 影子账号按 sub 绑定(唯一索引兜底);email_verified 是自动绑定闸门(防撞绑)
// - 影子账号随机不可登录密码,禁止本地密码登入
const crypto = require('crypto');
const fs = require('fs');
const path = require('path');
const bcrypt = require('bcryptjs');
const openidClient = require('openid-client'); // v6 函数式 APINode >=23 支持 require(esm)
const db = require('../db');
const DISCOVERY_DEFAULT = 'https://rainid.rainnya.asia/oauth';
// 机密 client_secret 双通道读取(优先级从高到低):
// ① 环境变量 RAINID_CLIENT_SECRETserver.js 启动时从 .env.json 的 cfg.rainid_client_secret 读入)
// ② .env.json 直接读取
// ③ 后台站点设置 site_settings.rainid_client_secret(可写不可读,GET /api/settings 不返回)
function getClientSecret() {
if (process.env.RAINID_CLIENT_SECRET) return process.env.RAINID_CLIENT_SECRET;
try {
const cfg = JSON.parse(fs.readFileSync(path.join(__dirname, '..', '.env.json'), 'utf8'));
if (cfg.rainid_client_secret) return cfg.rainid_client_secret;
} catch { /* .env.json 缺失/损坏 → 走 settings 回退 */ }
return db.getSetting('rainid_client_secret') || '';
}
function getOidcSettings() {
const clientId = db.getSetting('rainid_client_id');
const clientSecret = getClientSecret();
return {
// fail-closedenabled 声明为 true 仅当三项齐全(rainid_enabled + client_id + secret
enabled: db.getSetting('rainid_enabled') === '1' && !!clientId && !!clientSecret,
clientId,
clientSecret,
discoveryUrl: db.getSetting('rainid_discovery_url') || DISCOVERY_DEFAULT,
registerRedirect: db.getSetting('rainid_register_redirect') === '1',
};
}
// discovery 结果缓存(RainID JWKS 多 key 轮换由 SDK 自动处理;设置变更需重启进程生效)
let configCache = null;
async function getOidcConfig() {
if (configCache) return configCache;
const s = getOidcSettings();
if (!s.clientId || !s.clientSecret) {
const err = new Error('RainID 客户端未配置(rainid_client_id / rainid_client_secret');
err.code = 'RAINID_NOT_CONFIGURED';
throw err;
}
configCache = await openidClient.discovery(s.discoveryUrl, s.clientId, s.clientSecret);
return configCache;
}
// 站点基址:redirect_uri / 回跳前端页面用。优先 site_url 设置,回退请求头(反代注意 X-Forwarded-Proto
function siteBase(req) {
const u = db.getSetting('site_url');
if (u) return String(u).replace(/\/+$/, '');
return (req.protocol || 'http') + '://' + (req.get('host') || 'localhost');
}
// 影子账号 查/建(sub 为 OIDC 稳定绑定键):
// 1. rainid_user_id = sub 命中 → 直接返回
// 2. email_verified=true 且本地存在同 email 且未绑定 → 自动绑定(防撞绑:仅 RainID 已验证邮箱可绑)
// 3. 否则创建影子账号(username=preferred_username 或 rainid_<sub前8>,冲突加后缀;
// password=随机不可登录;email_verified=1;全站无 admin 时首个用户为 admin
// 4. 并发兜底:唯一索引冲突 → 重查按 sub 返回
function findOrCreateRainidUser(sub, profile) {
if (!sub) {
const e = new Error('RainID userinfo 缺少 sub');
e.code = 'RAINID_NO_SUB';
throw e;
}
const email = String(profile.email || '').trim().toLowerCase();
// 1) 已绑定
let user = db.get('SELECT * FROM users WHERE rainid_user_id = ?', [sub]);
if (user) return user;
// 2) 同 email 自动绑定(条件 UPDATE:仅绑定未绑定的本地号,防并发/防覆盖其他 sub)
if (email && profile.email_verified) {
const local = db.get('SELECT * FROM users WHERE email = ?', [email]);
if (local && !local.rainid_user_id) {
db.run('UPDATE users SET rainid_user_id = ? WHERE id = ? AND rainid_user_id = ?', [sub, local.id, '']);
const updated = db.get('SELECT * FROM users WHERE id = ?', [local.id]);
if (updated && updated.rainid_user_id === sub) return updated;
}
}
// 3) 创建影子账号
let username = profile.preferred_username || ('rainid_' + String(sub).slice(0, 8));
if (db.get('SELECT id FROM users WHERE username = ?', [username])) {
username = username + '_' + String(sub).slice(0, 4);
}
const randomHash = bcrypt.hashSync(crypto.randomBytes(24).toString('hex'), 10);
const adminCount = db.get("SELECT COUNT(*) AS c FROM users WHERE role = 'admin'");
const role = adminCount && adminCount.c > 0 ? 'user' : 'admin';
try {
const id = db.run(
'INSERT INTO users (username, password, email, email_verified, role, avatar, rainid_user_id) VALUES (?, ?, ?, 1, ?, ?, ?)',
[username, randomHash, email, role, profile.picture || '', sub]
);
return db.get('SELECT * FROM users WHERE id = ?', [id]);
} catch (e) {
// 并发兜底:唯一索引冲突 → 重查按 sub 登录
const dup = db.get('SELECT * FROM users WHERE rainid_user_id = ?', [sub]);
if (dup) return dup;
throw e;
}
}
// ROPC 密码登录:RainID token 端点 grant_type=passwordopenid-client genericGrantRequest 自动带 client 认证)
// 成功 → 影子账号 → 返回 { ok:true, user };失败 → { ok:false, status, error }
async function rainidRopcLogin(username, password) {
const s = getOidcSettings();
if (!s.enabled) return { ok: false, status: 400, error: 'RainID 登录未启用' };
let config;
try { config = await getOidcConfig(); }
catch { return { ok: false, status: 500, error: 'RainID 客户端未配置' }; }
try {
const tokens = await openidClient.genericGrantRequest(config, 'password', {
username,
password,
scope: 'openid profile email',
});
// id_token 声明(签名/iss/aud 校验由 SDK 承担);拿不到 sub 则 userinfo 跳过 subject 校验
let expectedSub = openidClient.skipSubjectCheck;
try {
const claims = tokens.claims();
if (claims && claims.sub) expectedSub = claims.sub;
} catch { /* id_token 解析失败不阻断(userinfo 为准) */ }
const userinfo = await openidClient.fetchUserInfo(config, tokens.access_token, expectedSub);
const user = findOrCreateRainidUser(userinfo.sub, userinfo);
return { ok: true, user };
} catch (err) {
return mapOidcError(err);
}
}
// RainID OAuth 错误 → HTTP 状态 + 文案(RainID 对接文档 §5.3 / §12 错误码总表)
function mapOidcError(err) {
const code = err && err.error;
const desc = (err && err.error_description) || '';
switch (code) {
case 'invalid_grant':
// 2FA 用户 ROPC 被拒 → 固定文案;其余统一"用户名/邮箱或密码错误"(防枚举)
return { ok: false, status: 401, error: desc.includes('二次验证')
? '该账号已开启二次验证,请使用 RainID 登录'
: '用户名/邮箱或密码错误' };
case 'rate_limited':
return { ok: false, status: 429, error: '尝试过于频繁,请稍后再试' };
case 'invalid_client':
case 'invalid_scope':
case 'invalid_request':
return { ok: false, status: 500, error: 'RainID 配置错误,请联系管理员' };
default:
return { ok: false, status: 502, error: 'RainID 服务暂不可用,请稍后再试' };
}
}
module.exports = {
getOidcSettings,
getOidcConfig,
getClientSecret,
siteBase,
findOrCreateRainidUser,
rainidRopcLogin,
mapOidcError,
};
+177 -10
View File
@@ -1,17 +1,22 @@
{ {
"name": "rainweb-links", "name": "rainweb-links",
"version": "2.0.3", "version": "2.3.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "rainweb-links", "name": "rainweb-links",
"version": "2.0.3", "version": "2.3.0",
"dependencies": { "dependencies": {
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/sortable": "^10.0.0",
"@emotion/react": "^11.14.0", "@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.1", "@emotion/styled": "^11.14.1",
"@mui/icons-material": "^9.3.1", "@mui/icons-material": "^9.3.1",
"@mui/material": "^9.3.1", "@mui/material": "^9.3.1",
"@xterm/addon-fit": "^0.11.0",
"@xterm/addon-unicode11": "^0.9.0",
"@xterm/xterm": "^6.0.0",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"better-sqlite3": "^13.0.3", "better-sqlite3": "^13.0.3",
"cors": "^2.8.5", "cors": "^2.8.5",
@@ -22,10 +27,14 @@
"jsonwebtoken": "^9.0.2", "jsonwebtoken": "^9.0.2",
"marked": "^18.0.5", "marked": "^18.0.5",
"multer": "^2.2.0", "multer": "^2.2.0",
"node-pty": "^1.0.0",
"nodemailer": "^9.0.1", "nodemailer": "^9.0.1",
"openid-client": "^6.8.4",
"react": "^19.2.8", "react": "^19.2.8",
"react-dom": "^19.2.8", "react-dom": "^19.2.8",
"react-router-dom": "^7.18.2" "react-resizable-panels": "^4.12.2",
"react-router-dom": "^7.18.2",
"ws": "^8.18.0"
}, },
"devDependencies": { "devDependencies": {
"@vitejs/plugin-react": "^6.0.5", "@vitejs/plugin-react": "^6.0.5",
@@ -371,6 +380,59 @@
"node": ">=20.19.0" "node": ">=20.19.0"
} }
}, },
"node_modules/@dnd-kit/accessibility": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz",
"integrity": "sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==",
"license": "MIT",
"dependencies": {
"tslib": "^2.0.0"
},
"peerDependencies": {
"react": ">=16.8.0"
}
},
"node_modules/@dnd-kit/core": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz",
"integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==",
"license": "MIT",
"dependencies": {
"@dnd-kit/accessibility": "^3.1.1",
"@dnd-kit/utilities": "^3.2.2",
"tslib": "^2.0.0"
},
"peerDependencies": {
"react": ">=16.8.0",
"react-dom": ">=16.8.0"
}
},
"node_modules/@dnd-kit/sortable": {
"version": "10.0.0",
"resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-10.0.0.tgz",
"integrity": "sha512-+xqhmIIzvAYMGfBYYnbKuNicfSsk4RksY2XdmJhT+HAC01nix6fHCztU68jooFiMUB01Ky3F0FyOvhG/BZrWkg==",
"license": "MIT",
"dependencies": {
"@dnd-kit/utilities": "^3.2.2",
"tslib": "^2.0.0"
},
"peerDependencies": {
"@dnd-kit/core": "^6.3.0",
"react": ">=16.8.0"
}
},
"node_modules/@dnd-kit/utilities": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.2.tgz",
"integrity": "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==",
"license": "MIT",
"dependencies": {
"tslib": "^2.0.0"
},
"peerDependencies": {
"react": ">=16.8.0"
}
},
"node_modules/@emotion/babel-plugin": { "node_modules/@emotion/babel-plugin": {
"version": "11.13.5", "version": "11.13.5",
"resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz", "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz",
@@ -506,7 +568,7 @@
} }
}, },
"node_modules/@emotion/utils": { "node_modules/@emotion/utils": {
"version": "2.0.3", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.2.tgz", "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.2.tgz",
"integrity": "sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==", "integrity": "sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==",
"license": "MIT" "license": "MIT"
@@ -1149,6 +1211,27 @@
} }
} }
}, },
"node_modules/@xterm/addon-fit": {
"version": "0.11.0",
"resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.11.0.tgz",
"integrity": "sha512-jYcgT6xtVYhnhgxh3QgYDnnNMYTcf8ElbxxFzX0IZo+vabQqSPAjC3c1wJrKB5E19VwQei89QCiZZP86DCPF7g==",
"license": "MIT"
},
"node_modules/@xterm/addon-unicode11": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/@xterm/addon-unicode11/-/addon-unicode11-0.9.0.tgz",
"integrity": "sha512-FxDnYcyuXhNl+XSqGZL/t0U9eiNb/q3EWT5rYkQT/zuig8Gz/VagnQANKHdDWFM2lTMk9ly0EFQxxxtZUoRetw==",
"license": "MIT"
},
"node_modules/@xterm/xterm": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.0.0.tgz",
"integrity": "sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg==",
"license": "MIT",
"workspaces": [
"addons/*"
]
},
"node_modules/accepts": { "node_modules/accepts": {
"version": "1.3.8", "version": "1.3.8",
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -1320,7 +1403,7 @@
} }
}, },
"node_modules/concat-stream": { "node_modules/concat-stream": {
"version": "2.0.3", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-2.0.0.tgz",
"integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==", "integrity": "sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==",
"engines": [ "engines": [
@@ -1480,7 +1563,7 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/depd": { "node_modules/depd": {
"version": "2.0.3", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
"license": "MIT", "license": "MIT",
@@ -1557,7 +1640,7 @@
"license": "MIT" "license": "MIT"
}, },
"node_modules/encodeurl": { "node_modules/encodeurl": {
"version": "2.0.3", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
"integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
"license": "MIT", "license": "MIT",
@@ -2014,6 +2097,15 @@
"integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/jose": {
"version": "6.2.8",
"resolved": "https://registry.npmjs.org/jose/-/jose-6.2.8.tgz",
"integrity": "sha512-Bsdjwm3Qsd/P0jR+BHDe3LytDfY7WBq2HmCCLIwuVRHMuEC9ae7/R474GIUdF1NgCyZjzVo/A9DOiOBtXq8ZoQ==",
"license": "MIT",
"funding": {
"url": "https://github.com/sponsors/panva"
}
},
"node_modules/js-tokens": { "node_modules/js-tokens": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -2557,13 +2649,13 @@
} }
}, },
"node_modules/ms": { "node_modules/ms": {
"version": "2.0.3", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/multer": { "node_modules/multer": {
"version": "2.2.0", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/multer/-/multer-2.2.0.tgz", "resolved": "https://registry.npmjs.org/multer/-/multer-2.2.0.tgz",
"integrity": "sha512-6rdyFg2kLrMh9Jee7/BMPuV9lEAd7lLW2YUpF9/YxR7njyoUwwQ0ZPh3TaIY50Sw6vlyD2HW3wGOkTS4P79xrQ==", "integrity": "sha512-6rdyFg2kLrMh9Jee7/BMPuV9lEAd7lLW2YUpF9/YxR7njyoUwwQ0ZPh3TaIY50Sw6vlyD2HW3wGOkTS4P79xrQ==",
"license": "MIT", "license": "MIT",
@@ -2618,6 +2710,22 @@
"node": "^18 || ^20 || >= 21" "node": "^18 || ^20 || >= 21"
} }
}, },
"node_modules/node-pty": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.1.0.tgz",
"integrity": "sha512-20JqtutY6JPXTUnL0ij1uad7Qe1baT46lyolh2sSENDd4sTzKZ4nmAFkeAARDKwmlLjPx6XKRlwRUxwjOy+lUg==",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
"node-addon-api": "^7.1.0"
}
},
"node_modules/node-pty/node_modules/node-addon-api": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
"integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
"license": "MIT"
},
"node_modules/nodemailer": { "node_modules/nodemailer": {
"version": "9.0.1", "version": "9.0.1",
"resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-9.0.1.tgz", "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-9.0.1.tgz",
@@ -2627,6 +2735,15 @@
"node": ">=6.0.0" "node": ">=6.0.0"
} }
}, },
"node_modules/oauth4webapi": {
"version": "3.8.6",
"resolved": "https://registry.npmjs.org/oauth4webapi/-/oauth4webapi-3.8.6.tgz",
"integrity": "sha512-iwemM91xz8nryHti2yTmg5fhyEMVOkOXwHNqbvcATjyajb5oQxCQzrNOA6uElRHuMhQQTKUyFKV9y/CNyg25BQ==",
"license": "MIT",
"funding": {
"url": "https://github.com/sponsors/panva"
}
},
"node_modules/object-assign": { "node_modules/object-assign": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -2660,6 +2777,19 @@
"node": ">= 0.8" "node": ">= 0.8"
} }
}, },
"node_modules/openid-client": {
"version": "6.8.4",
"resolved": "https://registry.npmjs.org/openid-client/-/openid-client-6.8.4.tgz",
"integrity": "sha512-QSw0BA08piujetEwfZsHoTrDpMEha7GDZDicQqVwX4u0ChCjefvjDB++TZ8BTg76UpwhzIQgdvvfgfl3HpCSAw==",
"license": "MIT",
"dependencies": {
"jose": "^6.2.2",
"oauth4webapi": "^3.8.5"
},
"funding": {
"url": "https://github.com/sponsors/panva"
}
},
"node_modules/parent-module": { "node_modules/parent-module": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -2885,6 +3015,16 @@
"integrity": "sha512-s5un28nYxKJw5gvUHyW5PCC28CvBqLu9r3cWgzHT4Vo/5fqqkFcdRYsGcKf50WMPpjjFZS5d76fn3YCo2njKwQ==", "integrity": "sha512-s5un28nYxKJw5gvUHyW5PCC28CvBqLu9r3cWgzHT4Vo/5fqqkFcdRYsGcKf50WMPpjjFZS5d76fn3YCo2njKwQ==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/react-resizable-panels": {
"version": "4.12.2",
"resolved": "https://registry.npmjs.org/react-resizable-panels/-/react-resizable-panels-4.12.2.tgz",
"integrity": "sha512-NwY5LCo4WrxVvDh0xoMML6EMLPONP/8ckKcIdpnojxexoatZdjLiRqLJQjQK5CPkd4SYiB/2M5BVrjZBQtOO7Q==",
"license": "MIT",
"peerDependencies": {
"react": "^18.0.0 || ^19.0.0",
"react-dom": "^18.0.0 || ^19.0.0"
}
},
"node_modules/react-router": { "node_modules/react-router": {
"version": "7.18.2", "version": "7.18.2",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-7.18.2.tgz", "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.18.2.tgz",
@@ -3359,6 +3499,12 @@
"node": ">=20" "node": ">=20"
} }
}, },
"node_modules/tslib": {
"version": "2.8.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
"license": "0BSD"
},
"node_modules/type-is": { "node_modules/type-is": {
"version": "1.6.18", "version": "1.6.18",
"resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -3542,6 +3688,27 @@
"node": "^22.14.0 || >=24.0.0" "node": "^22.14.0 || >=24.0.0"
} }
}, },
"node_modules/ws": {
"version": "8.21.3",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.21.3.tgz",
"integrity": "sha512-201TZ/kPWxoPr/OKWjquZR1SWKXcvxdH+e1xrx89b3YbmzLMFCLfnaG1HFIgWzJOEWZ7MvpK++odZufgYR50Rw==",
"license": "MIT",
"engines": {
"node": ">=10.0.0"
},
"peerDependencies": {
"bufferutil": "^4.0.1",
"utf-8-validate": ">=5.0.2"
},
"peerDependenciesMeta": {
"bufferutil": {
"optional": true
},
"utf-8-validate": {
"optional": true
}
}
},
"node_modules/xml-name-validator": { "node_modules/xml-name-validator": {
"version": "5.0.0", "version": "5.0.0",
"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
@@ -3552,7 +3719,7 @@
} }
}, },
"node_modules/xmlchars": { "node_modules/xmlchars": {
"version": "2.2.0", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
"integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
"license": "MIT" "license": "MIT"
+11 -2
View File
@@ -1,6 +1,6 @@
{ {
"name": "rainweb-links", "name": "rainweb-links",
"version": "2.0.3", "version": "2.3.0",
"description": "链接聚合管理平台", "description": "链接聚合管理平台",
"main": "server.js", "main": "server.js",
"scripts": { "scripts": {
@@ -11,10 +11,15 @@
"cli": "node cli.js" "cli": "node cli.js"
}, },
"dependencies": { "dependencies": {
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/sortable": "^10.0.0",
"@emotion/react": "^11.14.0", "@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.1", "@emotion/styled": "^11.14.1",
"@mui/icons-material": "^9.3.1", "@mui/icons-material": "^9.3.1",
"@mui/material": "^9.3.1", "@mui/material": "^9.3.1",
"@xterm/addon-fit": "^0.11.0",
"@xterm/addon-unicode11": "^0.9.0",
"@xterm/xterm": "^6.0.0",
"bcryptjs": "^2.4.3", "bcryptjs": "^2.4.3",
"better-sqlite3": "^13.0.3", "better-sqlite3": "^13.0.3",
"cors": "^2.8.5", "cors": "^2.8.5",
@@ -25,10 +30,14 @@
"jsonwebtoken": "^9.0.2", "jsonwebtoken": "^9.0.2",
"marked": "^18.0.5", "marked": "^18.0.5",
"multer": "^2.2.0", "multer": "^2.2.0",
"node-pty": "^1.0.0",
"nodemailer": "^9.0.1", "nodemailer": "^9.0.1",
"openid-client": "^6.8.4",
"react": "^19.2.8", "react": "^19.2.8",
"react-dom": "^19.2.8", "react-dom": "^19.2.8",
"react-router-dom": "^7.18.2" "react-resizable-panels": "^4.12.2",
"react-router-dom": "^7.18.2",
"ws": "^8.18.0"
}, },
"devDependencies": { "devDependencies": {
"@vitejs/plugin-react": "^6.0.5", "@vitejs/plugin-react": "^6.0.5",
+138 -2
View File
@@ -68,8 +68,10 @@ html { scroll-behavior: smooth; }
@media (prefers-reduced-motion: reduce) { @media (prefers-reduced-motion: reduce) {
*, *::before, *::after { *, *::before, *::after {
animation-duration: 0.01ms !important; animation-duration: 0.01ms !important;
animation-iteration-count: 1 !important;
transition-duration: 0.01ms !important; transition-duration: 0.01ms !important;
} }
html { scroll-behavior: auto; }
} }
body { body {
@@ -556,14 +558,41 @@ table tr:hover td {
} }
.chip:hover { .chip:hover {
background: var(--md-ref-surface-variant);
border-color: var(--md-ref-outline); border-color: var(--md-ref-outline);
transform: translateY(-1px); transform: translateY(-1px);
} }
/* 选中态优先级:hover 不覆盖 active(保持 primary-container 底) */
.chip.active:hover {
background: var(--md-ref-primary-container);
border-color: transparent;
}
.chip:active { .chip:active {
transform: translateY(0); transform: translateY(0);
} }
/* 装饰性静态徽标替代内联样式不可点紧凑尺寸
static=描边中性tonal=次级色容器均无交互态 */
.chip.chip-static {
background: transparent;
border: 1px solid var(--md-ref-outline-variant);
color: var(--md-ref-on-surface-variant);
cursor: default;
font-size: 12px;
padding: 1px 8px;
}
.chip.chip-tonal {
background: var(--md-ref-secondary-container);
color: var(--md-ref-on-secondary-container);
border-color: transparent;
cursor: default;
font-size: 12px;
padding: 1px 8px;
}
@keyframes chipPop { @keyframes chipPop {
from { transform: scale(0.92); } from { transform: scale(0.92); }
50% { transform: scale(1.06); } 50% { transform: scale(1.06); }
@@ -1006,9 +1035,15 @@ table tr:hover td {
gap: 8px; gap: 8px;
/* div/span → button 后补偿:保持块级填充、左对齐与自然高度 */ /* div/span → button 后补偿:保持块级填充、左对齐与自然高度 */
font-family: inherit; font-family: inherit;
min-height: 40px;
height: auto; height: auto;
justify-content: flex-start; justify-content: flex-start;
text-align: left; text-align: inherit;
/* B2 divbutton 后补偿清除 UA 默认浅色按钮底/描边同时基础态保留
主题化底色surface-container而非透明否则深色模式下非选中按钮
与页面暗底融为一体点击切换分类后"背景消失"沿用 .chip 的既有模式 */
background: var(--md-ref-surface-container);
border: 1px solid transparent;
} }
.forum-cat-item:hover { background: var(--md-ref-surface-variant); } .forum-cat-item:hover { background: var(--md-ref-surface-variant); }
@@ -1495,6 +1530,7 @@ table tr:hover td {
/* ===== Markdown toggle ===== */ /* ===== Markdown toggle ===== */
.toggle-group { display: flex; gap: 8px; margin-bottom: 16px; } .toggle-group { display: flex; gap: 8px; margin-bottom: 16px; }
.toggle-btn { padding: 6px 16px; border-radius: 100px; font-size: 13px; font-weight: 500; cursor: pointer; border: 1px solid var(--md-ref-outline-variant); background: transparent; color: var(--md-ref-on-surface-variant); } .toggle-btn { padding: 6px 16px; border-radius: 100px; font-size: 13px; font-weight: 500; cursor: pointer; border: 1px solid var(--md-ref-outline-variant); background: transparent; color: var(--md-ref-on-surface-variant); }
.toggle-btn:hover { background: var(--md-ref-surface-variant); }
.toggle-btn.active { background: var(--md-ref-primary-container); color: var(--md-ref-on-primary-container); border-color: transparent; } .toggle-btn.active { background: var(--md-ref-primary-container); color: var(--md-ref-on-primary-container); border-color: transparent; }
/* ===== Captcha ===== */ /* ===== Captcha ===== */
@@ -2253,7 +2289,7 @@ body.has-wallpaper .article-toc-side {
} }
.article-tags { display: flex; gap: 6px; flex-wrap: wrap; margin-top: 10px; } .article-tags { display: flex; gap: 6px; flex-wrap: wrap; margin-top: 10px; }
.article-tag-chip { text-decoration: none; transition: all 0.2s; } .article-tag-chip { text-decoration: none; transition: all 0.2s; }
.article-tag-chip:hover { border-color: var(--md-ref-primary); background: var(--md-ref-primary-container); } .article-tag-chip:hover { border-color: var(--md-ref-primary); background: var(--md-ref-surface-variant); }
.article-actions { display: flex; align-items: center; gap: 8px; margin-top: 12px; } .article-actions { display: flex; align-items: center; gap: 8px; margin-top: 12px; }
.like-btn { .like-btn {
height: 34px; height: 34px;
@@ -2678,3 +2714,103 @@ body.has-wallpaper .article-toc-side {
align-items: center; align-items: center;
gap: 4px; gap: 4px;
} }
/* ============================================================
Markdown Indigo 定制.md-body
只做文本级渲染除代码块okaidia 暗底外全部背景透明
由卡片磨砂玻璃接管颜色全部走主题 CSS 变量
/深色随 data-theme 自动切换
============================================================ */
/* 正文基调:透明背景,文字色走主题变量 */
.md-body {
color: var(--md-ref-on-surface);
line-height: 1.75;
}
/* 标题:Indigo 排版(字重 500 / 行高 1.3),h1/h2 带左侧竖线 + 下边框 */
.md-body h1, .md-body h2, .md-body h3, .md-body h4, .md-body h5, .md-body h6 {
color: var(--md-ref-on-surface);
font-weight: 500;
line-height: 1.3;
margin: 1.5em 0 .6em;
}
.md-body h1, .md-body h2 {
padding: .25em 0 .25em .75em;
border-left: 6px solid var(--md-ref-primary);
border-bottom: 1px solid var(--md-ref-outline-variant);
}
/* 加粗 / 删除线:不加 Indigo 的「」引号,仅保留字重;删除线走主题灰 */
.md-body strong { font-weight: 700; }
.md-body del, .md-body s { color: var(--md-ref-outline); }
/* 链接:主题主色 + Indigo 下边框式下划线 */
.md-body a {
color: var(--md-ref-primary);
text-decoration: none;
border-bottom: 1px solid color-mix(in srgb, var(--md-ref-primary) 40%, transparent);
}
.md-body a:hover { border-bottom-color: var(--md-ref-primary); }
/* 行内代码:主题容器色背景(可换肤),透明背景不出现 */
.md-body code {
background: var(--md-ref-surface-container);
color: var(--md-ref-on-surface);
padding: 2px 6px;
border-radius: 4px;
font-size: .9em;
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, 'Courier New', monospace;
}
/* 引用块:Indigo 左粗线(主题主色)+ 主题浅底 */
.md-body blockquote {
margin: 1em 0;
padding: .5em 1em;
border-left: 4px solid var(--md-ref-primary);
background: var(--md-ref-surface-container-low);
border-radius: 0 8px 8px 0;
color: color-mix(in srgb, var(--md-ref-primary) 70%, var(--md-ref-on-surface));
}
.md-body blockquote > :last-child { margin-bottom: 0; }
.md-body blockquote > :first-child { margin-top: 0; }
/* 代码块:唯一保留背景的元素 —— okaidia 暗色主题 */
.md-body pre {
background: #272822;
color: #f8f8f2;
padding: 16px;
border-radius: 12px;
overflow-x: auto;
margin: 1em 0;
font-size: 13px;
line-height: 1.6;
text-shadow: 0 1px rgba(0, 0, 0, .3);
tab-size: 4;
}
.md-body pre code {
background: none;
color: #f8f8f2;
padding: 0;
font-size: inherit;
text-shadow: 0 1px rgba(0, 0, 0, .3);
}
.md-body pre::-webkit-scrollbar-thumb { background: rgba(255, 255, 255, .18); border-radius: 2px; }
/* okaidia 语法高亮(token 出现时生效,如后续接入 highlight.js/prism */
.md-body .token.cdata, .md-body .token.comment, .md-body .token.doctype, .md-body .token.prolog { color: #8292a2; }
.md-body .token.punctuation { color: #f8f8f2; }
.md-body .token.namespace { opacity: .7; }
.md-body .token.constant, .md-body .token.deleted, .md-body .token.property, .md-body .token.symbol, .md-body .token.tag { color: #f92672; }
.md-body .token.boolean, .md-body .token.number { color: #ae81ff; }
.md-body .token.attr-name, .md-body .token.builtin, .md-body .token.char, .md-body .token.inserted, .md-body .token.selector, .md-body .token.string { color: #a6e22e; }
.md-body .token.entity, .md-body .token.operator, .md-body .token.url, .md-body .token.variable { color: #f8f8f2; }
.md-body .token.atrule, .md-body .token.attr-value, .md-body .token.class-name, .md-body .token.function { color: #e6db74; }
.md-body .token.keyword { color: #66d9ef; }
.md-body .token.important, .md-body .token.regex { color: #fd971f; }
.md-body .token.bold, .md-body .token.important { font-weight: 700; }
.md-body .token.italic { font-style: italic; }
/* 深色模式:文本色跟随 on-surface 浅色变体;代码块保持 okaidia 暗底不变 */
[data-theme="dark"] .md-body { color: var(--md-ref-on-surface); }
[data-theme="dark"] .md-body blockquote { background: var(--md-ref-surface-container); }
+17 -1
View File
@@ -6,6 +6,7 @@ const rateLimit = require('express-rate-limit');
const db = require('../db'); const db = require('../db');
const { SECRET, authMiddleware, adminOnly } = require('../middleware/auth'); const { SECRET, authMiddleware, adminOnly } = require('../middleware/auth');
const { consumeProof } = require('./captcha'); const { consumeProof } = require('./captcha');
const { rainidRopcLogin } = require('../lib/rainid');
const router = express.Router(); const router = express.Router();
@@ -82,8 +83,19 @@ router.post('/login', loginLimiter, async (req, res) => {
return res.status(400).json({ error: '请先完成验证码验证' }); return res.status(400).json({ error: '请先完成验证码验证' });
} }
// RainID 启用时:用户名/密码转发 RainID(ROPC),按 sub 登录/绑定影子账号
if (db.getSetting('rainid_enabled') === '1') {
const r = await rainidRopcLogin(username, password);
if (!r.ok) return res.status(r.status).json({ error: r.error });
const user = r.user;
const token = jwt.sign({ id: user.id, username: user.username, role: user.role }, SECRET, { expiresIn: '7d' });
return res.json({ token, username: user.username, role: user.role, email: user.email, email_verified: user.email_verified });
}
// 本地 bcrypt 登录(RainID 未启用 / 未配置时回退,本地功能不受 RainID 影响)
const user = db.get('SELECT * FROM users WHERE username = ?', [username]); const user = db.get('SELECT * FROM users WHERE username = ?', [username]);
if (!user || !bcrypt.compareSync(password, user.password)) { // 影子账号(rainid_user_id 非空)无本地密码 → 禁止本地密码登入
if (!user || (user.rainid_user_id && !user.password) || !bcrypt.compareSync(password, user.password)) {
return res.status(401).json({ error: '用户名或密码错误' }); return res.status(401).json({ error: '用户名或密码错误' });
} }
@@ -92,6 +104,10 @@ router.post('/login', loginLimiter, async (req, res) => {
}); });
router.post('/register', async (req, res) => { router.post('/register', async (req, res) => {
// 注册跳转 RainID 开启:前端直接跳 RainID 注册页,本地注册接口拒绝
if (db.getSetting('rainid_register_redirect') === '1') {
return res.status(400).json({ error: '注册已跳转 RainID' });
}
const { username, password, email } = req.body; const { username, password, email } = req.body;
if (!username || !password || !email) if (!username || !password || !email)
return res.status(400).json({ error: '请填写所有必填项' }); return res.status(400).json({ error: '请填写所有必填项' });
+130
View File
@@ -0,0 +1,130 @@
const express = require('express');
const fs = require('fs');
const path = require('path');
const { authMiddleware, adminOnly } = require('../middleware/auth');
/* ============================================================
* 工作台记事本API仅管理员
*
* 存储实体 .txt 文件目录 frontend/src/tools/workbench/workspace/
* .gitignore 已排除不入库
*
* GET /api/notes 文件列表按修改时间倒序
* GET /api/notes/:filename 读取文件内容 { name, content, size, mtime }
* POST /api/notes 创建 { filename, content }同名 409
* PUT /api/notes/:filename 更新 { content }不存在 404
* DELETE /api/notes/:filename 删除
*
* 安全文件名只允许 .txt拒绝路径穿越/\..隐藏文件
* ============================================================ */
const WORKSPACE_DIR = path.join(__dirname, '..', 'frontend', 'src', 'tools', 'workbench', 'workspace');
const router = express.Router();
function ensureDir() {
fs.mkdirSync(WORKSPACE_DIR, { recursive: true });
}
/** 文件名安全校验:返回规范化文件名(自动补 .txt),非法返回 null */
function sanitizeFilename(raw) {
if (typeof raw !== 'string') return null;
let name = raw.trim();
if (!name || name.length > 120) return null;
if (name.includes('/') || name.includes('\\') || name.includes('\0')) return null;
if (name === '.' || name === '..' || name.startsWith('.')) return null;
if (!name.toLowerCase().endsWith('.txt')) name += '.txt';
// 兜底:解析后必须仍位于 workspace 目录内,杜绝路径穿越
const full = path.join(WORKSPACE_DIR, name);
if (!full.startsWith(WORKSPACE_DIR + path.sep)) return null;
return name;
}
/** 列出所有 .txt 笔记,按修改时间倒序 */
function listNotes() {
ensureDir();
return fs.readdirSync(WORKSPACE_DIR, { withFileTypes: true })
.filter((d) => d.isFile() && d.name.toLowerCase().endsWith('.txt'))
.map((d) => {
const st = fs.statSync(path.join(WORKSPACE_DIR, d.name));
return { name: d.name, size: st.size, mtime: st.mtimeMs };
})
.sort((a, b) => b.mtime - a.mtime);
}
// 列表
router.get('/', authMiddleware, adminOnly, (req, res) => {
try {
res.json(listNotes());
} catch (e) {
console.error('Notes list error:', e.message);
res.status(500).json({ error: '读取笔记列表失败' });
}
});
// 读取内容
router.get('/:filename', authMiddleware, adminOnly, (req, res) => {
const name = sanitizeFilename(req.params.filename);
if (!name) return res.status(400).json({ error: '文件名不合法' });
try {
const full = path.join(WORKSPACE_DIR, name);
if (!fs.existsSync(full)) return res.status(404).json({ error: '笔记不存在' });
const content = fs.readFileSync(full, 'utf8');
const st = fs.statSync(full);
res.json({ name, content, size: st.size, mtime: st.mtimeMs });
} catch (e) {
console.error('Note read error:', e.message);
res.status(500).json({ error: '读取笔记失败' });
}
});
// 创建
router.post('/', authMiddleware, adminOnly, (req, res) => {
const name = sanitizeFilename(req.body && req.body.filename);
if (!name) return res.status(400).json({ error: '文件名不合法' });
const content = typeof req.body.content === 'string' ? req.body.content : '';
try {
ensureDir();
const full = path.join(WORKSPACE_DIR, name);
if (fs.existsSync(full)) return res.status(409).json({ error: '同名笔记已存在' });
fs.writeFileSync(full, content, 'utf8');
const st = fs.statSync(full);
res.json({ name, size: st.size, mtime: st.mtimeMs });
} catch (e) {
console.error('Note create error:', e.message);
res.status(500).json({ error: '创建笔记失败' });
}
});
// 更新内容
router.put('/:filename', authMiddleware, adminOnly, (req, res) => {
const name = sanitizeFilename(req.params.filename);
if (!name) return res.status(400).json({ error: '文件名不合法' });
const content = typeof req.body.content === 'string' ? req.body.content : '';
try {
const full = path.join(WORKSPACE_DIR, name);
if (!fs.existsSync(full)) return res.status(404).json({ error: '笔记不存在' });
fs.writeFileSync(full, content, 'utf8');
const st = fs.statSync(full);
res.json({ name, size: st.size, mtime: st.mtimeMs });
} catch (e) {
console.error('Note update error:', e.message);
res.status(500).json({ error: '保存笔记失败' });
}
});
// 删除
router.delete('/:filename', authMiddleware, adminOnly, (req, res) => {
const name = sanitizeFilename(req.params.filename);
if (!name) return res.status(400).json({ error: '文件名不合法' });
try {
const full = path.join(WORKSPACE_DIR, name);
if (!fs.existsSync(full)) return res.status(404).json({ error: '笔记不存在' });
fs.unlinkSync(full);
res.json({ message: '删除成功' });
} catch (e) {
console.error('Note delete error:', e.message);
res.status(500).json({ error: '删除笔记失败' });
}
});
module.exports = router;
+140
View File
@@ -0,0 +1,140 @@
// RainID OIDC 授权码 + PKCE 接入(挂 /api/auth/oidc
// 流程:GET /login 发起 → RainID 登录/同意 → GET /callback 换 token 建影子账号
// → 一次性 ticket → 前端 POST /exchange 换本地 JWT(避免长 token 进 URL
// → GET /logout 登出联动(end_session
// 安全:state 一次性 + PKCE S256SDK 自动验 id_token iss/aud/exp/签名);ticket 30s 一次性。
const express = require('express');
const crypto = require('crypto');
const jwt = require('jsonwebtoken');
const openidClient = require('openid-client'); // v6 函数式 API
const { SECRET } = require('../middleware/auth');
const {
getOidcSettings,
getOidcConfig,
siteBase,
findOrCreateRainidUser,
} = require('../lib/rainid');
const router = express.Router();
// ---- OIDC 流程状态:内存 Map + 短 TTL(模式同 routes/captcha.js 的 captchaStore----
const OIDC_STATE_TTL = 10 * 60 * 1000; // state:发起登录 → 回调,10 分钟
const OIDC_TICKET_TTL = 30 * 1000; // ticket:回调 → 前端换 JWT30 秒
const oidcStates = new Map(); // state -> { verifier, createdAt }
const oidcTickets = new Map(); // ticket -> { jwt, username, role, email, email_verified, createdAt }
setInterval(() => {
const now = Date.now();
for (const [k, v] of oidcStates) if (now - v.createdAt > OIDC_STATE_TTL) oidcStates.delete(k);
for (const [k, v] of oidcTickets) if (now - v.createdAt > OIDC_TICKET_TTL) oidcTickets.delete(k);
}, 60000);
const REDIRECT_PATH = '/api/auth/oidc/callback';
const LOGOUT_REDIRECT_PATH = '/login.html'; // RainID 登出回跳白名单需登记该地址
function frontLoginUrl(req, qs) {
return siteBase(req) + '/login.html' + (qs || '');
}
// ① 发起登录:PKCE + state → 302 RainID authorize
router.get('/login', async (req, res) => {
const s = getOidcSettings();
if (!s.enabled) return res.status(400).json({ error: '未启用 RainID 登录' });
try {
const config = await getOidcConfig();
const codeVerifier = openidClient.randomPKCECodeVerifier();
const codeChallenge = await openidClient.calculatePKCECodeChallenge(codeVerifier);
const state = openidClient.randomState();
oidcStates.set(state, { verifier: codeVerifier, createdAt: Date.now() });
const url = openidClient.buildAuthorizationUrl(config, {
redirect_uri: siteBase(req) + REDIRECT_PATH,
scope: 'openid profile email',
code_challenge: codeChallenge,
code_challenge_method: 'S256',
state,
});
res.redirect(url.href);
} catch (err) {
console.error('[RainID] login redirect error:', err.message);
res.status(502).json({ error: 'RainID 服务暂不可用' });
}
});
// ② 回调:state 校验 → 换 token → userinfo → 影子账号 → 发 JWT → 一次性 ticket → 302 前端
router.get('/callback', async (req, res) => {
const state = req.query.state;
const stored = state && oidcStates.get(state);
if (!stored) {
return res.status(400).send('登录状态已失效,请重新使用 RainID 登录');
}
oidcStates.delete(state); // state 一次性
let config;
try { config = await getOidcConfig(); }
catch { return res.status(500).send('RainID 客户端未配置'); }
const base = siteBase(req);
const currentUrl = new URL(req.originalUrl, base);
try {
// openid-client 自动验 id_token:签名(RS256/JWKS) + iss(discovery issuer) + aud(client_id) + exp
const tokens = await openidClient.authorizationCodeGrant(config, currentUrl, {
pkceCodeVerifier: stored.verifier,
expectedState: state,
idTokenExpected: true,
});
const claims = tokens.claims();
const sub = claims && claims.sub;
if (!sub) throw new Error('id_token 缺少 sub');
const userinfo = await openidClient.fetchUserInfo(config, tokens.access_token, sub);
const user = findOrCreateRainidUser(sub, userinfo);
const token = jwt.sign({ id: user.id, username: user.username, role: user.role }, SECRET, { expiresIn: '7d' });
const ticket = crypto.randomBytes(16).toString('hex');
oidcTickets.set(ticket, {
jwt: token,
username: user.username,
role: user.role,
email: user.email,
email_verified: user.email_verified,
createdAt: Date.now(),
});
res.redirect(frontLoginUrl(req, '?oidc_ticket=' + encodeURIComponent(ticket)));
} catch (err) {
// error 参数(access_denied / consent_required 等)或换 token 失败 → 回前端登录页带错误码
const code = err && err.error;
console.error('[RainID] callback error:', code || err.message);
res.redirect(frontLoginUrl(req, '?oidc_error=' + encodeURIComponent(code || 'server_error')));
}
});
// ③ 一次性 ticket 换本地 JWT(响应结构同 /api/auth/loginauth.js:91
router.post('/exchange', (req, res) => {
const ticket = req.body && req.body.ticket;
if (!ticket) return res.status(400).json({ error: '缺少 ticket' });
const rec = oidcTickets.get(ticket);
if (!rec) return res.status(401).json({ error: '登录已过期,请重新使用 RainID 登录' });
oidcTickets.delete(ticket); // 一次性
res.json({
token: rec.jwt,
username: rec.username,
role: rec.role,
email: rec.email,
email_verified: rec.email_verified,
});
});
// ④ 登出联动:302 RainID end_sessionpost_logout_redirect_uri 需先在 RainID Admin 登记)
router.get('/logout', async (req, res) => {
const s = getOidcSettings();
if (!s.enabled) return res.redirect('/');
try {
const config = await getOidcConfig();
const url = openidClient.buildEndSessionUrl(config, {
post_logout_redirect_uri: siteBase(req) + LOGOUT_REDIRECT_PATH,
});
res.redirect(url.href);
} catch (err) {
console.error('[RainID] logout error:', err.message);
res.redirect('/');
}
});
module.exports = router;
+72 -3
View File
@@ -1,7 +1,9 @@
const express = require('express'); const express = require('express');
const http = require('http'); const http = require('http');
const https = require('https'); const https = require('https');
const { authMiddleware, adminOnly } = require('../middleware/auth'); const jwt = require('jsonwebtoken');
const db = require('../db');
const { authMiddleware, adminOnly, SECRET } = require('../middleware/auth');
const router = express.Router(); const router = express.Router();
// SSRF 防护:拒绝内网/回环/链路本地地址 // SSRF 防护:拒绝内网/回环/链路本地地址
@@ -23,12 +25,65 @@ function isBlockedHost(hostname) {
return false; return false;
} }
// ---- 内网代理白名单(settings: proxy_allowed_hosts,逗号/空格/换行分隔)----
// 用途:https 页面无法嵌入 http 内网面板,管理员可在后台把可信内网地址/网段加入白名单放行。
// 仅放行被 isBlockedHost 拦截的地址;公网地址不受影响。SSRF 信任模型不变(仍 adminOnly)。
// IPv4 字符串 → 32 位整数(解析失败返回 null)
function ipv4ToInt(ip) {
const parts = String(ip).split('.');
if (parts.length !== 4) return null;
let n = 0;
for (const p of parts) {
if (!/^\d{1,3}$/.test(p)) return null;
const v = parseInt(p, 10);
if (v > 255) return null;
n = (n << 8) + v;
}
return n >>> 0;
}
// IPv4 CIDR 匹配(手写实现,项目无 ipaddr 依赖)。
// 返回 true/false 表示确定命中/不命中;返回 null 表示条目无法解析(调用方跳过该行)。
function ipv4CidrContains(cidr, host) {
const m = String(cidr).match(/^(\d{1,3}(?:\.\d{1,3}){3})\/(\d{1,2})$/);
if (!m) return null;
const net = ipv4ToInt(m[1]);
const hostInt = ipv4ToInt(host);
const prefix = parseInt(m[2], 10);
if (net === null || hostInt === null || prefix < 0 || prefix > 32) return null;
const mask = prefix === 0 ? 0 : (0xffffffff << (32 - prefix)) >>> 0;
return (net & mask) === (hostInt & mask);
}
// 判断 hostname 是否命中白名单:支持单 IP / IPv4 CIDR 网段 / 主机名精确匹配,IPv4 映射 IPv6 自动归一。
function proxyAllowed(hostname) {
if (!hostname) return false;
let host = String(hostname).toLowerCase();
if (host.startsWith('[') && host.endsWith(']')) host = host.slice(1, -1);
const mapped = host.match(/^::ffff:(\d+\.\d+\.\d+\.\d+)$/);
if (mapped) host = mapped[1];
const raw = (db.getSetting('proxy_allowed_hosts') || '').trim();
if (!raw) return false;
for (const entry of raw.split(/[,;\s]+/)) {
let e = entry.trim().toLowerCase();
if (!e) continue;
// 兼容 ip:port 写法(仅 IPv4 形态,避免误伤 IPv6 冒号)
const lastColon = e.lastIndexOf(':');
if (lastColon > 0 && e.indexOf('.') !== -1 && !e.includes('/')) e = e.slice(0, lastColon);
if (e === host) return true;
if (e.includes('/') && ipv4CidrContains(e, host) === true) return true;
}
return false;
}
function proxyRequest(target, res, maxRedirects = 5) { function proxyRequest(target, res, maxRedirects = 5) {
if (maxRedirects <= 0) return res.status(502).json({ error: '重定向次数过多' }); if (maxRedirects <= 0) return res.status(502).json({ error: '重定向次数过多' });
try { try {
const parsed = new URL(target); const parsed = new URL(target);
// 发起请求前校验目标 hostname,拒绝内网地址(含重定向跳转的目标) // 发起请求前校验目标 hostname内网地址一律拦截,除非命中白名单(proxy_allowed_hosts)。
if (isBlockedHost(parsed.hostname)) { // 注:403 JSON 经 Cloudflare 显示为 502 属正常(上游非 2xx),白名单放行后不再触发。
if (isBlockedHost(parsed.hostname) && !proxyAllowed(parsed.hostname)) {
return res.status(403).json({ error: '禁止访问内网地址' }); return res.status(403).json({ error: '禁止访问内网地址' });
} }
const client = parsed.protocol === 'https:' ? https : http; const client = parsed.protocol === 'https:' ? https : http;
@@ -59,6 +114,8 @@ function proxyRequest(target, res, maxRedirects = 5) {
delete headers['X-Frame-Options']; delete headers['X-Frame-Options'];
delete headers['content-security-policy']; delete headers['content-security-policy'];
delete headers['Content-Security-Policy']; delete headers['Content-Security-Policy'];
// 防止被代理页面内部资源请求把本站来源(/admin 等)泄露给第三方域名
headers['Referrer-Policy'] = 'no-referrer';
// Inject <base> tag so relative URLs resolve to the original domain // Inject <base> tag so relative URLs resolve to the original domain
const contentType = (headers['content-type'] || '').toLowerCase(); const contentType = (headers['content-type'] || '').toLowerCase();
@@ -118,6 +175,18 @@ function queryTokenAuth(req, res, next) {
next(); next();
} }
// 短 TTL 代理 token:仅供 iframe 的 ?token= 认证使用(5 分钟有效),
// 避免把 7 天长 TTL 主 token 暴露在 iframe URL 中(URL 可见于网络面板/历史记录/日志)。
// 前端 PanelFrame 每次组装 proxy URL 前先从此接口取短 token。
router.get('/token', authMiddleware, adminOnly, (req, res) => {
const token = jwt.sign(
{ id: req.user.id, username: req.user.username, role: req.user.role, proxy: true },
SECRET,
{ expiresIn: '5m' }
);
res.json({ token });
});
router.get('/fetch', queryTokenAuth, authMiddleware, adminOnly, (req, res) => { router.get('/fetch', queryTokenAuth, authMiddleware, adminOnly, (req, res) => {
if (!req.query.url) return res.status(400).json({ error: '缺少 url 参数' }); if (!req.query.url) return res.status(400).json({ error: '缺少 url 参数' });
proxyRequest(req.query.url, res); proxyRequest(req.query.url, res);
+5 -2
View File
@@ -9,6 +9,7 @@ const PUBLIC_KEYS = ['site_name','site_description','site_url','primary_color',
'theme_wallpaper','theme_wallpaper_scale','theme_wallpaper_enabled','nav_style','card_style', 'theme_wallpaper','theme_wallpaper_scale','theme_wallpaper_enabled','nav_style','card_style',
'glass_blur','glass_opacity','theme_force_dark', 'glass_blur','glass_opacity','theme_force_dark',
'captcha_type','captcha_login','captcha_register','captcha_forum', 'captcha_type','captcha_login','captcha_register','captcha_forum',
'rainid_enabled',
'homepage_avatar','homepage_bio','homepage_content','blog_show_sidebar', 'homepage_avatar','homepage_bio','homepage_content','blog_show_sidebar',
'site_favicon','homepage_contacts','music_embed_enabled','music_embed_code','music_embed_position','music_embed_autohide','music_embed_idle_timeout', 'site_favicon','homepage_contacts','music_embed_enabled','music_embed_code','music_embed_position','music_embed_autohide','music_embed_idle_timeout',
'footer_style','footer_copyright','footer_powered','footer_desc']; 'footer_style','footer_copyright','footer_powered','footer_desc'];
@@ -17,12 +18,14 @@ const ALL_KEYS = ['site_name','site_description','site_url','primary_color','rec
'smtp_host','smtp_port','smtp_user','smtp_from_email','smtp_from_name', 'smtp_host','smtp_port','smtp_user','smtp_from_email','smtp_from_name',
'theme_wallpaper','theme_wallpaper_scale','theme_wallpaper_enabled','nav_style','card_style','glass_blur','glass_opacity','theme_force_dark', 'theme_wallpaper','theme_wallpaper_scale','theme_wallpaper_enabled','nav_style','card_style','glass_blur','glass_opacity','theme_force_dark',
'captcha_type','captcha_login','captcha_register','captcha_forum', 'captcha_type','captcha_login','captcha_register','captcha_forum',
'rainid_enabled','rainid_client_id','rainid_discovery_url','rainid_register_redirect',
'homepage_avatar','homepage_bio','homepage_content','blog_show_sidebar', 'homepage_avatar','homepage_bio','homepage_content','blog_show_sidebar',
'site_favicon','homepage_contacts','music_embed_enabled','music_embed_code','music_embed_position','music_embed_autohide','music_embed_idle_timeout', 'site_favicon','homepage_contacts','music_embed_enabled','music_embed_code','music_embed_position','music_embed_autohide','music_embed_idle_timeout',
'footer_style','footer_copyright','footer_powered','footer_desc', 'footer_style','footer_copyright','footer_powered','footer_desc',
'comment_moderate','comment_notify']; 'comment_moderate','comment_notify',
'proxy_allowed_hosts'];
const ALLOWED_SET = [...ALL_KEYS, 'recaptcha_secret_key', 'smtp_pass', 'turnstile_secret_key']; const ALLOWED_SET = [...ALL_KEYS, 'recaptcha_secret_key', 'smtp_pass', 'turnstile_secret_key', 'rainid_client_secret'];
router.get('/public', (req, res) => { router.get('/public', (req, res) => {
const settings = {}; const settings = {};
+529
View File
@@ -0,0 +1,529 @@
// Web 终端后端 —— 安全敏感模块:终端 = RCE 级攻击面。
// 安全措施:
// 1. 专用终端密码二次确认:PBKDF2-SHA256 600k(与密码箱 routes/passwords.js 同参数,异步版不阻塞事件循环);
// 首次调用(未设置密码)即完成设置(needs_setup 流程),强度要求 8 位以上
// 2. 短 TTL token5 分钟):jwt 带 terminal:true 声明,普通登录 token 不可直接连终端;
// 认证成功后种 HttpOnly SameSite=Strict 短 TTL cookieterminal_token),WS upgrade 优先取 cookie
// ?token= query 仅为旧前端回退(不推荐,会落 access log);带失败限流 + 请求级限流防 PBKDF2 DoS
// 3. WS handshake Origin 校验(须与站点域名一致;仅 NODE_ENV=development 时放行 localhost)——纵深防御,非认证边界
// 4. 并发会话上限(MAX_SESSIONS=3):handleUpgrade 内同步预占槽位,杜绝升级回调前的竞态突破
// 5. pty.spawn 使用参数数组传参(防命令注入);kill 时连进程组一起终止(forkpty 子进程为 session leader
// 负 PID 即杀整组),杜绝 & 后台任务变孤儿进程
// 6. 审计:会话开始/结束/密码失败等写审计日志(console.log 带时间戳 + audit_logs 表);
// 拒绝类事件(Origin/token/超限)降频落审计防日志洪泛;audit_logs 按 90 天保留策略惰性清理
// 7. 空闲超时(15 分钟无输入)自动断开
// 8. ws close/error → pty.kill() + 进程组清理 + 监听器/计时器全量销毁
// 流控:pty 输出缓冲超限时 pause(仅在 onData 暂停),恢复检查放在 ws 消息处理 + 兜底轮询
//
// 部署注意:
// - node-pty 是原生模块,需要服务器编译环境(build-essential / python3),
// 安装失败时先 rm -rf node_modules 再 npm install(项目已有此重装先例)。
// - sudoers 配置(把 rainweb 换成实际运行用户):
// ⚠️ 实测 NOPASSWD: /usr/bin/sudo -i 写法匹配不到(sudo 匹配规则时 -i 会被规范化
// 为实际执行的 login shell 命令,精确命令规则失效),必须放宽为:
// echo "rainweb ALL=(ALL) NOPASSWD: ALL" | sudo tee /etc/sudoers.d/rainweb-terminal
// sudo chmod 440 /etc/sudoers.d/rainweb-terminal && sudo visudo -c
// 验证:以运行用户执行 `sudo -n -i id` 应直接输出 root 身份且不询问密码。
// 注意:NOPASSWD: ALL 等同把运行用户提权为免密 root,务必确认运行用户无交互登录面。
// - 后端若置于反向代理之后并希望审计 IP 取真实来源 IP,需设置环境变量 TRUST_PROXY=1
// (否则一律用 socket 直连地址,避免伪造 X-Forwarded-For)。
const express = require('express');
const crypto = require('crypto');
const jwt = require('jsonwebtoken');
const rateLimit = require('express-rate-limit');
const { WebSocketServer, WebSocket } = require('ws');
const db = require('../db');
const { authMiddleware, adminOnly, SECRET } = require('../middleware/auth');
const router = express.Router();
// ---------- 常量 ----------
const TOKEN_TTL = '5m'; // 短 TTL token 有效期
const TOKEN_COOKIE = 'terminal_token'; // HttpOnly 短 TTL cookie 名
const TOKEN_COOKIE_MAX_AGE = 300; // cookie 有效期(秒),与 TOKEN_TTL 一致
const MAX_SESSIONS = 3; // 最大并发终端会话数
const IDLE_TIMEOUT = 15 * 60 * 1000; // 空闲超时:15 分钟无输入自动断开
const PIN_MIN_LEN = 8; // 终端=root shellPIN 强度要求 8 位以上
const PBKDF2_ITERATIONS = 600000; // 与 routes/passwords.js 一致(OWASP 2023 建议)
const MAX_PTY_BUFFER = 1024 * 1024; // pty 输出缓冲上限(超过则暂停 pty 做流控)
const WS_MAX_PAYLOAD = 1024 * 1024; // ws 单帧消息上限,超限立即断开
const RESUME_POLL_MS = 2000; // 流控恢复兜底轮询间隔
const WS_CLOSE_BAD_TOKEN = 4001; // token 无效
const WS_CLOSE_OVERLOAD = 1013; // 会话数超限
const WS_CLOSE_IDLE = 4000; // 空闲超时
const WS_CLOSE_BAD_MSG = 4002; // 非法消息
// PIN 失败限流(与 passwords.js unlock 同模式):5 分钟 3 次失败锁定 5 分钟
const authFails = new Map();
const FAIL_LIMIT = 3;
const FAIL_WINDOW = 5 * 60 * 1000;
const LOCK_DURATION = 5 * 60 * 1000;
// /auth 请求级限流:防止异步 PBKDF2 被并发滥用造成 CPU DoS
// (失败锁定只在校验之后生效,无法挡住每请求一次的 600k 迭代计算)
const authRateLimit = rateLimit({
windowMs: 5 * 60 * 1000,
max: 20,
standardHeaders: true,
legacyHeaders: false,
message: { error: '尝试次数过多,请稍后再试' },
});
// 拒绝类事件审计降频:同一来源 IP 在窗口内最多记一条(防日志洪泛)
const REJECT_AUDIT_INTERVAL = 10 * 1000;
const rejectAudit = new Map(); // ip -> lastTs
// 并发终端会话集合(计数与统一清理)
const activeSessions = new Set();
// node-pty 懒加载:未安装时 REST 接口(status/auth)仍可用,仅 WS 会话被拒绝
let ptyModule = null;
try { ptyModule = require('node-pty'); } catch (e) { /* 未安装:连接时提示 */ }
// 审计写入计数:每 50 条惰性清理一次过期记录(保留策略,见 db.js)
let auditWriteCount = 0;
// ---------- 审计 ----------
// ctx: { user, ip }user 为 JWT payload
function audit(action, detail, ctx) {
const userId = ctx && ctx.user ? ctx.user.id : 0;
const username = ctx && ctx.user ? ctx.user.username : '';
const ip = ctx && ctx.ip ? ctx.ip : '';
console.log(`[${new Date().toISOString()}] [TERMINAL] ${action} user=${username}(${userId}) ip=${ip} ${detail}`);
// 审计落库(audit_logs 表由 db.js initTables 建表;db.run 内部已容错)
db.run('INSERT INTO audit_logs (action, user_id, username, detail, ip) VALUES (?, ?, ?, ?, ?)',
[action, userId, username, detail, ip]);
// 保留策略:每 50 条写入惰性清理 90 天前的记录(created_at 为 UTC datetime,与建表一致)
if (++auditWriteCount % 50 === 0) {
db.run("DELETE FROM audit_logs WHERE created_at < datetime('now','-90 day')");
}
}
// 客户端真实 IP:仅当 TRUST_PROXY=1 时信任 X-Forwarded-For(否则客户端可任意伪造该头)
function getClientIp(request) {
if (process.env.TRUST_PROXY === '1' && request.headers['x-forwarded-for']) {
return String(request.headers['x-forwarded-for']).split(',')[0].trim() || '';
}
return (request.socket.remoteAddress || '').toString();
}
// 拒绝事件降频审计:同 IP 10 秒内只记一条
function auditRejectOnce(ip, action, detail) {
const now = Date.now();
if ((rejectAudit.get(ip) || 0) > now - REJECT_AUDIT_INTERVAL) return;
rejectAudit.set(ip, now);
audit(action, detail, { ip });
}
// ---------- PIN(终端专用密码)----------
const PIN_SALT_KEY = 'terminal_pin_salt';
const PIN_ITER_KEY = 'terminal_pin_iter';
const PIN_HASH_KEY = 'terminal_pin_hash';
function getPinRecord() {
const salt = db.getSetting(PIN_SALT_KEY);
const hash = db.getSetting(PIN_HASH_KEY);
if (!salt || !hash) return null;
const iter = parseInt(db.getSetting(PIN_ITER_KEY), 10) || PBKDF2_ITERATIONS;
return { salt: Buffer.from(salt, 'hex'), hash: Buffer.from(hash, 'hex'), iter };
}
// 异步 PBKDF2:不阻塞事件循环(600k 迭代约几十毫秒,同步版会卡住所有请求)
function derivePinHash(pin, salt, iter) {
return new Promise((resolve, reject) => {
crypto.pbkdf2(pin, salt, iter, 32, 'sha256', (err, key) => {
if (err) reject(err); else resolve(key);
});
});
}
async function setPin(pin) {
const salt = crypto.randomBytes(16);
const hash = await derivePinHash(pin, salt, PBKDF2_ITERATIONS);
db.setSetting(PIN_SALT_KEY, salt.toString('hex'));
db.setSetting(PIN_ITER_KEY, String(PBKDF2_ITERATIONS));
db.setSetting(PIN_HASH_KEY, hash.toString('hex'));
}
async function verifyPin(pin) {
const rec = getPinRecord();
if (!rec) return false;
const derived = await derivePinHash(pin, rec.salt, rec.iter);
// 常数时间比较,防时序侧信道
return crypto.timingSafeEqual(derived, rec.hash);
}
// ---------- PIN 失败限流 ----------
function isLocked() {
const rec = authFails.get('global');
return !!(rec && rec.lockedUntil && Date.now() < rec.lockedUntil);
}
function recordFail() {
const now = Date.now();
let rec = authFails.get('global');
if (!rec || now - rec.firstTs > FAIL_WINDOW) rec = { count: 0, firstTs: now, lockedUntil: 0 };
rec.count += 1;
if (rec.count >= FAIL_LIMIT) { rec.lockedUntil = now + LOCK_DURATION; rec.count = 0; }
authFails.set('global', rec);
}
// ---------- 短 TTL token(参考 proxy.js----------
function issueToken(user) {
// terminal:true 声明:只有本接口签发的 token 才能连接终端,普通登录 token 无效
return jwt.sign(
{ id: user.id, username: user.username, role: user.role, terminal: true },
SECRET,
{ expiresIn: TOKEN_TTL }
);
}
function verifyToken(token) {
if (!token || typeof token !== 'string') return null;
try {
const payload = jwt.verify(token, SECRET);
if (!payload.terminal) return null; // 必须为终端专用 token
if (payload.role !== 'admin') return null; // 防篡改
const u = db.get('SELECT role FROM users WHERE id = ?', [payload.id]);
if (!u || u.role !== 'admin') return null; // 复查角色(用户被删/降权立即失效)
return payload;
} catch { return null; }
}
// 认证成功 → 种 HttpOnly 短 TTL cookieWS 握手(同源 GET /ws/terminal)自动携带,
// root shell 凭证不再进 URL / access log。Path 精确限定 /ws/terminalHttpOnly 防 XSS 读取,
// SameSite=Strict 防跨站发送。Secure 按 req.secureHTTPS 连接)条件附加。
function setTerminalCookie(res, token) {
res.setHeader('Set-Cookie',
`terminal_token=${token}; Path=/ws/terminal; HttpOnly; SameSite=Strict; Max-Age=${TOKEN_COOKIE_MAX_AGE}` +
(res.req && res.req.secure ? '; Secure' : ''));
}
// 极简 Cookie 解析(upgrade 事件不经 Express,无 cookie-parser
function parseCookies(header) {
const out = {};
if (!header) return out;
for (const part of String(header).split(';')) {
const idx = part.indexOf('=');
if (idx === -1) continue;
const name = part.slice(0, idx).trim();
const value = part.slice(idx + 1).trim();
if (name) { try { out[name] = decodeURIComponent(value); } catch { out[name] = value; } }
}
return out;
}
// ---------- REST API ----------
// GET /api/terminal/status —— 是否已设置密码 + 当前会话数
router.get('/status', authMiddleware, adminOnly, (req, res) => {
res.json({
hasPin: !!getPinRecord(),
sessions: activeSessions.size,
maxSessions: MAX_SESSIONS,
idleTimeoutMs: IDLE_TIMEOUT,
});
});
// POST /api/terminal/auth —— 设置/校验终端专用密码,通过后发放 5 分钟短 TTL token
// 并种 HttpOnly cookieterminal_token)。
// 首次(未设置密码)调用即完成设置(前端按 /status 的 hasPin 决定显示设置表单或密码输入框),
// 响应带 setup:true 标记。响应仍含 token 字段(保持 API 契约),前端无需再从 URL 传递。
router.post('/auth', authRateLimit, authMiddleware, adminOnly, async (req, res) => {
const pin = req.body && req.body.pin;
if (!pin || typeof pin !== 'string') return res.status(400).json({ error: '请输入终端密码' });
if (pin.length > 128) return res.status(400).json({ error: '终端密码过长' });
if (isLocked()) return res.status(429).json({ error: '尝试次数过多,请稍后再试' });
const rec = getPinRecord();
const ctx = { user: req.user, ip: getClientIp(req) };
if (!rec) {
// 首次设置:无密码 → 设置并发放 token
if (pin.length < PIN_MIN_LEN) {
return res.status(400).json({ error: `终端密码至少 ${PIN_MIN_LEN}` });
}
try {
await setPin(pin);
} catch (e) {
return res.status(500).json({ error: '密码处理失败' });
}
authFails.delete('global');
audit('PIN_SETUP', '终端专用密码已设置', ctx);
const token = issueToken(req.user);
setTerminalCookie(res, token);
return res.json({
needs_setup: false,
setup: true,
token,
expiresIn: TOKEN_TTL,
message: '终端密码已设置',
});
}
let pinOk = false;
try { pinOk = await verifyPin(pin); } catch { pinOk = false; }
if (!pinOk) {
recordFail();
audit('PIN_FAIL', '终端密码校验失败', ctx);
if (isLocked()) return res.status(429).json({ error: '尝试次数过多,请稍后再试' });
return res.status(401).json({ error: '终端密码错误' });
}
authFails.delete('global');
audit('PIN_OK', '终端密码校验通过,发放短 TTL token', ctx);
const token = issueToken(req.user);
setTerminalCookie(res, token);
res.json({ token, expiresIn: TOKEN_TTL });
});
// ---------- WS /ws/terminal ----------
const isDev = process.env.NODE_ENV === 'development';
// Origin 校验:必须与站点域名一致(site_url 或请求 Host 头)。
// localhost 豁免仅 NODE_ENV=development 时生效(生产环境非浏览器客户端无法借 localhost 绕过)。
// 注意:这是纵深防御,不是认证边界——真正把关的是 token/cookie 校验。
function originAllowed(request) {
const origin = request.headers.origin;
if (!origin) return false;
try {
const o = new URL(origin);
const allowed = [];
const siteUrl = db.getSetting('site_url');
if (siteUrl) { try { allowed.push(new URL(siteUrl).host); } catch {} }
if (request.headers.host) allowed.push(request.headers.host);
if (isDev && ['127.0.0.1', 'localhost', '::1'].includes(o.hostname)) return true;
return allowed.includes(o.host);
} catch { return false; }
}
// pty 安全:参数数组传参(防命令注入),禁止字符串拼接;sudo -i 获得 root shell。
// cwd 必须用运行用户可访问的目录:直接给 '/root' 时 spawn 不抛错,
// 而是 shell 启动后 chdir(2) 失败(Permission denied)——sudo -i 本身会把
// 工作目录与 HOME 切到 /root,所以这里给运行用户当前目录即可。
function spawnPty(cols, rows) {
if (!ptyModule) return null; // node-pty 未安装
const opts = { name: 'xterm-color', cols, rows, cwd: process.cwd() };
return ptyModule.spawn('sudo', ['-i'], opts);
}
// 终止 pty:先杀 shell,再连进程组一起杀(forkpty 子进程是 session leaderpgid == pid
// 负 PID 即杀整组),500ms 后兜底 SIGKILL,杜绝 `&` 后台任务变孤儿进程。
function killPty(pty) {
if (!pty) return;
const pid = pty.pid;
try { pty.kill(); } catch {} // 标准接口:向 shell 发 SIGKILL
if (pid && Number.isInteger(pid)) {
try { process.kill(-pid, 'SIGTERM'); } catch {}
const t = setTimeout(() => {
try { process.kill(-pid, 'SIGKILL'); } catch {}
}, 500);
if (t.unref) t.unref();
}
}
// WS 服务:noServer 模式,由 server.js 的 http server 'upgrade' 事件转交;
// maxPayload 限制单帧大小,超限由 ws 自动关闭(1009)。
const wss = new WebSocketServer({ noServer: true, maxPayload: WS_MAX_PAYLOAD });
// server.js 调用:返回 true 表示已接管该 upgrade 请求(含拒绝),false 表示非终端路径
function handleUpgrade(request, socket, head) {
let pathname = null;
try { pathname = new URL(request.url, 'http://localhost').pathname; } catch {}
if (pathname !== '/ws/terminal') return false;
const ip = getClientIp(request);
// 1) Origin 校验(纵深防御;拒绝事件降频落审计)
if (!originAllowed(request)) {
auditRejectOnce(ip, 'WS_ORIGIN_REJECT', 'Origin 校验失败');
socket.write('HTTP/1.1 403 Forbidden\r\nConnection: close\r\n\r\n');
socket.destroy();
return true;
}
// 2) token 校验:优先 HttpOnly cookie(推荐),?token= query 仅作旧前端回退(不推荐,落 access log)
const cookies = parseCookies(request.headers.cookie);
let token = cookies[TOKEN_COOKIE];
if (!token) {
try { token = new URL(request.url, 'http://localhost').searchParams.get('token'); } catch {}
}
const payload = verifyToken(token);
if (!payload) {
auditRejectOnce(ip, 'WS_TOKEN_REJECT', 'token 无效或过期');
socket.write('HTTP/1.1 401 Unauthorized\r\nConnection: close\r\n\r\n');
socket.destroy();
return true;
}
// 3) 并发会话上限:同步预占槽位再检查(升级回调前执行,杜绝并发竞态突破上限)
const slot = { pending: true };
activeSessions.add(slot);
if (activeSessions.size > MAX_SESSIONS) {
activeSessions.delete(slot);
auditRejectOnce(ip, 'WS_OVERLOAD', '并发会话数超限被拒绝');
socket.write('HTTP/1.1 503 Service Unavailable\r\nConnection: close\r\n\r\n');
socket.destroy();
return true;
}
// 升级中途失败(socket 断开等)时释放预占槽位,防止泄漏
const releaseSlot = () => { activeSessions.delete(slot); };
socket.once('close', releaseSlot);
socket.once('error', releaseSlot);
// 4) 升级并触发连接处理(槽位随会话移交)
wss.handleUpgrade(request, socket, head, (ws) => {
socket.removeListener('close', releaseSlot);
socket.removeListener('error', releaseSlot);
if (ws.readyState !== WebSocket.OPEN) { // 升级异常:释放槽位
activeSessions.delete(slot);
return;
}
wss.emit('connection', ws, request, payload, slot);
});
return true;
}
wss.on('connection', (ws, request, payload, slot) => {
// 复用 handleUpgrade 预占的槽位(已在 activeSessions 中,幂等 add),
// 升级失败路径已由 releaseSlot/readyState 检查负责释放。
const session = slot || {};
session.id = session.id || crypto.randomBytes(4).toString('hex');
session.startedAt = session.startedAt || Date.now();
activeSessions.add(session);
let ptyProc = null;
let idleTimer = null;
let resumeTimer = null;
let closed = false;
const ctx = { user: payload, ip: getClientIp(request) };
audit('SESSION_START', `终端会话 ${session.id} 建立`, ctx);
function cleanup() {
if (closed) return;
closed = true;
clearTimeout(idleTimer);
clearInterval(resumeTimer);
// 销毁 pty:kill() + 进程组清理(含后台任务),事件回调为一次性注册随对象失效
killPty(ptyProc);
ptyProc = null;
activeSessions.delete(session);
}
function scheduleIdle() {
clearTimeout(idleTimer);
idleTimer = setTimeout(() => {
if (closed) return;
audit('SESSION_IDLE_TIMEOUT', `终端会话 ${session.id} 空闲 ${IDLE_TIMEOUT / 60000} 分钟无输入,自动断开`, ctx);
try { ws.close(WS_CLOSE_IDLE, 'idle timeout'); } catch {}
cleanup();
}, IDLE_TIMEOUT);
if (idleTimer.unref) idleTimer.unref(); // 不阻止进程退出
}
// 流控恢复:onData 暂停后不再触发回调,恢复检查必须在消息路径/轮询中执行
function maybeResume() {
if (closed || !session._paused || !ptyProc) return;
if (ws.readyState === WebSocket.OPEN && ws.bufferedAmount < MAX_PTY_BUFFER / 2) {
session._paused = false;
try { ptyProc.resume(); } catch {}
}
}
ws.on('message', (data, isBinary) => {
if (closed) return;
maybeResume(); // 任意帧到达即尝试恢复(resize/输入/控制消息均可)
// 二进制帧 = pty 输入(触发空闲计时刷新)
if (isBinary) {
if (!ptyProc) return;
scheduleIdle();
try { ptyProc.write(data); } catch {}
return;
}
// 文本帧 = JSON 控制消息
let msg;
try { msg = JSON.parse(data.toString('utf8')); } catch {
try { ws.close(WS_CLOSE_BAD_MSG, 'invalid json'); } catch {}
cleanup(); return;
}
if (!msg || typeof msg.type !== 'string') {
try { ws.close(WS_CLOSE_BAD_MSG, 'bad message'); } catch {}
cleanup(); return;
}
switch (msg.type) {
case 'auth':
// 连接后可选再发 token 二次认证;无效立即断开(4001)
if (!verifyToken(msg.token)) {
audit('SESSION_AUTH_FAIL', `终端会话 ${session.id} 二次认证失败`, ctx);
try { ws.close(WS_CLOSE_BAD_TOKEN, 'bad token'); } catch {}
cleanup();
}
break;
case 'resize': {
const cols = Math.min(Math.max(parseInt(msg.cols, 10) || 80, 2), 500);
const rows = Math.min(Math.max(parseInt(msg.rows, 10) || 24, 2), 200);
if (ptyProc) { try { ptyProc.resize(cols, rows); } catch {} }
break;
}
case 'ping':
try { ws.send(JSON.stringify({ type: 'pong' })); } catch {}
break;
case 'bye':
audit('SESSION_BYE', `终端会话 ${session.id} 主动退出`, ctx);
try { ws.close(1000, 'bye'); } catch {}
cleanup();
break;
default:
break; // 未知控制消息忽略
}
});
ws.on('error', (err) => {
audit('SESSION_ERROR', `终端会话 ${session.id} WebSocket 错误: ${err.message}`, ctx);
cleanup();
});
ws.on('close', () => {
audit('SESSION_END', `终端会话 ${session.id} 连接关闭`, ctx);
cleanup();
});
// 启动 ptysudo -i → root shell
try {
ptyProc = spawnPty(80, 24);
} catch (e) {
audit('SESSION_SPAWN_FAIL', `终端会话 ${session.id} pty 启动失败: ${e.message}`, ctx);
try { ws.close(1011, 'pty spawn failed'); } catch {}
cleanup(); return;
}
if (!ptyProc) {
audit('SESSION_SPAWN_FAIL', `终端会话 ${session.id} 拒绝:node-pty 未安装或无法加载`, ctx);
try { ws.close(1011, 'node-pty not installed'); } catch {}
cleanup(); return;
}
// 兜底恢复轮询:即使客户端不再发任何帧,也能在缓冲排空后恢复 pty
resumeTimer = setInterval(() => maybeResume(), RESUME_POLL_MS);
if (resumeTimer.unref) resumeTimer.unref();
// pty 输出 → ws 二进制帧(binaryType=arraybuffer
ptyProc.onData((data) => {
if (closed || ws.readyState !== WebSocket.OPEN) return;
// 仅做暂停判断(数据流动时天然触发);恢复由 maybeResume(消息/轮询)负责
if (!session._paused && ws.bufferedAmount > MAX_PTY_BUFFER) {
session._paused = true;
try { ptyProc.pause(); } catch {}
}
try { ws.send(data, { binary: true }); } catch {}
});
ptyProc.onExit(({ exitCode, signal }) => {
audit('SESSION_EXIT', `终端会话 ${session.id} 进程退出 code=${exitCode} signal=${signal}`, ctx);
cleanup();
if (ws.readyState === WebSocket.OPEN) { try { ws.close(1000, 'pty exited'); } catch {} }
});
scheduleIdle();
audit('SESSION_READY', `终端会话 ${session.id} pty 就绪`, ctx);
});
module.exports = router;
module.exports.handleUpgrade = handleUpgrade;
+28 -1
View File
@@ -12,6 +12,8 @@ try {
fs.writeFileSync(cfgPath, JSON.stringify(cfg, null, 2)); fs.writeFileSync(cfgPath, JSON.stringify(cfg, null, 2));
} }
process.env.JWT_SECRET = cfg.jwt_secret; process.env.JWT_SECRET = cfg.jwt_secret;
// RainID OIDC 机密 client_secret(仅存 .env.jsongitignoredlib/rainid.js 读取)
if (cfg.rainid_client_secret) process.env.RAINID_CLIENT_SECRET = cfg.rainid_client_secret;
} catch {} } catch {}
const express = require('express'); const express = require('express');
@@ -32,7 +34,10 @@ const uploadRoutes = require('./routes/upload');
const setupRoutes = require('./routes/setup'); const setupRoutes = require('./routes/setup');
const proxyRoutes = require('./routes/proxy'); const proxyRoutes = require('./routes/proxy');
const importRoutes = require('./routes/import'); const importRoutes = require('./routes/import');
const noteRoutes = require('./routes/notes');
const feedRoutes = require('./routes/feed'); const feedRoutes = require('./routes/feed');
const terminalRoutes = require('./routes/terminal');
const oidcRoutes = require('./routes/oidc');
const { blogSSR, forumSSR, sitemapXml } = require('./ssr'); const { blogSSR, forumSSR, sitemapXml } = require('./ssr');
const app = express(); const app = express();
@@ -98,6 +103,7 @@ app.use('/uploads', express.static(path.join(__dirname, 'uploads'), {
})); }));
app.use('/api/auth', authRoutes); app.use('/api/auth', authRoutes);
app.use('/api/auth/oidc', oidcRoutes);
app.use('/api/admin-links', adminLinkRoutes); app.use('/api/admin-links', adminLinkRoutes);
app.use('/api/announcements', announcementRoutes); app.use('/api/announcements', announcementRoutes);
app.use('/api/forum', forumRoutes); app.use('/api/forum', forumRoutes);
@@ -111,6 +117,8 @@ app.use('/api/upload', uploadRoutes);
app.use('/api/setup', setupRoutes); app.use('/api/setup', setupRoutes);
app.use('/api/proxy', proxyRoutes); app.use('/api/proxy', proxyRoutes);
app.use('/api/import', importRoutes); app.use('/api/import', importRoutes);
app.use('/api/notes', noteRoutes);
app.use('/api/terminal', terminalRoutes);
// Version & Update // Version & Update
const version = require('fs').readFileSync('./VERSION', 'utf8').trim(); const version = require('fs').readFileSync('./VERSION', 'utf8').trim();
@@ -186,9 +194,28 @@ async function start() {
} }
await getDb(); await getDb();
app.listen(PORT, '0.0.0.0', () => { // RainID 单点登录启动校验:开启但 client_id/secret 缺失 → 警告并按未启用处理(fail-closed
try {
const { getClientSecret } = require('./lib/rainid');
const { getSetting } = require('./db');
if (getSetting('rainid_enabled') === '1') {
const clientId = getSetting('rainid_client_id');
if (!clientId || !getClientSecret()) {
console.warn('[RainID] rainid_enabled=1 但 client_id / rainid_client_secret 未配置,RainID 登录将不可用(fail-closed,本地登录不受影响)');
}
}
} catch {}
const server = app.listen(PORT, '0.0.0.0', () => {
console.log(`RainWeb running on port ${PORT}`); console.log(`RainWeb running on port ${PORT}`);
}); });
// Web 终端 WS 升级:upgrade 事件不经 Express 中间件栈,
// 在此提前接管 /ws/terminal(避开 SPA catch-all),其余升级请求直接关闭。
// 安全校验(Origin/token/会话上限)均在 routes/terminal.js handleUpgrade 内完成。
server.on('upgrade', (request, socket, head) => {
if (!terminalRoutes.handleUpgrade(request, socket, head)) {
socket.destroy();
}
});
} catch (err) { } catch (err) {
console.error('Failed to start:', err.message); console.error('Failed to start:', err.message);
process.exit(1); process.exit(1);
+3
View File
@@ -21,6 +21,9 @@ module.exports = defineConfig({
proxy: { proxy: {
'/api': 'http://localhost:3101', '/api': 'http://localhost:3101',
'/uploads': 'http://localhost:3101', '/uploads': 'http://localhost:3101',
// Web 终端 WS/ws/terminal 必须走 WebSocket 代理,否则 dev 下解锁后
// 连接永远失败 → 终端空转白屏(生产由 server.js 的 upgrade 事件处理)
'/ws': { target: 'ws://localhost:3101', ws: true },
}, },
}, },
}); });