From 8334ecae9abacef41944c3adbaedd4518bbff0dd Mon Sep 17 00:00:00 2001 From: ELA CITY Date: Fri, 16 Oct 2026 17:12:10 +0000 Subject: [PATCH 1/3] fix(browser): retire superseded observation runs and verify recovery Review package extracted from preserved candidate b0fa431d. The original eighteen commits remain on fix/runtime-performance-080. Validation of this recomposed head is recorded separately from historical candidate evidence. --- capsules/browser/browser/browser.js | 37 +- scripts/browser-observation-recovery.test.mjs | 58 ++- .../browser-window-close-handshake.test.mjs | 4 + .../browser-window-close-headless-smoke.mjs | 213 ++++++++-- ...wser-restored-lifecycle-headless-smoke.mjs | 397 ++++++++++++------ 5 files changed, 553 insertions(+), 156 deletions(-) diff --git a/capsules/browser/browser/browser.js b/capsules/browser/browser/browser.js index cfa904a61..124f5413b 100644 --- a/capsules/browser/browser/browser.js +++ b/capsules/browser/browser/browser.js @@ -117,8 +117,11 @@ let statusTimer = 0; let canGoBack = false; let canGoForward = false; let pageStatusTimer = 0; +let pageStatusPollingRun = null; let pageStatusRefreshTimers = []; +let pageStatusRefreshRun = null; let pageHeartbeatTimer = 0; +let pageHeartbeatRun = null; let lastPageStatus = null; let unloadCleanupStarted = false; let recoverableDisplayAttachStarted = false; @@ -398,12 +401,14 @@ function setLoading(loading) { } function stopPageStatusPolling() { + pageStatusPollingRun = null; window.clearTimeout(pageStatusTimer); pageStatusTimer = 0; stopPageStatusRefresh(); } function stopPageStatusRefresh() { + pageStatusRefreshRun = null; for (const timer of pageStatusRefreshTimers) { window.clearTimeout(timer); } @@ -411,6 +416,7 @@ function stopPageStatusRefresh() { } function stopPageHeartbeat() { + pageHeartbeatRun = null; window.clearTimeout(pageHeartbeatTimer); pageHeartbeatTimer = 0; } @@ -1249,8 +1255,9 @@ async function fetchPageStatus({ history = "replace", forceAddress = false, fast = false, + isCurrent = () => true, } = {}) { - if (!currentPage?.page_id) { + if (!isCurrent() || !currentPage?.page_id) { return null; } const owner = currentRuntimePageOwner(); @@ -1259,7 +1266,7 @@ async function fetchPageStatus({ `/api/apps/browser/pages/${encodeURIComponent(currentPage.page_id)}/status${query}`, { method: "GET" }, ); - if (!runtimeViewerOwnerActive(owner)) return null; + if (!isCurrent() || !runtimeViewerOwnerActive(owner)) return null; if ( status?.schema !== "elastos.browser.page-status/v1" || status.page_id !== currentPage.page_id @@ -1414,12 +1421,16 @@ function schedulePageStatusRefresh({ ), ]; stopPageStatusRefresh(); + const run = {}; + pageStatusRefreshRun = run; + const isCurrent = () => pageStatusRefreshRun === run; pageStatusRefreshTimers = delays.map((nextDelay) => { const timer = window.setTimeout(async () => { pageStatusRefreshTimers = pageStatusRefreshTimers.filter( (candidate) => candidate !== timer, ); if ( + !isCurrent() || unloadCleanupStarted || !currentPage || document.hidden || @@ -1429,9 +1440,9 @@ function schedulePageStatusRefresh({ } const owner = currentRuntimePageOwner(); try { - await fetchPageStatus({ history, forceAddress }); + await fetchPageStatus({ history, forceAddress, isCurrent }); } catch (error) { - await handlePageObservationFailure(error, owner); + if (isCurrent()) await handlePageObservationFailure(error, owner); } }, nextDelay); return timer; @@ -1440,8 +1451,11 @@ function schedulePageStatusRefresh({ function startPageStatusPolling() { stopPageStatusPolling(); + const run = {}; + pageStatusPollingRun = run; + const isCurrent = () => pageStatusPollingRun === run; const poll = async () => { - if (unloadCleanupStarted || !currentPage) { + if (!isCurrent() || unloadCleanupStarted || !currentPage) { return; } if (document.hidden) { @@ -1454,11 +1468,12 @@ function startPageStatusPolling() { } const owner = currentRuntimePageOwner(); try { - await fetchPageStatus({ fast: true }); + await fetchPageStatus({ fast: true, isCurrent }); } catch (error) { - await handlePageObservationFailure(error, owner); + if (isCurrent()) await handlePageObservationFailure(error, owner); } finally { if ( + isCurrent() && sameRuntimePageOwner(currentRuntimePageOwner(), owner) && !unloadCleanupStarted && !relaunchRequested && @@ -1473,8 +1488,11 @@ function startPageStatusPolling() { function startPageHeartbeat() { stopPageHeartbeat(); + const run = {}; + pageHeartbeatRun = run; + const isCurrent = () => pageHeartbeatRun === run; const beat = async () => { - if (unloadCleanupStarted || !currentPage?.page_id) { + if (!isCurrent() || unloadCleanupStarted || !currentPage?.page_id) { return; } const owner = currentRuntimePageOwner(); @@ -1485,9 +1503,10 @@ function startPageHeartbeat() { { method: "POST" }, ); } catch (error) { - if (await handlePageObservationFailure(error, owner)) nextDelay = PAGE_STATUS_INTERVAL_MS; + if (isCurrent() && await handlePageObservationFailure(error, owner)) nextDelay = PAGE_STATUS_INTERVAL_MS; } finally { if ( + isCurrent() && sameRuntimePageOwner(currentRuntimePageOwner(), owner) && !unloadCleanupStarted && !relaunchRequested && diff --git a/scripts/browser-observation-recovery.test.mjs b/scripts/browser-observation-recovery.test.mjs index 1093555c9..457c58b8d 100644 --- a/scripts/browser-observation-recovery.test.mjs +++ b/scripts/browser-observation-recovery.test.mjs @@ -29,9 +29,9 @@ function deferred() { } const routes = { - status: { start: "startPageStatusPolling", timer: "pageStatusTimer" }, - heartbeat: { start: "startPageHeartbeat", timer: "pageHeartbeatTimer" }, - afterInput: { start: "schedulePageStatusRefresh", timer: "pageStatusRefreshTimers" }, + status: { start: "startPageStatusPolling", stop: "stopPageStatusPolling", timer: "pageStatusTimer" }, + heartbeat: { start: "startPageHeartbeat", stop: "stopPageHeartbeat", timer: "pageHeartbeatTimer" }, + afterInput: { start: "schedulePageStatusRefresh", stop: "stopPageStatusRefresh", timer: "pageStatusRefreshTimers" }, }; function harness() { const timers = new Map(), requests = [], failures = [], renewals = [], mutations = [], messages = []; @@ -40,6 +40,7 @@ function harness() { currentPage: { page_id: "page-current", actual_url: "https://fixture.invalid/nav", title: "Before", runtime_cleanup: { schema: "elastos.browser.cleanup-handle/v1", id: "cleanup-current" } }, unloadCleanupStarted: false, currentPageGeneration: 1, pageStatusTimer: 0, pageHeartbeatTimer: 0, pageStatusRefreshTimers: [], + pageStatusPollingRun: null, pageStatusRefreshRun: null, pageHeartbeatRun: null, relaunchRequested: false, lastPageStatus: null, homeWindowCloseInFlight: false, homeWindowTerminalCloseConfirmed: false, pendingHomeWindowCloseDelivery: null, document: { hidden: false }, isAddressEditing: () => false, @@ -82,6 +83,7 @@ function harness() { mediaOpen: () => mediaOpen, setFetch: value => { fetch = value; }, start: route => state[routes[route].start](), + stop: route => state[routes[route].stop](), async fire(route) { const id = timerFor(route), timer = timers.get(id); assert.ok(timer, `missing ${route} timer`); @@ -236,6 +238,56 @@ for (const route of Object.keys(routes)) { } } +for (const route of Object.keys(routes)) { + for (const lifecycle of ["restart", "stop"]) { + for (const outcome of ["success", "transport", "authority", "terminal"]) { + test(`${route} ${lifecycle} retires a pending ${outcome} observation for the same page owner`, async () => { + const h = harness(), pending = deferred(), owner = h.state.currentRuntimePageOwner(); + const previousStatus = { ...h.healthyStatus(), actual_url: "https://fixture.invalid/previous", title: "Previous" }; + h.setFetch(() => pending.promise); + h.start(route); + const observation = h.fire(route); + assert.equal(h.requests.length, 1); + if (lifecycle === "restart") h.start(route); + else h.stop(route); + h.state.currentPage.actual_url = "https://fixture.invalid/current"; + const remainingTimers = [...h.timers.keys()]; + assert.equal(remainingTimers.length, lifecycle === "stop" ? 0 : route === "afterInput" ? 4 : 1); + + if (outcome === "success") pending.resolve(response(previousStatus)); + else if (outcome === "transport") pending.reject(new TypeError("retired observation failed")); + else pending.resolve(response({ error: "retired observation failed" }, outcome === "authority" ? 401 : 404)); + await observation; + + assertRetained(h, owner); + assert.equal(h.state.currentPage.actual_url, "https://fixture.invalid/current"); + assert.equal(h.state.lastPageStatus, null); + assert.deepEqual(h.mutations, []); + assert.deepEqual(h.messages, []); + assert.deepEqual([...h.timers.keys()], remainingTimers, + "Retired work must leave the replacement timers unchanged"); + + if (lifecycle === "restart") { + if (outcome === "authority") { + h.setFetch(async () => response({ error: "auth session is not active" }, 401)); + await h.fire(route); + assert.equal(h.renewals.length, 1, "The active run must still request fresh authority on HTTP 401"); + assert.equal(h.timers.size, 0); + assert.deepEqual(h.failures, []); + assert.equal(h.mediaOpen(), true); + } else { + h.setFetch(async () => response(h.healthyStatus())); + await h.fire(route); + assertRetained(h, owner); + assert.equal(h.requests.length, 2, "The replacement run must continue observing"); + if (route !== "heartbeat") assert.ok(h.mutations.length > 0); + } + } + }); + } + } +} + for (const route of ["status", "afterInput"]) { for (const invalid of ["schema", "page_id", "direct_network", "json"]) { test(`${route} still handles malformed ${invalid} as a terminal observation error`, async () => { diff --git a/scripts/browser-window-close-handshake.test.mjs b/scripts/browser-window-close-handshake.test.mjs index 008294ebf..f7459581a 100644 --- a/scripts/browser-window-close-handshake.test.mjs +++ b/scripts/browser-window-close-handshake.test.mjs @@ -156,6 +156,8 @@ function createActiveAuthorityExpiryHarness(surface) { unloadCleanupStarted: false, pageHeartbeatTimer: 0, pageStatusTimer: 0, + pageStatusPollingRun: null, + pageHeartbeatRun: null, relaunchRequested: false, browserAuthorityRenewal: null, browserAuthorityRenewalRetryTimer: 0, @@ -186,12 +188,14 @@ function createActiveAuthorityExpiryHarness(surface) { friendlyOpenError, showStatus() {}, stopPageStatusPolling() { + context.pageStatusPollingRun = null; for (const [id, timer] of timers) { if (timer.delay !== 60_000) timers.delete(id); } context.pageStatusTimer = 0; }, stopPageHeartbeat() { + context.pageHeartbeatRun = null; for (const [id, timer] of timers) { if (timer.delay === 60_000) timers.delete(id); } diff --git a/scripts/browser-window-close-headless-smoke.mjs b/scripts/browser-window-close-headless-smoke.mjs index 9295f723a..03dd52725 100644 --- a/scripts/browser-window-close-headless-smoke.mjs +++ b/scripts/browser-window-close-headless-smoke.mjs @@ -4,18 +4,27 @@ import { createServer } from "node:http"; import { existsSync, readFileSync } from "node:fs"; import { extname, isAbsolute, join, relative, resolve, sep } from "node:path"; import { fileURLToPath, pathToFileURL } from "node:url"; +import { DEFAULT_URL } from "../capsules/browser/browser/browser-runtime-api.js"; const repoRoot = fileURLToPath(new URL("../", import.meta.url)); const browserInstance = "browser:0123456789abcdef0123456789abcdef"; const browserToken = "browser-window-close-headless-token"; +const browserEngineId = "close-proof-engine"; +const remoteExitId = "close-proof-exit"; const state = { + authorityErrors: [], closeCalls: [], + closeOwnershipBrowserInstance: browserInstance, + freshStartAllowed: true, openCalls: 0, openRequests: 0, + openRequestBodies: [], openStatusRequests: 0, + pages: {}, resetCalls: [], releaseInitialOpen: null, serverErrors: [], + statusCalls: [], requests: [], unknownOpenResult: null, }; @@ -92,6 +101,8 @@ function topDocument(origin) { function browserRoute(homeOrigin, includeUrl = true) { const query = new URLSearchParams({ browser_instance: browserInstance, + browser_engine_id: browserEngineId, + remote_exit_id: remoteExitId, display_mode: "webrtc_remote_display", guarantee_level: "mechanism_microvm", home_origin: homeOrigin, @@ -160,17 +171,23 @@ function attackerDocument() { `; } -function openResult() { +function openResult(url) { state.openCalls += 1; const ordinal = state.openCalls; const pageId = `page-${ordinal}`; + state.pages[pageId] = url; return { schema: "elastos.browser.open-result/v1", + stream_session: { + schema: "elastos.net.stream-session/v1", + backend: remoteExitId, + direct_network: false, + }, engine_page: { schema: "elastos.browser.engine.page/v1", page_id: pageId, - url: "https://example.com/close-proof", - actual_url: "https://example.com/close-proof", + url, + actual_url: url, title: "Close proof", display_session: { schema: "elastos.browser.display-session/v1", @@ -202,49 +219,68 @@ async function handleApi(req, res, url) { res.end(); return true; } + if (url.pathname.startsWith("/api/") && req.headers["x-elastos-home-token"] !== browserToken) { + state.authorityErrors.push(`${req.method} ${url.pathname}: wrong Browser token`); + json(res, 403, { error: "invalid fixture Browser authority" }); + return true; + } if (url.pathname === "/api/apps/browser/summary" && req.method === "GET") { json(res, 200, { schema: "elastos.browser.runtime/v1", sessions: { schema: "elastos.browser.session-capacity/v1", status: "configured", - fresh_start_allowed: true, + fresh_start_allowed: state.freshStartAllowed, recoverable_page: null, window_close_ownership: { schema: "elastos.browser.window-close-ownership/v1", - browser_instance: browserInstance, + browser_instance: state.closeOwnershipBrowserInstance, state: "absent", }, }, - browser_engines: [], - remote_carrier_exits: [], + engine_adapter: { + adapters: [{ + id: browserEngineId, + backing_substrate: "local_microvm", + direct_network: false, + wallet_injection: false, + }], + }, + net: { exit_provider: { remote_carrier_exits: [{ id: remoteExitId }] } }, }); return true; } if (url.pathname === "/api/apps/browser/profile/reset" && req.method === "POST") { - state.resetCalls.push({ token: req.headers["x-elastos-home-token"] }); + state.resetCalls.push({ + token: req.headers["x-elastos-home-token"], + closeCallsAtReset: state.closeCalls.length, + openRequestsAtReset: state.openRequests, + }); json(res, 200, { schema: "elastos.browser.profile-reset/v1", status: "ok", removed_profile_disk: true }); return true; } if (url.pathname === "/api/apps/browser/open" && req.method === "POST") { const body = await readBody(req); if ( - req.headers["x-elastos-home-token"] !== browserToken || - body?.browser_instance !== browserInstance + body?.browser_instance !== browserInstance || + body?.adapter_id !== browserEngineId || + body?.remote_exit_id !== remoteExitId ) { + state.authorityErrors.push("open changed the Browser instance, Engine, or Exit selection"); json(res, 403, { error: "invalid fixture Browser owner" }); return true; } state.openRequests += 1; + state.openRequestBodies.push(body); if (state.openRequests === 1) { await new Promise((resolveOpen) => { state.releaseInitialOpen = resolveOpen; }); - json(res, 200, openResult()); + json(res, 200, openResult(body.url)); return true; } if (state.openRequests === 2) { - state.unknownOpenResult = openResult(); + state.unknownOpenResult = openResult(body.url); json(res, 202, { schema: "elastos.browser.open-accepted/v1", status: "pending", @@ -253,6 +289,10 @@ async function handleApi(req, res, url) { }); return true; } + if (state.openRequests === 3) { + json(res, 200, openResult(body.url)); + return true; + } json(res, 409, { error: "unexpected Browser open" }); return true; } @@ -283,7 +323,18 @@ async function handleApi(req, res, url) { } const signal = url.pathname.match(/^\/api\/apps\/browser\/pages\/([^/]+)\/signal$/); if (signal && req.method === "POST") { - await readBody(req); + const body = await readBody(req); + if (body?.type === "candidate" || body?.type === "end_of_candidates") { + json(res, 200, { + schema: "elastos.browser.webrtc-signal-ack/v1", + type: body.type, + accepted: true, + candidates: [], + end_of_candidates: true, + }); + return true; + } + assert(body?.type === "offer", "fixture received an unexpected display signal", body); json(res, 200, { schema: "elastos.browser.webrtc-answer/v1", type: "answer", @@ -297,7 +348,17 @@ async function handleApi(req, res, url) { if (close && req.method === "POST") { const pageId = decodeURIComponent(close[1]); const body = await readBody(req); - state.closeCalls.push({ pageId, body }); + if ( + body?.schema !== "elastos.browser.close-request/v2" || + body?.browser_instance !== browserInstance || + body?.cleanup_id !== pageId.replace("page-", "cleanup-") || + !Object.hasOwn(state.pages, pageId) + ) { + state.authorityErrors.push(`close changed the exact Runtime owner for ${pageId}`); + json(res, 403, { error: "invalid fixture Browser cleanup authority" }); + return true; + } + state.closeCalls.push({ pageId, body, token: req.headers["x-elastos-home-token"] }); const alreadyReaped = pageId === "page-2"; json(res, 200, { schema: "elastos.browser.close-result/v1", @@ -308,11 +369,16 @@ async function handleApi(req, res, url) { }); return true; } - if (/^\/api\/apps\/browser\/pages\/[^/]+\/status$/.test(url.pathname)) { + const status = url.pathname.match(/^\/api\/apps\/browser\/pages\/([^/]+)\/status$/); + if (status && req.method === "GET") { + const pageId = decodeURIComponent(status[1]); + state.statusCalls.push(pageId); json(res, 200, { schema: "elastos.browser.page-status/v1", - actual_url: "https://example.com/close-proof", - title: "Close proof", + page_id: pageId, + direct_network: false, + actual_url: state.pages[pageId], + title: `Observed ${pageId}`, audio: false, video: false, }); @@ -515,7 +581,7 @@ try { try { await browserFrame.waitForFunction( () => - document.body.dataset.loading === "false" && + document.body?.dataset.loading === "false" && !window.__elastosBrowserCurrentPageId, null, { timeout: 10_000 }, @@ -523,7 +589,7 @@ try { } catch (error) { const browserState = await browserFrame.evaluate(() => ({ currentPageId: window.__elastosBrowserCurrentPageId, - loading: document.body.dataset.loading, + loading: document.body?.dataset.loading ?? null, status: document.querySelector("#browser-status")?.textContent || "", })).catch(() => null); throw new Error(`unknown-owner Browser did not settle after the lost poll: ${JSON.stringify({ @@ -639,51 +705,144 @@ try { (frame) => frame.url().includes("/apps/browser/") && !new URL(frame.url()).searchParams.has("url"), "fresh Browser capsule", ); - await browserFrame.waitForFunction(() => document.body.dataset.loading === "false"); + await browserFrame.waitForFunction(() => document.body?.dataset.loading === "false"); + assert( + state.openRequests === 3 && + state.openRequestBodies[2].url === DEFAULT_URL && + state.openRequestBodies[2].adapter_id === browserEngineId && + state.openRequestBodies[2].remote_exit_id === remoteExitId && + (await browserFrame.evaluate(() => window.__elastosBrowserCurrentPageId)) === "page-3", + "a fresh Browser must open its default URL with the selected Engine and Exit", + state.openRequestBodies, + ); + await browserFrame.waitForFunction( + () => document.title === "Observed page-3 - ElastOS Browser" && + window.__elastosBrowserCurrentPageId === "page-3", + null, + { timeout: 10_000 }, + ); + assert(state.statusCalls.includes("page-3"), "the fresh page did not complete a status observation", state.statusCalls); + const opensBeforeReset = state.openRequests; + const closesBeforeReset = state.closeCalls.length; + async function assertResetUnchanged(action) { + assert( + state.resetCalls.length === 0 && + state.closeCalls.length === closesBeforeReset && + state.openRequests === opensBeforeReset && + (await browserFrame.evaluate(() => window.__elastosBrowserCurrentPageId)) === "page-3", + `${action} changed the Browser profile or page`, + state, + ); + } await browserFrame.locator("#browser-settings").click(); const confirmation = browserFrame.locator("#browser-profile-reset-confirmation"); await browserFrame.locator("#browser-profile-reset").click(); await confirmation.waitFor({ state: "visible" }); await browserFrame.locator("#browser-profile-reset-cancel").click(); await confirmation.waitFor({ state: "hidden" }); - assert(state.resetCalls.length === 0, "Cancel changed the Browser profile", state.resetCalls); + await assertResetUnchanged("Cancel"); await browserFrame.locator("#browser-profile-reset").click(); await browserFrame.locator("#browser-profile-reset-cancel").press("Escape"); await confirmation.waitFor({ state: "hidden" }); await browserFrame.locator("#browser-settings").click(); - assert(state.resetCalls.length === 0, "Escape changed the Browser profile", state.resetCalls); + await assertResetUnchanged("Escape"); await browserFrame.locator("#browser-profile-reset").click(); await browserFrame.locator("#browser-settings-close").click(); await browserFrame.locator("#browser-settings").click(); await confirmation.waitFor({ state: "hidden" }); - assert(state.resetCalls.length === 0, "Closing Settings changed the Browser profile", state.resetCalls); + await assertResetUnchanged("Closing Settings"); await browserFrame.locator("#browser-profile-reset").click(); await browserFrame.locator("#browser-profile-reset-commit").click(); await browserFrame.locator("#browser-status").getByText("Browser profile reset. Open the address again.", { exact: true }).waitFor(); - assert(state.resetCalls.length === 1 && state.resetCalls[0].token === browserToken && state.openRequests === 2, - "Confirmed reset must use the exact window authority once without opening an Engine", state.resetCalls); + assert( + state.resetCalls.length === 1 && + state.resetCalls[0].token === browserToken && + state.resetCalls[0].closeCallsAtReset === closesBeforeReset + 1 && + state.resetCalls[0].openRequestsAtReset === opensBeforeReset && + state.closeCalls.length === closesBeforeReset + 1 && + state.closeCalls.at(-1).pageId === "page-3" && + state.closeCalls.at(-1).body.cleanup_id === "cleanup-3" && + state.openRequests === opensBeforeReset && + !(await browserFrame.evaluate(() => window.__elastosBrowserCurrentPageId)), + "Confirmed reset must close the exact page before using window authority once, without a replacement open", + { resetCalls: state.resetCalls, closeCalls: state.closeCalls, openRequests: state.openRequests }, + ); await shellFrame.evaluate( (message) => window.__browserCloseProof.send(message), { ...request, requestId: "headless-close-exact-absence" }, ); await shellFrame.waitForFunction(() => window.__browserCloseProof.resultCount() === 5); + const resetResult = await shellFrame.evaluate(() => window.__browserCloseProof.results().at(-1)); + assert( + state.openRequests === opensBeforeReset && state.closeCalls.length === closesBeforeReset + 1 && + resetResult.state === "terminal" && + resetResult.terminalKind === "no_page" && + resetResult.pageId === "" && + resetResult.cleanupId === "", + "Browser did not retain terminal page absence after profile reset", + { resetResult, closeCalls: state.closeCalls }, + ); + + // An independent window never starts a page. Only Runtime's exact ownership + // receipt may make its close terminal, even when fresh starts are unavailable. + state.freshStartAllowed = false; + state.closeOwnershipBrowserInstance = "browser:another-window"; + await shellFrame.evaluate(() => window.__browserCloseProof.navigateAway()); + await waitForFrame(page, (frame) => frame.url().includes("/blank"), "reset Browser navigation"); + await shellFrame.evaluate(() => window.__browserCloseProof.openFresh()); + browserFrame = await waitForFrame( + page, + (frame) => frame.url().includes("/apps/browser/") && !new URL(frame.url()).searchParams.has("url"), + "Browser without a page", + ); + await browserFrame.waitForFunction(() => document.body?.dataset.loading === "false"); + assert( + state.openRequests === opensBeforeReset && + !(await browserFrame.evaluate(() => window.__elastosBrowserCurrentPageId)), + "Browser opened a page while Runtime withheld fresh-start permission", + state, + ); + await shellFrame.evaluate( + (message) => window.__browserCloseProof.send(message), + { ...request, requestId: "headless-close-other-window-absence" }, + ); + await shellFrame.waitForFunction(() => window.__browserCloseProof.resultCount() === 6); + const unrelatedAbsence = await shellFrame.evaluate(() => window.__browserCloseProof.results().at(-1)); + assert( + unrelatedAbsence.state === "pending" && + unrelatedAbsence.terminalKind === "" && + unrelatedAbsence.reason === "runtime_ownership_unproven", + "Browser accepted another window's absence as its own terminal close", + unrelatedAbsence, + ); + state.closeOwnershipBrowserInstance = browserInstance; + const freshRequest = { ...request, requestId: "headless-close-fresh-exact-absence" }; + await shellFrame.evaluate((message) => window.__browserCloseProof.send(message), freshRequest); + await shellFrame.waitForFunction(() => window.__browserCloseProof.resultCount() === 7); const freshResult = await shellFrame.evaluate(() => window.__browserCloseProof.results().at(-1)); assert( - state.openRequests === 2 && state.closeCalls.length === 1 && + state.openRequests === opensBeforeReset && state.closeCalls.length === closesBeforeReset + 1 && + freshResult.requestId === freshRequest.requestId && + freshResult.homeToken === browserToken && + freshResult.browserInstance === browserInstance && freshResult.state === "terminal" && freshResult.terminalKind === "no_page" && freshResult.pageId === "" && freshResult.cleanupId === "", - "fresh Browser did not accept Runtime's exact absence without closing another page", + "Browser without a page did not accept Runtime's exact absence without closing another page", { freshResult, closeCalls: state.closeCalls }, ); + assert(state.authorityErrors.length === 0, "Browser changed fixture authority", state.authorityErrors); assert(pageErrors.length === 0, "Browser close fixture raised page errors", pageErrors); assert(state.serverErrors.length === 0, "Browser close fixture server failed", state.serverErrors); console.log(JSON.stringify({ schema: "elastos.browser.window-close-headless-smoke/v1", ok: true, close_calls: state.closeCalls.length, + default_startup: state.openRequestBodies[2].url, + fresh_page_status_observed: state.statusCalls.includes("page-3"), fresh_close: freshResult.terminalKind, + unrelated_absence: unrelatedAbsence.state, unload_close_calls: 0, reset_calls: state.resetCalls.length, })); diff --git a/scripts/home-browser-restored-lifecycle-headless-smoke.mjs b/scripts/home-browser-restored-lifecycle-headless-smoke.mjs index a582374a6..9a9308bb0 100644 --- a/scripts/home-browser-restored-lifecycle-headless-smoke.mjs +++ b/scripts/home-browser-restored-lifecycle-headless-smoke.mjs @@ -12,11 +12,18 @@ const homeAuthorityToken = "fixture-home-authority-token"; const homeGuiToken = "fixture-home-gui-launch-token"; const browserOwnerToken = "fixture-browser-owner-launch-token"; const browserRefreshedToken = "fixture-browser-refreshed-launch-token"; +const browserReopenedToken = "fixture-browser-reopened-launch-token"; const openId = "browser-open-fixture-0001"; const pageId = "browser-page-fixture-0001"; +const reopenedPageId = "browser-page-fixture-0002"; const principalId = "did:elastos:fixture-home-refresh"; const recoveredCleanupId = "browser-cleanup:fixture-recovered"; const openedCleanupId = "browser-cleanup:fixture-opened"; +const retainedEngineId = "fixture-retained-engine"; +const retainedExitId = "fixture-retained-exit"; +const initialDisplayGeneration = `display:${"1".repeat(32)}`; +const restoredDisplayGeneration = `display:${"2".repeat(32)}`; +const reopenedDisplayGeneration = `display:${"3".repeat(32)}`; let releaseBrowserWindowCloseTerminal; const browserWindowCloseTerminalGate = new Promise((resolveGate) => { releaseBrowserWindowCloseTerminal = resolveGate; @@ -24,8 +31,8 @@ const browserWindowCloseTerminalGate = new Promise((resolveGate) => { const state = { phase: "placeholder", - homeGuiLaunches: { placeholder: 0, restored: 0 }, - browserLaunches: { placeholder: 0, restored: 0 }, + homeGuiLaunches: { placeholder: 0, restored: 0, reopened: 0 }, + browserLaunches: { placeholder: 0, restored: 0, reopened: 0 }, browserOpenRequests: 0, browserSummaryBindings: 0, browserOpenBindings: 0, @@ -33,6 +40,12 @@ const state = { browserOpenIntent: null, browserOpenCompleted: false, browserStatusPolls: 0, + browserPageStatusReads: 0, + browserFastStatusReads: 0, + browserDisplayAttachRequests: [], + browserDisplayAttachEffects: 0, + browserSignals: [], + reopenedBrowserInstanceId: null, browserPageCount: 0, browserVmCount: 0, browserCleanupEffects: 0, @@ -40,6 +53,8 @@ const state = { browserWindowCloseTerminalReceipts: 0, browserReapedCleanupId: null, activeCleanupId: null, + activePageId: null, + activeDisplayGeneration: initialDisplayGeneration, homeStateWrites: [], errors: [], }; @@ -157,6 +172,8 @@ function homeSummary() { height: 720, query: { browser_instance: browserInstanceId, + browser_engine_id: "fixture-default-engine", + remote_exit_id: "fixture-other-exit", }, }, ], @@ -225,6 +242,9 @@ function browserSummary() { return { sessions: { schema: "elastos.browser.session-capacity/v1", + status: "configured", + capacity_available: true, + fresh_start_allowed: state.activeCleanupId === null, active_sessions: state.browserPageCount, launching_sessions: 0, total_sessions: state.browserPageCount, @@ -232,67 +252,77 @@ function browserSummary() { ? { schema: "elastos.browser.recoverable-page/v1", state: "active", - page_id: pageId, + page_id: state.activePageId, cleanup: { schema: "elastos.browser.cleanup-handle/v1", id: state.activeCleanupId, }, - engine_page: { - schema: "elastos.browser.engine.page/v1", - page_id: pageId, - url: "https://ela.city/", + service_selection: { + schema: "elastos.browser.service-selection/v1", + engine_id: state.activePageId === pageId ? retainedEngineId : "", + exit_id: state.activePageId === pageId ? retainedExitId : "", }, + engine_page: enginePage(state.activePageId, state.activeDisplayGeneration), } : null, }, engine_adapter: { + display_attach_supported: true, supported_display_modes: ["webrtc_remote_display"], supported_guarantee_levels: ["mechanism_microvm"], - adapters: [ - { - id: "fixture-engine", - default: true, + adapters: ["fixture-default-engine", retainedEngineId].map((id, index) => ({ + id, + default: index === 0, engine: "fixture-microvm", backing_substrate: "local_microvm", direct_network: false, wallet_injection: false, supported_display_modes: ["webrtc_remote_display"], supported_guarantee_levels: ["mechanism_microvm"], - }, - ], + })), }, net: { exit_provider: { - remote_carrier_exits: [], + remote_carrier_exits: ["fixture-other-exit", retainedExitId].map((id) => ({ + id, grant_id: `grant:${id}`, display_name: id, state: "ready", allowed_for_principal: true, + })), }, }, }; } +function enginePage(id, displayGeneration) { + const retained = id === pageId; + return { + schema: "elastos.browser.engine.page/v1", + page_id: id, + url: retained ? "https://fixture.invalid/retained" : "https://ela.city/", + actual_url: retained ? "https://fixture.invalid/retained" : "https://ela.city/", + title: retained ? "Retained page" : "ela.city", + view: { width: 1280, height: 720 }, + display_session: { + schema: "elastos.browser.display-session/v1", + mode: "webrtc_remote_display", + signaling_url: `/api/apps/browser/pages/${id}/webrtc`, + display_generation: displayGeneration, + input: "runtime_route", + input_protocol: "elastos_json", + offerer: retained ? "engine" : "browser", + media_transport: "runtime_relay", + ice_servers: [], + audio: false, + video: true, + direct_network: false, + width: 1280, + height: 720, + }, + }; +} + function browserOpenResult() { return { schema: "elastos.browser.open-result/v1", - engine_page: { - schema: "elastos.browser.engine.page/v1", - page_id: pageId, - url: "https://ela.city/", - actual_url: "https://ela.city/", - title: "ela.city", - view: { width: 1280, height: 720 }, - display_session: { - schema: "elastos.browser.display-session/v1", - mode: "webrtc_remote_display", - signaling_url: `/api/apps/browser/pages/${pageId}/webrtc`, - input: "runtime_route", - input_protocol: "elastos_json", - offerer: "browser", - media_transport: "runtime_relay", - ice_servers: [], - audio: false, - video: true, - direct_network: false, - }, - }, + engine_page: enginePage(reopenedPageId, reopenedDisplayGeneration), stream_session: { schema: "elastos.net.stream-session/v1", backend: "fixture-local-exit", @@ -319,11 +349,13 @@ function launchRoute(origin, target, query) { params.set(key, String(value)); } params.set("home_origin", origin); - if (target === "browser" && state.phase === "restored") { + if (target === "browser" && state.phase === "reopened") { params.set("fixture_duplicate_open", "1"); } const token = target === "home-gui" ? homeGuiToken + : state.phase === "reopened" + ? browserReopenedToken : state.phase === "restored" ? browserRefreshedToken : browserOwnerToken; @@ -336,6 +368,11 @@ function launchResponse(origin, target, query) { state.homeGuiLaunches[bucket] += 1; } else if (target === "browser") { state.browserLaunches[bucket] += 1; + if (bucket === "reopened") { + assert(query?.browser_instance && query.browser_instance !== browserInstanceId, + "Home fresh reopen reused the retired Browser instance", query); + state.reopenedBrowserInstanceId = query.browser_instance; + } } return { target, @@ -358,6 +395,22 @@ function requireToken(req, expected, res) { return false; } +function currentBrowserToken() { + return state.phase === "reopened" ? browserReopenedToken : browserRefreshedToken; +} + +function currentBrowserInstance() { + return state.phase === "reopened" ? state.reopenedBrowserInstanceId : browserInstanceId; +} + +function fixtureOffer() { + return { + schema: "elastos.browser.webrtc-offer/v1", type: "offer", + sdp: "v=0\r\no=- 0 0 IN IP4 127.0.0.1\r\ns=fixture\r\nt=0 0\r\n", + candidates: [], end_of_candidates: true, + }; +} + function placeholderBrowser(res) { const body = ` @@ -437,28 +490,30 @@ async function handleApi(req, res, url) { return true; } if (url.pathname === "/api/apps/browser/summary" && req.method === "GET") { - if (!requireToken(req, browserRefreshedToken, res)) { + if (!requireToken(req, currentBrowserToken(), res)) { return true; } assert( - url.searchParams.get("browser_instance") === browserInstanceId, - "refreshed Browser summary omitted its exact stable instance binding", - { actual: url.searchParams.get("browser_instance"), expected: browserInstanceId }, + url.searchParams.get("browser_instance") === currentBrowserInstance(), + "Browser summary omitted its exact instance binding", + { actual: url.searchParams.get("browser_instance"), expected: currentBrowserInstance() }, ); state.browserSummaryBindings += 1; json(res, 200, browserSummary()); return true; } if (url.pathname === "/api/apps/browser/open" && req.method === "POST") { - if (!requireToken(req, browserRefreshedToken, res)) { + if (!requireToken(req, browserReopenedToken, res)) { return true; } const intent = await readBody(req); assert( - intent?.browser_instance === browserInstanceId, - "refreshed Browser open omitted its exact stable instance binding", - { actual: intent?.browser_instance, expected: browserInstanceId }, + state.phase === "reopened" && intent?.browser_instance === state.reopenedBrowserInstanceId, + "fresh Browser open omitted its new instance binding", + { actual: intent?.browser_instance, expected: state.reopenedBrowserInstanceId }, ); + assert(!intent.adapter_id && !intent.remote_exit_id, + "fresh Home launch inherited retired Engine or Exit choices", intent); state.browserOpenBindings += 1; state.browserOpenRequests += 1; if (state.browserOpenIntent === null) { @@ -468,6 +523,8 @@ async function handleApi(req, res, url) { state.browserPageCount = 1; state.browserVmCount = 1; state.activeCleanupId = openedCleanupId; + state.activePageId = reopenedPageId; + state.activeDisplayGeneration = reopenedDisplayGeneration; } else if (!exactIntent(state.browserOpenIntent, intent)) { json(res, 409, { error: "fixture launch owns a different open intent" }); return true; @@ -476,7 +533,7 @@ async function handleApi(req, res, url) { return true; } if (url.pathname === `/api/apps/browser/open/${openId}` && req.method === "GET") { - if (!requireToken(req, browserRefreshedToken, res)) { + if (!requireToken(req, browserReopenedToken, res)) { return true; } state.browserStatusPolls += 1; @@ -488,17 +545,43 @@ async function handleApi(req, res, url) { }); return true; } - if ( - url.pathname === `/api/apps/browser/pages/${pageId}/webrtc` && - req.method === "POST" - ) { - if (!requireToken(req, browserRefreshedToken, res)) { + const pageRoute = url.pathname.match(/^\/api\/apps\/browser\/pages\/([^/]+)\/(webrtc|status|heartbeat|input|close)$/); + const requestPageId = pageRoute?.[1]; + const pageToken = requestPageId === pageId ? browserRefreshedToken : browserReopenedToken; + if (pageRoute && ![pageId, reopenedPageId].includes(requestPageId)) { + json(res, 404, { error: "fixture page is not owned" }); + return true; + } + if (pageRoute?.[2] === "webrtc" && req.method === "POST") { + if (!requireToken(req, pageToken, res)) { return true; } const signal = await readBody(req); + assert(state.activePageId === requestPageId, "signaling used a retired page", signal); + if (signal?.type === "display_attach") { + assert(requestPageId === pageId && signal.display_generation === initialDisplayGeneration && + signal.request_id === initialDisplayGeneration.slice("display:".length) && + Object.keys(signal).sort().join(",") === "display_generation,request_id,type", + "retained display attach changed its exact request contract", signal); + const previous = state.browserDisplayAttachRequests[0]; + assert(!previous || exactIntent(previous, signal), "display attach retries changed request identity", signal); + state.browserDisplayAttachRequests.push(signal); + if (!previous) state.browserDisplayAttachEffects += 1; + state.activeDisplayGeneration = restoredDisplayGeneration; + json(res, 200, { + schema: "elastos.browser.display-attach-result/v1", page_id: pageId, + request_id: signal.request_id, previous_display_generation: signal.display_generation, + display_generation: restoredDisplayGeneration, initial_offer: fixtureOffer(), audio_offer: fixtureOffer(), + }); + return true; + } + assert(signal?.display_generation === state.activeDisplayGeneration, + "Browser signaling used the wrong display generation", signal); + state.browserSignals.push({ page_id: requestPageId, ...signal }); if (signal?.type === "offer") { json(res, 200, { schema: "elastos.browser.webrtc-answer/v1", + display_generation: signal.display_generation, type: "answer", sdp: [ "v=0", @@ -516,6 +599,7 @@ async function handleApi(req, res, url) { } else { json(res, 200, { schema: "elastos.browser.webrtc-signal-ack/v1", + display_generation: signal.display_generation, type: signal?.type || "end_of_candidates", accepted: true, candidates: [], @@ -524,57 +608,53 @@ async function handleApi(req, res, url) { } return true; } - if ( - url.pathname === `/api/apps/browser/pages/${pageId}/status` && - req.method === "GET" - ) { - if (!requireToken(req, browserRefreshedToken, res)) { + if (pageRoute?.[2] === "status" && req.method === "GET") { + if (!requireToken(req, pageToken, res)) { return true; } + state.browserPageStatusReads += 1; + if (url.searchParams.get("fast") === "1") state.browserFastStatusReads += 1; + const current = enginePage(requestPageId, state.activeDisplayGeneration); json(res, 200, { schema: "elastos.browser.page-status/v1", - page_id: pageId, - actual_url: "https://ela.city/", - title: "ela.city", + page_id: requestPageId, + actual_url: current.actual_url, + title: requestPageId === pageId && url.searchParams.get("fast") === "1" + ? "Retained page after status poll" : current.title, + direct_network: false, can_go_back: false, can_go_forward: false, view: { width: 1280, height: 720 }, }); return true; } - if ( - (url.pathname === `/api/apps/browser/pages/${pageId}/heartbeat` || - url.pathname === `/api/apps/browser/pages/${pageId}/input`) && - req.method === "POST" - ) { - if (!requireToken(req, browserRefreshedToken, res)) { + if (["heartbeat", "input"].includes(pageRoute?.[2]) && req.method === "POST") { + if (!requireToken(req, pageToken, res)) { return true; } json(res, 200, { schema: "elastos.browser.input-result/v1", - page_id: pageId, + page_id: requestPageId, accepted: true, }); return true; } - if ( - url.pathname === `/api/apps/browser/pages/${pageId}/close` && - req.method === "POST" - ) { - if (!requireToken(req, browserRefreshedToken, res)) { + if (pageRoute?.[2] === "close" && req.method === "POST") { + if (!requireToken(req, pageToken, res)) { return true; } const closeRequest = await readBody(req); if ( closeRequest?.schema !== "elastos.browser.close-request/v2" || - closeRequest.cleanup_id !== - (state.activeCleanupId || state.browserReapedCleanupId) + closeRequest.cleanup_id !== state.activeCleanupId || + requestPageId !== state.activePageId || + closeRequest.browser_instance !== currentBrowserInstance() ) { json(res, 400, { error: "fixture received a mismatched Browser cleanup identifier" }); return true; } - if (closeRequest.cleanup_id === openedCleanupId) { - state.browserWindowCloseRequests += 1; + state.browserWindowCloseRequests += 1; + if (closeRequest.cleanup_id === recoveredCleanupId) { if (state.browserWindowCloseRequests === 1) { json(res, 200, { schema: "elastos.browser.close-result/v1", @@ -586,31 +666,21 @@ async function handleApi(req, res, url) { return true; } await browserWindowCloseTerminalGate; - state.browserWindowCloseTerminalReceipts += 1; - json(res, 200, { - schema: "elastos.browser.close-result/v1", - page_id: pageId, - closed: false, - already_closed: true, - cleanup_id: closeRequest.cleanup_id, - terminal_effects: { page_absent: true }, - cleanup: { - schema: "elastos.browser.runtime-session-cleanup/v1", - ok: true, - action: "already_absent", - }, - }); - return true; } state.browserCleanupEffects += 1; + state.browserWindowCloseTerminalReceipts += 1; state.browserPageCount = 0; state.browserVmCount = 0; + state.browserReapedCleanupId = state.activeCleanupId; state.activeCleanupId = null; + state.activePageId = null; json(res, 200, { schema: "elastos.browser.close-result/v1", - page_id: pageId, + page_id: requestPageId, closed: true, cleanup_id: closeRequest.cleanup_id, + terminal_effects: { page_absent: true }, + cleanup: { schema: "elastos.browser.runtime-session-cleanup/v1", ok: true, action: "closed" }, }); return true; } @@ -700,6 +770,7 @@ function browserFrame(page) { const origin = await listen(); let browser = null; +let page = null; try { const imported = await import(playwrightSpecifier()); const { chromium } = imported.default || imported; @@ -744,6 +815,14 @@ try { return {}; } + createDataChannel() { + const channel = new EventTarget(); + channel.readyState = "open"; + channel.send = () => {}; + channel.close = () => { channel.readyState = "closed"; }; + return channel; + } + async createOffer() { return { type: "offer", @@ -760,6 +839,10 @@ try { }; } + async createAnswer() { + return { ...(await this.createOffer()), type: "answer" }; + } + async setLocalDescription(description) { this.localDescription = description; } @@ -807,7 +890,7 @@ try { { contextId: browserContextId }, ); - const page = await context.newPage(); + page = await context.newPage(); const recordPageError = (error) => { if (pageErrors.length < 20) pageErrors.push(String(error).slice(0, 2000)); }; @@ -847,30 +930,33 @@ try { state.browserPageCount = 1; state.browserVmCount = 1; state.activeCleanupId = recoveredCleanupId; + state.activePageId = pageId; await page.reload({ waitUntil: "domcontentloaded" }); await waitFor(() => page.evaluate(() => document.body.dataset.homeStatus === "ready"), 15_000, "restored Home bootstrap"); await waitFor(() => homeGuiFrame(page), 15_000, "refreshed real Home GUI frame"); const restoredGui = homeGuiFrame(page); await waitFor(() => restoredGui.locator('.window[data-target="browser"]').isVisible(), 15_000, "restored Browser window"); await waitFor( - () => browserFrame(page)?.url().includes("fixture_duplicate_open=1"), + () => browserFrame(page)?.url().includes(encodeURIComponent(browserRefreshedToken)), 15_000, "restored real Browser frame", ); const restoredBrowser = browserFrame(page); await waitFor(() => restoredBrowser.locator("#browser-form").isVisible(), 15_000, "restored Browser bootstrap"); await waitFor( - () => state.browserStatusPolls > 0 && state.browserOpenCompleted, + () => state.browserPageStatusReads > 0 && state.browserDisplayAttachEffects === 1, 15_000, - "completed coalesced Browser open", + "retained page status and fresh display attachment", ); await restoredBrowser.waitForFunction( - () => - document.querySelector("#browser-status .browser-status-message")?.textContent === - "Remote display negotiated. Waiting for video...", - null, + (expectedPage) => document.body.dataset.loading === "false" && + window.__elastosBrowserCurrentPageId === expectedPage, + pageId, { timeout: 15_000 }, ); + await waitFor(() => state.browserFastStatusReads > 0, 5_000, "restored page periodic status polling"); + await restoredBrowser.waitForFunction(() => document.title.startsWith("Retained page after status poll"), + null, { timeout: 5_000 }); const restoredWindowCount = await restoredGui .locator('.window[data-target="browser"]') @@ -892,15 +978,26 @@ try { assert(state.homeGuiLaunches.restored === 1, "refresh loaded multiple GUI roots", state); assert(state.browserLaunches.placeholder === 1, "first Home replaced the Browser window", state); assert(state.browserLaunches.restored === 1, "refresh replaced the Browser window", state); - assert(state.browserOpenRequests === 2, "completed-open race did not issue two matching requests", state); + assert(state.browserOpenRequests === 0 && state.browserOpenBindings === 0 && state.browserOpenEffects === 0, + "Home reload opened a replacement for the retained page", state); assert(state.browserSummaryBindings > 0, "refreshed Browser summary was not instance-bound", state); - assert(state.browserOpenBindings === 2, "refreshed Browser opens were not instance-bound", state); - assert(state.browserOpenEffects === 1, "matching completed-open race duplicated provider work", state); - assert(state.browserCleanupEffects === 1, "opaque Home reload did not reap exactly one recovered page", state); + assert(state.browserCleanupEffects === 0, "Home reload reaped the retained page", state); assert(state.browserPageCount === 1, "restored Browser owns the wrong active page count", state); assert(state.browserVmCount === 1, "restored Browser owns the wrong active VM count", state); - assert(state.activeCleanupId === openedCleanupId, "restored Browser cleanup ownership is not recoverable", state); - assert(state.browserStatusPolls === 1, "restored Browser polled a replacement open job", state); + assert(state.activeCleanupId === recoveredCleanupId && state.activePageId === pageId, + "restored Browser changed page or cleanup ownership", state); + assert(state.browserStatusPolls === 0, "restored Browser polled a replacement open job", state); + assert(state.browserDisplayAttachRequests.length === 1 && state.browserDisplayAttachEffects === 1, + "restored Browser duplicated display attachment", state); + assert(state.browserSignals.some((signal) => signal.type === "answer" && + signal.page_id === pageId && signal.display_generation === restoredDisplayGeneration), + "restored viewer did not answer under the new display generation", state); + assert(await restoredBrowser.locator("#browser-engine").inputValue() === retainedEngineId && + await restoredBrowser.locator("#browser-exit").inputValue() === retainedExitId, + "retained nondefault Engine/Exit choices did not replace stale launch hints"); + assert(await restoredBrowser.evaluate(() => window.__elastosBrowserCurrentPageId) === pageId && + new URL(restoredBrowser.url()).searchParams.get("display_generation") === restoredDisplayGeneration, + "viewer did not publish its retained page and new display generation"); assert( !/failed|could not open|did not start|error/i.test(restoredStatus || ""), "restored Browser rendered a false startup failure", @@ -918,10 +1015,13 @@ try { await restoredTaskbarButton.getAttribute("data-open-windows") === "1", "restored Browser taskbar entry did not represent exactly one window", ); - state.browserPageCount = 0; - state.browserVmCount = 0; - state.activeCleanupId = null; - state.browserReapedCleanupId = openedCleanupId; + await restoredGui.evaluate(() => { + window.addEventListener("message", (event) => { + if (event.data?.type === "elastos.browser.window-close.result/v1" && event.data.state === "terminal") { + window.__fixtureRetiredBrowserClose = { data: event.data, source: event.source, origin: event.origin }; + } + }); + }); await restoredGui .locator('.window[data-target="browser"] [data-action="close"]') .click(); @@ -932,15 +1032,20 @@ try { ); assert( await restoredGui.locator('.window[data-target="browser"]').count() === 1 && - await restoredTaskbarButton.getAttribute("data-open-windows") === "1", - "nonterminal Browser close removed the shell or taskbar entry", + await restoredTaskbarButton.getAttribute("data-open-windows") === "1" && + state.browserPageCount === 1 && state.browserVmCount === 1 && + state.activeCleanupId === recoveredCleanupId && state.browserCleanupEffects === 0, + "nonterminal Browser close removed its shell, taskbar or Runtime ownership", ); + await waitFor(() => state.browserWindowCloseRequests === 2, 5_000, "pending terminal close retry"); + assert(await restoredGui.locator('.window[data-target="browser"]').count() === 1 && + state.browserWindowCloseTerminalReceipts === 0, "pending close retry removed the shell before its receipt"); releaseBrowserWindowCloseTerminal(); await waitFor( async () => await restoredGui.locator('.window[data-target="browser"]').count() === 0, 10_000, - "delayed already-absent Browser window close", + "delayed terminal Browser window close", ); const finalTaskbarButton = restoredGui.locator( '.taskbar-item[data-target="browser"]', @@ -958,22 +1063,80 @@ try { state.browserPageCount === 0 && state.browserVmCount === 0 && state.activeCleanupId === null && - state.browserReapedCleanupId === openedCleanupId && - state.browserOpenRequests === 2 && - state.browserOpenEffects === 1, + state.activePageId === null && + state.browserReapedCleanupId === recoveredCleanupId && + state.browserOpenRequests === 0 && + state.browserOpenEffects === 0, "terminal Browser close duplicated work or retained Runtime residue", state, ); + // The real Home taskbar opens a new window only after terminal close. The + // fetch shim duplicates that fresh request; fixture dedup is not gateway proof. + state.phase = "reopened"; + assert(finalTaskbarCount === 1, "fixture Browser pin is missing from the Home taskbar"); + await finalTaskbarButton.click(); + await waitFor(() => state.browserLaunches.reopened === 1 && browserFrame(page), + 15_000, "fresh Browser launched through Home"); + const reopenedBrowser = browserFrame(page); + await waitFor(() => state.browserOpenCompleted && state.browserStatusPolls === 1, + 15_000, "completed matching fresh-open requests"); + await reopenedBrowser.waitForFunction(() => + document.querySelector("#browser-status .browser-status-message")?.textContent === + "Remote display negotiated. Waiting for video...", null, { timeout: 15_000 }); + assert(state.browserOpenRequests === 2 && state.browserOpenBindings === 2 && state.browserOpenEffects === 1, + "matching fresh-open fixture requests duplicated effects or lost instance bindings", state); + assert(state.activePageId === reopenedPageId && state.activeCleanupId === openedCleanupId && + state.browserPageCount === 1 && state.browserVmCount === 1 && + state.reopenedBrowserInstanceId !== browserInstanceId, + "fresh Browser did not acquire distinct page, cleanup and window ownership", state); + assert(await reopenedBrowser.evaluate(() => window.__elastosBrowserCurrentPageId) === reopenedPageId && + new URL(reopenedBrowser.url()).hash.includes(browserReopenedToken), + "fresh Browser did not use its new launch authority and page"); + assert(await reopenedBrowser.locator("#browser-engine").inputValue() === "" && + await reopenedBrowser.locator("#browser-exit").inputValue() === "", + "fresh Home launch did not retain its own Automatic Engine/local Exit choices"); + const replayed = await restoredGui.evaluate(() => { + const retired = window.__fixtureRetiredBrowserClose; + if (!retired) return false; + window.dispatchEvent(new MessageEvent("message", retired)); + return true; + }); + assert(replayed, "fixture did not observe the original terminal close delivery"); + assert(await restoredGui.locator('.window[data-target="browser"]').count() === 1 && + page.frames().filter((frame) => frame.url().includes("/apps/browser/")).length === 1 && + state.activePageId === reopenedPageId && state.activeCleanupId === openedCleanupId && + state.browserWindowCloseRequests === 2, + "late retired close delivery changed the fresh Browser window or owner"); + await restoredGui.locator('.window[data-target="browser"] [data-action="close"]').click(); + await waitFor(async () => await restoredGui.locator('.window[data-target="browser"]').count() === 0, + 10_000, "fresh Browser terminal cleanup"); + assert(state.browserWindowCloseRequests === 3 && state.browserWindowCloseTerminalReceipts === 2 && + state.browserCleanupEffects === 2 && state.browserPageCount === 0 && state.browserVmCount === 0 && + state.activeCleanupId === null && state.activePageId === null && + state.browserOpenRequests === 2 && state.browserOpenEffects === 1, + "fresh close duplicated work or retained Runtime residue", state); + assert(state.errors.length === 0 && pageErrors.length === 0, + "Home/Browser lifecycle recorded errors", { pageErrors, serverErrors: state.errors }); + console.log( "[home-browser-restored-lifecycle-headless] PASS " + `home_refresh=1 shell=${restoredWindowCount} frame=${restoredFrameCount} ` + - `open_requests=${state.browserOpenRequests} provider_effects=${state.browserOpenEffects} ` + - `cleanup_effects=${state.browserCleanupEffects} pages=${state.browserPageCount} ` + - `vms=${state.browserVmCount} recoverable_cleanup=1 delayed_close=1 ` + + `open_requests=${state.browserOpenRequests} fixture_open_effects=${state.browserOpenEffects} ` + + `fixture_cleanup_effects=${state.browserCleanupEffects} fixture_pages=${state.browserPageCount} ` + + `fixture_vms=${state.browserVmCount} retained_restore=1 display_attach=1 delayed_close=1 fresh_reopen=1 ` + `open_id=${openId}`, ); +} catch (error) { + const viewer = page ? await browserFrame(page)?.evaluate(() => ({ + status: document.querySelector("#browser-status .browser-status-message")?.textContent, + loading: document.body.dataset.loading, + pageId: window.__elastosBrowserCurrentPageId, + })).catch(() => null) : null; + console.error("[home-browser-restored-lifecycle-headless] diagnostics", JSON.stringify({ state, pageErrors, viewer })); + throw error; } finally { + releaseBrowserWindowCloseTerminal(); await browser?.close().catch(() => {}); await new Promise((resolveClose) => server.close(resolveClose)); } From 9a86d3aed0ba5f0e9d9580fad97c7a1fcb7b3616 Mon Sep 17 00:00:00 2001 From: SashaMIT Date: Sat, 17 Oct 2026 14:07:14 +0000 Subject: [PATCH 2/3] Run Browser lifecycle smokes in the behavior gate Co-authored-by: Codex --- scripts/test-behaviour.sh | 3 +++ scripts/test-behaviour.test.mjs | 42 +++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/scripts/test-behaviour.sh b/scripts/test-behaviour.sh index 8e03138fc..6a55cfa1d 100755 --- a/scripts/test-behaviour.sh +++ b/scripts/test-behaviour.sh @@ -34,4 +34,7 @@ if ! installed "$browser" playwright 1.60.0 || ! installed "$core" playwright-co fi export NODE_PATH="${browser}/node_modules" export BROWSER_OPERATOR_PLAYWRIGHT_CORE="${core}/node_modules/playwright-core" +export ELASTOS_PLAYWRIGHT_MODULE="${browser}/node_modules/playwright/index.mjs" +node scripts/browser-window-close-headless-smoke.mjs +node scripts/home-browser-restored-lifecycle-headless-smoke.mjs exec node --test --test-force-exit --test-timeout=60000 --test-reporter=spec elastos/esp/projections.test.mjs scripts/*.test.mjs scripts/build/*.test.mjs scripts/lib/*.test.mjs capsules/*/browser/*.test.mjs capsules/*/browser/src/*.test.mjs scripts/home-fixture-contracts-smoke.mjs scripts/documents-save-conflict-smoke.mjs scripts/gba-save-conflict-smoke.mjs scripts/assistant-shell-smoke.mjs scripts/model-preparation-failure-smoke.mjs scripts/model-management-browser-smoke.mjs diff --git a/scripts/test-behaviour.test.mjs b/scripts/test-behaviour.test.mjs index abe4ff5b0..d37d8a58c 100644 --- a/scripts/test-behaviour.test.mjs +++ b/scripts/test-behaviour.test.mjs @@ -101,3 +101,45 @@ test("behaviour inputs reject a missing pinned installer binary instead of using assert.notEqual(result.status, 0, result.stderr); assert.match(result.stderr, /node\/bin\/node.*(?:No such file|not found)/); }); + + +const lifecycleSmokes = [ + "scripts/browser-window-close-headless-smoke.mjs", + "scripts/home-browser-restored-lifecycle-headless-smoke.mjs", +]; +for (const failedScript of [null, ...lifecycleSmokes]) { + test(`behaviour runner ${failedScript ? `stops when ${failedScript} fails` : "runs both lifecycle smokes with pinned Playwright"}`, t => { + const { env, log } = fixture(t); + const bin = env.PATH.split(":")[0]; + const shim = `#!${process.execPath} + const fs = require("node:fs"), childProcess = require("node:child_process"); + const args = process.argv.slice(2); + if (args[0] === "-p") { + const result = childProcess.spawnSync(process.execPath, args, { stdio: "inherit" }); + process.exit(result.status ?? 1); + } + fs.appendFileSync(process.env.INPUTS_LOG, JSON.stringify({ + args, playwrightModule: process.env.ELASTOS_PLAYWRIGHT_MODULE, + }) + "\\n"); + process.exit(args[0] === process.env.FAILED_SCRIPT ? 73 : 0); + `; + writeFileSync(join(bin, "node"), shim, { mode: 0o755 }); + // Other sequential shell smokes can share this runner after integration. + // Record their invocation without starting an unrelated process fixture. + writeFileSync(join(bin, "bash"), shim, { mode: 0o755 }); + const result = spawnSync("/bin/bash", [script], { + env: { ...env, FAILED_SCRIPT: failedScript || "", ELASTOS_PLAYWRIGHT_MODULE: "/wrong/ambient/playwright.mjs" }, + encoding: "utf8", timeout: 10_000, + }); + assert.equal(result.status, failedScript ? 73 : 0, result.stderr); + const commands = readFileSync(log, "utf8").trim().split("\n").map(JSON.parse); + const expected = failedScript ? lifecycleSmokes.slice(0, lifecycleSmokes.indexOf(failedScript) + 1) : lifecycleSmokes; + assert.deepEqual(commands.filter(command => lifecycleSmokes.includes(command.args[0])).map(command => command.args), + expected.map(name => [name])); + for (const command of commands.filter(command => lifecycleSmokes.includes(command.args[0]))) { + assert.equal(command.playwrightModule, join(env.BEHAVIOUR_INPUTS, "browser/node_modules/playwright/index.mjs")); + } + if (failedScript) assert.equal(commands.at(-1).args[0], failedScript, "failure stops every later check"); + else assert.equal(commands.at(-1).args[0], "--test", "both smoke results precede the Node suite"); + }); +} From bfb02583f1ebdc976aa8349c8f8370cc42bee487 Mon Sep 17 00:00:00 2001 From: SashaMIT Date: Sun, 18 Oct 2026 00:56:19 +0000 Subject: [PATCH 3/3] Reuse the platform-neutral Home link test fixture Apply the test-only System fixture from 619c0961964aa2a5da938af5cba622349edb1382 to the refreshed develop base. Preserve the existing authority assertions and production behavior. Co-authored-by: Codex --- .../src/api/gateway_tests/home_system.rs | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/elastos/crates/elastos-server/src/api/gateway_tests/home_system.rs b/elastos/crates/elastos-server/src/api/gateway_tests/home_system.rs index a30bded9c..02d08fc68 100644 --- a/elastos/crates/elastos-server/src/api/gateway_tests/home_system.rs +++ b/elastos/crates/elastos-server/src/api/gateway_tests/home_system.rs @@ -11945,9 +11945,10 @@ async fn home_external_link_names_the_launched_app_and_the_exact_address() { }) }; - let browser_token = launched(BROWSER_CAPSULE_ID); + // System is launchable on every host; Browser availability is platform-specific. + let system_token = launched(SYSTEM_CAPSULE_ID); for (app_token, app_id, app_title) in [ - (browser_token.clone(), BROWSER_CAPSULE_ID, "Browser"), + (system_token.clone(), SYSTEM_CAPSULE_ID, "System"), ( launched(HOME_CLI_CAPSULE_ID_FOR_TEST), "home-cli", @@ -11979,13 +11980,13 @@ async fn home_external_link_names_the_launched_app_and_the_exact_address() { "foreign origin", "https://evil.example", home_token.clone(), - browser_token.clone(), + system_token.clone(), ), ( "an app frame calling directly", "null", home_token.clone(), - browser_token.clone(), + system_token.clone(), ), ( "app token from another Home session", @@ -11993,8 +11994,8 @@ async fn home_external_link_names_the_launched_app_and_the_exact_address() { home_token.clone(), issue_home_projection_launch_token_with_context( dir.path(), - BROWSER_CAPSULE_ID, - BROWSER_CAPSULE_ID, + SYSTEM_CAPSULE_ID, + SYSTEM_CAPSULE_ID, &other_session, ) .unwrap(), @@ -12004,13 +12005,13 @@ async fn home_external_link_names_the_launched_app_and_the_exact_address() { "http://localhost:61180", issue_home_launch_token_with_context(dir.path(), HOME_CAPSULE_ID, &other_session) .unwrap(), - browser_token.clone(), + system_token.clone(), ), ( "app token Home did not mint", "http://localhost:61180", home_token.clone(), - issue_home_launch_token_with_context(dir.path(), BROWSER_CAPSULE_ID, &context).unwrap(), + issue_home_launch_token_with_context(dir.path(), SYSTEM_CAPSULE_ID, &context).unwrap(), ), ( "Home GUI is not a link sender", @@ -12037,7 +12038,7 @@ async fn home_external_link_names_the_launched_app_and_the_exact_address() { issue_home_projection_launch_token_with_context( dir.path(), "assistant", - BROWSER_CAPSULE_ID, + SYSTEM_CAPSULE_ID, &context, ) .unwrap(), @@ -12061,7 +12062,7 @@ async fn home_external_link_names_the_launched_app_and_the_exact_address() { } let expired = - issue_expired_home_launch_token_with_context(dir.path(), BROWSER_CAPSULE_ID, &context) + issue_expired_home_launch_token_with_context(dir.path(), SYSTEM_CAPSULE_ID, &context) .unwrap(); let (status, body) = home_external_link_raw( &app, @@ -12088,7 +12089,7 @@ async fn home_external_link_names_the_launched_app_and_the_exact_address() { &app, "http://localhost:61180", &home_token, - request(&browser_token, url), + request(&system_token, url), ) .await; assert_eq!(status, StatusCode::BAD_REQUEST, "{url:?}: {body}"); @@ -12099,13 +12100,13 @@ async fn home_external_link_names_the_launched_app_and_the_exact_address() { &home_token, json!({ "schema": "elastos.home.external-link.request/v2", - "app_token": browser_token, + "app_token": system_token, "url": "https://example.com/", }), ) .await; assert_eq!(status, StatusCode::BAD_REQUEST); - let mut extra = request(&browser_token, "https://example.com/"); + let mut extra = request(&system_token, "https://example.com/"); extra["app_id"] = json!("wallet"); let (status, _) = home_external_link_raw(&app, "http://localhost:61180", &home_token, extra).await;