dilim/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-13 17:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(synology-chat): remove duplicate local deliver timeout (#95707)

Browse Source 
Merged via squash.

Prepared head SHA: a9860099c9
Co-authored-by: vincentkoc <25068+vincentkoc@users.noreply.github.com>
Co-authored-by: vincentkoc <25068+vincentkoc@users.noreply.github.com>
Reviewed-by: @vincentkoc
This commit is contained in:
Vincent Koc
2026-06-22 17:45:59 +08:00
committed by GitHub
parent 03a71f3b46
commit 387b5337ec
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
extensions/synology-chat/src/webhook-handler.test.ts
View File

@@ -619,6 +619,37 @@ describe("createWebhookHandler", () => {
expectBotReplySentTo("123");
});
it("awaits deliver directly with no local hardcoded timeout wrapper", async () => {
// Previously this webhook handler wrapped deliver with a hardcoded 120s
// Promise.race that overrode the configurable agents.defaults.timeoutSeconds
// from core. That wrapper created a setTimeout(_, 120000) on every deliver
// call. We spy on setTimeout to prove no such call exists in the current code.
const setTimeoutSpy = vi.spyOn(global, "setTimeout");
try {
const deliver = vi.fn().mockResolvedValue("late reply");
const handler = createWebhookHandler({
account: makeAccount({ accountId: "no-hardcoded-timeout-" + Date.now() }),
deliver,
log,
});
const res = makeRes();
const req = makeReq("POST", validBody);
await handler(req, res);
expect(res.status).toBe(204);
// Collect all setTimeout delays used during this handler run
const delays = setTimeoutSpy.mock.calls.map((call) => call[1]);
// Every delay should be well under 120s — the old hardcoded wrapper would
// have produced exactly one call with delay === 120000.
const longDelays = delays.filter((d) => typeof d === "number" && d >= 120_000);
expect(longDelays).toEqual([]);
} finally {
setTimeoutSpy.mockRestore();
}
});
it("sanitizes input before delivery", async () => {
const deliver = vi.fn().mockResolvedValue(null);
const handler = createWebhookHandler({

6
extensions/synology-chat/src/webhook-handler.ts
View File

@@ -554,7 +554,7 @@ async function processAuthorizedSynologyWebhook(params: {
log: params.log,
});
const deliverPromise = params.deliver({
const reply = await params.deliver({
body: params.message.body,
from: authorizedWebhookUserId,
senderName: params.message.payload.username,
@@ -564,10 +564,6 @@ async function processAuthorizedSynologyWebhook(params: {
commandAuthorized: params.message.commandAuthorized,
chatUserId: deliveryUserId,
});
const timeoutPromise = new Promise<null>((_, reject) => {
setTimeout(() => reject(new Error("Agent response timeout (120s)")), 120_000);
});
const reply = await Promise.race([deliverPromise, timeoutPromise]);
if (!reply) {
return;
}