fix(workboard): bound claim expiry timestamps · openclaw/openclaw@6c7642b

Recent Commits to openclaw:main

steipete · 2026-05-30 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import { MAX_DATE_TIMESTAMP_MS } from "openclaw/plugin-sdk/number-runtime";`
`1`	`2`	`import { describe, expect, it, vi } from "vitest";`
`2`	`3`	`import {`
`3`	`4`	`WorkboardStore,`
`@@ -499,7 +500,7 @@ describe("WorkboardStore", () => {`
`499`	`500`	`expect(released.metadata?.claim).toBeUndefined();`
`500`	`501`	`});`
`501`	`502`
`502`		`-it("caps oversized claim TTL seconds before storing expiry", async () => {`
	`503`	`+it("caps oversized claim TTL seconds to a valid Date timestamp", async () => {`
`503`	`504`	`vi.useFakeTimers();`
`504`	`505`	`try {`
`505`	`506`	`vi.setSystemTime(1_000);`
`@@ -511,7 +512,7 @@ describe("WorkboardStore", () => {`
`511`	`512`	`ttlSeconds: Number.MAX_SAFE_INTEGER,`
`512`	`513`	`});`
`513`	`514`
`514`		`-expect(claimed.card.metadata?.claim?.expiresAt).toBe(Number.MAX_SAFE_INTEGER);`
	`515`	`+expect(claimed.card.metadata?.claim?.expiresAt).toBe(MAX_DATE_TIMESTAMP_MS);`
`515`	`516`	`} finally {`
`516`	`517`	`vi.useRealTimers();`
`517`	`518`	`}`
`@@ -1179,6 +1180,23 @@ describe("WorkboardStore", () => {`
`1179`	`1180`	`}`
`1180`	`1181`	`});`
`1181`	`1182`
	`1183`	`+it("caps heartbeat claim renewal to a valid Date timestamp", async () => {`
	`1184`	`+vi.useFakeTimers();`
	`1185`	`+try {`
	`1186`	`+vi.setSystemTime(MAX_DATE_TIMESTAMP_MS - 30_000);`
	`1187`	`+const store = new WorkboardStore(createMemoryStore());`
	`1188`	`+const card = await store.create({ title: "Near date limit" });`
	`1189`	`+await store.claim(card.id, { ownerId: "main", ttlSeconds: 60 });`
	`1190`	`+`
	`1191`	`+vi.setSystemTime(MAX_DATE_TIMESTAMP_MS - 10_000);`
	`1192`	`+const heartbeat = await store.heartbeat(card.id, { ownerId: "main" });`
	`1193`	`+`
	`1194`	`+expect(heartbeat.metadata?.claim?.expiresAt).toBe(MAX_DATE_TIMESTAMP_MS);`
	`1195`	`+} finally {`
	`1196`	`+vi.useRealTimers();`
	`1197`	`+}`
	`1198`	`+});`
	`1199`	`+`
`1182`	`1200`	`it("keeps the claim when release status validation fails", async () => {`
`1183`	`1201`	`const store = new WorkboardStore(createMemoryStore());`
`1184`	`1202`	`const card = await store.create({ title: "Keep claim" });`

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
`1`	`1`	`import { randomUUID } from "node:crypto";`
	`2`	`+import {`
	`3`	`+MAX_DATE_TIMESTAMP_MS,`
	`4`	`+resolveExpiresAtMsFromDurationMs,`
	`5`	`+} from "openclaw/plugin-sdk/number-runtime";`
`2`	`6`	`import {`
`3`	`7`	`WORKBOARD_DIAGNOSTIC_KINDS,`
`4`	`8`	`WORKBOARD_DIAGNOSTIC_SEVERITIES,`
`@@ -61,20 +65,16 @@ const READY_STRANDED_MS = 60 * 60 * 1000;`
`61`	`65`	`const RUNNING_HEARTBEAT_STALE_MS = 20 * 60 * 1000;`
`62`	`66`	`const BLOCKED_TOO_LONG_MS = 24 * 60 * 60 * 1000;`
`63`	`67`	`const CLAIM_RECLAIM_MS = 5 * 60 * 1000;`
`64`		`-const MAX_SAFE_WORKBOARD_DURATION_MS = Number.MAX_SAFE_INTEGER;`
`65`	`68`
`66`	`69`	`function secondsToDurationMs(seconds: number): number {`
`67`	`70`	`const ms = Math.trunc(seconds) * 1000;`
`68`	`71`	`return Number.isFinite(ms)`
`69`		`- ? Math.min(MAX_SAFE_WORKBOARD_DURATION_MS, Math.max(1, ms))`
`70`		`- : MAX_SAFE_WORKBOARD_DURATION_MS;`
	`72`	`+ ? Math.min(MAX_DATE_TIMESTAMP_MS, Math.max(1, ms))`
	`73`	`+ : MAX_DATE_TIMESTAMP_MS;`
`71`	`74`	`}`
`72`	`75`
`73`	`76`	`function addWorkboardDurationMs(now: number, durationMs: number): number {`
`74`		`-const expiresAt = now + durationMs;`
`75`		`-return Number.isFinite(expiresAt)`
`76`		`- ? Math.min(MAX_SAFE_WORKBOARD_DURATION_MS, expiresAt)`
`77`		`- : MAX_SAFE_WORKBOARD_DURATION_MS;`
	`77`	`+return resolveExpiresAtMsFromDurationMs(durationMs, { nowMs: now }) ?? MAX_DATE_TIMESTAMP_MS;`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`export type PersistedWorkboardCard = {`
`@@ -2782,12 +2782,14 @@ export class WorkboardStore {`
`2782`	`2782`	`...claim,`
`2783`	`2783`	`lastHeartbeatAt: now,`
`2784`	`2784`	`expiresAt: claim.expiresAt`
`2785`		`- ? now +`
`2786`		`-Math.max(`
`2787`		`-1,`
`2788`		`-claim.expiresAt > claim.claimedAt`
`2789`		`- ? claim.expiresAt - claim.lastHeartbeatAt`
`2790`		`- : DEFAULT_CLAIM_TTL_MS,`
	`2785`	`+ ? addWorkboardDurationMs(`
	`2786`	`+now,`
	`2787`	`+Math.max(`
	`2788`	`+1,`
	`2789`	`+claim.expiresAt > claim.claimedAt`
	`2790`	`+ ? claim.expiresAt - claim.lastHeartbeatAt`
	`2791`	`+ : DEFAULT_CLAIM_TTL_MS,`
	`2792`	`+),`
`2791`	`2793`	`)`
`2792`	`2794`	`: undefined,`
`2793`	`2795`	`};`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main