github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-12 00:53:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(browser): share playwright download wait/save flow

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-18 18:22:10 +00:00
parent 7bf9b6e52f
commit e103323014
1 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/browser/pw-tools-core.downloads.ts
View File

@@ -102,6 +102,42 @@ function createPageDownloadWaiter(page: Page, timeoutMs: number) {
}; };
} }
type DownloadPayload = {
url?: () => string;
suggestedFilename?: () => string;
saveAs?: (outPath: string) => Promise<void>;
};
async function saveDownloadPayload(download: DownloadPayload, outPath: string) {
const suggested = download.suggestedFilename?.() || "download.bin";
const resolvedOutPath = outPath?.trim() || buildTempDownloadPath(suggested);
await fs.mkdir(path.dirname(resolvedOutPath), { recursive: true });
await download.saveAs?.(resolvedOutPath);
return {
url: download.url?.() || "",
suggestedFilename: suggested,
path: path.resolve(resolvedOutPath),
};
}
async function awaitDownloadPayload(params: {
waiter: ReturnType<typeof createPageDownloadWaiter>;
state: ReturnType<typeof ensurePageState>;
armId: number;
outPath?: string;
}) {
try {
const download = (await params.waiter.promise) as DownloadPayload;
if (params.state.armIdDownload !== params.armId) {
throw new Error("Download was superseded by another waiter");
}
return await saveDownloadPayload(download, params.outPath ?? "");
} catch (err) {
params.waiter.cancel();
throw err;
}
}
export async function armFileUploadViaPlaywright(opts: { export async function armFileUploadViaPlaywright(opts: {
cdpUrl: string; cdpUrl: string;
targetId?: string; targetId?: string;
@@ -200,28 +236,7 @@ export async function waitForDownloadViaPlaywright(opts: {
const armId = state.armIdDownload; const armId = state.armIdDownload;
const waiter = createPageDownloadWaiter(page, timeout); const waiter = createPageDownloadWaiter(page, timeout);
try { return await awaitDownloadPayload({ waiter, state, armId, outPath: opts.path });
const download = (await waiter.promise) as {
url?: () => string;
suggestedFilename?: () => string;
saveAs?: (outPath: string) => Promise<void>;
};
if (state.armIdDownload !== armId) {
throw new Error("Download was superseded by another waiter");
}
const suggested = download.suggestedFilename?.() || "download.bin";
const outPath = opts.path?.trim() || buildTempDownloadPath(suggested);
await fs.mkdir(path.dirname(outPath), { recursive: true });
await download.saveAs?.(outPath);
return {
url: download.url?.() || "",
suggestedFilename: suggested,
path: path.resolve(outPath),
};
} catch (err) {
waiter.cancel();
throw err;
}
} }
export async function downloadViaPlaywright(opts: { export async function downloadViaPlaywright(opts: {
@@ -257,23 +272,7 @@ export async function downloadViaPlaywright(opts: {
} catch (err) { } catch (err) {
throw toAIFriendlyError(err, ref); throw toAIFriendlyError(err, ref);
} }
return await awaitDownloadPayload({ waiter, state, armId, outPath });
const download = (await waiter.promise) as {
url?: () => string;
suggestedFilename?: () => string;
saveAs?: (outPath: string) => Promise<void>;
};
if (state.armIdDownload !== armId) {
throw new Error("Download was superseded by another waiter");
}
const suggested = download.suggestedFilename?.() || "download.bin";
await fs.mkdir(path.dirname(outPath), { recursive: true });
await download.saveAs?.(outPath);
return {
url: download.url?.() || "",
suggestedFilename: suggested,
path: path.resolve(outPath),
};
} catch (err) { } catch (err) {
waiter.cancel(); waiter.cancel();
throw err; throw err;