@sleep2agi/commhub-server 0.9.0-preview.225 → 0.9.0-preview.227
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/cors-origins.test.ts +18 -1
- package/src/hub-catalog-read-http.test.ts +77 -0
- package/src/server.ts +80 -3
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sleep2agi/commhub-server",
|
|
3
|
-
"version": "0.9.0-preview.
|
|
3
|
+
"version": "0.9.0-preview.227",
|
|
4
4
|
"description": "CommHub Server — AI Agent communication hub with MCP protocol, multi-network isolation, user auth, and MCP tools (17 collaboration-core + node/provider ops tools; authoritative list: docs-site/docs/api/mcp-tools.md).",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "src/index.ts",
|
package/src/cors-origins.test.ts
CHANGED
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
// 判据:写一个允许清单的默认值之前,先写出它的**最松值**。
|
|
13
13
|
// 这里最松值不是空(空 = 谁都不许 = 最严),而是 `*`。所以空绝不能被读成「用默认」。
|
|
14
14
|
import { describe, expect, test } from "bun:test";
|
|
15
|
-
import { normalizeOrigin, parseCorsOrigins } from "./server.js";
|
|
15
|
+
import { assertCorsOrigins, normalizeOrigin, parseCorsOrigins } from "./server.js";
|
|
16
16
|
|
|
17
17
|
describe("parseCorsOrigins: 未设 / 设空 / 设值 三态", () => {
|
|
18
18
|
test("未设 ⇒ 开发默认(localhost 两个端口)", () => {
|
|
@@ -53,4 +53,21 @@ describe("parseCorsOrigins: 未设 / 设空 / 设值 三态", () => {
|
|
|
53
53
|
// 去重:同一 origin 的两种写法只留一条
|
|
54
54
|
expect(parseCorsOrigins("https://a.example,https://a.example:443/")).toEqual(["https://a.example"]);
|
|
55
55
|
});
|
|
56
|
+
|
|
57
|
+
// 2026-10-31 —— **配错了就别起服务**(「解除武装 ≠ 修好」):
|
|
58
|
+
// 丢弃非法条目只是让服务更安全,但配置仍然是错的,而且没有任何信号。
|
|
59
|
+
// 这里钉的是启动期断言:非法条目必须**抛**,且把非法条目逐个点出来。
|
|
60
|
+
test("startup assertion refuses invalid CORS entries and names them", () => {
|
|
61
|
+
expect(() => assertCorsOrigins(undefined)).not.toThrow(); // 未设 ⇒ 默认,合法
|
|
62
|
+
expect(() => assertCorsOrigins("")).not.toThrow(); // 设空 ⇒ 空清单,合法(更严)
|
|
63
|
+
expect(() => assertCorsOrigins("https://a.example,http://b.example:8080")).not.toThrow();
|
|
64
|
+
// 每个非法形态都要抛,并且错误信息里能看到那个值
|
|
65
|
+
for (const bad of ["*", "a.example", "ftp://a.example", "https://a.example, *"]) {
|
|
66
|
+
let msg = "";
|
|
67
|
+
try { assertCorsOrigins(bad); } catch (e) { msg = String((e as Error).message); }
|
|
68
|
+
expect(msg).toContain("不是 http(s) origin");
|
|
69
|
+
expect(msg.length).toBeGreaterThan(20);
|
|
70
|
+
}
|
|
71
|
+
expect(() => assertCorsOrigins("*")).toThrow(/\*/);
|
|
72
|
+
});
|
|
56
73
|
});
|
|
@@ -326,6 +326,83 @@ describe("GET /api/providers", () => {
|
|
|
326
326
|
expect(d.body.error).toBe("daemon_rejected_selection");
|
|
327
327
|
} finally {
|
|
328
328
|
db.run(`DELETE FROM daemon_provider_snapshots WHERE daemon_node_id = ?1`, [nodeId]);
|
|
329
|
+
db.run(`DELETE FROM node_daemon_bindings WHERE request_id = 'bind_ps'`);
|
|
330
|
+
db.run(`DELETE FROM nodes WHERE node_id = 'ps-target-node'`);
|
|
331
|
+
db.run(`DELETE FROM api_tokens WHERE token_id = 'tok_ps_write'`);
|
|
332
|
+
db.run(`DELETE FROM nodes WHERE node_id = ?1`, [nodeId]);
|
|
333
|
+
}
|
|
334
|
+
});
|
|
335
|
+
|
|
336
|
+
// 2026-10-31 —— 写侧:切 provider 的**第一步**(排队 + 带切换前读数)。
|
|
337
|
+
// 关键断言不是「返回 202」,而是「它把 before 带回来了」——没有 before,
|
|
338
|
+
// 「切成功了吗」只能靠客户端自己记住上一次。
|
|
339
|
+
test("POST /api/nodes/:id/provider-selection queues an application and returns the pre-state", async () => {
|
|
340
|
+
const { db } = await import("./db.js");
|
|
341
|
+
const nodeId = "ps-write-node";
|
|
342
|
+
// provider 切换只对 host_supervisor 守护进程有意义 —— 那条前置条件本身也要先被证明:
|
|
343
|
+
// 普通节点 ⇒ 404 daemon_not_found(下面第一条断言)。
|
|
344
|
+
db.run(`INSERT OR REPLACE INTO nodes (node_id, node_name, network_id, alias, created_at, updated_at, config_snapshot)
|
|
345
|
+
VALUES (?1, 'ps-write', ?2, 'ps-write', ?3, ?3, '{}')`, [nodeId, ownerNet, Date.now()]);
|
|
346
|
+
const selection0 = { node_id: nodeId, node_revision: "a".repeat(64), provider_id: "main", auth_id: "auth1", model: "m1", confirm_restart: true };
|
|
347
|
+
const postRaw = async (body: any) => {
|
|
348
|
+
const r = await fetch(`${base}/api/nodes/${nodeId}/provider-selection`, {
|
|
349
|
+
method: "POST",
|
|
350
|
+
headers: { Authorization: `Bearer ${ownerToken}`, "content-type": "application/json" },
|
|
351
|
+
body: JSON.stringify(body),
|
|
352
|
+
});
|
|
353
|
+
return { status: r.status, body: await r.json() as any };
|
|
354
|
+
};
|
|
355
|
+
db.run(`INSERT OR REPLACE INTO daemon_provider_snapshots (request_id, network_id, daemon_node_id, requested_by, status, created_at, expires_at, observed_at, snapshot_json, error)
|
|
356
|
+
VALUES ('dpa_prev', ?1, ?2, 'test', 'completed', ?3, ?4, ?3, ?5, NULL)`,
|
|
357
|
+
[ownerNet, nodeId, Date.now(), Date.now() + 60_000, JSON.stringify({ expected_revision: 3, provider_id: "prev", model: "m0" })]);
|
|
358
|
+
// 真实语义:切的是**被这个守护进程监督的节点**,不是守护进程自己 ⇒ 需要一个 target 节点 + 一条 active 绑定
|
|
359
|
+
const targetId = "ps-target-node";
|
|
360
|
+
db.run(`INSERT OR REPLACE INTO nodes (node_id, node_name, network_id, alias, created_at, updated_at)
|
|
361
|
+
VALUES (?1, 'ps-target', ?2, 'ps-target', ?3, ?3)`, [targetId, ownerNet, Date.now()]);
|
|
362
|
+
db.run(`INSERT OR REPLACE INTO node_daemon_bindings (request_id, network_id, node_id, daemon_node_id, workdir, requested_by, status, created_at, updated_at)
|
|
363
|
+
VALUES ('bind_ps', ?1, ?2, ?3, '/tmp', 'test', 'active', ?4, ?4)`, [ownerNet, targetId, nodeId, Date.now()]);
|
|
364
|
+
const selection = { node_id: targetId, node_revision: "a".repeat(64), provider_id: "main", auth_id: "auth1", model: "m1", confirm_restart: true };
|
|
365
|
+
try {
|
|
366
|
+
const post = async (body: any) => {
|
|
367
|
+
const r = await fetch(`${base}/api/nodes/${nodeId}/provider-selection`, {
|
|
368
|
+
method: "POST",
|
|
369
|
+
headers: { Authorization: `Bearer ${ownerToken}`, "content-type": "application/json" },
|
|
370
|
+
body: JSON.stringify(body),
|
|
371
|
+
});
|
|
372
|
+
return { status: r.status, body: await r.json() as any };
|
|
373
|
+
};
|
|
374
|
+
// ① 普通节点(不是 host_supervisor)⇒ 404:切换只对守护进程有意义
|
|
375
|
+
expect((await postRaw({ revision: 3, selection: selection0 })).status).toBe(404);
|
|
376
|
+
|
|
377
|
+
// 补上前置条件:节点既要有 node-scoped token,也要 config_snapshot.role=host_supervisor
|
|
378
|
+
db.run(`INSERT OR REPLACE INTO api_tokens (token_id, token_hash, user_id, network_id, name, created_at)
|
|
379
|
+
VALUES ('tok_ps_write', 'hash', ?1, ?2, 'node:ps-write', datetime('now'))`, [ownerUserId, ownerNet]);
|
|
380
|
+
db.run(`UPDATE nodes SET config_snapshot = '{"role":"host_supervisor"}' WHERE node_id = ?1`, [nodeId]);
|
|
381
|
+
|
|
382
|
+
// 缺 revision ⇒ 400(且提示「先 GET 同一路由」)
|
|
383
|
+
const noRev = await post({ selection });
|
|
384
|
+
expect(noRev.status).toBe(400);
|
|
385
|
+
expect(noRev.body.error).toBe("invalid_revision");
|
|
386
|
+
|
|
387
|
+
// 正常:202 + state=pending + before 是上一次生效的 selection
|
|
388
|
+
const ok = await post({ revision: 3, selection });
|
|
389
|
+
if (ok.status !== 202) throw new Error(`期望 202,实际 ${ok.status}:${JSON.stringify(ok.body)}`);
|
|
390
|
+
expect(ok.status).toBe(202);
|
|
391
|
+
expect(ok.body.state).toBe("pending");
|
|
392
|
+
expect(ok.body.request_id).toMatch(/^dpa_/);
|
|
393
|
+
expect(ok.body.before).toMatchObject({ provider_id: "prev", model: "m0" });
|
|
394
|
+
expect(String(ok.body.hint)).toContain("pending 不等于生效");
|
|
395
|
+
|
|
396
|
+
// 回读:pending 状态在 GET 上立刻可见(写与读用同一个状态源)
|
|
397
|
+
const get = await fetch(`${base}/api/nodes/${nodeId}/provider-selection`, { headers: { Authorization: `Bearer ${ownerToken}` } });
|
|
398
|
+
const got = await get.json() as any;
|
|
399
|
+
expect(got.state).toBe("pending");
|
|
400
|
+
} finally {
|
|
401
|
+
db.run(`DELETE FROM daemon_provider_applications WHERE request_id IN (SELECT request_id FROM daemon_provider_snapshots WHERE daemon_node_id = ?1)`, [nodeId]);
|
|
402
|
+
db.run(`DELETE FROM daemon_provider_snapshots WHERE daemon_node_id = ?1`, [nodeId]);
|
|
403
|
+
db.run(`DELETE FROM node_daemon_bindings WHERE request_id = 'bind_ps'`);
|
|
404
|
+
db.run(`DELETE FROM nodes WHERE node_id = 'ps-target-node'`);
|
|
405
|
+
db.run(`DELETE FROM api_tokens WHERE token_id = 'tok_ps_write'`);
|
|
329
406
|
db.run(`DELETE FROM nodes WHERE node_id = ?1`, [nodeId]);
|
|
330
407
|
}
|
|
331
408
|
});
|
package/src/server.ts
CHANGED
|
@@ -107,6 +107,7 @@ import { assertScheduledTaskBackendSupported, handleScheduledTaskRequest, startS
|
|
|
107
107
|
import { startDueReminderTimer } from "./requirement-due-reminders.js";
|
|
108
108
|
import { handleRequirementsRequest } from "./requirements.js";
|
|
109
109
|
import { readHubProviders, putHubProvider, providerWriteStatus } from "./hub-provider-config.js";
|
|
110
|
+
import { requestProviderApplication } from "./daemon-provider-snapshots.js";
|
|
110
111
|
import { requestNodeSecrets, getScopedSecrets } from "./scoped-secrets.js";
|
|
111
112
|
import { readEnvTransportLog } from "./env-transport-gate.js";
|
|
112
113
|
import { enforceImpactOf, normalizePeerAllowlist, normalizeToolAllowlist, restAllowlistVerdict, restRouteLabel } from "./node-permissions.js";
|
|
@@ -978,9 +979,35 @@ export function parseCorsOrigins(raw: string | undefined): string[] {
|
|
|
978
979
|
return out;
|
|
979
980
|
}
|
|
980
981
|
|
|
981
|
-
|
|
982
|
-
|
|
983
|
-
|
|
982
|
+
/**
|
|
983
|
+
* 2026-10-31 —— **「解除武装」不等于「修好」**(外部复核:
|
|
984
|
+
* 「『断掉』和『修好』都是正确的下一步,但它们解决的不是同一个问题」)。
|
|
985
|
+
*
|
|
986
|
+
* 现在非法条目会被**丢弃**(等于不放行)——那是解除武装:更安全,但**配置仍然是错的**,
|
|
987
|
+
* 而且没有任何信号,运维只会看到「前端突然 CORS 不过」。
|
|
988
|
+
* ⇒ 启动时直接拒绝:非法条目 = 配错了,别让它带着错的清单跑起来。
|
|
989
|
+
* (生产未设置这个变量,走 localhost 默认,不受影响。)
|
|
990
|
+
*/
|
|
991
|
+
export function assertCorsOrigins(raw: string | undefined): void {
|
|
992
|
+
if (raw === undefined) return;
|
|
993
|
+
const bad: string[] = [];
|
|
994
|
+
for (const part of raw.split(",")) {
|
|
995
|
+
const trimmed = part.trim();
|
|
996
|
+
if (!trimmed) continue;
|
|
997
|
+
if (!normalizeOrigin(trimmed)) bad.push(trimmed);
|
|
998
|
+
}
|
|
999
|
+
if (bad.length) {
|
|
1000
|
+
throw new Error(
|
|
1001
|
+
`COMMHUB_CORS_ORIGINS 里有 ${bad.length} 个条目不是 http(s) origin:${bad.join(", ")}\n` +
|
|
1002
|
+
" ⇒ 它们会被丢弃(等于不放行)。配错了就别起服务:改成 https://host[:port] 的形式再启动。",
|
|
1003
|
+
);
|
|
1004
|
+
}
|
|
1005
|
+
}
|
|
1006
|
+
const CORS_ORIGINS = (() => {
|
|
1007
|
+
const raw = "COMMHUB_CORS_ORIGINS" in process.env ? (process.env.COMMHUB_CORS_ORIGINS ?? "") : undefined;
|
|
1008
|
+
assertCorsOrigins(raw);
|
|
1009
|
+
return parseCorsOrigins(raw);
|
|
1010
|
+
})();
|
|
984
1011
|
|
|
985
1012
|
function corsHeaders(req: Request): Record<string, string> {
|
|
986
1013
|
const origin = req.headers.get("Origin") || "";
|
|
@@ -3920,6 +3947,56 @@ return Bun.serve({
|
|
|
3920
3947
|
: {}),
|
|
3921
3948
|
}));
|
|
3922
3949
|
}
|
|
3950
|
+
// 2026-10-31 —— **写侧:切这个节点的 provider / 模型**(#3146 的第一个动作面)。
|
|
3951
|
+
// 直接复用 requestProviderApplication(校验/授权/加密下发都在那边),
|
|
3952
|
+
// 这里只做两件 REST 侧的事:把「切换前是什么」一起回给对方,并给出下一步该看什么。
|
|
3953
|
+
if (providerSelMatch && req.method === "POST") {
|
|
3954
|
+
if (!restAuth) return withCors(req, Response.json({ ok: false, error: "auth required" }, { status: 401 }));
|
|
3955
|
+
if (restAuth.networkId) return userTokenRequired(req);
|
|
3956
|
+
const nodeRef = decodeURIComponent(providerSelMatch[1]);
|
|
3957
|
+
const node = db.get<{ node_id: string; network_id: string | null }>(
|
|
3958
|
+
"SELECT node_id, network_id FROM nodes WHERE node_id = ?1", nodeRef);
|
|
3959
|
+
const role = node?.network_id ? getUserNetworkRole(restAuth.userId, node.network_id) : null;
|
|
3960
|
+
if (!node || !node.network_id || (!role && !isAdmin)) {
|
|
3961
|
+
return withCors(req, Response.json({ ok: false, error: "node_not_found" }, { status: 404 }));
|
|
3962
|
+
}
|
|
3963
|
+
let body: any = null;
|
|
3964
|
+
try { body = await req.json(); } catch { return withCors(req, Response.json({ ok: false, error: "invalid_json" }, { status: 400 })); }
|
|
3965
|
+
const revision = Number.isSafeInteger(body?.revision) ? body.revision : NaN;
|
|
3966
|
+
if (!Number.isSafeInteger(revision) || revision < 0) {
|
|
3967
|
+
return withCors(req, Response.json({ ok: false, error: "invalid_revision", hint: "传节点当前的 config revision;不确定就先 GET 同一路由" }, { status: 400 }));
|
|
3968
|
+
}
|
|
3969
|
+
// 切换前读数(对照):没有它,「切成功了吗」只能靠客户端自己记住上一次
|
|
3970
|
+
const beforeRow = db.get<{ snapshot_json: string | null }>(
|
|
3971
|
+
`SELECT snapshot_json FROM daemon_provider_snapshots
|
|
3972
|
+
WHERE network_id = ?1 AND daemon_node_id = ?2 AND request_id LIKE 'dpa\_%' ESCAPE '\\'
|
|
3973
|
+
ORDER BY created_at DESC LIMIT 1`, node.network_id, node.node_id);
|
|
3974
|
+
let before: unknown = null;
|
|
3975
|
+
if (beforeRow?.snapshot_json) { try { before = JSON.parse(beforeRow.snapshot_json); } catch { before = null; } }
|
|
3976
|
+
|
|
3977
|
+
const applied = requestProviderApplication(
|
|
3978
|
+
{ userId: restAuth.userId ?? null, isNode: false, networkId: node.network_id },
|
|
3979
|
+
node.node_id, revision, body?.selection,
|
|
3980
|
+
);
|
|
3981
|
+
if (!applied.ok) {
|
|
3982
|
+
const status = applied.error === "user_token_required" ? 401
|
|
3983
|
+
: applied.error === "provider_admin_required" ? 403
|
|
3984
|
+
: applied.error === "daemon_not_found" ? 404
|
|
3985
|
+
: applied.error === "application_target_not_bound" ? 400
|
|
3986
|
+
: applied.error === "invalid_application" ? 400
|
|
3987
|
+
: 409;
|
|
3988
|
+
return withCors(req, Response.json({ ...applied, before }, { status }));
|
|
3989
|
+
}
|
|
3990
|
+
return withCors(req, Response.json({
|
|
3991
|
+
ok: true,
|
|
3992
|
+
node_id: node.node_id,
|
|
3993
|
+
request_id: applied.request_id,
|
|
3994
|
+
state: "pending",
|
|
3995
|
+
before, // 切换前(可能为 null = 从未切换过)
|
|
3996
|
+
expires_at: new Date(applied.expires_at).toISOString(),
|
|
3997
|
+
hint: "已排队;用 GET 同一路由回读 state=applied 才算生效(pending 不等于生效)",
|
|
3998
|
+
}, { status: 202 }));
|
|
3999
|
+
}
|
|
3923
4000
|
// #2969 后半 —— 接口白名单:PUT /api/nodes/:id/tool-allowlist { tools: string[] | null }
|
|
3924
4001
|
// 与 peer-allowlist 同一套授权口径。
|
|
3925
4002
|
const toolAllowMatch = url.pathname.match(/^\/api\/nodes\/([^/]+)\/tool-allowlist$/);
|