Skip to content

fix(dashboard): survive unavailable browser storage #4159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Green-hats wants to merge 1 commit into
base: main
Choose a base branch
from
+179 −4
Open

fix(dashboard): survive unavailable browser storage #4159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions apps/presentation/dashboard/src/views/dashboard-page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ import { ensureSshSource } from "../data/ssh-host-catalog";
import {
addSshTunnelStatusSource,
defaultLocalStatusSourceUrl,
emptyStatusSourceCatalog,
loadStatusSourceCatalog,
localStatusSource,
activeStatusSourceForUrl,
Expand Down Expand Up @@ -2823,9 +2824,14 @@ export function DashboardPage() {
preferredGoalRef.current = search.goalId;
const [payload, setPayload] = useState<StatusPayload>(exampleStatusPayload);
const [source, setSource] = useState<DataSource>({ kind: "example", label: "bundled example" });
const [statusSourceCatalog, setStatusSourceCatalog] = useState(() =>
loadStatusSourceCatalog(window.localStorage, window.location.href)
);
const [statusSourceCatalog, setStatusSourceCatalog] = useState(() => {
try {
return loadStatusSourceCatalog(window.localStorage, window.location.href);
} catch {
// Browsers may reject access to the storage object itself.
return emptyStatusSourceCatalog();
}
});
const [statusUrl, setStatusUrl] = useState(search.statusUrl);
const [loadError, setLoadError] = useState<string | null>(null);
const [isLoading, setIsLoading] = useState(false);
Expand Down
40 changes: 40 additions & 0 deletions examples/status-source-switch-browser-smoke.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,46 @@ async function main() {
const appUrl = `http://127.0.0.1:${port}/${packaged ? "chat/" : ""}`;
await waitForHttp(appUrl);
browser = await launchBrowser(chromium);
for (const storageFailure of ["getter", "methods"]) {
const isolated = await browser.newPage({ viewport: { width: 1512, height: 982 } });
const errors = [];
isolated.on("pageerror", (error) => errors.push(error.message));
await isolated.addInitScript((failure) => {
const deny = () => { throw new DOMException("Storage unavailable", "SecurityError"); };
if (failure === "getter") {
Object.defineProperty(window, "localStorage", { get: deny });
} else {
Storage.prototype.getItem = deny;
Storage.prototype.setItem = deny;
}
}, storageFailure);
await isolated.route(`http://127.0.0.1:${port}/ssh-hosts`, (route) => route.fulfill({
json: { ok: true, schema_version: "ssh_host_catalog_v0", hosts: [] },
}));
await isolated.route(`http://127.0.0.1:${port}/status.json*`, (route) => route.fulfill({
json: statusPayload("local-goal", "Local Goal Only"),
}));
await isolated.route("http://127.0.0.1:8976/status.json*", (route) => route.fulfill({
json: statusPayload("remote-b-goal", "Remote B Goal Only"),
}));
await isolated.goto(appUrl, { waitUntil: "networkidle" });
await isolated.getByText("Local Goal Only", { exact: true }).first().waitFor({ timeout: 10_000 });
const select = isolated.getByRole("combobox", { name: "选择控制面来源" });
if (await selectedSourceLabel(select) !== "本机") throw new Error(`${storageFailure}: missing local source fallback`);
await isolated.getByRole("button", { name: "添加 SSH 隧道来源" }).click();
await isolated.getByRole("tab", { name: "手动 URL" }).click();
await isolated.getByLabel("名称").fill("Session Remote");
await isolated.getByLabel("本地转发 URL").fill("http://127.0.0.1:8976/status.json");
await isolated.getByRole("button", { name: "添加只读来源" }).click();
await isolated.getByText("Remote B Goal Only", { exact: true }).first().waitFor({ timeout: 10_000 });
await isolated.locator(".personal-read-only-source", { hasText: "Session Remote" }).waitFor();
await selectSource(isolated, select, "本机");
await isolated.getByText("Local Goal Only", { exact: true }).first().waitFor({ timeout: 10_000 });
await isolated.reload({ waitUntil: "networkidle" });
await isolated.getByText("Local Goal Only", { exact: true }).first().waitFor({ timeout: 10_000 });
if (errors.length) throw new Error(`${storageFailure}: uncaught page errors: ${errors.join("; ")}`);
await isolated.close();
}
const page = await browser.newPage({ viewport: { width: 1512, height: 982 } });
const state = {
ensureGates: new Map(),
Expand Down
Loading