diff --git a/browser-tools-mcp/package.json b/browser-tools-mcp/package.json index 2dd3ff49..fd22b42c 100644 --- a/browser-tools-mcp/package.json +++ b/browser-tools-mcp/package.json @@ -7,7 +7,8 @@ "main": "dist/index.js", "bin": { "browser-tools-mcp": "dist/index.js", - "browser-tools-connector": "dist/connector-bin.js" + "browser-tools-connector": "dist/connector-bin.js", + "browser-tools": "dist/tools-cli-bin.js" }, "files": [ "dist", diff --git a/browser-tools-mcp/src/cli.ts b/browser-tools-mcp/src/cli.ts index 41d586c9..f734b435 100644 --- a/browser-tools-mcp/src/cli.ts +++ b/browser-tools-mcp/src/cli.ts @@ -20,10 +20,6 @@ export interface CliOptions { auditAllowedOrigins?: string[]; /** Let audits reach any loopback/private address but the audits' own ports (not recommended). */ auditAllowPrivateNetwork: boolean; - /** State-changing local API calls, without a panel confirmation. */ - allowActions: boolean; - /** Only this extension may pair. Bare id or full origin. */ - extensionId?: string; /** * Script evaluation. Argv only — not read from the environment — and off * unless this flag is present. @@ -38,6 +34,8 @@ export interface CliOptions { allowInputOrigins?: string[]; /** http(s) origins that are never acted on. Empty unless set. */ excludeOrigins?: string[]; + /** Only this extension may pair. Bare id or full origin. */ + extensionId?: string; } export function readPackageVersion(): string { @@ -80,15 +78,11 @@ export function parseCli(argv: string[], env: NodeJS.ProcessEnv = process.env): auditAllowPrivateNetwork: env["BROWSER_TOOLS_AUDIT_ALLOW_PRIVATE_NETWORK"] === "true" || env["BROWSER_TOOLS_AUDIT_ALLOW_PRIVATE_NETWORK"] === "1", - allowActions: - env["BROWSER_TOOLS_ALLOW_ACTIONS"] === "true" || env["BROWSER_TOOLS_ALLOW_ACTIONS"] === "1", + allowEval: false, + allowInput: false, ...(env["BROWSER_TOOLS_EXTENSION_ID"] ? { extensionId: env["BROWSER_TOOLS_EXTENSION_ID"] } : {}), - // Capability flags are argv only. They are intentionally not read from the - // environment, so an inherited variable cannot turn them on. - allowEval: false, - allowInput: false, ...(splitList(env["BROWSER_TOOLS_AUDIT_ALLOW_ORIGINS"]) ? { auditAllowedOrigins: splitList(env["BROWSER_TOOLS_AUDIT_ALLOW_ORIGINS"]) } : {}), @@ -108,7 +102,6 @@ export function parseCli(argv: string[], env: NodeJS.ProcessEnv = process.env): : {}), }; - // Both spellings of the flag, and the variable, add to the same list. const addAuditOrigins = (value: string | undefined) => { options.auditAllowedOrigins = [...(options.auditAllowedOrigins ?? []), ...(splitList(value) ?? [])]; }; @@ -151,12 +144,6 @@ export function parseCli(argv: string[], env: NodeJS.ProcessEnv = process.env): case "--audit-allow-private-network": options.auditAllowPrivateNetwork = true; break; - case "--allow-actions": - options.allowActions = true; - break; - case "--extension-id": - options.extensionId = next(); - break; case "--allow-eval": options.allowEval = true; break; @@ -169,6 +156,9 @@ export function parseCli(argv: string[], env: NodeJS.ProcessEnv = process.env): case "--exclude-origins": addExcludeOrigins(next()); break; + case "--extension-id": + options.extensionId = next(); + break; case "--port": options.port = numberOrUndefined(next()); break; @@ -199,9 +189,11 @@ export function parseCli(argv: string[], env: NodeJS.ProcessEnv = process.env): else if (arg.startsWith("--token=")) options.token = arg.slice(8); else if (arg.startsWith("--screenshot-dir=")) options.screenshotDir = arg.slice(17); else if (arg.startsWith("--audit-allow-origin=")) addAuditOrigins(arg.slice(21)); + else if (arg.startsWith("--allow-input-origins=")) + addInputOrigins(arg.slice("--allow-input-origins=".length)); + else if (arg.startsWith("--exclude-origins=")) + addExcludeOrigins(arg.slice("--exclude-origins=".length)); else if (arg.startsWith("--extension-id=")) options.extensionId = arg.slice(15); - else if (arg.startsWith("--allow-input-origins=")) addInputOrigins(arg.slice("--allow-input-origins=".length)); - else if (arg.startsWith("--exclude-origins=")) addExcludeOrigins(arg.slice("--exclude-origins=".length)); break; } } @@ -228,7 +220,6 @@ Options: --screenshot-dir
Where screenshots are written
--only Expose only these tools
--exclude Hide these tools (also on the local API)
- --allow-actions Let the local API reload, capture, wipe and change settings
--extension-id Connection
Loopback addresses only. The extension will not send captured data to any other host.
- Off until you turn it on here, or start the connector with --allow-actions.
- Covers reload, screenshots, wiping captured logs, settings changes and which tab is
- current. Closing DevTools turns it off again.
-
diff --git a/chrome-extension/panel.js b/chrome-extension/panel.js index afce5ba4..a3f10852 100644 --- a/chrome-extension/panel.js +++ b/chrome-extension/panel.js @@ -69,9 +69,6 @@ } applySettings(bridge.getSettings()); - if (el("allowActions")) { - el("allowActions").checked = Boolean(bridge.getActionsConfirmed && bridge.getActionsConfirmed()); - } bridge.subscribe(renderStatus); if (bridge.getPanelInputEnabled) { @@ -95,10 +92,6 @@ void bridge.updateSettings(collectSettings()) ); - el("allowActions").addEventListener("change", () => { - if (bridge.setActionsConfirmed) bridge.setActionsConfirmed(el("allowActions").checked); - }); - el("cookies").addEventListener("click", async () => { const granted = await bridge.requestCookiePermission(); el("detail").textContent = granted diff --git a/chrome-extension/worker.js b/chrome-extension/worker.js index 53d7a683..cd7420ed 100644 --- a/chrome-extension/worker.js +++ b/chrome-extension/worker.js @@ -81,9 +81,24 @@ async function ensureConnected() { return; } + var token = ""; + try { + var paired = await fetch("http://" + found.host + ":" + found.port + "/.pair", { method: "POST" }); + if (paired.ok) { + var body = await paired.json(); + if (body && typeof body.token === "string") token = body.token; + } + } catch (error) { + token = ""; + } + if (!token) { + scheduleReconnect(); + return; + } + var ws; try { - ws = new WebSocket("ws://" + found.host + ":" + found.port + "/extension-ws"); + ws = new WebSocket("ws://" + found.host + ":" + found.port + "/extension-ws", ["browser-tools", token]); } catch (error) { scheduleReconnect(); return; @@ -92,7 +107,7 @@ async function ensureConnected() { ws.onopen = function () { reconnectDelayMs = 1000; - send({ type: "hello", extensionVersion: "2.0.0", role: "worker" }); + send({ type: "hello", extensionVersion: "2.0.4", role: "worker" }); void reportState(); }; @@ -105,6 +120,8 @@ async function ensureConnected() { } if (message && message.type === "capability-probe") { void answerProbe(message); + } else if (message && message.type === "navigate-tab") { + void navigateTab(message); } else if (message && message.type === "ping") { send({ type: "pong", id: message.id }); } @@ -124,6 +141,76 @@ async function ensureConnected() { * Reads the switch and the tab again. The URL on the probe message is ignored; * chrome.tabs.get is the only source. */ +function respond(requestId, payload) { + send(Object.assign({ requestId: requestId }, payload)); +} + +function waitForTabUrl(tabId, timeoutMs) { + return new Promise(function (resolve) { + var done = false; + var timer = setTimeout(function () { + if (done) return; + done = true; + api.tabs + .get(tabId) + .then(function (tab) { + resolve(tab && tab.url ? tab.url : ""); + }) + .catch(function () { + resolve(""); + }); + }, timeoutMs); + + function onUpdated(updatedId, changeInfo, tab) { + if (done) return; + if (String(updatedId) !== String(tabId)) return; + if (changeInfo.status === "complete" && tab && tab.url) { + done = true; + clearTimeout(timer); + api.tabs.onUpdated.removeListener(onUpdated); + resolve(tab.url); + } + } + api.tabs.onUpdated.addListener(onUpdated); + }); +} + +async function navigateTab(message) { + var tabId = message.tabId; + var url = message.url; + if ((typeof tabId !== "number" && typeof tabId !== "string") || typeof url !== "string" || !url) { + respond(message.requestId, { + type: "navigate-result", + ok: false, + error: "tabId and url are required", + }); + return; + } + + try { + var before = await api.tabs.get(tabId); + var wasDiscarded = Boolean(before && before.discarded); + await api.tabs.update(tabId, { url: url, active: false }); + var finalUrl = await waitForTabUrl(tabId, 30000); + if (!finalUrl) { + var after = await api.tabs.get(tabId); + finalUrl = after && after.url ? after.url : url; + } + respond(message.requestId, { + type: "navigate-result", + ok: true, + finalUrl: finalUrl, + wasDiscarded: wasDiscarded, + }); + } catch (error) { + respond(message.requestId, { + type: "navigate-result", + ok: false, + error: error instanceof Error ? error.message : String(error), + }); + } +} + async function answerProbe(message) { var state = await readHumanState(); var liveUrl = null;