@checkly/playwright-core 1.41.2-beta.1 → 1.41.2-beta.3

package/lib/server/chromium/crNetworkManager.js

@@ -8,6 +8,7 @@ var _helper = require("../helper");
 var _eventsHelper = require("../../utils/eventsHelper");
 var network = _interopRequireWildcard(require("../network"));
 var _utils = require("../../utils");
+var _protocolError = require("../protocolError");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
@@ -543,30 +544,44 @@ class RouteImpl {
       method: overrides.method,
       postData: overrides.postData ? overrides.postData.toString('base64') : undefined
     };
-    await this._session.send('Fetch.continueRequest', this._alreadyContinuedParams);
+    await catchDisallowedErrors(async () => {
+      await this._session.send('Fetch.continueRequest', this._alreadyContinuedParams);
+    });
   }
   async fulfill(response) {
     const body = response.isBase64 ? response.body : Buffer.from(response.body).toString('base64');
     const responseHeaders = splitSetCookieHeader(response.headers);
-    await this._session.send('Fetch.fulfillRequest', {
-      requestId: this._interceptionId,
-      responseCode: response.status,
-      responsePhrase: network.STATUS_TEXTS[String(response.status)],
-      responseHeaders,
-      body
+    await catchDisallowedErrors(async () => {
+      await this._session.send('Fetch.fulfillRequest', {
+        requestId: this._interceptionId,
+        responseCode: response.status,
+        responsePhrase: network.STATUS_TEXTS[String(response.status)],
+        responseHeaders,
+        body
+      });
     });
   }
   async abort(errorCode = 'failed') {
     const errorReason = errorReasons[errorCode];
     (0, _utils.assert)(errorReason, 'Unknown error code: ' + errorCode);
-    // In certain cases, protocol will return error if the request was already canceled
-    // or the page was closed. We should tolerate these errors.
-    await this._session._sendMayFail('Fetch.failRequest', {
-      requestId: this._interceptionId,
-      errorReason
+    await catchDisallowedErrors(async () => {
+      await this._session.send('Fetch.failRequest', {
+        requestId: this._interceptionId,
+        errorReason
+      });
     });
   }
 }
+
+// In certain cases, protocol will return error if the request was already canceled
+// or the page was closed. We should tolerate these errors but propagate other.
+async function catchDisallowedErrors(callback) {
+  try {
+    return await callback();
+  } catch (e) {
+    if ((0, _protocolError.isProtocolError)(e) && e.message.includes('Invalid http status code or phrase')) throw e;
+  }
+}
 function splitSetCookieHeader(headers) {
   const index = headers.findIndex(({
     name

package/lib/server/dispatchers/frameDispatcher.js

@@ -281,6 +281,12 @@ class FrameDispatcher extends _dispatcher.Dispatcher {
       expectedValue
     });
     if (result.received !== undefined) result.received = (0, _jsHandleDispatcher.serializeResult)(result.received);
+    if (result.matches === params.isNot) metadata.error = {
+      error: {
+        name: 'Expect',
+        message: 'Expect failed'
+      }
+    };
     return result;
   }
 }

package/lib/server/network.js

@@ -126,15 +126,6 @@ class Request extends _instrumentation.SdkObject {
     this._failureText = failureText;
     this._waitForResponsePromise.resolve(null);
   }
-  async _waitForRequestFailure() {
-    const response = await this._waitForResponsePromise;
-    // If response is null it was a failure an we are done.
-    if (!response) return;
-    await response._finishedPromise;
-    if (this.failure()) return;
-    // If request finished without errors, we stall.
-    await new Promise(() => {});
-  }
   _setOverrides(overrides) {
     this._overrides = overrides;
     this._updateHeadersMap();
@@ -241,10 +232,7 @@ class Route extends _instrumentation.SdkObject {
   async abort(errorCode = 'failed') {
     this._startHandling();
     this._request._context.emit(_browserContext.BrowserContext.Events.RequestAborted, this._request);
-    await Promise.race([this._delegate.abort(errorCode),
-    // If the request is already cancelled by the page before we handle the route,
-    // we'll receive loading failed event and will ignore route handling error.
-    this._request._waitForRequestFailure()]);
+    await this._delegate.abort(errorCode);
     this._endHandling();
   }
   async redirectNavigationRequest(url) {
@@ -270,15 +258,12 @@ class Route extends _instrumentation.SdkObject {
     const headers = [...(overrides.headers || [])];
     this._maybeAddCorsHeaders(headers);
     this._request._context.emit(_browserContext.BrowserContext.Events.RequestFulfilled, this._request);
-    await Promise.race([this._delegate.fulfill({
+    await this._delegate.fulfill({
       status: overrides.status || 200,
       headers,
-      body,
+      body: body,
       isBase64
-    }),
-    // If the request is already cancelled by the page before we handle the route,
-    // we'll receive loading failed event and will ignore route handling error.
-    this._request._waitForRequestFailure()]);
+    });
     this._endHandling();
   }
 
@@ -315,10 +300,7 @@ class Route extends _instrumentation.SdkObject {
     }
     this._request._setOverrides(overrides);
     if (!overrides.isFallback) this._request._context.emit(_browserContext.BrowserContext.Events.RequestContinued, this._request);
-    await Promise.race([this._delegate.continue(this._request, overrides),
-    // If the request is already cancelled by the page before we handle the route,
-    // we'll receive loading failed event and will ignore route handling error.
-    this._request._waitForRequestFailure()]);
+    await this._delegate.continue(this._request, overrides);
     this._endHandling();
   }
   _startHandling() {