patchright-core 1.55.0 → 1.55.2

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.
Files changed (6) hide show
  1. package/lib/server/browserContext.js +1 -3
  2. package/lib/server/chromium/crNetworkManager.js +14 -2
  3. package/lib/server/chromium/crServiceWorker.js +10 -0
  4. package/lib/server/frameSelectors.js +2 -2
  5. package/lib/server/frames.js +17 -13
  6. package/package.json +1 -1
package/lib/server/browserContext.js CHANGED
@@ -127,9 +127,7 @@ class BrowserContext extends import_instrumentation.SdkObject {
127
127
  `);
128
128
  }
129
129
  if (this._options.serviceWorkers === "block")
130
- await this.addInitScript(`navigator.serviceWorker.register = async () => { };`, `
131
- if (navigator.serviceWorker) navigator.serviceWorker.register = async () => { console.warn('Service Worker registration blocked by Playwright'); };
132
- `);
130
+ await this.addInitScript(void 0, `navigator.serviceWorker.register = async () => { };`);
133
131
  if (this._options.permissions)
134
132
  await this.grantPermissions(this._options.permissions);
135
133
  }
package/lib/server/chromium/crNetworkManager.js CHANGED
@@ -568,8 +568,20 @@ class RouteImpl {
568
568
  response.isBase64 = false;
569
569
  response.body = Buffer.from(response.body, "base64").toString("utf-8");
570
570
  }
571
- if (/^<!DOCTYPE[sS]*?>/i.test(response.body)) {
572
- response.body = response.body.replace(/^<!DOCTYPE[sS]*?>/i, (match) => `${match}${injectionHTML}`);
571
+ const headMatch = response.body.match(/<head[^>]*>[\s\S]*?<\/head>/i);
572
+ if (headMatch) {
573
+ response.body = response.body.replace(/(<head[^>]*>)([\s\S]*?)(<\/head>)/i, (match, headOpen, headContent, headClose) => {
574
+ const scriptMatch = headContent.match(/([\s\S]*?)(<script[\s\S]*?$)/i);
575
+ if (scriptMatch) {
576
+ const [beforeScript, fromScript] = [scriptMatch[1], scriptMatch[2]];
577
+ return `${headOpen}${beforeScript}${injectionHTML}${fromScript}${headClose}`;
578
+ }
579
+ return `${headOpen}${headContent}${injectionHTML}${headClose}`;
580
+ });
581
+ } else if (/^<!DOCTYPE[\s\S]*?>/i.test(response.body)) {
582
+ response.body = response.body.replace(/^<!DOCTYPE[\s\S]*?>/i, (match) => `${match}${injectionHTML}`);
583
+ } else if (/<html[^>]*>/i.test(response.body)) {
584
+ response.body = response.body.replace(/<html[^>]*>/i, `$&<head>${injectionHTML}</head>`);
573
585
  } else {
574
586
  response.body = injectionHTML + response.body;
575
587
  }
package/lib/server/chromium/crServiceWorker.js CHANGED
@@ -64,6 +64,16 @@ class CRServiceWorker extends import_page.Worker {
64
64
  session.on("Inspector.targetReloadedAfterCrash", () => {
65
65
  session._sendMayFail("Runtime.runIfWaitingForDebugger", {});
66
66
  });
67
+ session._sendMayFail("Runtime.evaluate", {
68
+ expression: "globalThis",
69
+ serializationOptions: { serialization: "idOnly" }
70
+ }).then((globalThis) => {
71
+ if (globalThis && globalThis.result) {
72
+ var globalThisObjId = globalThis.result.objectId;
73
+ var executionContextId = parseInt(globalThisObjId.split(".")[1], 10);
74
+ this.createExecutionContext(new import_crExecutionContext.CRExecutionContext(session, { id: executionContextId }));
75
+ }
76
+ });
67
77
  }
68
78
  didClose() {
69
79
  this._networkManager?.removeSession(this._session);
package/lib/server/frameSelectors.js CHANGED
@@ -259,7 +259,7 @@ class FrameSelectors {
259
259
  depth: -1
260
260
  });
261
261
  elementToCheck.backendNodeId = resolvedElement.node.backendNodeId;
262
- elementToCheck.nodePosition = this._findElementPositionInDomTree(elementToCheck, describedScope.node, describedScope.node, "");
262
+ elementToCheck.nodePosition = this._findElementPositionInDomTree(elementToCheck, describedScope.node, context, "");
263
263
  elements.push(elementToCheck);
264
264
  }
265
265
  }
@@ -295,7 +295,7 @@ class FrameSelectors {
295
295
  if (queryingElement.shadowRoots && Array.isArray(queryingElement.shadowRoots)) {
296
296
  for (const shadowRoot of queryingElement.shadowRoots) {
297
297
  if (shadowRoot.shadowRootType === "closed" && shadowRoot.backendNodeId) {
298
- const shadowRootHandle = new dom.ElementHandle(documentScope, shadowRoot.backendNodeId);
298
+ const shadowRootHandle = new import_dom.ElementHandle(documentScope, shadowRoot.backendNodeId);
299
299
  const childIndex = this._findElementPositionInDomTree(element, shadowRootHandle, documentScope, currentIndex);
300
300
  if (childIndex !== null) return childIndex;
301
301
  }
package/lib/server/frames.js CHANGED
@@ -1603,7 +1603,8 @@ class Frame extends import_instrumentation.SdkObject {
1603
1603
  const partNth = Number(part.body);
1604
1604
  if (currentScopingElements.length == 0) return [];
1605
1605
  if (partNth > currentScopingElements.length - 1 || partNth < -(currentScopingElements.length - 1)) {
1606
- throw new Error("Can't query n-th element");
1606
+ if (parsed.capture !== void 0) throw new Error("Can't query n-th element in a request with the capture.");
1607
+ return [];
1607
1608
  } else {
1608
1609
  currentScopingElements = [currentScopingElements.at(partNth)];
1609
1610
  continue;
@@ -1692,24 +1693,27 @@ class Frame extends import_instrumentation.SdkObject {
1692
1693
  depth: -1
1693
1694
  });
1694
1695
  elementToCheck.backendNodeId = resolvedElement.node.backendNodeId;
1696
+ elementToCheck.nodePosition = this.selectors._findElementPositionInDomTree(elementToCheck, describedScope.node, context, "");
1695
1697
  elements.push(elementToCheck);
1696
1698
  }
1697
1699
  }
1698
1700
  }
1699
1701
  }
1700
- currentScopingElements = [];
1701
- for (var element of elements) {
1702
- var elemIndex = element.backendNodeId;
1703
- if (elementsIndexes.includes(elemIndex)) continue;
1704
- var elemPos = elementsIndexes.findIndex((index) => index > elemIndex);
1705
- if (elemPos === -1) {
1706
- currentScopingElements.push(element);
1707
- elementsIndexes.push(elemIndex);
1708
- } else {
1709
- currentScopingElements.splice(elemPos, 0, element);
1710
- elementsIndexes.splice(elemPos, 0, elemIndex);
1702
+ const getParts = (pos) => (pos || "").split("").map(Number);
1703
+ elements.sort((a, b) => {
1704
+ const partA = getParts(a.nodePosition);
1705
+ const partB = getParts(b.nodePosition);
1706
+ const maxLength = Math.max(partA.length, partB.length);
1707
+ for (let i2 = 0; i2 < maxLength; i2++) {
1708
+ const aVal = partA[i2] ?? -1;
1709
+ const bVal = partB[i2] ?? -1;
1710
+ if (aVal !== bVal) return aVal - bVal;
1711
1711
  }
1712
- }
1712
+ return 0;
1713
+ });
1714
+ currentScopingElements = Array.from(
1715
+ new Map(elements.map((e) => [e.backendNodeId, e])).values()
1716
+ );
1713
1717
  }
1714
1718
  return currentScopingElements;
1715
1719
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "patchright-core",
3
- "version": "1.55.0",
3
+ "version": "1.55.2",
4
4
  "description": "A high-level API to automate web browsers",
5
5
  "repository": {
6
6
  "type": "git",