fix(gateway): tighten session delivery recovery · openclaw/openclaw@03addfe

Recent Commits to openclaw:main

fuller-stack · 2026-04-25 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ export function isSessionDeliveryEligibleForRetry(`
`72`	`72`	`entry: QueuedSessionDelivery,`
`73`	`73`	`now: number,`
`74`	`74`	`): { eligible: true } \| { eligible: false; remainingBackoffMs: number } {`
`75`		`-const backoff = computeSessionDeliveryBackoffMs(entry.retryCount + 1);`
	`75`	`+const backoff = computeSessionDeliveryBackoffMs(entry.retryCount);`
`76`	`76`	`if (backoff <= 0) {`
`77`	`77`	`return { eligible: true };`
`78`	`78`	`}`

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import { generateSecureUuid } from "./secure-random.js";`
`7`	`7`
`8`	`8`	`const QUEUE_DIRNAME = "session-delivery-queue";`
`9`	`9`	`const FAILED_DIRNAME = "failed";`
	`10`	`+const TMP_SWEEP_MAX_AGE_MS = 5_000;`
`10`	`11`
`11`	`12`	`export type SessionDeliveryContext = {`
`12`	`13`	`channel?: string;`
`@@ -71,6 +72,23 @@ async function unlinkBestEffort(filePath: string): Promise<void> {`
`71`	`72`	`}`
`72`	`73`	`}`
`73`	`74`
	`75`	`+async function unlinkStaleTmpBestEffort(filePath: string, now: number): Promise<void> {`
	`76`	`+try {`
	`77`	`+const stat = await fs.promises.stat(filePath);`
	`78`	`+if (!stat.isFile()) {`
	`79`	`+return;`
	`80`	`+}`
	`81`	`+if (now - stat.mtimeMs < TMP_SWEEP_MAX_AGE_MS) {`
	`82`	`+return;`
	`83`	`+}`
	`84`	`+await unlinkBestEffort(filePath);`
	`85`	`+} catch (err) {`
	`86`	`+if (getErrnoCode(err) !== "ENOENT") {`
	`87`	`+throw err;`
	`88`	`+}`
	`89`	`+}`
	`90`	`+}`
	`91`	`+`
`74`	`92`	`async function writeQueueEntry(filePath: string, entry: QueuedSessionDelivery): Promise<void> {`
`75`	`93`	const tmp = `${filePath}.${process.pid}.tmp`;
`76`	`94`	`await fs.promises.writeFile(tmp, JSON.stringify(entry, null, 2), {`
`@@ -205,9 +223,12 @@ export async function loadPendingSessionDeliveries(`
`205`	`223`	`throw err;`
`206`	`224`	`}`
`207`	`225`
	`226`	`+const now = Date.now();`
`208`	`227`	`for (const file of files) {`
`209`		`-if (file.endsWith(".delivered") \|\| file.endsWith(".tmp")) {`
	`228`	`+if (file.endsWith(".delivered")) {`
`210`	`229`	`await unlinkBestEffort(path.join(queueDir, file));`
	`230`	`+} else if (file.endsWith(".tmp")) {`
	`231`	`+await unlinkStaleTmpBestEffort(path.join(queueDir, file), now);`
`211`	`232`	`}`
`212`	`233`	`}`
`213`	`234`

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@ import { describe, expect, it, vi } from "vitest";`
`2`	`2`	`import { withTempDir } from "../test-helpers/temp-dir.js";`
`3`	`3`	`import {`
`4`	`4`	`enqueueSessionDelivery,`
	`5`	`+failSessionDelivery,`
	`6`	`+isSessionDeliveryEligibleForRetry,`
`5`	`7`	`loadPendingSessionDeliveries,`
`6`	`8`	`recoverPendingSessionDeliveries,`
`7`	`9`	`} from "./session-delivery-queue.js";`
`@@ -115,4 +117,35 @@ describe("session-delivery queue recovery", () => {`
`115`	`117`
`116`	`118`	`vi.useRealTimers();`
`117`	`119`	`});`
	`120`	`+`
	`121`	`+it("uses the persisted retryCount for the first backoff tier", async () => {`
	`122`	`+vi.useFakeTimers();`
	`123`	`+vi.setSystemTime(new Date("2026-04-23T00:00:00.000Z"));`
	`124`	`+`
	`125`	`+await withTempDir({ prefix: "openclaw-session-delivery-" }, async (tempDir) => {`
	`126`	`+const id = await enqueueSessionDelivery(`
	`127`	`+{`
	`128`	`+kind: "systemEvent",`
	`129`	`+sessionKey: "agent:main:main",`
	`130`	`+text: "retry me",`
	`131`	`+},`
	`132`	`+tempDir,`
	`133`	`+);`
	`134`	`+await failSessionDelivery(id, "transient failure", tempDir);`
	`135`	`+`
	`136`	`+const [failedEntry] = await loadPendingSessionDeliveries(tempDir);`
	`137`	`+expect(failedEntry).toBeDefined();`
	`138`	`+expect(failedEntry?.retryCount).toBe(1);`
	`139`	`+expect(failedEntry?.lastAttemptAt).toBeDefined();`
	`140`	`+`
	`141`	`+const lastAttemptAt = failedEntry?.lastAttemptAt ?? 0;`
	`142`	`+const notReady = isSessionDeliveryEligibleForRetry(failedEntry, lastAttemptAt + 4_999);`
	`143`	`+expect(notReady).toEqual({ eligible: false, remainingBackoffMs: 1 });`
	`144`	`+`
	`145`	`+const ready = isSessionDeliveryEligibleForRetry(failedEntry, lastAttemptAt + 5_000);`
	`146`	`+expect(ready).toEqual({ eligible: true });`
	`147`	`+});`
	`148`	`+`
	`149`	`+vi.useRealTimers();`
	`150`	`+});`
`118`	`151`	`});`

Original file line number	Diff line number	Diff line change
`@@ -72,10 +72,24 @@ describe("session-delivery queue storage", () => {`
`72`	`72`	`);`
`73`	`73`	`const tmpPath = path.join(resolveSessionDeliveryQueueDir(tempDir), "orphan-entry.tmp");`
`74`	`74`	`fs.writeFileSync(tmpPath, "stale tmp");`
	`75`	`+const staleAt = new Date(Date.now() - 60_000);`
	`76`	`+fs.utimesSync(tmpPath, staleAt, staleAt);`
`75`	`77`
`76`	`78`	`await loadPendingSessionDeliveries(tempDir);`
`77`	`79`
`78`	`80`	`expect(fs.existsSync(tmpPath)).toBe(false);`
`79`	`81`	`});`
`80`	`82`	`});`
	`83`	`+`
	`84`	`+it("keeps fresh temporary queue files while a write may still be in flight", async () => {`
	`85`	`+await withTempDir({ prefix: "openclaw-session-delivery-" }, async (tempDir) => {`
	`86`	`+const tmpPath = path.join(resolveSessionDeliveryQueueDir(tempDir), "active-entry.tmp");`
	`87`	`+fs.mkdirSync(path.dirname(tmpPath), { recursive: true });`
	`88`	`+fs.writeFileSync(tmpPath, "active tmp");`
	`89`	`+`
	`90`	`+await loadPendingSessionDeliveries(tempDir);`
	`91`	`+`
	`92`	`+expect(fs.existsSync(tmpPath)).toBe(true);`
	`93`	`+});`
	`94`	`+});`
`81`	`95`	`});`

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

推荐订阅源

Recent Commits to openclaw:main