Skip to content

Commit c1f1d7f

Browse files
committed
fix(server): serialize overlapping file picker offers
1 parent b353d69 commit c1f1d7f

2 files changed

Lines changed: 46 additions & 1 deletion

File tree

‎apps/server/src/preview/ServerBrowser.test.ts‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,6 +1106,46 @@ it.live("a page's file picker goes to the controller and takes its uploaded file
11061106
).pipe(Effect.provide(layer)),
11071107
);
11081108

1109+
it.live("overlapping file pickers keep the newer offer answerable", () =>
1110+
Effect.scoped(
1111+
Effect.gen(function* () {
1112+
const { browser, tabId } = yield* ready;
1113+
const page = contexts[0]!.page;
1114+
const viewer = yield* browser.attachViewer(viewerInput(tabId, true));
1115+
yield* viewer.input({ type: "takeControl" });
1116+
const accept = Promise.withResolvers<string | null>();
1117+
const firstFiles = vi.fn(async (_files: unknown) => {});
1118+
const secondFiles = vi.fn(async (_files: unknown) => {});
1119+
page.emit("filechooser", {
1120+
isMultiple: () => false,
1121+
element: () => ({ ...fileChooserElement(""), getAttribute: () => accept.promise }),
1122+
setFiles: firstFiles,
1123+
});
1124+
page.emit("filechooser", {
1125+
isMultiple: () => false,
1126+
element: () => fileChooserElement(".csv"),
1127+
setFiles: secondFiles,
1128+
});
1129+
accept.resolve(".txt");
1130+
let first = yield* Queue.take(viewer.output);
1131+
while (first._tag !== "fileChooser") first = yield* Queue.take(viewer.output);
1132+
let second = yield* Queue.take(viewer.output);
1133+
while (second._tag !== "fileChooser") second = yield* Queue.take(viewer.output);
1134+
expect(second.accept).toBe(".csv");
1135+
expect(
1136+
yield* browser.answerFileChooser({
1137+
threadId: scope.thread.threadId,
1138+
tabId,
1139+
chooserId: second.id,
1140+
files: [{ name: "a.csv", mimeType: "text/csv", buffer: Buffer.from("a") }],
1141+
}),
1142+
).toBe(true);
1143+
expect(firstFiles).not.toHaveBeenCalled();
1144+
expect(secondFiles).toHaveBeenCalledOnce();
1145+
}),
1146+
).pipe(Effect.provide(layer)),
1147+
);
1148+
11091149
it.live("a detached file picker stays open across same-document navigation", () =>
11101150
Effect.scoped(
11111151
Effect.gen(function* () {

‎apps/server/src/preview/ServerBrowser.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,7 @@ const make = Effect.gen(function* () {
741741
const control = new SessionControl(snapshot.automationOwner ?? null, () =>
742742
ServerBrowserPage.invalidateRefs(page),
743743
);
744+
let pendingFileChooserOffer = Promise.resolve();
744745
const tab: ServerTab = {
745746
threadId: ThreadId.make(snapshot.threadId),
746747
tabId: snapshot.tabId,
@@ -756,7 +757,11 @@ const make = Effect.gen(function* () {
756757
control,
757758
agentOperating: false,
758759
fileChooserIntercepted: false,
759-
onFileChooser: (chooser) => void offerFileChooser(tab, chooser),
760+
onFileChooser: (chooser) => {
761+
pendingFileChooserOffer = pendingFileChooserOffer
762+
.then(() => offerFileChooser(tab, chooser))
763+
.catch(constVoid);
764+
},
760765
isolatedContext,
761766
desktop: desktop === null ? null : { close: desktop.close },
762767
profileId: snapshot.profileId,

0 commit comments

Comments
 (0)