patchright-core 1.52.1 → 1.52.3

package/lib/server/frameSelectors.js

@@ -150,12 +150,8 @@ class FrameSelectors {
     while (parsed.parts.length > 0) {
       var part = parsed.parts.shift();
       parsedEdits.parts = [part];
-      var isUsingXPath = false;
       var elements = [];
       var elementsIndexes = [];
-      if (part.name == "xpath") {
-        isUsingXPath = true;
-      }
       if (part.name == "nth") {
         const partNth = Number(part.body);
         if (partNth > currentScopingElements.length || partNth < -currentScopingElements.length) {
@@ -179,44 +175,42 @@ class FrameSelectors {
             pierce: true
           });
           var queryingElements = [];
-          if (!isUsingXPath) {
-            let findClosedShadowRoots2 = function(node, results = []) {
-              if (!node || typeof node !== "object") return results;
-              if (node.shadowRoots && Array.isArray(node.shadowRoots)) {
-                for (const shadowRoot2 of node.shadowRoots) {
-                  if (shadowRoot2.shadowRootType === "closed" && shadowRoot2.backendNodeId) {
-                    results.push(shadowRoot2.backendNodeId);
-                  }
-                  findClosedShadowRoots2(shadowRoot2, results);
-                }
-              }
-              if (node.nodeName !== "IFRAME" && node.children && Array.isArray(node.children)) {
-                for (const child of node.children) {
-                  findClosedShadowRoots2(child, results);
+          let findClosedShadowRoots2 = function(node, results = []) {
+            if (!node || typeof node !== "object") return results;
+            if (node.shadowRoots && Array.isArray(node.shadowRoots)) {
+              for (const shadowRoot2 of node.shadowRoots) {
+                if (shadowRoot2.shadowRootType === "closed" && shadowRoot2.backendNodeId) {
+                  results.push(shadowRoot2.backendNodeId);
                 }
+                findClosedShadowRoots2(shadowRoot2, results);
               }
-              return results;
-            };
-            var findClosedShadowRoots = findClosedShadowRoots2;
-            var shadowRootBackendIds = findClosedShadowRoots2(describedScope.node);
-            var shadowRoots = [];
-            for (var shadowRootBackendId of shadowRootBackendIds) {
-              var resolvedShadowRoot = await client.send("DOM.resolveNode", {
-                backendNodeId: shadowRootBackendId,
-                contextId: context.delegate._contextId
-              });
-              shadowRoots.push(new import_dom.ElementHandle(context, resolvedShadowRoot.object.objectId));
             }
-            for (var shadowRoot of shadowRoots) {
-              const shadowElements = await shadowRoot.evaluateHandleInUtility(([injected2, node, { parsed: parsed2 }]) => {
-                const elements2 = injected2.querySelectorAll(parsed2, node);
-                return elements2;
-              }, {
-                parsed: parsedEdits
-              });
-              const shadowElementsAmount = await shadowElements.getProperty("length");
-              queryingElements.push([shadowElements, shadowElementsAmount, shadowRoot]);
+            if (node.nodeName !== "IFRAME" && node.children && Array.isArray(node.children)) {
+              for (const child of node.children) {
+                findClosedShadowRoots2(child, results);
+              }
             }
+            return results;
+          };
+          var findClosedShadowRoots = findClosedShadowRoots2;
+          var shadowRootBackendIds = findClosedShadowRoots2(describedScope.node);
+          var shadowRoots = [];
+          for (var shadowRootBackendId of shadowRootBackendIds) {
+            var resolvedShadowRoot = await client.send("DOM.resolveNode", {
+              backendNodeId: shadowRootBackendId,
+              contextId: context.delegate._contextId
+            });
+            shadowRoots.push(new import_dom.ElementHandle(context, resolvedShadowRoot.object.objectId));
+          }
+          for (var shadowRoot of shadowRoots) {
+            const shadowElements = await shadowRoot.evaluateHandleInUtility(([injected2, node, { parsed: parsed2 }]) => {
+              const elements2 = injected2.querySelectorAll(parsed2, node);
+              return elements2;
+            }, {
+              parsed: parsedEdits
+            });
+            const shadowElementsAmount = await shadowElements.getProperty("length");
+            queryingElements.push([shadowElements, shadowElementsAmount, shadowRoot]);
           }
           const rootElements = await scope.evaluateHandleInUtility(([injected2, node, { parsed: parsed2 }]) => {
             const elements2 = injected2.querySelectorAll(parsed2, node);

package/lib/server/frames.js

@@ -802,7 +802,7 @@ class Frame extends import_instrumentation.SdkObject {
         return handle ? handles.length : 0;
       }, "returnAll");
       return promise;
-    }, 100);
+    }, 1e4);
     return resultPromise ? resultPromise : 0;
   }
   async content() {
@@ -1231,9 +1231,9 @@ class Frame extends import_instrumentation.SdkObject {
               return state.matches;
             }, { handle });
           }
-        });
+        }, "returnOnNotResolved");
         return scope ? scope._context._raceAgainstContextDestroyed(promise) : promise;
