cdp-toolkit 3.2.0 → 3.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/cli.js CHANGED
@@ -3000,6 +3000,8 @@ function mapBidiError(e) {
3000
3000
  return driverError2("disconnected", e.message);
3001
3001
  if (code === "unsupported operation")
3002
3002
  return driverError2("unsupported", e.message);
3003
+ if (code === "unknown command")
3004
+ return driverError2("unsupported", `${e.message} (this Firefox predates that WebDriver BiDi command; see BIDI_CAPABILITY_MIN_FIREFOX for the version each capability needs)`);
3003
3005
  if (!code && /timed out/i.test(e.message))
3004
3006
  return driverError2("timeout", e.message);
3005
3007
  if (!code && /(disposed|not open|connection closed)/i.test(e.message))
@@ -3153,6 +3155,69 @@ async function resolveElementLocator2(conn, contextId, loc) {
3153
3155
  throw driverError2("no-such-element", `text '${loc.text}' matched no element`);
3154
3156
  return sharedRefOf(nodes[0], `text '${loc.text}'`);
3155
3157
  }
3158
+ function modifierKeyValues(mods) {
3159
+ const out = [];
3160
+ for (const m of mods ?? []) {
3161
+ const v = MODIFIER_VALUES[m.toLowerCase()];
3162
+ if (v === undefined)
3163
+ throw driverError2("page-error", `unknown modifier '${m}' (use Alt, Control, Meta, or Shift)`);
3164
+ if (!out.includes(v))
3165
+ out.push(v);
3166
+ }
3167
+ return out;
3168
+ }
3169
+ function modifierChord(pointerId, actions, keys) {
3170
+ const pointer = actions;
3171
+ if (keys.length === 0)
3172
+ return [{ type: "pointer", id: pointerId, actions: pointer }];
3173
+ const k = keys.length;
3174
+ const pause = () => ({ type: "pause" });
3175
+ const keyActions = [
3176
+ ...keys.map((v) => ({ type: "keyDown", value: v })),
3177
+ ...pointer.map(pause),
3178
+ ...[...keys].reverse().map((v) => ({ type: "keyUp", value: v }))
3179
+ ];
3180
+ const pointerActions = [
3181
+ ...Array.from({ length: k }, pause),
3182
+ ...pointer,
3183
+ ...Array.from({ length: k }, pause)
3184
+ ];
3185
+ return [
3186
+ { type: "key", id: "cdp-keyboard", actions: keyActions },
3187
+ { type: "pointer", id: pointerId, actions: pointerActions }
3188
+ ];
3189
+ }
3190
+ function firefoxMajor(conn) {
3191
+ const v = conn.capabilities?.browserVersion;
3192
+ if (typeof v !== "string")
3193
+ return;
3194
+ const major = Number.parseInt(v, 10);
3195
+ return Number.isFinite(major) ? major : undefined;
3196
+ }
3197
+ function requireFirefox(conn, token) {
3198
+ const min = BIDI_CAPABILITY_MIN_FIREFOX[token];
3199
+ if (min === undefined)
3200
+ return;
3201
+ const major = firefoxMajor(conn);
3202
+ if (major !== undefined && major < min) {
3203
+ const v = conn.capabilities.browserVersion;
3204
+ throw driverError2("unsupported", `${token} needs Firefox ${min} or newer; this Firefox is ${v}.`);
3205
+ }
3206
+ }
3207
+ async function armPostHocBodies(conn) {
3208
+ if (process.env.CDP_FIREFOX_BODY_COLLECTOR === "off")
3209
+ return;
3210
+ try {
3211
+ requireFirefox(conn, "network.responseBodyPostHoc");
3212
+ } catch {
3213
+ return;
3214
+ }
3215
+ try {
3216
+ await conn.send("network.addDataCollector", { dataTypes: ["response"], maxEncodedDataSize: POST_HOC_BODY_MAX_BYTES });
3217
+ } catch (e) {
3218
+ console.error(`[cdp-toolkit] firefox response-body collector not armed: ${e instanceof Error ? e.message : String(e)}`);
3219
+ }
3220
+ }
3156
3221
  function bumpEpoch(endpoint, conn) {
3157
3222
  sessionEpochs.set(endpoint, (sessionEpochs.get(endpoint) ?? 0) + 1);
3158
3223
  connEndpoints.set(conn, endpoint);
@@ -3350,6 +3415,7 @@ async function getConnection(endpoint, timeoutMs, attached = false) {
3350
3415
  }
3351
3416
  connections.set(endpoint, conn);
3352
3417
  bumpEpoch(endpoint, conn);
3418
+ await armPostHocBodies(conn);
3353
3419
  if (muxMode(attached) !== "off") {
3354
3420
  try {
3355
3421
  const mux = await startBidiMux(conn);
@@ -3565,7 +3631,35 @@ class BidiBrowserDriver {
3565
3631
  conn.release();
3566
3632
  }
3567
3633
  }
3634
+ async withBrowserConnection(fn) {
3635
+ const conn = await getConnection(this.endpoint, this.timeoutMs, this.attached);
3636
+ try {
3637
+ return await fn(conn);
3638
+ } finally {
3639
+ conn.release();
3640
+ }
3641
+ }
3642
+ setDisposeHook(key, hook) {
3643
+ let hooks = disposeHooks.get(this.endpoint);
3644
+ if (!hooks) {
3645
+ hooks = new Map;
3646
+ disposeHooks.set(this.endpoint, hooks);
3647
+ }
3648
+ if (hook)
3649
+ hooks.set(key, hook);
3650
+ else
3651
+ hooks.delete(key);
3652
+ }
3568
3653
  async dispose() {
3654
+ const hooks = disposeHooks.get(this.endpoint);
3655
+ disposeHooks.delete(this.endpoint);
3656
+ const live = connections.get(this.endpoint);
3657
+ if (hooks && live) {
3658
+ for (const hook of hooks.values())
3659
+ await hook(live).catch(() => {
3660
+ return;
3661
+ });
3662
+ }
3569
3663
  for (const key of [...bidiBeaconScripts.keys()]) {
3570
3664
  if (key.startsWith(`${this.endpoint}:`))
3571
3665
  bidiBeaconScripts.delete(key);
@@ -3640,7 +3734,7 @@ async function hostFirefoxMux(endpoint, opts = {}) {
3640
3734
  function createFirefoxDriverForEndpoint(wsUrl, opts) {
3641
3735
  return new BidiBrowserDriver(wsUrl, opts?.timeoutMs, true);
3642
3736
  }
3643
- var LINE_RE, INTERACTIVE_ROLES3, STAMP_ONE_SOURCE, KEY_VALUES, MODIFIER_VALUES, BUTTON_CODES, ARM_SCROLL_SETTLE_WATCH_SOURCE, AWAIT_SCROLL_SETTLE_SOURCE = "function(){return window.__cdpScrollSettle;}", BIDI_CAPABILITIES, connections, slotHandles, muxes, joined, connecting, sessionEpochs, connEndpoints, STALE_ID_HINT, sleep3 = (ms) => new Promise((r) => setTimeout(r, ms)), slotLabelOverride, bidiBeaconScripts, BidiPageDriver;
3737
+ var LINE_RE, INTERACTIVE_ROLES3, STAMP_ONE_SOURCE, KEY_VALUES, MODIFIER_VALUES, BUTTON_CODES, RAW_MOUSE_SOURCE_ID = "cdp-raw-mouse", ARM_SCROLL_SETTLE_WATCH_SOURCE, AWAIT_SCROLL_SETTLE_SOURCE = "function(){return window.__cdpScrollSettle;}", BIDI_CAPABILITY_MIN_FIREFOX, POST_HOC_BODY_MAX_BYTES, BIDI_CAPABILITIES, connections, slotHandles, muxes, joined, connecting, sessionEpochs, connEndpoints, disposeHooks, STALE_ID_HINT, sleep3 = (ms) => new Promise((r) => setTimeout(r, ms)), slotLabelOverride, bidiBeaconScripts, BidiPageDriver;
3644
3738
  var init_driver2 = __esm(() => {
3645
3739
  init_driver();
3646
3740
  init_leases();
@@ -3695,13 +3789,25 @@ var init_driver2 = __esm(() => {
3695
3789
  MODIFIER_VALUES = { shift: "", control: "", ctrl: "", alt: "", meta: "", cmd: "", command: "" };
3696
3790
  BUTTON_CODES = { left: 0, middle: 1, right: 2 };
3697
3791
  ARM_SCROLL_SETTLE_WATCH_SOURCE = "function(){window.__cdpScrollSettle=new Promise((resolve)=>{let t;const done=()=>{window.removeEventListener('scroll',on,true);resolve(true);};" + "const on=()=>{clearTimeout(t);t=setTimeout(done,60);};window.addEventListener('scroll',on,true);t=setTimeout(done,60);setTimeout(done,500);});}";
3792
+ BIDI_CAPABILITY_MIN_FIREFOX = {
3793
+ "browser.downloads": 160,
3794
+ "browser.permissions": 160,
3795
+ "emulate.mediaFeatures": 160,
3796
+ "emulate.networkConditions": 160,
3797
+ "input.raw": 160,
3798
+ "input.modifierClick": 160,
3799
+ "network.responseBodyPostHoc": 160,
3800
+ "screenshot.scale": 160
3801
+ };
3802
+ POST_HOC_BODY_MAX_BYTES = 2 * 1024 * 1024;
3698
3803
  BIDI_CAPABILITIES = new Set([
3699
3804
  "emulate.deviceMetrics",
3700
3805
  "screenshot.fullPage",
3701
3806
  "screenshot.element",
3702
3807
  "screenshot.renderSize",
3703
3808
  "network.intercept",
3704
- "locate.xpath"
3809
+ "locate.xpath",
3810
+ ...Object.keys(BIDI_CAPABILITY_MIN_FIREFOX)
3705
3811
  ]);
3706
3812
  connections = new Map;
3707
3813
  slotHandles = new Map;
@@ -3710,6 +3816,7 @@ var init_driver2 = __esm(() => {
3710
3816
  connecting = new Map;
3711
3817
  sessionEpochs = new Map;
3712
3818
  connEndpoints = new WeakMap;
3819
+ disposeHooks = new Map;
3713
3820
  STALE_ID_HINT = " — the Firefox BiDi session was re-established after its previous holder went away, and Firefox " + "assigns new context ids per session — re-resolve the tab with list_pages (url:/title: selectors) " + "and claim it again";
3714
3821
  bidiBeaconScripts = new Map;
3715
3822
  BidiPageDriver = class BidiPageDriver {
@@ -3876,18 +3983,30 @@ var init_driver2 = __esm(() => {
3876
3983
  return { x, y };
3877
3984
  }
3878
3985
  async click(loc, opts) {
3879
- if (opts?.modifiers && opts.modifiers.length > 0) {
3880
- throw driverError2("unsupported", "click: 'modifiers' is not supported by the Firefox/BiDi driver; omit 'modifiers' or use --browser chrome for a modifier click.");
3881
- }
3986
+ const hasModifiers = !!opts?.modifiers && opts.modifiers.length > 0;
3987
+ if (hasModifiers)
3988
+ requireFirefox(this.conn, "input.modifierClick");
3989
+ const keys = modifierKeyValues(opts?.modifiers);
3882
3990
  const ref = await resolveElementLocator2(this.conn, this.contextId, loc);
3883
3991
  const { x, y } = await this.centerOf(ref);
3884
3992
  const button = BUTTON_CODES[opts?.button ?? "left"];
3885
3993
  const actions = [{ type: "pointerMove", x, y, duration: 0 }];
3886
3994
  for (let i = 0;i < (opts?.clickCount ?? 1); i++)
3887
3995
  actions.push({ type: "pointerDown", button }, { type: "pointerUp", button });
3888
- await this.performActions([{ type: "pointer", id: "cdp-mouse", actions }]);
3996
+ await this.performActions(modifierChord("cdp-mouse", actions, keys));
3889
3997
  return { x, y };
3890
3998
  }
3999
+ async dispatchMouse(event) {
4000
+ requireFirefox(this.conn, "input.raw");
4001
+ const keys = modifierKeyValues(event.modifiers);
4002
+ const button = BUTTON_CODES[event.button ?? "left"];
4003
+ const actions = [{ type: "pointerMove", x: event.x, y: event.y, duration: 0 }];
4004
+ if (event.action === "down")
4005
+ actions.push({ type: "pointerDown", button });
4006
+ else if (event.action === "up")
4007
+ actions.push({ type: "pointerUp", button });
4008
+ await this.performActions(modifierChord(RAW_MOUSE_SOURCE_ID, actions, keys));
4009
+ }
3891
4010
  async scroll(anchor, opts) {
3892
4011
  const { x, y } = await this.resolveScrollPoint(anchor);
3893
4012
  const deltaX = Math.round(opts.deltaX ?? 0);
@@ -3996,11 +4115,23 @@ var init_driver2 = __esm(() => {
3996
4115
  }
3997
4116
  async screenshot(opts, _consumeBands) {
3998
4117
  const renderSize = opts?.renderWidth !== undefined && opts?.renderHeight !== undefined ? { width: opts.renderWidth, height: opts.renderHeight } : undefined;
3999
- if (!renderSize)
4118
+ const scale = opts?.scale !== undefined && opts.scale !== 1 ? opts.scale : undefined;
4119
+ if (!renderSize && scale === undefined)
4000
4120
  return this.capture(opts);
4121
+ if (scale !== undefined)
4122
+ requireFirefox(this.conn, "screenshot.scale");
4001
4123
  const previous = await readViewportRecord(this.browser.scheme, this.contextId);
4124
+ let dprOverride;
4125
+ if (scale !== undefined) {
4126
+ const base = previous?.deviceScaleFactor ?? Number(await this.evaluate("window.devicePixelRatio").catch(() => 1));
4127
+ dprOverride = (Number.isFinite(base) && base > 0 ? base : 1) * scale;
4128
+ }
4002
4129
  try {
4003
- await this.conn.send("browsingContext.setViewport", { context: this.contextId, viewport: { width: renderSize.width, height: renderSize.height } });
4130
+ await this.conn.send("browsingContext.setViewport", {
4131
+ context: this.contextId,
4132
+ ...renderSize ? { viewport: { width: renderSize.width, height: renderSize.height } } : {},
4133
+ ...dprOverride !== undefined ? { devicePixelRatio: dprOverride } : {}
4134
+ });
4004
4135
  } catch (e) {
4005
4136
  throw mapBidiError(e);
4006
4137
  }
@@ -4017,29 +4148,35 @@ var init_driver2 = __esm(() => {
4017
4148
  await this.conn.send("browsingContext.setViewport", {
4018
4149
  context: this.contextId,
4019
4150
  viewport: { width: previous.width, height: previous.height },
4020
- ...previous.deviceScaleFactor != null ? { devicePixelRatio: previous.deviceScaleFactor } : {}
4151
+ ...previous.deviceScaleFactor != null ? { devicePixelRatio: previous.deviceScaleFactor } : scale !== undefined ? { devicePixelRatio: null } : {}
4021
4152
  });
4022
4153
  } else {
4023
- await this.conn.send("browsingContext.setViewport", { context: this.contextId, viewport: null });
4154
+ await this.conn.send("browsingContext.setViewport", {
4155
+ context: this.contextId,
4156
+ ...renderSize ? { viewport: null } : {},
4157
+ ...scale !== undefined ? { devicePixelRatio: null } : {}
4158
+ });
4024
4159
  }
4025
4160
  } catch (e) {
4026
4161
  restoreError = e instanceof Error ? e.message : String(e);
4027
4162
  }
4028
4163
  if (!shot) {
4029
4164
  if (restoreError !== undefined && captureError instanceof Error) {
4030
- captureError.message = `${captureError.message} ${renderRestoreFailureNote(renderSize, restoreError)}`;
4165
+ captureError.message = renderSize ? `${captureError.message} ${renderRestoreFailureNote(renderSize, restoreError)}` : `${captureError.message} (and restoring the device pixel ratio failed too, the tab may still be emulated at ratio ${dprOverride}: ${restoreError})`;
4031
4166
  }
4032
4167
  throw captureError;
4033
4168
  }
4169
+ if (!renderSize) {
4170
+ if (restoreError !== undefined)
4171
+ throw driverError2("page-error", `screenshot captured, but restoring the device pixel ratio failed (the tab may still be emulated at ratio ${dprOverride}): ${restoreError}`);
4172
+ return shot;
4173
+ }
4034
4174
  const result = { ...shot, renderSize, renderRestored: restoreError === undefined };
4035
4175
  if (restoreError !== undefined)
4036
4176
  result.renderRestoreError = restoreError;
4037
4177
  return result;
4038
4178
  }
4039
4179
  async capture(opts) {
4040
- if (opts?.scale !== undefined && opts.scale !== 1) {
4041
- throw driverError2("unsupported", `screenshot scale ${opts.scale} is not supported by this backend (WebDriver BiDi's ` + "browsingContext.captureScreenshot has no scale parameter). Call emulate with " + `deviceScaleFactor:${opts.scale} first and capture at scale 1, or use --browser chrome.`);
4042
- }
4043
4180
  if (opts?.tile === true) {
4044
4181
  throw driverError2("unsupported", "screenshot tile:true is not supported by this backend: band tiling is declared only where the band " + "arithmetic has been measured against a real browser, and Firefox was not driven for it " + `(browsingContext.captureScreenshot's clip:{type:"box"} is the primitive it would ride, untested). ` + "Capture a smaller region or a single element, or use --browser chrome for a tiled capture.");
4045
4182
  }
@@ -4067,10 +4204,29 @@ var init_driver2 = __esm(() => {
4067
4204
  await this.conn.send("browsingContext.setViewport", { context: this.contextId, viewport: null, devicePixelRatio: null }).catch(() => {
4068
4205
  return;
4069
4206
  });
4207
+ await this.conn.send("emulation.setMediaFeaturesOverride", { features: null, contexts: [this.contextId] }).catch(() => {
4208
+ return;
4209
+ });
4210
+ await this.conn.send("emulation.setNetworkConditions", { networkConditions: null, contexts: [this.contextId] }).catch(() => {
4211
+ return;
4212
+ });
4070
4213
  await clearViewportRecord(this.browser.scheme, this.contextId);
4071
4214
  return { applied: [] };
4072
4215
  }
4073
4216
  const applied = [];
4217
+ if (opts.media != null && opts.media !== "") {
4218
+ throw driverError2("unsupported", `emulate media "${opts.media}": WebDriver BiDi's emulation.setMediaFeaturesOverride takes media features (prefers-color-scheme, ...) but has no print/screen media-type override. Use mediaFeatures, or --browser chrome for media type emulation.`);
4219
+ }
4220
+ const net = opts.networkConditions;
4221
+ if (net != null) {
4222
+ const throttled = (net.latency ?? 0) > 0 || (net.downloadThroughput ?? -1) >= 0 || (net.uploadThroughput ?? -1) >= 0;
4223
+ if (throttled) {
4224
+ throw driverError2("unsupported", 'emulate networkConditions: Firefox only emulates offline (emulation.setNetworkConditions has the single type "offline"); latency and download/upload throughput throttling are not available. Pass only {offline:true|false}, or use --browser chrome.');
4225
+ }
4226
+ requireFirefox(this.conn, "emulate.networkConditions");
4227
+ }
4228
+ if (opts.mediaFeatures != null)
4229
+ requireFirefox(this.conn, "emulate.mediaFeatures");
4074
4230
  try {
4075
4231
  if (opts.width != null && opts.height != null) {
4076
4232
  await this.conn.send("browsingContext.setViewport", { context: this.contextId, viewport: { width: opts.width, height: opts.height }, ...opts.deviceScaleFactor != null ? { devicePixelRatio: opts.deviceScaleFactor } : {} });
@@ -4085,6 +4241,21 @@ var init_driver2 = __esm(() => {
4085
4241
  await this.conn.send("emulation.setUserAgentOverride", { userAgent: opts.userAgent, contexts: [this.contextId] });
4086
4242
  applied.push("userAgent");
4087
4243
  }
4244
+ if (opts.mediaFeatures != null) {
4245
+ const features = Object.fromEntries(opts.mediaFeatures.map((f) => [f.name, f.value]));
4246
+ await this.conn.send("emulation.setMediaFeaturesOverride", {
4247
+ features: opts.mediaFeatures.length > 0 ? features : null,
4248
+ contexts: [this.contextId]
4249
+ });
4250
+ applied.push("mediaFeatures");
4251
+ }
4252
+ if (net != null) {
4253
+ await this.conn.send("emulation.setNetworkConditions", {
4254
+ networkConditions: net.offline ? { type: "offline" } : null,
4255
+ contexts: [this.contextId]
4256
+ });
4257
+ applied.push("networkConditions");
4258
+ }
4088
4259
  } catch (e) {
4089
4260
  throw mapBidiError(e);
4090
4261
  }
@@ -4219,12 +4390,25 @@ var init_driver2 = __esm(() => {
4219
4390
  };
4220
4391
  }
4221
4392
  async getResponseBody(requestId) {
4222
- if (!this.bodyCollector)
4223
- throw driverError2("unsupported", "getResponseBody: call startBodyCapture() first (network.responseBodyPostHoc is not supported)");
4393
+ let collector;
4224
4394
  try {
4225
- const { bytes } = await this.conn.send("network.getData", { dataType: "response", collector: this.bodyCollector, request: requestId });
4395
+ requireFirefox(this.conn, "network.responseBodyPostHoc");
4396
+ } catch (e) {
4397
+ if (!this.bodyCollector) {
4398
+ throw driverError2("unsupported", `${e.message} Call startBodyCapture() before the request to read its body on this Firefox.`);
4399
+ }
4400
+ collector = this.bodyCollector;
4401
+ }
4402
+ try {
4403
+ const { bytes } = await this.conn.send("network.getData", { dataType: "response", request: requestId, ...collector ? { collector } : {} });
4226
4404
  return bytes.type === "base64" ? { body: bytes.value, base64Encoded: true } : { body: bytes.value, base64Encoded: false };
4227
4405
  } catch (e) {
4406
+ if (e instanceof BidiError && e.code === "unavailable network data") {
4407
+ throw driverError2("page-error", `getResponseBody: the body of request ${requestId} was collected but has been evicted (Firefox keeps only a bounded recent window of response bodies, on the order of 100-200 MB). Re-issue the request, then read it sooner.`);
4408
+ }
4409
+ if (e instanceof BidiError && e.code === "no such network data") {
4410
+ throw driverError2("page-error", `getResponseBody: no body is held for request ${requestId}. Firefox cannot say which of these applies: the id is wrong, the request started before this Firefox session did, the response was larger than ${POST_HOC_BODY_MAX_BYTES} bytes (not retained), or it has no body.`);
4411
+ }
4228
4412
  throw mapBidiError(e);
4229
4413
  }
4230
4414
  }
@@ -4752,6 +4936,7 @@ var CDP_CAPABILITIES = new Set([
4752
4936
  "locate.xpath",
4753
4937
  "capture.screencast",
4754
4938
  "input.raw",
4939
+ "input.modifierClick",
4755
4940
  "input.html5Drag",
4756
4941
  "emulate.focus",
4757
4942
  "browser.downloads",
@@ -6772,7 +6957,7 @@ function resolveScreenshotScale(scale, capabilities) {
6772
6957
  throw new SharedToolError(`take_screenshot: 'scale' must be a finite number greater than 0 and at most ${MAX_SCREENSHOT_SCALE} (default 1)`);
6773
6958
  }
6774
6959
  if (scale !== 1 && !capabilities.has("screenshot.scale")) {
6775
- throw new SharedToolError("take_screenshot: 'scale' is not supported by this backend (WebDriver BiDi's browsingContext.captureScreenshot has no scale parameter). " + `Call emulate with deviceScaleFactor:${scale} first and capture at scale 1, or use --browser chrome for a per-capture scale.`);
6960
+ throw new SharedToolError("take_screenshot: 'scale' is not supported by this backend (no per-capture scale primitive). " + `Call emulate with deviceScaleFactor:${scale} first and capture at scale 1, or use --browser chrome for a per-capture scale.`);
6776
6961
  }
6777
6962
  return scale;
6778
6963
  }
@@ -9475,6 +9660,16 @@ async function withPage4(driver, target, fn) {
9475
9660
  await page.release();
9476
9661
  }
9477
9662
  }
9663
+ async function dispatchMouse2(driver, args) {
9664
+ validateDispatchMouseArgs(args);
9665
+ modifierBits(args.modifiers);
9666
+ return withPage4(driver, args.target, async (page) => {
9667
+ if (!page.dispatchMouse)
9668
+ throw new BidiToolError("dispatch_mouse: this page driver has no raw mouse dispatch");
9669
+ await page.dispatchMouse({ action: args.action, x: args.x, y: args.y, button: args.button, clickCount: args.clickCount, modifiers: args.modifiers });
9670
+ return { dispatched: args.action, x: args.x, y: args.y };
9671
+ });
9672
+ }
9478
9673
  var consoleBuffers = new Map;
9479
9674
  var networkBuffers = new Map;
9480
9675
  function refuseWorkerSelector(driver, target) {
@@ -9547,6 +9742,13 @@ async function getNetworkRequest2(driver, args = {}) {
9547
9742
  return withPage4(driver, args.target, async (page) => {
9548
9743
  const buf = bufferFor(networkBuffers, page.info.id);
9549
9744
  const found = args.requestId ? buf.find((r) => r.requestId === args.requestId || r.request === args.requestId) : buf.find((r) => typeof r.url === "string" && r.url.includes(args.url));
9745
+ if (args.includeBody) {
9746
+ const id = args.requestId ?? (found ? String(found.requestId ?? found.request ?? "") : "");
9747
+ if (!id)
9748
+ throw new BidiToolError("get_network_request includeBody on this backend needs a requestId, or a url already present in the buffer (run list_network_requests with reload first)");
9749
+ const { body, base64Encoded } = await page.getResponseBody(id);
9750
+ return { ...found ?? { requestId: id }, body, bodyBase64Encoded: base64Encoded };
9751
+ }
9550
9752
  if (!found)
9551
9753
  throw new BidiToolError("no matching network request in the current buffer; run list_network_requests first");
9552
9754
  return found;
@@ -9622,7 +9824,232 @@ var BIDI_ONLY_TOOLS = {
9622
9824
  get_network_request: getNetworkRequest2,
9623
9825
  mock_request: mockRequest2,
9624
9826
  list_mocks: listMocks2,
9625
- clear_mocks: clearMocks2
9827
+ clear_mocks: clearMocks2,
9828
+ dispatch_mouse: dispatchMouse2
9829
+ };
9830
+
9831
+ // src/bidi-browser-tools.ts
9832
+ init_driver2();
9833
+ import { mkdir as mkdir14, readdir as readdir4, realpath, rename as rename4, stat as stat5 } from "node:fs/promises";
9834
+ import { basename as basename2, dirname as dirname4, join as join14, resolve } from "node:path";
9835
+ function unsupported(message) {
9836
+ return Object.assign(new Error(message), { code: "unsupported" });
9837
+ }
9838
+ function scopeOf(driver, tool) {
9839
+ const d = driver;
9840
+ if (typeof d.withBrowserConnection !== "function" || typeof d.setDisposeHook !== "function") {
9841
+ throw unsupported(`${tool}: this driver has no browser-scoped connection (the Firefox BiDi driver does; Chrome uses src/tools/).`);
9842
+ }
9843
+ return d;
9844
+ }
9845
+ async function targetOf(driver, target) {
9846
+ const page = await driver.page(target);
9847
+ try {
9848
+ return { id: page.info.id, url: page.info.url, title: page.info.title };
9849
+ } finally {
9850
+ await page.release();
9851
+ }
9852
+ }
9853
+ var FIREFOX_DOWNLOAD_STAGING_DIR = join14(dirname4(DOWNLOADS_DIR), "downloads-firefox-staging");
9854
+ var downloadStates = new WeakMap;
9855
+ function downloadId(p) {
9856
+ const v = p.download ?? p.navigation;
9857
+ return typeof v === "string" && v.length > 0 ? v : undefined;
9858
+ }
9859
+ function deliver(s, r) {
9860
+ r.state = "completed";
9861
+ s.downloads.push(r);
9862
+ while (s.downloads.length > DOWNLOAD_BUFFER_LIMIT) {
9863
+ const i = s.downloads.findIndex((d) => d.consumed);
9864
+ s.downloads.splice(i >= 0 ? i : 0, 1);
9865
+ }
9866
+ const waiter = s.waiters.shift();
9867
+ if (waiter) {
9868
+ r.consumed = true;
9869
+ waiter(r);
9870
+ }
9871
+ }
9872
+ function downloadStateFor(conn) {
9873
+ let s = downloadStates.get(conn);
9874
+ if (s)
9875
+ return s;
9876
+ const state = { downloads: [], begun: new Map, waiters: [], stagingDirs: new Set([resolve(FIREFOX_DOWNLOAD_STAGING_DIR)]) };
9877
+ downloadStates.set(conn, state);
9878
+ conn.on("browsingContext.downloadWillBegin", (p) => {
9879
+ const id = downloadId(p);
9880
+ if (!id)
9881
+ return;
9882
+ state.begun.set(id, { id, url: p.url, suggestedFilename: p.suggestedFilename, state: "inProgress", consumed: false });
9883
+ if (state.begun.size > DOWNLOAD_BUFFER_LIMIT)
9884
+ state.begun.delete(state.begun.keys().next().value);
9885
+ });
9886
+ conn.on("browsingContext.downloadEnd", (p) => {
9887
+ const id = downloadId(p);
9888
+ if (!id)
9889
+ return;
9890
+ const rec = state.begun.get(id) ?? { id, state: "inProgress", consumed: false };
9891
+ state.begun.delete(id);
9892
+ if (p.status !== "complete" || !p.filepath)
9893
+ return;
9894
+ if (!state.stagingDirs.has(resolve(dirname4(p.filepath))))
9895
+ return;
9896
+ rec.url ??= p.url;
9897
+ const held = join14(dirname4(p.filepath), `${id.replace(/[^A-Za-z0-9-]/g, "_")}.download`);
9898
+ rename4(p.filepath, held).then(() => {
9899
+ rec.filePath = held;
9900
+ }, () => {
9901
+ rec.filePath = p.filepath ?? undefined;
9902
+ }).finally(() => deliver(state, rec));
9903
+ });
9904
+ return state;
9905
+ }
9906
+ async function armFirefoxDownloads(conn, s, scope) {
9907
+ await mkdir14(FIREFOX_DOWNLOAD_STAGING_DIR, { recursive: true });
9908
+ await mkdir14(DOWNLOADS_DIR, { recursive: true });
9909
+ s.stagingDirs.add(resolve(await realpath(FIREFOX_DOWNLOAD_STAGING_DIR)));
9910
+ scope.setDisposeHook("browser.downloads", async (c) => {
9911
+ await c.send("browser.setDownloadBehavior", { downloadBehavior: null });
9912
+ });
9913
+ await conn.send("browser.setDownloadBehavior", { downloadBehavior: { type: "allowed", destinationFolder: FIREFOX_DOWNLOAD_STAGING_DIR } });
9914
+ }
9915
+ async function disarmFirefoxDownloads(conn, scope) {
9916
+ await conn.send("browser.setDownloadBehavior", { downloadBehavior: null });
9917
+ scope.setDisposeHook("browser.downloads", undefined);
9918
+ }
9919
+ function nextFirefoxDownload(s, timeoutMs) {
9920
+ const buffered = s.downloads.find((d) => !d.consumed);
9921
+ if (buffered) {
9922
+ buffered.consumed = true;
9923
+ return Promise.resolve(buffered);
9924
+ }
9925
+ return new Promise((resolvePromise, reject) => {
9926
+ const waiter = (r) => {
9927
+ clearTimeout(timer);
9928
+ resolvePromise(r);
9929
+ };
9930
+ const timer = setTimeout(() => {
9931
+ const i = s.waiters.indexOf(waiter);
9932
+ if (i >= 0)
9933
+ s.waiters.splice(i, 1);
9934
+ reject(new Error(`wait_for_download: no download completed within ${timeoutMs}ms. On Firefox, downloads are captured only while a wait_for_download call is armed: arm (arm:true) BEFORE the triggering click, and again before every later download, because each collecting call restores Firefox's normal download behavior when it returns.`));
9935
+ }, timeoutMs);
9936
+ s.waiters.push(waiter);
9937
+ });
9938
+ }
9939
+ async function waitForDownloadFirefox(driver, args = {}) {
9940
+ validateWaitForDownloadArgs(args);
9941
+ const scope = scopeOf(driver, "wait_for_download");
9942
+ const target = await targetOf(driver, args.target);
9943
+ return scope.withBrowserConnection(async (conn) => {
9944
+ requireFirefox(conn, "browser.downloads");
9945
+ const s = downloadStateFor(conn);
9946
+ await armFirefoxDownloads(conn, s, scope);
9947
+ if (args.arm === true) {
9948
+ return { armed: true, downloadPath: DOWNLOADS_DIR, pending: s.downloads.filter((d) => !d.consumed).length, target };
9949
+ }
9950
+ let rec;
9951
+ try {
9952
+ rec = await nextFirefoxDownload(s, args.timeoutMs ?? 30000);
9953
+ } finally {
9954
+ if (s.waiters.length === 0)
9955
+ await disarmFirefoxDownloads(conn, scope).catch(() => {
9956
+ return;
9957
+ });
9958
+ }
9959
+ if (!rec.filePath) {
9960
+ throw new Error(`wait_for_download: download ${rec.id} completed without a file path (nothing to return)`);
9961
+ }
9962
+ const suggestedFilename = safeFilename(rec.suggestedFilename);
9963
+ const taken = new Set(await readdir4(DOWNLOADS_DIR).catch(() => []));
9964
+ taken.delete(basename2(rec.filePath));
9965
+ const finalName = nextFreeName(suggestedFilename, taken);
9966
+ const path = join14(DOWNLOADS_DIR, finalName);
9967
+ await rename4(rec.filePath, path);
9968
+ const bytes = (await stat5(path)).size;
9969
+ return { path, suggestedFilename, bytes, ...rec.url ? { url: rec.url } : {}, target };
9970
+ });
9971
+ }
9972
+ var FIREFOX_PERMISSION_DESCRIPTORS = {
9973
+ geolocation: { name: "geolocation" },
9974
+ notifications: { name: "notifications" },
9975
+ audioCapture: { name: "microphone" },
9976
+ videoCapture: { name: "camera" },
9977
+ durableStorage: { name: "persistent-storage" },
9978
+ midi: { name: "midi" },
9979
+ midiSysex: { name: "midi", sysex: true },
9980
+ wakeLockScreen: { name: "screen-wake-lock" }
9981
+ };
9982
+ function mapFirefoxPermissions(names) {
9983
+ return names.map((n) => {
9984
+ const d = Object.hasOwn(FIREFOX_PERMISSION_DESCRIPTORS, n) ? FIREFOX_PERMISSION_DESCRIPTORS[n] : undefined;
9985
+ if (!d) {
9986
+ throw unsupported(`grant_permissions: permission '${n}' is not supported on Firefox (WebDriver BiDi permissions.setPermission has no measured equivalent). Supported on Firefox: ${Object.keys(FIREFOX_PERMISSION_DESCRIPTORS).join(", ")}.`);
9987
+ }
9988
+ return d;
9989
+ });
9990
+ }
9991
+ var trackedGrants = new WeakMap;
9992
+ function grantKey(origin, d) {
9993
+ return `${origin} ${JSON.stringify(d)}`;
9994
+ }
9995
+ async function restoreGrants(conn, grants) {
9996
+ const all = [...grants.values()];
9997
+ grants.clear();
9998
+ for (const g of all) {
9999
+ await conn.send("permissions.setPermission", { descriptor: g.descriptor, state: g.previous, origin: g.origin });
10000
+ }
10001
+ }
10002
+ async function queryState(page, d) {
10003
+ try {
10004
+ const v = await page.evaluate(`navigator.permissions.query(${JSON.stringify(d)}).then((p) => p.state, () => "prompt")`, { awaitPromise: true });
10005
+ return v === "granted" || v === "denied" ? v : "prompt";
10006
+ } catch {
10007
+ return "prompt";
10008
+ }
10009
+ }
10010
+ async function grantPermissionsFirefox(driver, args = {}) {
10011
+ validateGrantPermissionsArgs(args);
10012
+ const reset = args.reset === true;
10013
+ const permissions = args.permissions ?? [];
10014
+ const descriptors = mapFirefoxPermissions(permissions);
10015
+ const scope = scopeOf(driver, "grant_permissions");
10016
+ let grants = trackedGrants.get(driver);
10017
+ if (!grants) {
10018
+ grants = new Map;
10019
+ trackedGrants.set(driver, grants);
10020
+ }
10021
+ const tracked = grants;
10022
+ const page = await driver.page(args.target);
10023
+ try {
10024
+ const target = { id: page.info.id, url: page.info.url, title: page.info.title };
10025
+ return await scope.withBrowserConnection(async (conn) => {
10026
+ requireFirefox(conn, "browser.permissions");
10027
+ if (reset)
10028
+ await restoreGrants(conn, tracked);
10029
+ if (permissions.length === 0)
10030
+ return { reset: true, target };
10031
+ const origin = args.origin ?? originOf(page.info.url);
10032
+ if (!origin) {
10033
+ throw new Error(`grant_permissions: cannot derive an origin from the target tab's url (${JSON.stringify(page.info.url)}); pass 'origin' explicitly, e.g. origin:"https://example.com"`);
10034
+ }
10035
+ const pageIsOrigin = originOf(page.info.url) === origin;
10036
+ scope.setDisposeHook("browser.permissions", (c) => restoreGrants(c, tracked));
10037
+ for (const d of descriptors) {
10038
+ const key = grantKey(origin, d);
10039
+ if (!tracked.has(key)) {
10040
+ tracked.set(key, { origin, descriptor: d, previous: pageIsOrigin ? await queryState(page, d) : "prompt" });
10041
+ }
10042
+ await conn.send("permissions.setPermission", { descriptor: d, state: "granted", origin });
10043
+ }
10044
+ return { granted: [...permissions], origin, ...reset ? { reset: true } : {}, target };
10045
+ });
10046
+ } finally {
10047
+ await page.release();
10048
+ }
10049
+ }
10050
+ var BIDI_BROWSER_TOOLS = {
10051
+ wait_for_download: waitForDownloadFirefox,
10052
+ grant_permissions: grantPermissionsFirefox
9626
10053
  };
9627
10054
 
9628
10055
  // src/firefox-tools.ts
@@ -9630,6 +10057,7 @@ var FIREFOX_TOOLS = {
9630
10057
  ...SHARED_TOOLS,
9631
10058
  ...BIDI_ONLY_TOOLS,
9632
10059
  ...LEASE_TOOLS,
10060
+ ...BIDI_BROWSER_TOOLS,
9633
10061
  extract_page: extractPage
9634
10062
  };
9635
10063
 
@@ -10238,7 +10666,7 @@ var MANIFEST = [
10238
10666
  },
10239
10667
  {
10240
10668
  name: "dispatch_mouse",
10241
- description: "Dispatch one raw mouse event at viewport coordinates; Chrome-only.",
10669
+ description: "Dispatch one raw mouse event at viewport coordinates; Firefox needs 160 or newer.",
10242
10670
  inputSchema: {
10243
10671
  type: "object",
10244
10672
  properties: {
@@ -10395,7 +10823,7 @@ var MANIFEST = [
10395
10823
  },
10396
10824
  {
10397
10825
  name: "grant_permissions",
10398
- description: "Grant or reset browser permissions; permissions are origin-scoped and Chrome-only.",
10826
+ description: "Grant or reset browser permissions; permissions are origin-scoped (Chrome, Firefox 160+).",
10399
10827
  inputSchema: {
10400
10828
  type: "object",
10401
10829
  properties: {
@@ -11567,13 +11995,13 @@ function toolAnnotations(name) {
11567
11995
  // src/install/wizard.ts
11568
11996
  import { createInterface } from "node:readline";
11569
11997
  import { homedir as homedir3 } from "node:os";
11570
- import { join as join16 } from "node:path";
11998
+ import { join as join17 } from "node:path";
11571
11999
 
11572
12000
  // src/install/browser.ts
11573
12001
  import { existsSync as existsSync3 } from "node:fs";
11574
- import { mkdir as mkdir14, readFile as readFile10, writeFile as writeFile11 } from "node:fs/promises";
12002
+ import { mkdir as mkdir15, readFile as readFile10, writeFile as writeFile11 } from "node:fs/promises";
11575
12003
  import { homedir } from "node:os";
11576
- import { delimiter, dirname as dirname4, join as join14 } from "node:path";
12004
+ import { delimiter, dirname as dirname5, join as join15 } from "node:path";
11577
12005
  var CANDIDATE_BUILDERS = {
11578
12006
  chrome: () => [
11579
12007
  process.env.CHROME_BIN,
@@ -11603,7 +12031,7 @@ function existsOnPath(cmd) {
11603
12031
  for (const dir of pathEnv.split(delimiter)) {
11604
12032
  if (!dir)
11605
12033
  continue;
11606
- if (existsSync3(join14(dir, cmd)))
12034
+ if (existsSync3(join15(dir, cmd)))
11607
12035
  return true;
11608
12036
  }
11609
12037
  return false;
@@ -11653,10 +12081,10 @@ function aliasLine(o) {
11653
12081
  function detectShellRc() {
11654
12082
  const shell = process.env.SHELL ?? "";
11655
12083
  if (shell.endsWith("zsh"))
11656
- return join14(homedir(), ".zshrc");
12084
+ return join15(homedir(), ".zshrc");
11657
12085
  if (shell.endsWith("bash"))
11658
- return join14(homedir(), ".bashrc");
11659
- return join14(homedir(), process.platform === "darwin" ? ".zshrc" : ".bashrc");
12086
+ return join15(homedir(), ".bashrc");
12087
+ return join15(homedir(), process.platform === "darwin" ? ".zshrc" : ".bashrc");
11660
12088
  }
11661
12089
  var MARKER_START = "# >>> cdp-toolkit alias >>>";
11662
12090
  var MARKER_END = "# <<< cdp-toolkit alias <<<";
@@ -11692,7 +12120,7 @@ ${after}`);
11692
12120
  await writeFile11(rcPath, next, "utf8");
11693
12121
  return { rcPath, action: "replaced-block" };
11694
12122
  }
11695
- await mkdir14(dirname4(rcPath), { recursive: true });
12123
+ await mkdir15(dirname5(rcPath), { recursive: true });
11696
12124
  const sep = existing.length === 0 || existing.endsWith(`
11697
12125
  `) ? "" : `
11698
12126
  `;
@@ -11704,9 +12132,9 @@ ${after}`);
11704
12132
 
11705
12133
  // src/install/harness.ts
11706
12134
  import { spawnSync } from "node:child_process";
11707
- import { mkdir as mkdir15, readFile as readFile11, writeFile as writeFile12 } from "node:fs/promises";
12135
+ import { mkdir as mkdir16, readFile as readFile11, writeFile as writeFile12 } from "node:fs/promises";
11708
12136
  import { homedir as homedir2 } from "node:os";
11709
- import { dirname as dirname5, join as join15 } from "node:path";
12137
+ import { dirname as dirname6, join as join16 } from "node:path";
11710
12138
  async function installMcpServer(harness, name, cfg, opts = {}) {
11711
12139
  switch (harness) {
11712
12140
  case "claude":
@@ -11722,7 +12150,7 @@ async function installMcpServer(harness, name, cfg, opts = {}) {
11722
12150
  }
11723
12151
  }
11724
12152
  async function installClaude(name, cfg, opts) {
11725
- const path = opts.configPath ?? join15(opts.homeDir ?? homedir2(), ".claude.json");
12153
+ const path = opts.configPath ?? join16(opts.homeDir ?? homedir2(), ".claude.json");
11726
12154
  let root;
11727
12155
  let fileExisted;
11728
12156
  try {
@@ -11753,7 +12181,7 @@ async function installClaude(name, cfg, opts) {
11753
12181
  if (action === "unchanged") {
11754
12182
  return { harness: "claude", method: "file", path, action, detail: "no change needed" };
11755
12183
  }
11756
- await mkdir15(dirname5(path), { recursive: true });
12184
+ await mkdir16(dirname6(path), { recursive: true });
11757
12185
  await writeFile12(path, JSON.stringify(root, null, 2) + `
11758
12186
  `, "utf8");
11759
12187
  return {
@@ -11990,7 +12418,7 @@ async function promptPort(def) {
11990
12418
  }
11991
12419
  function harnessTargetDesc(harness, io) {
11992
12420
  if (harness === "claude") {
11993
- return io.configPath ?? join16(io.homeDir ?? homedir3(), ".claude.json");
12421
+ return io.configPath ?? join17(io.homeDir ?? homedir3(), ".claude.json");
11994
12422
  }
11995
12423
  return `via \`${harness} mcp add\``;
11996
12424
  }