Skip to content

Commit b9fd528

Browse files
committed
fix(server): preview tab list shows desktop tabs that loaded before the server attached
A desktop-rendered preview tab navigates by itself, and the server attaches its load listener only after connecting. A page that finished loading in that gap never reported Success, so t3_preview_list kept showing Loading with an empty title while preview_status showed the live page. The tab now reports a load that already happened once its listeners are in place.
1 parent 5ef5685 commit b9fd528

2 files changed

Lines changed: 34 additions & 3 deletions

File tree

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

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ vi.mock("./ServerBrowserContexts.ts", () => ({
5555
return makeEncoderPage() as unknown as Page;
5656
}
5757
async connectDesktopPage(endpoint: string) {
58-
const context = makeContext();
58+
const context = makeContext(undefined, desktopPageUrl);
5959
desktopConnections.push({ endpoint, context });
6060
return { browser: { close: async () => {} }, page: context.page as unknown as Page };
6161
}
@@ -123,12 +123,12 @@ function makeSession(frame?: ReturnType<typeof makeFrame>) {
123123
};
124124
}
125125

126-
function makeContext(onClose?: (context: BrowserContext) => void) {
126+
function makeContext(onClose?: (context: BrowserContext) => void, initialUrl = "about:blank") {
127127
const events = new NodeEvents.EventEmitter();
128128
const nativeFileChooser = vi.fn();
129129
const setChooserFiles = vi.fn(async (_files: unknown) => {});
130130
const sessions: ReturnType<typeof makeSession>[] = [];
131-
let url = "about:blank";
131+
let url = initialUrl;
132132
let viewport = { width: 1280, height: 800 };
133133
let closed = false;
134134
let contextClosed = false;
@@ -268,6 +268,7 @@ let focusedFrame: ReturnType<typeof makeFrame> | null = null;
268268
let contextFailure: Error | null = null;
269269
let initialNavigation: (() => Promise<void>) | null = null;
270270
let desktopRendersNext = false;
271+
let desktopPageUrl = "about:blank";
271272
const desktopDetaches = new NodeEvents.EventEmitter();
272273
const desktopTabs = new Set<string>();
273274
const desktopRenders = (tabId: string) => {
@@ -380,6 +381,7 @@ beforeEach(() => {
380381
focusedFrame = null;
381382
desktopTabs.clear();
382383
desktopRendersNext = false;
384+
desktopPageUrl = "about:blank";
383385
releasedDesktopTabs.length = 0;
384386
desktopConnections.length = 0;
385387
});
@@ -494,6 +496,33 @@ it.effect("a tab the desktop does not draw is marked headless, so the desktop st
494496
).pipe(Effect.provide(layer)),
495497
);
496498

499+
it.live("a desktop page that loaded before the server attached reports its loaded title", () =>
500+
Effect.scoped(
501+
Effect.gen(function* () {
502+
const { broker } = yield* ready;
503+
const manager = yield* Manager.PreviewManager;
504+
const events = yield* manager.subscribeEvents;
505+
desktopRendersNext = true;
506+
desktopPageUrl = "https://example.com/loaded";
507+
const opened = yield* broker.invoke<PreviewAutomationStatus>({
508+
scope,
509+
operation: "open",
510+
input: { url: desktopPageUrl, reuseExistingTab: false, show: false },
511+
});
512+
let event = yield* PubSub.take(events);
513+
while (event.type !== "navigated" || event.tabId !== opened.tabId) {
514+
event = yield* PubSub.take(events);
515+
}
516+
517+
expect(event.snapshot.navStatus).toEqual({
518+
_tag: "Success",
519+
url: "https://example.com/loaded",
520+
title: "test page",
521+
});
522+
}),
523+
).pipe(Effect.provide(layer)),
524+
);
525+
497526
it.live.each([
498527
{ method: "goto" as const, message: { type: "navigate", url: "http://10.255.255.1/" } },
499528
{ method: "goBack" as const, message: { type: "history", delta: -1 } },

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,8 @@ const make = Effect.gen(function* () {
905905
page.on("crash", () => dropTab(tab, true));
906906
tabs.set(key, tab);
907907
reportLiveTabs();
908+
// A desktop page navigates on its own and can finish loading before these listeners attach.
909+
if (desktop) void page.waitForLoadState("load").then(() => reportLoaded(tab), constVoid);
908910
// Existing desktop and popup PDFs can start loading before interception attaches.
909911
if (
910912
snapshot.navStatus._tag === "Loading" &&

0 commit comments

Comments
 (0)