patchright-core 1.48.2 → 1.49.1

package/lib/server/dispatchers/androidDispatcher.js

@@ -96,8 +96,10 @@ class AndroidDeviceDispatcher extends _dispatcher.Dispatcher {
     await this._object.send('swipe', params);
   }
   async info(params) {
+    const info = await this._object.send('info', params);
+    fixupAndroidElementInfo(info);
     return {
-      info: await this._object.send('info', params)
+      info
     };
   }
   async inputType(params) {
@@ -190,4 +192,13 @@ class AndroidSocketDispatcher extends _dispatcher.Dispatcher {
   }
 }
 exports.AndroidSocketDispatcher = AndroidSocketDispatcher;
-const keyMap = new Map([['Unknown', 0], ['SoftLeft', 1], ['SoftRight', 2], ['Home', 3], ['Back', 4], ['Call', 5], ['EndCall', 6], ['0', 7], ['1', 8], ['2', 9], ['3', 10], ['4', 11], ['5', 12], ['6', 13], ['7', 14], ['8', 15], ['9', 16], ['Star', 17], ['*', 17], ['Pound', 18], ['#', 18], ['DialUp', 19], ['DialDown', 20], ['DialLeft', 21], ['DialRight', 22], ['DialCenter', 23], ['VolumeUp', 24], ['VolumeDown', 25], ['Power', 26], ['Camera', 27], ['Clear', 28], ['A', 29], ['B', 30], ['C', 31], ['D', 32], ['E', 33], ['F', 34], ['G', 35], ['H', 36], ['I', 37], ['J', 38], ['K', 39], ['L', 40], ['M', 41], ['N', 42], ['O', 43], ['P', 44], ['Q', 45], ['R', 46], ['S', 47], ['T', 48], ['U', 49], ['V', 50], ['W', 51], ['X', 52], ['Y', 53], ['Z', 54], ['Comma', 55], [',', 55], ['Period', 56], ['.', 56], ['AltLeft', 57], ['AltRight', 58], ['ShiftLeft', 59], ['ShiftRight', 60], ['Tab', 61], ['\t', 61], ['Space', 62], [' ', 62], ['Sym', 63], ['Explorer', 64], ['Envelop', 65], ['Enter', 66], ['Del', 67], ['Grave', 68], ['Minus', 69], ['-', 69], ['Equals', 70], ['=', 70], ['LeftBracket', 71], ['(', 71], ['RightBracket', 72], [')', 72], ['Backslash', 73], ['\\', 73], ['Semicolon', 74], [';', 74], ['Apostrophe', 75], ['`', 75], ['Slash', 76], ['/', 76], ['At', 77], ['@', 77], ['Num', 78], ['HeadsetHook', 79], ['Focus', 80], ['Plus', 81], ['Menu', 82], ['Notification', 83], ['Search', 84], ['ChannelUp', 166], ['ChannelDown', 167], ['AppSwitch', 187], ['Assist', 219], ['Cut', 277], ['Copy', 278], ['Paste', 279]]);
+const keyMap = new Map([['Unknown', 0], ['SoftLeft', 1], ['SoftRight', 2], ['Home', 3], ['Back', 4], ['Call', 5], ['EndCall', 6], ['0', 7], ['1', 8], ['2', 9], ['3', 10], ['4', 11], ['5', 12], ['6', 13], ['7', 14], ['8', 15], ['9', 16], ['Star', 17], ['*', 17], ['Pound', 18], ['#', 18], ['DialUp', 19], ['DialDown', 20], ['DialLeft', 21], ['DialRight', 22], ['DialCenter', 23], ['VolumeUp', 24], ['VolumeDown', 25], ['Power', 26], ['Camera', 27], ['Clear', 28], ['A', 29], ['B', 30], ['C', 31], ['D', 32], ['E', 33], ['F', 34], ['G', 35], ['H', 36], ['I', 37], ['J', 38], ['K', 39], ['L', 40], ['M', 41], ['N', 42], ['O', 43], ['P', 44], ['Q', 45], ['R', 46], ['S', 47], ['T', 48], ['U', 49], ['V', 50], ['W', 51], ['X', 52], ['Y', 53], ['Z', 54], ['Comma', 55], [',', 55], ['Period', 56], ['.', 56], ['AltLeft', 57], ['AltRight', 58], ['ShiftLeft', 59], ['ShiftRight', 60], ['Tab', 61], ['\t', 61], ['Space', 62], [' ', 62], ['Sym', 63], ['Explorer', 64], ['Envelop', 65], ['Enter', 66], ['Del', 67], ['Grave', 68], ['Minus', 69], ['-', 69], ['Equals', 70], ['=', 70], ['LeftBracket', 71], ['(', 71], ['RightBracket', 72], [')', 72], ['Backslash', 73], ['\\', 73], ['Semicolon', 74], [';', 74], ['Apostrophe', 75], ['`', 75], ['Slash', 76], ['/', 76], ['At', 77], ['@', 77], ['Num', 78], ['HeadsetHook', 79], ['Focus', 80], ['Plus', 81], ['Menu', 82], ['Notification', 83], ['Search', 84], ['ChannelUp', 166], ['ChannelDown', 167], ['AppSwitch', 187], ['Assist', 219], ['Cut', 277], ['Copy', 278], ['Paste', 279]]);
+function fixupAndroidElementInfo(info) {
+  // Some of the properties are nullable, see https://developer.android.com/reference/androidx/test/uiautomator/UiObject2.
+  info.clazz = info.clazz || '';
+  info.pkg = info.pkg || '';
+  info.res = info.res || '';
+  info.desc = info.desc || '';
+  info.text = info.text || '';
+  for (const child of info.children || []) fixupAndroidElementInfo(child);
+}

