diff options
| author | amankumarsingh77 <amankumarsingh7702@gmail.com> | 2026-07-28 21:55:55 +0530 |
|---|---|---|
| committer | Aman Kumar <145339995+amankumarsingh77@users.noreply.github.com> | 2026-08-02 19:12:46 +0530 |
| commit | 632600ec0a0a68d9327e19bd419a1ae72047955f (patch) | |
| tree | 5ef59b561d055b8f9173154c252e6d464f3a042b /src/domains/page.ts | |
| parent | 893a9d338ceb5d37aefece1df637c9a5888a120e (diff) | |
refactor: one door from a tool to the browser
Four routes coexisted: cdpCall, a raw client.session().call, a session
held in a local and called directly, and client.evaluateJs — and five
files mixed two or three of them. The CdpError-to-ToolErr mapping was
hand-copied at nine sites, plus a private copy in isolated-tab.ts.
domains/cdp-call.ts now owns all of it: cdpErrToToolErr, cdpCall,
cdpCallOnTarget, cdpCallBrowser, evalJs. Every other file under
src/domains goes through them, which also removes a pile of
`if (!r.success) return err({ kind: "cdp_error", ... })` boilerplate in
favour of returning the failed Result as-is.
Two scanner rules keep it that way, scoped to src/domains/ so the layer
that legitimately owns the session — cdp/ and client.ts — is unaffected.
Scoping is new to the rule model; without it the rules fired on the
transport itself.
One deliberate behaviour change: a CDP timeout now surfaces as
kind "timeout" rather than "cdp_error". isolated-tab.ts already did this
and the other 13 sites flattened it; the shared mapper uses the honest
label rather than preserving the mislabel.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'src/domains/page.ts')
| -rw-r--r-- | src/domains/page.ts | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/domains/page.ts b/src/domains/page.ts index 0d7aa8b..c202ef1 100644 --- a/src/domains/page.ts +++ b/src/domains/page.ts @@ -1,6 +1,7 @@ import { Type } from "typebox"; import { type Result, err, ok } from "../util/result"; import { defineBrowserTool, type ToolErr, type ToolOk } from "../util/tool"; +import { evalJs } from "./cdp-call"; import { sleep } from "../util/time"; import { safeJs } from "../util/js-template"; @@ -79,7 +80,7 @@ export const waitForLoadTool = defineBrowserTool({ const start = Date.now(); while (Date.now() - start < timeoutMs) { if (signal?.aborted) return err({ kind: "internal", message: "aborted" }); - const r = await client.evaluateJs(safeJs`document.readyState`); + const r = await evalJs(client, safeJs`document.readyState`); if (r.success && r.data === "complete") { const ms = Date.now() - start; return ok({ text: `Page loaded in ${Math.round(ms / 100) / 10}s`, details: { ms } }); @@ -123,7 +124,7 @@ export const waitForTool = defineBrowserTool({ const start = Date.now(); while (Date.now() - start < timeoutMs) { if (signal?.aborted) return err({ kind: "internal", message: "aborted" }); - const r = await client.evaluateJs(expr); + const r = await evalJs(client, expr); if (r.success && r.data === true) { const ms = Date.now() - start; const what = args.selector !== undefined ? `${args.selector}${gone ? " gone" : ""}` : `text "${args.text}"`; |
