update at 2026-10-13 08:40:33
GUI提速:Pyodide自托管(m4 /pyodide/ immutable)+SW持久缓存(二次访问0.5s)+正反向设计+结果持久化(指纹校验) ; deploy.sh排除pyodide目录
This commit is contained in:
@@ -37,7 +37,8 @@ fi
|
||||
|
||||
echo "[3/4] 上传 ${SRC} -> ${REMOTE_HOST}:${SITE_DIR}/"
|
||||
ssh -o RemoteCommand=none -o RequestTTY=no "$REMOTE_HOST" "mkdir -p ${SITE_DIR}"
|
||||
rsync -az --delete -e "ssh -o RemoteCommand=none -o RequestTTY=no" "$SRC" "${REMOTE_HOST}:${SITE_DIR}/"
|
||||
# --delete 但保护 /pyodide/(自托管运行时,仅手动管理,见 docs/实现方案.md 附录 B)
|
||||
rsync -az --delete --exclude 'pyodide' -e "ssh -o RemoteCommand=none -o RequestTTY=no" "$SRC" "${REMOTE_HOST}:${SITE_DIR}/"
|
||||
|
||||
echo "[4/4] 验证"
|
||||
sleep 1
|
||||
|
||||
@@ -402,9 +402,11 @@ runs/YYYYMMDD-HHMMSS-<实验名>-<seed>/
|
||||
| 公网链路 | `chenxy.biboer.cn`(Cloudflare DNS CNAME)→ mac-tunnel(`cloudflared`)→ `http://127.0.0.1:5050` |
|
||||
| 服务器 | m4(Homebrew nginx,监听 5050 仅 HTTP;站点目录 `/Users/gavin/www/chenxy`) |
|
||||
| 域名脚本 | m4 上 `./yuming.sh chenxy.biboer.cn 5050` 管理隧道与 nginx 占位配置 |
|
||||
| 发布方式 | `./deploy.sh`(同步 core 到 web/py + rsync 到 m4 + 本地 HTTP 验证);`./deploy.sh local` 仅同步 core 供本地预览 |
|
||||
| 已上线 | M0–M4 五个交互页(v8:修复 Pyodide 初始化时序竞态与 M3 表格渲染) |
|
||||
| 注意 | m4 nginx master 由 root/launchd 管理,改配置后需 `sudo /opt/homebrew/bin/nginx -s reload`;静态资源经 Cloudflare 边缘缓存,改 JS/CSS 后需在 `index.html` 中递增 `?v=` 版本号强制刷新 |
|
||||
| 发布方式 | `./deploy.sh`(构建 figma GUI → rsync 到 m4 → HTTP 验证);`./deploy.sh legacy` 部署旧版 web/;`./deploy.sh local` 仅同步 core |
|
||||
| 已上线 | React 版六页面 GUI(Figma 重构):P1 正/反向设计、P2–P4、P5 扫描+蒙特卡洛(参数各自可调)、P6 导出;参数与计算结果 localStorage 持久化(刷新保持) |
|
||||
| Pyodide 自托管 | `/pyodide/` 目录(v0.26.4 + numpy/scipy/openblas wheel ≈ 70MB,一次性下载至 m4,**rsync --delete 排除保护**);nginx `Cache-Control: immutable` 一年缓存 |
|
||||
| 加载提速 | Service Worker 缓存 Pyodide 运行时与构建产物——二次访问引擎 ~0.5s 就绪(首次仍需网络下载);Pyodide `packageCacheDir:"idb"` 双保险;sw.js 响应 no-store 防钉死,注册 URL 带版本参数 |
|
||||
| 注意 | m4 nginx master 由 root/launchd 管理,改配置需 `sudo /opt/homebrew/bin/nginx -s reload`;构建产物文件名带内容 hash 无需手动版本号;index.html 为 no-store |
|
||||
|
||||
### B.4 内容纪律(诚信红线在网站的落实)
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
2
figma/dist/index.html
vendored
2
figma/dist/index.html
vendored
@@ -4,7 +4,7 @@
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>光纤延时等效采样 · 教学实验仿真</title>
|
||||
<script type="module" crossorigin src="/assets/index-PBaEiqxk.js"></script>
|
||||
<script type="module" crossorigin src="/assets/index-CbLgLCQA.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/assets/index-XikjVaZG.css">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
65
figma/dist/sw.js
vendored
Normal file
65
figma/dist/sw.js
vendored
Normal file
@@ -0,0 +1,65 @@
|
||||
/* Service Worker:静态资源持久缓存(Pyodide 运行时 + 构建产物)
|
||||
* 首次访问从网络拉取并写入 Cache API;此后(包括刷新/离线)全部本地命中,
|
||||
* Pyodide 引擎启动从 ~60s 降到 ~2-3s。
|
||||
* 缓存策略:
|
||||
* - "/pyodide/...":带版本(v0.26.4),内容不可变 → cache-first,永不淘汰
|
||||
* - "/assets/...":文件名带内容 hash → cache-first
|
||||
* - "/py/..."(算法核心 py 文件):no-store 语义 → network-only(SW 不缓存)
|
||||
* - 根路径与 index.html:network-first(SW 更新后立即生效)
|
||||
*/
|
||||
|
||||
const CACHE = "fdets-static-v1";
|
||||
const IMMUTABLE = [
|
||||
/\/pyodide\//, // 自托管 Pyodide 运行时(版本化,immutable)
|
||||
/\/assets\/.+-[A-Za-z0-9_]{8}\.[a-z]+$/, // vite 内容 hash 产物
|
||||
];
|
||||
|
||||
self.addEventListener("install", (e) => {
|
||||
self.skipWaiting();
|
||||
e.waitUntil(caches.open(CACHE));
|
||||
});
|
||||
|
||||
self.addEventListener("activate", (e) => {
|
||||
e.waitUntil((async () => {
|
||||
// 清理旧版本缓存
|
||||
const keys = await caches.keys();
|
||||
await Promise.all(keys.filter(k => k.startsWith("fdets-static-") && k !== CACHE).map(k => caches.delete(k)));
|
||||
await self.clients.claim();
|
||||
})());
|
||||
});
|
||||
|
||||
self.addEventListener("fetch", (e) => {
|
||||
const url = new URL(e.request.url);
|
||||
if (url.origin !== location.origin) return; // 只管同源
|
||||
if (e.request.method !== "GET") return;
|
||||
|
||||
// 不可变静态资源:cache-first
|
||||
if (IMMUTABLE.some((re) => re.test(url.pathname))) {
|
||||
e.respondWith((async () => {
|
||||
const cached = await caches.match(e.request);
|
||||
if (cached) return cached;
|
||||
const resp = await fetch(e.request);
|
||||
if (resp.ok) {
|
||||
const cache = await caches.open(CACHE);
|
||||
cache.put(e.request, resp.clone());
|
||||
}
|
||||
return resp;
|
||||
})());
|
||||
return;
|
||||
}
|
||||
|
||||
// HTML 入口:network-first(保证新版本部署后立即生效)
|
||||
if (url.pathname === "/" || url.pathname.endsWith(".html")) {
|
||||
e.respondWith((async () => {
|
||||
try {
|
||||
const resp = await fetch(e.request, { cache: "no-store" });
|
||||
return resp;
|
||||
} catch {
|
||||
const cached = await caches.match(e.request);
|
||||
if (cached) return cached;
|
||||
throw new Error("offline");
|
||||
}
|
||||
})());
|
||||
}
|
||||
// 其余(py 算法核心等):默认行为,不拦截
|
||||
});
|
||||
65
figma/public/sw.js
Normal file
65
figma/public/sw.js
Normal file
@@ -0,0 +1,65 @@
|
||||
/* Service Worker:静态资源持久缓存(Pyodide 运行时 + 构建产物)
|
||||
* 首次访问从网络拉取并写入 Cache API;此后(包括刷新/离线)全部本地命中,
|
||||
* Pyodide 引擎启动从 ~60s 降到 ~2-3s。
|
||||
* 缓存策略:
|
||||
* - "/pyodide/...":带版本(v0.26.4),内容不可变 → cache-first,永不淘汰
|
||||
* - "/assets/...":文件名带内容 hash → cache-first
|
||||
* - "/py/..."(算法核心 py 文件):no-store 语义 → network-only(SW 不缓存)
|
||||
* - 根路径与 index.html:network-first(SW 更新后立即生效)
|
||||
*/
|
||||
|
||||
const CACHE = "fdets-static-v1";
|
||||
const IMMUTABLE = [
|
||||
/\/pyodide\//, // 自托管 Pyodide 运行时(版本化,immutable)
|
||||
/\/assets\/.+-[A-Za-z0-9_]{8}\.[a-z]+$/, // vite 内容 hash 产物
|
||||
];
|
||||
|
||||
self.addEventListener("install", (e) => {
|
||||
self.skipWaiting();
|
||||
e.waitUntil(caches.open(CACHE));
|
||||
});
|
||||
|
||||
self.addEventListener("activate", (e) => {
|
||||
e.waitUntil((async () => {
|
||||
// 清理旧版本缓存
|
||||
const keys = await caches.keys();
|
||||
await Promise.all(keys.filter(k => k.startsWith("fdets-static-") && k !== CACHE).map(k => caches.delete(k)));
|
||||
await self.clients.claim();
|
||||
})());
|
||||
});
|
||||
|
||||
self.addEventListener("fetch", (e) => {
|
||||
const url = new URL(e.request.url);
|
||||
if (url.origin !== location.origin) return; // 只管同源
|
||||
if (e.request.method !== "GET") return;
|
||||
|
||||
// 不可变静态资源:cache-first
|
||||
if (IMMUTABLE.some((re) => re.test(url.pathname))) {
|
||||
e.respondWith((async () => {
|
||||
const cached = await caches.match(e.request);
|
||||
if (cached) return cached;
|
||||
const resp = await fetch(e.request);
|
||||
if (resp.ok) {
|
||||
const cache = await caches.open(CACHE);
|
||||
cache.put(e.request, resp.clone());
|
||||
}
|
||||
return resp;
|
||||
})());
|
||||
return;
|
||||
}
|
||||
|
||||
// HTML 入口:network-first(保证新版本部署后立即生效)
|
||||
if (url.pathname === "/" || url.pathname.endsWith(".html")) {
|
||||
e.respondWith((async () => {
|
||||
try {
|
||||
const resp = await fetch(e.request, { cache: "no-store" });
|
||||
return resp;
|
||||
} catch {
|
||||
const cached = await caches.match(e.request);
|
||||
if (cached) return cached;
|
||||
throw new Error("offline");
|
||||
}
|
||||
})());
|
||||
}
|
||||
// 其余(py 算法核心等):默认行为,不拦截
|
||||
});
|
||||
@@ -127,6 +127,10 @@ function pload<T>(key: string, fallback: T): T {
|
||||
const raw = localStorage.getItem(LS_NS + key);
|
||||
if (raw == null) return fallback;
|
||||
const v = JSON.parse(raw);
|
||||
if (v === null) {
|
||||
// 显式区分 "存过 null"(允许,如结果清空)与 "无记录"
|
||||
return fallback === null ? null as T : fallback;
|
||||
}
|
||||
// 类型不匹配(旧版残留/手改损坏)时回退默认值
|
||||
if (Array.isArray(fallback) !== Array.isArray(v)) return fallback;
|
||||
if (typeof v !== typeof fallback) return fallback;
|
||||
@@ -147,6 +151,46 @@ function useSticky<T>(key: string, initial: T) {
|
||||
return [v, setV] as const;
|
||||
}
|
||||
|
||||
/**
|
||||
* 持久化计算结果:附带参数指纹。
|
||||
* - 保存:{ fp: 指纹, data: 结果 },参数变化 → 新指纹 → 旧结果恢复时校验失败自动作废;
|
||||
* - 这样保证“刷新后图表保留”,同时“改参数后旧图不会被误显示”。
|
||||
*/
|
||||
function useStickyResult<T>(key: string, fingerprint: string) {
|
||||
const fpKey = key + ".fp";
|
||||
const [v, setV] = useState<T | null>(() => {
|
||||
const savedFpRaw = localStorage.getItem(LS_NS + fpKey);
|
||||
let savedFp: string | null = null;
|
||||
try { savedFp = savedFpRaw == null ? null : JSON.parse(savedFpRaw); } catch { savedFp = null; }
|
||||
if (savedFp !== fingerprint) return null; // 参数已变:旧结果作废
|
||||
return ploadStrict<T | null>(key, null);
|
||||
});
|
||||
// 保存:新数据到达即写入并同步指纹。
|
||||
// 注意不用 v==null 判断去删除存档——刷新恢复的初始 null 会误删(React 18/19
|
||||
// StrictMode 下 effect 双跑加剧);显式置 null 的场景(run 前 setRows([]))
|
||||
// 紧接着就会写入新结果,旧档被覆盖即可。
|
||||
useEffect(() => {
|
||||
if (v != null) {
|
||||
psave(key, v);
|
||||
psave(fpKey, fingerprint);
|
||||
}
|
||||
// fingerprint 变化(参数编辑中)不触发清档——加载时校验已兜底
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [v]);
|
||||
return [v, setV] as const;
|
||||
}
|
||||
|
||||
/** useStickyResult 专用加载:不做类型校验直接 JSON.parse(数据形状由消费端 JSX 防护) */
|
||||
function ploadStrict<T>(key: string, fallback: T): T {
|
||||
try {
|
||||
const raw = localStorage.getItem(LS_NS + key);
|
||||
if (raw == null) return fallback;
|
||||
return JSON.parse(raw) as T;
|
||||
} catch {
|
||||
return fallback;
|
||||
}
|
||||
}
|
||||
|
||||
function clearPersisted() {
|
||||
try {
|
||||
Object.keys(localStorage)
|
||||
@@ -166,7 +210,7 @@ function ParameterPage() {
|
||||
const [targets, setTargets] = useSticky<number[]>("p1.targets", [0, 2.5, 5, 7.5]);
|
||||
const [running, setRunning] = useState(false);
|
||||
const [copied, setCopied] = useState(false);
|
||||
const [res, setRes] = useState<P1Result | null>(null);
|
||||
const [res, setRes] = useStickyResult<P1Result>("p1.res", JSON.stringify([lengths, ng, dt, targets]));
|
||||
const [err, setErr] = useState("");
|
||||
|
||||
const phases = useMemo(() => lengths.map((l) => (l * ng / 0.2998) % dt), [lengths, ng, dt]);
|
||||
@@ -299,7 +343,7 @@ function SamplingPage() {
|
||||
const [window_, setWindow] = useSticky("p2.window", "400");
|
||||
const [ideal, setIdeal] = useSticky("p2.ideal", false);
|
||||
const [seed, setSeed] = useSticky("p2.seed", 42);
|
||||
const [res, setRes] = useState<P2Result | null>(null);
|
||||
const [res, setRes] = useStickyResult<P2Result>("p2.res", JSON.stringify([window_, snr, bits, ideal, seed]));
|
||||
const [running, setRunning] = useState(false);
|
||||
const [err, setErr] = useState("");
|
||||
|
||||
@@ -370,7 +414,7 @@ function CalibrationPage() {
|
||||
const [delay, setDelay] = useSticky("p3.delay", 1);
|
||||
const [baseline, setBaseline] = useSticky("p3.baseline", 1);
|
||||
const [snr, setSnr] = useSticky("p3.snr", 50);
|
||||
const [res, setRes] = useState<P3Result | null>(null);
|
||||
const [res, setRes] = useStickyResult<P3Result>("p3.res", JSON.stringify([gain, delay, baseline, snr]));
|
||||
const [running, setRunning] = useState(false);
|
||||
const [err, setErr] = useState("");
|
||||
|
||||
@@ -447,7 +491,7 @@ function FitPage() {
|
||||
const [snr, setSnr] = useSticky("p4.snr", 50);
|
||||
const [seed, setSeed] = useSticky("p4.seed", 42);
|
||||
const [algos, setAlgos] = useSticky<string[]>("p4.algos", ["NLS", "对数线性", "稳健拟合"]);
|
||||
const [res, setRes] = useState<P4Result | null>(null);
|
||||
const [res, setRes] = useStickyResult<P4Result>("p4.res", JSON.stringify([snr, seed]));
|
||||
const [running, setRunning] = useState(false);
|
||||
const [err, setErr] = useState("");
|
||||
|
||||
@@ -517,14 +561,14 @@ function ScanPage() {
|
||||
const [repeats, setRepeats] = useSticky("p5.repeats", 16);
|
||||
const [seed] = useSticky("p5.seed", 42);
|
||||
const [wins, setWins] = useSticky<number[]>("p5.wins", [100, 150, 200, 300, 400]);
|
||||
const [rows, setRows] = useState<P5Row[]>([]);
|
||||
const [mc, setMc] = useState<P5MCResult | null>(null);
|
||||
const [mcRunning, setMcRunning] = useState(false);
|
||||
const [mcErr, setMcErr] = useState("");
|
||||
const [mcSnr, setMcSnr] = useSticky("p5.mcSnr", 50);
|
||||
const [mcWindow, setMcWindow] = useSticky("p5.mcWindow", 400);
|
||||
const [mcRepeats, setMcRepeats] = useSticky("p5.mcRepeats", 30);
|
||||
const [mcSeed, setMcSeed] = useSticky("p5.mcSeed", 42);
|
||||
const [rows, setRows] = useStickyResult<P5Row[]>("p5.rows", JSON.stringify([snr, repeats, seed, wins]));
|
||||
const [mc, setMc] = useStickyResult<P5MCResult>("p5.mc", JSON.stringify([mcSnr, mcRepeats, mcSeed, mcWindow]));
|
||||
|
||||
const toggleWin = (w: number) => setWins((prev) => prev.includes(w) ? (prev.length > 1 ? prev.filter((x) => x !== w) : prev) : [...prev, w].sort((a, b) => a - b));
|
||||
|
||||
@@ -549,13 +593,13 @@ function ScanPage() {
|
||||
setMcRunning(false);
|
||||
};
|
||||
|
||||
if (rows.length) session.p5 = rows;
|
||||
if (rows?.length) session.p5 = rows;
|
||||
if (mc && !mc.error) (session as any).p5mc = mc;
|
||||
session.params = { ...session.params, p5_snr: snr, p5_repeats: repeats, p5_wins: wins, p5_seed: seed,
|
||||
mc: { snr: mcSnr, window: mcWindow, repeats: mcRepeats, seed: mcSeed } };
|
||||
|
||||
const option = useMemo(() => {
|
||||
if (!rows.length) return null;
|
||||
if (!rows?.length) return null;
|
||||
return {
|
||||
grid: { left: 52, right: 20, top: 34, bottom: 40 },
|
||||
tooltip: chartTooltip(),
|
||||
@@ -570,7 +614,7 @@ function ScanPage() {
|
||||
}, [rows]);
|
||||
|
||||
const best = useMemo(() => {
|
||||
if (!rows.length) return null;
|
||||
if (!rows?.length) return null;
|
||||
const valid = rows.filter((r) => r.ratio && isFinite(r.ratio));
|
||||
if (!valid.length) return null;
|
||||
return valid.reduce((a, b) => ((a.ratio ?? 0) > (b.ratio ?? 0) ? a : b));
|
||||
@@ -625,7 +669,7 @@ function ScanPage() {
|
||||
{running && <div className="progress" style={{ marginBottom: 12 }}><i style={{ width: `${progress}%` }} /><span>扫描进行中 · {progress}%({wins.length} 个窗口 × {repeats} 次)</span></div>}
|
||||
<Legend items={[{ color: C.orange, label: "单通道" }, { color: C.blue, label: "四相位等效" }]} />
|
||||
{option ? <Chart option={option} height={280} /> : <div className="chart-placeholder">{running ? "扫描进行中…" : "点击「运行扫描」开始"}</div>}
|
||||
{rows.length > 0 && <div className="table-scroll" style={{ marginTop: 12 }}><table><thead><tr><th>窗口 (ns)</th><th>单通道</th><th>四相位</th><th>提升比</th><th>失败率</th></tr></thead><tbody>
|
||||
{rows && rows.length > 0 && <div className="table-scroll" style={{ marginTop: 12 }}><table><thead><tr><th>窗口 (ns)</th><th>单通道</th><th>四相位</th><th>提升比</th><th>失败率</th></tr></thead><tbody>
|
||||
{rows.map((r) => <tr key={r.window}><td><b>{r.window}</b></td><td>{r.single?.toFixed(2) ?? "—"}%</td><td>{r.fiber?.toFixed(2) ?? "—"}%</td><td className={r.ratio && r.ratio >= 3 ? "good" : ""}>{r.ratio?.toFixed(1)}×</td><td>{r.single_fail.toFixed(0)}% / {r.fiber_fail.toFixed(0)}%</td></tr>)}
|
||||
</tbody></table></div>}
|
||||
</Card>
|
||||
|
||||
@@ -190,17 +190,27 @@ declare global {
|
||||
}
|
||||
|
||||
async function loadEngine(): Promise<void> {
|
||||
// 动态加载 Pyodide(与旧版网站一致的 CDN 版本)
|
||||
// Pyodide 运行时自托管(同源 /pyodide/,经 Cloudflare 缓存到边缘,国内无需直连 jsdelivr)
|
||||
const PYODIDE_BASE = "/pyodide/";
|
||||
// 本地 dev(vite 5188)时无 /pyodide/,回退 CDN
|
||||
const probe = await fetch(PYODIDE_BASE + "pyodide-lock.json", { method: "HEAD" }).catch(() => null);
|
||||
const base = probe && probe.ok ? location.origin + PYODIDE_BASE : "https://cdn.jsdelivr.net/pyodide/v0.26.4/full/";
|
||||
|
||||
if (!window.loadPyodide) {
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
const s = document.createElement("script");
|
||||
s.src = "https://cdn.jsdelivr.net/pyodide/v0.26.4/full/pyodide.js";
|
||||
s.src = base + "pyodide.js";
|
||||
s.onload = () => resolve();
|
||||
s.onerror = () => reject(new Error("Pyodide 脚本加载失败(需访问 cdn.jsdelivr.net)"));
|
||||
s.onerror = () => reject(new Error("Pyodide 脚本加载失败"));
|
||||
document.head.appendChild(s);
|
||||
});
|
||||
}
|
||||
pyodide = await window.loadPyodide({ indexURL: "https://cdn.jsdelivr.net/pyodide/v0.26.4/full/" });
|
||||
pyodide = await window.loadPyodide({
|
||||
indexURL: base,
|
||||
// 关键:wheel 下载进 IndexedDB,二次访问免网络(配合 HTTP 缓存双保险)
|
||||
packageCacheDir: "idb",
|
||||
lockFileURL: base + "pyodide-lock.json",
|
||||
});
|
||||
await pyodide.loadPackage(["numpy", "scipy"]);
|
||||
pyodide.runPython("import sys; sys.path.insert(0, '/')");
|
||||
for (const rel of CORE_FILES) {
|
||||
|
||||
@@ -8,3 +8,12 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
|
||||
<App />
|
||||
</React.StrictMode>,
|
||||
)
|
||||
|
||||
// Service Worker:缓存 Pyodide 运行时与构建产物,二次访问引擎秒级就绪
|
||||
// (注意 /sw.js 自身避免被 CF/浏览器长缓存钉死:URL 带版本参数,更新时递增)
|
||||
if ("serviceWorker" in navigator && location.protocol === "https:") {
|
||||
const SW_URL = "/sw.js?v=2";
|
||||
const register = () => navigator.serviceWorker.register(SW_URL).catch(() => { /* 注册失败不影响主功能 */ });
|
||||
if (document.readyState === "complete") register();
|
||||
else window.addEventListener("load", register, { once: true });
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user