cdp-toolkit 3.3.0 → 3.4.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/CHANGELOG.md +14 -0
- package/CONTRACT.md +1 -1
- package/README.md +4 -3
- package/dist/bidi/mux-daemon.js +62 -7
- package/dist/cli.js +171 -46
- package/dist/index.js +142 -37
- package/dist/mcp.js +187 -59
- package/package.json +1 -1
- package/src/bidi/driver.ts +21 -6
- package/src/cdp/driver.ts +118 -17
- package/src/driver.ts +20 -5
- package/src/frontApp.ts +62 -0
- package/src/leases-tools.ts +3 -2
- package/src/manifest.ts +15 -3
- package/src/origins.ts +3 -2
- package/src/policy.ts +2 -1
- package/src/shared-tools.ts +43 -21
- package/src/toolDocs.ts +13 -10
- package/src/version.ts +1 -1
package/dist/cli.js
CHANGED
|
@@ -687,7 +687,7 @@ async function originIndex(backend, liveIds) {
|
|
|
687
687
|
return index;
|
|
688
688
|
}
|
|
689
689
|
async function newTrackedPage(driver, backend, opts = {}) {
|
|
690
|
-
const page = await driver.newPage(opts.url);
|
|
690
|
+
const page = await driver.newPage(opts.url, { focus: opts.focus === true });
|
|
691
691
|
await recordOrigin(backend, page.id, { label: opts.label });
|
|
692
692
|
return page;
|
|
693
693
|
}
|
|
@@ -1297,6 +1297,53 @@ var init_client = __esm(() => {
|
|
|
1297
1297
|
knownTransports = new Map;
|
|
1298
1298
|
});
|
|
1299
1299
|
|
|
1300
|
+
// src/frontApp.ts
|
|
1301
|
+
import { execFile } from "node:child_process";
|
|
1302
|
+
function run(cmd, args) {
|
|
1303
|
+
return new Promise((resolve) => {
|
|
1304
|
+
execFile(cmd, args, { timeout: 2000 }, (err, stdout) => resolve(err ? "" : String(stdout)));
|
|
1305
|
+
});
|
|
1306
|
+
}
|
|
1307
|
+
function restoreFrontAppEnabled(platform = process.platform) {
|
|
1308
|
+
return platform === "darwin" && (process.env.CDP_RESTORE_FRONT_APP ?? "").trim() !== "0";
|
|
1309
|
+
}
|
|
1310
|
+
async function keepFrontApp(fn, opts = {}) {
|
|
1311
|
+
const enabled = opts.enabled ?? restoreFrontAppEnabled();
|
|
1312
|
+
if (!enabled)
|
|
1313
|
+
return fn();
|
|
1314
|
+
const ops = opts.ops ?? macFrontAppOps;
|
|
1315
|
+
const before = await ops.front().catch(() => null);
|
|
1316
|
+
const result = await fn();
|
|
1317
|
+
if (before === null)
|
|
1318
|
+
return result;
|
|
1319
|
+
const fix = async () => {
|
|
1320
|
+
const now = await ops.front().catch(() => null);
|
|
1321
|
+
if (now !== null && now !== before)
|
|
1322
|
+
await ops.setFront(before).catch(() => {
|
|
1323
|
+
return;
|
|
1324
|
+
});
|
|
1325
|
+
};
|
|
1326
|
+
await fix();
|
|
1327
|
+
await new Promise((r) => setTimeout(r, opts.recheckMs ?? 250));
|
|
1328
|
+
await fix();
|
|
1329
|
+
return result;
|
|
1330
|
+
}
|
|
1331
|
+
var macFrontAppOps;
|
|
1332
|
+
var init_frontApp = __esm(() => {
|
|
1333
|
+
macFrontAppOps = {
|
|
1334
|
+
async front() {
|
|
1335
|
+
const asn = (await run("lsappinfo", ["front"])).trim();
|
|
1336
|
+
if (!asn)
|
|
1337
|
+
return null;
|
|
1338
|
+
const m = /"?pid"?\s*=\s*(\d+)/.exec(await run("lsappinfo", ["info", "-only", "pid", asn]));
|
|
1339
|
+
return m ? Number(m[1]) : null;
|
|
1340
|
+
},
|
|
1341
|
+
async setFront(pid) {
|
|
1342
|
+
await run("osascript", ["-e", `tell application "System Events" to set frontmost of (first process whose unix id is ${pid}) to true`]);
|
|
1343
|
+
}
|
|
1344
|
+
};
|
|
1345
|
+
});
|
|
1346
|
+
|
|
1300
1347
|
// src/activity.ts
|
|
1301
1348
|
function dispatchKey(backend, targetId) {
|
|
1302
1349
|
return `${backend}:${targetId}`;
|
|
@@ -3506,6 +3553,9 @@ async function pickContext(conn, contexts, selector) {
|
|
|
3506
3553
|
return exact;
|
|
3507
3554
|
throw driverError2("no-such-target", `no context matching '${selector}'`);
|
|
3508
3555
|
}
|
|
3556
|
+
function bidiCreateTabParams(opts) {
|
|
3557
|
+
return { type: "tab", background: opts?.focus !== true };
|
|
3558
|
+
}
|
|
3509
3559
|
|
|
3510
3560
|
class BidiBrowserDriver {
|
|
3511
3561
|
endpoint;
|
|
@@ -3532,12 +3582,13 @@ class BidiBrowserDriver {
|
|
|
3532
3582
|
conn.release();
|
|
3533
3583
|
}
|
|
3534
3584
|
}
|
|
3535
|
-
async newPage(url) {
|
|
3585
|
+
async newPage(url, opts) {
|
|
3536
3586
|
const conn = await getConnection(this.endpoint, this.timeoutMs, this.attached);
|
|
3537
3587
|
try {
|
|
3538
|
-
const
|
|
3588
|
+
const create = () => conn.send("browsingContext.create", bidiCreateTabParams(opts)).catch((e) => {
|
|
3539
3589
|
throw mapBidiError(e);
|
|
3540
3590
|
});
|
|
3591
|
+
const { context } = opts?.focus === true ? await create() : await keepFrontApp(create);
|
|
3541
3592
|
if (url)
|
|
3542
3593
|
await conn.send("browsingContext.navigate", { context, url, wait: "complete" }).catch((e) => {
|
|
3543
3594
|
throw mapBidiError(e);
|
|
@@ -3550,9 +3601,9 @@ class BidiBrowserDriver {
|
|
|
3550
3601
|
async closePage(id) {
|
|
3551
3602
|
const conn = await getConnection(this.endpoint, this.timeoutMs, this.attached);
|
|
3552
3603
|
try {
|
|
3553
|
-
await conn.send("browsingContext.close", { context: id }).catch((e) => {
|
|
3604
|
+
await keepFrontApp(() => conn.send("browsingContext.close", { context: id }).catch((e) => {
|
|
3554
3605
|
throw mapBidiError(e);
|
|
3555
|
-
});
|
|
3606
|
+
}));
|
|
3556
3607
|
return { success: true };
|
|
3557
3608
|
} finally {
|
|
3558
3609
|
conn.release();
|
|
@@ -3736,6 +3787,7 @@ function createFirefoxDriverForEndpoint(wsUrl, opts) {
|
|
|
3736
3787
|
}
|
|
3737
3788
|
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;
|
|
3738
3789
|
var init_driver2 = __esm(() => {
|
|
3790
|
+
init_frontApp();
|
|
3739
3791
|
init_driver();
|
|
3740
3792
|
init_leases();
|
|
3741
3793
|
init_origins();
|
|
@@ -4077,8 +4129,11 @@ var init_driver2 = __esm(() => {
|
|
|
4077
4129
|
await this.callFunctionValue(BidiPageDriver.INSERT_TEXT_SOURCE, [value, false], ref);
|
|
4078
4130
|
return;
|
|
4079
4131
|
}
|
|
4080
|
-
const clear = "function(){this.focus&&this.focus();if('value' in this){this.value='';this.dispatchEvent(new Event('input',{bubbles:true}));}}";
|
|
4081
|
-
await this.callFunctionValue(clear, [], ref);
|
|
4132
|
+
const clear = "function(){if(this.disabled||this.readOnly)return this.disabled?'disabled':'readonly';this.focus&&this.focus();if('value' in this){this.value='';this.dispatchEvent(new Event('input',{bubbles:true}));}return 'ok';}";
|
|
4133
|
+
const state = await this.callFunctionValue(clear, [], ref);
|
|
4134
|
+
if (state === "disabled" || state === "readonly") {
|
|
4135
|
+
throw driverError2("page-error", `cannot fill a ${state} field: it was left unchanged`);
|
|
4136
|
+
}
|
|
4082
4137
|
await this.sendKeys(value);
|
|
4083
4138
|
}
|
|
4084
4139
|
async typeText(loc, text) {
|
|
@@ -4473,6 +4528,7 @@ var init_driver2 = __esm(() => {
|
|
|
4473
4528
|
// src/cdp/driver.ts
|
|
4474
4529
|
init_client();
|
|
4475
4530
|
init_session();
|
|
4531
|
+
init_frontApp();
|
|
4476
4532
|
init_leases();
|
|
4477
4533
|
init_endpoints();
|
|
4478
4534
|
init_activity();
|
|
@@ -4650,6 +4706,47 @@ async function centerOf(conn, objectId) {
|
|
|
4650
4706
|
throw driverError("page-error", "element has zero size / is not visible; cannot compute a click point");
|
|
4651
4707
|
return result.value;
|
|
4652
4708
|
}
|
|
4709
|
+
var SNAPSHOT_TEXT_FN = "function(){var e=this;e.__cdpSawInput=false;var f=function(){e.__cdpSawInput=true;};" + "e.addEventListener('beforeinput',f,{capture:true,once:true});e.addEventListener('input',f,{capture:true,once:true});" + "return e.isContentEditable?e.textContent:('value' in e?String(e.value):null);}";
|
|
4710
|
+
var LANDED_TEXT_FN = "function(before){var e=this;var now=function(){return e.isContentEditable?e.textContent:('value' in e?String(e.value):null);};" + "var hit=function(){return e.__cdpSawInput===true||now()!==before;};" + "if(hit())return true;return new Promise(function(r){setTimeout(function(){r(hit());},50);});}";
|
|
4711
|
+
var FALLBACK_TEXT_FN = "function(t){var e=this;if(e.disabled||e.readOnly)return 'skipped';var ce=e.isContentEditable===true;" + "var ta=e instanceof HTMLTextAreaElement;var inp=e instanceof HTMLInputElement&&!/^(checkbox|radio|file|button|submit|reset|image|hidden|range|color)$/i.test(e.type);" + "if(!ce&&!ta&&!inp)return 'skipped';e.focus();" + "if(ce){var r=document.createRange();r.selectNodeContents(e);r.collapse(false);var s=window.getSelection();s.removeAllRanges();s.addRange(r);}" + "else{try{var n=e.value.length;e.setSelectionRange(n,n);}catch(x){}}" + "var read=function(){return ce?e.textContent:e.value;};var before=read();" + "if(document.execCommand('insertText',false,t)&&read()!==before){e.dispatchEvent(new Event('change',{bubbles:true}));return 'execCommand';}" + "if(ce)return 'failed';var proto=ta?HTMLTextAreaElement.prototype:HTMLInputElement.prototype;" + "Object.getOwnPropertyDescriptor(proto,'value').set.call(e,before+t);" + "e.dispatchEvent(new InputEvent('input',{bubbles:true,inputType:'insertText',data:t}));" + "e.dispatchEvent(new Event('change',{bubbles:true}));return 'setter';}";
|
|
4712
|
+
async function insertTextVerified(conn, objectId, text, sendInput) {
|
|
4713
|
+
const call = async (fn, args = [], awaitPromise = false) => {
|
|
4714
|
+
const { result, exceptionDetails } = await conn.send("Runtime.callFunctionOn", {
|
|
4715
|
+
objectId,
|
|
4716
|
+
functionDeclaration: fn,
|
|
4717
|
+
arguments: args.map((value) => ({ value })),
|
|
4718
|
+
returnByValue: true,
|
|
4719
|
+
awaitPromise
|
|
4720
|
+
});
|
|
4721
|
+
if (exceptionDetails)
|
|
4722
|
+
throw driverError("page-error", `text input check failed: ${exceptionDetails.text ?? "error"}`);
|
|
4723
|
+
return result?.value;
|
|
4724
|
+
};
|
|
4725
|
+
const before = await call(SNAPSHOT_TEXT_FN);
|
|
4726
|
+
await sendInput("Input.insertText", { text });
|
|
4727
|
+
if (await call(LANDED_TEXT_FN, [before], true) === true)
|
|
4728
|
+
return "trusted";
|
|
4729
|
+
const via = await call(FALLBACK_TEXT_FN, [text]);
|
|
4730
|
+
if (via === "execCommand" || via === "setter" || via === "skipped")
|
|
4731
|
+
return via;
|
|
4732
|
+
throw driverError("page-error", "text did not land: trusted Input.insertText was not delivered (a background tab gets no trusted keyboard input) and document.execCommand('insertText') changed nothing on this element");
|
|
4733
|
+
}
|
|
4734
|
+
var ARM_KEY_WITNESS = "(function(){window.__cdpKeySeen=false;window.addEventListener('keydown',function(){window.__cdpKeySeen=true;},{capture:true,once:true});return true;})()";
|
|
4735
|
+
var READ_KEY_WITNESS = "(function(){if(window.__cdpKeySeen===true)return true;return new Promise(function(r){setTimeout(function(){r(window.__cdpKeySeen===true);},50);});})()";
|
|
4736
|
+
async function pressKeyObserved(conn, dispatch) {
|
|
4737
|
+
const eval_ = (expression, awaitPromise = false) => conn.send("Runtime.evaluate", { expression, returnByValue: true, awaitPromise }).then((r) => r.result?.value, () => {
|
|
4738
|
+
return;
|
|
4739
|
+
});
|
|
4740
|
+
const armed = await eval_(ARM_KEY_WITNESS) === true;
|
|
4741
|
+
await dispatch();
|
|
4742
|
+
if (!armed)
|
|
4743
|
+
return;
|
|
4744
|
+
const seen = await eval_(READ_KEY_WITNESS, true);
|
|
4745
|
+
if (seen === false)
|
|
4746
|
+
return { delivered: false };
|
|
4747
|
+
if (seen === true)
|
|
4748
|
+
return { delivered: true };
|
|
4749
|
+
}
|
|
4653
4750
|
async function focusElement(conn, objectId) {
|
|
4654
4751
|
await conn.send("Runtime.callFunctionOn", { objectId, functionDeclaration: "function(){this.focus&&this.focus();}", returnByValue: true });
|
|
4655
4752
|
}
|
|
@@ -4664,10 +4761,12 @@ async function awaitScrollSettle(conn) {
|
|
|
4664
4761
|
}
|
|
4665
4762
|
async function setValueOnObject(conn, objectId, value, sendInput) {
|
|
4666
4763
|
await focusElement(conn, objectId);
|
|
4667
|
-
const fn = "function(){if('value'in this){this.value='';this.dispatchEvent(new Event('input',{bubbles:true}));}else if(this.isContentEditable){this.textContent='';}}";
|
|
4668
|
-
await conn.send("Runtime.callFunctionOn", { objectId, functionDeclaration: fn, returnByValue: true });
|
|
4669
|
-
if (value
|
|
4670
|
-
|
|
4764
|
+
const fn = "function(){if(this.disabled||this.readOnly)return this.disabled?'disabled':'readonly';if('value'in this){this.value='';this.dispatchEvent(new Event('input',{bubbles:true}));}else if(this.isContentEditable){this.textContent='';}return 'ok';}";
|
|
4765
|
+
const { result } = await conn.send("Runtime.callFunctionOn", { objectId, functionDeclaration: fn, returnByValue: true });
|
|
4766
|
+
if (result?.value === "disabled" || result?.value === "readonly") {
|
|
4767
|
+
throw driverError("page-error", `cannot fill a ${result.value} field: it was left unchanged`);
|
|
4768
|
+
}
|
|
4769
|
+
return value.length ? insertTextVerified(conn, objectId, value, sendInput) : "trusted";
|
|
4671
4770
|
}
|
|
4672
4771
|
var NAMED_KEYS = {
|
|
4673
4772
|
enter: { key: "Enter", code: "Enter", keyCode: 13, text: "\r" },
|
|
@@ -5215,13 +5314,12 @@ class CdpPageDriver {
|
|
|
5215
5314
|
}
|
|
5216
5315
|
async setValue(loc, value) {
|
|
5217
5316
|
const { objectId } = await resolveElementLocator(this.conn, loc);
|
|
5218
|
-
|
|
5317
|
+
return setValueOnObject(this.conn, objectId, value, (method, params) => this.dispatchInput(method, params));
|
|
5219
5318
|
}
|
|
5220
5319
|
async typeText(loc, text) {
|
|
5221
5320
|
const { objectId } = await resolveElementLocator(this.conn, loc);
|
|
5222
5321
|
await focusElement(this.conn, objectId);
|
|
5223
|
-
|
|
5224
|
-
await this.dispatchInput("Input.insertText", { text });
|
|
5322
|
+
return text.length ? insertTextVerified(this.conn, objectId, text, (method, params) => this.dispatchInput(method, params)) : "trusted";
|
|
5225
5323
|
}
|
|
5226
5324
|
async pressKey(press) {
|
|
5227
5325
|
const spec = resolveKey(press.key);
|
|
@@ -5236,8 +5334,10 @@ class CdpPageDriver {
|
|
|
5236
5334
|
const down = { type: "keyDown", key: spec.key, code: spec.code, windowsVirtualKeyCode: spec.keyCode, nativeVirtualKeyCode: spec.keyCode, modifiers: modBits };
|
|
5237
5335
|
if (spec.text && !suppressText)
|
|
5238
5336
|
down.text = spec.text;
|
|
5239
|
-
|
|
5240
|
-
|
|
5337
|
+
return pressKeyObserved(this.conn, async () => {
|
|
5338
|
+
await this.dispatchInput("Input.dispatchKeyEvent", down);
|
|
5339
|
+
await this.dispatchInput("Input.dispatchKeyEvent", { type: "keyUp", key: spec.key, code: spec.code, windowsVirtualKeyCode: spec.keyCode, nativeVirtualKeyCode: spec.keyCode, modifiers: modBits });
|
|
5340
|
+
});
|
|
5241
5341
|
}
|
|
5242
5342
|
async setFiles(loc, files) {
|
|
5243
5343
|
const { objectId } = await resolveElementLocator(this.conn, loc);
|
|
@@ -5614,7 +5714,7 @@ function noSuchTarget(e) {
|
|
|
5614
5714
|
throw driverError("no-such-target", e instanceof CdpError ? e.message : String(e));
|
|
5615
5715
|
}
|
|
5616
5716
|
var NEW_TARGET_SETTLE_MS = 2000;
|
|
5617
|
-
async function createSettledTarget(conn, url, settleMs = NEW_TARGET_SETTLE_MS) {
|
|
5717
|
+
async function createSettledTarget(conn, url, settleMs = NEW_TARGET_SETTLE_MS, opts = {}) {
|
|
5618
5718
|
const changed = new Set;
|
|
5619
5719
|
let id = "";
|
|
5620
5720
|
let wake;
|
|
@@ -5630,7 +5730,8 @@ async function createSettledTarget(conn, url, settleMs = NEW_TARGET_SETTLE_MS) {
|
|
|
5630
5730
|
await conn.send("Target.setDiscoverTargets", { discover: true }).catch(() => {
|
|
5631
5731
|
return;
|
|
5632
5732
|
});
|
|
5633
|
-
const
|
|
5733
|
+
const create = () => conn.send("Target.createTarget", { url, background: opts.focus !== true });
|
|
5734
|
+
const { targetId } = opts.focus === true ? await create() : await keepFrontApp(create);
|
|
5634
5735
|
if (!targetId)
|
|
5635
5736
|
throw driverError("page-error", "Target.createTarget returned no targetId");
|
|
5636
5737
|
id = targetId;
|
|
@@ -5660,15 +5761,15 @@ class CdpBrowserDriver {
|
|
|
5660
5761
|
const filtered = opts?.all ? targets : targets.filter((t) => t.type === "page");
|
|
5661
5762
|
return filtered.map((t) => ({ id: t.id, url: t.url, title: t.title, type: t.type }));
|
|
5662
5763
|
}
|
|
5663
|
-
async newPage(url) {
|
|
5764
|
+
async newPage(url, opts) {
|
|
5664
5765
|
return withBrowserConn(async (conn) => {
|
|
5665
|
-
const targetId = await createSettledTarget(conn, url ?? "about:blank");
|
|
5766
|
+
const targetId = await createSettledTarget(conn, url ?? "about:blank", NEW_TARGET_SETTLE_MS, { focus: opts?.focus === true });
|
|
5666
5767
|
return { id: targetId, url: url ?? "about:blank", title: "" };
|
|
5667
5768
|
});
|
|
5668
5769
|
}
|
|
5669
5770
|
async closePage(id) {
|
|
5670
5771
|
return withBrowserConn(async (conn) => {
|
|
5671
|
-
const res = await conn.send("Target.closeTarget", { targetId: id });
|
|
5772
|
+
const res = await keepFrontApp(() => conn.send("Target.closeTarget", { targetId: id }));
|
|
5672
5773
|
if (res.success !== false)
|
|
5673
5774
|
beaconSessions.drop(beaconKey(id));
|
|
5674
5775
|
return { success: res.success ?? true };
|
|
@@ -6338,7 +6439,6 @@ init_workers();
|
|
|
6338
6439
|
init_frames();
|
|
6339
6440
|
init_endpoints();
|
|
6340
6441
|
var ARTIFACT_DIR = process.env.CDP_ARTIFACT_DIR ?? "/tmp/cdp-toolkit";
|
|
6341
|
-
var STATE_DIR = process.env.CDP_STATE_DIR ?? "/tmp/cdp-toolkit";
|
|
6342
6442
|
|
|
6343
6443
|
class SharedToolError extends Error {
|
|
6344
6444
|
}
|
|
@@ -6497,7 +6597,7 @@ async function listPagesOne(driver, args = {}) {
|
|
|
6497
6597
|
}
|
|
6498
6598
|
async function newPage(driver, args = {}) {
|
|
6499
6599
|
const label = typeof args.label === "string" && args.label.length ? args.label : defaultLabel();
|
|
6500
|
-
const p = await newTrackedPage(driver, backendOf(driver), { url: args.url, label });
|
|
6600
|
+
const p = await newTrackedPage(driver, backendOf(driver), { url: args.url, label, focus: args.focus === true });
|
|
6501
6601
|
const explicit = args.claim === true;
|
|
6502
6602
|
if (!explicit && !requireLease())
|
|
6503
6603
|
return { targetId: p.id, url: p.url };
|
|
@@ -6520,16 +6620,17 @@ async function closePage(driver, args) {
|
|
|
6520
6620
|
return { closed: p.id, success: true, ...released.released ? { leaseReleased: true } : {} };
|
|
6521
6621
|
}
|
|
6522
6622
|
async function writeSelectedFile(id) {
|
|
6523
|
-
|
|
6524
|
-
await
|
|
6623
|
+
const stateDir = process.env.CDP_STATE_DIR ?? "/tmp/cdp-toolkit";
|
|
6624
|
+
await mkdir5(stateDir, { recursive: true });
|
|
6625
|
+
await writeFile4(join5(stateDir, "selected"), id, "utf8");
|
|
6525
6626
|
}
|
|
6526
6627
|
async function selectPage(driver, args) {
|
|
6527
6628
|
if (args.target === undefined || args.target === "")
|
|
6528
6629
|
throw new SharedToolError("select_page requires an explicit target");
|
|
6529
6630
|
const p = await resolvePage(driver, args.target);
|
|
6530
|
-
const
|
|
6531
|
-
await writeSelectedFile(
|
|
6532
|
-
return { selected:
|
|
6631
|
+
const id = args.focus === true ? (await driver.activatePage(p.id)).id : p.id;
|
|
6632
|
+
await writeSelectedFile(id);
|
|
6633
|
+
return { selected: id, focused: args.focus === true };
|
|
6533
6634
|
}
|
|
6534
6635
|
function toLegacyWaitedFor(w) {
|
|
6535
6636
|
if (w === "committed")
|
|
@@ -6888,14 +6989,17 @@ async function drag(driver, args) {
|
|
|
6888
6989
|
};
|
|
6889
6990
|
});
|
|
6890
6991
|
}
|
|
6992
|
+
function inputPathField(path) {
|
|
6993
|
+
return path && path !== "trusted" ? { inputPath: path } : {};
|
|
6994
|
+
}
|
|
6891
6995
|
async function fill(driver, args) {
|
|
6892
6996
|
if (typeof args.value !== "string")
|
|
6893
6997
|
throw new SharedToolError("fill requires a string { value }");
|
|
6894
6998
|
const loc = locatorOf(args);
|
|
6895
6999
|
return withPage2(driver, args.target, async (page) => {
|
|
6896
7000
|
const element = await describeElement(page, loc);
|
|
6897
|
-
await page.setValue(loc, args.value);
|
|
6898
|
-
return { filled: true, ...elementField(element), value: args.value };
|
|
7001
|
+
const path = await page.setValue(loc, args.value);
|
|
7002
|
+
return { filled: true, ...elementField(element), value: args.value, ...inputPathField(path) };
|
|
6899
7003
|
});
|
|
6900
7004
|
}
|
|
6901
7005
|
async function fillForm(driver, args) {
|
|
@@ -6904,15 +7008,16 @@ async function fillForm(driver, args) {
|
|
|
6904
7008
|
return withPage2(driver, args.target, async (page) => {
|
|
6905
7009
|
let filled = 0;
|
|
6906
7010
|
const elements = [];
|
|
7011
|
+
const paths = [];
|
|
6907
7012
|
for (const f of args.fields) {
|
|
6908
7013
|
if (typeof f.value !== "string")
|
|
6909
7014
|
throw new SharedToolError("each fill_form field requires a string value");
|
|
6910
7015
|
const loc = locatorOf(f);
|
|
6911
7016
|
elements.push(await describeElement(page, loc) ?? null);
|
|
6912
|
-
await page.setValue(loc, f.value);
|
|
7017
|
+
paths.push(await page.setValue(loc, f.value) || "trusted");
|
|
6913
7018
|
filled++;
|
|
6914
7019
|
}
|
|
6915
|
-
return { filled, fields: args.fields.length, elements };
|
|
7020
|
+
return { filled, fields: args.fields.length, elements, ...paths.some((p) => p !== "trusted") ? { inputPaths: paths } : {} };
|
|
6916
7021
|
});
|
|
6917
7022
|
}
|
|
6918
7023
|
async function typeText(driver, args) {
|
|
@@ -6921,8 +7026,8 @@ async function typeText(driver, args) {
|
|
|
6921
7026
|
const loc = locatorOf(args);
|
|
6922
7027
|
return withPage2(driver, args.target, async (page) => {
|
|
6923
7028
|
const element = await describeElement(page, loc);
|
|
6924
|
-
await page.typeText(loc, args.text);
|
|
6925
|
-
return { typed: true, ...elementField(element), text: args.text };
|
|
7029
|
+
const path = await page.typeText(loc, args.text);
|
|
7030
|
+
return { typed: true, ...elementField(element), text: args.text, ...inputPathField(path) };
|
|
6926
7031
|
});
|
|
6927
7032
|
}
|
|
6928
7033
|
async function pressKey(driver, args) {
|
|
@@ -6930,7 +7035,15 @@ async function pressKey(driver, args) {
|
|
|
6930
7035
|
throw new SharedToolError("press_key requires a non-empty { key }");
|
|
6931
7036
|
const modifiers = args.modifiers ?? [];
|
|
6932
7037
|
return withPage2(driver, args.target, async (page) => {
|
|
6933
|
-
await page.pressKey({ key: args.key, modifiers });
|
|
7038
|
+
const res = await page.pressKey({ key: args.key, modifiers });
|
|
7039
|
+
if (res && res.delivered === false) {
|
|
7040
|
+
return {
|
|
7041
|
+
pressed: args.key,
|
|
7042
|
+
modifiers,
|
|
7043
|
+
delivered: false,
|
|
7044
|
+
note: "the page saw no keydown: a background tab gets no trusted keyboard input. A click on the tab's page (click tool) usually gives it focus so keys land; or open the tab with new_page focus:true. A key handled inside a cross-origin iframe also reads as not delivered."
|
|
7045
|
+
};
|
|
7046
|
+
}
|
|
6934
7047
|
return { pressed: args.key, modifiers };
|
|
6935
7048
|
});
|
|
6936
7049
|
}
|
|
@@ -7198,7 +7311,7 @@ async function claimPage(driver, args = {}) {
|
|
|
7198
7311
|
url = existing.url;
|
|
7199
7312
|
opened = false;
|
|
7200
7313
|
} else {
|
|
7201
|
-
const page = await newTrackedPage(driver, backend, { url: args.url, label });
|
|
7314
|
+
const page = await newTrackedPage(driver, backend, { url: args.url, label, focus: args.focus === true });
|
|
7202
7315
|
targetId = page.id;
|
|
7203
7316
|
url = page.url;
|
|
7204
7317
|
opened = true;
|
|
@@ -7698,7 +7811,7 @@ init_client();
|
|
|
7698
7811
|
import { mkdir as mkdir7, readFile as readFile7, writeFile as writeFile6, stat, unlink as unlink4 } from "node:fs/promises";
|
|
7699
7812
|
import { join as join6 } from "node:path";
|
|
7700
7813
|
var ARTIFACT_DIR2 = process.env.CDP_ARTIFACT_DIR ?? "/tmp/cdp-toolkit";
|
|
7701
|
-
var
|
|
7814
|
+
var STATE_DIR = process.env.CDP_STATE_DIR ?? "/tmp/cdp-toolkit";
|
|
7702
7815
|
var DEFAULT_CATEGORIES = [
|
|
7703
7816
|
"devtools.timeline",
|
|
7704
7817
|
"blink.user_timing",
|
|
@@ -7714,7 +7827,7 @@ function shortId(id) {
|
|
|
7714
7827
|
return id.slice(0, 8);
|
|
7715
7828
|
}
|
|
7716
7829
|
function stateFilePath() {
|
|
7717
|
-
return join6(
|
|
7830
|
+
return join6(STATE_DIR, "trace-state.json");
|
|
7718
7831
|
}
|
|
7719
7832
|
function bufferTraceData(conn, sink) {
|
|
7720
7833
|
return conn.on("Tracing.dataCollected", (params) => {
|
|
@@ -7759,7 +7872,7 @@ async function performanceStartTrace(args = {}) {
|
|
|
7759
7872
|
throw err;
|
|
7760
7873
|
}
|
|
7761
7874
|
liveTraces.set(target.id, { conn, target, events, startedAt: Date.now() });
|
|
7762
|
-
await mkdir7(
|
|
7875
|
+
await mkdir7(STATE_DIR, { recursive: true });
|
|
7763
7876
|
const state = {
|
|
7764
7877
|
targetId: target.id,
|
|
7765
7878
|
url: target.url,
|
|
@@ -8088,7 +8201,7 @@ function buildFfmpegArgs(manifestPath, outPath, choice) {
|
|
|
8088
8201
|
outPath
|
|
8089
8202
|
];
|
|
8090
8203
|
}
|
|
8091
|
-
function
|
|
8204
|
+
function run2(bin, args) {
|
|
8092
8205
|
return new Promise((resolve, reject) => {
|
|
8093
8206
|
const child = spawn(bin, args, { stdio: ["ignore", "pipe", "pipe"] });
|
|
8094
8207
|
let stdout = "";
|
|
@@ -8110,7 +8223,7 @@ async function probeEncoder() {
|
|
|
8110
8223
|
encoderProbe = (async () => {
|
|
8111
8224
|
let res;
|
|
8112
8225
|
try {
|
|
8113
|
-
res = await
|
|
8226
|
+
res = await run2(FFMPEG_BIN, ["-hide_banner", "-encoders"]);
|
|
8114
8227
|
} catch (err) {
|
|
8115
8228
|
throw new CdpError(`${FFMPEG_MISSING} (${err.message})`);
|
|
8116
8229
|
}
|
|
@@ -8119,7 +8232,7 @@ async function probeEncoder() {
|
|
|
8119
8232
|
const choice = selectEncoder(`${res.stdout}
|
|
8120
8233
|
${res.stderr}`);
|
|
8121
8234
|
const output = async (args) => {
|
|
8122
|
-
const r = await
|
|
8235
|
+
const r = await run2(FFMPEG_BIN, args).catch(() => {
|
|
8123
8236
|
return;
|
|
8124
8237
|
});
|
|
8125
8238
|
return r && r.code === 0 ? `${r.stdout}
|
|
@@ -8292,7 +8405,7 @@ async function stopScreenRecording(args = {}) {
|
|
|
8292
8405
|
const { width, height } = evenDimensions(ledger[0].width, ledger[0].height);
|
|
8293
8406
|
let res;
|
|
8294
8407
|
try {
|
|
8295
|
-
res = await
|
|
8408
|
+
res = await run2(FFMPEG_BIN, buildFfmpegArgs(manifestPath, outPath, rec.encoder));
|
|
8296
8409
|
} catch (err) {
|
|
8297
8410
|
throw new CdpError(`${FFMPEG_MISSING} Spooled frames kept at ${rec.spoolDir}. (${err.message})`);
|
|
8298
8411
|
}
|
|
@@ -10100,7 +10213,7 @@ var MANIFEST = [
|
|
|
10100
10213
|
},
|
|
10101
10214
|
{
|
|
10102
10215
|
name: "new_page",
|
|
10103
|
-
description: "Open a browser tab, optionally claim it; navigation is not awaited.",
|
|
10216
|
+
description: "Open a browser tab in the background, optionally claim it; navigation is not awaited.",
|
|
10104
10217
|
inputSchema: {
|
|
10105
10218
|
type: "object",
|
|
10106
10219
|
properties: {
|
|
@@ -10127,6 +10240,10 @@ var MANIFEST = [
|
|
|
10127
10240
|
ttlMs: {
|
|
10128
10241
|
type: "number",
|
|
10129
10242
|
description: "Lease TTL in milliseconds."
|
|
10243
|
+
},
|
|
10244
|
+
focus: {
|
|
10245
|
+
type: "boolean",
|
|
10246
|
+
description: "Open in the foreground and take focus; default false (background tab)."
|
|
10130
10247
|
}
|
|
10131
10248
|
},
|
|
10132
10249
|
required: [],
|
|
@@ -10156,7 +10273,7 @@ var MANIFEST = [
|
|
|
10156
10273
|
},
|
|
10157
10274
|
{
|
|
10158
10275
|
name: "select_page",
|
|
10159
|
-
description: "
|
|
10276
|
+
description: "Persist a page as selected; focus:true also raises it. Target must resolve explicitly.",
|
|
10160
10277
|
inputSchema: {
|
|
10161
10278
|
type: "object",
|
|
10162
10279
|
properties: {
|
|
@@ -10167,6 +10284,10 @@ var MANIFEST = [
|
|
|
10167
10284
|
target: {
|
|
10168
10285
|
type: "string",
|
|
10169
10286
|
description: "Page selector (index:/url:/title:/label:/targetId, endpoint:<name>/ prefix, default active); grammar in server instructions."
|
|
10287
|
+
},
|
|
10288
|
+
focus: {
|
|
10289
|
+
type: "boolean",
|
|
10290
|
+
description: "Also raise the tab and take window focus; default false (selection only)."
|
|
10170
10291
|
}
|
|
10171
10292
|
},
|
|
10172
10293
|
required: [
|
|
@@ -11758,7 +11879,7 @@ var MANIFEST = [
|
|
|
11758
11879
|
},
|
|
11759
11880
|
{
|
|
11760
11881
|
name: "claim_page",
|
|
11761
|
-
description: "Claim an existing tab or open a fresh one; CLI use is refused.",
|
|
11882
|
+
description: "Claim an existing tab or open a fresh one in the background; CLI use is refused.",
|
|
11762
11883
|
inputSchema: {
|
|
11763
11884
|
type: "object",
|
|
11764
11885
|
properties: {
|
|
@@ -11781,6 +11902,10 @@ var MANIFEST = [
|
|
|
11781
11902
|
ttlMs: {
|
|
11782
11903
|
type: "number",
|
|
11783
11904
|
description: "Lease TTL in milliseconds."
|
|
11905
|
+
},
|
|
11906
|
+
focus: {
|
|
11907
|
+
type: "boolean",
|
|
11908
|
+
description: "Fresh tab only: open it in the foreground; default false (background)."
|
|
11784
11909
|
}
|
|
11785
11910
|
},
|
|
11786
11911
|
required: [],
|