@percy/core 1.26.2-beta.0 → 1.26.3-alpha.4

package/dist/api.js

@@ -32,8 +32,8 @@ export function createPercyServer(percy, port) {
 
     // skip or change api version header in testing mode
     if (((_percy$testing = percy.testing) === null || _percy$testing === void 0 ? void 0 : _percy$testing.version) !== false) {
-      var _percy$testing2;
-      res.setHeader('X-Percy-Core-Version', ((_percy$testing2 = percy.testing) === null || _percy$testing2 === void 0 ? void 0 : _percy$testing2.version) ?? pkg.version);
+      var _percy$testing$versio, _percy$testing2;
+      res.setHeader('X-Percy-Core-Version', (_percy$testing$versio = (_percy$testing2 = percy.testing) === null || _percy$testing2 === void 0 ? void 0 : _percy$testing2.version) !== null && _percy$testing$versio !== void 0 ? _percy$testing$versio : pkg.version);
     }
 
     // track all api reqeusts in testing mode
@@ -58,8 +58,8 @@ export function createPercyServer(percy, port) {
 
     // return json errors
     return next().catch(e => {
-      var _percy$testing6;
-      return res.json(e.status ?? 500, {
+      var _e$status, _percy$testing6;
+      return res.json((_e$status = e.status) !== null && _e$status !== void 0 ? _e$status : 500, {
         build: ((_percy$testing6 = percy.testing) === null || _percy$testing6 === void 0 ? void 0 : _percy$testing6.build) || percy.build,
         error: e.message,
         success: false
@@ -68,9 +68,9 @@ export function createPercyServer(percy, port) {
   })
   // healthcheck returns basic information
   .route('get', '/percy/healthcheck', (req, res) => {
-    var _percy$testing7;
+    var _percy$testing$build2, _percy$testing7;
     return res.json(200, {
-      build: ((_percy$testing7 = percy.testing) === null || _percy$testing7 === void 0 ? void 0 : _percy$testing7.build) ?? percy.build,
+      build: (_percy$testing$build2 = (_percy$testing7 = percy.testing) === null || _percy$testing7 === void 0 ? void 0 : _percy$testing7.build) !== null && _percy$testing$build2 !== void 0 ? _percy$testing$build2 : percy.build,
       loglevel: percy.loglevel(),
       config: percy.config,
       success: true
@@ -202,6 +202,7 @@ export function createPercyServer(percy, port) {
 
 // Create a static server instance with an automatic sitemap
 export function createStaticServer(options) {
+  var _options$rewrites;
   let {
     serve: dir,
     baseUrl = ''
@@ -214,7 +215,7 @@ export function createStaticServer(options) {
   // used when generating an automatic sitemap
   let toURL = Server.createRewriter(
   // reverse rewrites' src, dest, & order
-  Object.entries((options === null || options === void 0 ? void 0 : options.rewrites) ?? {}).reduce((acc, rw) => [rw.reverse(), ...acc], []), (filename, rewrite) => new URL(path.posix.join('/', baseUrl,
+  Object.entries((_options$rewrites = options === null || options === void 0 ? void 0 : options.rewrites) !== null && _options$rewrites !== void 0 ? _options$rewrites : {}).reduce((acc, rw) => [rw.reverse(), ...acc], []), (filename, rewrite) => new URL(path.posix.join('/', baseUrl,
   // cleanUrls will trim trailing .html/index.html from paths
   !options.cleanUrls ? rewrite(filename) : rewrite(filename).replace(/(\/index)?\.html$/, '')), server.address()));
 

package/dist/browser.js

@@ -1,3 +1,8 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
@@ -67,6 +72,7 @@ export class Browser extends EventEmitter {
     super().percy = percy;
   }
   async launch() {
+    var _executable;
     // already launching or launched
     if (this.readyState != null) return;
     this.readyState = 0;
@@ -80,7 +86,7 @@ export class Browser extends EventEmitter {
       args = [],
       timeout
     } = launchOptions;
-    executable ?? (executable = process.env.PERCY_BROWSER_EXECUTABLE);
+    (_executable = executable) !== null && _executable !== void 0 ? _executable : executable = process.env.PERCY_BROWSER_EXECUTABLE;
 
     // transform cookies object to an array of cookie params
     this.cookies = Array.isArray(cookies) ? cookies : Object.entries(cookies).map(([name, value]) => ({
@@ -212,10 +218,9 @@ export class Browser extends EventEmitter {
     let id = ++this.#lastid;
     if (!params && typeof method === 'object') {
       // allow providing a raw message as the only argument and return the id
-      this.ws.send(JSON.stringify({
-        ...method,
+      this.ws.send(JSON.stringify(_objectSpread(_objectSpread({}, method), {}, {
         id
-      }));
+      })));
       return id;
     } else {
       // send the message payload
@@ -251,7 +256,10 @@ export class Browser extends EventEmitter {
         if (match) cleanup(() => resolve(match[1]));
       };
       let handleExitClose = () => handleError();
-      let handleError = error => cleanup(() => reject(new Error(`Failed to launch browser. ${(error === null || error === void 0 ? void 0 : error.message) ?? ''}\n${stderr}'\n\n`)));
+      let handleError = error => cleanup(() => {
+        var _error$message;
+        return reject(new Error(`Failed to launch browser. ${(_error$message = error === null || error === void 0 ? void 0 : error.message) !== null && _error$message !== void 0 ? _error$message : ''}\n${stderr}'\n\n`));
+      });
       let cleanup = callback => {
         clearTimeout(timeoutId);
         this.process.stderr.off('data', handleData);

package/dist/discovery.js

@@ -1,3 +1,13 @@
+const _excluded = ["domSnapshot", "resources"],
+  _excluded2 = ["discovery", "additionalSnapshots"],
+  _excluded3 = ["additionalSnapshots"];
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import logger from '@percy/logger';
 import Queue from './queue.js';
 import { normalizeURL, hostnameMatches, createResource, createRootResource, createPercyCSSResource, createLogResource, yieldAll } from './utils.js';
@@ -95,24 +105,24 @@ function parseDomResources({
 }
 
 // Calls the provided callback with additional resources
-function processSnapshotResources({
-  domSnapshot,
-  resources,
-  ...snapshot
-}) {
-  var _resources;
-  resources = [...(((_resources = resources) === null || _resources === void 0 ? void 0 : _resources.values()) ?? [])];
+function processSnapshotResources(_ref) {
+  var _resources$values, _resources, _domSnapshot$html;
+  let {
+      domSnapshot,
+      resources
+    } = _ref,
+    snapshot = _objectWithoutProperties(_ref, _excluded);
+  resources = [...((_resources$values = (_resources = resources) === null || _resources === void 0 ? void 0 : _resources.values()) !== null && _resources$values !== void 0 ? _resources$values : [])];
 
   // find any root resource matching the provided dom snapshot
-  let rootContent = (domSnapshot === null || domSnapshot === void 0 ? void 0 : domSnapshot.html) ?? domSnapshot;
+  let rootContent = (_domSnapshot$html = domSnapshot === null || domSnapshot === void 0 ? void 0 : domSnapshot.html) !== null && _domSnapshot$html !== void 0 ? _domSnapshot$html : domSnapshot;
   let root = resources.find(r => r.content === rootContent);
 
   // initialize root resources if needed
   if (!root) {
-    let domResources = parseDomResources({
-      ...snapshot,
+    let domResources = parseDomResources(_objectSpread(_objectSpread({}, snapshot), {}, {
       domSnapshot
-    });
+    }));
     resources = [...domResources.values(), ...resources];
     root = resources[0];
   }
@@ -131,20 +141,19 @@ function processSnapshotResources({
     var _log$meta$snapshot;
     return ((_log$meta$snapshot = log.meta.snapshot) === null || _log$meta$snapshot === void 0 ? void 0 : _log$meta$snapshot.name) === snapshot.meta.snapshot.name;
   })));
-  return {
-    ...snapshot,
+  return _objectSpread(_objectSpread({}, snapshot), {}, {
     resources
-  };
+  });
 }
 
 // Triggers the capture of resource requests for a page by iterating over snapshot widths to resize
 // the page and calling any provided execute options.
 async function* captureSnapshotResources(page, snapshot, options) {
   let {
-    discovery,
-    additionalSnapshots = [],
-    ...baseSnapshot
-  } = snapshot;
+      discovery,
+      additionalSnapshots = []
+    } = snapshot,
+    baseSnapshot = _objectWithoutProperties(snapshot, _excluded2);
   let {
     capture,
     captureWidths,
@@ -154,10 +163,9 @@ async function* captureSnapshotResources(page, snapshot, options) {
 
   // used to take snapshots and remove any discovered root resource
   let takeSnapshot = async (options, width) => {
-    if (captureWidths) options = {
-      ...options,
+    if (captureWidths) options = _objectSpread(_objectSpread({}, options), {}, {
       width
-    };
+    });
     let captured = await page.snapshot(options);
     captured.resources.delete(normalizeURL(captured.url));
     capture(processSnapshotResources(captured));
@@ -185,10 +193,7 @@ async function* captureSnapshotResources(page, snapshot, options) {
   // iterate over additional snapshots for proper DOM capturing
   for (let additionalSnapshot of [baseSnapshot, ...additionalSnapshots]) {
     let isBaseSnapshot = additionalSnapshot === baseSnapshot;
-    let snap = {
-      ...baseSnapshot,
-      ...additionalSnapshot
-    };
+    let snap = _objectSpread(_objectSpread({}, baseSnapshot), additionalSnapshot);
     let {
       widths,
       execute
@@ -247,9 +252,9 @@ export async function* discoverSnapshotResources(queue, options, callback) {
     debugSnapshotOptions(snapshot);
     if (skipDiscovery) {
       let {
-        additionalSnapshots,
-        ...baseSnapshot
-      } = snapshot;
+          additionalSnapshots
+        } = snapshot,
+        baseSnapshot = _objectWithoutProperties(snapshot, _excluded3);
       additionalSnapshots = dryRun && additionalSnapshots || [];
       for (let snap of [baseSnapshot, ...additionalSnapshots]) {
         callback(dryRun ? snap : processSnapshotResources(snap));
@@ -293,18 +298,18 @@ export function createDiscoveryQueue(percy) {
   // initialize the resources for DOM snapshots
   .handle('push', snapshot => {
     let resources = parseDomResources(snapshot);
-    return {
-      ...snapshot,
+    return _objectSpread(_objectSpread({}, snapshot), {}, {
       resources
-    };
+    });
   })
   // discovery resources for snapshots and call the callback for each discovered snapshot
   .handle('task', async function* (snapshot, callback) {
+    var _snapshot$enableJavaS;
     percy.log.debug(`Discovering resources: ${snapshot.name}`, snapshot.meta);
 
     // expectation explained in tests
     /* istanbul ignore next: tested, but coverage is stripped */
-    let assetDiscoveryPageEnableJS = snapshot.cliEnableJavaScript && !snapshot.domSnapshot || (snapshot.enableJavaScript ?? !snapshot.domSnapshot);
+    let assetDiscoveryPageEnableJS = snapshot.cliEnableJavaScript && !snapshot.domSnapshot || ((_snapshot$enableJavaS = snapshot.enableJavaScript) !== null && _snapshot$enableJavaS !== void 0 ? _snapshot$enableJavaS : !snapshot.domSnapshot);
     percy.log.debug(`Asset discovery Browser Page enable JS: ${assetDiscoveryPageEnableJS}`);
     // create a new browser page
     let page = yield percy.browser.page({

package/dist/install.js

@@ -84,8 +84,9 @@ export async function download({
           let total = parseInt(response.headers['content-length'], 10);
           let start, progress;
           response.on('data', chunk => {
-            start ?? (start = Date.now());
-            progress = (progress ?? 0) + chunk.length;
+            var _start, _progress;
+            (_start = start) !== null && _start !== void 0 ? _start : start = Date.now();
+            progress = ((_progress = progress) !== null && _progress !== void 0 ? _progress : 0) + chunk.length;
             log.progress(formatProgress(premsg, total, start, progress));
           });
         }

package/dist/network.js

@@ -1,3 +1,8 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import mime from 'mime-types';
 import logger from '@percy/logger';
 import { request as makeRequest } from '@percy/client/utils';
@@ -5,6 +10,7 @@ import { normalizeURL, hostnameMatches, createResource, waitFor } from './utils.
 const MAX_RESOURCE_SIZE = 25 * 1024 ** 2; // 25MB
 const ALLOWED_STATUSES = [200, 201, 301, 302, 304, 307, 308];
 const ALLOWED_RESOURCES = ['Document', 'Stylesheet', 'Image', 'Media', 'Font', 'Other'];
+const ABORTED_MESSAGE = 'Request was aborted by browser';
 
 // The Interceptor class creates common handlers for dealing with intercepting asset requests
 // for a given page using various devtools protocol events and commands.
@@ -15,12 +21,14 @@ export class Network {
   #requests = new Map();
   #intercepts = new Map();
   #authentications = new Set();
+  #aborted = new Set();
   constructor(page, options) {
+    var _options$networkIdleT, _options$requestHeade, _options$userAgent;
     this.page = page;
-    this.timeout = options.networkIdleTimeout ?? 100;
+    this.timeout = (_options$networkIdleT = options.networkIdleTimeout) !== null && _options$networkIdleT !== void 0 ? _options$networkIdleT : 100;
     this.authorization = options.authorization;
-    this.requestHeaders = options.requestHeaders ?? {};
-    this.userAgent = options.userAgent ??
+    this.requestHeaders = (_options$requestHeade = options.requestHeaders) !== null && _options$requestHeade !== void 0 ? _options$requestHeade : {};
+    this.userAgent = (_options$userAgent = options.userAgent) !== null && _options$userAgent !== void 0 ? _options$userAgent :
     // by default, emulate a non-headless browser
     page.session.browser.version.userAgent.replace('Headless', '');
     this.intercept = options.intercept;
@@ -77,6 +85,23 @@ export class Network {
     });
   }
 
+  // Validates that requestId is still valid as sometimes request gets cancelled and we have already executed
+  // _forgetRequest for the same, but we still attempt to make a call for it and it fails
+  // with Protocol error (Fetch.failRequest): Invalid InterceptionId.
+  async send(session, method, params) {
+    /* istanbul ignore else: currently all send have requestId */
+    if (params.requestId) {
+      /* istanbul ignore if: race condition, very hard to mock this */
+      if (this.isAborted(params.requestId)) {
+        throw new Error(ABORTED_MESSAGE);
+      }
+    }
+    return await session.send(method, params);
+  }
+  isAborted(requestId) {
+    return this.#aborted.has(requestId);
+  }
+
   // Throw a better network timeout error
   _throwTimeoutError(msg, filter = () => true) {
     if (this.log.shouldLog('debug')) {
@@ -102,10 +127,11 @@ export class Network {
   // Called when a request requires authentication. Responds to the auth request with any
   // provided authorization credentials.
   _handleAuthRequired = async (session, event) => {
+    var _this$authorization;
     let {
       username,
       password
-    } = this.authorization ?? {};
+    } = (_this$authorization = this.authorization) !== null && _this$authorization !== void 0 ? _this$authorization : {};
     let {
       requestId
     } = event;
@@ -116,7 +142,7 @@ export class Network {
       response = 'ProvideCredentials';
       this.#authentications.add(requestId);
     }
-    await session.send('Fetch.continueWithAuth', {
+    await this.send(session, 'Fetch.continueWithAuth', {
       requestId: event.requestId,
       authChallengeResponse: {
         response,
@@ -139,17 +165,15 @@ export class Network {
 
     // guard against redirects with the same requestId
     if ((pending === null || pending === void 0 ? void 0 : pending.request.url) === event.request.url && pending.request.method === event.request.method) {
-      await this._handleRequest(session, {
-        ...pending,
+      await this._handleRequest(session, _objectSpread(_objectSpread({}, pending), {}, {
         resourceType,
         interceptId
-      });
+      }));
     } else {
       // track the session that intercepted the request
-      this.#intercepts.set(requestId, {
-        ...event,
+      this.#intercepts.set(requestId, _objectSpread(_objectSpread({}, event), {}, {
         session
-      });
+      }));
     }
   };
 
@@ -173,11 +197,10 @@ export class Network {
           requestId: interceptId,
           resourceType
         } = intercept;
-        await this._handleRequest(session, {
-          ...event,
+        await this._handleRequest(session, _objectSpread(_objectSpread({}, event), {}, {
           resourceType,
           interceptId
-        });
+        }));
         this.#intercepts.delete(requestId);
       }
     }
@@ -222,7 +245,7 @@ export class Network {
     if (!request) return;
     request.response = response;
     request.response.buffer = async () => {
-      let result = await session.send('Network.getResponseBody', {
+      let result = await this.send(session, 'Network.getResponseBody', {
         requestId
       });
       return Buffer.from(result.body, result.base64Encoded ? 'base64' : 'utf-8');
@@ -253,13 +276,21 @@ export class Network {
     /* istanbul ignore if: race condition paranioa */
     if (!request) return;
 
-    // do not log generic messages since the real error was likely logged elsewhere
-    if (event.errorText !== 'net::ERR_FAILED') {
+    // If request was aborted, keep track of it as we need to cancel any in process callbacks for
+    // such a request to avoid Invalid InterceptionId errors
+    // Note: 404s also show up under ERR_ABORTED and not ERR_FAILED
+    if (event.errorText === 'net::ERR_ABORTED') {
+      let message = `Request aborted for ${request.url}: ${event.errorText}`;
+      this.log.debug(message, _objectSpread(_objectSpread({}, this.meta), {}, {
+        url: request.url
+      }));
+      this.#aborted.add(request.requestId);
+    } else if (event.errorText !== 'net::ERR_FAILED') {
+      // do not log generic messages since the real error was likely logged elsewhere
       let message = `Request failed for ${request.url}: ${event.errorText}`;
-      this.log.debug(message, {
-        ...this.meta,
+      this.log.debug(message, _objectSpread(_objectSpread({}, this.meta), {}, {
         url: request.url
-      });
+      }));
     }
     this._forgetRequest(request);
   };
@@ -285,22 +316,22 @@ async function sendResponseResource(network, request, session) {
   } = network.intercept;
   let log = network.log;
   let url = originURL(request);
-  let meta = {
-    ...network.meta,
+  let meta = _objectSpread(_objectSpread({}, network.meta), {}, {
     url
-  };
+  });
+  let send = (method, params) => network.send(session, method, params);
   try {
     let resource = network.intercept.getResource(url);
     network.log.debug(`Handling request: ${url}`, meta);
     if (!(resource !== null && resource !== void 0 && resource.root) && hostnameMatches(disallowedHostnames, url)) {
       log.debug('- Skipping disallowed hostname', meta);
-      await session.send('Fetch.failRequest', {
+      await send('Fetch.failRequest', {
         requestId: request.interceptId,
         errorReason: 'Aborted'
       });
     } else if (resource && (resource.root || resource.provided || !disableCache)) {
       log.debug(resource.root ? '- Serving root resource' : '- Resource cache hit', meta);
-      await session.send('Fetch.fulfillRequest', {
+      await send('Fetch.fulfillRequest', {
         requestId: request.interceptId,
         responseCode: resource.status || 200,
         body: Buffer.from(resource.content).toString('base64'),
@@ -310,18 +341,35 @@ async function sendResponseResource(network, request, session) {
         }))
       });
     } else {
-      await session.send('Fetch.continueRequest', {
+      await send('Fetch.continueRequest', {
         requestId: request.interceptId
       });
     }
   } catch (error) {
     /* istanbul ignore next: too hard to test (create race condition) */
     if (session.closing && error.message.includes('close')) return;
+
+    // if failure is due to an already aborted request, ignore it
+    // due to race condition we might get aborted event later and see a `Invalid InterceptionId`
+    // error before, in which case we should wait for a tick and check again
+    // Note: its not a necessity that we would get aborted callback in a tick, its just that if we
+    // already have it then we can safely ignore this error
+    // Its very hard to test it as this function should be called and request should get cancelled before
+    if (error.message === ABORTED_MESSAGE || error.message.includes('Invalid InterceptionId')) {
+      // defer this to the end of queue to make sure that any incoming aborted messages were
+      // handled and network.#aborted is updated
+      await new Promise((res, _) => process.nextTick(res));
+      /* istanbul ignore else: too hard to create race where abortion event is delayed */
+      if (network.isAborted(request.requestId)) {
+        log.debug(`Ignoring further steps for ${url} as request was aborted by the browser.`);
+        return;
+      }
+    }
     log.debug(`Encountered an error handling request: ${url}`, meta);
     log.debug(error);
 
     /* istanbul ignore next: catch race condition */
-    await session.send('Fetch.failRequest', {
+    await send('Fetch.failRequest', {
       requestId: request.interceptId,
       errorReason: 'Failed'
     }).catch(e => log.debug(e, meta));
@@ -331,9 +379,7 @@ async function sendResponseResource(network, request, session) {
 // Make a new request with Node based on a network request
 function makeDirectRequest(network, request) {
   var _network$authorizatio;
-  let headers = {
-    ...request.headers
-  };
+  let headers = _objectSpread({}, request.headers);
   if ((_network$authorizatio = network.authorization) !== null && _network$authorizatio !== void 0 && _network$authorizatio.username) {
     // include basic authorization username and password
     let {
@@ -359,10 +405,9 @@ async function saveResponseResource(network, request) {
   let log = network.log;
   let url = originURL(request);
   let response = request.response;
-  let meta = {
-    ...network.meta,
+  let meta = _objectSpread(_objectSpread({}, network.meta), {}, {
     url
-  };
+  });
   let resource = network.intercept.getResource(url);
   if (!resource || !resource.root && !resource.provided && disableCache) {
     try {

package/dist/page.js

@@ -1,3 +1,12 @@
+const _excluded = ["waitForTimeout", "waitForSelector", "execute"];
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
 import fs from 'fs';
 import logger from '@percy/logger';
 import Network from './network.js';
@@ -7,9 +16,10 @@ export class Page {
   static TIMEOUT = undefined;
   log = logger('core:page');
   constructor(session, options) {
+    var _options$enableJavaSc;
     this.session = session;
     this.browser = session.browser;
-    this.enableJavaScript = options.enableJavaScript ?? true;
+    this.enableJavaScript = (_options$enableJavaSc = options.enableJavaScript) !== null && _options$enableJavaSc !== void 0 ? _options$enableJavaSc : true;
     this.network = new Network(this, options);
     this.meta = options.meta;
     this._initializeLoadTimeout();
@@ -53,9 +63,8 @@ export class Page {
         let defaultDomain = hostname(url);
         await this.session.send('Network.setCookies', {
           // spread is used to make a shallow copy of the cookie
-          cookies: this.session.browser.cookies.map(({
-            ...cookie
-          }) => {
+          cookies: this.session.browser.cookies.map(_ref => {
+            let cookie = Object.assign({}, (_objectDestructuringEmpty(_ref), _ref));
             if (!cookie.url) cookie.domain || (cookie.domain = defaultDomain);
             return cookie;
           })
@@ -125,22 +134,22 @@ export class Page {
   async evaluate(scripts) {
     var _scripts;
     if (!((_scripts = scripts && (scripts = [].concat(scripts))) !== null && _scripts !== void 0 && _scripts.length)) return;
-    this.log.debug('Evaluate JavaScript', {
-      ...this.meta,
+    this.log.debug('Evaluate JavaScript', _objectSpread(_objectSpread({}, this.meta), {}, {
       scripts
-    });
+    }));
     for (let script of scripts) await this.eval(script);
   }
 
   // Takes a snapshot after waiting for any timeout, waiting for any selector, executing any
   // scripts, and waiting for the network idle. Returns all other provided snapshot options along
   // with the captured URL and DOM snapshot.
-  async snapshot({
-    waitForTimeout,
-    waitForSelector,
-    execute,
-    ...snapshot
-  }) {
+  async snapshot(_ref2) {
+    let {
+        waitForTimeout,
+        waitForSelector,
+        execute
+      } = _ref2,
+      snapshot = _objectWithoutProperties(_ref2, _excluded);
     let {
       name,
       width,
@@ -193,10 +202,7 @@ export class Page {
       disableShadowDOM,
       domTransformation
     });
-    return {
-      ...snapshot,
-      ...capture
-    };
+    return _objectSpread(_objectSpread({}, snapshot), capture);
   }
 
   // Initialize newly attached pages and iframes with page options