aboutsummaryrefslogtreecommitdiff
path: root/src/client.ts
diff options
context:
space:
mode:
authoramankumarsingh77 <amankumarsingh7702@gmail.com>2026-07-28 00:53:19 +0530
committerAman Kumar <145339995+amankumarsingh77@users.noreply.github.com>2026-08-02 19:12:46 +0530
commitb9c77bb6f9b8b83574489344ef6efd207a611e98 (patch)
tree3c59bf53bcce3ac5c6bbf9a22884b6e6f787dc91 /src/client.ts
parent1c73f4af643aa60ca554a3770264791d299e64e2 (diff)
refactor: validate JSON at every parse boundary
Ten sites cast or implicitly typed JSON.parse output; JSON.parse("null") would have satisfied all of them. parseJson returns a Result and validates against a typebox schema. js.ts keeps unknown — user script output has no fixed shape. daemon/bridge.ts assigned JSON.parse straight to CdpRawMessage with no guard at all; it now uses isCdpRawMessage like the transport does. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'src/client.ts')
-rw-r--r--src/client.ts60
1 files changed, 30 insertions, 30 deletions
diff --git a/src/client.ts b/src/client.ts
index c1c8951..ad35826 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -1,3 +1,6 @@
+import { Type } from "typebox";
+import { Compile } from "typebox/compile";
+import { parseJson } from "./schemas/parse";
import { type Result, err, ok } from "./util/result";
import { safeJs } from "./util/js-template";
import { type Mutex, createMutex } from "./util/mutex";
@@ -75,31 +78,34 @@ export type BrowserClient = {
const HEALTH_TTL_MS = 30_000;
const PAGE_INFO_TTL_MS = 1_000;
-const parsePageInfoPayload = (v: unknown): Result<PageInfo, CdpError> => {
- if (typeof v !== "object" || v === null) {
- return err(cdpError("invalid_response", "page info payload is not an object"));
- }
- const o = v as Readonly<Record<string, unknown>>;
- const fields: ReadonlyArray<readonly [string, "string" | "number"]> = [
- ["url", "string"], ["title", "string"],
- ["w", "number"], ["h", "number"],
- ["sx", "number"], ["sy", "number"],
- ["pw", "number"], ["ph", "number"],
- ];
- for (const [k, t] of fields) {
- if (typeof o[k] !== t) {
- return err(cdpError("invalid_response", `page info field ${k} has wrong type (expected ${t})`));
- }
+const PageInfoPayload = Type.Object({
+ url: Type.String(),
+ title: Type.String(),
+ w: Type.Number(),
+ h: Type.Number(),
+ sx: Type.Number(),
+ sy: Type.Number(),
+ pw: Type.Number(),
+ ph: Type.Number(),
+});
+
+const pageInfoValidator = Compile(PageInfoPayload);
+
+const parsePageInfoPayload = (raw: string): Result<PageInfo, CdpError> => {
+ const parsed = parseJson(raw, pageInfoValidator);
+ if (!parsed.success) {
+ return err(cdpError("invalid_response", `page info payload is invalid: ${parsed.error}`));
}
+ const o = parsed.data;
return ok({
- url: o["url"] as string,
- title: o["title"] as string,
- width: o["w"] as number,
- height: o["h"] as number,
- scrollX: o["sx"] as number,
- scrollY: o["sy"] as number,
- pageWidth: o["pw"] as number,
- pageHeight: o["ph"] as number,
+ url: o.url,
+ title: o.title,
+ width: o.w,
+ height: o.h,
+ scrollX: o.sx,
+ scrollY: o.sy,
+ pageWidth: o.pw,
+ pageHeight: o.ph,
});
};
@@ -259,13 +265,7 @@ export const createBrowserClient = (opts: BrowserClientOptions): BrowserClient =
const raw = await evaluateJs(expr);
if (!raw.success) return raw;
if (typeof raw.data !== "string") return err(cdpError("invalid_response", "page info evaluation did not return a string"));
- let parsedRaw: unknown;
- try {
- parsedRaw = JSON.parse(raw.data);
- } catch (e) {
- return err(cdpError("invalid_response", `page info JSON.parse failed: ${e instanceof Error ? e.message : String(e)}`));
- }
- const info = parsePageInfoPayload(parsedRaw);
+ const info = parsePageInfoPayload(raw.data);
if (!info.success) return info;
if (currentTid) pageCaches.set(currentTid, { info: info.data, at: Date.now() });
return ok(info.data);