diff --git a/apps/web/src/browser/ServerBrowserSurface.browser.test.tsx b/apps/web/src/browser/ServerBrowserSurface.browser.test.tsx index 47cfb623dc7f9..c52ff3e892cf2 100644 --- a/apps/web/src/browser/ServerBrowserSurface.browser.test.tsx +++ b/apps/web/src/browser/ServerBrowserSurface.browser.test.tsx @@ -7,7 +7,7 @@ import type { import { describe, expect, it, vi } from "vite-plus/test"; import { userEvent } from "vite-plus/test/browser"; -import { act, render } from "../../test/render"; +import { act, fakeTimers, render } from "../../test/render"; const mocks = vi.hoisted(() => ({ createClient: vi.fn<(target: unknown, handlers: PreviewStreamEvents) => unknown>(), @@ -220,3 +220,38 @@ describe("ServerBrowserSurface history", () => { expect(mouseInputs()).not.toEqual([]); }); }); + +describe("ServerBrowserSurface frames", () => { + it("reports a connected stream that never delivers a frame until one arrives", async () => { + setup(); + const onNoFrames = vi.fn(); + const container = document.createElement("div"); + container.style.cssText = "width: 400px; height: 300px; display: flex;"; + await using _screen = await render( + , + { container }, + ); + await vi.waitFor(() => expect(mocks.createClient).toHaveBeenCalled()); + using _timers = fakeTimers(); + const handlers = mocks.createClient.mock.calls.at(-1)![1]; + await act(() => handlers.onConnectedChange(true)); + await act(() => vi.advanceTimersByTime(9_999)); + expect(onNoFrames).not.toHaveBeenCalled(); + expect(container.querySelector('[role="alert"]')).toBeNull(); + + await act(() => vi.advanceTimersByTime(1)); + expect(onNoFrames).toHaveBeenCalledOnce(); + expect(container.querySelector('[role="alert"]')?.textContent).toContain("not drawing it"); + + await act(() => mocks.painted?.()); + expect(container.querySelector('[role="alert"]')).toBeNull(); + }); +}); diff --git a/apps/web/src/browser/ServerBrowserSurface.tsx b/apps/web/src/browser/ServerBrowserSurface.tsx index 9ce55b4020e87..868da347164ab 100644 --- a/apps/web/src/browser/ServerBrowserSurface.tsx +++ b/apps/web/src/browser/ServerBrowserSurface.tsx @@ -70,6 +70,8 @@ const TAP_SLOP_PX = 8; const MULTI_CLICK_MS = 500; const MULTI_CLICK_SLOP_PX = 4; const WHEEL_LINE_PX = 16; +// The server answers a new viewer with a still within seconds, so silence means Chromium is not painting. +const NO_FRAME_TIMEOUT_MS = 10_000; type MouseInput = Extract; type WheelInput = Extract; @@ -151,6 +153,7 @@ export function ServerBrowserSurface(props: { readonly followSize?: boolean; readonly controlPosition?: "top" | "bottom"; readonly onFirstFrame?: () => void; + readonly onNoFrames?: () => void; readonly onViewport?: (viewport: PreviewStreamViewport) => void; readonly onControl?: (control: PreviewStreamControl | null) => void; readonly onPopup?: (tabId: string) => void; @@ -166,6 +169,7 @@ export function ServerBrowserSurface(props: { followSize = true, controlPosition = "top", onFirstFrame, + onNoFrames, onViewport, onControl, onPopup, @@ -220,6 +224,8 @@ export function ServerBrowserSurface(props: { const probeRef = useRef(null); const lastProbeRef = useRef<{ x: number; y: number; editable: boolean; at: number } | null>(null); const firstFrame = useEffectEvent(() => onFirstFrame?.()); + const noFrames = useEffectEvent(() => onNoFrames?.()); + const [framesStalled, setFramesStalled] = useState(false); const viewportChanged = useEffectEvent((viewport: PreviewStreamViewport) => onViewport?.(viewport), ); @@ -375,9 +381,16 @@ export function ServerBrowserSurface(props: { const canvas = canvasRef.current; if (!visible || accessDenied || hostSetup || !access || !cap || !canvas) return; let refreshTimer: ReturnType | null = null; + let noFrameTimer: ReturnType | null = null; + const clearNoFrameTimer = () => { + if (noFrameTimer !== null) clearTimeout(noFrameTimer); + noFrameTimer = null; + }; const painter = createPreviewFramePainter(canvas, () => { if (hasFrameRef.current) return; hasFrameRef.current = true; + clearNoFrameTimer(); + setFramesStalled(false); firstFrame(); }); const client = createPreviewStreamClient( @@ -429,7 +442,15 @@ export function ServerBrowserSurface(props: { } }, onConnectedChange: (connected) => { - if (connected) return; + clearNoFrameTimer(); + if (connected) { + if (!hasFrameRef.current) + noFrameTimer = setTimeout(() => { + setFramesStalled(true); + noFrames(); + }, NO_FRAME_TIMEOUT_MS); + return; + } setFileChooser(null); controlRef.current = null; setControl(null); @@ -454,6 +475,7 @@ export function ServerBrowserSurface(props: { clientRef.current = client; return () => { painter.stop(); + clearNoFrameTimer(); if (refreshTimer !== null) clearTimeout(refreshTimer); client.stop(); if (clientRef.current === client) clientRef.current = null; @@ -829,6 +851,16 @@ export function ServerBrowserSurface(props: { if (text) send({ type: "text", text }); }} /> + {visible && framesStalled && !pdfUrl ? ( +
+

+ + The server's browser loaded this page but is not drawing it. Try reloading, or open + the page in a browser on this computer. + +

+
+ ) : null} {fileChooser && control?.controller === "you" ? (
(null); const serverInputDisabled = isServerTab && serverControlledTabId !== runtimeTabId; - const [serverFrameTabId, setServerFrameTabId] = useState(null); + const [serverStreamSettledTabId, setServerStreamSettledTabId] = useState(null); // A desktop page that mounted before its tab went headless leaves its stale state here. const desktopOverlay = tabId && !isServerTab ? (previewState.desktopByTabId[tabId] ?? null) : null; @@ -260,7 +260,7 @@ export function PreviewView({ const isUnreachable = navStatus._tag === "LoadFailed"; const showEmptyState = navStatus._tag === "Idle"; const serverStreamPending = - isServerTab && !showEmptyState && !isUnreachable && serverFrameTabId !== runtimeTabId; + isServerTab && !showEmptyState && !isUnreachable && serverStreamSettledTabId !== runtimeTabId; const controller = desktopOverlay?.controller ?? "none"; const viewport = snapshot?.viewport ?? FILL_PREVIEW_VIEWPORT; const browserDefaults = useBrowserDefaults(); @@ -1110,7 +1110,8 @@ export function PreviewView({ : null } visible={visible} - onFirstFrame={() => setServerFrameTabId(runtimeTabId)} + onFirstFrame={() => setServerStreamSettledTabId(runtimeTabId)} + onNoFrames={() => setServerStreamSettledTabId(runtimeTabId)} onControl={(control) => setServerControlledTabId(control?.controller === "you" ? runtimeTabId : null) } diff --git a/apps/web/src/i18n/translations/de.json b/apps/web/src/i18n/translations/de.json index 221fbe9e1552a..2ecf4ac827a86 100644 --- a/apps/web/src/i18n/translations/de.json +++ b/apps/web/src/i18n/translations/de.json @@ -1421,6 +1421,7 @@ "61a552a67e9e3eac": "Antwort auf Dialog", "3d000b56e95f3150": "Steuerung abgeben", "0633c3bcdcb95b2f": "Steuerung übernehmen", + "b8ba763621bcdd70": "Der Browser des Servers hat diese Seite geladen, zeichnet sie aber nicht. Lade sie neu oder öffne die Seite in einem Browser auf diesem Computer.", "db4deed9433e0482": "Die Seite fordert Dateien an.", "730765790c9965e2": "Die Seite fordert eine Datei an.", "d15d4ce9981708e9": "Abbrechen", diff --git a/apps/web/src/i18n/translations/en.json b/apps/web/src/i18n/translations/en.json index 5f5205cd0be10..f9f4aadad6760 100644 --- a/apps/web/src/i18n/translations/en.json +++ b/apps/web/src/i18n/translations/en.json @@ -1421,6 +1421,7 @@ "61a552a67e9e3eac": "Dialog response", "3d000b56e95f3150": "Release control", "0633c3bcdcb95b2f": "Take control", + "b8ba763621bcdd70": "The server's browser loaded this page but is not drawing it. Try reloading, or open the page in a browser on this computer.", "db4deed9433e0482": "The page asks for files.", "730765790c9965e2": "The page asks for a file.", "d15d4ce9981708e9": "Cancel", diff --git a/apps/web/src/i18n/translations/es.json b/apps/web/src/i18n/translations/es.json index cf98b0b2f00f2..74960ffa4a49c 100644 --- a/apps/web/src/i18n/translations/es.json +++ b/apps/web/src/i18n/translations/es.json @@ -1421,6 +1421,7 @@ "61a552a67e9e3eac": "Respuesta al cuadro de diálogo", "3d000b56e95f3150": "Ceder el control", "0633c3bcdcb95b2f": "Tomar el control", + "b8ba763621bcdd70": "El navegador del servidor cargó esta página, pero no la está dibujando. Prueba a recargarla o abre la página en un navegador de este ordenador.", "db4deed9433e0482": "La página pide archivos.", "730765790c9965e2": "La página pide un archivo.", "d15d4ce9981708e9": "Cancelar", diff --git a/apps/web/src/i18n/translations/fr.json b/apps/web/src/i18n/translations/fr.json index 46f0333590e03..c8ae14fce09f7 100644 --- a/apps/web/src/i18n/translations/fr.json +++ b/apps/web/src/i18n/translations/fr.json @@ -1421,6 +1421,7 @@ "61a552a67e9e3eac": "Réponse à la boîte de dialogue", "3d000b56e95f3150": "Rendre le contrôle", "0633c3bcdcb95b2f": "Prendre le contrôle", + "b8ba763621bcdd70": "Le navigateur du serveur a chargé cette page mais ne l'affiche pas. Essayez de la recharger ou ouvrez la page dans un navigateur sur cet ordinateur.", "db4deed9433e0482": "La page demande des fichiers.", "730765790c9965e2": "La page demande un fichier.", "d15d4ce9981708e9": "Annuler", diff --git a/apps/web/src/i18n/translations/ja.json b/apps/web/src/i18n/translations/ja.json index 3557dee251c90..d93f213040522 100644 --- a/apps/web/src/i18n/translations/ja.json +++ b/apps/web/src/i18n/translations/ja.json @@ -1421,6 +1421,7 @@ "61a552a67e9e3eac": "ダイアログへの応答", "3d000b56e95f3150": "操作権を手放す", "0633c3bcdcb95b2f": "操作権を取得", + "b8ba763621bcdd70": "サーバーのブラウザーはこのページを読み込みましたが、描画していません。再読み込みするか、このコンピューターのブラウザーでページを開いてください。", "db4deed9433e0482": "ページがファイルを求めています。", "730765790c9965e2": "ページがファイルを求めています。", "d15d4ce9981708e9": "キャンセル", diff --git a/apps/web/src/i18n/translations/ko.json b/apps/web/src/i18n/translations/ko.json index afaedc677327e..dea63bb3d6524 100644 --- a/apps/web/src/i18n/translations/ko.json +++ b/apps/web/src/i18n/translations/ko.json @@ -1421,6 +1421,7 @@ "61a552a67e9e3eac": "대화 상자 응답", "3d000b56e95f3150": "제어 해제", "0633c3bcdcb95b2f": "제어하기", + "b8ba763621bcdd70": "서버의 브라우저가 이 페이지를 불러왔지만 화면을 그리지 않고 있습니다. 새로고침하거나 이 컴퓨터의 브라우저에서 페이지를 여세요.", "db4deed9433e0482": "페이지에서 파일을 요청합니다.", "730765790c9965e2": "페이지에서 파일을 요청합니다.", "d15d4ce9981708e9": "취소", diff --git a/apps/web/src/i18n/translations/pt-BR.json b/apps/web/src/i18n/translations/pt-BR.json index 0be7d13d3cece..b21f28555d704 100644 --- a/apps/web/src/i18n/translations/pt-BR.json +++ b/apps/web/src/i18n/translations/pt-BR.json @@ -1421,6 +1421,7 @@ "61a552a67e9e3eac": "Resposta da caixa de diálogo", "3d000b56e95f3150": "Liberar o controle", "0633c3bcdcb95b2f": "Assumir o controle", + "b8ba763621bcdd70": "O navegador do servidor carregou esta página, mas não a está desenhando. Tente recarregar ou abra a página em um navegador neste computador.", "db4deed9433e0482": "A página está pedindo arquivos.", "730765790c9965e2": "A página está pedindo um arquivo.", "d15d4ce9981708e9": "Cancelar", diff --git a/apps/web/src/i18n/translations/ru.json b/apps/web/src/i18n/translations/ru.json index dacfb97f48567..32098dd1e2971 100644 --- a/apps/web/src/i18n/translations/ru.json +++ b/apps/web/src/i18n/translations/ru.json @@ -1421,6 +1421,7 @@ "61a552a67e9e3eac": "Ответ на диалог", "3d000b56e95f3150": "Отдать управление", "0633c3bcdcb95b2f": "Взять управление", + "b8ba763621bcdd70": "Браузер сервера загрузил эту страницу, но не отрисовывает её. Попробуйте перезагрузить её или откройте страницу в браузере на этом компьютере.", "db4deed9433e0482": "Страница запрашивает файлы.", "730765790c9965e2": "Страница запрашивает файл.", "d15d4ce9981708e9": "Отмена", diff --git a/apps/web/src/i18n/translations/sv.json b/apps/web/src/i18n/translations/sv.json index d963ce9ef16a8..6ad088b79aaed 100644 --- a/apps/web/src/i18n/translations/sv.json +++ b/apps/web/src/i18n/translations/sv.json @@ -1421,6 +1421,7 @@ "61a552a67e9e3eac": "Dialogsvar", "3d000b56e95f3150": "Släpp kontrollen", "0633c3bcdcb95b2f": "Ta kontrollen", + "b8ba763621bcdd70": "Serverns webbläsare har läst in sidan men ritar inte upp den. Försök läsa in den igen, eller öppna sidan i en webbläsare på den här datorn.", "db4deed9433e0482": "Sidan ber om filer.", "730765790c9965e2": "Sidan ber om en fil.", "d15d4ce9981708e9": "Avbryt", diff --git a/apps/web/src/i18n/translations/zh.json b/apps/web/src/i18n/translations/zh.json index 4e240b7fc752c..2ab4cef1b738f 100644 --- a/apps/web/src/i18n/translations/zh.json +++ b/apps/web/src/i18n/translations/zh.json @@ -1421,6 +1421,7 @@ "61a552a67e9e3eac": "对话框输入", "3d000b56e95f3150": "释放控制", "0633c3bcdcb95b2f": "接管控制", + "b8ba763621bcdd70": "服务器的浏览器已加载此页面,但没有绘制出来。请尝试重新加载,或在这台电脑的浏览器中打开该页面。", "db4deed9433e0482": "页面请求选择文件。", "730765790c9965e2": "页面请求选择一个文件。", "d15d4ce9981708e9": "取消",