* 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 及更早无法解析依赖)
352 lines
15 KiB
TypeScript
352 lines
15 KiB
TypeScript
/**
|
|
* Lazy chunk loader for the client bundle. The heavy preview/terminal
|
|
* libraries (CodeMirror, xterm — the editor/terminal stacks, several MB)
|
|
* live in separate build-time bundles (`lib/client-<name>.js`) fetched only
|
|
* on first use of the feature that needs them, so startup downloads/parses
|
|
* only the ~1MB core bundle. (The office stack — Univer / docx-preview /
|
|
* pptx-renderer — is no longer bundled here: Office previews moved to the
|
|
* recommended office plugin, see plugins-viewers.ts.)
|
|
*
|
|
* How a chunk script works (see tsdown.config.ts chunkBundle):
|
|
*
|
|
* globalThis.__dshChunks__ = globalThis.__dshChunks__ || {};
|
|
* globalThis.__dshChunks__["terminal"] = (require) => { ...exports };
|
|
*
|
|
* The script registers its factory on a plugin-owned global registry (NOT
|
|
* through window.__ModuleLoader__.load — the module loader's import() only
|
|
* resolves seed words, shell-own modules, registered factories, and boot
|
|
* graph rows; a chunk id is none of those, so resolution would be version-
|
|
* dependent). Materialization is plugin-owned:
|
|
*
|
|
* 1. inject <script src="/sidebar/bundle/<name>.js"> (classic same-origin
|
|
* script; the official /plugins/<id>/client.js route cannot serve
|
|
* arbitrary file names, so the plugin's own host route serves the chunks),
|
|
* 2. read the factory from the global registry,
|
|
* 3. call it with a require that resolves the platform externals through
|
|
* `__DSH_MODULES__.import(spec)` — the seed-word branch, the one part of
|
|
* the module system that is stable across versions.
|
|
*
|
|
* Caching contract (three layers, each with a failure path):
|
|
* - In-memory: one in-flight promise per chunk, memoized until
|
|
* {@link resetChunks}; a failed load removes its entry so the next call
|
|
* retries from scratch. HMR re-activation keeps the resolved exports of
|
|
* unchanged chunks (ETag revalidation via
|
|
* {@link revalidateChunksOnReactivate}) — the next lazy open skips the
|
|
* re-inject / re-execute.
|
|
* - Script execution: each re-execution overwrites the global registry slot
|
|
* (assignment, never registration) — no "duplicate factory registration"
|
|
* class of errors; a failed materialization clears the cache so the retry
|
|
* re-injects and re-executes.
|
|
* - HTTP: the bundle route revalidates every request (`cache-control:
|
|
* no-cache` + ETag, 304 when unchanged), so page refreshes and HMR
|
|
* re-activations never re-download a multi-MB chunk that did not change.
|
|
*
|
|
* HMR: each plugin activation calls {@link revalidateChunksOnReactivate},
|
|
* which HEADs every loaded chunk against the bundle route and keeps the
|
|
* in-memory cache for the ones whose ETag is unchanged (a hot-reloaded core
|
|
* bundle therefore does not re-execute multi-MB chunk scripts). Chunk-only
|
|
* source edits still need a manual page refresh (the HMR poll watches only
|
|
* client.js); an edit that does land while a core HMR happens is caught by
|
|
* the ETag comparison on the next activation.
|
|
*/
|
|
export type ChunkName = 'terminal' | 'editor' | 'mermaid'
|
|
|
|
/** The module exports a chunk factory provides (namespace-ish record). */
|
|
export type ChunkExports = Record<string, unknown>
|
|
|
|
/** A chunk factory: (require) => exports (the chunk's CJS closure shape). */
|
|
type ChunkFactory = (require: (spec: string) => unknown) => ChunkExports
|
|
|
|
/**
|
|
* The platform externals a chunk bundle may require (mirror of
|
|
* CLIENT_EXTERNALS in tsdown.config.ts — the chunk builds keep these
|
|
* external and the loader resolves them here). A superset is safe: the
|
|
* require only answers what the chunk actually asks for. The shell's static
|
|
* module table seeds React, Cordis, and the UI libraries (primitives/slots);
|
|
* `dsh-client-runtime/client` normalizes onto the runtime package row
|
|
* (stripClientSuffix). dsh-client-web-react / dsh-client-schema-form were
|
|
* dropped in DSH 0.1.0-rc.8 (no rc.8 publish, nothing requires them) — the
|
|
* chunks never asked for them, so they no longer belong here.
|
|
*/
|
|
export const CHUNK_EXTERNALS: readonly string[] = [
|
|
'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',
|
|
]
|
|
|
|
/** Chunk script endpoint served by the plugin host half (src/bundle-route.ts). */
|
|
const CHUNK_URL = (name: ChunkName): string => `/sidebar/bundle/${name}.js`
|
|
|
|
/** Bound on the revalidation HEAD round-trip. A timeout fails open (drop +
|
|
* re-fetch on the next open) so a stuck bundle route can never wedge lazy
|
|
* chunk loads behind the revalidation barrier. */
|
|
const CHUNK_REVALIDATE_TIMEOUT_MS = 5_000
|
|
|
|
/**
|
|
* The client module system surface this loader needs to resolve externals.
|
|
* DSH 0.1.0-rc.8 provides it as the `ctx.modules` service (no page global
|
|
* anymore); the plugin injects it at activation via
|
|
* {@link setChunkModuleSystem}. The rc.7-era `window.__DSH_MODULES__` global
|
|
* remains as a fallback so older hosts and the test harness keep working.
|
|
*/
|
|
export interface ChunkModuleSystem {
|
|
import(specifier: string): Promise<unknown>
|
|
}
|
|
|
|
/** The module system injected by the client half at activation (rc.8+). */
|
|
let injectedModuleSystem: ChunkModuleSystem | undefined
|
|
|
|
/**
|
|
* Plugin-owned page global carrying the injected module system across
|
|
* bundle copies: the lazy chunk bundles (client-editor.js etc.) inline their
|
|
* own chunk-loader instance, and rc.8 no longer exposes the shell module
|
|
* system as a page global — so the core bundle's injection must be visible
|
|
* to the chunk copies through a namespace of our own.
|
|
*/
|
|
const MODULE_SYSTEM_GLOBAL = '__dshSidebarModuleSystem__'
|
|
|
|
/**
|
|
* Inject the client module system the chunk externals resolve through.
|
|
* Called by the client half's apply() with `ctx.modules` (rc.8+); pass
|
|
* undefined to clear (tests). Survives {@link resetChunks} — the module
|
|
* system is shell state, not chunk state, and stays live across HMR.
|
|
*/
|
|
export function setChunkModuleSystem(system: ChunkModuleSystem | undefined): void {
|
|
injectedModuleSystem = system
|
|
const g = globalThis as Record<string, unknown>
|
|
if (system === undefined) delete g[MODULE_SYSTEM_GLOBAL]
|
|
else g[MODULE_SYSTEM_GLOBAL] = system
|
|
}
|
|
|
|
/** Resolve the shell-installed module system (injected, then the plugin
|
|
* global shared with chunk-bundle copies, then the rc.7 page global). */
|
|
function moduleSystem(): ChunkModuleSystem | undefined {
|
|
const g = globalThis as Record<string, unknown>
|
|
return injectedModuleSystem
|
|
?? g[MODULE_SYSTEM_GLOBAL] as ChunkModuleSystem | undefined
|
|
?? (g as { __DSH_MODULES__?: ChunkModuleSystem }).__DSH_MODULES__
|
|
}
|
|
|
|
/** The plugin-owned chunk factory registry the chunk scripts populate. */
|
|
interface ChunkRegistry {
|
|
[name: string]: ChunkFactory | undefined
|
|
}
|
|
|
|
function chunkRegistry(): ChunkRegistry {
|
|
const g = globalThis as { __dshChunks__?: ChunkRegistry }
|
|
return g.__dshChunks__ ??= {}
|
|
}
|
|
|
|
/** Script-load hook; tests replace it with a stub (the default needs a real DOM + network). */
|
|
export type ChunkScriptLoader = (src: string) => Promise<void>
|
|
|
|
const defaultScriptLoader: ChunkScriptLoader = (src) => new Promise((resolve, reject) => {
|
|
const el = document.createElement('script')
|
|
el.async = true
|
|
el.src = src
|
|
el.addEventListener('load', () => {
|
|
el.remove()
|
|
resolve()
|
|
}, { once: true })
|
|
el.addEventListener('error', () => {
|
|
el.remove()
|
|
reject(new Error(`[dsh-better-sidebar] chunk script ${src} failed to load`))
|
|
}, { once: true })
|
|
document.head.append(el)
|
|
})
|
|
|
|
let scriptLoader: ChunkScriptLoader = defaultScriptLoader
|
|
|
|
/** Test hook: replace the chunk-script loader (pass null to restore the default). */
|
|
export function setChunkScriptLoaderForTests(loader: ChunkScriptLoader | null): void {
|
|
scriptLoader = loader ?? defaultScriptLoader
|
|
}
|
|
|
|
/** Test/dev hook: resolve a chunk without fetching a script (e.g. vitest). */
|
|
const testLoaders = new Map<ChunkName, () => Promise<ChunkExports>>()
|
|
export function registerChunkForTests(name: ChunkName, loader: () => Promise<ChunkExports>): void {
|
|
testLoaders.set(name, loader)
|
|
}
|
|
|
|
/** Memoized externals require, resolved once per page from the seed table. */
|
|
let externalsRequire: ((spec: string) => unknown) | undefined
|
|
|
|
async function buildExternalsRequire(modules: ChunkModuleSystem): Promise<(spec: string) => unknown> {
|
|
if (externalsRequire !== undefined) return externalsRequire
|
|
// Per-spec tolerance: a spec the running DSH version cannot resolve (e.g.
|
|
// the runtime/client exemption row) stays unresolved until a chunk
|
|
// actually requires it — only then it is a loud error.
|
|
const entries = await Promise.all(CHUNK_EXTERNALS.map(async (spec) => {
|
|
try {
|
|
return [spec, await modules.import(spec)] as const
|
|
} catch {
|
|
return [spec, undefined] as const
|
|
}
|
|
}))
|
|
const table = new Map<string, unknown>(entries)
|
|
externalsRequire = (spec: string): unknown => {
|
|
if (!table.has(spec)) {
|
|
// Single quotes: the bundle-consistency scan regexes for require("...")
|
|
// lexical calls — a double-quoted literal here would trip it.
|
|
throw new Error(`[dsh-better-sidebar] chunk require('${spec}') missed the module table`)
|
|
}
|
|
return table.get(spec)
|
|
}
|
|
return externalsRequire
|
|
}
|
|
|
|
/** In-flight/memoized chunk loads; a failure removes its entry so a retry re-fetches. */
|
|
const cache = new Map<ChunkName, Promise<ChunkExports>>()
|
|
|
|
/** Chunk names whose exports are currently cached (loaded successfully). */
|
|
const loadedChunks = new Set<ChunkName>()
|
|
|
|
/** ETags observed for loaded chunks (HEAD revalidation, see
|
|
* {@link revalidateChunksOnReactivate}). */
|
|
const chunkEtags = new Map<ChunkName, string>()
|
|
|
|
/** Pending revalidation barrier: while set, {@link loadChunk} awaits it
|
|
* before serving cache (see revalidateChunksOnReactivate). */
|
|
let revalidation: Promise<void> | null = null
|
|
|
|
/** Best-effort ETag capture for revalidation. The script tag itself exposes
|
|
* no response headers, so after a successful load we HEAD the bundle route
|
|
* once. Failures (including a stuck route — bounded by the timeout) are
|
|
* ignored — revalidation then fails open (re-fetch). */
|
|
async function recordEtag(name: ChunkName): Promise<void> {
|
|
try {
|
|
const res = await fetch(CHUNK_URL(name), {
|
|
method: 'HEAD',
|
|
cache: 'no-cache',
|
|
signal: AbortSignal.timeout(CHUNK_REVALIDATE_TIMEOUT_MS),
|
|
})
|
|
const etag = res.headers.get('etag')
|
|
if (etag !== null && etag !== '') chunkEtags.set(name, etag)
|
|
} catch {
|
|
chunkEtags.delete(name)
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Load (once) and materialize a lazy chunk, returning its module exports.
|
|
* Concurrent callers share one in-flight load; a failure clears the cache
|
|
* entry so the next call retries (the script re-executes and overwrites its
|
|
* global registry slot — assignments are idempotent).
|
|
* @param name - the chunk to load.
|
|
*/
|
|
export async function loadChunk(name: ChunkName): Promise<ChunkExports> {
|
|
// Barrier: never serve a cache entry that a pending revalidation is about
|
|
// to inspect — a stale chunk could otherwise render mid-HMR (CR #232 P1).
|
|
if (revalidation !== null) await revalidation
|
|
const cached = cache.get(name)
|
|
if (cached !== undefined) return cached
|
|
let task: Promise<ChunkExports>
|
|
task = (async (): Promise<ChunkExports> => {
|
|
const test = testLoaders.get(name)
|
|
if (test !== undefined) return test()
|
|
const modules = moduleSystem()
|
|
if (modules === undefined) {
|
|
throw new Error(`[dsh-better-sidebar] chunk "${name}": client module system unavailable`)
|
|
}
|
|
await scriptLoader(CHUNK_URL(name))
|
|
const factory = chunkRegistry()[name]
|
|
if (typeof factory !== 'function') {
|
|
throw new Error(`[dsh-better-sidebar] chunk "${name}" script did not register its factory`)
|
|
}
|
|
const require = await buildExternalsRequire(modules)
|
|
const exports = factory(require)
|
|
// Only track production loads whose cache entry survived (a revalidation
|
|
// sweep may have dropped it mid-flight; the caller still gets these
|
|
// exports, they just are not memoized for the next open). Test-registry
|
|
// loads return above and never reach this tracking.
|
|
if (cache.get(name) !== undefined) {
|
|
loadedChunks.add(name)
|
|
void recordEtag(name)
|
|
}
|
|
return exports
|
|
})()
|
|
cache.set(name, task)
|
|
void task.catch(() => {
|
|
cache.delete(name)
|
|
loadedChunks.delete(name)
|
|
chunkEtags.delete(name)
|
|
})
|
|
return task
|
|
}
|
|
|
|
/**
|
|
* Drop all chunk state for a fresh plugin activation (HMR-safe): clear the
|
|
* in-memory cache and any test-registry entries, so the next lazy open
|
|
* re-fetches and re-executes the current chunk scripts (the registry slots
|
|
* are overwritten by the re-execution — no cleanup needed). A pending
|
|
* revalidation barrier is cleared too: it was only guarding the cache reads
|
|
* of the state being dropped, so the next load must not wait on it (the
|
|
* orphaned task still settles and its identity-guarded `finally` no-ops).
|
|
*/
|
|
export function resetChunks(): void {
|
|
cache.clear()
|
|
loadedChunks.clear()
|
|
chunkEtags.clear()
|
|
testLoaders.clear()
|
|
externalsRequire = undefined
|
|
revalidation = null
|
|
}
|
|
|
|
/**
|
|
* HMR-safe re-activation hook (index.tsx calls this instead of a full
|
|
* reset): keep the resolved exports of every loaded chunk and drop only the
|
|
* ones whose script changed on disk — the bundle route revalidates every
|
|
* request (cache-control: no-cache + ETag), so an unchanged chunk keeps its
|
|
* memory cache and the next lazy open skips the re-inject / re-execute.
|
|
* Fail-open: an unreachable, ETag-less, or timed-out chunk is dropped
|
|
* (re-fetch on next open). Test-registry entries are always cleared
|
|
* (per-test fixtures).
|
|
* A page refresh remains the authoritative reset (the HMR poll watches only
|
|
* client.js; chunk-only edits surface here on the next core re-activation).
|
|
*
|
|
* The returned promise is also a BARRIER for {@link loadChunk}: while a
|
|
* revalidation is pending, every chunk load awaits it before serving cache,
|
|
* so a lazy tab opening mid-revalidation can never render stale exports
|
|
* that the sweep is about to invalidate (CR #232 P1).
|
|
*/
|
|
export function revalidateChunksOnReactivate(): Promise<void> {
|
|
testLoaders.clear()
|
|
const task = (async (): Promise<void> => {
|
|
// Entries not tracked as production-loaded (test fixtures, orphans) never
|
|
// survive a re-activation — their resolved exports came from per-test
|
|
// stubs, not from the bundle route.
|
|
for (const name of [...cache.keys()]) {
|
|
if (!loadedChunks.has(name)) cache.delete(name)
|
|
}
|
|
if (loadedChunks.size === 0) return
|
|
const stale: ChunkName[] = []
|
|
await Promise.all([...loadedChunks].map(async (name) => {
|
|
try {
|
|
const res = await fetch(CHUNK_URL(name), {
|
|
method: 'HEAD',
|
|
cache: 'no-cache',
|
|
signal: AbortSignal.timeout(CHUNK_REVALIDATE_TIMEOUT_MS),
|
|
})
|
|
const etag = res.headers.get('etag')
|
|
if (etag !== null && etag !== '' && chunkEtags.get(name) === etag) return
|
|
} catch {
|
|
// Fail open below (network errors and timeouts alike).
|
|
}
|
|
stale.push(name)
|
|
}))
|
|
for (const name of stale) {
|
|
cache.delete(name)
|
|
loadedChunks.delete(name)
|
|
chunkEtags.delete(name)
|
|
}
|
|
})()
|
|
revalidation = task
|
|
void task.finally(() => { if (revalidation === task) revalidation = null })
|
|
return task
|
|
}
|