Skip to content

Commit 9194c28

Browse files
yaacovcorcosclaude
andcommitted
fix(server): a desktop tab detached during setup no longer blocks later browser tabs
When the desktop detached a tab while the server was still setting it up, DesktopBrowserChannel shut down the tab's relay queue but kept Playwright's WebSocket open. Playwright then waited forever for CDP replies, so the tab's setup never settled. The desktop attach and preview event consumers await each setup in turn, so every desktop tab after it was never set up and kept showing the empty page over a page that had loaded. End the relay connection when its queue shuts down, so pending commands fail and the setup settles. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 5bb5d53 commit 9194c28

2 files changed

Lines changed: 53 additions & 3 deletions

File tree

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

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ import * as NodeServices from "@effect/platform-node/NodeServices";
22
import * as NodeStream from "@effect/platform-node/NodeStream";
33
import { expect, it } from "@effect/vitest";
44
import * as Effect from "effect/Effect";
5+
import * as Exit from "effect/Exit";
56
import * as Layer from "effect/Layer";
67
import * as Queue from "effect/Queue";
8+
import * as Scope from "effect/Scope";
79
import * as Stream from "effect/Stream";
810
import { vi } from "vite-plus/test";
911

@@ -65,3 +67,48 @@ it.effect("protects unknown desktop visibility until an explicit hidden report a
6567
),
6668
),
6769
);
70+
71+
it.live("closes a tab's relay connection when the desktop detaches the tab", () =>
72+
Effect.gen(function* () {
73+
const input = yield* Queue.unbounded<Uint8Array>();
74+
vi.mocked(NodeStream.fromReadable).mockReturnValue(Stream.fromQueue(input));
75+
const config = yield* ServerConfig.ServerConfig;
76+
yield* Effect.gen(function* () {
77+
const channel = yield* DesktopBrowserChannel.DesktopBrowserChannel;
78+
const key = { threadId: "thread-1", tabId: "tab-1" };
79+
const send = (event: object) =>
80+
Queue.offer(input, new TextEncoder().encode(`${JSON.stringify(event)}\n`));
81+
82+
yield* send({ type: "attached", ...key });
83+
yield* channel.awaitAttached(key, "5 seconds");
84+
const scope = yield* Scope.make();
85+
const url = yield* channel.endpoint(key).pipe(Scope.provide(scope));
86+
const socket = new WebSocket(url);
87+
const closed = new Promise<void>((resolve) =>
88+
socket.addEventListener("close", () => resolve()),
89+
);
90+
yield* Effect.promise(
91+
() => new Promise<void>((resolve) => socket.addEventListener("open", () => resolve())),
92+
);
93+
94+
// Playwright waits on this socket for CDP replies; it must learn the tab is gone.
95+
yield* send({ type: "detached", ...key });
96+
yield* Effect.promise(() => closed).pipe(Effect.timeout("2 seconds"));
97+
yield* Scope.close(scope, Exit.void);
98+
}).pipe(
99+
Effect.provide(
100+
DesktopBrowserChannel.layer.pipe(
101+
Layer.provide(
102+
ServerConfig.layer({ ...config, desktopBrowserFd: 41, desktopBrowserControlFd: 42 }),
103+
),
104+
),
105+
),
106+
);
107+
}).pipe(
108+
Effect.provide(
109+
ServerConfig.layerTest(process.cwd(), { prefix: "desktop-browser-channel-" }).pipe(
110+
Layer.provide(NodeServices.layer),
111+
),
112+
),
113+
),
114+
);

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,14 @@ const make = Effect.gen(function* () {
175175
connected = true;
176176
const writer = yield* socket.writer;
177177
const reader = yield* socket.reader;
178-
yield* Stream.fromQueue(queue).pipe(
178+
// A detach shuts the queue down. Ending here closes the socket, so Playwright's
179+
// pending commands fail instead of waiting forever for the tab to answer.
180+
const toPlaywright = Stream.fromQueue(queue).pipe(
179181
Stream.runForEach((message) => writer.write(message)),
180-
Effect.forkScoped,
182+
Effect.exit,
181183
);
182184
const decoder = new TextDecoder();
183-
return yield* reader.pull.pipe(
185+
const toDesktop = reader.pull.pipe(
184186
Effect.flatMap((frames) =>
185187
Effect.forEach(
186188
frames,
@@ -195,6 +197,7 @@ const make = Effect.gen(function* () {
195197
),
196198
Effect.forever,
197199
);
200+
return yield* Effect.raceFirst(toPlaywright, toDesktop);
198201
}).pipe(Effect.scoped, Effect.ignore),
199202
)
200203
.pipe(Effect.forkScoped);

0 commit comments

Comments
 (0)