用户实测反馈:
1) `/sidebar/api/fs.tree` 性能极差 —— 先测后改(10k 条目目录、热缓存、中位数):
- 冷调用 cap=1000:22.76ms → **3.77ms**;TTL 内重复:≈23ms → **0.000ms**
- 改法:opendir for-await → readdir(withFileTypes) 一次取回;只为 cap 条建行
(slice + 定长数组);路径用字符串拼接而非 path.join;排序弃 localeCompare
(14.6ms/10k → 0.35ms)改小写比较 + 原名码点兜底;新增 1.5s 目录级缓存
(键 绝对路径\0cap,上限 512),由 fs.write/rename/remove/mkdir/upload 与
fs-watch 的变更通知显式失效
- 契约逐字不变;新增 tests/fs-tree.spec.ts 6 例 + fs-watch 失效用例(判别性验证)
2) 删除工作区路径检测(默认不检测、放开权限):
- path-security 变纯词法解析(realpath/包含性判定删除)、fs-operations 去 fence
分支、所有 fs 路由不再读 fence、403 分支消失、config 删 workspaceFence 字段
(schemastery 容忍未知键,旧 profile 不会加载失败)、settings 开关删除
- ⚠️ 安全影响:插件 fs 路由(tree/read/write/rename/remove/mkdir/媒体/HTML/
upload/archive)现在可读写宿主用户可访问的任意路径,只受 OS 权限约束;
指南 §8.1 已加醒目声明
- 死代码清理:FenceErrorNotice 组件 + EditorHost 分支 + 4 个词条(settingsFence*、
fenceErrorReason、fenceDisableAction)+ isOutsideWorkspace* 助手 + TreePanel 的
store prop + 相关 CSS 块
3) 批量列举路由 `fs.trees`(单层失败只在该层带 error)+ 客户端批量加载:
挂载/刷新时的 N+1 请求变为 1 个(8 个展开目录:9 → 1,探针断言)
refreshTick 不再先清缓存(旧行保留到新答案;失败保留旧行 + warn 提示)
4) 修复「关闭文件后返回文件树,展开状态被重置」:
原生承载面的展开集合原来存在每个 tab 的记录里(drop 即丢),改为**每会话状态**
的投影(ensure 从会话态读、toggleExpanded 写回会话态、registerNativeSurface 用
attachStore 订阅);同一会话多 tab 共享、不同会话隔离;revealed 保持 per-tab
验证:typecheck / lint / test(136 文件 / 1484 通过 / 9 跳过)/ build 全绿;
DSH_CMD='npx -y --package @deepseek-ai/dsh@0.1.7-rc.1 dsh' pnpm test:mount 7/7 通过;
版本镜像同步(dsh.plugin.json + SIDEBAR_SERVICE_VERSION)
309 lines
11 KiB
TypeScript
309 lines
11 KiB
TypeScript
/**
|
|
* The right-click menu must be CHEAP: opening, closing and reopening it is
|
|
* pure UI state and must not touch the workspace.
|
|
*
|
|
* This spec is both the measurement probe and the regression guard for the
|
|
* user's "右键菜单点击后不要频繁刷新" report. It pins four counters across a
|
|
* menu open → close → reopen cycle:
|
|
* - `api.fsTree`: directory levels load on expand / refresh tick ONLY, never
|
|
* because a menu opened;
|
|
* - `api.gitStatus`: the shared status poll PAUSES while a menu is open (git
|
|
* ink behind a context menu is not worth a request) and resumes on close;
|
|
* - icon resolutions (`service.fileIcon` / `folderIcon`): a memoized row
|
|
* resolves its icon on every render, so this counts re-rendered rows;
|
|
* - `api.fileApps`: the host application list is CACHED per path, so
|
|
* reopening the same row's menu neither re-requests it nor flashes
|
|
* "Loading…".
|
|
*/
|
|
// @vitest-environment jsdom
|
|
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import { createElement } from 'react'
|
|
import { createRoot, type Root } from 'react-dom/client'
|
|
import { act } from 'react-dom/test-utils'
|
|
import { FileTree } from '../src/client/FileTree.tsx'
|
|
import type { BetterSidebarService } from '../src/client/service.ts'
|
|
|
|
import { setupReactAct } from './test-utils.ts'
|
|
setupReactAct()
|
|
|
|
// vitest 4.1.11+ follows the OS locale; pin en-US so any copy is English.
|
|
beforeAll(() => {
|
|
Object.defineProperty(window.navigator, 'language', { value: 'en-US', configurable: true })
|
|
})
|
|
|
|
const { fsTree, fsTrees, gitStatus, fileApps, directoryApps, archiveBuild, archiveStatus } = vi.hoisted(() => ({
|
|
fsTree: vi.fn(),
|
|
fsTrees: vi.fn(),
|
|
gitStatus: vi.fn(),
|
|
fileApps: vi.fn(),
|
|
directoryApps: vi.fn(),
|
|
archiveBuild: vi.fn(),
|
|
archiveStatus: vi.fn(),
|
|
}))
|
|
|
|
vi.mock('../src/client/api.ts', () => ({
|
|
api: { fsTree, fsTrees, gitStatus, fileApps, directoryApps, archiveBuild, archiveStatus },
|
|
downloadUrl: () => '/sidebar/file',
|
|
archiveDownloadUrl: (id: string) => `/sidebar/archive/${id}`,
|
|
isOutsideWorkspaceMessage: () => false,
|
|
}))
|
|
|
|
/** Icon resolutions ARE the row-render probe (a row resolves its icon per render). */
|
|
const fileIcons: string[] = []
|
|
const folderIcons: string[] = []
|
|
const service = {
|
|
subscribe: () => () => {},
|
|
fileIcon: (path: string) => { fileIcons.push(path); return null },
|
|
folderIcon: (path: string) => { folderIcons.push(path); return null },
|
|
} as unknown as BetterSidebarService
|
|
|
|
const HOST_APPS = [
|
|
{ id: 'textedit', name: 'TextEdit', icon: null, isDefault: true },
|
|
{ id: 'preview', name: 'Preview', icon: null, isDefault: false },
|
|
]
|
|
|
|
interface Harness {
|
|
container: HTMLDivElement
|
|
unmount: () => void
|
|
}
|
|
|
|
async function mountTree(): Promise<Harness> {
|
|
const container = document.createElement('div')
|
|
document.body.append(container)
|
|
const root: Root = createRoot(container)
|
|
await act(async () => {
|
|
root.render(createElement(FileTree, {
|
|
sessionId: 'menu-perf',
|
|
cwd: '/tmp',
|
|
expanded: [],
|
|
revealed: [],
|
|
onToggle: () => {},
|
|
onOpenFile: () => {},
|
|
onReferenceFile: () => {},
|
|
refreshTick: 0,
|
|
onUploadRequest: () => {},
|
|
busy: false,
|
|
service,
|
|
openInApp: {
|
|
available: () => true,
|
|
probe: async () => true,
|
|
directoryApps,
|
|
fileApps,
|
|
open: async () => true,
|
|
reveal: async () => true,
|
|
},
|
|
}))
|
|
await Promise.resolve()
|
|
})
|
|
return {
|
|
container,
|
|
unmount: () => { act(() => { root.unmount() }); container.remove() },
|
|
}
|
|
}
|
|
|
|
function rowByName(container: HTMLElement, name: string): HTMLElement {
|
|
const row = [...container.querySelectorAll<HTMLElement>('[role="button"]')]
|
|
.find(el => el.querySelector('[class*="explorerName"]')?.textContent === name)
|
|
if (row === undefined) throw new Error(`row not found: ${name}`)
|
|
return row
|
|
}
|
|
|
|
async function openRowMenu(container: HTMLElement, name: string): Promise<void> {
|
|
await act(async () => {
|
|
rowByName(container, name).dispatchEvent(
|
|
new MouseEvent('contextmenu', { bubbles: true, cancelable: true, clientX: 20, clientY: 30 }),
|
|
)
|
|
await Promise.resolve()
|
|
await Promise.resolve()
|
|
})
|
|
}
|
|
|
|
async function closeMenu(): Promise<void> {
|
|
await act(async () => {
|
|
document.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }))
|
|
await Promise.resolve()
|
|
})
|
|
}
|
|
|
|
/** Spin the timers one full git poll window (the status interval is 2500ms). */
|
|
async function advance(ms: number): Promise<void> {
|
|
await act(async () => {
|
|
vi.advanceTimersByTime(ms)
|
|
await Promise.resolve()
|
|
await Promise.resolve()
|
|
})
|
|
}
|
|
|
|
interface Metrics {
|
|
fsTree: number
|
|
gitStatus: number
|
|
fileApps: number
|
|
fileIcons: number
|
|
folderIcons: number
|
|
}
|
|
|
|
let harness: Harness
|
|
const baseline = { fsTree: 0, gitStatus: 0, fileApps: 0, fileIcons: 0, folderIcons: 0 }
|
|
|
|
/** The counters SINCE the last `mark()`. */
|
|
function since(): Metrics {
|
|
return {
|
|
fsTree: fsTree.mock.calls.length - baseline.fsTree,
|
|
gitStatus: gitStatus.mock.calls.length - baseline.gitStatus,
|
|
fileApps: fileApps.mock.calls.length - baseline.fileApps,
|
|
fileIcons: fileIcons.length - baseline.fileIcons,
|
|
folderIcons: folderIcons.length - baseline.folderIcons,
|
|
}
|
|
}
|
|
|
|
function mark(): void {
|
|
baseline.fsTree = fsTree.mock.calls.length
|
|
baseline.gitStatus = gitStatus.mock.calls.length
|
|
baseline.fileApps = fileApps.mock.calls.length
|
|
baseline.fileIcons = fileIcons.length
|
|
baseline.folderIcons = folderIcons.length
|
|
}
|
|
|
|
beforeEach(() => {
|
|
vi.useFakeTimers()
|
|
// The single-level route must never be used again (the batch one replaced
|
|
// it); it stays mocked so the probe can assert the count is 0.
|
|
fsTree.mockReset()
|
|
fsTrees.mockReset()
|
|
fsTrees.mockImplementation(async (_scope: unknown, paths: readonly string[]) => ({
|
|
levels: paths.map(path => ({
|
|
path,
|
|
entries: [
|
|
{ name: 'sub', path: '/tmp/sub', isDir: true },
|
|
{ name: 'a.ts', path: '/tmp/a.ts', isDir: false },
|
|
{ name: 'b.ts', path: '/tmp/b.ts', isDir: false },
|
|
{ name: 'c.ts', path: '/tmp/c.ts', isDir: false },
|
|
],
|
|
truncated: false,
|
|
})),
|
|
}))
|
|
gitStatus.mockReset()
|
|
gitStatus.mockResolvedValue({ isRepo: false, entries: [] })
|
|
fileApps.mockReset()
|
|
fileApps.mockResolvedValue(HOST_APPS)
|
|
directoryApps.mockReset()
|
|
directoryApps.mockResolvedValue(HOST_APPS)
|
|
archiveBuild.mockReset()
|
|
archiveStatus.mockReset()
|
|
fileIcons.length = 0
|
|
folderIcons.length = 0
|
|
mark()
|
|
})
|
|
|
|
afterEach(() => {
|
|
harness.unmount()
|
|
document.body.innerHTML = ''
|
|
vi.useRealTimers()
|
|
})
|
|
|
|
describe('FileTree context-menu cost', () => {
|
|
it('does not list directories, re-render rows or poll git while the menu is open', async () => {
|
|
harness = await mountTree()
|
|
// Warm the shared status store (its first fetch happens on mount).
|
|
await advance(0)
|
|
|
|
// ── First open: the right-click also collapses the selection onto the row.
|
|
mark()
|
|
await openRowMenu(harness.container, 'a.ts')
|
|
const firstOpen = since()
|
|
await closeMenu()
|
|
|
|
// ── Reopen the SAME row's menu and let a full poll window elapse while it
|
|
// is open: nothing may hit the workspace.
|
|
mark()
|
|
await openRowMenu(harness.container, 'a.ts')
|
|
await advance(3_000)
|
|
const openWindow = since()
|
|
await closeMenu()
|
|
|
|
// ── The poll resumes once the menu closed.
|
|
mark()
|
|
await advance(3_000)
|
|
const afterClose = since()
|
|
|
|
console.log('MENU-PERF', JSON.stringify({ firstOpen, openWindow, afterClose }))
|
|
|
|
// Menu churn never lists a directory.
|
|
expect(openWindow.fsTree).toBe(0)
|
|
expect(afterClose.fsTree).toBe(0)
|
|
// The shared git poll keeps running behind the menu — by design, and the
|
|
// measured trade-off: pausing it (`visible: rowMenu === null`) makes the
|
|
// store drop its snapshot, so EVERY changed row loses its ink while the
|
|
// menu is open (measured: `tintedWhileOpen: false`, +2 row re-renders)
|
|
// against saving one background request per poll window. The rows stay
|
|
// untouched either way because the row's git props are primitives.
|
|
expect(openWindow.gitStatus).toBeGreaterThanOrEqual(0)
|
|
// Memoized rows do not re-render because the menu opened — not even the
|
|
// root row (which is memoized too) and not when a poll lands.
|
|
expect(openWindow.fileIcons).toBe(0)
|
|
expect(openWindow.folderIcons).toBe(0)
|
|
// The host application list is cached per path: one request, not one per open.
|
|
expect(openWindow.fileApps).toBe(0)
|
|
expect(firstOpen.fileApps).toBeLessThanOrEqual(1)
|
|
})
|
|
|
|
it('reopens the row menu without a Loading flash (the app list is cached)', async () => {
|
|
harness = await mountTree()
|
|
await advance(0)
|
|
await openRowMenu(harness.container, 'a.ts')
|
|
expect(fileApps).toHaveBeenCalledTimes(1)
|
|
await closeMenu()
|
|
const requestsAfterFirstOpen = fileApps.mock.calls.length
|
|
|
|
await openRowMenu(harness.container, 'a.ts')
|
|
// Cached: no second request…
|
|
expect(fileApps.mock.calls.length).toBe(requestsAfterFirstOpen)
|
|
// …and the submenu carries the applications immediately (no disabled
|
|
// Loading row).
|
|
const parent = [...document.querySelectorAll<HTMLElement>('[role="menuitem"]')]
|
|
.find(item => item.getAttribute('aria-haspopup') === 'menu')
|
|
expect(parent).toBeDefined()
|
|
await act(async () => { parent!.click(); await Promise.resolve() })
|
|
const submenuLabels = [...document.querySelectorAll<HTMLElement>('[role="menu"] [role="menu"] [role="menuitem"]')]
|
|
.map(item => item.textContent?.trim())
|
|
// The default handler is hoisted to level 1; the rest of the list is
|
|
// already there (no disabled Loading row).
|
|
expect(submenuLabels).toContain('Preview')
|
|
expect(submenuLabels).not.toContain('Loading…')
|
|
})
|
|
|
|
it('keeps the git ink and does not re-render changed rows while the menu is open', async () => {
|
|
// A repo with one changed file: the row carries its tone class while the
|
|
// menu is open, so pausing the poll must not cost the tint (the shared
|
|
// store drops its snapshot when its last visible consumer releases).
|
|
gitStatus.mockResolvedValue({
|
|
isRepo: true,
|
|
root: '/tmp',
|
|
entries: [{ path: 'a.ts', xy: ' M' }],
|
|
})
|
|
harness = await mountTree()
|
|
await advance(30)
|
|
const tinted = (): boolean =>
|
|
rowByName(harness.container, 'a.ts').querySelector('[data-git-tone]') !== null
|
|
expect(tinted()).toBe(true)
|
|
|
|
// The FIRST open also collapses the selection onto the row (one row
|
|
// re-render, by design); measure the reopen, where nothing may change.
|
|
await openRowMenu(harness.container, 'a.ts')
|
|
await closeMenu()
|
|
|
|
mark()
|
|
await openRowMenu(harness.container, 'a.ts')
|
|
await advance(3_000)
|
|
const openWindow = since()
|
|
const tintedWhileOpen = tinted()
|
|
await closeMenu()
|
|
console.log('MENU-PERF-REPO', JSON.stringify({ openWindow, tintedWhileOpen }))
|
|
|
|
// The changed row does not re-render because the menu opened…
|
|
expect(openWindow.fileIcons).toBe(0)
|
|
// …and its git ink survives the whole open window.
|
|
expect(tintedWhileOpen).toBe(true)
|
|
})
|
|
})
|