patchright-core 1.50.0 → 1.51.0

package/lib/cli/driver.js

@@ -9,13 +9,13 @@ exports.runDriver = runDriver;
 exports.runServer = runServer;
 var _fs = _interopRequireDefault(require("fs"));
 var playwright = _interopRequireWildcard(require("../.."));
-var _server = require("../server");
-var _transport = require("../protocol/transport");
+var _pipeTransport = require("../server/utils/pipeTransport");
 var _playwrightServer = require("../remote/playwrightServer");
-var _processLauncher = require("../utils/processLauncher");
+var _server = require("../server");
+var _processLauncher = require("../server/utils/processLauncher");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -48,7 +48,7 @@ function runDriver() {
     });
     return new _server.PlaywrightDispatcher(rootScope, playwright);
   });
-  const transport = new _transport.PipeTransport(process.stdout, process.stdin);
+  const transport = new _pipeTransport.PipeTransport(process.stdout, process.stdin);
   transport.onmessage = message => dispatcherConnection.dispatch(JSON.parse(message));
   // Certain Language Binding JSON parsers (e.g. .NET) do not like strings with lone surrogates.
   const isJavaScriptLanguageBinding = !process.env.PW_LANG_NAME || process.env.PW_LANG_NAME === 'javascript';

package/lib/cli/program.js

