patchright-core 1.52.3 → 1.52.4

package/lib/server/chromium/crNetworkManager.js

@@ -552,7 +552,8 @@ class RouteImpl {
       let injectionHTML = "";
       allInjections.forEach((script) => {
         let scriptId = import_crypto.default.randomBytes(22).toString("hex");
-        injectionHTML += `<script class="${this._page._delegate.initScriptTag}" nonce="${scriptNonce}" type="text/javascript">document.getElementById("${scriptId}")?.remove();${script.source}</script>`;
+        let scriptSource = script.source || script;
+        injectionHTML += `<script class="${this._page._delegate.initScriptTag}" nonce="${scriptNonce}" type="text/javascript">document.getElementById("${scriptId}")?.remove();${scriptSource}</script>`;
       });
       if (response.isBase64) {
         response.isBase64 = false;

package/lib/server/frames.js

@@ -756,7 +756,7 @@ class Frame extends import_instrumentation.SdkObject {
       } catch (e) {
         return "internal:continuepolling";
       }
-    });
+    }, "returnOnNotResolved");
     return scope ? scope._context._raceAgainstContextDestroyed(promise) : promise;
   }
   async dispatchEvent(metadata, selector, type, eventInit = {}, options = {}, scope) {
@@ -797,6 +797,7 @@ class Frame extends import_instrumentation.SdkObject {
     const resultPromise = await controller.run(async (progress) => {
       progress.log("waiting for " + this._asLocator(selector));
       const promise = await this._retryWithProgressIfNotConnected(progress, selector, false, false, async (result) => {
+        if (!result) return 0;
         const handle = result[0];
         const handles = result[1];
         return handle ? handles.length : 0;
@@ -978,7 +979,7 @@ class Frame extends import_instrumentation.SdkObject {
     return result;
   }
   async retryWithProgressAndTimeouts(progress, timeouts, action) {
-    const continuePolling2 = Symbol("continuePolling");
+    const continuePolling3 = Symbol("continuePolling");
     timeouts = [0, ...timeouts];
     let timeoutIndex = 0;
     while (progress.isRunning()) {
@@ -992,8 +993,8 @@ class Frame extends import_instrumentation.SdkObject {
       }
       progress.throwIfAborted();
       try {
-        const result = await action(continuePolling2);
-        if (result === continuePolling2)
+        const result = await action(continuePolling3);
+        if (result === continuePolling3)
           continue;
         return result;
       } catch (e) {
@@ -1016,15 +1017,18 @@ class Frame extends import_instrumentation.SdkObject {
   }
   async _retryWithProgressIfNotConnected(progress, selector, strict, performActionPreChecks, action, returnAction) {
     progress.log("waiting for " + this._asLocator(selector));
-    return this.retryWithProgressAndTimeouts(progress, [0, 20, 50, 100, 100, 500], async (continuePolling2) => {
+    return this.retryWithProgressAndTimeouts(progress, [0, 20, 50, 100, 100, 500], async (continuePolling3) => {
       if (performActionPreChecks) await this._page.performActionPreChecks(progress);
       const resolved = await this.selectors.resolveInjectedForSelector(selector, {
         strict
       });
       progress.throwIfAborted();
       if (!resolved) {
-        if (returnAction === "returnOnNotResolved" || returnAction === "returnAll") return null;
-        return continuePolling2;
+        if (returnAction === "returnOnNotResolved" || returnAction === "returnAll") {
+          const result2 = await action(null);
+          return result2 === "internal:continuepolling" ? continuePolling2 : result2;
+        }
+        return continuePolling3;
       }
       try {
         var client = this._page._delegate._sessionForFrame(resolved.frame)._client;
@@ -1042,8 +1046,11 @@ class Frame extends import_instrumentation.SdkObject {
       const documentScope = new dom.ElementHandle(context, documentNode.result.objectId);
       const currentScopingElements = await this._customFindElementsByParsed(resolved, client, context, documentScope, progress, resolved.info.parsed);
       if (currentScopingElements.length == 0) {
-        if (returnAction === "returnOnNotResolved" || returnAction === "returnAll") return null;
-        return continuePolling2;
+        if (returnAction === "returnOnNotResolved" || returnAction === "returnAll") {
+          const result2 = await action(null);
+          return result2 === "internal:continuepolling" ? continuePolling2 : result2;
+        }
+        return continuePolling3;
       }
       const resultElement = currentScopingElements[0];
       if (currentScopingElements.length > 1) {
@@ -1071,9 +1078,9 @@ class Frame extends import_instrumentation.SdkObject {
         }
         if (result === "error:notconnected") {
           progress.log("element was detached from the DOM, retrying");
-          return continuePolling2;
+          return continuePolling3;
         } else if (result === "internal:continuepolling") {
-          return continuePolling2;
+          return continuePolling3;
         }
         return result;
       } finally {
@@ -1214,6 +1221,7 @@ class Frame extends import_instrumentation.SdkObject {
       return await controller.run(async (progress) => {
         progress.log("waiting for " + this._asLocator(selector));
         const promise = this._retryWithProgressIfNotConnected(progress, selector, options.strict, false, async (handle) => {
+          if (!handle) return false;
           if (handle.parentNode.constructor.name == "ElementHandle") {
             return await handle.parentNode.evaluateInUtility(([injected, node, { handle: handle2 }]) => {
               const state = handle2 ? injected.elementState(handle2, "visible") : {
@@ -1342,11 +1350,11 @@ class Frame extends import_instrumentation.SdkObject {
       if (timeout < 0)
         return { matches: options.isNot, log: (0, import_callLog.compressCallLog)(metadata.log), timedOut: true, received: lastIntermediateResult.received };
       return await new import_progress.ProgressController(metadata, this).run(async (progress) => {
-        return await this.retryWithProgressAndTimeouts(progress, [100, 250, 500, 1e3], async (continuePolling2) => {
+        return await this.retryWithProgressAndTimeouts(progress, [100, 250, 500, 1e3], async (continuePolling3) => {
           await this._page.performActionPreChecks(progress);
           const { matches, received } = await this._expectInternal(progress, selector, options, lastIntermediateResult);
           if (matches === options.isNot) {
-            return continuePolling2;
+            return continuePolling3;
           }
           return { matches, received };
         });

package/package.json

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