rebrowser-playwright-core 1.47.2 → 1.48.2

package/lib/utils/happy-eyeballs.js

@@ -7,6 +7,7 @@ exports.createConnectionAsync = createConnectionAsync;
 exports.createSocket = createSocket;
 exports.createTLSSocket = createTLSSocket;
 exports.httpsHappyEyeballsAgent = exports.httpHappyEyeballsAgent = void 0;
+exports.timingForSocket = timingForSocket;
 var dns = _interopRequireWildcard(require("dns"));
 var http = _interopRequireWildcard(require("http"));
 var https = _interopRequireWildcard(require("https"));
@@ -14,6 +15,7 @@ var net = _interopRequireWildcard(require("net"));
 var tls = _interopRequireWildcard(require("tls"));
 var _manualPromise = require("./manualPromise");
 var _debug = require("./debug");
+var _time = require("./time");
 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; }
 /**
@@ -37,6 +39,8 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 
 // Same as in Chromium (https://source.chromium.org/chromium/chromium/src/+/5666ff4f5077a7e2f72902f3a95f5d553ea0d88d:net/socket/transport_connect_job.cc;l=102)
 const connectionAttemptDelayMs = 300;
+const kDNSLookupAt = Symbol('kDNSLookupAt');
+const kTCPConnectionAt = Symbol('kTCPConnectionAt');
 class HttpHappyEyeballsAgent extends http.Agent {
   createConnection(options, oncreate) {
     // There is no ambiguity in case of IP address.
@@ -101,6 +105,7 @@ async function createConnectionAsync(options, oncreate, useTLS) {
   const lookup = options.__testHookLookup || lookupAddresses;
   const hostname = clientRequestArgsToHostName(options);
   const addresses = await lookup(hostname);
+  const dnsLookupAt = (0, _time.monotonicTime)();
   const sockets = new Set();
   let firstError;
   let errorCount = 0;
@@ -125,10 +130,12 @@ async function createConnectionAsync(options, oncreate, useTLS) {
       port: options.port,
       host: address
     });
+    socket[kDNSLookupAt] = dnsLookupAt;
 
     // Each socket may fire only one of 'connect', 'timeout' or 'error' events.
     // None of these events are fired after socket.destroy() is called.
     socket.on('connect', () => {
+      socket[kTCPConnectionAt] = (0, _time.monotonicTime)();
       connected.resolve();
       oncreate === null || oncreate === void 0 || oncreate(null, socket);
       // TODO: Cache the result?
@@ -178,4 +185,10 @@ function clientRequestArgsToHostName(options) {
   if (options.hostname) return options.hostname;
   if (options.host) return options.host;
   throw new Error('Either options.hostname or options.host must be provided');
+}
+function timingForSocket(socket) {
+  return {
+    dnsLookupAt: socket[kDNSLookupAt],
+    tcpConnectionAt: socket[kTCPConnectionAt]
+  };
 }

package/lib/utils/hostPlatform.js

@@ -37,9 +37,9 @@ function calculatePlatform() {
       macVersion = 'mac10.15';
     } else {
       // ver[0] >= 20
-      const LAST_STABLE_MAC_MAJOR_VERSION = 14;
+      const LAST_STABLE_MACOS_MAJOR_VERSION = 15;
       // Best-effort support for MacOS beta versions.
-      macVersion = 'mac' + Math.min(ver[0] - 9, LAST_STABLE_MAC_MAJOR_VERSION);
+      macVersion = 'mac' + Math.min(ver[0] - 9, LAST_STABLE_MACOS_MAJOR_VERSION);
       // BigSur is the first version that might run on Apple Silicon.
       if (_os.default.cpus().some(cpu => cpu.model.includes('Apple'))) macVersion += '-arm64';
     }

package/lib/utils/httpServer.js

@@ -76,6 +76,7 @@ class HttpServer {
       path: '/' + this._wsGuid
     });
     wss.on('connection', ws => {
+      transport.onconnect();
       transport.sendEvent = (method, params) => ws.send(JSON.stringify({
         method,
         params

package/lib/utils/isomorphic/locatorGenerators.js

@@ -37,15 +37,6 @@ function asLocators(lang, selector, isFrameLocator = false, maxOutputSize = 20,
 }
 function innerAsLocators(factory, parsed, isFrameLocator = false, maxOutputSize = 20) {
   const parts = [...parsed.parts];
-  // frameLocator('iframe').first is actually "iframe >> nth=0 >> internal:control=enter-frame"
-  // To make it easier to parse, we turn it into "iframe >> internal:control=enter-frame >> nth=0"
-  for (let index = 0; index < parts.length - 1; index++) {
-    if (parts[index].name === 'nth' && parts[index + 1].name === 'internal:control' && parts[index + 1].body === 'enter-frame') {
-      // Swap nth and enter-frame.
-      const [nth] = parts.splice(index, 1);
-      parts.splice(index + 1, 0, nth);
-    }
-  }
   const tokens = [];
   let nextBase = isFrameLocator ? 'frame-locator' : 'page';
   for (let index = 0; index < parts.length; index++) {
@@ -183,13 +174,13 @@ function innerAsLocators(factory, parsed, isFrameLocator = false, maxOutputSize
         continue;
       }
     }
-    let locatorType = 'default';
-    const nextPart = parts[index + 1];
-    if (nextPart && nextPart.name === 'internal:control' && nextPart.body === 'enter-frame') {
-      locatorType = 'frame';
+    if (part.name === 'internal:control' && part.body === 'enter-frame') {
+      tokens.push([factory.generateLocator(base, 'frame', '')]);
       nextBase = 'frame-locator';
-      index++;
+      continue;
     }
+    let locatorType = 'default';
+    const nextPart = parts[index + 1];
     const selectorPart = (0, _selectorParser.stringifySelector)({
       parts: [part]
     });
@@ -277,7 +268,7 @@ class JavaScriptLocatorFactory {
         if (options.hasNotText !== undefined) return `locator(${this.quote(body)}, { hasNotText: ${this.toHasText(options.hasNotText)} })`;
         return `locator(${this.quote(body)})`;
       case 'frame':
-        return `frameLocator(${this.quote(body)})`;
+        return `contentFrame()`;
       case 'nth':
         return `nth(${body})`;
       case 'first':
@@ -360,7 +351,7 @@ class PythonLocatorFactory {
         if (options.hasNotText !== undefined) return `locator(${this.quote(body)}, has_not_text=${this.toHasText(options.hasNotText)})`;
         return `locator(${this.quote(body)})`;
       case 'frame':
-        return `frame_locator(${this.quote(body)})`;
+        return `content_frame`;
       case 'nth':
         return `nth(${body})`;
       case 'first':
@@ -460,7 +451,7 @@ class JavaLocatorFactory {
         if (options.hasNotText !== undefined) return `locator(${this.quote(body)}, new ${clazz}.LocatorOptions().setHasNotText(${this.toHasText(options.hasNotText)}))`;
         return `locator(${this.quote(body)})`;
       case 'frame':
-        return `frameLocator(${this.quote(body)})`;
+        return `contentFrame()`;
       case 'nth':
         return `nth(${body})`;
       case 'first':
@@ -544,7 +535,7 @@ class CSharpLocatorFactory {
         if (options.hasNotText !== undefined) return `Locator(${this.quote(body)}, new() { ${this.toHasNotText(options.hasNotText)} })`;
         return `Locator(${this.quote(body)})`;
       case 'frame':
-        return `FrameLocator(${this.quote(body)})`;
+        return `ContentFrame`;
       case 'nth':
         return `Nth(${body})`;
       case 'first':

package/lib/utils/isomorphic/locatorParser.js

@@ -63,7 +63,7 @@ function parseLocator(locator, testIdAttributeName) {
   }
 
   // Equalize languages.
-  template = template.toLowerCase().replace(/get_by_alt_text/g, 'getbyalttext').replace(/get_by_test_id/g, 'getbytestid').replace(/get_by_([\w]+)/g, 'getby$1').replace(/has_not_text/g, 'hasnottext').replace(/has_text/g, 'hastext').replace(/has_not/g, 'hasnot').replace(/frame_locator/g, 'framelocator').replace(/[{}\s]/g, '').replace(/new\(\)/g, '').replace(/new[\w]+\.[\w]+options\(\)/g, '').replace(/\.set/g, ',set').replace(/\.or_\(/g, 'or(') // Python has "or_" instead of "or".
+  template = template.toLowerCase().replace(/get_by_alt_text/g, 'getbyalttext').replace(/get_by_test_id/g, 'getbytestid').replace(/get_by_([\w]+)/g, 'getby$1').replace(/has_not_text/g, 'hasnottext').replace(/has_text/g, 'hastext').replace(/has_not/g, 'hasnot').replace(/frame_locator/g, 'framelocator').replace(/content_frame/g, 'contentframe').replace(/[{}\s]/g, '').replace(/new\(\)/g, '').replace(/new[\w]+\.[\w]+options\(\)/g, '').replace(/\.set/g, ',set').replace(/\.or_\(/g, 'or(') // Python has "or_" instead of "or".
   .replace(/\.and_\(/g, 'and(') // Python has "and_" instead of "and".
   .replace(/:/g, '=').replace(/,re\.ignorecase/g, 'i').replace(/,pattern.case_insensitive/g, 'i').replace(/,regexoptions.ignorecase/g, 'i').replace(/re.compile\(([^)]+)\)/g, '$1') // Python has regex strings as r"foo"
   .replace(/pattern.compile\(([^)]+)\)/g, 'r$1').replace(/newregex\(([^)]+)\)/g, 'r$1').replace(/string=/g, '=').replace(/regex=/g, '=').replace(/,,/g, ',');
@@ -123,7 +123,7 @@ function transform(template, params, testIdAttributeName) {
   }
 
   // Transform to selector engines.
-  template = template.replace(/\,set([\w]+)\(([^)]+)\)/g, (_, group1, group2) => ',' + group1.toLowerCase() + '=' + group2.toLowerCase()).replace(/framelocator\(([^)]+)\)/g, '$1.internal:control=enter-frame').replace(/locator\(([^)]+),hastext=([^),]+)\)/g, 'locator($1).internal:has-text=$2').replace(/locator\(([^)]+),hasnottext=([^),]+)\)/g, 'locator($1).internal:has-not-text=$2').replace(/locator\(([^)]+),hastext=([^),]+)\)/g, 'locator($1).internal:has-text=$2').replace(/locator\(([^)]+)\)/g, '$1').replace(/getbyrole\(([^)]+)\)/g, 'internal:role=$1').replace(/getbytext\(([^)]+)\)/g, 'internal:text=$1').replace(/getbylabel\(([^)]+)\)/g, 'internal:label=$1').replace(/getbytestid\(([^)]+)\)/g, `internal:testid=[${testIdAttributeName}=$1]`).replace(/getby(placeholder|alt|title)(?:text)?\(([^)]+)\)/g, 'internal:attr=[$1=$2]').replace(/first(\(\))?/g, 'nth=0').replace(/last(\(\))?/g, 'nth=-1').replace(/nth\(([^)]+)\)/g, 'nth=$1').replace(/filter\(,?hastext=([^)]+)\)/g, 'internal:has-text=$1').replace(/filter\(,?hasnottext=([^)]+)\)/g, 'internal:has-not-text=$1').replace(/filter\(,?has2=([^)]+)\)/g, 'internal:has=$1').replace(/filter\(,?hasnot2=([^)]+)\)/g, 'internal:has-not=$1').replace(/,exact=false/g, '').replace(/,exact=true/g, 's').replace(/\,/g, '][');
+  template = template.replace(/\,set([\w]+)\(([^)]+)\)/g, (_, group1, group2) => ',' + group1.toLowerCase() + '=' + group2.toLowerCase()).replace(/framelocator\(([^)]+)\)/g, '$1.internal:control=enter-frame').replace(/contentframe(\(\))?/g, 'internal:control=enter-frame').replace(/locator\(([^)]+),hastext=([^),]+)\)/g, 'locator($1).internal:has-text=$2').replace(/locator\(([^)]+),hasnottext=([^),]+)\)/g, 'locator($1).internal:has-not-text=$2').replace(/locator\(([^)]+),hastext=([^),]+)\)/g, 'locator($1).internal:has-text=$2').replace(/locator\(([^)]+)\)/g, '$1').replace(/getbyrole\(([^)]+)\)/g, 'internal:role=$1').replace(/getbytext\(([^)]+)\)/g, 'internal:text=$1').replace(/getbylabel\(([^)]+)\)/g, 'internal:label=$1').replace(/getbytestid\(([^)]+)\)/g, `internal:testid=[${testIdAttributeName}=$1]`).replace(/getby(placeholder|alt|title)(?:text)?\(([^)]+)\)/g, 'internal:attr=[$1=$2]').replace(/first(\(\))?/g, 'nth=0').replace(/last(\(\))?/g, 'nth=-1').replace(/nth\(([^)]+)\)/g, 'nth=$1').replace(/filter\(,?hastext=([^)]+)\)/g, 'internal:has-text=$1').replace(/filter\(,?hasnottext=([^)]+)\)/g, 'internal:has-not-text=$1').replace(/filter\(,?has2=([^)]+)\)/g, 'internal:has=$1').replace(/filter\(,?hasnot2=([^)]+)\)/g, 'internal:has-not=$1').replace(/,exact=false/g, '').replace(/,exact=true/g, 's').replace(/\,/g, '][');
   const parts = template.split('.');
   // Turn "internal:control=enter-frame >> nth=0" into "nth=0 >> internal:control=enter-frame"
   // because these are swapped in locators vs selectors.

package/lib/utils/isomorphic/recorderUtils.js

@@ -0,0 +1,195 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildFullSelector = buildFullSelector;
+exports.toKeyboardModifiers = toKeyboardModifiers;
+exports.traceParamsForAction = traceParamsForAction;
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+function buildFullSelector(framePath, selector) {
+  return [...framePath, selector].join(' >> internal:control=enter-frame >> ');
+}
+function traceParamsForAction(actionInContext) {
+  const {
+    action
+  } = actionInContext;
+  switch (action.name) {
+    case 'navigate':
+      {
+        const params = {
+          url: action.url
+        };
+        return {
+          method: 'goto',
+          params
+        };
+      }
+    case 'openPage':
+    case 'closePage':
+      throw new Error('Not reached');
+  }
+  const selector = buildFullSelector(actionInContext.frame.framePath, action.selector);
+  switch (action.name) {
+    case 'click':
+      {
+        const params = {
+          selector,
+          strict: true,
+          modifiers: toKeyboardModifiers(action.modifiers),
+          button: action.button,
+          clickCount: action.clickCount,
+          position: action.position
+        };
+        return {
+          method: 'click',
+          params
+        };
+      }
+    case 'press':
+      {
+        const params = {
+          selector,
+          strict: true,
+          key: [...toKeyboardModifiers(action.modifiers), action.key].join('+')
+        };
+        return {
+          method: 'press',
+          params
+        };
+      }
+    case 'fill':
+      {
+        const params = {
+          selector,
+          strict: true,
+          value: action.text
+        };
+        return {
+          method: 'fill',
+          params
+        };
+      }
+    case 'setInputFiles':
+      {
+        const params = {
+          selector,
+          strict: true,
+          localPaths: action.files
+        };
+        return {
+          method: 'setInputFiles',
+          params
+        };
+      }
+    case 'check':
+      {
+        const params = {
+          selector,
+          strict: true
+        };
+        return {
+          method: 'check',
+          params
+        };
+      }
+    case 'uncheck':
+      {
+        const params = {
+          selector,
+          strict: true
+        };
+        return {
+          method: 'uncheck',
+          params
+        };
+      }
+    case 'select':
+      {
+        const params = {
+          selector,
+          strict: true,
+          options: action.options.map(option => ({
+            value: option
+          }))
+        };
+        return {
+          method: 'selectOption',
+          params
+        };
+      }
+    case 'assertChecked':
+      {
+        const params = {
+          selector: action.selector,
+          expression: 'to.be.checked',
+          isNot: !action.checked
+        };
+        return {
+          method: 'expect',
+          params
+        };
+      }
+    case 'assertText':
+      {
+        const params = {
+          selector,
+          expression: 'to.have.text',
+          expectedText: [],
+          isNot: false
+        };
+        return {
+          method: 'expect',
+          params
+        };
+      }
+    case 'assertValue':
+      {
+        const params = {
+          selector,
+          expression: 'to.have.value',
+          expectedValue: undefined,
+          isNot: false
+        };
+        return {
+          method: 'expect',
+          params
+        };
+      }
+    case 'assertVisible':
+      {
+        const params = {
+          selector,
+          expression: 'to.be.visible',
+          isNot: false
+        };
+        return {
+          method: 'expect',
+          params
+        };
+      }
+  }
+}
+function toKeyboardModifiers(modifiers) {
+  const result = [];
+  if (modifiers & 1) result.push('Alt');
+  if (modifiers & 2) result.push('ControlOrMeta');
+  if (modifiers & 4) result.push('ControlOrMeta');
+  if (modifiers & 8) result.push('Shift');
+  return result;
+}