@@ -12,16 +12,16 @@ Object.defineProperty(exports, "program", {
 var _fs = _interopRequireDefault(require("fs"));
 var _os = _interopRequireDefault(require("os"));
 var _path = _interopRequireDefault(require("path"));
-var _utilsBundle = require("../utilsBundle");
-var _driver = require("./driver");
-var _traceViewer = require("../server/trace/viewer/traceViewer");
 var playwright = _interopRequireWildcard(require("../.."));
-var _utils = require("../utils");
+var _driver = require("./driver");
 var _server = require("../server");
-var _errors = require("../client/errors");
+var _utils = require("../utils");
+var _traceViewer = require("../server/trace/viewer/traceViewer");
+var _ascii = require("../server/utils/ascii");
+var _utilsBundle = require("../utilsBundle");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -97,7 +97,7 @@ _utilsBundle.program.command('install [browser...]').description('ensure browser
   // For '--no-shell' option, commander sets `shell: false` instead.
   if (options.shell === false) options.noShell = true;
   if ((0, _utils.isLikelyNpxGlobal)()) {
-    console.error((0, _utils.wrapInASCIIBox)([`WARNING: It looks like you are running 'npx playwright install' without first`, `installing your project's dependencies.`, ``, `To avoid unexpected behavior, please install your dependencies first, and`, `then run Playwright's install command:`, ``, `    npm install`, `    npx playwright install`, ``, `If your project does not yet depend on Playwright, first install the`, `applicable npm package (most commonly @playwright/test), and`, `then run Playwright's install command to download the browsers:`, ``, `    npm install @playwright/test`, `    npx playwright install`, ``].join('\n'), 1));
+    console.error((0, _ascii.wrapInASCIIBox)([`WARNING: It looks like you are running 'npx playwright install' without first`, `installing your project's dependencies.`, ``, `To avoid unexpected behavior, please install your dependencies first, and`, `then run Playwright's install command:`, ``, `    npm install`, `    npx playwright install`, ``, `If your project does not yet depend on Playwright, first install the`, `applicable npm package (most commonly @playwright/test), and`, `then run Playwright's install command to download the browsers:`, ``, `    npm install @playwright/test`, `    npx playwright install`, ``].join('\n'), 1));
   }
   try {
     const hasNoArguments = !args.length;
@@ -408,7 +408,7 @@ async function openPage(context, url) {
   if (url) {
     if (_fs.default.existsSync(url)) url = 'file://' + _path.default.resolve(url);else if (!url.startsWith('http') && !url.startsWith('file://') && !url.startsWith('about:') && !url.startsWith('data:')) url = 'http://' + url;
     await page.goto(url).catch(error => {
-      if (process.env.PWTEST_CLI_AUTO_EXIT_WHEN && (0, _errors.isTargetClosedError)(error)) {
+      if (process.env.PWTEST_CLI_AUTO_EXIT_WHEN) {
         // Tests with PWTEST_CLI_AUTO_EXIT_WHEN might close page too fast, resulting
         // in a stray navigation aborted error. We should ignore it.
       } else {

package/lib/cli/programWithTestStub.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "program", {
     return _program.program;
   }
 });
+var _processLauncher = require("../server/utils/processLauncher");
 var _utils = require("../utils");
 var _program = require("./program");
 /**
@@ -60,7 +61,7 @@ function addExternalPlaywrightTestCommands() {
     playwrightTest.description(`${description} Available in @playwright/test package.`);
     playwrightTest.action(async () => {
       printPlaywrightTestError(command);
-      (0, _utils.gracefullyProcessExitDoNotHang)(1);
+      (0, _processLauncher.gracefullyProcessExitDoNotHang)(1);
     });
   }
 }

package/lib/client/android.js

@@ -4,18 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AndroidWebView = exports.AndroidSocket = exports.AndroidInput = exports.AndroidDevice = exports.Android = void 0;
-var _fs = _interopRequireDefault(require("fs"));
-var _utils = require("../utils");
-var _events = require("./events");
+var _eventEmitter = require("./eventEmitter");
 var _browserContext = require("./browserContext");
 var _channelOwner = require("./channelOwner");
-var _timeoutSettings = require("../common/timeoutSettings");
-var _waiter = require("./waiter");
-var _events2 = require("events");
-var _connection = require("./connection");
 var _errors = require("./errors");
-var _timeoutRunner = require("../utils/timeoutRunner");
-let _Symbol$asyncDispose;
+var _events = require("./events");
+var _waiter = require("./waiter");
+var _timeoutSettings = require("./timeoutSettings");
+var _rtti = require("../utils/isomorphic/rtti");
+var _time = require("../utils/isomorphic/time");
+var _timeoutRunner = require("../utils/isomorphic/timeoutRunner");
+var _webSocket = require("./webSocket");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -31,7 +30,7 @@ let _Symbol$asyncDispose;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 class Android extends _channelOwner.ChannelOwner {
   static from(android) {
     return android._object;
@@ -40,13 +39,15 @@ class Android extends _channelOwner.ChannelOwner {
     super(parent, type, guid, initializer);
     this._timeoutSettings = void 0;
     this._serverLauncher = void 0;
-    this._timeoutSettings = new _timeoutSettings.TimeoutSettings();
+    this._timeoutSettings = new _timeoutSettings.TimeoutSettings(this._platform);
   }
   setDefaultTimeout(timeout) {
     this._timeoutSettings.setDefaultTimeout(timeout);
-    this._channel.setDefaultTimeoutNoReply({
-      timeout
-    });
+    this._wrapApiCall(async () => {
+      await this._channel.setDefaultTimeoutNoReply({
+        timeout
+      });
+    }, true).catch(() => {});
   }
   async devices(options = {}) {
     const {
@@ -60,68 +61,44 @@ class Android extends _channelOwner.ChannelOwner {
   }
   async connect(wsEndpoint, options = {}) {
     return await this._wrapApiCall(async () => {
-      const deadline = options.timeout ? (0, _utils.monotonicTime)() + options.timeout : 0;
+      const deadline = options.timeout ? (0, _time.monotonicTime)() + options.timeout : 0;
       const headers = {
         'x-playwright-browser': 'android',
         ...options.headers
       };
-      const localUtils = this._connection.localUtils();
       const connectParams = {
         wsEndpoint,
         headers,
         slowMo: options.slowMo,
         timeout: options.timeout
       };
-      const {
-        pipe
-      } = await localUtils._channel.connect(connectParams);
-      const closePipe = () => pipe.close().catch(() => {});
-      const connection = new _connection.Connection(localUtils, this._instrumentation);
-      connection.markAsRemote();
-      connection.on('close', closePipe);
+      const connection = await (0, _webSocket.connectOverWebSocket)(this._connection, connectParams);
       let device;
-      let closeError;
-      const onPipeClosed = () => {
+      connection.on('close', () => {
         var _device;
         (_device = device) === null || _device === void 0 || _device._didClose();
-        connection.close(closeError);
-      };
-      pipe.on('closed', onPipeClosed);
-      connection.onmessage = message => pipe.send({
-        message
-      }).catch(onPipeClosed);
-      pipe.on('message', ({
-        message
-      }) => {
-        try {
-          connection.dispatch(message);
-        } catch (e) {
-          closeError = String(e);
-          closePipe();
-        }
       });
       const result = await (0, _timeoutRunner.raceAgainstDeadline)(async () => {
         const playwright = await connection.initializePlaywright();
         if (!playwright._initializer.preConnectedAndroidDevice) {
-          closePipe();
+          connection.close();
           throw new Error('Malformed endpoint. Did you use Android.launchServer method?');
         }
         device = AndroidDevice.from(playwright._initializer.preConnectedAndroidDevice);
         device._shouldCloseConnectionOnClose = true;
-        device.on(_events.Events.AndroidDevice.Close, closePipe);
+        device.on(_events.Events.AndroidDevice.Close, () => connection.close());
         return device;
       }, deadline);
       if (!result.timedOut) {
         return result.result;
       } else {
-        closePipe();
+        connection.close();
         throw new Error(`Timeout ${options.timeout}ms exceeded`);
       }
     });
   }
 }
 exports.Android = Android;
-_Symbol$asyncDispose = Symbol.asyncDispose;
 class AndroidDevice extends _channelOwner.ChannelOwner {
   static from(androidDevice) {
     return androidDevice._object;
@@ -133,7 +110,7 @@ class AndroidDevice extends _channelOwner.ChannelOwner {
     this._shouldCloseConnectionOnClose = false;
     this.input = void 0;
     this.input = new AndroidInput(this);
-    this._timeoutSettings = new _timeoutSettings.TimeoutSettings(parent._timeoutSettings);
+    this._timeoutSettings = new _timeoutSettings.TimeoutSettings(this._platform, parent._timeoutSettings);
     this._channel.on('webViewAdded', ({
       webView
     }) => this._onWebViewAdded(webView));
@@ -154,9 +131,11 @@ class AndroidDevice extends _channelOwner.ChannelOwner {
   }
   setDefaultTimeout(timeout) {
     this._timeoutSettings.setDefaultTimeout(timeout);
-    this._channel.setDefaultTimeoutNoReply({
-      timeout
-    });
+    this._wrapApiCall(async () => {
+      await this._channel.setDefaultTimeoutNoReply({
+        timeout
+      });
+    }, true).catch(() => {});
   }
   serial() {
     return this._initializer.serial;
@@ -262,10 +241,10 @@ class AndroidDevice extends _channelOwner.ChannelOwner {
     const {
       binary
     } = await this._channel.screenshot();
-    if (options.path) await _fs.default.promises.writeFile(options.path, binary);
+    if (options.path) await this._platform.fs().promises.writeFile(options.path, binary);
     return binary;
   }
-  async [_Symbol$asyncDispose]() {
+  async [Symbol.asyncDispose]() {
     await this.close();
   }
   async close() {
@@ -294,19 +273,19 @@ class AndroidDevice extends _channelOwner.ChannelOwner {
   }
   async installApk(file, options) {
     await this._channel.installApk({
-      file: await loadFile(file),
+      file: await loadFile(this._platform, file),
       args: options && options.args
     });
   }
   async push(file, path, options) {
     await this._channel.push({
-      file: await loadFile(file),
+      file: await loadFile(this._platform, file),
       path,
       mode: options ? options.mode : undefined
     });
   }
   async launchBrowser(options = {}) {
-    const contextOptions = await (0, _browserContext.prepareBrowserContextParams)(options);
+    const contextOptions = await (0, _browserContext.prepareBrowserContextParams)(this._platform, options);
     const result = await this._channel.launchBrowser(contextOptions);
     const context = _browserContext.BrowserContext.from(result.context);
     context._setOptions(contextOptions, {});
@@ -350,8 +329,8 @@ class AndroidSocket extends _channelOwner.ChannelOwner {
   }
 }
 exports.AndroidSocket = AndroidSocket;
-async function loadFile(file) {
-  if ((0, _utils.isString)(file)) return await _fs.default.promises.readFile(file);
+async function loadFile(platform, file) {
+  if ((0, _rtti.isString)(file)) return await platform.fs().promises.readFile(file);
   return file;
 }
 class AndroidInput {
@@ -411,7 +390,7 @@ function toSelectorChannel(selector) {
   } = selector;
   const toRegex = value => {
     if (value === undefined) return undefined;
-    if ((0, _utils.isRegExp)(value)) return value.source;
+    if ((0, _rtti.isRegExp)(value)) return value.source;
     return '^' + value.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&').replace(/-/g, '\\x2d') + '$';
   };
   return {
@@ -439,9 +418,9 @@ function toSelectorChannel(selector) {
     selected
   };
 }
-class AndroidWebView extends _events2.EventEmitter {
+class AndroidWebView extends _eventEmitter.EventEmitter {
   constructor(device, data) {
-    super();
+    super(device._platform);
     this._device = void 0;
     this._data = void 0;
     this._pagePromise = void 0;

package/lib/client/artifact.js

@@ -4,12 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Artifact = void 0;
-var fs = _interopRequireWildcard(require("fs"));
-var _stream = require("./stream");
-var _fileUtils = require("../utils/fileUtils");
 var _channelOwner = require("./channelOwner");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var _stream = require("./stream");
+var _fileUtils = require("./fileUtils");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -43,9 +40,9 @@ class Artifact extends _channelOwner.ChannelOwner {
     }
     const result = await this._channel.saveAsStream();
     const stream = _stream.Stream.from(result.stream);
-    await (0, _fileUtils.mkdirIfNeeded)(path);
+    await (0, _fileUtils.mkdirIfNeeded)(this._platform, path);
     await new Promise((resolve, reject) => {
-      stream.stream().pipe(fs.createWriteStream(path)).on('finish', resolve).on('error', reject);
+      stream.stream().pipe(this._platform.fs().createWriteStream(path)).on('finish', resolve).on('error', reject);
     });
   }
   async failure() {

package/lib/client/browser.js

@@ -4,15 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Browser = void 0;
-var _fs = _interopRequireDefault(require("fs"));
+var _artifact = require("./artifact");
 var _browserContext = require("./browserContext");
+var _cdpSession = require("./cdpSession");
 var _channelOwner = require("./channelOwner");
-var _events = require("./events");
 var _errors = require("./errors");
-var _cdpSession = require("./cdpSession");
-var _artifact = require("./artifact");
-var _utils = require("../utils");
-let _Symbol$asyncDispose;
+var _events = require("./events");
+var _fileUtils = require("./fileUtils");
 /**
  * Copyright (c) Microsoft Corporation.
  *
@@ -28,8 +26,7 @@ let _Symbol$asyncDispose;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-_Symbol$asyncDispose = Symbol.asyncDispose;
+
 class Browser extends _channelOwner.ChannelOwner {
   static from(browser) {
     return browser._object;
@@ -44,8 +41,6 @@ class Browser extends _channelOwner.ChannelOwner {
     this._options = {};
     this._name = void 0;
     this._path = void 0;
-    // Used from @playwright/test fixtures.
-    this._connectHeaders = void 0;
     this._closeReason = void 0;
     this._name = initializer.name;
     this._channel.on('close', () => this._didClose());
@@ -76,10 +71,10 @@ class Browser extends _channelOwner.ChannelOwner {
   }
   async _innerNewContext(options = {}, forReuse) {
     options = {
-      ...this._browserType._defaultContextOptions,
+      ...this._browserType._playwright._defaultContextOptions,
       ...options
     };
-    const contextOptions = await (0, _browserContext.prepareBrowserContextParams)(options);
+    const contextOptions = await (0, _browserContext.prepareBrowserContextParams)(this._platform, options);
     const response = forReuse ? await this._channel.newContextForReuse(contextOptions) : await this._channel.newContext(contextOptions);
     const context = _browserContext.BrowserContext.from(response.context);
     await this._browserType._didCreateContext(context, contextOptions, this._options, options.logger || this._logger);
@@ -118,13 +113,13 @@ class Browser extends _channelOwner.ChannelOwner {
     const buffer = await artifact.readIntoBuffer();
     await artifact.delete();
     if (this._path) {
-      await (0, _utils.mkdirIfNeeded)(this._path);
-      await _fs.default.promises.writeFile(this._path, buffer);
+      await (0, _fileUtils.mkdirIfNeeded)(this._platform, this._path);
+      await this._platform.fs().promises.writeFile(this._path, buffer);
       this._path = undefined;
     }
     return buffer;
   }
-  async [_Symbol$asyncDispose]() {
+  async [Symbol.asyncDispose]() {
     await this.close();
   }
   async close(options = {}) {