-      }, 100);
+      }, 1e4) || false;
     } catch (e) {
       if (js.isJavaScriptErrorInEvaluate(e) || (0, import_selectorParser.isInvalidSelectorError)(e) || (0, import_protocolError.isSessionClosedError)(e)) throw e;
       return false;
@@ -1620,12 +1620,8 @@ class Frame extends import_instrumentation.SdkObject {
     while (parsed.parts.length > 0) {
       var part = parsed.parts.shift();
       parsedEdits.parts = [part];
-      var isUsingXPath = false;
       var elements = [];
       var elementsIndexes = [];
-      if (part.name == "xpath") {
-        isUsingXPath = true;
-      }
       if (part.name == "nth") {
         const partNth = Number(part.body);
         if (partNth > currentScopingElements.length || partNth < -currentScopingElements.length) {
@@ -1643,52 +1639,50 @@ class Frame extends import_instrumentation.SdkObject {
         elements = currentScopingElements.filter((item) => backendNodeIds.has(item.backendNodeId));
       } else {
         for (const scope of currentScopingElements) {
+          let findClosedShadowRoots2 = function(node, results = []) {
+            if (!node || typeof node !== "object") return results;
+            if (node.shadowRoots && Array.isArray(node.shadowRoots)) {
+              for (const shadowRoot2 of node.shadowRoots) {
+                if (shadowRoot2.shadowRootType === "closed" && shadowRoot2.backendNodeId) {
+                  results.push(shadowRoot2.backendNodeId);
+                }
+                findClosedShadowRoots2(shadowRoot2, results);
+              }
+            }
+            if (node.nodeName !== "IFRAME" && node.children && Array.isArray(node.children)) {
+              for (const child of node.children) {
+                findClosedShadowRoots2(child, results);
+              }
+            }
+            return results;
+          };
+          var findClosedShadowRoots = findClosedShadowRoots2;
           const describedScope = await client.send("DOM.describeNode", {
             objectId: scope._objectId,
             depth: -1,
             pierce: true
           });
           var queryingElements = [];
-          if (!isUsingXPath) {
-            let findClosedShadowRoots2 = function(node, results = []) {
-              if (!node || typeof node !== "object") return results;
-              if (node.shadowRoots && Array.isArray(node.shadowRoots)) {
-                for (const shadowRoot2 of node.shadowRoots) {
-                  if (shadowRoot2.shadowRootType === "closed" && shadowRoot2.backendNodeId) {
-                    results.push(shadowRoot2.backendNodeId);
-                  }
-                  findClosedShadowRoots2(shadowRoot2, results);
-                }
-              }
-              if (node.nodeName !== "IFRAME" && node.children && Array.isArray(node.children)) {
-                for (const child of node.children) {
-                  findClosedShadowRoots2(child, results);
-                }
-              }
-              return results;
-            };
-            var findClosedShadowRoots = findClosedShadowRoots2;
-            var shadowRootBackendIds = findClosedShadowRoots2(describedScope.node);
-            var shadowRoots = [];
-            for (var shadowRootBackendId of shadowRootBackendIds) {
-              var resolvedShadowRoot = await client.send("DOM.resolveNode", {
-                backendNodeId: shadowRootBackendId,
-                contextId: context.delegate._contextId
-              });
-              shadowRoots.push(new dom.ElementHandle(context, resolvedShadowRoot.object.objectId));
-            }
-            for (var shadowRoot of shadowRoots) {
-              const shadowElements = await shadowRoot.evaluateHandleInUtility(([injected, node, { parsed: parsed2, callId }]) => {
-                const elements2 = injected.querySelectorAll(parsed2, node);
-                if (callId) injected.markTargetElements(new Set(elements2), callId);
-                return elements2;
-              }, {
-                parsed: parsedEdits,
-                callId: progress.metadata.id
-              });
-              const shadowElementsAmount = await shadowElements.getProperty("length");
-              queryingElements.push([shadowElements, shadowElementsAmount, shadowRoot]);
-            }
+          var shadowRootBackendIds = findClosedShadowRoots2(describedScope.node);
+          var shadowRoots = [];
+          for (var shadowRootBackendId of shadowRootBackendIds) {
+            var resolvedShadowRoot = await client.send("DOM.resolveNode", {
+              backendNodeId: shadowRootBackendId,
+              contextId: context.delegate._contextId
+            });
+            shadowRoots.push(new dom.ElementHandle(context, resolvedShadowRoot.object.objectId));
+          }
+          for (var shadowRoot of shadowRoots) {
+            const shadowElements = await shadowRoot.evaluateHandleInUtility(([injected, node, { parsed: parsed2, callId }]) => {
+              const elements2 = injected.querySelectorAll(parsed2, node);
+              if (callId) injected.markTargetElements(new Set(elements2), callId);
+              return elements2;
+            }, {
+              parsed: parsedEdits,
+              callId: progress.metadata.id
+            });
+            const shadowElementsAmount = await shadowElements.getProperty("length");
+            queryingElements.push([shadowElements, shadowElementsAmount, shadowRoot]);
           }
           const rootElements = await scope.evaluateHandleInUtility(([injected, node, { parsed: parsed2, callId }]) => {
             const elements2 = injected.querySelectorAll(parsed2, node);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "patchright-core",
-    "version": "1.52.1",
+    "version": "1.52.3",
     "description": "A high-level API to automate web browsers",
     "repository": {
         "type": "git",