* feat(injection): 统一面板宿主——固定含块层 + 挂载自检降级 + body 锚点守卫 - Sidebar 渲染根包 [data-dsh-panel-host](fixed inset-0 pointer-events:none) - 面板/开关簇由 fixed 改 absolute(层内视口坐标等价),免疫套壳中间层 transform 劫持 - 挂载后一次性几何自检:页面级 transform 时降级 absolute + rAF 视口同步 - MutationObserver(body childList)守卫锚点被宿主清空时重挂 * perf(injection): 几何写路径统一为 writeGeometry + 面板 layout 隔离 - 拖拽帧与打开态共用单一推挤写入器(--dsh-sidebar-width/height) - .panel/.bottomPanel contain: layout style——内部重排不外泄 - 拖拽期(body[data-dsh-sidebar-dragging])才挂 will-change: transform * perf(chunks): HMR 激活保留未变 chunk 的已解析 exports + ETag HEAD 重验证 - 新增 revalidateChunksOnReactivate():激活时 HEAD 每个已加载 chunk 对比 ETag, 未变保留内存缓存(跳过重注入/重执行),变更或不可达则 fail-open 重取 - 测试夹具与孤儿缓存条目不跨激活存活 - index.tsx 激活路径由 resetChunks() 改为 revalidateChunksOnReactivate() * fix(layout): 推挤锚点改 data 属性 + #root calc 宽度防桌面壳溢出 - nth-child(2) → #root [data-dsh-frame] > [data-pane="conversation"](实证同元素) - #root 宽度 calc(100% - var) 与 margin 同步过渡:web 视觉不变(实测 1140+300=1440 无溢出), Desktop 壳(#208)width:100% 的加性溢出根因消除 * feat(desktop): 桌面信号自动探测 + win32 顶栏 overlay 自动避让 + 键盘/safe-area 适配 - 新增 desktop-env.ts:解析 dsh-desktop-mode/platform URL 信号与 preload 标记 - win32 advanced 壳自动启用 titleBarCompat(32px overlay),手动 pref 仍可覆盖 - visualViewport 键盘 inset:底部面板/窄屏抽屉键盘弹起时上移 - 面板与开关簇 safe-area-inset 适配(env() 桌面端为 0) - 单测 7 例(含 URLSearchParams 前导 ? 剥除修复) * docs+e2e: 注入方案实施记录(路线B关闭、偏差记录、基线数据)+ 契约同步 + e2e 新断言 - 设计文档:路线 B 标记关闭、§8.1 改单 PR 步骤(含 commit 对照)、拖拽基线数据、实施偏差记录 - AGENTS.md §8:data-dsh-panel-host 含块层、推挤锚点契约(禁 nth-child)、桌面信号 - mount.e2e:data-dsh-panel-host 断言 + win32 advanced 桌面信号场景 * fix(cr): 响应 #232 CR 三条 findings - P1 降级同步:按未修正几何判定(跟踪自身补偿量),祖先 transform 消失才退出循环—— 修正后矩形不再被误判为无需修正(自清除缺陷) - P1 chunk 重验证成为 loadChunk 屏障:重验证挂起期间不提供缓存,杜绝 HMR 竞态陈旧 exports; 测试夹具加载不再被误记为生产加载 - P2 键盘 inset:innerHeight - (vv.height + vv.offsetTop),并监听 scroll(offsetTop 变化) - 新增屏障单测 1 例;设计文档偏差记录更新 * fix(chunks): 屏障 HEAD 加超时兜底 + resetChunks 清 revalidation - revalidateChunksOnReactivate 的 HEAD 与 recordEtag 均带 AbortSignal.timeout(5s):路由挂起时 fail-open(drop + 重取), 屏障不再可能无限期阻塞所有懒加载 chunk(CR #232 P1 修复的健壮性缺口) - resetChunks 同步清 revalidation:重验证挂起期间重置后, loadChunk 不再等待已丢弃状态的孤儿任务(finally 身份判断 no-op) - 单测 +2:HEAD 挂起超时 fail-open(fake AbortSignal.timeout 触发中止)、 resetChunks 清屏障后 loadChunk 立即放行 * fix(deps): align @deepseek-ai/* peers with DSH 0.1.0-rc.8 - peer/devDependencies: 13 个 @deepseek-ai/* 从 ^0.1.0-rc.7 升至 ^0.1.0-rc.8;删除随 rc.8 消失的 dsh-client-web-react / dsh-client-schema-form (无 rc.8 发布、rc.8 依赖树与壳 bundle 零引用、插件 src 零引用); cordis peer/devDep 同步升 ^4.0.0-rc.8 - 版本 0.13.1 -> 0.14.0(package.json / dsh.plugin.json / SIDEBAR_SERVICE_VERSION 三处同步) - CHUNK_EXTERNALS / CLIENT_EXTERNALS / CLIENT_REQUIRE_ALLOWED 三处镜像 同步删除两个死包(primitives/slots 仍是 rc.8 壳静态模块表种子,保留) - CI 挂载冒烟钉版 @deepseek-ai/dsh@0.1.0-rc.7 -> rc.8 - pnpm clean --lockfile 全量重解析:lockfile 内 @deepseek-ai/* rc.7 残留 清零(传递链同升 rc.8,杜绝 #206 式混用树);pnpm-workspace.yaml minimumReleaseAgeExclude 按 #207 模式整体换为 rc.8 列表 - 文档同步:README 安装说明、AGENTS.md CI 钉版、外部插件指南与设计文档 cordis 示例、issue 模板版本示例 * feat(prefs): editorExplorer 默认独立(关)——文件各自新开 tab - SIDEBAR_PREFS_DEFAULTS 与 host PrefsSchema 的 editorExplorer 默认 true -> false:新会话树点击/打开文件按 path 新开 tab,无路径窗口即 纯资源管理器;合并模式保留为可选手动开启(持久化过的用户设置不受影响) - 测试同步:prefs.spec 默认断言翻转、plugin-shape.spec 与 smoke.spec 默认对象翻转;editor-host 合并模式用例显式开启 editorExplorer(split 用例本已显式);side-card-section-rows 的 select 行用例固定选中 Merged - e2e 重写:mount.e2e 文件打开流程从 in-place 断言改为独立模式 (新开 hello.txt tab、Files home tab 保留),文件头注释同步 - 契约文档同步:AGENTS.md §3.4 editor 行默认描述翻转 + CI 冒烟描述、 README/README_EN v0.13.0 特性描述 + v0.14.0 changelog * fix(client): rc.8 模块系统经 ctx.modules 注入 + chunk 副本全局共享 rc.8 不再暴露 window.__DSH_MODULES__ 页面全局(改由 ctx.modules 服务 提供),chunk 外部依赖解析全面失效(terminal/editor/mermaid 全部 "client module system unavailable")。修复: - src/client/index.tsx: inject 增加 'modules'(Cordis 服务访问守卫, 此前直接读 ctx.modules 抛 "cannot get property modules without inject");apply() 激活时 setChunkModuleSystem(ctx.modules) - package.json dsh.client.inject 增加 @deepseek-ai/dsh-client-modules - chunk-loader: 注入写插件自有页面全局 __dshSidebarModuleSystem__—— 懒加载 chunk bundle 各自内联一份 loader(rc.7 靠官方全局回退工作, rc.8 全局消失后副本注入变量恒空);moduleSystem() 按 注入变量 → 插件全局 → rc.7 全局回退解析 - context-types: Context 镜像补 modules 服务声明(client half) - e2e: assertNoCrash 失败时输出错误条文本;独立模式断言修正 (Files 数量按存在性、mermaid 流程先切回 Files、md 预览 locator 去掉 重复的 [data-dsh-better-sidebar] 嵌套) 验证:typecheck / 639 测试全绿;本地 rc.8 CLI + Chromium 挂载冒烟 3/3 通过(drag-layout、mount 深扫含 editor/mermaid chunk、桌面信号) * feat(settings): 终端 shell/shellArgs 可在设置页配置(bash 管理) - SidebarPrefs 新增 terminalShell / terminalShellArgs(默认空 = 保持 yaml config.shell → $SHELL / 登录 shell / powershell.exe 的既有解析) - 终端卡齿轮二级页面新增两行 text 配置(与字体行同列) - host 侧生效链路:UI 终端 WS 打开与 agent terminal_create 均读取 设置文档覆盖(ptyManager.open / AgentPtyRegistry.create 增加可选 shell 覆盖参数;shellOverridesOf 解析设置文档);设置页写入即时 影响之后打开的终端(既有 pty 保持原 shell) - locales zh/en 文案;parsePrefs 校验新字段;测试同步 * feat(settings): 侧边卡片设置页加 DSH-better-sidebar 版本徽标 - 设置页 intro 下新增身份徽标:名称 + v{service.version}(服务实例 版本,与 package.json 由 tests/service.spec.ts 保持同步) - token 驱动样式(--dsw-alias-*),名称/版本 pill 布局 * fix(drag): 快速拖动提交最后位置 + HMR 后中心列重定位兜底 快速释放(浏览器合并/丢失 pointermove 突发,超快速 flick 甚至可能 完全无 move)时的回退问题: - pointerup 优先采用最后一次已知拖动值(rAF pending),而非 up 位置 (事件合并时可能等于按下位置) - pointercancel / lostpointercapture 中断时同样提交最后已知位置; 无 move 时用中断事件自身的坐标计算(clamp 后提交)——只有真正 未产生位移的拖动才回滚 - commitDrag 统一 flush + 同值提交 + 立即重测中心列(消除提交后 React 用旧 centerRect 覆盖底栏 right 的中间帧) HMR 重激活后底栏空白(输入框被推挤上移、强制刷新恢复): - 根因:新组件实例重跑 locate 时壳的 centerCol 尚未就绪,而壳重建 复用 #root 子节点(childList 观察器不触发)→ centerRect 卡 {0,0} → 底栏 visibility:hidden 永久空白 - 修复:额外观察 <html> 的 style 属性(layout push 写回 --dsh-sidebar-* 时重定位重测);底栏打开时 effect 重跑 locate/measure 兜底 - 底栏未测量时由「不渲染」改为 visibility:hidden(渲染链不被几何 门控,jsdom 测试不回归) e2e 新增:极快拖动(单 move 立即 up)提交拖动位置、稳定后不回退 * feat(plugins): 添加插件目录支持搜索/分组/独立滚动(多插件场景) - PluginListBody 顶部加实时搜索框(按名称/id/描述过滤,空结果提示) - PluginEntry 增加可选 category 分组字段(i18n 友好),目录条目按组 渲染(未分类条目保持平铺);数量徽标跟随过滤结果 - 条目列表 max-height + overflow-y 独立滚动,插件多时弹窗不再无限 增长;渲染数量由搜索天然收敛 - locales zh/en(搜索占位、无匹配);测试文件固定英文环境 (vitest 4.1.11+ jsdom 跟随系统 locale,本机 zh-CN 导致英文文案 断言漂移) * chore(deps): 适配 pnpm 11.8 supply-chain 校验(exclude 通配) pnpm 11.8.0 起对 lockfile 既有条目强制 minimumReleaseAge 校验, 且精确 exclude(@scope/pkg@version)对带 peer 依赖后缀的解析条目 匹配失效(44 条误报违规,CI 全红)。@deepseek-ai/* scope 为官方 可信 scope,minimumReleaseAgeExclude 改为 '@deepseek-ai/*' 通配 (保留 rc.1 历史与 stable 条目);通配经实测通过全部 504 条校验。 * docs: v0.14.0 changelog 补全(自 v0.13.1 全部更改 + 特别声明 rc.8 适配) 新增条目:终端 shell/shellArgs 设置页配置、设置页版本徽标、 添加插件目录搜索/分组/滚动、rc.8 模块系统迁移、拖拽健壮性修复; 版本说明块醒目声明本版适配 DSH 0.1.0-rc.8(rc.7 及更早无法解析依赖)
424 lines
17 KiB
TypeScript
424 lines
17 KiB
TypeScript
/**
|
|
* Chunk loader tests: the lazy chunk machinery (src/client/chunk-loader.ts).
|
|
* Pins the caching contract that makes the lazy mechanism correct:
|
|
* - one in-flight promise per chunk (concurrent opens share it),
|
|
* - a failed load clears the cache so the next call retries (the script
|
|
* re-executes and overwrites its global registry slot — assignments are
|
|
* idempotent, no duplicate-registration class of errors),
|
|
* - externals resolve through the module system's seed branch (the stable,
|
|
* version-independent part), once per page,
|
|
* - resetChunks drops the cache and the externals memo (HMR).
|
|
* The production path runs against a fake `window.__DSH_MODULES__` and a
|
|
* stub script loader that simulates the executed chunk script by assigning
|
|
* the plugin-owned global factory registry.
|
|
*/
|
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import './browser-globals.ts'
|
|
import {
|
|
CHUNK_EXTERNALS,
|
|
loadChunk,
|
|
registerChunkForTests,
|
|
revalidateChunksOnReactivate,
|
|
resetChunks,
|
|
setChunkModuleSystem,
|
|
setChunkScriptLoaderForTests,
|
|
} from '../src/client/chunk-loader.ts'
|
|
import type { ChunkExports } from '../src/client/chunk-loader.ts'
|
|
|
|
interface FakeModuleSystem {
|
|
import: (specifier: string) => Promise<unknown>
|
|
}
|
|
|
|
function installModuleSystem(): FakeModuleSystem {
|
|
const fake: FakeModuleSystem = {
|
|
import: vi.fn(async (specifier: string) => ({ seed: specifier })),
|
|
}
|
|
;(globalThis as Record<string, unknown>).__DSH_MODULES__ = fake
|
|
return fake
|
|
}
|
|
|
|
function removeModuleSystem(): void {
|
|
delete (globalThis as Record<string, unknown>).__DSH_MODULES__
|
|
}
|
|
|
|
/** The global registry the chunk scripts populate (mirror of chunk-loader). */
|
|
function registry(): Record<string, unknown> {
|
|
return (globalThis as { __dshChunks__?: Record<string, unknown> }).__dshChunks__ ?? {}
|
|
}
|
|
|
|
/** Simulate a chunk script executing: it assigns its factory to the registry. */
|
|
function simulateScript(name: string, factory: (require: (spec: string) => unknown) => ChunkExports): void {
|
|
const g = globalThis as { __dshChunks__?: Record<string, unknown> }
|
|
g.__dshChunks__ = g.__dshChunks__ ?? {}
|
|
g.__dshChunks__[name] = factory
|
|
}
|
|
|
|
beforeEach(() => {
|
|
removeModuleSystem()
|
|
setChunkModuleSystem(undefined)
|
|
delete (globalThis as Record<string, unknown>).__dshChunks__
|
|
resetChunks()
|
|
setChunkScriptLoaderForTests(null)
|
|
})
|
|
|
|
describe('test-registry path (vitest / jsdom-less environments)', () => {
|
|
it('returns the registered chunk exports, loading once even for concurrent callers', async () => {
|
|
let calls = 0
|
|
registerChunkForTests('editor', async () => {
|
|
calls += 1
|
|
return { TextEditor: 'text-editor' }
|
|
})
|
|
const [a, b, c] = await Promise.all([loadChunk('editor'), loadChunk('editor'), loadChunk('editor')])
|
|
expect(a).toEqual({ TextEditor: 'text-editor' })
|
|
expect(b).toBe(a)
|
|
expect(c).toBe(a)
|
|
expect(calls).toBe(1)
|
|
// Memoized after resolution too.
|
|
expect(await loadChunk('editor')).toBe(a)
|
|
expect(calls).toBe(1)
|
|
})
|
|
|
|
it('a failed load clears the cache so the next call retries', async () => {
|
|
let calls = 0
|
|
registerChunkForTests('terminal', async () => {
|
|
calls += 1
|
|
if (calls === 1) throw new Error('boom')
|
|
return { TerminalView: 'terminal-view' }
|
|
})
|
|
await expect(loadChunk('terminal')).rejects.toThrow('boom')
|
|
await expect(loadChunk('terminal')).resolves.toEqual({ TerminalView: 'terminal-view' })
|
|
expect(calls).toBe(2)
|
|
})
|
|
})
|
|
|
|
describe('production path (script injection + global registry + externals require)', () => {
|
|
it('resolves externals through an injected ctx.modules system (rc.8 — no page global)', async () => {
|
|
const modules = installModuleSystem()
|
|
// rc.8 drops window.__DSH_MODULES__; the client half injects ctx.modules.
|
|
removeModuleSystem()
|
|
setChunkModuleSystem(modules)
|
|
const loaded: string[] = []
|
|
setChunkScriptLoaderForTests(async (src) => {
|
|
loaded.push(src)
|
|
simulateScript('editor', (require) => ({ TextEditor: `view:${String(require('react'))}` }))
|
|
})
|
|
const exports = await loadChunk('editor')
|
|
expect(loaded).toEqual(['/sidebar/bundle/editor.js'])
|
|
expect(exports).toEqual({ TextEditor: 'view:[object Object]' })
|
|
expect(modules.import).toHaveBeenCalledTimes(CHUNK_EXTERNALS.length)
|
|
// The injection also lands on a plugin-owned global so chunk-bundle
|
|
// copies of this loader (which inline their own module instance and
|
|
// never run apply()) can resolve externals too — rc.8 has no shell
|
|
// page global anymore.
|
|
expect((globalThis as Record<string, unknown>).__dshSidebarModuleSystem__).toBe(modules)
|
|
// The injection survives resetChunks (shell state, not chunk state).
|
|
resetChunks()
|
|
setChunkScriptLoaderForTests(async () => {
|
|
simulateScript('editor', () => ({ TextEditor: 'editor-view' }))
|
|
})
|
|
await loadChunk('editor')
|
|
expect(modules.import).toHaveBeenCalledTimes(CHUNK_EXTERNALS.length * 2)
|
|
})
|
|
|
|
it('injects the chunk script, then materializes the factory with externals from the module table', async () => {
|
|
const modules = installModuleSystem()
|
|
const loaded: string[] = []
|
|
setChunkScriptLoaderForTests(async (src) => {
|
|
loaded.push(src)
|
|
simulateScript('editor', (require) => ({ TextEditor: `view:${String(require('react'))}` }))
|
|
})
|
|
const exports = await loadChunk('editor')
|
|
expect(loaded).toEqual(['/sidebar/bundle/editor.js'])
|
|
expect(exports).toEqual({ TextEditor: 'view:[object Object]' })
|
|
// Externals resolved through the module system's seed branch, once.
|
|
expect(modules.import).toHaveBeenCalledTimes(CHUNK_EXTERNALS.length)
|
|
// Memoized: no second script injection, no second externals resolution.
|
|
await loadChunk('editor')
|
|
expect(loaded).toHaveLength(1)
|
|
expect(modules.import).toHaveBeenCalledTimes(CHUNK_EXTERNALS.length)
|
|
})
|
|
|
|
it('resolves the externals table once across chunks', async () => {
|
|
const modules = installModuleSystem()
|
|
const seen: string[] = []
|
|
setChunkScriptLoaderForTests(async (src) => {
|
|
seen.push(src)
|
|
simulateScript(src.endsWith('editor.js') ? 'editor' : 'terminal', () => ({}))
|
|
})
|
|
await loadChunk('terminal')
|
|
await loadChunk('editor')
|
|
expect(seen).toEqual(['/sidebar/bundle/terminal.js', '/sidebar/bundle/editor.js'])
|
|
expect(modules.import).toHaveBeenCalledTimes(CHUNK_EXTERNALS.length)
|
|
})
|
|
|
|
it('a chunk requiring an unresolvable externals spec fails loudly', async () => {
|
|
installModuleSystem()
|
|
setChunkScriptLoaderForTests(async () => {
|
|
simulateScript('editor', (require) => { require('not-in-the-table'); return {} })
|
|
})
|
|
await expect(loadChunk('editor')).rejects.toThrow('missed the module table')
|
|
})
|
|
|
|
it('a script load failure rejects without materializing', async () => {
|
|
const modules = installModuleSystem()
|
|
setChunkScriptLoaderForTests(async () => { throw new Error('script 404') })
|
|
await expect(loadChunk('terminal')).rejects.toThrow('script 404')
|
|
expect(modules.import).not.toHaveBeenCalled()
|
|
// Cache cleared: the retry re-attempts the script load.
|
|
setChunkScriptLoaderForTests(async () => { simulateScript('terminal', () => ({ TerminalView: 'ok' })) })
|
|
await expect(loadChunk('terminal')).resolves.toEqual({ TerminalView: 'ok' })
|
|
})
|
|
|
|
it('a script that ran but registered no factory fails with a clear error', async () => {
|
|
installModuleSystem()
|
|
setChunkScriptLoaderForTests(async () => { /* executes but assigns nothing */ })
|
|
await expect(loadChunk('editor')).rejects.toThrow('did not register its factory')
|
|
})
|
|
|
|
it('a materialization failure clears the cache; the retry re-executes cleanly (idempotent slot assignment)', async () => {
|
|
const modules = installModuleSystem()
|
|
let calls = 0
|
|
setChunkScriptLoaderForTests(async () => {
|
|
calls += 1
|
|
simulateScript('editor', () => {
|
|
if (calls === 1) throw new Error('materialize boom')
|
|
return { TextEditor: 'text-editor' }
|
|
})
|
|
})
|
|
await expect(loadChunk('editor')).rejects.toThrow('materialize boom')
|
|
// Retry: script re-injected, slot overwritten, materialization succeeds.
|
|
await expect(loadChunk('editor')).resolves.toEqual({ TextEditor: 'text-editor' })
|
|
expect(calls).toBe(2)
|
|
expect(modules.import).toHaveBeenCalled()
|
|
})
|
|
|
|
it('fails loudly when no module system is installed (before touching the network)', async () => {
|
|
const loaded: string[] = []
|
|
setChunkScriptLoaderForTests(async (src) => { loaded.push(src) })
|
|
await expect(loadChunk('editor')).rejects.toThrow('client module system unavailable')
|
|
expect(loaded).toEqual([])
|
|
})
|
|
|
|
it('resetChunks drops the cache and the externals memo (HMR re-activation)', async () => {
|
|
const modules = installModuleSystem()
|
|
let calls = 0
|
|
setChunkScriptLoaderForTests(async () => {
|
|
calls += 1
|
|
simulateScript('editor', () => ({ TextEditor: 'editor-view' }))
|
|
})
|
|
await loadChunk('editor')
|
|
expect(calls).toBe(1)
|
|
expect(modules.import).toHaveBeenCalledTimes(CHUNK_EXTERNALS.length)
|
|
resetChunks()
|
|
// Cache dropped: the next open re-fetches and re-executes; the externals
|
|
// memo is rebuilt (fresh module-table resolution).
|
|
await loadChunk('editor')
|
|
expect(calls).toBe(2)
|
|
expect(modules.import).toHaveBeenCalledTimes(CHUNK_EXTERNALS.length * 2)
|
|
})
|
|
|
|
it('resetChunks is a safe no-op without a module system', () => {
|
|
resetChunks()
|
|
expect(() => resetChunks()).not.toThrow()
|
|
})
|
|
})
|
|
|
|
describe('revalidateChunksOnReactivate (HMR re-activation keeps unchanged chunks)', () => {
|
|
/** Stub the bundle route's HEAD endpoint with per-name ETags (Error = unreachable). */
|
|
function stubBundleHead(etagFor: (name: string) => string | null | Error): void {
|
|
vi.stubGlobal('fetch', vi.fn(async (input: unknown) => {
|
|
const url = String(input)
|
|
const name = url.endsWith('terminal.js') ? 'terminal' : 'editor'
|
|
const etag = etagFor(name)
|
|
if (etag instanceof Error) throw etag
|
|
return {
|
|
headers: { get: (key: string) => (key.toLowerCase() === 'etag' ? etag : null) },
|
|
} as unknown as Response
|
|
}))
|
|
}
|
|
|
|
/** Let the fire-and-forget ETag recorder (recordEtag) settle. */
|
|
const settleEtag = (): Promise<void> => new Promise((resolve) => setTimeout(resolve, 5))
|
|
|
|
it('keeps the resolved exports of an unchanged chunk — no re-inject / re-execute', async () => {
|
|
installModuleSystem()
|
|
let scriptCalls = 0
|
|
setChunkScriptLoaderForTests(async () => {
|
|
scriptCalls += 1
|
|
simulateScript('editor', () => ({ TextEditor: 'editor-view' }))
|
|
})
|
|
stubBundleHead(() => '"v1"')
|
|
const first = await loadChunk('editor')
|
|
expect(scriptCalls).toBe(1)
|
|
await settleEtag()
|
|
await revalidateChunksOnReactivate()
|
|
const second = await loadChunk('editor')
|
|
expect(second).toBe(first)
|
|
expect(scriptCalls).toBe(1)
|
|
})
|
|
|
|
it('drops a chunk whose ETag changed on disk — the next open re-injects and re-executes', async () => {
|
|
installModuleSystem()
|
|
let scriptCalls = 0
|
|
setChunkScriptLoaderForTests(async () => {
|
|
scriptCalls += 1
|
|
simulateScript('editor', () => ({ TextEditor: `editor-view:${scriptCalls}` }))
|
|
})
|
|
let etag = '"v1"'
|
|
stubBundleHead(() => etag)
|
|
const first = await loadChunk('editor')
|
|
await settleEtag()
|
|
etag = '"v2"'
|
|
await revalidateChunksOnReactivate()
|
|
const second = await loadChunk('editor')
|
|
expect(second).not.toBe(first)
|
|
expect(scriptCalls).toBe(2)
|
|
})
|
|
|
|
it('fails open when revalidation cannot reach the bundle route', async () => {
|
|
installModuleSystem()
|
|
let scriptCalls = 0
|
|
setChunkScriptLoaderForTests(async () => {
|
|
scriptCalls += 1
|
|
simulateScript('terminal', () => ({ TerminalView: 'tv' }))
|
|
})
|
|
stubBundleHead(() => new Error('HEAD unreachable'))
|
|
await loadChunk('terminal')
|
|
await settleEtag()
|
|
await revalidateChunksOnReactivate()
|
|
await loadChunk('terminal')
|
|
expect(scriptCalls).toBe(2)
|
|
})
|
|
|
|
it('loadChunk is a barrier: a pending revalidation never serves stale exports (CR P1)', async () => {
|
|
installModuleSystem()
|
|
let scriptCalls = 0
|
|
setChunkScriptLoaderForTests(async () => {
|
|
scriptCalls += 1
|
|
simulateScript('editor', () => ({ TextEditor: `editor-view:${scriptCalls}` }))
|
|
})
|
|
// First load: etag "v1", recorded after settlement.
|
|
let etag = '"v1"'
|
|
stubBundleHead(() => etag)
|
|
const first = await loadChunk('editor')
|
|
await settleEtag()
|
|
expect(scriptCalls).toBe(1)
|
|
// The chunk changed on disk; the revalidation HEAD is gated (pending).
|
|
etag = '"v2"'
|
|
let release: (() => void) | undefined
|
|
const gate = new Promise<void>((resolve) => { release = resolve })
|
|
vi.stubGlobal('fetch', vi.fn(async () => {
|
|
await gate
|
|
return { headers: { get: () => etag } } as unknown as Response
|
|
}))
|
|
const revalidating = revalidateChunksOnReactivate()
|
|
// A lazy open DURING the pending revalidation must NOT get the old cache.
|
|
let resolved = false
|
|
let pendingLoad: Promise<ChunkExports> | null = null
|
|
pendingLoad = loadChunk('editor').then((exports) => { resolved = true; return exports })
|
|
await new Promise((resolve) => setTimeout(resolve, 5))
|
|
expect(resolved, 'loadChunk must await the pending revalidation').toBe(false)
|
|
// Release the HEAD; the barrier lifts and the load re-injects fresh exports.
|
|
release?.()
|
|
await revalidating
|
|
const after = await pendingLoad
|
|
expect(after).not.toBe(first)
|
|
expect(scriptCalls).toBe(2)
|
|
})
|
|
|
|
it('a HEAD that never answers is bounded by a timeout signal and fails open (barrier cannot wedge loads forever)', async () => {
|
|
installModuleSystem()
|
|
let scriptCalls = 0
|
|
setChunkScriptLoaderForTests(async () => {
|
|
scriptCalls += 1
|
|
simulateScript('editor', () => ({ TextEditor: `editor-view:${scriptCalls}` }))
|
|
})
|
|
// First load settles an ETag under a healthy HEAD route.
|
|
stubBundleHead(() => '"v1"')
|
|
const first = await loadChunk('editor')
|
|
await settleEtag()
|
|
expect(scriptCalls).toBe(1)
|
|
// The revalidation HEAD now hangs. The loader must hand the fetch a
|
|
// timeout signal and, when it fires, fail open (drop + re-fetch) — the
|
|
// barrier must never block lazy loads indefinitely.
|
|
const controller = new AbortController()
|
|
const timeoutSpy = vi.spyOn(AbortSignal, 'timeout').mockReturnValue(controller.signal)
|
|
vi.stubGlobal('fetch', vi.fn(async (_input, init?: RequestInit) => {
|
|
await new Promise<void>((_resolve, reject) => {
|
|
init?.signal?.addEventListener('abort', () => reject(new DOMException('timed out', 'AbortError')))
|
|
})
|
|
}))
|
|
const revalidating = revalidateChunksOnReactivate()
|
|
let resolved = false
|
|
const pendingLoad = loadChunk('editor').then((exports) => { resolved = true; return exports })
|
|
await new Promise((resolve) => setTimeout(resolve, 5))
|
|
expect(resolved, 'loadChunk must await the pending revalidation').toBe(false)
|
|
controller.abort() // the timeout fires
|
|
await revalidating
|
|
const after = await pendingLoad
|
|
expect(after).not.toBe(first)
|
|
expect(scriptCalls).toBe(2)
|
|
expect(timeoutSpy).toHaveBeenCalledWith(expect.any(Number))
|
|
timeoutSpy.mockRestore()
|
|
})
|
|
|
|
it('resetChunks clears a pending revalidation barrier (the next load does not wait on the orphaned task)', async () => {
|
|
installModuleSystem()
|
|
let scriptCalls = 0
|
|
setChunkScriptLoaderForTests(async () => {
|
|
scriptCalls += 1
|
|
simulateScript('editor', () => ({ TextEditor: `editor-view:${scriptCalls}` }))
|
|
})
|
|
let etag = '"v1"'
|
|
stubBundleHead(() => etag)
|
|
await loadChunk('editor')
|
|
await settleEtag()
|
|
// Gate the revalidation HEAD so the barrier stays pending.
|
|
let release: (() => void) | undefined
|
|
const gate = new Promise<void>((resolve) => { release = resolve })
|
|
vi.stubGlobal('fetch', vi.fn(async () => {
|
|
await gate
|
|
return { headers: { get: () => etag } } as unknown as Response
|
|
}))
|
|
const revalidating = revalidateChunksOnReactivate()
|
|
// resetChunks mid-revalidation: the barrier guarded only the state being
|
|
// dropped, so the next load must proceed without waiting for the HEAD.
|
|
resetChunks()
|
|
const after = await loadChunk('editor')
|
|
expect(after).toEqual({ TextEditor: 'editor-view:2' })
|
|
expect(scriptCalls).toBe(2)
|
|
// The orphaned task still settles; its identity-guarded finally no-ops.
|
|
// (Its sweep may later drop the freshly loaded entry — chunkEtags was
|
|
// cleared by resetChunks, so the old ETag no longer matches. That is the
|
|
// fail-safe direction: never serve stale, at worst one redundant fetch.)
|
|
release?.()
|
|
await revalidating
|
|
})
|
|
|
|
it('clears test-registry fixtures on re-activation (per-test stubs never leak)', async () => {
|
|
let testCalls = 0
|
|
registerChunkForTests('editor', async () => { testCalls += 1; return { TextEditor: 'test-view' } })
|
|
await loadChunk('editor')
|
|
expect(testCalls).toBe(1)
|
|
await revalidateChunksOnReactivate()
|
|
// Test fixture gone: the production path runs and fails fast (no module system).
|
|
await expect(loadChunk('editor')).rejects.toThrow('client module system unavailable')
|
|
expect(testCalls).toBe(1)
|
|
})
|
|
})
|
|
|
|
describe('externals contract', () => {
|
|
it('the loader resolves exactly the platform externals the chunk builds keep external', () => {
|
|
expect(CHUNK_EXTERNALS).toEqual([
|
|
'react',
|
|
'react/jsx-runtime',
|
|
'react-dom',
|
|
'react-dom/client',
|
|
'cordis',
|
|
'@deepseek-ai/dsh-client-ui-slots',
|
|
'@deepseek-ai/dsh-client-ui-primitives',
|
|
'@deepseek-ai/dsh-client-runtime/client',
|
|
])
|
|
})
|
|
})
|