package/lib/server/dispatchers/debugControllerDispatcher.js

@@ -81,7 +81,7 @@ class DebugControllerDispatcher extends _dispatcher.Dispatcher {
     await this._object.setRecorderMode(params);
   }
   async highlight(params) {
-    await this._object.highlight(params.selector);
+    await this._object.highlight(params);
   }
   async hideHighlight() {
     await this._object.hideHighlight();

package/lib/server/dispatchers/dispatcher.js

@@ -384,7 +384,7 @@ class DispatcherConnection {
       callMetadata.endTime = (0, _utils.monotonicTime)();
       await (sdkObject === null || sdkObject === void 0 ? void 0 : sdkObject.instrumentation.onAfterCall(sdkObject, callMetadata));
     }
-    if (response.error) response.log = callMetadata.log;
+    if (response.error) response.log = (0, _utils.compressCallLog)(callMetadata.log);
     this.onmessage(response);
   }
 }

package/lib/server/dispatchers/frameDispatcher.js

@@ -10,6 +10,7 @@ var _elementHandlerDispatcher = require("./elementHandlerDispatcher");
 var _jsHandleDispatcher = require("./jsHandleDispatcher");
 var _networkDispatchers = require("./networkDispatchers");
 var _utils = require("../../utils");
+var _ariaSnapshot = require("../ariaSnapshot");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -274,7 +275,8 @@ class FrameDispatcher extends _dispatcher.Dispatcher {
   }
   async expect(params, metadata) {
     metadata.potentiallyClosesScope = true;
-    const expectedValue = params.expectedValue ? (0, _jsHandleDispatcher.parseArgument)(params.expectedValue) : undefined;
+    let expectedValue = params.expectedValue ? (0, _jsHandleDispatcher.parseArgument)(params.expectedValue) : undefined;
+    if (params.expression === 'to.match.aria' && expectedValue) expectedValue = (0, _ariaSnapshot.parseAriaSnapshot)(expectedValue);
     const result = await this._frame.expect(metadata, params.selector, {
       ...params,
       expectedValue
@@ -282,5 +284,10 @@ class FrameDispatcher extends _dispatcher.Dispatcher {
     if (result.received !== undefined) result.received = (0, _jsHandleDispatcher.serializeResult)(result.received);
     return result;
   }
+  async ariaSnapshot(params, metadata) {
+    return {
+      snapshot: await this._frame.ariaSnapshot(metadata, params.selector, params)
+    };
+  }
 }
 exports.FrameDispatcher = FrameDispatcher;

package/lib/server/dispatchers/tracingDispatcher.js

@@ -37,6 +37,16 @@ class TracingDispatcher extends _dispatcher.Dispatcher {
   async tracingStartChunk(params) {
     return await this._object.startChunk(params);
   }
+  async tracingGroup(params, metadata) {
+    const {
+      name,
+      location
+    } = params;
+    await this._object.group(name, location, metadata);
+  }
+  async tracingGroupEnd(params) {
+    await this._object.groupEnd();
+  }
   async tracingStopChunk(params) {
     const {
       artifact,

package/lib/server/dom.js

@@ -225,17 +225,21 @@ class ElementHandle extends js.JSHandle {
     // Allow 1x1 elements. Compensate for rounding errors by comparing with 0.99 instead.
     const filtered = quads.map(quad => intersectQuadWithViewport(quad)).filter(quad => computeQuadArea(quad) > 0.99);
     if (!filtered.length) return 'error:notinviewport';
-    // Return the middle point of the first quad.
-    const result = {
-      x: 0,
-      y: 0
-    };
-    for (const point of filtered[0]) {
-      result.x += point.x / 4;
-      result.y += point.y / 4;
+    if (this._page._browserContext._browser.options.name === 'firefox') {
+      // Firefox internally uses integer coordinates, so 8.x is converted to 8 or 9 when clicking.
+      //
+      // This does not work nicely for small elements. For example, 1x1 square with corners
+      // (8;8) and (9;9) is targeted when clicking at (8;8) but not when clicking at (9;9).
+      // So, clicking at (8.x;8.y) will sometimes click at (9;9) and miss the target.
+      //
+      // Therefore, we try to find an integer point within a quad to make sure we click inside the element.
+      for (const quad of filtered) {
+        const integerPoint = findIntegerPointInsideQuad(quad);
+        if (integerPoint) return integerPoint;
+      }
     }
-    compensateHalfIntegerRoundingError(result);
-    return result;
+    // Return the middle point of the first quad.
+    return quadMiddlePoint(filtered[0]);
   }
   async _offsetPoint(offset) {
     const [box, border] = await Promise.all([this.boundingBox(), this.evaluateInUtility(([injected, node]) => injected.getElementBorderWidth(node), {}).catch(e => {})]);
@@ -253,7 +257,7 @@ class ElementHandle extends js.JSHandle {
     const waitTime = [0, 20, 100, 100, 500];
     while (progress.isRunning()) {
       if (retry) {
-        progress.log(`retrying ${actionName} action${options.trial ? ' (trial run)' : ''}, attempt #${retry}`);
+        progress.log(`retrying ${actionName} action${options.trial ? ' (trial run)' : ''}`);
         const timeout = waitTime[Math.min(retry - 1, waitTime.length - 1)];
         if (timeout) {
           progress.log(`  waiting ${timeout}ms`);
@@ -263,7 +267,7 @@ class ElementHandle extends js.JSHandle {
       } else {
         progress.log(`attempting ${actionName} action${options.trial ? ' (trial run)' : ''}`);
       }
-      if (!options.skipLocatorHandlersCheckpoint && !options.force) await this._frame._page.performLocatorHandlersCheckpoint(progress);
+      if (!options.skipActionPreChecks && !options.force) await this._frame._page.performActionPreChecks(progress);
       const result = await action(retry);
       ++retry;
       if (result === 'error:notvisible') {
@@ -294,7 +298,7 @@ class ElementHandle extends js.JSHandle {
   }
   async _retryPointerAction(progress, actionName, waitForEnabled, action, options) {
     // Note: do not perform locator handlers checkpoint to avoid moving the mouse in the middle of a drag operation.
-    const skipLocatorHandlersCheckpoint = actionName === 'move and up';
+    const skipActionPreChecks = actionName === 'move and up';
     return await this._retryAction(progress, actionName, async retry => {
       // By default, we scroll with protocol method to reveal the action point.
       // However, that might not work to scroll from under position:sticky elements
@@ -314,7 +318,7 @@ class ElementHandle extends js.JSHandle {
       return await this._performPointerAction(progress, actionName, waitForEnabled, action, forceScrollOptions, options);
     }, {
       ...options,
-      skipLocatorHandlersCheckpoint
+      skipActionPreChecks
     });
   }
   async _performPointerAction(progress, actionName, waitForEnabled, action, forceScrollOptions, options) {
@@ -367,7 +371,7 @@ class ElementHandle extends js.JSHandle {
     if (typeof maybePoint === 'string') return maybePoint;
     const point = roundPoint(maybePoint);
     progress.metadata.point = point;
-    await progress.beforeInputAction(this);
+    await this.instrumentation.onBeforeInputAction(this, progress.metadata);
     let hitTargetInterceptionHandle;
     if (force) {
       progress.log(`  forcing action`);
@@ -433,9 +437,16 @@ class ElementHandle extends js.JSHandle {
     progress.log('  navigations have finished');
     return 'done';
   }
+  async _markAsTargetElement(metadata) {
+    if (!metadata.id) return;
+    await this.evaluateInUtility(([injected, node, callId]) => {
+      if (node.nodeType === 1 /* Node.ELEMENT_NODE */) injected.markTargetElements(new Set([node]), callId);
+    }, metadata.id);
+  }
   async hover(metadata, options) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
+      await this._markAsTargetElement(metadata);
       const result = await this._hover(progress, options);
       return assertDone(throwRetargetableDOMError(result));
     }, this._page._timeoutSettings.timeout(options));
@@ -449,6 +460,7 @@ class ElementHandle extends js.JSHandle {
   async click(metadata, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
+      await this._markAsTargetElement(metadata);
       const result = await this._click(progress, {
         ...options,
         waitAfter: !options.noWaitAfter
@@ -462,6 +474,7 @@ class ElementHandle extends js.JSHandle {
   async dblclick(metadata, options) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
+      await this._markAsTargetElement(metadata);
       const result = await this._dblclick(progress, options);
       return assertDone(throwRetargetableDOMError(result));
     }, this._page._timeoutSettings.timeout(options));
@@ -475,6 +488,7 @@ class ElementHandle extends js.JSHandle {
   async tap(metadata, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
+      await this._markAsTargetElement(metadata);
       const result = await this._tap(progress, options);
       return assertDone(throwRetargetableDOMError(result));
     }, this._page._timeoutSettings.timeout(options));
@@ -488,6 +502,7 @@ class ElementHandle extends js.JSHandle {
   async selectOption(metadata, elements, values, options) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
+      await this._markAsTargetElement(metadata);
       const result = await this._selectOption(progress, elements, values, options);
       return throwRetargetableDOMError(result);
     }, this._page._timeoutSettings.timeout(options));
@@ -495,7 +510,7 @@ class ElementHandle extends js.JSHandle {
   async _selectOption(progress, elements, values, options) {
     let resultingOptions = [];
     await this._retryAction(progress, 'select option', async () => {
-      await progress.beforeInputAction(this);
+      await this.instrumentation.onBeforeInputAction(this, progress.metadata);
       if (!options.force) progress.log(`  waiting for element to be visible and enabled`);
       const optionsToSelect = [...elements, ...values];
       const result = await this.evaluateInUtility(async ([injected, node, {
@@ -523,6 +538,7 @@ class ElementHandle extends js.JSHandle {
   async fill(metadata, value, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
+      await this._markAsTargetElement(metadata);
       const result = await this._fill(progress, value, options);
       assertDone(throwRetargetableDOMError(result));
     }, this._page._timeoutSettings.timeout(options));
@@ -530,7 +546,7 @@ class ElementHandle extends js.JSHandle {
   async _fill(progress, value, options) {
     progress.log(`  fill("${value}")`);
     return await this._retryAction(progress, 'fill', async () => {
-      await progress.beforeInputAction(this);
+      await this.instrumentation.onBeforeInputAction(this, progress.metadata);
       if (!options.force) progress.log('  waiting for element to be visible, enabled and editable');
       const result = await this.evaluateInUtility(async ([injected, node, {
         value,
@@ -578,6 +594,7 @@ class ElementHandle extends js.JSHandle {
     const inputFileItems = await (0, _fileUploadUtils.prepareFilesForUpload)(this._frame, params);
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
+      await this._markAsTargetElement(metadata);
       const result = await this._setInputFiles(progress, inputFileItems);
       return assertDone(throwRetargetableDOMError(result));
     }, this._page._timeoutSettings.timeout(params));
@@ -607,7 +624,7 @@ class ElementHandle extends js.JSHandle {
     });
     if (result === 'error:notconnected' || !result.asElement()) return 'error:notconnected';
     const retargeted = result.asElement();
-    await progress.beforeInputAction(this);
+    await this.instrumentation.onBeforeInputAction(this, progress.metadata);
     progress.throwIfAborted(); // Avoid action that has side-effects.
     if (localPaths || localDirectory) {
       const localPathsOrDirectory = localDirectory ? [localDirectory] : localPaths;
@@ -628,6 +645,7 @@ class ElementHandle extends js.JSHandle {
   async focus(metadata) {
     const controller = new _progress.ProgressController(metadata, this);
     await controller.run(async progress => {
+      await this._markAsTargetElement(metadata);
       const result = await this._focus(progress);
       return assertDone(throwRetargetableDOMError(result));
     }, 0);
@@ -643,13 +661,14 @@ class ElementHandle extends js.JSHandle {
   async type(metadata, text, options) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
+      await this._markAsTargetElement(metadata);
       const result = await this._type(progress, text, options);
       return assertDone(throwRetargetableDOMError(result));
     }, this._page._timeoutSettings.timeout(options));
   }
   async _type(progress, text, options) {
     progress.log(`elementHandle.type("${text}")`);
-    await progress.beforeInputAction(this);
+    await this.instrumentation.onBeforeInputAction(this, progress.metadata);
     const result = await this._focus(progress, true /* resetSelectionIfNotFocused */);
     if (result !== 'done') return result;
     progress.throwIfAborted(); // Avoid action that has side-effects.
@@ -659,13 +678,14 @@ class ElementHandle extends js.JSHandle {
   async press(metadata, key, options) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(async progress => {
+      await this._markAsTargetElement(metadata);
       const result = await this._press(progress, key, options);
       return assertDone(throwRetargetableDOMError(result));
     }, this._page._timeoutSettings.timeout(options));
   }
   async _press(progress, key, options) {
     progress.log(`elementHandle.press("${key}")`);
-    await progress.beforeInputAction(this);
+    await this.instrumentation.onBeforeInputAction(this, progress.metadata);
     return this._page._frameManager.waitForSignalsCreatedBy(progress, !options.noWaitAfter, async () => {
       const result = await this._focus(progress, true /* resetSelectionIfNotFocused */);
       if (result !== 'done') return result;
@@ -693,6 +713,7 @@ class ElementHandle extends js.JSHandle {
       const result = await this.evaluateInUtility(([injected, node]) => injected.elementState(node, 'checked'), {});
       return throwRetargetableDOMError(result);
     };
+    await this._markAsTargetElement(progress.metadata);
     if ((await isChecked()) === state) return 'done';
     const result = await this._click(progress, {
       ...options,
@@ -706,6 +727,9 @@ class ElementHandle extends js.JSHandle {
   async boundingBox() {
     return this._page._delegate.getBoundingBox(this);
   }
+  async ariaSnapshot() {
+    return await this.evaluateInUtility(([injected, element]) => injected.ariaSnapshot(element), {});
+  }
   async screenshot(metadata, options = {}) {
     const controller = new _progress.ProgressController(metadata, this);
     return controller.run(progress => this._page._screenshotter.screenshotElement(progress, this, options), this._page._timeoutSettings.timeout(options));
@@ -825,21 +849,40 @@ function roundPoint(point) {
     y: (point.y * 100 | 0) / 100
   };
 }
-function compensateHalfIntegerRoundingError(point) {
-  // Firefox internally uses integer coordinates, so 8.5 is converted to 9 when clicking.
-  //
-  // This does not work nicely for small elements. For example, 1x1 square with corners
-  // (8;8) and (9;9) is targeted when clicking at (8;8) but not when clicking at (9;9).
-  // So, clicking at (8.5;8.5) will effectively click at (9;9) and miss the target.
-  //
-  // Therefore, we skew half-integer values from the interval (8.49, 8.51) towards
-  // (8.47, 8.49) that is rounded towards 8. This means clicking at (8.5;8.5) will
-  // be replaced with (8.48;8.48) and will effectively click at (8;8).
-  //
-  // Other browsers use float coordinates, so this change should not matter.
-  const remainderX = point.x - Math.floor(point.x);
-  if (remainderX > 0.49 && remainderX < 0.51) point.x -= 0.02;
-  const remainderY = point.y - Math.floor(point.y);
-  if (remainderY > 0.49 && remainderY < 0.51) point.y -= 0.02;
+function quadMiddlePoint(quad) {
+  const result = {
+    x: 0,
+    y: 0
+  };
+  for (const point of quad) {
+    result.x += point.x / 4;
+    result.y += point.y / 4;
+  }
+  return result;
+}
+function triangleArea(p1, p2, p3) {
+  return Math.abs(p1.x * (p2.y - p3.y) + p2.x * (p3.y - p1.y) + p3.x * (p1.y - p2.y)) / 2;
+}
+function isPointInsideQuad(point, quad) {
+  const area1 = triangleArea(point, quad[0], quad[1]) + triangleArea(point, quad[1], quad[2]) + triangleArea(point, quad[2], quad[3]) + triangleArea(point, quad[3], quad[0]);
+  const area2 = triangleArea(quad[0], quad[1], quad[2]) + triangleArea(quad[1], quad[2], quad[3]);
+  // Check that point is inside the quad.
+  if (Math.abs(area1 - area2) > 0.1) return false;
+  // Check that point is not on the right/bottom edge, because clicking
+  // there does not actually click the element.
+  return point.x < Math.max(quad[0].x, quad[1].x, quad[2].x, quad[3].x) && point.y < Math.max(quad[0].y, quad[1].y, quad[2].y, quad[3].y);
+}
+function findIntegerPointInsideQuad(quad) {
+  // Try all four rounding directions of the middle point.
+  const point = quadMiddlePoint(quad);
+  point.x = Math.floor(point.x);
+  point.y = Math.floor(point.y);
+  if (isPointInsideQuad(point, quad)) return point;
+  point.x += 1;
+  if (isPointInsideQuad(point, quad)) return point;
+  point.y += 1;
+  if (isPointInsideQuad(point, quad)) return point;
+  point.x -= 1;
+  if (isPointInsideQuad(point, quad)) return point;
 }
 const kUnableToAdoptErrorMessage = exports.kUnableToAdoptErrorMessage = 'Unable to adopt element handle from a different document';

package/lib/server/fetch.js

@@ -8,7 +8,6 @@ exports.createProxyAgent = createProxyAgent;
 var _http = _interopRequireDefault(require("http"));
 var _https = _interopRequireDefault(require("https"));
 var _stream = require("stream");
-var _url = _interopRequireDefault(require("url"));
 var _zlib = _interopRequireDefault(require("zlib"));
 var _timeoutSettings = require("../common/timeoutSettings");
 var _userAgent = require("../utils/userAgent");
@@ -91,7 +90,7 @@ class APIRequestContext extends _instrumentation.SdkObject {
         value
       } of params.headers) setHeader(headers, name, value);
     }
-    const requestUrl = new URL(params.url, defaults.baseURL);
+    const requestUrl = new URL((0, _utils.constructURLBasedOnBaseURL)(defaults.baseURL, params.url));
     if (params.encodedParams) {
       requestUrl.search = params.encodedParams;
     } else if (params.params) {
@@ -218,6 +217,7 @@ class APIRequestContext extends _instrumentation.SdkObject {
         agent
       };
       const startAt = (0, _utils.monotonicTime)();
+      let reusedSocketAt;
       let dnsLookupAt;
       let tcpConnectionAt;
       let tlsHandshakeAt;
@@ -232,15 +232,16 @@ class APIRequestContext extends _instrumentation.SdkObject {
           var _tlsHandshakeAt;
           const endAt = (0, _utils.monotonicTime)();
           // spec: http://www.softwareishard.com/blog/har-12-spec/#timings
+          const connectEnd = (_tlsHandshakeAt = tlsHandshakeAt) !== null && _tlsHandshakeAt !== void 0 ? _tlsHandshakeAt : tcpConnectionAt;
           const timings = {
             send: requestFinishAt - startAt,
             wait: responseAt - requestFinishAt,
             receive: endAt - responseAt,
             dns: dnsLookupAt ? dnsLookupAt - startAt : -1,
-            connect: ((_tlsHandshakeAt = tlsHandshakeAt) !== null && _tlsHandshakeAt !== void 0 ? _tlsHandshakeAt : tcpConnectionAt) - startAt,
+            connect: connectEnd ? connectEnd - startAt : -1,
             // "If [ssl] is defined then the time is also included in the connect field "
             ssl: tlsHandshakeAt ? tlsHandshakeAt - tcpConnectionAt : -1,
-            blocked: -1
+            blocked: reusedSocketAt ? reusedSocketAt - startAt : -1
           };
           const requestFinishedEvent = {
             requestEvent,
@@ -387,16 +388,23 @@ class APIRequestContext extends _instrumentation.SdkObject {
       }));
       request.on('close', () => _utils.eventsHelper.removeEventListeners(listeners));
       request.on('socket', socket => {
+        var _tcpConnectionAt, _tcpConnectionAt3;
+        if (request.reusedSocket) {
+          reusedSocketAt = (0, _utils.monotonicTime)();
+          return;
+        }
+
         // happy eyeballs don't emit lookup and connect events, so we use our custom ones
         const happyEyeBallsTimings = (0, _happyEyeballs.timingForSocket)(socket);
         dnsLookupAt = happyEyeBallsTimings.dnsLookupAt;
-        tcpConnectionAt = happyEyeBallsTimings.tcpConnectionAt;
+        (_tcpConnectionAt = tcpConnectionAt) !== null && _tcpConnectionAt !== void 0 ? _tcpConnectionAt : tcpConnectionAt = happyEyeBallsTimings.tcpConnectionAt;
 
         // non-happy-eyeballs sockets
         listeners.push(_utils.eventsHelper.addEventListener(socket, 'lookup', () => {
           dnsLookupAt = (0, _utils.monotonicTime)();
         }), _utils.eventsHelper.addEventListener(socket, 'connect', () => {
-          tcpConnectionAt = (0, _utils.monotonicTime)();
+          var _tcpConnectionAt2;
+          (_tcpConnectionAt2 = tcpConnectionAt) !== null && _tcpConnectionAt2 !== void 0 ? _tcpConnectionAt2 : tcpConnectionAt = (0, _utils.monotonicTime)();
         }), _utils.eventsHelper.addEventListener(socket, 'secureConnect', () => {
           tlsHandshakeAt = (0, _utils.monotonicTime)();
           if (socket instanceof _tls.TLSSocket) {
@@ -411,12 +419,21 @@ class APIRequestContext extends _instrumentation.SdkObject {
             };
           }
         }));
+
+        // when using socks proxy, having the socket means the connection got established
+        if (agent instanceof _utilsBundle.SocksProxyAgent) (_tcpConnectionAt3 = tcpConnectionAt) !== null && _tcpConnectionAt3 !== void 0 ? _tcpConnectionAt3 : tcpConnectionAt = (0, _utils.monotonicTime)();
         serverIPAddress = socket.remoteAddress;
         serverPort = socket.remotePort;
       });
       request.on('finish', () => {
         requestFinishAt = (0, _utils.monotonicTime)();
       });
+
+      // http proxy
+      request.on('proxyConnect', () => {
+        var _tcpConnectionAt4;
+        (_tcpConnectionAt4 = tcpConnectionAt) !== null && _tcpConnectionAt4 !== void 0 ? _tcpConnectionAt4 : tcpConnectionAt = (0, _utils.monotonicTime)();
+      });
       progress.log(`→ ${options.method} ${url.toString()}`);
       if (options.headers) {
         for (const [name, value] of Object.entries(options.headers)) progress.log(`  ${name}: ${value}`);
@@ -562,17 +579,13 @@ class GlobalAPIRequestContext extends APIRequestContext {
 }
 exports.GlobalAPIRequestContext = GlobalAPIRequestContext;
 function createProxyAgent(proxy) {
-  var _proxyOpts$protocol;
-  const proxyOpts = _url.default.parse(proxy.server);
-  if ((_proxyOpts$protocol = proxyOpts.protocol) !== null && _proxyOpts$protocol !== void 0 && _proxyOpts$protocol.startsWith('socks')) {
-    return new _utilsBundle.SocksProxyAgent({
-      host: proxyOpts.hostname,
-      port: proxyOpts.port || undefined
-    });
-  }
-  if (proxy.username) proxyOpts.auth = `${proxy.username}:${proxy.password || ''}`;
-  // TODO: We should use HttpProxyAgent conditional on proxyOpts.protocol instead of always using CONNECT method.
-  return new _utilsBundle.HttpsProxyAgent(proxyOpts);
+  var _proxyURL$protocol;
+  const proxyURL = new URL(proxy.server);
+  if ((_proxyURL$protocol = proxyURL.protocol) !== null && _proxyURL$protocol !== void 0 && _proxyURL$protocol.startsWith('socks')) return new _utilsBundle.SocksProxyAgent(proxyURL);
+  if (proxy.username) proxyURL.username = proxy.username;
+  if (proxy.password) proxyURL.password = proxy.password;
+  // TODO: We should use HttpProxyAgent conditional on proxyURL.protocol instead of always using CONNECT method.
+  return new _utilsBundle.HttpsProxyAgent(proxyURL);
 }
 function toHeadersArray(rawHeaders) {
   const result = [];

package/lib/server/firefox/ffExecutionContext.js

@@ -52,18 +52,6 @@ class FFExecutionContext {
     checkException(payload.exceptionDetails);
     return payload.result.objectId;
   }
-  rawCallFunctionNoReply(func, ...args) {
-    this._session.send('Runtime.callFunction', {
-      functionDeclaration: func.toString(),
-      args: args.map(a => a instanceof js.JSHandle ? {
-        objectId: a._objectId
-      } : {
-        value: a
-      }),
-      returnByValue: true,
-      executionContextId: this._executionContextId
-    }).catch(() => {});
-  }
   async evaluateWithArguments(expression, returnByValue, utilityScript, values, objectIds) {
     const payload = await this._session.send('Runtime.callFunction', {
       functionDeclaration: expression,

package/lib/server/firefox/ffNetworkManager.js

@@ -161,7 +161,7 @@ const causeToResourceType = {
   TYPE_XSLT: 'other',
   TYPE_BEACON: 'other',
   TYPE_FETCH: 'fetch',
-  TYPE_IMAGESET: 'images',
+  TYPE_IMAGESET: 'image',
   TYPE_WEB_MANIFEST: 'manifest'
 };
 const internalCauseToResourceType = {