用户实测反馈:
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)
131 lines
4.7 KiB
TypeScript
131 lines
4.7 KiB
TypeScript
/**
|
|
* FileTree row memoization (the tree's performance contract): rows are
|
|
* `React.memo` components fed stable callbacks and per-row booleans, so an
|
|
* interaction that touches ONE row must re-render that row only — not the
|
|
* whole tree. The evidence is the icon resolver: it runs inside the row
|
|
* component, so counting its calls counts the rows that re-rendered.
|
|
*/
|
|
// @vitest-environment jsdom
|
|
import { beforeAll, afterEach, 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 })
|
|
})
|
|
|
|
vi.mock('../src/client/api.ts', () => ({
|
|
api: {
|
|
fsTrees: 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 })),
|
|
}),
|
|
// The tree reads the shared git-status store; a non-repo answer keeps
|
|
// every row plain (its arrival must not defeat the memo bail-out either).
|
|
gitStatus: async () => ({ isRepo: false, entries: [] }),
|
|
},
|
|
downloadUrl: () => '/sidebar/file',
|
|
isOutsideWorkspaceMessage: () => false,
|
|
}))
|
|
|
|
/** The icon resolutions per render: one per row that actually re-rendered. */
|
|
const fileIcons: string[] = []
|
|
const folderIcons: string[] = []
|
|
|
|
/** A minimal registry service: the counters ARE the re-render probe. */
|
|
const service = {
|
|
subscribe: () => () => {},
|
|
fileIcon: (path: string) => { fileIcons.push(path); return null },
|
|
folderIcon: (path: string) => { folderIcons.push(path); return null },
|
|
} as unknown as BetterSidebarService
|
|
|
|
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: 'memo-spec',
|
|
cwd: '/tmp',
|
|
expanded: [],
|
|
revealed: [],
|
|
onToggle: () => {},
|
|
onOpenFile: () => {},
|
|
onReferenceFile: () => {},
|
|
refreshTick: 0,
|
|
onUploadRequest: () => {},
|
|
busy: false,
|
|
service,
|
|
}))
|
|
await Promise.resolve()
|
|
await Promise.resolve()
|
|
})
|
|
return {
|
|
container,
|
|
unmount: () => { act(() => { root.unmount() }); container.remove() },
|
|
}
|
|
}
|
|
|
|
/** One tree row by its displayed name. */
|
|
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
|
|
}
|
|
|
|
function fireDragOver(el: Element): void {
|
|
const event = new Event('dragover', { bubbles: true, cancelable: true })
|
|
Object.defineProperty(event, 'dataTransfer', { value: { types: ['Files'], dropEffect: '' } })
|
|
act(() => { el.dispatchEvent(event) })
|
|
}
|
|
|
|
let harness: Harness
|
|
afterEach(() => {
|
|
harness.unmount()
|
|
document.body.innerHTML = ''
|
|
fileIcons.length = 0
|
|
folderIcons.length = 0
|
|
})
|
|
|
|
describe('FileTree row memoization', () => {
|
|
it('re-renders only the toggled row on a Ctrl+click selection change', async () => {
|
|
harness = await mountTree()
|
|
fileIcons.length = 0
|
|
act(() => {
|
|
rowByName(harness.container, 'a.ts')
|
|
.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true, ctrlKey: true }))
|
|
})
|
|
// The other three file rows kept their last render (memo bailed out).
|
|
expect(fileIcons).toEqual(['/tmp/a.ts'])
|
|
})
|
|
|
|
it('re-renders only the hovered directory row while a drag retargets', async () => {
|
|
harness = await mountTree()
|
|
folderIcons.length = 0
|
|
fileIcons.length = 0
|
|
fireDragOver(rowByName(harness.container, 'sub'))
|
|
// Every parent render resolves the ROOT row's icon; the memoized dir row
|
|
// resolves its own exactly once (its unhovered render was cached), and
|
|
// the file rows (whose drop target is the untouched /tmp) never re-render.
|
|
expect(folderIcons.filter(path => path === '/tmp/sub')).toEqual(['/tmp/sub'])
|
|
expect(fileIcons).toEqual([])
|
|
})
|
|
})
|