Skip to content

Commit 6482143

Browse files
Merge remote-tracking branch 'origin/main' into pr-33038
2 parents b78ce34 + ac5e48c commit 6482143

28 files changed

Lines changed: 1154 additions & 141 deletions

‎apps/desktop/src/preview/DesktopBrowserHost.test.ts‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ const command = (
3434
const makeDebuggee = (
3535
options: {
3636
readonly deferFocus?: boolean;
37+
/** The guest is still loading its first page. */
38+
readonly loading?: boolean;
3739
readonly refuse?: (method: string, sessionId: string | undefined) => boolean;
3840
} = {},
3941
) => {
@@ -69,10 +71,13 @@ const makeDebuggee = (
6971
sendWaiters.shift()?.();
7072
}),
7173
});
74+
let destroyed = false;
7275
const webContents = Object.assign(new NodeEvents.EventEmitter(), {
7376
getURL: () => "http://localhost/",
7477
getTitle: () => "Page",
7578
getUserAgent: () => "Electron",
79+
isLoadingMainFrame: () => options.loading === true,
80+
isDestroyed: () => destroyed,
7681
});
7782
return {
7883
tab: {
@@ -81,6 +86,12 @@ const makeDebuggee = (
8186
},
8287
emit: (method: string, params: unknown) => emitter.emit("message", {}, method, params, ""),
8388
navigate: () => webContents.emit("did-navigate"),
89+
domReady: () => webContents.emit("dom-ready"),
90+
destroy: () => {
91+
destroyed = true;
92+
},
93+
failLoad: (code: number) =>
94+
webContents.emit("did-fail-load", {}, code, "Failed", "http://localhost/", true),
8495
/** Ids of the commands the debugger received, in order. */
8596
sent,
8697
focusEmulation,
@@ -144,6 +155,71 @@ describe("DesktopBrowserHost", () => {
144155
}),
145156
);
146157

158+
it.effect("announces a guest still loading its first page only once that page is up", () =>
159+
Effect.gen(function* () {
160+
const host = yield* DesktopBrowserHost.make;
161+
const loading = makeDebuggee({ loading: true });
162+
const other = { ...key, tabId: "tab-2" };
163+
const reader = yield* takeEvents(host, 3).pipe(Effect.forkScoped);
164+
165+
yield* Effect.yieldNow;
166+
host.attach(key, loading.tab);
167+
host.setShown(key, true);
168+
host.attach(other, makeDebuggee().tab);
169+
loading.domReady();
170+
171+
expect(yield* Fiber.join(reader)).toEqual([
172+
{ type: "attached", ...other },
173+
{ type: "attached", ...key },
174+
{ type: "shown", ...key, shown: true },
175+
]);
176+
}),
177+
);
178+
179+
it.effect(
180+
"keeps a loading guest unannounced across a replaced navigation and a new backend",
181+
() =>
182+
Effect.gen(function* () {
183+
const host = yield* DesktopBrowserHost.make;
184+
const loading = makeDebuggee({ loading: true });
185+
const other = { ...key, tabId: "tab-2" };
186+
host.attach(key, loading.tab);
187+
loading.failLoad(-3);
188+
const reader = yield* takeEvents(host, 2).pipe(Effect.forkScoped);
189+
190+
yield* Effect.yieldNow;
191+
host.attach(other, makeDebuggee().tab);
192+
loading.domReady();
193+
194+
expect(yield* Fiber.join(reader)).toEqual([
195+
{ type: "attached", ...other },
196+
{ type: "attached", ...key },
197+
]);
198+
}),
199+
);
200+
201+
it.effect(
202+
"announces a first page that never comes up, but never a tab closed or destroyed first",
203+
() =>
204+
Effect.gen(function* () {
205+
const host = yield* DesktopBrowserHost.make;
206+
const closed = { ...key, tabId: "tab-2" };
207+
const destroyed = { ...key, tabId: "tab-3" };
208+
const destroyedGuest = makeDebuggee({ loading: true });
209+
const reader = yield* takeEvents(host, 1).pipe(Effect.forkScoped);
210+
211+
yield* Effect.yieldNow;
212+
host.attach(closed, makeDebuggee({ loading: true }).tab);
213+
host.detach(closed);
214+
host.attach(destroyed, destroyedGuest.tab);
215+
destroyedGuest.destroy();
216+
host.attach(key, makeDebuggee({ loading: true }).tab);
217+
yield* TestClock.adjust("5 seconds");
218+
219+
expect(yield* Fiber.join(reader)).toEqual([{ type: "attached", ...key }]);
220+
}),
221+
);
222+
147223
it.effect("re-sends shown to a backend that starts later and when a tab attaches again", () =>
148224
Effect.gen(function* () {
149225
const host = yield* DesktopBrowserHost.make;

‎apps/desktop/src/preview/DesktopBrowserHost.ts‎

Lines changed: 55 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
import * as Context from "effect/Context";
99
import * as NodePath from "node:path";
1010
import * as Effect from "effect/Effect";
11+
import * as Fiber from "effect/Fiber";
1112
import * as Layer from "effect/Layer";
1213
import * as Option from "effect/Option";
1314
import * as PubSub from "effect/PubSub";
@@ -26,6 +27,9 @@ const AGENT_INPUT_COMMAND =
2627
const AGENT_INPUT_METHOD = /^(?:Input\.|Page\.navigate$|Runtime\.(?:evaluate|callFunctionOn)$)/;
2728
const AGENT_DOWNLOAD_WINDOW_MS = 5_000;
2829
const FOCUS_IDLE = "5 seconds";
30+
/** Well inside the server's 10 s DESKTOP_ATTACH_TIMEOUT, for a first page that never reports it is up. */
31+
const FIRST_PAGE_TIMEOUT = "5 seconds";
32+
const ERR_ABORTED = -3;
2933

3034
export interface DesktopBrowserTabKey {
3135
readonly threadId: string;
@@ -78,6 +82,8 @@ interface AttachedTab {
7882
sessionId: string,
7983
) => void;
8084
readonly onNewDocument: () => void;
85+
/** Stops waiting for the first page; set until the tab is announced. */
86+
stopWaiting: (() => void) | null;
8187
}
8288

8389
export class DesktopBrowserHost extends Context.Service<
@@ -413,11 +419,13 @@ export const make = Effect.gen(function* () {
413419
const tab = tabs.get(id);
414420
if (!tab) return;
415421
tabs.delete(id);
422+
const announced = tab.stopWaiting === null;
423+
tab.stopWaiting?.();
416424
tab.relay = null;
417425
tab.debuggee.debugger.off("message", tab.onMessage);
418426
tab.debuggee.webContents.off("did-navigate", tab.onNewDocument);
419427
syncPainting(tab);
420-
emit({ type: "detached", ...key });
428+
if (announced) emit({ type: "detached", ...key });
421429
};
422430

423431
const attach = (key: DesktopBrowserTabKey, debuggee: DesktopBrowserTabDebugger) => {
@@ -455,13 +463,53 @@ export const make = Effect.gen(function* () {
455463
dropFocusHolds(tab);
456464
if (tab.screenshotTurn !== null) nextScreenshot(tab);
457465
},
466+
stopWaiting: null,
458467
};
459468
tabs.set(id, tab);
460469
debuggee.debugger.on("message", tab.onMessage);
461470
debuggee.webContents.on("did-navigate", tab.onNewDocument);
462-
emit({ type: "attached", ...key });
463-
const shown = shownTabs.get(id);
464-
if (shown !== undefined) emit({ type: "shown", ...key, shown });
471+
const announce = () => {
472+
emit({ type: "attached", ...key });
473+
const shown = shownTabs.get(id);
474+
if (shown !== undefined) emit({ type: "shown", ...key, shown });
475+
};
476+
if (!debuggee.webContents.isLoadingMainFrame()) {
477+
announce();
478+
return;
479+
}
480+
// Electron does not pause a guest for the debugger, so Playwright connecting during its first
481+
// commit builds its utility world in the discarded document and every wait on it hangs.
482+
const { webContents } = debuggee;
483+
// ERR_ABORTED is a newer navigation replacing this one, whose commit is still to come.
484+
const onFailLoad = (
485+
_event: Electron.Event,
486+
code: number,
487+
_description: string,
488+
_url: string,
489+
isMainFrame: boolean,
490+
) => {
491+
if (isMainFrame && code !== ERR_ABORTED) ready();
492+
};
493+
const ready = () => {
494+
if (tab.stopWaiting === null) return;
495+
// The manager's cleanup for a destroyed guest can still be queued behind another tab's attach.
496+
if (webContents.isDestroyed()) return detach(key);
497+
tab.stopWaiting();
498+
announce();
499+
};
500+
const timeout = runFork(
501+
Effect.sleep(FIRST_PAGE_TIMEOUT).pipe(Effect.andThen(Effect.sync(ready))),
502+
);
503+
tab.stopWaiting = () => {
504+
tab.stopWaiting = null;
505+
webContents.off("dom-ready", ready);
506+
webContents.off("did-stop-loading", ready);
507+
webContents.off("did-fail-load", onFailLoad);
508+
runFork(Fiber.interrupt(timeout));
509+
};
510+
webContents.on("dom-ready", ready);
511+
webContents.on("did-stop-loading", ready);
512+
webContents.on("did-fail-load", onFailLoad);
465513
};
466514

467515
const setShown = (key: DesktopBrowserTabKey, shown: boolean | undefined) => {
@@ -472,7 +520,7 @@ export const make = Effect.gen(function* () {
472520
}
473521
if (shownTabs.get(id) === shown) return;
474522
shownTabs.set(id, shown);
475-
if (tabs.has(id)) emit({ type: "shown", ...key, shown });
523+
if (tabs.get(id)?.stopWaiting === null) emit({ type: "shown", ...key, shown });
476524
};
477525

478526
const handleCommandLine = (line: string) =>
@@ -511,6 +559,8 @@ export const make = Effect.gen(function* () {
511559
[...tabs.values()],
512560
(tab) => {
513561
dropRelay(tab);
562+
// Announced once its first page is up.
563+
if (tab.stopWaiting !== null) return Effect.void;
514564
const shown = shownTabs.get(keyOf(tab.key));
515565
return PubSub.publish(outbox, { type: "attached", ...tab.key }).pipe(
516566
Effect.andThen(

‎apps/mobile/src/components/ui/FilePreviewSession.test.tsx‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
import { act, useState } from "react";
22
import { createRoot } from "react-dom/client";
33
import { expect, it, vi } from "vite-plus/test";
4-
import { EnvironmentId, SOURCE_CONTROL_MEDIA_ASSET } from "@t3tools/contracts";
4+
import {
5+
AssetWorkspaceAssetNotFoundError,
6+
EnvironmentId,
7+
SOURCE_CONTROL_MEDIA_ASSET,
8+
ThreadId,
9+
} from "@t3tools/contracts";
510

611
const harness = vi.hoisted(() => ({
7-
refreshAssetUrl: vi.fn<(environmentId: string, resource: { url: string }) => Promise<string>>(),
12+
refreshAssetUrl:
13+
vi.fn<(environmentId: string, resource: { url: string }) => Promise<string | null>>(),
814
alert: vi.fn(),
915
previews: [] as unknown[],
1016
mounts: 0,
@@ -144,3 +150,24 @@ it("closes the preview when the selected image cannot be resolved", async () =>
144150
expect(preview.onRequestClose).toHaveBeenCalledOnce();
145151
expect(harness.alert).toHaveBeenCalledOnce();
146152
});
153+
154+
it("names the checked path when the server cannot find the file", async () => {
155+
const resource = {
156+
_tag: "media-file" as const,
157+
threadId: ThreadId.make("thread"),
158+
path: "v2/extended/duo-color-3-extended-FINAL.png",
159+
};
160+
const checkedPath = "/repo/v2/extended/duo-color-3-extended-FINAL.png";
161+
harness.refreshAssetUrl.mockRejectedValue(
162+
new AssetWorkspaceAssetNotFoundError({ resource, checkedPath }),
163+
);
164+
const selected: FilePreviewItem = { kind: "image", environmentId, resource };
165+
await using preview = await openGallery(selected, [selected], false);
166+
167+
expect(preview.onRequestClose).toHaveBeenCalledOnce();
168+
expect(harness.alert).toHaveBeenCalledWith(
169+
"Could not open preview",
170+
expect.stringContaining(checkedPath),
171+
);
172+
expect(harness.alert.mock.calls[0]?.[1]).not.toMatch(/reconnect/i);
173+
});

‎apps/mobile/src/components/ui/FilePreviewSession.tsx‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { AssetWorkspaceAssetNotFoundError } from "@t3tools/contracts";
12
import * as Schema from "effect/Schema";
23
import * as Dialog from "./Dialog";
34
import { useContext, useEffect, useEffectEvent, useState, type ComponentType } from "react";
@@ -36,6 +37,15 @@ class PreviewResolutionError extends Schema.TaggedError<PreviewResolutionError>(
3637
}
3738

3839
const isPreviewResolutionError = Schema.is(PreviewResolutionError);
40+
const isAssetNotFoundError = Schema.is(AssetWorkspaceAssetNotFoundError);
41+
42+
function remotePreviewFailureMessage(error: unknown): string {
43+
if (!isAssetNotFoundError(error)) {
44+
return "Reconnect to this environment and try again. The file may have been moved or deleted.";
45+
}
46+
const path = error.checkedPath ?? ("path" in error.resource ? error.resource.path : undefined);
47+
return path ? `The file was not found at ${path}.` : error.message;
48+
}
3949

4050
interface ResolvedPreviewUri {
4151
readonly uri: string;
@@ -64,8 +74,7 @@ async function resolvePreviewUri(
6474
.catch((error: unknown) => {
6575
throw new PreviewResolutionError({
6676
cause: error,
67-
fallbackMessage:
68-
"Reconnect to this environment and try again. The file may have been moved or deleted.",
77+
fallbackMessage: remotePreviewFailureMessage(error),
6978
});
7079
});
7180
return { uri: url + (item.srcFragment ?? "") };

‎apps/mobile/src/components/ui/VideoPreviewModal.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ function NativeVideoPreview(props: {
5050
const resolvePlaybackUrl = useEffectEvent(async (): Promise<string> => {
5151
if (source.type !== "media") throw new Error("Could not load this video.");
5252
if (!("resource" in source)) return source.uri;
53-
const url = await refreshAssetUrl(source.environmentId, source.resource);
53+
const url = await refreshAssetUrl(source.environmentId, source.resource).catch(() => null);
5454
const playbackUrl = mediaVideoPreviewUri(source, url);
5555
if (playbackUrl !== null) return playbackUrl;
5656
throw new Error(
@@ -61,7 +61,7 @@ function NativeVideoPreview(props: {
6161
});
6262
const reauthorize = useEffectEvent(() => {
6363
if (source.type === "media" && "resource" in source) {
64-
void refreshAssetUrl(source.environmentId, source.resource);
64+
void refreshAssetUrl(source.environmentId, source.resource).catch(() => {});
6565
}
6666
});
6767

‎apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,8 @@ function AdaptiveWorkspaceLayoutContent(
362362
floatingTabs.row,
363363
floatingTabsEnabled,
364364
]);
365-
// A floating sidebar brings the rail with it.
366-
const width = viewportWidth - (sidebarFloats ? 0 : navigationRailWidth);
365+
// The rail keeps its room even while the sidebar floats; only the list pane overlays the page.
366+
const width = viewportWidth - navigationRailWidth;
367367
// The sidebar stays mounted under a workspace page, so its list is ready on the way back.
368368
const shouldRenderPrimarySidebar = layout.usesSplitView;
369369
const fileInspector = useMemo(
@@ -721,7 +721,7 @@ function AdaptiveWorkspaceLayoutContent(
721721
// panes land. A sliding sidebar uncovers the strip it is about to fill, or covers the content
722722
// until it is gone.
723723
const contentLeftTarget = sidebarFloats
724-
? 0
724+
? navigationRailWidth
725725
: navigationRailWidth +
726726
(shouldRenderPrimarySidebar && !workspacePage && panes.primarySidebarVisible
727727
? (layout.listPaneWidth ?? 0) + (layout.listPaneGap ?? 0)
@@ -794,7 +794,9 @@ function AdaptiveWorkspaceLayoutContent(
794794
workspacePage,
795795
]);
796796
const railAnimatedStyle = useAnimatedStyle(() => ({ width: renderedRailWidth.value }));
797-
const floatingSidebarAnimatedStyle = useAnimatedStyle(() => ({ left: renderedRailWidth.value }));
797+
const floatingSidebarAnimatedStyle = useAnimatedStyle(() => ({
798+
left: sidebarFloats ? renderedRailWidth.value : 0,
799+
}));
798800
const floatingSidebarOpen = sidebarFloats && panes.primarySidebarVisible;
799801
// Its own value, so a sidebar that was beside a list doesn't dim the page as it leaves.
800802
const scrimOpacity = useSharedValue(0);
@@ -850,7 +852,7 @@ function AdaptiveWorkspaceLayoutContent(
850852
Math.max(
851853
0,
852854
viewportWidth -
853-
(sidebarFloats ? 0 : renderedRailWidth.value) -
855+
renderedRailWidth.value -
854856
(workspacePage || sidebarFloats ? 0 : renderedSidebarWidth.value) -
855857
renderedInspectorWidth.value,
856858
),
@@ -974,10 +976,7 @@ function AdaptiveWorkspaceLayoutContent(
974976
>
975977
<AndroidHingeObserver onChange={handleHingeChange} />
976978
{shouldRenderNavigationRail ? (
977-
<Animated.View
978-
className={sidebarFloats ? "absolute inset-y-0 left-0" : "shrink self-stretch"}
979-
style={railAnimatedStyle}
980-
/>
979+
<Animated.View className="shrink self-stretch" style={railAnimatedStyle} />
981980
) : null}
982981
{shouldRenderPrimarySidebar && layout.listPaneWidth !== null ? (
983982
<Animated.View
@@ -994,11 +993,9 @@ function AdaptiveWorkspaceLayoutContent(
994993
style={[
995994
workspacePage ? { position: "absolute", top: 0, bottom: 0, left: 0 } : null,
996995
sidebarFloats
997-
? [
998-
{ position: "absolute", top: 0, bottom: 0, zIndex: 2, elevation: 8 },
999-
floatingSidebarAnimatedStyle,
1000-
]
996+
? { position: "absolute", top: 0, bottom: 0, zIndex: 2, elevation: 8 }
1001997
: null,
998+
floatingSidebarAnimatedStyle,
1002999
sidebarAnimatedStyle,
10031000
]}
10041001
>

‎apps/mobile/src/lib/attachmentDocument.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ async function readAttachmentText(key: AttachmentTextKey, signal: AbortSignal) {
4444
const refreshed =
4545
key.environmentId === null
4646
? null
47-
: await refreshAssetUrl(key.environmentId, key.resource, signal);
47+
: await refreshAssetUrl(key.environmentId, key.resource, signal).catch(() => null);
4848
if (!refreshed) throw new Error("Reconnect to this environment and try again.");
4949
target = refreshed;
5050
}

0 commit comments

Comments
 (0)