fix(browser): keep upload errors specific #101465
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| import { beforeEach, describe, expect, it, vi } from "vitest"; | ||
|
|
||
| const clientFetchMocks = vi.hoisted(() => ({ | ||
| fetchBrowserJson: vi.fn(async (..._args: unknown[]) => ({ ok: true })), | ||
| })); | ||
|
|
||
| vi.mock("./client-fetch.js", () => clientFetchMocks); | ||
|
|
||
| import { browserArmDialog, browserArmFileChooser } from "./client-actions-core.js"; | ||
|
|
||
| function lastFetchCall(): { url: string; options: { body?: string; timeoutMs?: number } } { | ||
| const call = clientFetchMocks.fetchBrowserJson.mock.calls.at(-1); | ||
| if (!call) { | ||
| throw new Error("fetchBrowserJson was not called"); | ||
| } | ||
| return { | ||
| url: String(call[0]), | ||
| options: call[1] as { body?: string; timeoutMs?: number }, | ||
| }; | ||
| } | ||
|
|
||
| describe("browser hook client actions", () => { | ||
| beforeEach(() => vi.clearAllMocks()); | ||
|
|
||
| it("adds transport slack to an atomic file chooser upload", async () => { | ||
| await browserArmFileChooser(undefined, { | ||
| paths: ["/tmp/openclaw/uploads/report.pdf"], | ||
| ref: "e12", | ||
| targetId: "tab-1", | ||
| timeoutMs: 30_000, | ||
| profile: "openclaw", | ||
| }); | ||
|
|
||
| const call = lastFetchCall(); | ||
| expect(call.url).toBe("/hooks/file-chooser?profile=openclaw"); | ||
| expect(call.options.timeoutMs).toBe(35_000); | ||
| expect(JSON.parse(call.options.body ?? "{}")).toEqual({ | ||
| paths: ["/tmp/openclaw/uploads/report.pdf"], | ||
| ref: "e12", | ||
| targetId: "tab-1", | ||
| timeoutMs: 30_000, | ||
| }); | ||
| }); | ||
|
|
||
| it("preserves paths-only arming with the advertised 120 second default", async () => { | ||
| await browserArmFileChooser(undefined, { | ||
| paths: ["/tmp/openclaw/uploads/report.pdf"], | ||
| }); | ||
|
|
||
| const call = lastFetchCall(); | ||
| expect(call.url).toBe("/hooks/file-chooser"); | ||
| expect(call.options.timeoutMs).toBe(125_000); | ||
| expect(JSON.parse(call.options.body ?? "{}")).toEqual({ | ||
| paths: ["/tmp/openclaw/uploads/report.pdf"], | ||
| }); | ||
| }); | ||
|
|
||
| it("keeps dialog hook requests alive past their operation timeout", async () => { | ||
| await browserArmDialog(undefined, { accept: true, timeoutMs: 45_000 }); | ||
|
|
||
| const call = lastFetchCall(); | ||
| expect(call.url).toBe("/hooks/dialog"); | ||
| expect(call.options.timeoutMs).toBe(50_000); | ||
| expect(JSON.parse(call.options.body ?? "{}")).toEqual({ | ||
| accept: true, | ||
| timeoutMs: 45_000, | ||
| }); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When an atomic upload includes
refand a smalltimeoutMs(for example 1000ms), this changed watchdog becomes onlytimeoutMs + 5000, but the server route applies that timeout only toarmFileUploadViaPlaywright; the subsequentclickViaPlaywrightinextensions/browser/src/browser/routes/agent.act.hooks.tsis called withouttimeoutMsand falls back to the 8000ms interaction default fromact-policy.ts. For a stale/hidden trigger ref, the client can still abort first and return the generic browser-control timeout this change is trying to avoid. Either include the trigger-click timeout/default in this outer timeout calculation or pass the upload timeout through to the trigger click.Useful? React with 👍 / 👎.