@sleep2agi/commhub-server 0.9.0-preview.255 → 0.9.0-preview.256
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/build-info.json +2 -2
- package/package.json +1 -1
- package/src/expiry-counters.test.ts +37 -0
- package/src/expiry-counters.ts +49 -2
- package/src/server.ts +3 -1
- package/src/task-consumption.test.ts +5 -1
- package/src/tools.ts +3 -1
package/build-info.json
CHANGED
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.256",
|
|
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",
|
|
@@ -112,6 +112,43 @@ describe("#3271 派单侧硬闸:从未取走过的目标", () => {
|
|
|
112
112
|
});
|
|
113
113
|
});
|
|
114
114
|
|
|
115
|
+
describe("#3271 证据的生命期必须 ≥ 故障的生命期(进程内计数器不够)", () => {
|
|
116
|
+
const NOW = Date.parse("2026-10-31T10:00:00.000Z");
|
|
117
|
+
const empty = { since: "2026-10-31T10:00:00.000Z", total: 0, by_node: {}, last_at: {} };
|
|
118
|
+
|
|
119
|
+
// 🔴 这条是 2026-10-31 生产实测的 must-fire:
|
|
120
|
+
// `.254` 部署(22:39)后,我给一台**已经 10 次到死没被取走**的节点派单,
|
|
121
|
+
// 闸返回 ok:true —— 因为计数器随进程重启归零,而故障是以「周」计的。
|
|
122
|
+
test("🔴 内存计数为空,但 tasks 表里有 3 条历史 ⇒ 必须拒绝", () => {
|
|
123
|
+
const r = neverConsumeGate({
|
|
124
|
+
alias: "ghost", counters: empty, force: false, forceAllowed: true, now: NOW,
|
|
125
|
+
persistent: { expiries: 3, last_at: new Date(NOW - 60_000).toISOString().replace("T", " ").slice(0, 19) },
|
|
126
|
+
});
|
|
127
|
+
expect(r.ok).toBe(false);
|
|
128
|
+
if (r.ok) throw new Error("unreachable");
|
|
129
|
+
expect(r.expiries).toBe(3);
|
|
130
|
+
});
|
|
131
|
+
|
|
132
|
+
test("两个来源取**并集**(内存 2 + 表里 3 ⇒ 按 3 判,不是相加也不是取小)", () => {
|
|
133
|
+
const counters = { since: "s", total: 2, by_node: { ghost: 2 }, last_at: { ghost: new Date(NOW - 60_000).toISOString() } };
|
|
134
|
+
const r = neverConsumeGate({
|
|
135
|
+
alias: "ghost", counters, force: false, forceAllowed: true, now: NOW,
|
|
136
|
+
persistent: { expiries: 3, last_at: new Date(NOW - 60_000).toISOString().replace("T", " ").slice(0, 19) },
|
|
137
|
+
});
|
|
138
|
+
expect(r.ok).toBe(false);
|
|
139
|
+
if (r.ok) throw new Error("unreachable");
|
|
140
|
+
expect(r.expiries).toBe(3);
|
|
141
|
+
});
|
|
142
|
+
|
|
143
|
+
test("表里的历史很旧(超过时效)⇒ 放行:节点可能已经恢复", () => {
|
|
144
|
+
const r = neverConsumeGate({
|
|
145
|
+
alias: "ghost", counters: empty, force: false, forceAllowed: true, now: NOW,
|
|
146
|
+
persistent: { expiries: 9, last_at: "2026-10-20T00:00:00" },
|
|
147
|
+
});
|
|
148
|
+
expect(r.ok).toBe(true);
|
|
149
|
+
});
|
|
150
|
+
});
|
|
151
|
+
|
|
115
152
|
describe("#3271 硬闸的时效:只数不衰减会把恢复了的节点永久拉黑", () => {
|
|
116
153
|
const NOW = Date.parse("2026-10-31T10:00:00.000Z");
|
|
117
154
|
const mk = (lastAtIso: string) => ({
|
package/src/expiry-counters.ts
CHANGED
|
@@ -72,6 +72,46 @@ export const NEVER_CONSUME_LIMIT = 3;
|
|
|
72
72
|
/** 「最近一次从未取走」超过这个时长 ⇒ 不再拒发(节点可能已经恢复;计数仍留在读数里)。 */
|
|
73
73
|
export const NEVER_CONSUME_STALE_MS = 2 * 60 * 60_000;
|
|
74
74
|
|
|
75
|
+
/**
|
|
76
|
+
* #3271 🔴 2026-10-31 修 —— 这道闸原来**只读进程内计数器**,而计数器随部署归零。
|
|
77
|
+
*
|
|
78
|
+
* 实测打脸:`.254` 部署(22:39)之后我给 TM官网运维 派了一条自检任务,
|
|
79
|
+
* 它明明已经 10 次「到死没被取走」,闸却 `ok:true` 放行了 —— 因为计数器在重启时被清空。
|
|
80
|
+
* ⇒ **证据的生命期比故障短**:故障以「周」计,计数器以「本次进程」计。
|
|
81
|
+
* 一条只在本次进程内有效的判据,会被每一次发版重置,而发版比故障频繁得多。
|
|
82
|
+
*
|
|
83
|
+
* 所以判据必须有一个**持久**来源:tasks 表里已经写着每一条过期的 `status='expired'` 与
|
|
84
|
+
* `consumed_at IS NULL` —— 那是过期发生时就落库的事实,不随重启消失。
|
|
85
|
+
*
|
|
86
|
+
* 两个来源**取并集**(不是二选一):
|
|
87
|
+
* · 进程内计数器:本次进程内发生的最新鲜的那几条(可能在 tasks 行写之前就有)
|
|
88
|
+
* · tasks 表:跨重启的历史(窗口由调用方给,默认 7 天 —— 与「节点可能恢复」同一个取舍)
|
|
89
|
+
*/
|
|
90
|
+
export interface PersistentExpiryEvidence { expiries: number; last_at: string | null }
|
|
91
|
+
|
|
92
|
+
export const NEVER_CONSUME_LOOKBACK_MS = 7 * 24 * 60 * 60_000;
|
|
93
|
+
|
|
94
|
+
export function persistentNeverConsumedExpiries(
|
|
95
|
+
db: { get<T = any>(sql: string, ...params: any[]): T | null },
|
|
96
|
+
alias: string,
|
|
97
|
+
networkId: string | null,
|
|
98
|
+
opts: { now?: number; lookbackMs?: number } = {},
|
|
99
|
+
): PersistentExpiryEvidence {
|
|
100
|
+
const since = new Date((opts.now ?? Date.now()) - (opts.lookbackMs ?? NEVER_CONSUME_LOOKBACK_MS)).toISOString().replace("T", " ").slice(0, 19);
|
|
101
|
+
const row = networkId
|
|
102
|
+
? db.get<{ n: number; last: string | null }>(
|
|
103
|
+
`SELECT COUNT(*) AS n, MAX(created_at) AS last FROM tasks
|
|
104
|
+
WHERE to_name = ?1 AND network_id = ?2 AND status = 'expired' AND consumed_at IS NULL
|
|
105
|
+
AND created_at >= ?3`,
|
|
106
|
+
alias, networkId, since)
|
|
107
|
+
: db.get<{ n: number; last: string | null }>(
|
|
108
|
+
`SELECT COUNT(*) AS n, MAX(created_at) AS last FROM tasks
|
|
109
|
+
WHERE to_name = ?1 AND status = 'expired' AND consumed_at IS NULL
|
|
110
|
+
AND created_at >= ?2`,
|
|
111
|
+
alias, since);
|
|
112
|
+
return { expiries: Number(row?.n ?? 0), last_at: row?.last ?? null };
|
|
113
|
+
}
|
|
114
|
+
|
|
75
115
|
export type NeverConsumeGate =
|
|
76
116
|
| { ok: true }
|
|
77
117
|
| { ok: false; error: "target_never_consumes"; alias: string; expiries: number; window_since: string; message: string };
|
|
@@ -86,14 +126,21 @@ export function neverConsumeGate(input: {
|
|
|
86
126
|
/** 「最近一次」的时效:超过它就不再拒发(节点可能已经恢复)。 */
|
|
87
127
|
staleAfterMs?: number;
|
|
88
128
|
now?: number;
|
|
129
|
+
/** tasks 表里的历史(跨重启)。与进程内计数器**取并集**,见 persistentNeverConsumedExpiries 的注释。 */
|
|
130
|
+
persistent?: PersistentExpiryEvidence;
|
|
89
131
|
}): NeverConsumeGate {
|
|
90
132
|
const limit = input.limit ?? NEVER_CONSUME_LIMIT;
|
|
91
|
-
const
|
|
133
|
+
const fromMemory = input.counters.by_node[input.alias] ?? 0;
|
|
134
|
+
const fromDb = input.persistent?.expiries ?? 0;
|
|
135
|
+
const expiries = Math.max(fromMemory, fromDb);
|
|
92
136
|
if (expiries < limit) return { ok: true };
|
|
93
137
|
// 2026-10-31 —— **只数不衰减会把恢复了的节点永久拉黑**。
|
|
94
138
|
// 实测的教训来自另一台机(TM中转运维):连「抑制了多少」这个数本身都在被环缓冲淘汰,
|
|
95
139
|
// 所以任何「累计」都只在它的窗口内可引用;这里把窗口写进判据:最近一次过期超过 TTL ⇒ 放行。
|
|
96
|
-
const lastAt = input.counters.last_at?.[input.alias]
|
|
140
|
+
const lastAt = [input.counters.last_at?.[input.alias], input.persistent?.last_at ?? undefined]
|
|
141
|
+
.filter((x): x is string => typeof x === "string")
|
|
142
|
+
.sort()
|
|
143
|
+
.pop();
|
|
97
144
|
if (lastAt) {
|
|
98
145
|
const age = (input.now ?? Date.now()) - Date.parse(lastAt);
|
|
99
146
|
if (Number.isFinite(age) && age > (input.staleAfterMs ?? NEVER_CONSUME_STALE_MS)) return { ok: true };
|
package/src/server.ts
CHANGED
|
@@ -122,7 +122,7 @@ import { createProductionSideThreadTransport } from "./side-thread-production.js
|
|
|
122
122
|
import { parseHubTimestamp } from "./hub-timestamp";
|
|
123
123
|
import { logTaskRejection } from "./task-rejection-log.js";
|
|
124
124
|
import { taskRejectionCounters } from "./rejection-counters.js";
|
|
125
|
-
import { neverConsumedExpiryCounters, noteNeverConsumedExpiry, neverConsumeGate } from "./expiry-counters.js";
|
|
125
|
+
import { neverConsumedExpiryCounters, noteNeverConsumedExpiry, neverConsumeGate, persistentNeverConsumedExpiries } from "./expiry-counters.js";
|
|
126
126
|
import { legacyLicenseField, licenseStateOf } from "./license-state.js";
|
|
127
127
|
import { AVATAR_FIELD, avatarUrl, inspectAvatarImage, isMultipart, isValidAvatarVersion, MAX_AVATAR_BYTES, MAX_AVATAR_STORAGE_BYTES } from "./user-avatar-image.js";
|
|
128
128
|
|
|
@@ -5865,6 +5865,8 @@ return Bun.serve({
|
|
|
5865
5865
|
counters: neverConsumedExpiryCounters(),
|
|
5866
5866
|
force: body.force === true,
|
|
5867
5867
|
forceAllowed: !restAuth?.networkId,
|
|
5868
|
+
// #3271 —— 与 MCP 面同一份持久证据。
|
|
5869
|
+
persistent: persistentNeverConsumedExpiries(db, targetAlias, taskNetId ?? null),
|
|
5868
5870
|
});
|
|
5869
5871
|
if (!gate.ok) return reject(withCors(req, Response.json(gate, { status: 409 })));
|
|
5870
5872
|
}
|
|
@@ -210,7 +210,11 @@ describe("task consumed_at identity and lifecycle", () => {
|
|
|
210
210
|
expect(queued?.task).toBe(content);
|
|
211
211
|
expect(queued?.last_seen_at).toBe(before?.last_seen_at);
|
|
212
212
|
|
|
213
|
-
|
|
213
|
+
// #3275 批次 1 —— 同变量口径:断言的对象就是这次调用的返回值(不是「附近的某个断言」)。
|
|
214
|
+
// ack_inbox 成功路径的键集是**闭合的两态**:成功 {ok},失败 {ok, error}。
|
|
215
|
+
const acked = await call(nodeTools.ack_inbox, { alias: NODE_A, message_id: taskId });
|
|
216
|
+
expect(Object.keys(acked).sort()).toEqual(["ok"]);
|
|
217
|
+
expect(acked.ok).toBe(true);
|
|
214
218
|
expect(runtimeSubmittedAt(taskId)).toBeNull();
|
|
215
219
|
expect(consumedAt(taskId)).toBeNull();
|
|
216
220
|
});
|
package/src/tools.ts
CHANGED
|
@@ -112,7 +112,7 @@ import { parseHubTimestamp } from "./hub-timestamp";
|
|
|
112
112
|
import { noteTerminalResultRead, purgeLogsResultNow, sweepNodeRequestContent } from "./node-request-retention.js";
|
|
113
113
|
import { listTaskLateReplies } from "./task-late-replies.js";
|
|
114
114
|
import { pollPacer } from "./poll-pacing.js";
|
|
115
|
-
import { neverConsumedExpiryCounters, neverConsumeGate } from "./expiry-counters.js";
|
|
115
|
+
import { neverConsumedExpiryCounters, neverConsumeGate, persistentNeverConsumedExpiries } from "./expiry-counters.js";
|
|
116
116
|
import { auditDepartment, createDepartment, deleteDepartment, listDepartments, setAgentDepartment, updateDepartment } from "./departments.js";
|
|
117
117
|
|
|
118
118
|
function ts(): string {
|
|
@@ -2278,6 +2278,8 @@ export function registerTools(server: McpServer, clientIP?: string, enforceNetwo
|
|
|
2278
2278
|
counters: neverConsumedExpiryCounters(),
|
|
2279
2279
|
force: force === true,
|
|
2280
2280
|
forceAllowed: !callerTokenIsNetwork,
|
|
2281
|
+
// #3271 —— 进程内计数器随部署归零,所以必须并上 tasks 表里的历史(跨重启)。
|
|
2282
|
+
persistent: persistentNeverConsumedExpiries(db, targetAlias, effectiveNetId ?? null),
|
|
2281
2283
|
});
|
|
2282
2284
|
if (!gate.ok) return { content: [{ type: "text" as const, text: JSON.stringify(gate) }] };
|
|
2283
2285
|
}
|