feat(R2)+refactor: 平台管理分区 + 删 3 桩页(档案80 #7)+ 无浏览器验收脚本
- R2:business-plugins 0.2.9 新增原生「平台管理」只读分区(已铺发到 admin/guest profile 并生效)
- 档案80 #7:删 web/{desktop,plugins,skills}.html(9→6 页)+ 5 处引用改直达 portal(nginx 已加 301)
- 新增 scripts/verify-platform-admin-section.mjs(打桩 react/jsx-runtime 真执行 client.js 做渲染断言)并接入 npm run verify
This commit is contained in:
1 parent
8d5597b3f9
commit
f25723b743
9 files changed
+121
-39
No files matched your search
+1
-1
@@ -22,7 +22,7 @@
|
||||
"prepare": "npm run build",
|
||||
"dev": "node lib/cli.js",
|
||||
"typecheck": "tsc -p tsconfig.json --noEmit",
|
||||
"verify": "npm run build && node --test test/db.test.mjs test/k8s-spawner.test.mjs test/leader.test.mjs test/local-user-fs.test.mjs test/crash-policy.test.mjs && node scripts/verify-inject.cjs lib/supervisor/proxy.js && node scripts/verify-static.mjs",
|
||||
"verify": "npm run build && node --test test/db.test.mjs test/k8s-spawner.test.mjs test/leader.test.mjs test/local-user-fs.test.mjs test/crash-policy.test.mjs && node scripts/verify-inject.cjs lib/supervisor/proxy.js && node scripts/verify-static.mjs && node scripts/verify-platform-admin-section.mjs",
|
||||
"test": "npm run build && node --test test/db.test.mjs test/k8s-spawner.test.mjs test/leader.test.mjs test/local-user-fs.test.mjs test/crash-policy.test.mjs && node scripts/verify-inject.cjs lib/supervisor/proxy.js",
|
||||
"smoke": "node scripts/smoke.mjs",
|
||||
"smoke:admin": "node scripts/smoke-admin.mjs",
|
||||
|
||||
@@ -0,0 +1,115 @@
|
||||
#!/usr/bin/env node
|
||||
/**
|
||||
* verify-platform-admin-section.mjs —— R2「平台管理」分区的**无浏览器**渲染验收(档案 82)
|
||||
*
|
||||
* 为什么需要:本机 `agent-browser` 的 daemon 起不来(2026-09-13),浏览器截图验收受阻;
|
||||
* 而 `06-工作台UI规范 §7.3` 三段式在 bundle **按需动态加载** 时也拿不到带 rev 的完整 URL。
|
||||
* 做法:打桩 `react` / `react/jsx-runtime` + 最小 hooks 循环 + **真执行** client.js,
|
||||
* 断言分区**被注册**、**admin 渲染出 6 张卡**、**非 admin 被门禁挡住**。
|
||||
* 用法:node scripts/verify-platform-admin-section.mjs 退出码 0=全绿 / 1=有失败
|
||||
*/
|
||||
import { readFileSync } from "node:fs";
|
||||
import { fileURLToPath } from "node:url";
|
||||
import { dirname, join } from "node:path";
|
||||
import vm from "node:vm";
|
||||
|
||||
const ROOT = join(dirname(fileURLToPath(import.meta.url)), "..");
|
||||
const src = readFileSync(join(ROOT, "poc/business-plugins/lib/client.js"), "utf8");
|
||||
let failed = 0;
|
||||
const ok = (name, cond, extra = "") => { console.log((cond ? " ✓ " : " ✗ ") + name + (extra ? " " + extra : "")); if (!cond) failed++; };
|
||||
|
||||
let slots = [], cursor = 0, dirty = false;
|
||||
const React = {
|
||||
useState(init) { const i = cursor++; if (!(i in slots)) slots[i] = init; return [slots[i], (v) => { slots[i] = typeof v === "function" ? v(slots[i]) : v; dirty = true; }]; },
|
||||
useEffect(fn) { const i = cursor++; if (!slots[i]) { slots[i] = 1; fn(); } },
|
||||
};
|
||||
const jsx = (type, props) => ({ type, props: props || {} });
|
||||
const jsxRuntime = { jsx, jsxs: jsx, Fragment: "Fragment" };
|
||||
|
||||
let def = null;
|
||||
const win = {
|
||||
__ModuleLoader__: { load: (d) => { def = d; } },
|
||||
location: { hostname: "admin.alotbuy.com", protocol: "https:", origin: "https://admin.alotbuy.com" },
|
||||
open: (u) => { globalThis.__OPENED = u; },
|
||||
document: { createElement: () => ({ setAttribute() {}, remove() {}, textContent: "" }), head: { appendChild() {} } },
|
||||
};
|
||||
let ROLE = "admin";
|
||||
const DATA = {
|
||||
"/api/dsh/status": { running: true, instance: { port: 43095, restarts: 2 }, breaker: null },
|
||||
"/api/admin/users": { users: [{ role: "admin" }, { role: "active" }, { role: "pending" }, { role: "disabled" }] },
|
||||
"/api/admin/storage": { generatedAt: 1, users: [{}, {}] },
|
||||
"/api/plugins/business": { plugins: [{}, {}, {}] },
|
||||
"/api/admin/runtime": { items: [{}, {}, {}, {}, {}] },
|
||||
};
|
||||
const sandbox = {
|
||||
console, setTimeout, clearTimeout,
|
||||
JSON, Object, Promise, Buffer, URL, globalThis: undefined,
|
||||
window: win, document: win.document,
|
||||
fetch: async (url) => {
|
||||
const p = String(url).replace("https://alotbuy.com", "");
|
||||
const body = p === "/api/auth/me" ? { user: { id: "u1", username: ROLE, role: ROLE } } : DATA[p];
|
||||
return { ok: body !== undefined, status: body === undefined ? 404 : 200, json: async () => body };
|
||||
},
|
||||
require: (m) => (m === "react" ? React : m === "react/jsx-runtime" ? jsxRuntime : (() => { throw new Error("require " + m); })()),
|
||||
};
|
||||
sandbox.globalThis = sandbox;
|
||||
vm.createContext(sandbox);
|
||||
vm.runInContext(src, sandbox);
|
||||
const mod = def.factory(sandbox.require);
|
||||
|
||||
let DICT = {}, regs = [];
|
||||
const ctx = {
|
||||
effect: (fn, name) => { try { fn(); } catch (e) { console.log(" effect 抛错:", name, e.message); } },
|
||||
locale: { register: (ns, d) => { DICT = Object.assign({}, dICT_zh(d)); }, bind: () => (k) => DICT[k] ?? k },
|
||||
slots: { inject: (n, fn) => fn(), register: (meta, Comp) => { regs.push({ meta, Comp }); return () => {}; } },
|
||||
};
|
||||
function dICT_zh(d) { return d.zh || {}; }
|
||||
const inj = Array.isArray(mod.inject) ? mod.inject : [];
|
||||
console.log(" inject 声明:", JSON.stringify(inj));
|
||||
mod.apply(ctx);
|
||||
console.log(" 已注册 section:", regs.map(r => r.meta.id + " / order=" + r.meta.order + " / label=" + r.meta.label()).join(" | "));
|
||||
|
||||
function text(n, out = [], depth = 0) {
|
||||
if (n == null || depth > 12) return out;
|
||||
if (typeof n === "string" || typeof n === "number") { out.push(String(n)); return out; }
|
||||
if (Array.isArray(n)) { n.forEach(x => text(x, out, depth + 1)); return out; }
|
||||
if (typeof n === "object") {
|
||||
if (typeof n.type === "function") { text(n.type(n.props || {}), out, depth + 1); return out; }
|
||||
if (n.props) text(n.props.children, out, depth + 1);
|
||||
}
|
||||
return out;
|
||||
}
|
||||
async function render(Comp) {
|
||||
cursor = 0; slots = [];
|
||||
let tree = Comp();
|
||||
for (let i = 0; i < 6; i++) { await new Promise(r => setTimeout(r, 30)); if (!dirty) break; dirty = false; cursor = 0; tree = Comp(); }
|
||||
return tree;
|
||||
}
|
||||
for (const { meta, Comp } of regs.filter(r => r.meta.id === "platform-admin")) {
|
||||
for (const role of ["admin", "active"]) {
|
||||
ROLE = role;
|
||||
delete globalThis.__OPENED;
|
||||
const tree = await render(Comp);
|
||||
const t = text(tree).join(" | ");
|
||||
console.log("\n ── role=" + role + " ──");
|
||||
console.log(" 渲染文本:", t.slice(0, 300));
|
||||
console.log(" 含「平台管理」:", t.includes("平台管理"), "| 含 6 张卡:", ["当前实例","熔断","用户","存储","候选池","运行时"].every(k => t.includes(k)));
|
||||
if (role === "active") console.log(" 含仅管理员说明:", t.includes("仅对管理员显示"));
|
||||
}
|
||||
}
|
||||
|
||||
ok("注册了两个 settings.section", regs.length === 2, "-> " + regs.map(r => r.meta.id).join(", "));
|
||||
const pa = regs.find(r => r.meta.id === "platform-admin");
|
||||
ok("存在 platform-admin 分区", !!pa);
|
||||
if (pa) ok("其 order = 102", pa.meta.order === 102);
|
||||
ROLE = "admin"; delete globalThis.__OPENED;
|
||||
const tAdmin = text(await render(pa.Comp)).join(" | ");
|
||||
ok("admin:含分区标题「平台管理」", tAdmin.includes("平台管理"));
|
||||
ok("admin:6 张卡齐全", ["当前实例","熔断","用户","存储","候选池","运行时"].every(k => tAdmin.includes(k)));
|
||||
ok("admin:含只读声明", tAdmin.includes("只读"));
|
||||
ROLE = "active";
|
||||
const tUser = text(await render(pa.Comp)).join(" | ");
|
||||
ok("非 admin:被门禁挡住", tUser.includes("仅对管理员显示"));
|
||||
ok("非 admin:不出现任何指标卡", !["候选池","运行时"].some(k => tUser.includes(k)));
|
||||
console.log(failed === 0 ? "\n结论:全绿 ✅" : "\n结论:有 " + failed + " 项失败 ❌");
|
||||
process.exit(failed === 0 ? 0 : 1);
|
||||
@@ -184,7 +184,7 @@ export const dshRoutes: FastifyPluginAsync = async (app) => {
|
||||
// 所有已放行角色(admin / active)统一:已运行实例复用其 launchToken URL,
|
||||
// 未运行则在 ws 根目录 launch 后返回带 token 的会话 URL。
|
||||
// desktop 管理台不再作为登录落点,admin 经会话侧栏"门户/管理台"入口或直
|
||||
// 接访问 /desktop.html 进入。
|
||||
// 接访问 /portal.html 进入。
|
||||
app.post('/api/dsh/enter', { preHandler: requireAuth }, async (request, reply) => {
|
||||
const user = request.user!
|
||||
if (user.role !== 'active' && user.role !== 'admin') return reply.code(403).send({ error: 'not_allowed' })
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@
|
||||
|
||||
<div id="console" class="hidden">
|
||||
<div class="row-actions" style="justify-content:space-between">
|
||||
<span>登录为 <strong id="who"></strong> <a href="/skills.html" style="margin-left:10px">技能管理</a></span>
|
||||
<span>登录为 <strong id="who"></strong> <a href="/portal.html#/skills" style="margin-left:10px">技能管理</a></span>
|
||||
<button class="btn ghost small" id="logoutBtn">退出</button>
|
||||
</div>
|
||||
<table class="admin">
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
<!doctype html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="refresh" content="0;url=/portal.html" />
|
||||
<title>跳转中…</title>
|
||||
</head>
|
||||
<body>
|
||||
<script>location.replace('/portal.html')</script>
|
||||
</body>
|
||||
</html>
|
||||
+1
-1
@@ -24,7 +24,7 @@
|
||||
} catch {
|
||||
// fall through to desktop
|
||||
}
|
||||
location.href = '/desktop.html'
|
||||
location.href = '/portal.html'
|
||||
})()
|
||||
</script>
|
||||
</body>
|
||||
|
||||
+2
-2
@@ -91,13 +91,13 @@
|
||||
location.href = b.url
|
||||
return
|
||||
}
|
||||
// 失败兜底:admin 可手动进管理台 /desktop.html
|
||||
// 失败兜底:admin 可手动进管理台 /portal.html
|
||||
const errText =
|
||||
b.error === 'instance_starting' ? '实例正在启动,请稍后重试'
|
||||
: (b.error ?? 'HTTP ' + r.status)
|
||||
msg.innerHTML =
|
||||
'进入工作台失败:' + errText +
|
||||
(role === 'admin' ? '(<a href="/desktop.html">前往管理台</a>)' : '')
|
||||
(role === 'admin' ? '(<a href="/portal.html">前往管理台</a>)' : '')
|
||||
setBusy(false)
|
||||
} catch {
|
||||
msg.textContent = '进入工作台失败:网络错误'
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
<!doctype html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="refresh" content="0;url=/portal.html#/plugins" />
|
||||
<title>跳转中…</title>
|
||||
</head>
|
||||
<body>
|
||||
<script>location.replace('/portal.html#/plugins')</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,11 +0,0 @@
|
||||
<!doctype html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<meta http-equiv="refresh" content="0;url=/portal.html#/skills" />
|
||||
<title>跳转中…</title>
|
||||
</head>
|
||||
<body>
|
||||
<script>location.replace('/portal.html#/skills')</script>
|
||||
</body>
|
||||
</html>
|
||||
Reference in new issue
Block a user