devops: set version 1.22.0, driver to 1.22.0 (#929 )

feat: roll beta driver, remove layout selectors (#926 )
feat: implement Locator.filter (#925 )
2026-05-23 11:13:15 +00:00 · 2022-05-13 15:31:22 -07:00 · 2022-05-13 00:49:59 -07:00 · 2022-05-12 09:39:10 -07:00 · 2022-05-11 09:20:51 -07:00 · 2022-05-10 10:43:30 -07:00
155 changed files with 7583 additions and 1935 deletions
@@ -1,6 +1,7 @@
 name: Publish
 on:
-  workflow_dispatch:
+  release:
+    types: [published]
  push:
    branches:
      - main
@@ -17,10 +17,9 @@ jobs:
        username: playwright
        password: ${{ secrets.DOCKER_PASSWORD }}
    - uses: actions/checkout@v2
-    - name: Build Docker image
-      run: docker build -t playwright-java:localbuild-focal -f Dockerfile.focal .
-    - name: tag & publish
-      run: |
-        ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:next
-        ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:next-focal
-        ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:sha-${{ github.sha }}
+    - name: Set up Docker QEMU for arm64 docker builds
+      uses: docker/setup-qemu-action@v1
+      with:
+        platforms: arm64
+    - name: publish docker canary
+      run: ./utils/docker/publish_docker.sh canary
@@ -3,6 +3,11 @@ on:
  release:
    types: [published]
  workflow_dispatch:
+    inputs:
+      is_release:
+        required: true
+        type: boolean
+        description: "Is this a release image?"
    branches:
      - release-*
 jobs:
@@ -17,20 +22,12 @@ jobs:
        login-server: playwright.azurecr.io
        username: playwright
        password: ${{ secrets.DOCKER_PASSWORD }}
+    - name: Set up Docker QEMU for arm64 docker builds
+      uses: docker/setup-qemu-action@v1
+      with:
+        platforms: arm64
    - uses: actions/checkout@v2
-    - name: Build Docker image
-      run: docker build -t playwright-java:localbuild-focal -f Dockerfile.focal .
-    - name: tag & publish
-      run: |
-        # GITHUB_REF has a form of `refs/tags/v1.3.0`.
-        # TAG_NAME would be `v1.3.0`
-        TAG_NAME=${GITHUB_REF#refs/tags/}
-        if [[ ! "$TAG_NAME" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]];
-        then
-          echo "Wrong TAG_NAME format: $TAG_NAME"
-          exit 1
-        fi
-        ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:latest
-        ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:focal
-        ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:${TAG_NAME}
-        ./scripts/tag_image_and_push.sh playwright-java:localbuild-focal playwright.azurecr.io/public/playwright/java:${TAG_NAME}-focal
+    - run: ./utils/docker/publish_docker.sh stable
+      if: (github.event_name != 'workflow_dispatch' && !github.event.release.prerelease) || (github.event_name == 'workflow_dispatch' && github.event.inputs.is_release == 'true')
+    - run: ./utils/docker/publish_docker.sh canary
+      if: (github.event_name != 'workflow_dispatch' && github.event.release.prerelease) || (github.event_name == 'workflow_dispatch' && github.event.inputs.is_release != 'true')
@@ -19,24 +19,28 @@ jobs:
    runs-on: ${{ matrix.os }}
    steps:
    - uses: actions/checkout@v2
-    - uses: microsoft/playwright-github-action@v1.5.0
+    - uses: microsoft/playwright-github-action@v1
    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
      with:
-        java-version: 1.8
-    - name: Cache Maven packages
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+        distribution: zulu
+        java-version: 8
    - name: Download drivers
      shell: bash
      run: scripts/download_driver_for_all_platforms.sh
-    - name: Build with Maven
-      run: mvn -B package -D skipTests --no-transfer-progress
+    - name: Build & Install
+      run: mvn -B install -D skipTests --no-transfer-progress
    - name: Run tests
-      run: mvn test --no-transfer-progress --fail-at-end
+      run: mvn test -DexcludedGroups=isolated --no-transfer-progress --fail-at-end
+      env:
+        BROWSER: ${{ matrix.browser }}
+    - name: Run tracing tests w/ sources
+      run: mvn test -DexcludedGroups=isolated --no-transfer-progress --fail-at-end -D test=*TestTracing*
+      env:
+        BROWSER: ${{ matrix.browser }}
+        PLAYWRIGHT_JAVA_SRC: src/test/java
+    - name: Run driver throw tests
+      run: mvn test -Dgroups=driverThrowTest --no-transfer-progress --fail-at-end
      env:
        BROWSER: ${{ matrix.browser }}
    - name: Test Spring Boot Starter
@@ -44,7 +48,6 @@ jobs:
      env:
        BROWSER: ${{ matrix.browser }}
      run: |
-        mvn -B install -D skipTests --no-transfer-progress
        cd tools/test-spring-boot-starter
        mvn package -D skipTests --no-transfer-progress
        java -jar target/test-spring-boot*.jar
@@ -64,28 +67,61 @@ jobs:
    runs-on: ${{ matrix.os }}
    steps:
      - uses: actions/checkout@v2
-      - uses: microsoft/playwright-github-action@v1.5.0
+      - uses: microsoft/playwright-github-action@v1
      - name: Install Media Pack
        if: matrix.os == 'windows-latest'
        shell: powershell
        run: Install-WindowsFeature Server-Media-Foundation
      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
        with:
-          java-version: 1.8
-      - name: Cache Maven packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          distribution: zulu
+          java-version: 8
      - name: Download drivers
        shell: bash
        run: scripts/download_driver_for_all_platforms.sh
-      - name: Build with Maven
-        run: mvn -B package -D skipTests --no-transfer-progress
+      - name: Build & Install
+        run: mvn -B install -D skipTests --no-transfer-progress
      - name: Run tests
-        run: mvn test --no-transfer-progress --fail-at-end
+        run: mvn test -DexcludedGroups=isolated --no-transfer-progress --fail-at-end
        env:
          BROWSER: chromium
          BROWSER_CHANNEL: ${{ matrix.browser-channel }}
+      - name: Run driver throw tests
+        run: mvn test -Dgroups=driverThrowTest --no-transfer-progress --fail-at-end
+        env:
+          BROWSER: chromium
+          BROWSER_CHANNEL: ${{ matrix.browser-channel }}
+
+  Java_17:
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        browser: [chromium, firefox, webkit]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: microsoft/playwright-github-action@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          distribution: adopt
+          java-version: 17
+      - name: Download drivers
+        shell: bash
+        run: scripts/download_driver_for_all_platforms.sh
+      - name: Build & Install
+        run: mvn -B install -D skipTests --no-transfer-progress
+      - name: Run tests
+        run: mvn test --no-transfer-progress --fail-at-end
+        env:
+          BROWSER: ${{ matrix.browser }}
+      - name: Test Spring Boot Starter
+        shell: bash
+        env:
+          BROWSER: ${{ matrix.browser }}
+        run: |
+          cd tools/test-spring-boot-starter
+          mvn package -D skipTests --no-transfer-progress
+          java -jar target/test-spring-boot*.jar
@@ -26,3 +26,6 @@ jobs:
        run: mvn install -D skipTests --no-transfer-progress
      - name: Test CLI
        run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -f playwright/pom.xml  -D exec.args=-V
+      - name: Test CLI version
+        shell: bash
+        run: tools/test-cli-version/test.sh
@@ -3,14 +3,14 @@ on:
  push:
    paths:
      - '.github/workflows/test_docker.yml'
-      - 'Dockerfile*'
+      - '**/Dockerfile*'
    branches:
      - main
      - release-*
  pull_request:
    paths:
      - .github/workflows/test_docker.yml
-      - Dockerfile.*
+      - '**/Dockerfile*'
      - scripts/CLI_VERSION
      - '**/pom.xml'
    branches:
@@ -23,7 +23,7 @@ jobs:
    steps:
      - uses: actions/checkout@v2
      - name: Build Docker image
-        run: docker build -t playwright-java:localbuild-focal -f Dockerfile.focal .
+        run: bash utils/docker/build.sh --amd64 focal playwright-java:localbuild-focal
      - name: Test
        run: |
          CONTAINER_ID="$(docker run --rm --ipc=host -v $(pwd):/root/playwright --name playwright-docker-test -d -t playwright-java:localbuild-focal /bin/bash)"
@@ -0,0 +1,21 @@
+name: "Internal Tests"
+
+on:
+  push:
+    branches:
+      - main
+      - release-*
+
+jobs:
+  trigger:
+    name: "trigger"
+    runs-on: ubuntu-20.04
+    steps:
+    - run: |
+        curl -X POST \
+          -H "Accept: application/vnd.github.v3+json" \
+          -H "Authorization: token ${GH_TOKEN}" \
+          --data "{\"event_type\": \"playwright_tests_java\", \"client_payload\": {\"ref\": \"${GITHUB_SHA}\"}}" \
+          https://api.github.com/repos/microsoft/playwright-internal/dispatches
+      env:
+        GH_TOKEN: ${{ secrets.REPOSITORY_DISPATCH_PERSONAL_ACCESS_TOKEN }}
@@ -20,13 +20,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2
-      - uses: microsoft/playwright-github-action@v1.5.0
-      - name: Cache Maven packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+      - uses: microsoft/playwright-github-action@v1
      - name: Download drivers
        run: scripts/download_driver_for_all_platforms.sh
      - name: Regenerate APIs
@@ -8,7 +8,7 @@ Install git, Java JDK (version >= 8), Maven (tested with version 3.6.3), on Ubun
 just run the following command:

 ```sh
-sudo apt-get install git openjdk-11-jdk maven
+sudo apt-get install git openjdk-11-jdk maven unzip
 ```

 ### Getting the Code
@@ -49,6 +49,19 @@ Java interfaces for the current driver run the following commands:
 ./scripts/generate_api.sh
 ```

+#### Updating driver version
+
+Driver version is read from [scripts/CLI_VERSION](https://github.com/microsoft/playwright-java/blob/main/scripts/CLI_VERSION) and can be found in the upstream [GHA build](https://github.com/microsoft/playwright/actions/workflows/publish_canary.yml) logs. To update the driver to a particular version run the following commands:
+
+```bash
+cat > scripts/CLI_VERSION
+<paste new version>
+^D
+./scripts/download_driver_for_all_platforms.sh -f
+./scripts/generate_api.sh
+./scripts/update_readme.sh
+```
+
 ### Code Style

 - We try to follow [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html)
@@ -1,32 +0,0 @@
-FROM ubuntu:focal
-
-# === INSTALL JDK and Maven ===
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    openjdk-11-jdk maven
-
-ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
-
-# Install utilities required for downloading driver
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    curl unzip
-
-# === INSTALL playwright maven modules & browsers ===
-
-# Browsers will remain downloaded in `/ms-playwright`.
-# Note: make sure to set 777 to the registry so that any user can access
-# registry.
-ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
-
-RUN mkdir /ms-playwright && chmod -R 777 $PLAYWRIGHT_BROWSERS_PATH
-
-RUN mkdir /tmp/pw-java
-COPY . /tmp/pw-java
-RUN cd /tmp/pw-java && \
-    ./scripts/download_driver_for_all_platforms.sh && \
-    mvn install -D skipTests --no-transfer-progress && \
-    DEBIAN_FRONTEND=noninteractive mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
-                     -D exec.args="install-deps" -f playwright/pom.xml --no-transfer-progress && \
-    mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI \
-                     -D exec.args="install" -f playwright/pom.xml --no-transfer-progress && \
-    rm -rf /tmp/pw-java
@@ -11,9 +11,9 @@ Playwright is a Java library to automate [Chromium](https://www.chromium.org/Hom

 |          | Linux | macOS | Windows |
 |   :---   | :---: | :---: | :---:   |
-| Chromium <!-- GEN:chromium-version -->98.0.4695.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Chromium <!-- GEN:chromium-version -->102.0.5005.40<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | WebKit <!-- GEN:webkit-version -->15.4<!-- GEN:stop --> | ✅ | ✅ | ✅ |
-| Firefox <!-- GEN:firefox-version -->94.0.1<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Firefox <!-- GEN:firefox-version -->99.0.1<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |

 Headless execution is supported for all the browsers on all platforms. Check out [system requirements](https://playwright.dev/java/docs/next/intro/#system-requirements) for details.

@@ -43,7 +43,7 @@ To run Playwright simply add following dependency to your Maven project:
 <dependency>
  <groupId>com.microsoft.playwright</groupId>
  <artifactId>playwright</artifactId>
-  <version>1.16.0</version>
+  <version>1.17.0</version>
 </dependency>
 ```

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.microsoft.playwright</groupId>
-    <artifactId>parent-pom</artifactId>
-    <version>1.17.2</version>
-  </parent>
-
-  <artifactId>assertions</artifactId>
-  <name>Playwright - Assertions</name>
-  <description>
-    This module provides Playwright assertions that will wait until the expected condition is met.
-  </description>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <subpackages>com.microsoft.playwright.assertions</subpackages>
-          <excludePackageNames>com.microsoft.playwright.impl</excludePackageNames>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.opentest4j</groupId>
-      <artifactId>opentest4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.microsoft.playwright</groupId>
-      <artifactId>playwright</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.microsoft.playwright</groupId>
-      <artifactId>playwright</artifactId>
-      <version>${project.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>
@@ -6,7 +6,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.17.2</version>
+    <version>1.22.0</version>
  </parent>

  <artifactId>driver-bundle</artifactId>
@@ -28,15 +28,24 @@ public class DriverJar extends Driver {
  private static final String PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD";
  private final Path driverTempDir;

-  DriverJar() throws IOException, URISyntaxException, InterruptedException {
-    driverTempDir = Files.createTempDirectory("playwright-java-");
+  public DriverJar() throws IOException {
+    // Allow specifying custom path for the driver installation
+    // See https://github.com/microsoft/playwright-java/issues/728
+    String alternativeTmpdir = System.getProperty("playwright.driver.tmpdir");
+    String prefix = "playwright-java-";
+    driverTempDir = alternativeTmpdir == null
+      ? Files.createTempDirectory(prefix)
+      : Files.createTempDirectory(Paths.get(alternativeTmpdir), prefix);
    driverTempDir.toFile().deleteOnExit();
+    logMessage("created DriverJar: " + driverTempDir);
  }

  @Override
-  protected void initialize(Map<String, String> env) throws Exception {
+  protected void initialize(Map<String, String> env, Boolean installBrowsers) throws Exception {
    extractDriverToTempDir();
-    installBrowsers(env);
+    logMessage("extracted driver from jar to " + driverPath());
+    if (installBrowsers)
+      installBrowsers(env);
  }

  private void installBrowsers(Map<String, String> env) throws IOException, InterruptedException {
@@ -48,13 +57,13 @@ public class DriverJar extends Driver {
      System.out.println("Skipping browsers download because `PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD` env variable is set");
      return;
    }
-    String cliFileName = super.cliFileName();
-    Path driver = driverTempDir.resolve(cliFileName);
+    Path driver = driverPath();
    if (!Files.exists(driver)) {
-      throw new RuntimeException("Failed to find " + cliFileName + " at " + driver);
+      throw new RuntimeException("Failed to find driver: " + driver);
    }
    ProcessBuilder pb = new ProcessBuilder(driver.toString(), "install");
    pb.environment().putAll(env);
+    setRequiredEnvironmentVariables(pb);
    pb.redirectError(ProcessBuilder.Redirect.INHERIT);
    pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
    Process p = pb.start();
@@ -130,11 +139,17 @@ public class DriverJar extends Driver {

  private static String platformDir() {
    String name = System.getProperty("os.name").toLowerCase();
+    String arch = System.getProperty("os.arch").toLowerCase();
+
    if (name.contains("windows")) {
      return "win32_x64";
    }
    if (name.contains("linux")) {
-      return "linux";
+      if (arch.equals("aarch64")) {
+        return "linux-arm64";
+      } else {
+        return "linux";
+      }
    }
    if (name.contains("mac os x")) {
      return "mac";
@@ -17,22 +17,47 @@
 package com.microsoft.playwright;

 import com.microsoft.playwright.impl.Driver;
-import org.junit.jupiter.api.Test;
+import com.microsoft.playwright.impl.DriverJar;
+import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.io.TempDir;

 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;

-import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;

 public class TestInstall {
-  @Test
-  void playwrightCliInstalled() throws Exception {
+  @BeforeEach
+  void clearSystemProperties() {
    // Clear system property to ensure that the driver is loaded from jar.
    System.clearProperty("playwright.cli.dir");
-    Path cli = Driver.ensureDriverInstalled(Collections.emptyMap());
+    System.clearProperty("playwright.driver.tmpdir");
+    // Clear system property to ensure that the default driver is loaded.
+    System.clearProperty("playwright.driver.impl");
+  }
+
+  @Test
+  @Tags({@Tag("isolated"), @Tag("driverThrowTest")})
+  void shouldThrowWhenBrowserPathIsInvalid(@TempDir Path tmpDir) {
+    Map<String,String> env = new HashMap<>();
+    env.put("PLAYWRIGHT_DOWNLOAD_HOST", "https://127.0.0.127");
+    // Make sure the browsers are not installed yet by pointing at an empty dir.
+    env.put("PLAYWRIGHT_BROWSERS_PATH", tmpDir.toString());
+
+    assertThrows(RuntimeException.class, () -> Driver.ensureDriverInstalled(env, true));
+    assertThrows(RuntimeException.class, () -> Driver.ensureDriverInstalled(env, true));
+  }
+
+  @Test
+  void playwrightCliInstalled() throws Exception {
+    Path cli = Driver.ensureDriverInstalled(Collections.emptyMap(), false);
    assertTrue(Files.exists(cli));

    ProcessBuilder pb = new ProcessBuilder(cli.toString(), "install");
@@ -42,4 +67,26 @@ public class TestInstall {
    boolean result = p.waitFor(1, TimeUnit.MINUTES);
    assertTrue(result, "Timed out waiting for browsers to install");
  }
+
+  @Test
+  void playwrightDriverInAlternativeTmpdir(@TempDir Path tmpdir) throws Exception {
+    System.setProperty("playwright.driver.tmpdir", tmpdir.toString());
+    DriverJar driver = new DriverJar();
+    assertTrue(driver.driverPath().startsWith(tmpdir), "Driver path: " + driver.driverPath() + " tmp: " + tmpdir);
+  }
+
+  @Test
+  void playwrightDriverDefaultImpl() {
+    assertDoesNotThrow(() -> Driver.ensureDriverInstalled(Collections.emptyMap(), false));
+  }
+
+  @Test
+  void playwrightDriverAlternativeImpl() {
+    System.setProperty("playwright.driver.impl", "com.microsoft.playwright.impl.AlternativeDriver");
+    RuntimeException thrown =
+      assertThrows(
+        RuntimeException.class,
+        () -> Driver.ensureDriverInstalled(Collections.emptyMap(), false));
+    assertEquals("Failed to create driver", thrown.getMessage());
+  }
 }
@@ -6,7 +6,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.17.2</version>
+    <version>1.22.0</version>
  </parent>

  <artifactId>driver</artifactId>
@@ -18,8 +18,11 @@ package com.microsoft.playwright.impl;

 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.ZonedDateTime;
 import java.util.Map;

+import static com.microsoft.playwright.impl.DriverLogging.logWithTimestamp;
+
 /**
 * This class provides access to playwright-cli. It can be either preinstalled
 * in the host system and its path is passed as a system property or it can be
@@ -31,11 +34,12 @@ public abstract class Driver {
  private static class PreinstalledDriver extends Driver {
    private final Path driverDir;
    PreinstalledDriver(Path driverDir) {
+      logMessage("created PreinstalledDriver: " + driverDir);
      this.driverDir = driverDir;
    }

    @Override
-    protected void initialize(Map<String, String> env) {
+    protected void initialize(Map<String, String> env, Boolean installBrowsers) {
      // no-op
    }

@@ -45,24 +49,48 @@ public abstract class Driver {
    }
  }

-  public static synchronized Path ensureDriverInstalled(Map<String, String> env) {
+  public static synchronized Path ensureDriverInstalled(Map<String, String> env, Boolean installBrowsers) {
    if (instance == null) {
      try {
        instance = createDriver();
-        instance.initialize(env);
+        logMessage("initializing driver");
+        instance.initialize(env, installBrowsers);
+        logMessage("driver initialized.");
      } catch (Exception exception) {
+        instance = null;
        throw new RuntimeException("Failed to create driver", exception);
      }
    }
-    String name = instance.cliFileName();
-    return instance.driverDir().resolve(name);
+    return instance.driverPath();
  }

-  protected abstract void initialize(Map<String, String> env) throws Exception;
+  protected abstract void initialize(Map<String, String> env, Boolean installBrowsers) throws Exception;

-  protected String cliFileName() {
-    return System.getProperty("os.name").toLowerCase().contains("windows") ?
+  public Path driverPath() {
+    String cliFileName = System.getProperty("os.name").toLowerCase().contains("windows") ?
      "playwright.cmd" : "playwright.sh";
+    return driverDir().resolve(cliFileName);
+  }
+
+  public static void setRequiredEnvironmentVariables(ProcessBuilder pb) {
+    pb.environment().put("PW_LANG_NAME", "java");
+    pb.environment().put("PW_LANG_NAME_VERSION", getMajorJavaVersion());
+    String version = Driver.class.getPackage().getImplementationVersion();
+    if (version != null) {
+      pb.environment().put("PW_CLI_DISPLAY_VERSION", version);
+    }
+  }
+
+  private static String getMajorJavaVersion() {
+    String version = System.getProperty("java.version");
+    if (version.startsWith("1.")) {
+      return version.substring(2, 3);
+    }
+    int dot = version.indexOf(".");
+    if (dot != -1) {
+      return version.substring(0, dot);
+    }
+    return version;
  }

  private static Driver createDriver() throws Exception {
@@ -71,9 +99,16 @@ public abstract class Driver {
      return new PreinstalledDriver(Paths.get(pathFromProperty));
    }

-    Class<?> jarDriver = Class.forName("com.microsoft.playwright.impl.DriverJar");
+    String driverImpl =
+      System.getProperty("playwright.driver.impl", "com.microsoft.playwright.impl.DriverJar");
+    Class<?> jarDriver = Class.forName(driverImpl);
    return (Driver) jarDriver.getDeclaredConstructor().newInstance();
  }

  abstract Path driverDir();
+
+  protected static void logMessage(String message) {
+    // This matches log format produced by the server.
+    logWithTimestamp("pw:install " + message);
+  }
 }
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+
+package com.microsoft.playwright.impl;
+
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+
+class DriverLogging {
+  private static final boolean isEnabled;
+  static {
+    String debug = System.getenv("DEBUG");
+    isEnabled = (debug != null) && debug.contains("pw:install");
+  }
+
+  private static final DateTimeFormatter timestampFormat = DateTimeFormatter.ofPattern(
+    "yyyy-MM-dd'T'HH:mm:ss.SSSXXX").withZone(ZoneId.of("UTC"));
+
+  static void logWithTimestamp(String message) {
+    if (!isEnabled) {
+      return;
+    }
+    // This matches log format produced by the server.
+    String timestamp = ZonedDateTime.now().format(timestampFormat);
+    System.err.println(timestamp + " " + message);
+  }
+}
@@ -6,7 +6,7 @@

  <groupId>org.example</groupId>
  <artifactId>examples</artifactId>
-  <version>1.17.2</version>
+  <version>1.22.0</version>
  <name>Playwright Client Examples</name>
  <properties>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -15,7 +15,7 @@
    <dependency>
      <groupId>com.microsoft.playwright</groupId>
      <artifactId>playwright</artifactId>
-      <version>1.16.0</version>
+      <version>1.17.0</version>
    </dependency>
  </dependencies>
  <build>
@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package org.example;
+
+import com.microsoft.playwright.*;
+
+public class SelectorsAndKeyboardManipulation {
+  public static void main(String[] args) {
+    try(Playwright playwright = Playwright.create()) {
+      Browser browser = playwright.firefox().launch();
+      BrowserContext context = browser.newContext();
+      Page page = context.newPage();
+      page.navigate("https://playwright.dev/java/");
+      page.locator("text=SearchK").click();
+      page.locator("[placeholder=\"Search docs\"]").fill("getting started");
+      page.locator("div[role=\"button\"]:has-text(\"CancelIntroductionGetting startedInstallationGetting startedUsageGetting start\")").click();
+      page.waitForSelector("h1:has-text(\"Getting started\")"); // Waits for the new page to load before screenshotting.
+      page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("Screenshot.png")));
+    }
+  }
+}
@@ -1,10 +0,0 @@
-{
-  "catalogs": {},
-  "aliases": {
-    "playwright": {
-      "script-ref": "scripts/playwright.java",
-      "description": "Playwright lets you automate Chromium, Firefox and Webkit with a single API. \nWith this cli you can install, trace, generate pdf and screenshots and more.\nExample on how to record and run a script:\n```\n  jbang playwright@microsoft/playwright-java codegen -o Example.java`\n  jbang --deps com.microsoft.playwright:playwright:RELEASE Example.java\n```"
-    }
-  },
-  "templates": {}
-}
@@ -7,7 +7,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.17.2</version>
+    <version>1.22.0</version>
  </parent>

  <artifactId>playwright</artifactId>
@@ -44,7 +44,6 @@
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
        <executions>
          <execution>
            <goals>
@@ -74,6 +73,10 @@
      <groupId>org.junit.jupiter</groupId>
      <artifactId>junit-jupiter-engine</artifactId>
    </dependency>
+    <dependency>
+      <groupId>org.opentest4j</groupId>
+      <artifactId>opentest4j</artifactId>
+    </dependency>
    <dependency>
      <groupId>com.microsoft.playwright</groupId>
      <artifactId>driver</artifactId>
@@ -0,0 +1,184 @@
+/*
+ * 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.
+ */
+
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.options.*;
+import java.nio.file.Path;
+import java.util.*;
+
+/**
+ * Exposes API that can be used for the Web API testing. This class is used for creating {@code APIRequestContext} instance which
+ * in turn can be used for sending web requests. An instance of this class can be obtained via {@link Playwright#request
+ * Playwright.request()}. For more information see {@code APIRequestContext}.
+ */
+public interface APIRequest {
+  class NewContextOptions {
+    /**
+     * Methods like {@link APIRequestContext#get APIRequestContext.get()} take the base URL into consideration by using the <a
+     * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code URL()}</a> constructor for building the corresponding
+     * URL. Examples:
+     * <ul>
+     * <li> baseURL: {@code http://localhost:3000} and sending request to {@code /bar.html} results in {@code http://localhost:3000/bar.html}</li>
+     * <li> baseURL: {@code http://localhost:3000/foo/} and sending request to {@code ./bar.html} results in
+     * {@code http://localhost:3000/foo/bar.html}</li>
+     * <li> baseURL: {@code http://localhost:3000/foo} (without trailing slash) and navigating to {@code ./bar.html} results in
+     * {@code http://localhost:3000/bar.html}</li>
+     * </ul>
+     */
+    public String baseURL;
+    /**
+     * An object containing additional HTTP headers to be sent with every request.
+     */
+    public Map<String, String> extraHTTPHeaders;
+    /**
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
+     */
+    public HttpCredentials httpCredentials;
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to {@code false}.
+     */
+    public Boolean ignoreHTTPSErrors;
+    /**
+     * Network proxy settings.
+     */
+    public Proxy proxy;
+    /**
+     * Populates context with given storage state. This option can be used to initialize context with logged-in information
+     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()} or {@link APIRequestContext#storageState
+     * APIRequestContext.storageState()}. Either a path to the file with saved storage, or the value returned by one of {@link
+     * BrowserContext#storageState BrowserContext.storageState()} or {@link APIRequestContext#storageState
+     * APIRequestContext.storageState()} methods.
+     */
+    public String storageState;
+    /**
+     * Populates context with given storage state. This option can be used to initialize context with logged-in information
+     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()}. Path to the file with saved storage
+     * state.
+     */
+    public Path storageStatePath;
+    /**
+     * Maximum time in milliseconds to wait for the response. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout.
+     */
+    public Double timeout;
+    /**
+     * Specific user agent to use in this context.
+     */
+    public String userAgent;
+
+    /**
+     * Methods like {@link APIRequestContext#get APIRequestContext.get()} take the base URL into consideration by using the <a
+     * href="https://developer.mozilla.org/en-US/docs/Web/API/URL/URL">{@code URL()}</a> constructor for building the corresponding
+     * URL. Examples:
+     * <ul>
+     * <li> baseURL: {@code http://localhost:3000} and sending request to {@code /bar.html} results in {@code http://localhost:3000/bar.html}</li>
+     * <li> baseURL: {@code http://localhost:3000/foo/} and sending request to {@code ./bar.html} results in
+     * {@code http://localhost:3000/foo/bar.html}</li>
+     * <li> baseURL: {@code http://localhost:3000/foo} (without trailing slash) and navigating to {@code ./bar.html} results in
+     * {@code http://localhost:3000/bar.html}</li>
+     * </ul>
+     */
+    public NewContextOptions setBaseURL(String baseURL) {
+      this.baseURL = baseURL;
+      return this;
+    }
+    /**
+     * An object containing additional HTTP headers to be sent with every request.
+     */
+    public NewContextOptions setExtraHTTPHeaders(Map<String, String> extraHTTPHeaders) {
+      this.extraHTTPHeaders = extraHTTPHeaders;
+      return this;
+    }
+    /**
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
+     */
+    public NewContextOptions setHttpCredentials(String username, String password) {
+      return setHttpCredentials(new HttpCredentials(username, password));
+    }
+    /**
+     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>.
+     */
+    public NewContextOptions setHttpCredentials(HttpCredentials httpCredentials) {
+      this.httpCredentials = httpCredentials;
+      return this;
+    }
+    /**
+     * Whether to ignore HTTPS errors when sending network requests. Defaults to {@code false}.
+     */
+    public NewContextOptions setIgnoreHTTPSErrors(boolean ignoreHTTPSErrors) {
+      this.ignoreHTTPSErrors = ignoreHTTPSErrors;
+      return this;
+    }
+    /**
+     * Network proxy settings.
+     */
+    public NewContextOptions setProxy(String server) {
+      return setProxy(new Proxy(server));
+    }
+    /**
+     * Network proxy settings.
+     */
+    public NewContextOptions setProxy(Proxy proxy) {
+      this.proxy = proxy;
+      return this;
+    }
+    /**
+     * Populates context with given storage state. This option can be used to initialize context with logged-in information
+     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()} or {@link APIRequestContext#storageState
+     * APIRequestContext.storageState()}. Either a path to the file with saved storage, or the value returned by one of {@link
+     * BrowserContext#storageState BrowserContext.storageState()} or {@link APIRequestContext#storageState
+     * APIRequestContext.storageState()} methods.
+     */
+    public NewContextOptions setStorageState(String storageState) {
+      this.storageState = storageState;
+      return this;
+    }
+    /**
+     * Populates context with given storage state. This option can be used to initialize context with logged-in information
+     * obtained via {@link BrowserContext#storageState BrowserContext.storageState()}. Path to the file with saved storage
+     * state.
+     */
+    public NewContextOptions setStorageStatePath(Path storageStatePath) {
+      this.storageStatePath = storageStatePath;
+      return this;
+    }
+    /**
+     * Maximum time in milliseconds to wait for the response. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout.
+     */
+    public NewContextOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+    /**
+     * Specific user agent to use in this context.
+     */
+    public NewContextOptions setUserAgent(String userAgent) {
+      this.userAgent = userAgent;
+      return this;
+    }
+  }
+  /**
+   * Creates new instances of {@code APIRequestContext}.
+   */
+  default APIRequestContext newContext() {
+    return newContext(null);
+  }
+  /**
+   * Creates new instances of {@code APIRequestContext}.
+   */
+  APIRequestContext newContext(NewContextOptions options);
+}
+
@@ -0,0 +1,227 @@
+/*
+ * 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.
+ */
+
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.options.*;
+import java.nio.file.Path;
+
+/**
+ * This API is used for the Web API testing. You can use it to trigger API endpoints, configure micro-services, prepare
+ * environment or the service to your e2e test.
+ *
+ * <p> Each Playwright browser context has associated with it {@code APIRequestContext} instance which shares cookie storage with the
+ * browser context and can be accessed via {@link BrowserContext#request BrowserContext.request()} or {@link Page#request
+ * Page.request()}. It is also possible to create a new APIRequestContext instance manually by calling {@link
+ * APIRequest#newContext APIRequest.newContext()}.
+ *
+ * <p> **Cookie management**
+ *
+ * <p> {@code APIRequestContext} retuned by {@link BrowserContext#request BrowserContext.request()} and {@link Page#request
+ * Page.request()} shares cookie storage with the corresponding {@code BrowserContext}. Each API request will have {@code Cookie}
+ * header populated with the values from the browser context. If the API response contains {@code Set-Cookie} header it will
+ * automatically update {@code BrowserContext} cookies and requests made from the page will pick them up. This means that if you
+ * log in using this API, your e2e test will be logged in and vice versa.
+ *
+ * <p> If you want API requests to not interfere with the browser cookies you shoud create a new {@code APIRequestContext} by calling
+ * {@link APIRequest#newContext APIRequest.newContext()}. Such {@code APIRequestContext} object will have its own isolated cookie
+ * storage.
+ */
+public interface APIRequestContext {
+  class StorageStateOptions {
+    /**
+     * The file path to save the storage state to. If {@code path} is a relative path, then it is resolved relative to current
+     * working directory. If no path is provided, storage state is still returned, but won't be saved to the disk.
+     */
+    public Path path;
+
+    /**
+     * The file path to save the storage state to. If {@code path} is a relative path, then it is resolved relative to current
+     * working directory. If no path is provided, storage state is still returned, but won't be saved to the disk.
+     */
+    public StorageStateOptions setPath(Path path) {
+      this.path = path;
+      return this;
+    }
+  }
+  /**
+   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/DELETE">DELETE</a> request and returns
+   * its response. The method will populate request cookies from the context and update context cookies from the response.
+   * The method will automatically follow redirects.
+   *
+   * @param url Target URL.
+   */
+  default APIResponse delete(String url) {
+    return delete(url, null);
+  }
+  /**
+   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/DELETE">DELETE</a> request and returns
+   * its response. The method will populate request cookies from the context and update context cookies from the response.
+   * The method will automatically follow redirects.
+   *
+   * @param url Target URL.
+   * @param params Optional request parameters.
+   */
+  APIResponse delete(String url, RequestOptions params);
+  /**
+   * All responses returned by {@link APIRequestContext#get APIRequestContext.get()} and similar methods are stored in the
+   * memory, so that you can later call {@link APIResponse#body APIResponse.body()}. This method discards all stored
+   * responses, and makes {@link APIResponse#body APIResponse.body()} throw "Response disposed" error.
+   */
+  void dispose();
+  /**
+   * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and update
+   * context cookies from the response. The method will automatically follow redirects.
+   *
+   * @param urlOrRequest Target URL or Request to get all parameters from.
+   */
+  default APIResponse fetch(String urlOrRequest) {
+    return fetch(urlOrRequest, null);
+  }
+  /**
+   * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and update
+   * context cookies from the response. The method will automatically follow redirects.
+   *
+   * @param urlOrRequest Target URL or Request to get all parameters from.
+   * @param params Optional request parameters.
+   */
+  APIResponse fetch(String urlOrRequest, RequestOptions params);
+  /**
+   * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and update
+   * context cookies from the response. The method will automatically follow redirects.
+   *
+   * @param urlOrRequest Target URL or Request to get all parameters from.
+   */
+  default APIResponse fetch(Request urlOrRequest) {
+    return fetch(urlOrRequest, null);
+  }
+  /**
+   * Sends HTTP(S) request and returns its response. The method will populate request cookies from the context and update
+   * context cookies from the response. The method will automatically follow redirects.
+   *
+   * @param urlOrRequest Target URL or Request to get all parameters from.
+   * @param params Optional request parameters.
+   */
+  APIResponse fetch(Request urlOrRequest, RequestOptions params);
+  /**
+   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/GET">GET</a> request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response. The
+   * method will automatically follow redirects.
+   *
+   * @param url Target URL.
+   */
+  default APIResponse get(String url) {
+    return get(url, null);
+  }
+  /**
+   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/GET">GET</a> request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response. The
+   * method will automatically follow redirects.
+   *
+   * @param url Target URL.
+   * @param params Optional request parameters.
+   */
+  APIResponse get(String url, RequestOptions params);
+  /**
+   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/HEAD">HEAD</a> request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response. The
+   * method will automatically follow redirects.
+   *
+   * @param url Target URL.
+   */
+  default APIResponse head(String url) {
+    return head(url, null);
+  }
+  /**
+   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/HEAD">HEAD</a> request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response. The
+   * method will automatically follow redirects.
+   *
+   * @param url Target URL.
+   * @param params Optional request parameters.
+   */
+  APIResponse head(String url, RequestOptions params);
+  /**
+   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PATCH">PATCH</a> request and returns
+   * its response. The method will populate request cookies from the context and update context cookies from the response.
+   * The method will automatically follow redirects.
+   *
+   * @param url Target URL.
+   */
+  default APIResponse patch(String url) {
+    return patch(url, null);
+  }
+  /**
+   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PATCH">PATCH</a> request and returns
+   * its response. The method will populate request cookies from the context and update context cookies from the response.
+   * The method will automatically follow redirects.
+   *
+   * @param url Target URL.
+   * @param params Optional request parameters.
+   */
+  APIResponse patch(String url, RequestOptions params);
+  /**
+   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/POST">POST</a> request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response. The
+   * method will automatically follow redirects.
+   *
+   * @param url Target URL.
+   */
+  default APIResponse post(String url) {
+    return post(url, null);
+  }
+  /**
+   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/POST">POST</a> request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response. The
+   * method will automatically follow redirects.
+   *
+   * @param url Target URL.
+   * @param params Optional request parameters.
+   */
+  APIResponse post(String url, RequestOptions params);
+  /**
+   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PUT">PUT</a> request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response. The
+   * method will automatically follow redirects.
+   *
+   * @param url Target URL.
+   */
+  default APIResponse put(String url) {
+    return put(url, null);
+  }
+  /**
+   * Sends HTTP(S) <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PUT">PUT</a> request and returns its
+   * response. The method will populate request cookies from the context and update context cookies from the response. The
+   * method will automatically follow redirects.
+   *
+   * @param url Target URL.
+   * @param params Optional request parameters.
+   */
+  APIResponse put(String url, RequestOptions params);
+  /**
+   * Returns storage state for this request context, contains current cookies and local storage snapshot if it was passed to
+   * the constructor.
+   */
+  default String storageState() {
+    return storageState(null);
+  }
+  /**
+   * Returns storage state for this request context, contains current cookies and local storage snapshot if it was passed to
+   * the constructor.
+   */
+  String storageState(StorageStateOptions options);
+}
+
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ */
+
+package com.microsoft.playwright;
+
+import com.microsoft.playwright.options.*;
+import java.util.*;
+
+/**
+ * {@code APIResponse} class represents responses returned by {@link APIRequestContext#get APIRequestContext.get()} and similar
+ * methods.
+ */
+public interface APIResponse {
+  /**
+   * Returns the buffer with response body.
+   */
+  byte[] body();
+  /**
+   * Disposes the body of this response. If not called then the body will stay in memory until the context closes.
+   */
+  void dispose();
+  /**
+   * An object with all the response HTTP headers associated with this response.
+   */
+  Map<String, String> headers();
+  /**
+   * An array with all the request HTTP headers associated with this response. Header names are not lower-cased. Headers with
+   * multiple entries, such as {@code Set-Cookie}, appear in the array multiple times.
+   */
+  List<HttpHeader> headersArray();
+  /**
+   * Contains a boolean stating whether the response was successful (status in the range 200-299) or not.
+   */
+  boolean ok();
+  /**
+   * Contains the status code of the response (e.g., 200 for a success).
+   */
+  int status();
+  /**
+   * Contains the status text of the response (e.g. usually an "OK" for a success).
+   */
+  String statusText();
+  /**
+   * Returns the text representation of response body.
+   */
+  String text();
+  /**
+   * Contains the URL of the response.
+   */
+  String url();
+}
+
@@ -57,7 +57,7 @@ public interface Browser extends AutoCloseable {

  class NewContextOptions {
    /**
-     * Whether to automatically download all the attachments. Defaults to {@code false} where all the downloads are canceled.
+     * Whether to automatically download all the attachments. Defaults to {@code true} where all the downloads are accepted.
     */
    public Boolean acceptDownloads;
    /**
@@ -69,6 +69,8 @@ public interface Browser extends AutoCloseable {
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code http://localhost:3000/bar.html}</li>
     * <li> baseURL: {@code http://localhost:3000/foo/} and navigating to {@code ./bar.html} results in {@code http://localhost:3000/foo/bar.html}</li>
+     * <li> baseURL: {@code http://localhost:3000/foo} (without trailing slash) and navigating to {@code ./bar.html} results in
+     * {@code http://localhost:3000/bar.html}</li>
     * </ul>
     */
    public String baseURL;
@@ -205,7 +207,7 @@ public interface Browser extends AutoCloseable {
    public Optional<ViewportSize> viewportSize;

    /**
-     * Whether to automatically download all the attachments. Defaults to {@code false} where all the downloads are canceled.
+     * Whether to automatically download all the attachments. Defaults to {@code true} where all the downloads are accepted.
     */
    public NewContextOptions setAcceptDownloads(boolean acceptDownloads) {
      this.acceptDownloads = acceptDownloads;
@@ -220,6 +222,8 @@ public interface Browser extends AutoCloseable {
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code http://localhost:3000/bar.html}</li>
     * <li> baseURL: {@code http://localhost:3000/foo/} and navigating to {@code ./bar.html} results in {@code http://localhost:3000/foo/bar.html}</li>
+     * <li> baseURL: {@code http://localhost:3000/foo} (without trailing slash) and navigating to {@code ./bar.html} results in
+     * {@code http://localhost:3000/bar.html}</li>
     * </ul>
     */
    public NewContextOptions setBaseURL(String baseURL) {
@@ -481,7 +485,7 @@ public interface Browser extends AutoCloseable {
  }
  class NewPageOptions {
    /**
-     * Whether to automatically download all the attachments. Defaults to {@code false} where all the downloads are canceled.
+     * Whether to automatically download all the attachments. Defaults to {@code true} where all the downloads are accepted.
     */
    public Boolean acceptDownloads;
    /**
@@ -493,6 +497,8 @@ public interface Browser extends AutoCloseable {
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code http://localhost:3000/bar.html}</li>
     * <li> baseURL: {@code http://localhost:3000/foo/} and navigating to {@code ./bar.html} results in {@code http://localhost:3000/foo/bar.html}</li>
+     * <li> baseURL: {@code http://localhost:3000/foo} (without trailing slash) and navigating to {@code ./bar.html} results in
+     * {@code http://localhost:3000/bar.html}</li>
     * </ul>
     */
    public String baseURL;
@@ -629,7 +635,7 @@ public interface Browser extends AutoCloseable {
    public Optional<ViewportSize> viewportSize;

    /**
-     * Whether to automatically download all the attachments. Defaults to {@code false} where all the downloads are canceled.
+     * Whether to automatically download all the attachments. Defaults to {@code true} where all the downloads are accepted.
     */
    public NewPageOptions setAcceptDownloads(boolean acceptDownloads) {
      this.acceptDownloads = acceptDownloads;
@@ -644,6 +650,8 @@ public interface Browser extends AutoCloseable {
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code http://localhost:3000/bar.html}</li>
     * <li> baseURL: {@code http://localhost:3000/foo/} and navigating to {@code ./bar.html} results in {@code http://localhost:3000/foo/bar.html}</li>
+     * <li> baseURL: {@code http://localhost:3000/foo} (without trailing slash) and navigating to {@code ./bar.html} results in
+     * {@code http://localhost:3000/bar.html}</li>
     * </ul>
     */
    public NewPageOptions setBaseURL(String baseURL) {
@@ -1009,8 +1017,9 @@ public interface Browser extends AutoCloseable {
  Page newPage(NewPageOptions options);
  /**
   * <strong>NOTE:</strong> This API controls <a href="https://www.chromium.org/developers/how-tos/trace-event-profiling-tool">Chromium Tracing</a>
-   * which is a low-level chromium-specific debugging tool. API to control <a href="../trace-viewer">Playwright Tracing</a>
-   * could be found <a href="https://playwright.dev/java/docs/class-tracing">here</a>.
+   * which is a low-level chromium-specific debugging tool. API to control <a
+   * href="https://playwright.dev/java/docs/trace-viewer">Playwright Tracing</a> could be found <a
+   * href="https://playwright.dev/java/docs/api/class-tracing">here</a>.
   *
   * <p> You can use {@link Browser#startTracing Browser.startTracing()} and {@link Browser#stopTracing Browser.stopTracing()} to
   * create a trace file that can be opened in Chrome DevTools performance panel.
@@ -1028,8 +1037,9 @@ public interface Browser extends AutoCloseable {
  }
  /**
   * <strong>NOTE:</strong> This API controls <a href="https://www.chromium.org/developers/how-tos/trace-event-profiling-tool">Chromium Tracing</a>
-   * which is a low-level chromium-specific debugging tool. API to control <a href="../trace-viewer">Playwright Tracing</a>
-   * could be found <a href="https://playwright.dev/java/docs/class-tracing">here</a>.
+   * which is a low-level chromium-specific debugging tool. API to control <a
+   * href="https://playwright.dev/java/docs/trace-viewer">Playwright Tracing</a> could be found <a
+   * href="https://playwright.dev/java/docs/api/class-tracing">here</a>.
   *
   * <p> You can use {@link Browser#startTracing Browser.startTracing()} and {@link Browser#stopTracing Browser.stopTracing()} to
   * create a trace file that can be opened in Chrome DevTools performance panel.
@@ -1045,8 +1055,9 @@ public interface Browser extends AutoCloseable {
  }
  /**
   * <strong>NOTE:</strong> This API controls <a href="https://www.chromium.org/developers/how-tos/trace-event-profiling-tool">Chromium Tracing</a>
-   * which is a low-level chromium-specific debugging tool. API to control <a href="../trace-viewer">Playwright Tracing</a>
-   * could be found <a href="https://playwright.dev/java/docs/class-tracing">here</a>.
+   * which is a low-level chromium-specific debugging tool. API to control <a
+   * href="https://playwright.dev/java/docs/trace-viewer">Playwright Tracing</a> could be found <a
+   * href="https://playwright.dev/java/docs/api/class-tracing">here</a>.
   *
   * <p> You can use {@link Browser#startTracing Browser.startTracing()} and {@link Browser#stopTracing Browser.stopTracing()} to
   * create a trace file that can be opened in Chrome DevTools performance panel.
@@ -1062,8 +1073,9 @@ public interface Browser extends AutoCloseable {
  void startTracing(Page page, StartTracingOptions options);
  /**
   * <strong>NOTE:</strong> This API controls <a href="https://www.chromium.org/developers/how-tos/trace-event-profiling-tool">Chromium Tracing</a>
-   * which is a low-level chromium-specific debugging tool. API to control <a href="../trace-viewer">Playwright Tracing</a>
-   * could be found <a href="https://playwright.dev/java/docs/class-tracing">here</a>.
+   * which is a low-level chromium-specific debugging tool. API to control <a
+   * href="https://playwright.dev/java/docs/trace-viewer">Playwright Tracing</a> could be found <a
+   * href="https://playwright.dev/java/docs/api/class-tracing">here</a>.
   *
   * <p> Returns the buffer with trace data.
   */
@@ -497,7 +497,6 @@ public interface BrowserContext extends AutoCloseable {
   * <li> {@code "midi"}</li>
   * <li> {@code "midi-sysex"} (system-exclusive midi)</li>
   * <li> {@code "notifications"}</li>
-   * <li> {@code "push"}</li>
   * <li> {@code "camera"}</li>
   * <li> {@code "microphone"}</li>
   * <li> {@code "background-sync"}</li>
@@ -524,7 +523,6 @@ public interface BrowserContext extends AutoCloseable {
   * <li> {@code "midi"}</li>
   * <li> {@code "midi-sysex"} (system-exclusive midi)</li>
   * <li> {@code "notifications"}</li>
-   * <li> {@code "push"}</li>
   * <li> {@code "camera"}</li>
   * <li> {@code "microphone"}</li>
   * <li> {@code "background-sync"}</li>
@@ -547,6 +545,10 @@ public interface BrowserContext extends AutoCloseable {
   * Returns all open pages in the context.
   */
  List<Page> pages();
+  /**
+   * API testing helper associated with this context. Requests made with this API will use context cookies.
+   */
+  APIRequestContext request();
  /**
   * Routing provides the capability to modify network requests that are made by any page in the browser context. Once route
   * is enabled, every request matching the url pattern will stall unless it's continued, fulfilled or aborted.
@@ -52,8 +52,7 @@ public interface BrowserType {
     */
    public Double slowMo;
    /**
-     * Maximum time in milliseconds to wait for the connection to be established. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to
-     * disable timeout.
+     * Maximum time in milliseconds to wait for the connection to be established. Defaults to {@code 0} (no timeout).
     */
    public Double timeout;

@@ -73,8 +72,7 @@ public interface BrowserType {
      return this;
    }
    /**
-     * Maximum time in milliseconds to wait for the connection to be established. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to
-     * disable timeout.
+     * Maximum time in milliseconds to wait for the connection to be established. Defaults to {@code 0} (no timeout).
     */
    public ConnectOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -130,7 +128,7 @@ public interface BrowserType {
    /**
     * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
     * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
-     * href="https://playwright.dev/java/docs/browsers/#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
+     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
     */
    public Object channel;
    /**
@@ -222,7 +220,7 @@ public interface BrowserType {
    /**
     * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
     * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
-     * href="https://playwright.dev/java/docs/browsers/#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
+     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
     */
    public LaunchOptions setChannel(BrowserChannel channel) {
      this.channel = channel;
@@ -231,7 +229,7 @@ public interface BrowserType {
    /**
     * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
     * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
-     * href="https://playwright.dev/java/docs/browsers/#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
+     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
     */
    public LaunchOptions setChannel(String channel) {
      this.channel = channel;
@@ -370,7 +368,7 @@ public interface BrowserType {
  }
  class LaunchPersistentContextOptions {
    /**
-     * Whether to automatically download all the attachments. Defaults to {@code false} where all the downloads are canceled.
+     * Whether to automatically download all the attachments. Defaults to {@code true} where all the downloads are accepted.
     */
    public Boolean acceptDownloads;
    /**
@@ -387,6 +385,8 @@ public interface BrowserType {
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code http://localhost:3000/bar.html}</li>
     * <li> baseURL: {@code http://localhost:3000/foo/} and navigating to {@code ./bar.html} results in {@code http://localhost:3000/foo/bar.html}</li>
+     * <li> baseURL: {@code http://localhost:3000/foo} (without trailing slash) and navigating to {@code ./bar.html} results in
+     * {@code http://localhost:3000/bar.html}</li>
     * </ul>
     */
    public String baseURL;
@@ -397,7 +397,7 @@ public interface BrowserType {
    /**
     * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
     * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
-     * href="https://playwright.dev/java/docs/browsers/#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
+     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
     */
    public Object channel;
    /**
@@ -581,7 +581,7 @@ public interface BrowserType {
    public Optional<ViewportSize> viewportSize;

    /**
-     * Whether to automatically download all the attachments. Defaults to {@code false} where all the downloads are canceled.
+     * Whether to automatically download all the attachments. Defaults to {@code true} where all the downloads are accepted.
     */
    public LaunchPersistentContextOptions setAcceptDownloads(boolean acceptDownloads) {
      this.acceptDownloads = acceptDownloads;
@@ -604,6 +604,8 @@ public interface BrowserType {
     * <ul>
     * <li> baseURL: {@code http://localhost:3000} and navigating to {@code /bar.html} results in {@code http://localhost:3000/bar.html}</li>
     * <li> baseURL: {@code http://localhost:3000/foo/} and navigating to {@code ./bar.html} results in {@code http://localhost:3000/foo/bar.html}</li>
+     * <li> baseURL: {@code http://localhost:3000/foo} (without trailing slash) and navigating to {@code ./bar.html} results in
+     * {@code http://localhost:3000/bar.html}</li>
     * </ul>
     */
    public LaunchPersistentContextOptions setBaseURL(String baseURL) {
@@ -621,7 +623,7 @@ public interface BrowserType {
    /**
     * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
     * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
-     * href="https://playwright.dev/java/docs/browsers/#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
+     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
     */
    public LaunchPersistentContextOptions setChannel(BrowserChannel channel) {
      this.channel = channel;
@@ -630,7 +632,7 @@ public interface BrowserType {
    /**
     * Browser distribution channel.  Supported values are "chrome", "chrome-beta", "chrome-dev", "chrome-canary", "msedge",
     * "msedge-beta", "msedge-dev", "msedge-canary". Read more about using <a
-     * href="https://playwright.dev/java/docs/browsers/#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
+     * href="https://playwright.dev/java/docs/browsers#google-chrome--microsoft-edge">Google Chrome and Microsoft Edge</a>.
     */
    public LaunchPersistentContextOptions setChannel(String channel) {
      this.channel = channel;
@@ -967,7 +969,7 @@ public interface BrowserType {
    }
  }
  /**
-   * This methods attaches Playwright to an existing browser instance.
+   * This method attaches Playwright to an existing browser instance.
   *
   * @param wsEndpoint A browser websocket endpoint to connect to.
   */
@@ -975,13 +977,13 @@ public interface BrowserType {
    return connect(wsEndpoint, null);
  }
  /**
-   * This methods attaches Playwright to an existing browser instance.
+   * This method attaches Playwright to an existing browser instance.
   *
   * @param wsEndpoint A browser websocket endpoint to connect to.
   */
  Browser connect(String wsEndpoint, ConnectOptions options);
  /**
-   * This methods attaches Playwright to an existing browser instance using the Chrome DevTools Protocol.
+   * This method attaches Playwright to an existing browser instance using the Chrome DevTools Protocol.
   *
   * <p> The default browser context is accessible via {@link Browser#contexts Browser.contexts()}.
   *
@@ -994,7 +996,7 @@ public interface BrowserType {
    return connectOverCDP(endpointURL, null);
  }
  /**
-   * This methods attaches Playwright to an existing browser instance using the Chrome DevTools Protocol.
+   * This method attaches Playwright to an existing browser instance using the Chrome DevTools Protocol.
   *
   * <p> The default browser context is accessible via {@link Browser#contexts Browser.contexts()}.
   *
@@ -29,11 +29,13 @@ import static java.util.Arrays.asList;
 */
 public class CLI {
  public static void main(String[] args) throws IOException, InterruptedException {
-    Path driver = Driver.ensureDriverInstalled(Collections.emptyMap());
+    Path driver = Driver.ensureDriverInstalled(Collections.emptyMap(), false);
    ProcessBuilder pb = new ProcessBuilder(driver.toString());
    pb.command().addAll(asList(args));
-    if (!pb.environment().containsKey("PW_CLI_TARGET_LANG")) {
-      pb.environment().put("PW_CLI_TARGET_LANG", "java");
+    Driver.setRequiredEnvironmentVariables(pb);
+    String version = Playwright.class.getPackage().getImplementationVersion();
+    if (version != null) {
+      pb.environment().put("PW_CLI_DISPLAY_VERSION", version);
    }
    pb.inheritIO();
    Process process = pb.start();
@@ -19,7 +19,28 @@ package com.microsoft.playwright;
 import java.util.*;

 /**
- * {@code ConsoleMessage} objects are dispatched by page via the {@link Page#onConsoleMessage Page.onConsoleMessage()} event.
+ * {@code ConsoleMessage} objects are dispatched by page via the {@link Page#onConsoleMessage Page.onConsoleMessage()} event. For
+ * each console messages logged in the page there will be corresponding event in the Playwright context.
+ * <pre>{@code
+ * // Listen for all System.out.printlns
+ * page.onConsoleMessage(msg -> System.out.println(msg.text()));
+ *
+ * // Listen for all console events and handle errors
+ * page.onConsoleMessage(msg -> {
+ *   if ("error".equals(msg.type()))
+ *     System.out.println("Error text: " + msg.text());
+ * });
+ *
+ * // Get the next System.out.println
+ * ConsoleMessage msg = page.waitForConsoleMessage(() -> {
+ *   // Issue console.log inside the page
+ *   page.evaluate("console.log('hello', 42, { foo: 'bar' });");
+ * });
+ *
+ * // Deconstruct console.log arguments
+ * msg.args().get(0).jsonValue() // hello
+ * msg.args().get(1).jsonValue() // 42
+ * }</pre>
 */
 public interface ConsoleMessage {
  /**
@@ -16,7 +16,6 @@

 package com.microsoft.playwright;

-import java.util.*;

 /**
 * {@code Dialog} objects are dispatched by page via the {@link Page#onDialog Page.onDialog()} event.
@@ -18,7 +18,6 @@ package com.microsoft.playwright;

 import java.io.InputStream;
 import java.nio.file.Path;
-import java.util.*;

 /**
 * {@code Download} objects are dispatched by page via the {@link Page#onDownload Page.onDownload()} event.
@@ -40,10 +39,6 @@ import java.util.*;
 * // wait for download to complete
 * Path path = download.path();
 * }</pre>
- *
- * <p> <strong>NOTE:</strong> Browser context **must** be created with the {@code acceptDownloads} set to {@code true} when user needs access to the downloaded
- * content. If {@code acceptDownloads} is not set, download events are emitted, but the actual download is not performed and user
- * has no access to the downloaded files.
 */
 public interface Download {
  /**
@@ -18,7 +18,6 @@ package com.microsoft.playwright;

 import com.microsoft.playwright.options.*;
 import java.nio.file.Path;
-import java.util.*;

 /**
 * {@code FileChooser} objects are dispatched by the page in the {@link Page#onFileChooser Page.onFileChooser()} event.
@@ -75,50 +74,50 @@ public interface FileChooser {
  Page page();
  /**
   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths, then
-   * they are resolved relative to the the current working directory. For empty array, clears the selected files.
+   * they are resolved relative to the current working directory. For empty array, clears the selected files.
   */
  default void setFiles(Path files) {
    setFiles(files, null);
  }
  /**
   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths, then
-   * they are resolved relative to the the current working directory. For empty array, clears the selected files.
+   * they are resolved relative to the current working directory. For empty array, clears the selected files.
   */
  void setFiles(Path files, SetFilesOptions options);
  /**
   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths, then
-   * they are resolved relative to the the current working directory. For empty array, clears the selected files.
+   * they are resolved relative to the current working directory. For empty array, clears the selected files.
   */
  default void setFiles(Path[] files) {
    setFiles(files, null);
  }
  /**
   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths, then
-   * they are resolved relative to the the current working directory. For empty array, clears the selected files.
+   * they are resolved relative to the current working directory. For empty array, clears the selected files.
   */
  void setFiles(Path[] files, SetFilesOptions options);
  /**
   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths, then
-   * they are resolved relative to the the current working directory. For empty array, clears the selected files.
+   * they are resolved relative to the current working directory. For empty array, clears the selected files.
   */
  default void setFiles(FilePayload files) {
    setFiles(files, null);
  }
  /**
   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths, then
-   * they are resolved relative to the the current working directory. For empty array, clears the selected files.
+   * they are resolved relative to the current working directory. For empty array, clears the selected files.
   */
  void setFiles(FilePayload files, SetFilesOptions options);
  /**
   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths, then
-   * they are resolved relative to the the current working directory. For empty array, clears the selected files.
+   * they are resolved relative to the current working directory. For empty array, clears the selected files.
   */
  default void setFiles(FilePayload[] files) {
    setFiles(files, null);
  }
  /**
   * Sets the value of the file input this chooser is associated with. If some of the {@code filePaths} are relative paths, then
-   * they are resolved relative to the the current working directory. For empty array, clears the selected files.
+   * they are resolved relative to the current working directory. For empty array, clears the selected files.
   */
  void setFiles(FilePayload[] files, SetFilesOptions options);
 }
@@ -16,7 +16,7 @@

 package com.microsoft.playwright;

-import java.util.*;
+import java.util.regex.Pattern;

 /**
 * FrameLocator represents a view to the {@code iframe} on the page. It captures the logic sufficient to retrieve the {@code iframe}
@@ -38,8 +38,60 @@ import java.util.*;
 * // Works because we explicitly tell locator to pick the first frame:
 * page.frame_locator(".result-frame").first().locator("button").click();
 * }</pre>
+ *
+ * <p> **Converting Locator to FrameLocator**
+ *
+ * <p> If you have a {@code Locator} object pointing to an {@code iframe} it can be converted to {@code FrameLocator} using <a
+ * href="https://developer.mozilla.org/en-US/docs/Web/CSS/:scope">{@code :scope}</a> CSS selector:
+ * <pre>{@code
+ * Locator frameLocator = locator.frameLocator(':scope');
+ * }</pre>
 */
 public interface FrameLocator {
+  class LocatorOptions {
+    /**
+     * Matches elements containing an element that matches an inner locator. Inner locator is queried against the outer one.
+     * For example, {@code article} that has {@code text=Playwright} matches {@code <article><div>Playwright</div></article>}.
+     *
+     * <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
+     */
+    public Locator has;
+    /**
+     * Matches elements containing specified text somewhere inside, possibly in a child or a descendant element. When passed a
+     * [string], matching is case-insensitive and searches for a substring. For example, {@code "Playwright"} matches
+     * {@code <article><div>Playwright</div></article>}.
+     */
+    public Object hasText;
+
+    /**
+     * Matches elements containing an element that matches an inner locator. Inner locator is queried against the outer one.
+     * For example, {@code article} that has {@code text=Playwright} matches {@code <article><div>Playwright</div></article>}.
+     *
+     * <p> Note that outer and inner locators must belong to the same frame. Inner locator must not contain {@code FrameLocator}s.
+     */
+    public LocatorOptions setHas(Locator has) {
+      this.has = has;
+      return this;
+    }
+    /**
+     * Matches elements containing specified text somewhere inside, possibly in a child or a descendant element. When passed a
+     * [string], matching is case-insensitive and searches for a substring. For example, {@code "Playwright"} matches
+     * {@code <article><div>Playwright</div></article>}.
+     */
+    public LocatorOptions setHasText(String hasText) {
+      this.hasText = hasText;
+      return this;
+    }
+    /**
+     * Matches elements containing specified text somewhere inside, possibly in a child or a descendant element. When passed a
+     * [string], matching is case-insensitive and searches for a substring. For example, {@code "Playwright"} matches
+     * {@code <article><div>Playwright</div></article>}.
+     */
+    public LocatorOptions setHasText(Pattern hasText) {
+      this.hasText = hasText;
+      return this;
+    }
+  }
  /**
   * Returns locator to the first matching frame.
   */
@@ -48,7 +100,7 @@ public interface FrameLocator {
   * When working with iframes, you can create a frame locator that will enter the iframe and allow selecting elements in
   * that iframe.
   *
-   * @param selector A selector to use when resolving DOM element. See <a href="https://playwright.dev/java/docs/selectors/">working with
+   * @param selector A selector to use when resolving DOM element. See <a href="https://playwright.dev/java/docs/selectors">working with
   * selectors</a> for more details.
   */
  FrameLocator frameLocator(String selector);
@@ -59,12 +111,21 @@ public interface FrameLocator {
  /**
   * The method finds an element matching the specified selector in the FrameLocator's subtree.
   *
-   * @param selector A selector to use when resolving DOM element. See <a href="https://playwright.dev/java/docs/selectors/">working with
+   * @param selector A selector to use when resolving DOM element. See <a href="https://playwright.dev/java/docs/selectors">working with
   * selectors</a> for more details.
   */
-  Locator locator(String selector);
+  default Locator locator(String selector) {
+    return locator(selector, null);
+  }
  /**
-   * Returns locator to the n-th matching frame.
+   * The method finds an element matching the specified selector in the FrameLocator's subtree.
+   *
+   * @param selector A selector to use when resolving DOM element. See <a href="https://playwright.dev/java/docs/selectors">working with
+   * selectors</a> for more details.
+   */
+  Locator locator(String selector, LocatorOptions options);
+  /**
+   * Returns locator to the n-th matching frame. It's zero based, {@code nth(0)} selects the first frame.
   */
  FrameLocator nth(int index);
 }
@@ -17,7 +17,6 @@
 package com.microsoft.playwright;

 import com.microsoft.playwright.options.*;
-import java.util.*;

 /**
 * Keyboard provides an api for managing a virtual keyboard. The high level api is {@link Keyboard#type Keyboard.type()},
@@ -17,7 +17,6 @@
 package com.microsoft.playwright;

 import com.microsoft.playwright.options.*;
-import java.util.*;

 /**
 * The Mouse class operates in main-frame CSS pixels relative to the top-left corner of the viewport.
@@ -123,12 +122,12 @@ public interface Mouse {
  }
  class MoveOptions {
    /**
-     * defaults to 1. Sends intermediate {@code mousemove} events.
+     * Defaults to 1. Sends intermediate {@code mousemove} events.
     */
    public Integer steps;

    /**
-     * defaults to 1. Sends intermediate {@code mousemove} events.
+     * Defaults to 1. Sends intermediate {@code mousemove} events.
     */
    public MoveOptions setSteps(int steps) {
      this.steps = steps;
@@ -64,9 +64,13 @@ public interface Playwright extends AutoCloseable {
   * This object can be used to launch or connect to Firefox, returning instances of {@code Browser}.
   */
  BrowserType firefox();
+  /**
+   * Exposes API that can be used for the Web API testing.
+   */
+  APIRequest request();
  /**
   * Selectors can be used to install custom selector engines. See <a
-   * href="https://playwright.dev/java/docs/selectors/">Working with selectors</a> for more information.
+   * href="https://playwright.dev/java/docs/selectors">Working with selectors</a> for more information.
   */
  Selectors selectors();
  /**
@@ -16,13 +16,14 @@

 package com.microsoft.playwright;

-import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.*;

 /**
 * Whenever a network route is set up with {@link Page#route Page.route()} or {@link BrowserContext#route
 * BrowserContext.route()}, the {@code Route} object allows to handle the route.
+ *
+ * <p> Learn more about <a href="https://playwright.dev/java/docs/network">networking</a>.
 */
 public interface Route {
  class ResumeOptions {
@@ -101,6 +102,11 @@ public interface Route {
     * is resolved relative to the current working directory.
     */
    public Path path;
+    /**
+     * {@code APIResponse} to fulfill route's request with. Individual fields of the response (such as headers) can be overridden
+     * using fulfill options.
+     */
+    public APIResponse response;
    /**
     * Response status code, defaults to {@code 200}.
     */
@@ -142,6 +148,14 @@ public interface Route {
      this.path = path;
      return this;
    }
+    /**
+     * {@code APIResponse} to fulfill route's request with. Individual fields of the response (such as headers) can be overridden
+     * using fulfill options.
+     */
+    public FulfillOptions setResponse(APIResponse response) {
+      this.response = response;
+      return this;
+    }
    /**
     * Response status code, defaults to {@code 200}.
     */
@@ -17,11 +17,10 @@
 package com.microsoft.playwright;

 import java.nio.file.Path;
-import java.util.*;

 /**
 * Selectors can be used to install custom selector engines. See <a
- * href="https://playwright.dev/java/docs/selectors/">Working with selectors</a> for more information.
+ * href="https://playwright.dev/java/docs/selectors">Working with selectors</a> for more information.
 */
 public interface Selectors {
  class RegisterOptions {
@@ -16,7 +16,6 @@

 package com.microsoft.playwright;

-import java.util.*;

 /**
 * The Touchscreen class operates in main-frame CSS pixels relative to the top-left corner of the viewport. Methods on the
@@ -17,11 +17,10 @@
 package com.microsoft.playwright;

 import java.nio.file.Path;
-import java.util.*;

 /**
 * API for collecting and saving Playwright traces. Playwright traces can be opened in <a
- * href="https://playwright.dev/java/docs/trace-viewer/">Trace Viewer</a> after Playwright script runs.
+ * href="https://playwright.dev/java/docs/trace-viewer">Trace Viewer</a> after Playwright script runs.
 *
 * <p> Start recording a trace before performing actions. At the end, stop tracing and save it to a file.
 * <pre>{@code
@@ -48,9 +47,19 @@ public interface Tracing {
     */
    public Boolean screenshots;
    /**
-     * Whether to capture DOM snapshot on every action.
+     * If this option is true tracing will
+     * <ul>
+     * <li> capture DOM snapshot on every action</li>
+     * <li> record network activity</li>
+     * </ul>
     */
    public Boolean snapshots;
+    /**
+     * Whether to include source files for trace actions. List of the directories with source code for the application must be
+     * provided via {@code PLAYWRIGHT_JAVA_SRC} environment variable (the paths should be separated by ';' on Windows and by ':' on
+     * other platforms).
+     */
+    public Boolean sources;
    /**
     * Trace name to be shown in the Trace Viewer.
     */
@@ -72,12 +81,25 @@ public interface Tracing {
      return this;
    }
    /**
-     * Whether to capture DOM snapshot on every action.
+     * If this option is true tracing will
+     * <ul>
+     * <li> capture DOM snapshot on every action</li>
+     * <li> record network activity</li>
+     * </ul>
     */
    public StartOptions setSnapshots(boolean snapshots) {
      this.snapshots = snapshots;
      return this;
    }
+    /**
+     * Whether to include source files for trace actions. List of the directories with source code for the application must be
+     * provided via {@code PLAYWRIGHT_JAVA_SRC} environment variable (the paths should be separated by ';' on Windows and by ':' on
+     * other platforms).
+     */
+    public StartOptions setSources(boolean sources) {
+      this.sources = sources;
+      return this;
+    }
    /**
     * Trace name to be shown in the Trace Viewer.
     */
@@ -17,7 +17,6 @@
 package com.microsoft.playwright;

 import java.nio.file.Path;
-import java.util.*;

 /**
 * When browser context is created with the {@code recordVideo} option, each page has a video object associated with it.
@@ -16,7 +16,6 @@

 package com.microsoft.playwright;

-import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Predicate;

@@ -16,7 +16,6 @@

 package com.microsoft.playwright;

-import java.util.*;

 /**
 * The {@code WebSocketFrame} class represents frames sent over {@code WebSocket} connections in the page. Frame payload is returned by
@@ -16,7 +16,6 @@

 package com.microsoft.playwright;

-import java.util.*;
 import java.util.function.Consumer;

 /**
@@ -0,0 +1,56 @@
+/*
+ * 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.
+ */
+
+package com.microsoft.playwright.assertions;
+
+
+/**
+ * The {@code APIResponseAssertions} class provides assertion methods that can be used to make assertions about the {@code APIResponse}
+ * in the tests. A new instance of {@code APIResponseAssertions} is created by calling {@link PlaywrightAssertions#assertThat
+ * PlaywrightAssertions.assertThat()}:
+ * <pre>{@code
+ * ...
+ * import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+ *
+ * public class TestPage {
+ *   ...
+ *   @Test
+ *   void navigatesToLoginPage() {
+ *     ...
+ *     APIResponse response = page.request().get('https://playwright.dev');
+ *     assertThat(response).isOK();
+ *   }
+ * }
+ * }</pre>
+ */
+public interface APIResponseAssertions {
+  /**
+   * Makes the assertion check for the opposite condition. For example, this code tests that the response status is not
+   * successful:
+   * <pre>{@code
+   * assertThat(response).not().isOK();
+   * }</pre>
+   */
+  APIResponseAssertions not();
+  /**
+   * Ensures the response status code is within [200..299] range.
+   * <pre>{@code
+   * assertThat(response).isOK();
+   * }</pre>
+   */
+  void isOK();
+}
+
@@ -16,9 +16,7 @@

 package com.microsoft.playwright.assertions;

-import java.util.*;
 import java.util.regex.Pattern;
-import com.microsoft.playwright.Locator;

 /**
 * The {@code LocatorAssertions} class provides assertion methods that can be used to make assertions about the {@code Locator} state
@@ -40,6 +38,123 @@ import com.microsoft.playwright.Locator;
 * }</pre>
 */
 public interface LocatorAssertions {
+  class IsCheckedOptions {
+    public Boolean checked;
+    /**
+     * Time to retry the assertion for.
+     */
+    public Double timeout;
+
+    public IsCheckedOptions setChecked(boolean checked) {
+      this.checked = checked;
+      return this;
+    }
+    /**
+     * Time to retry the assertion for.
+     */
+    public IsCheckedOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
+  class IsDisabledOptions {
+    /**
+     * Time to retry the assertion for.
+     */
+    public Double timeout;
+
+    /**
+     * Time to retry the assertion for.
+     */
+    public IsDisabledOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
+  class IsEditableOptions {
+    /**
+     * Time to retry the assertion for.
+     */
+    public Double timeout;
+
+    /**
+     * Time to retry the assertion for.
+     */
+    public IsEditableOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
+  class IsEmptyOptions {
+    /**
+     * Time to retry the assertion for.
+     */
+    public Double timeout;
+
+    /**
+     * Time to retry the assertion for.
+     */
+    public IsEmptyOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
+  class IsEnabledOptions {
+    /**
+     * Time to retry the assertion for.
+     */
+    public Double timeout;
+
+    /**
+     * Time to retry the assertion for.
+     */
+    public IsEnabledOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
+  class IsFocusedOptions {
+    /**
+     * Time to retry the assertion for.
+     */
+    public Double timeout;
+
+    /**
+     * Time to retry the assertion for.
+     */
+    public IsFocusedOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
+  class IsHiddenOptions {
+    /**
+     * Time to retry the assertion for.
+     */
+    public Double timeout;
+
+    /**
+     * Time to retry the assertion for.
+     */
+    public IsHiddenOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
+  class IsVisibleOptions {
+    /**
+     * Time to retry the assertion for.
+     */
+    public Double timeout;
+
+    /**
+     * Time to retry the assertion for.
+     */
+    public IsVisibleOptions setTimeout(double timeout) {
+      this.timeout = timeout;
+      return this;
+    }
+  }
  class ContainsTextOptions {
    /**
     * Time to retry the assertion for.
@@ -188,118 +303,154 @@ public interface LocatorAssertions {
      return this;
    }
  }
-  class IsCheckedOptions {
-    /**
-     * Time to retry the assertion for.
-     */
-    public Double timeout;
-
-    /**
-     * Time to retry the assertion for.
-     */
-    public IsCheckedOptions setTimeout(double timeout) {
-      this.timeout = timeout;
-      return this;
-    }
+  /**
+   * Makes the assertion check for the opposite condition. For example, this code tests that the Locator doesn't contain text
+   * {@code "error"}:
+   * <pre>{@code
+   * assertThat(locator).not().containsText("error");
+   * }</pre>
+   */
+  LocatorAssertions not();
+  /**
+   * Ensures the {@code Locator} points to a checked input.
+   * <pre>{@code
+   * assertThat(page.locator(".subscribe")).isChecked();
+   * }</pre>
+   */
+  default void isChecked() {
+    isChecked(null);
  }
-  class IsDisabledOptions {
-    /**
-     * Time to retry the assertion for.
-     */
-    public Double timeout;
-
-    /**
-     * Time to retry the assertion for.
-     */
-    public IsDisabledOptions setTimeout(double timeout) {
-      this.timeout = timeout;
-      return this;
-    }
+  /**
+   * Ensures the {@code Locator} points to a checked input.
+   * <pre>{@code
+   * assertThat(page.locator(".subscribe")).isChecked();
+   * }</pre>
+   */
+  void isChecked(IsCheckedOptions options);
+  /**
+   * Ensures the {@code Locator} points to a disabled element. Element is disabled if it has "disabled" attribute or is disabled
+   * via <a
+   * href="https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-disabled">'aria-disabled'</a>.
+   * Note that only native control elements such as HTML {@code button}, {@code input}, {@code select}, {@code textarea}, {@code option}, {@code optgroup} can be
+   * disabled by setting "disabled" attribute. "disabled" attribute on other elements is ignored by the browser.
+   * <pre>{@code
+   * assertThat(page.locator("button.submit")).isDisabled();
+   * }</pre>
+   */
+  default void isDisabled() {
+    isDisabled(null);
  }
-  class IsEditableOptions {
-    /**
-     * Time to retry the assertion for.
-     */
-    public Double timeout;
-
-    /**
-     * Time to retry the assertion for.
-     */
-    public IsEditableOptions setTimeout(double timeout) {
-      this.timeout = timeout;
-      return this;
-    }
+  /**
+   * Ensures the {@code Locator} points to a disabled element. Element is disabled if it has "disabled" attribute or is disabled
+   * via <a
+   * href="https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA/Attributes/aria-disabled">'aria-disabled'</a>.
+   * Note that only native control elements such as HTML {@code button}, {@code input}, {@code select}, {@code textarea}, {@code option}, {@code optgroup} can be
+   * disabled by setting "disabled" attribute. "disabled" attribute on other elements is ignored by the browser.
+   * <pre>{@code
+   * assertThat(page.locator("button.submit")).isDisabled();
+   * }</pre>
+   */
+  void isDisabled(IsDisabledOptions options);
+  /**
+   * Ensures the {@code Locator} points to an editable element.
+   * <pre>{@code
+   * assertThat(page.locator("input")).isEditable();
+   * }</pre>
+   */
+  default void isEditable() {
+    isEditable(null);
  }
-  class IsEmptyOptions {
-    /**
-     * Time to retry the assertion for.
-     */
-    public Double timeout;
-
-    /**
-     * Time to retry the assertion for.
-     */
-    public IsEmptyOptions setTimeout(double timeout) {
-      this.timeout = timeout;
-      return this;
-    }
+  /**
+   * Ensures the {@code Locator} points to an editable element.
+   * <pre>{@code
+   * assertThat(page.locator("input")).isEditable();
+   * }</pre>
+   */
+  void isEditable(IsEditableOptions options);
+  /**
+   * Ensures the {@code Locator} points to an empty editable element or to a DOM node that has no text.
+   * <pre>{@code
+   * assertThat(page.locator("div.warning")).isEmpty();
+   * }</pre>
+   */
+  default void isEmpty() {
+    isEmpty(null);
  }
-  class IsEnabledOptions {
-    /**
-     * Time to retry the assertion for.
-     */
-    public Double timeout;
-
-    /**
-     * Time to retry the assertion for.
-     */
-    public IsEnabledOptions setTimeout(double timeout) {
-      this.timeout = timeout;
-      return this;
-    }
+  /**
+   * Ensures the {@code Locator} points to an empty editable element or to a DOM node that has no text.
+   * <pre>{@code
+   * assertThat(page.locator("div.warning")).isEmpty();
+   * }</pre>
+   */
+  void isEmpty(IsEmptyOptions options);
+  /**
+   * Ensures the {@code Locator} points to an enabled element.
+   * <pre>{@code
+   * assertThat(page.locator("button.submit")).isEnabled();
+   * }</pre>
+   */
+  default void isEnabled() {
+    isEnabled(null);
  }
-  class IsFocusedOptions {
-    /**
-     * Time to retry the assertion for.
-     */
-    public Double timeout;
-
-    /**
-     * Time to retry the assertion for.
-     */
-    public IsFocusedOptions setTimeout(double timeout) {
-      this.timeout = timeout;
-      return this;
-    }
+  /**
+   * Ensures the {@code Locator} points to an enabled element.
+   * <pre>{@code
+   * assertThat(page.locator("button.submit")).isEnabled();
+   * }</pre>
+   */
+  void isEnabled(IsEnabledOptions options);
+  /**
+   * Ensures the {@code Locator} points to a focused DOM node.
+   * <pre>{@code
+   * assertThat(page.locator("input")).isFocused();
+   * }</pre>
+   */
+  default void isFocused() {
+    isFocused(null);
  }
-  class IsHiddenOptions {
-    /**
-     * Time to retry the assertion for.
-     */
-    public Double timeout;
-
-    /**
-     * Time to retry the assertion for.
-     */
-    public IsHiddenOptions setTimeout(double timeout) {
-      this.timeout = timeout;
-      return this;
-    }
+  /**
+   * Ensures the {@code Locator} points to a focused DOM node.
+   * <pre>{@code
+   * assertThat(page.locator("input")).isFocused();
+   * }</pre>
+   */
+  void isFocused(IsFocusedOptions options);
+  /**
+   * Ensures the {@code Locator} points to a hidden DOM node, which is the opposite of <a
+   * href="https://playwright.dev/java/docs/api/actionability#visible">visible</a>.
+   * <pre>{@code
+   * assertThat(page.locator(".my-element")).isHidden();
+   * }</pre>
+   */
+  default void isHidden() {
+    isHidden(null);
  }
-  class IsVisibleOptions {
-    /**
-     * Time to retry the assertion for.
-     */
-    public Double timeout;
-
-    /**
-     * Time to retry the assertion for.
-     */
-    public IsVisibleOptions setTimeout(double timeout) {
-      this.timeout = timeout;
-      return this;
-    }
+  /**
+   * Ensures the {@code Locator} points to a hidden DOM node, which is the opposite of <a
+   * href="https://playwright.dev/java/docs/api/actionability#visible">visible</a>.
+   * <pre>{@code
+   * assertThat(page.locator(".my-element")).isHidden();
+   * }</pre>
+   */
+  void isHidden(IsHiddenOptions options);
+  /**
+   * Ensures the {@code Locator} points to a <a href="https://playwright.dev/java/docs/api/actionability#visible">visible</a> DOM
+   * node.
+   * <pre>{@code
+   * assertThat(page.locator(".my-element")).isVisible();
+   * }</pre>
+   */
+  default void isVisible() {
+    isVisible(null);
  }
+  /**
+   * Ensures the {@code Locator} points to a <a href="https://playwright.dev/java/docs/api/actionability#visible">visible</a> DOM
+   * node.
+   * <pre>{@code
+   * assertThat(page.locator(".my-element")).isVisible();
+   * }</pre>
+   */
+  void isVisible(IsVisibleOptions options);
  /**
   * Ensures the {@code Locator} points to an element that contains the given text. You can use regular expressions for the value
   * as well.
@@ -307,7 +458,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator(".title")).containsText("substring");
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .list-item")).containsText(new String[] {"Text 1", "Text 4", "Text 5"});
   * }</pre>
@@ -324,7 +475,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator(".title")).containsText("substring");
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .list-item")).containsText(new String[] {"Text 1", "Text 4", "Text 5"});
   * }</pre>
@@ -339,7 +490,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator(".title")).containsText("substring");
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .list-item")).containsText(new String[] {"Text 1", "Text 4", "Text 5"});
   * }</pre>
@@ -356,7 +507,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator(".title")).containsText("substring");
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .list-item")).containsText(new String[] {"Text 1", "Text 4", "Text 5"});
   * }</pre>
@@ -371,7 +522,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator(".title")).containsText("substring");
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .list-item")).containsText(new String[] {"Text 1", "Text 4", "Text 5"});
   * }</pre>
@@ -388,7 +539,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator(".title")).containsText("substring");
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .list-item")).containsText(new String[] {"Text 1", "Text 4", "Text 5"});
   * }</pre>
@@ -403,7 +554,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator(".title")).containsText("substring");
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .list-item")).containsText(new String[] {"Text 1", "Text 4", "Text 5"});
   * }</pre>
@@ -420,7 +571,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator(".title")).containsText("substring");
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .list-item")).containsText(new String[] {"Text 1", "Text 4", "Text 5"});
   * }</pre>
@@ -478,7 +629,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator("#component")).hasClass(Pattern.compile("selected"));
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .component")).hasClass(new String[] {"component", "component selected", "component"});
   * }</pre>
@@ -494,7 +645,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator("#component")).hasClass(Pattern.compile("selected"));
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .component")).hasClass(new String[] {"component", "component selected", "component"});
   * }</pre>
@@ -508,7 +659,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator("#component")).hasClass(Pattern.compile("selected"));
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .component")).hasClass(new String[] {"component", "component selected", "component"});
   * }</pre>
@@ -524,7 +675,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator("#component")).hasClass(Pattern.compile("selected"));
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .component")).hasClass(new String[] {"component", "component selected", "component"});
   * }</pre>
@@ -538,7 +689,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator("#component")).hasClass(Pattern.compile("selected"));
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .component")).hasClass(new String[] {"component", "component selected", "component"});
   * }</pre>
@@ -554,7 +705,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator("#component")).hasClass(Pattern.compile("selected"));
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .component")).hasClass(new String[] {"component", "component selected", "component"});
   * }</pre>
@@ -568,7 +719,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator("#component")).hasClass(Pattern.compile("selected"));
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .component")).hasClass(new String[] {"component", "component selected", "component"});
   * }</pre>
@@ -584,7 +735,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator("#component")).hasClass(Pattern.compile("selected"));
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .component")).hasClass(new String[] {"component", "component selected", "component"});
   * }</pre>
@@ -676,11 +827,31 @@ public interface LocatorAssertions {
   * @param id Element id.
   */
  void hasId(String id, HasIdOptions options);
+  /**
+   * Ensures the {@code Locator} points to an element with the given DOM Node ID.
+   * <pre>{@code
+   * assertThat(page.locator("input")).hasId("lastname");
+   * }</pre>
+   *
+   * @param id Element id.
+   */
+  default void hasId(Pattern id) {
+    hasId(id, null);
+  }
+  /**
+   * Ensures the {@code Locator} points to an element with the given DOM Node ID.
+   * <pre>{@code
+   * assertThat(page.locator("input")).hasId("lastname");
+   * }</pre>
+   *
+   * @param id Element id.
+   */
+  void hasId(Pattern id, HasIdOptions options);
  /**
   * Ensures the {@code Locator} points to an element with given JavaScript property. Note that this property can be of a primitive
   * type as well as a plain serializable JavaScript object.
   * <pre>{@code
-   * assertThat(page.locator("input")).hasJSProperty("type", "text");
+   * assertThat(page.locator("input")).hasJSProperty("loaded", true);
   * }</pre>
   *
   * @param name Property name.
@@ -693,7 +864,7 @@ public interface LocatorAssertions {
   * Ensures the {@code Locator} points to an element with given JavaScript property. Note that this property can be of a primitive
   * type as well as a plain serializable JavaScript object.
   * <pre>{@code
-   * assertThat(page.locator("input")).hasJSProperty("type", "text");
+   * assertThat(page.locator("input")).hasJSProperty("loaded", true);
   * }</pre>
   *
   * @param name Property name.
@@ -707,7 +878,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator(".title")).hasText(Pattern.compile("Welcome, .*"));
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .component")).hasText(new String[] {"Text 1", "Text 2", "Text 3"});
   * }</pre>
@@ -724,7 +895,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator(".title")).hasText(Pattern.compile("Welcome, .*"));
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .component")).hasText(new String[] {"Text 1", "Text 2", "Text 3"});
   * }</pre>
@@ -739,7 +910,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator(".title")).hasText(Pattern.compile("Welcome, .*"));
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .component")).hasText(new String[] {"Text 1", "Text 2", "Text 3"});
   * }</pre>
@@ -756,7 +927,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator(".title")).hasText(Pattern.compile("Welcome, .*"));
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .component")).hasText(new String[] {"Text 1", "Text 2", "Text 3"});
   * }</pre>
@@ -771,7 +942,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator(".title")).hasText(Pattern.compile("Welcome, .*"));
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .component")).hasText(new String[] {"Text 1", "Text 2", "Text 3"});
   * }</pre>
@@ -788,7 +959,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator(".title")).hasText(Pattern.compile("Welcome, .*"));
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .component")).hasText(new String[] {"Text 1", "Text 2", "Text 3"});
   * }</pre>
@@ -803,7 +974,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator(".title")).hasText(Pattern.compile("Welcome, .*"));
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .component")).hasText(new String[] {"Text 1", "Text 2", "Text 3"});
   * }</pre>
@@ -820,7 +991,7 @@ public interface LocatorAssertions {
   * assertThat(page.locator(".title")).hasText(Pattern.compile("Welcome, .*"));
   * }</pre>
   *
-   * <p> Note that if array is passed as an expected value, entire lists can be asserted:
+   * <p> Note that if array is passed as an expected value, entire lists of elements can be asserted:
   * <pre>{@code
   * assertThat(page.locator("list > .component")).hasText(new String[] {"Text 1", "Text 2", "Text 3"});
   * }</pre>
@@ -872,145 +1043,5 @@ public interface LocatorAssertions {
   * @param value Expected value.
   */
  void hasValue(Pattern value, HasValueOptions options);
-  /**
-   * Ensures the {@code Locator} points to a checked input.
-   * <pre>{@code
-   * assertThat(page.locator(".subscribe")).isChecked();
-   * }</pre>
-   */
-  default void isChecked() {
-    isChecked(null);
-  }
-  /**
-   * Ensures the {@code Locator} points to a checked input.
-   * <pre>{@code
-   * assertThat(page.locator(".subscribe")).isChecked();
-   * }</pre>
-   */
-  void isChecked(IsCheckedOptions options);
-  /**
-   * Ensures the {@code Locator} points to a disabled element.
-   * <pre>{@code
-   * assertThat(page.locator("button.submit")).isDisabled();
-   * }</pre>
-   */
-  default void isDisabled() {
-    isDisabled(null);
-  }
-  /**
-   * Ensures the {@code Locator} points to a disabled element.
-   * <pre>{@code
-   * assertThat(page.locator("button.submit")).isDisabled();
-   * }</pre>
-   */
-  void isDisabled(IsDisabledOptions options);
-  /**
-   * Ensures the {@code Locator} points to an editable element.
-   * <pre>{@code
-   * assertThat(page.locator("input")).isEditable();
-   * }</pre>
-   */
-  default void isEditable() {
-    isEditable(null);
-  }
-  /**
-   * Ensures the {@code Locator} points to an editable element.
-   * <pre>{@code
-   * assertThat(page.locator("input")).isEditable();
-   * }</pre>
-   */
-  void isEditable(IsEditableOptions options);
-  /**
-   * Ensures the {@code Locator} points to an empty editable element or to a DOM node that has no text.
-   * <pre>{@code
-   * assertThat(page.locator("div.warning")).isEmpty();
-   * }</pre>
-   */
-  default void isEmpty() {
-    isEmpty(null);
-  }
-  /**
-   * Ensures the {@code Locator} points to an empty editable element or to a DOM node that has no text.
-   * <pre>{@code
-   * assertThat(page.locator("div.warning")).isEmpty();
-   * }</pre>
-   */
-  void isEmpty(IsEmptyOptions options);
-  /**
-   * Ensures the {@code Locator} points to an enabled element.
-   * <pre>{@code
-   * assertThat(page.locator("button.submit")).isEnabled();
-   * }</pre>
-   */
-  default void isEnabled() {
-    isEnabled(null);
-  }
-  /**
-   * Ensures the {@code Locator} points to an enabled element.
-   * <pre>{@code
-   * assertThat(page.locator("button.submit")).isEnabled();
-   * }</pre>
-   */
-  void isEnabled(IsEnabledOptions options);
-  /**
-   * Ensures the {@code Locator} points to a focused DOM node.
-   * <pre>{@code
-   * assertThat(page.locator("input")).isFocused();
-   * }</pre>
-   */
-  default void isFocused() {
-    isFocused(null);
-  }
-  /**
-   * Ensures the {@code Locator} points to a focused DOM node.
-   * <pre>{@code
-   * assertThat(page.locator("input")).isFocused();
-   * }</pre>
-   */
-  void isFocused(IsFocusedOptions options);
-  /**
-   * Ensures the {@code Locator} points to a hidden DOM node, which is the opposite of <a
-   * href="https://playwright.dev/java/docs/actionability/#visible">visible</a>.
-   * <pre>{@code
-   * assertThat(page.locator(".my-element")).isHidden();
-   * }</pre>
-   */
-  default void isHidden() {
-    isHidden(null);
-  }
-  /**
-   * Ensures the {@code Locator} points to a hidden DOM node, which is the opposite of <a
-   * href="https://playwright.dev/java/docs/actionability/#visible">visible</a>.
-   * <pre>{@code
-   * assertThat(page.locator(".my-element")).isHidden();
-   * }</pre>
-   */
-  void isHidden(IsHiddenOptions options);
-  /**
-   * Ensures the {@code Locator} points to a <a href="https://playwright.dev/java/docs/actionability/#visible">visible</a> DOM
-   * node.
-   * <pre>{@code
-   * assertThat(page.locator(".my-element")).isVisible();
-   * }</pre>
-   */
-  default void isVisible() {
-    isVisible(null);
-  }
-  /**
-   * Ensures the {@code Locator} points to a <a href="https://playwright.dev/java/docs/actionability/#visible">visible</a> DOM
-   * node.
-   * <pre>{@code
-   * assertThat(page.locator(".my-element")).isVisible();
-   * }</pre>
-   */
-  void isVisible(IsVisibleOptions options);
-  /**
-   * Makes the assertion check for the opposite condition. For example, this code tests that the Locator doesn't contain text
-   * {@code "error"}:
-   * <pre>{@code
-   * assertThat(locator).not().containsText("error");
-   * }</pre>
-   */
-  LocatorAssertions not();
 }

@@ -16,13 +16,11 @@

 package com.microsoft.playwright.assertions;

-import java.util.*;
 import java.util.regex.Pattern;
-import com.microsoft.playwright.Page;

 /**
 * The {@code PageAssertions} class provides assertion methods that can be used to make assertions about the {@code Page} state in the
- * tests. A new instance of {@code LocatorAssertions} is created by calling {@link PlaywrightAssertions#assertThat
+ * tests. A new instance of {@code PageAssertions} is created by calling {@link PlaywrightAssertions#assertThat
 * PlaywrightAssertions.assertThat()}:
 * <pre>{@code
 * ...
@@ -68,6 +66,14 @@ public interface PageAssertions {
      return this;
    }
  }
+  /**
+   * Makes the assertion check for the opposite condition. For example, this code tests that the page URL doesn't contain
+   * {@code "error"}:
+   * <pre>{@code
+   * assertThat(page).not().hasURL("error");
+   * }</pre>
+   */
+  PageAssertions not();
  /**
   * Ensures the page has the given title.
   * <pre>{@code
@@ -148,13 +154,5 @@ public interface PageAssertions {
   * @param urlOrRegExp Expected substring or RegExp.
   */
  void hasURL(Pattern urlOrRegExp, HasURLOptions options);
-  /**
-   * Makes the assertion check for the opposite condition. For example, this code tests that the page URL doesn't contain
-   * {@code "error"}:
-   * <pre>{@code
-   * assertThat(page).not().hasURL("error");
-   * }</pre>
-   */
-  PageAssertions not();
 }

@@ -16,15 +16,16 @@

 package com.microsoft.playwright.assertions;

-import java.util.*;
+import com.microsoft.playwright.APIResponse;
 import com.microsoft.playwright.Locator;
 import com.microsoft.playwright.Page;
+import com.microsoft.playwright.impl.APIResponseAssertionsImpl;
 import com.microsoft.playwright.impl.LocatorAssertionsImpl;
 import com.microsoft.playwright.impl.PageAssertionsImpl;

 /**
- * The {@code PlaywrightAssertions} class provides convenience methods for creating assertions that will wait until the expected
- * condition is met.
+ * Playwright gives you Web-First Assertions with convenience methods for creating assertions that will wait and retry
+ * until the expected condition is met.
 *
 * <p> Consider the following example:
 * <pre>{@code
@@ -47,10 +48,20 @@ import com.microsoft.playwright.impl.PageAssertionsImpl;
 * You can pass this timeout as an option.
 *
 * <p> By default, the timeout for assertions is set to 5 seconds.
- *
- * <p> To use Playwright assertions add the following dependency into the {@code pom.xml} of your Maven project:
 */
 public interface PlaywrightAssertions {
+  /**
+   * Creates a {@code APIResponseAssertions} object for the given {@code APIResponse}.
+   * <pre>{@code
+   * PlaywrightAssertions.assertThat(response).isOK();
+   * }</pre>
+   *
+   * @param response {@code APIResponse} object to use for assertions.
+   */
+  static APIResponseAssertions assertThat(APIResponse response) {
+    return new APIResponseAssertionsImpl(response);
+  }
+
  /**
   * Creates a {@code LocatorAssertions} object for the given {@code Locator}.
   * <pre>{@code
@@ -0,0 +1,199 @@
+package com.microsoft.playwright.impl;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.microsoft.playwright.APIRequestContext;
+import com.microsoft.playwright.APIResponse;
+import com.microsoft.playwright.PlaywrightException;
+import com.microsoft.playwright.Request;
+import com.microsoft.playwright.options.FilePayload;
+import com.microsoft.playwright.options.RequestOptions;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Base64;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import static com.microsoft.playwright.impl.Serialization.*;
+import static com.microsoft.playwright.impl.Utils.toFilePayload;
+
+class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
+  private final TracingImpl tracing;
+
+  APIRequestContextImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
+    super(parent, type, guid, initializer);
+    this.tracing = connection.getExistingObject(initializer.getAsJsonObject("tracing").get("guid").getAsString());
+  }
+
+  @Override
+  public APIResponse delete(String url, RequestOptions options) {
+    return fetch(url, ensureOptions(options, "DELETE"));
+  }
+
+  @Override
+  public void dispose() {
+    withLogging("APIRequestContext.dispose", () -> sendMessage("dispose"));
+  }
+
+  @Override
+  public APIResponse fetch(String urlOrRequest, RequestOptions options) {
+    return withLogging("APIRequestContext.fetch", () -> fetchImpl(urlOrRequest, (RequestOptionsImpl) options));
+  }
+
+  @Override
+  public APIResponse fetch(Request request, RequestOptions optionsArg) {
+    RequestOptionsImpl options = (RequestOptionsImpl) optionsArg;
+    if (options == null) {
+      options = new RequestOptionsImpl();
+    }
+    if (options.method == null) {
+      options.method = request.method();
+    }
+    if (options.headers == null) {
+      options.headers = request.headers();
+    }
+    if (options.data == null && options.form == null && options.multipart == null) {
+      options.data = request.postDataBuffer();
+    }
+    return fetch(request.url(), options);
+  }
+
+  private APIResponse fetchImpl(String url, RequestOptionsImpl options) {
+    if (options == null) {
+      options = new RequestOptionsImpl();
+    }
+    JsonObject params = new JsonObject();
+    params.addProperty("url", url);
+    if (options.params != null) {
+      Map<String, String> queryParams = new LinkedHashMap<>();
+      for (Map.Entry<String, ?> e : options.params.entrySet()) {
+        queryParams.put(e.getKey(), "" + e.getValue());
+      }
+      params.add("params", toNameValueArray(queryParams));
+    }
+    if (options.method != null) {
+      params.addProperty("method", options.method);
+    }
+    if (options.headers != null) {
+      params.add("headers", toProtocol(options.headers));
+    }
+
+    if (options.data != null) {
+      byte[] bytes = null;
+      if (options.data instanceof byte[]) {
+        bytes = (byte[]) options.data;
+      } else if (options.data instanceof String && !isJsonContentType(options.headers)) {
+        bytes = ((String) options.data).getBytes(StandardCharsets.UTF_8);
+      }
+      if (bytes == null) {
+        params.add("jsonData", gson().toJsonTree(options.data));
+      } else {
+        String base64 = Base64.getEncoder().encodeToString(bytes);
+        params.addProperty("postData", base64);
+      }
+    }
+    if (options.form != null) {
+      params.add("formData", toNameValueArray(options.form.fields));
+    }
+    if (options.multipart != null) {
+      params.add("multipartData", serializeMultipartData(options.multipart.fields));
+    }
+    if (options.timeout != null) {
+      params.addProperty("timeout", options.timeout);
+    }
+    if (options.failOnStatusCode != null) {
+      params.addProperty("failOnStatusCode", options.failOnStatusCode);
+    }
+    if (options.ignoreHTTPSErrors != null) {
+      params.addProperty("ignoreHTTPSErrors", options.ignoreHTTPSErrors);
+    }
+    JsonObject json = sendMessage("fetch", params).getAsJsonObject();
+    return new APIResponseImpl(this, json.getAsJsonObject("response"));
+  }
+
+  private static boolean isJsonContentType(Map<String, String> headers) {
+    if (headers == null) {
+      return false;
+    }
+    for (Map.Entry<String, String> e : headers.entrySet()) {
+      if ("content-type".equalsIgnoreCase(e.getKey())) {
+        return "application/json".equals(e.getValue());
+      }
+    }
+    return false;
+  }
+
+  private static JsonArray serializeMultipartData(Map<String, Object> data) {
+    JsonArray result = new JsonArray();
+    for (Map.Entry<String, Object> e : data.entrySet()) {
+      FilePayload filePayload = null;
+      if (e.getValue() instanceof FilePayload) {
+        filePayload = (FilePayload) e.getValue();
+      } else if (e.getValue() instanceof Path) {
+        filePayload = toFilePayload((Path) e.getValue());
+      } else if (e.getValue() instanceof File) {
+        filePayload = toFilePayload(((File) e.getValue()).toPath());
+      }
+      JsonObject item = new JsonObject();
+      item.addProperty("name", e.getKey());
+      if (filePayload == null) {
+        item.addProperty("value", "" + e.getValue());
+      } else {
+        item.add("file", toProtocol(filePayload));
+      }
+      result.add(item);
+    }
+    return result;
+  }
+
+  @Override
+  public APIResponse get(String url, RequestOptions options) {
+    return fetch(url, ensureOptions(options, "GET"));
+  }
+
+  @Override
+  public APIResponse head(String url, RequestOptions options) {
+    return fetch(url, ensureOptions(options, "HEAD"));
+  }
+
+  @Override
+  public APIResponse patch(String url, RequestOptions options) {
+    return fetch(url, ensureOptions(options, "PATCH"));
+  }
+
+  @Override
+  public APIResponse post(String url, RequestOptions options) {
+    return fetch(url, ensureOptions(options, "POST"));
+  }
+
+  @Override
+  public APIResponse put(String url, RequestOptions options) {
+    return fetch(url, ensureOptions(options, "PUT"));
+  }
+
+  @Override
+  public String storageState(StorageStateOptions options) {
+    return withLogging("APIRequestContext.storageState", () -> {
+      JsonElement json = sendMessage("storageState");
+      String storageState = json.toString();
+      if (options != null && options.path != null) {
+        Utils.writeToFile(storageState.getBytes(StandardCharsets.UTF_8), options.path);
+      }
+      return storageState;
+    });
+  }
+
+  private static RequestOptionsImpl ensureOptions(RequestOptions options, String method) {
+    RequestOptionsImpl impl = (RequestOptionsImpl) options;
+    if (impl == null) {
+      impl = new RequestOptionsImpl();
+    }
+    if (impl.method == null) {
+      impl.method = method;
+    }
+    return impl;
+  }
+}
@@ -0,0 +1,53 @@
+package com.microsoft.playwright.impl;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.microsoft.playwright.APIRequest;
+import com.microsoft.playwright.PlaywrightException;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+
+import static com.microsoft.playwright.impl.Serialization.gson;
+
+class APIRequestImpl implements APIRequest {
+  private final PlaywrightImpl playwright;
+
+  APIRequestImpl(PlaywrightImpl playwright) {
+    this.playwright = playwright;
+  }
+
+  @Override
+  public APIRequestContextImpl newContext(NewContextOptions options) {
+    return playwright.withLogging("APIRequest.newContext", () -> newContextImpl(options));
+  }
+
+  private APIRequestContextImpl newContextImpl(NewContextOptions options) {
+    if (options == null) {
+      options = new NewContextOptions();
+    }
+    if (options.storageStatePath != null) {
+      try {
+        byte[] bytes = Files.readAllBytes(options.storageStatePath);
+        options.storageState = new String(bytes, StandardCharsets.UTF_8);
+        options.storageStatePath = null;
+      } catch (IOException e) {
+        throw new PlaywrightException("Failed to read storage state from file", e);
+      }
+    }
+    JsonObject storageState = null;
+    if (options.storageState != null) {
+      storageState = new Gson().fromJson(options.storageState, JsonObject.class);
+      options.storageState = null;
+    }
+    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+    if (storageState != null) {
+      params.add("storageState", storageState);
+    }
+
+    JsonObject result = playwright.sendMessage("newRequest", params).getAsJsonObject();
+    APIRequestContextImpl context = playwright.connection.getExistingObject(result.getAsJsonObject("request").get("guid").getAsString());
+    return context;
+  }
+}
@@ -0,0 +1,59 @@
+/*
+ * 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.
+ */
+
+package com.microsoft.playwright.impl;
+
+import com.microsoft.playwright.APIResponse;
+import com.microsoft.playwright.assertions.APIResponseAssertions;
+import org.opentest4j.AssertionFailedError;
+
+import java.util.List;
+
+public class APIResponseAssertionsImpl implements APIResponseAssertions {
+  private final APIResponse actual;
+  private final boolean isNot;
+
+  APIResponseAssertionsImpl(APIResponse response, boolean isNot) {
+    this.actual = response;
+    this.isNot = isNot;
+  }
+
+  public APIResponseAssertionsImpl(APIResponse response) {
+    this(response, false);
+  }
+
+  @Override
+  public APIResponseAssertions not() {
+    return new APIResponseAssertionsImpl(actual, !isNot);
+  }
+
+  @Override
+  public void isOK() {
+    if (actual.ok() == !isNot) {
+      return;
+    }
+    String message = "Response status expected to be within [200..299] range, was " + actual.status();
+    if (isNot) {
+      message = message.replace("expected to", "expected not to");
+    }
+    List<String> logList = ((APIResponseImpl) actual).fetchLog();
+    String log = String.join("\n", logList);
+    if (!log.isEmpty()) {
+      log = "\nCall log:\n" + log;
+    }
+    throw new AssertionFailedError(message + log);
+  }
+}
@@ -0,0 +1,124 @@
+/*
+ * 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.
+ */
+
+package com.microsoft.playwright.impl;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
+import com.microsoft.playwright.APIResponse;
+import com.microsoft.playwright.PlaywrightException;
+import com.microsoft.playwright.options.HttpHeader;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.List;
+import java.util.Map;
+
+import static com.microsoft.playwright.impl.Serialization.gson;
+import static com.microsoft.playwright.impl.Utils.isSafeCloseError;
+import static java.util.Arrays.asList;
+
+class APIResponseImpl implements APIResponse {
+  final APIRequestContextImpl context;
+  private final JsonObject initializer;
+  private final RawHeaders headers;
+
+  APIResponseImpl(APIRequestContextImpl apiRequestContext, JsonObject response) {
+    context = apiRequestContext;
+    initializer = response;
+    headers = new RawHeaders(asList(gson().fromJson(initializer.getAsJsonArray("headers"), HttpHeader[].class)));
+  }
+
+  @Override
+  public byte[] body() {
+    return context.withLogging("APIResponse.body", () -> {
+      try {
+        JsonObject params = new JsonObject();
+        params.addProperty("fetchUid", fetchUid());
+        JsonObject json = context.sendMessage("fetchResponseBody", params).getAsJsonObject();
+        if (!json.has("binary")) {
+          throw new PlaywrightException("Response has been disposed");
+        }
+        return Base64.getDecoder().decode(json.get("binary").getAsString());
+      } catch (PlaywrightException e) {
+        if (isSafeCloseError(e)) {
+          throw new PlaywrightException("Response has been disposed");
+        }
+        throw e;
+      }
+    });
+  }
+
+  @Override
+  public void dispose() {
+    context.withLogging("APIResponse.dispose", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("fetchUid", fetchUid());
+      context.sendMessage("disposeAPIResponse", params);
+    });
+  }
+
+  @Override
+  public Map<String, String> headers() {
+    return headers.headers();
+  }
+
+  @Override
+  public List<HttpHeader> headersArray() {
+    return headers.headersArray();
+  }
+
+  @Override
+  public boolean ok() {
+    int status = status();
+    return status == 0 || (status >= 200 && status <= 299);
+  }
+
+  @Override
+  public int status() {
+    return initializer.get("status").getAsInt();
+  }
+
+  @Override
+  public String statusText() {
+    return initializer.get("statusText").getAsString();
+  }
+
+  @Override
+  public String text() {
+    return new String(body(), StandardCharsets.UTF_8);
+  }
+
+  @Override
+  public String url() {
+    return initializer.get("url").getAsString();
+  }
+
+  String fetchUid() {
+    return initializer.get("fetchUid").getAsString();
+  }
+
+  List<String> fetchLog() {
+    JsonObject params = new JsonObject();
+    params.addProperty("fetchUid", fetchUid());
+    JsonObject json = context.sendMessage("fetchLog", params).getAsJsonObject();
+    JsonArray log = json.get("log").getAsJsonArray();
+    return gson().fromJson(log, new TypeToken<List<String>>() {}.getType());
+  }
+
+}
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;

+import static com.microsoft.playwright.impl.Utils.toJsRegexFlags;
 import static java.util.Arrays.asList;

 class AssertionsBase {
@@ -66,7 +67,10 @@ class AssertionsBase {
      if (expected == null) {
        throw new AssertionFailedError(message + log);
      }
-      throw new AssertionFailedError(message + log, formatValue(expected), formatValue(actual));
+      ValueWrapper expectedValue = formatValue(expected);
+      ValueWrapper actualValue = formatValue(actual);
+      message += ": " + expectedValue.getStringRepresentation() + "\nReceived: " + actualValue.getStringRepresentation() + "\n";
+      throw new AssertionFailedError(message + log, expectedValue, actualValue);
    }
  }

@@ -83,22 +87,7 @@ class AssertionsBase {
    ExpectedTextValue expected = new ExpectedTextValue();
    expected.regexSource = pattern.pattern();
    if (pattern.flags() != 0) {
-      expected.regexFlags = "";
-      if ((pattern.flags() & Pattern.CASE_INSENSITIVE) != 0) {
-        // Case-insensitive search.
-        expected.regexFlags += "i";
-      }
-      if ((pattern.flags() & Pattern.DOTALL) != 0) {
-        // Allows . to match newline characters.
-        expected.regexFlags += "s";
-      }
-      if ((pattern.flags() & Pattern.MULTILINE) != 0) {
-        // Multi-line search.
-        expected.regexFlags += "m";
-      }
-      if ((pattern.flags() & ~(Pattern.MULTILINE | Pattern.CASE_INSENSITIVE | Pattern.DOTALL)) != 0) {
-        throw new PlaywrightException("Unexpected RegEx flag, only CASE_INSENSITIVE, DOTALL and MULTILINE are supported.");
-      }
+      expected.regexFlags = toJsRegexFlags(pattern);
    }
    return expected;
  }
@@ -30,10 +30,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
@@ -47,6 +44,7 @@ import static java.util.Arrays.asList;
 class BrowserContextImpl extends ChannelOwner implements BrowserContext {
  private final BrowserImpl browser;
  private final TracingImpl tracing;
+  private final APIRequestContextImpl request;
  final List<PageImpl> pages = new ArrayList<>();
  final Router routes = new Router();
  private boolean isClosedOrClosing;
@@ -74,7 +72,9 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    } else {
      browser = null;
    }
-    this.tracing = new TracingImpl(this);
+    this.tracing = connection.getExistingObject(initializer.getAsJsonObject("tracing").get("guid").getAsString());
+    tracing.isRemote = browser != null && browser.isRemote;
+    this.request = connection.getExistingObject(initializer.getAsJsonObject("APIRequestContext").get("guid").getAsString());
  }

  void setBaseUrl(String spec) {
@@ -172,7 +172,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {

  @Override
  public List<Cookie> cookies(String url) {
-    return cookies(url == null ? new ArrayList<>() : asList(url));
+    return cookies(url == null ? new ArrayList<>() : Collections.singletonList(url));
  }

  private void closeImpl() {
@@ -329,6 +329,11 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    return new ArrayList<>(pages);
  }

+  @Override
+  public APIRequestContextImpl request() {
+    return request;
+  }
+
  @Override
  public void route(String url, Consumer<Route> handler, RouteOptions options) {
    route(new UrlMatcher(this.baseUrl, url), handler, options);
@@ -424,7 +429,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
  }

  @Override
-  public Tracing tracing() {
+  public TracingImpl tracing() {
    return tracing;
  }

@@ -555,4 +560,11 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    }
    listeners.notify(EventType.CLOSE, this);
  }
+
+  WritableStream createTempFile(String name) {
+    JsonObject params = new JsonObject();
+    params.addProperty("name", name);
+    JsonObject json = sendMessage("createTempFile", params).getAsJsonObject();
+    return connection.getExistingObject(json.getAsJsonObject("writableStream").get("guid").getAsString());
+  }
 }
@@ -31,7 +31,7 @@ import java.util.*;
 import java.util.function.Consumer;

 import static com.microsoft.playwright.impl.Serialization.gson;
-import static com.microsoft.playwright.impl.Utils.convertViaJson;
+import static com.microsoft.playwright.impl.Utils.convertType;
 import static com.microsoft.playwright.impl.Utils.isSafeCloseError;

 class BrowserImpl extends ChannelOwner implements Browser {
@@ -40,6 +40,7 @@ class BrowserImpl extends ChannelOwner implements Browser {
  boolean isRemote;
  boolean isConnectedOverWebSocket;
  private boolean isConnected = true;
+  LocalUtils localUtils;

  enum EventType {
    DISCONNECTED,
@@ -171,6 +172,7 @@ class BrowserImpl extends ChannelOwner implements Browser {
      context.setBaseUrl(options.baseURL);
    }
    context.recordHarPath = options.recordHarPath;
+    context.tracing().localUtils = localUtils;
    contexts.add(context);
    return context;
  }
@@ -209,7 +211,7 @@ class BrowserImpl extends ChannelOwner implements Browser {
  }

  private Page newPageImpl(NewPageOptions options) {
-    BrowserContextImpl context = newContext(convertViaJson(options, NewContextOptions.class));
+    BrowserContextImpl context = newContext(convertType(options, NewContextOptions.class));
    PageImpl page = context.newPage();
    page.ownedContext = context;
    context.ownerPage = page;
@@ -30,6 +30,8 @@ import java.util.function.Consumer;
 import static com.microsoft.playwright.impl.Serialization.gson;

 class BrowserTypeImpl extends ChannelOwner implements BrowserType {
+  LocalUtils localUtils;
+
  BrowserTypeImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
  }
@@ -45,7 +47,9 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    JsonElement result = sendMessage("launch", params);
-    return connection.getExistingObject(result.getAsJsonObject().getAsJsonObject("browser").get("guid").getAsString());
+    BrowserImpl browser = connection.getExistingObject(result.getAsJsonObject().getAsJsonObject("browser").get("guid").getAsString());
+    browser.localUtils = localUtils;
+    return browser;
  }

  @Override
@@ -60,6 +64,22 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
    // We don't use gson() here as the headers map should be serialized to a json object.
    JsonObject params = new Gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("wsEndpoint", wsEndpoint);
+
+    if (!params.has("headers")) {
+      params.add("headers", new JsonObject());
+    }
+    JsonObject headers = params.get("headers").getAsJsonObject();
+    boolean foundBrowserHeader = false;
+    for (String name : headers.keySet()) {
+      if ("x-playwright-browser".equalsIgnoreCase(name)) {
+        foundBrowserHeader = true;
+        break;
+      }
+    }
+    if (!foundBrowserHeader) {
+      headers.addProperty("x-playwright-browser", name());
+    }
+
    JsonObject json = sendMessage("connect", params).getAsJsonObject();
    JsonPipe pipe = connection.getExistingObject(json.getAsJsonObject("pipe").get("guid").getAsString());
    Connection connection = new Connection(pipe);
@@ -76,6 +96,7 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
    BrowserImpl browser = connection.getExistingObject(playwright.initializer.getAsJsonObject("preLaunchedBrowser").get("guid").getAsString());
    browser.isRemote = true;
    browser.isConnectedOverWebSocket = true;
+    browser.localUtils = localUtils;
    Consumer<JsonPipe> connectionCloseListener = t -> browser.notifyRemoteClosed();
    pipe.onClose(connectionCloseListener);
    browser.onDisconnected(b -> {
@@ -109,6 +130,7 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {

    BrowserImpl browser = connection.getExistingObject(json.getAsJsonObject("browser").get("guid").getAsString());
    browser.isRemote = true;
+    browser.localUtils = localUtils;
    if (json.has("defaultContext")) {
      String contextId = json.getAsJsonObject("defaultContext").get("guid").getAsString();
      BrowserContextImpl defaultContext = connection.getExistingObject(contextId);
@@ -174,6 +196,7 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
      context.setBaseUrl(options.baseURL);
    }
    context.recordHarPath = options.recordHarPath;
+    context.tracing().localUtils = localUtils;
    return context;
  }

@@ -16,23 +16,17 @@
 package com.microsoft.playwright.impl;

 import com.google.gson.Gson;
-import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.Playwright;
 import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.TimeoutError;

-import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;

-import static com.microsoft.playwright.impl.LoggingSupport.logWithTimestamp;
 import static com.microsoft.playwright.impl.Serialization.gson;

 class Message {
@@ -62,7 +56,7 @@ public class Connection {
  private final Map<String, ChannelOwner> objects = new HashMap<>();
  private final Root root;
  private int lastId = 0;
-  private final Path srcDir;
+  private final StackTraceCollector stackTraceCollector;
  private final Map<Integer, WaitableResult<JsonElement>> callbacks = new HashMap<>();
  private String apiName;
  private static final boolean isLogging;
@@ -90,15 +84,11 @@ public class Connection {
    }
    this.transport = transport;
    root = new Root(this);
-    String srcRoot = System.getenv("PLAYWRIGHT_JAVA_SRC");
-    if (srcRoot == null) {
-      srcDir = null;
-    } else {
-      srcDir = Paths.get(srcRoot);
-      if (!Files.exists(srcDir)) {
-        throw new PlaywrightException("PLAYWRIGHT_JAVA_SRC environment variable points to non-existing location: '" + srcRoot + "'");
-      }
-    }
+    stackTraceCollector = StackTraceCollector.createFromEnv();
+  }
+
+  boolean isCollectingStacks() {
+    return stackTraceCollector != null;
  }

  String setApiName(String name) {
@@ -119,45 +109,6 @@ public class Connection {
    return internalSendMessage(guid, method, params);
  }

-  private String sourceFile(StackTraceElement frame) {
-    String pkg = frame.getClassName();
-    int lastDot = pkg.lastIndexOf('.');
-    if (lastDot == -1) {
-      pkg = "";
-    } else {
-      pkg = frame.getClassName().substring(0, lastDot + 1);
-    }
-    pkg = pkg.replace('.', File.separatorChar);
-    return srcDir.resolve(pkg).resolve(frame.getFileName()).toString();
-  }
-
-  private JsonArray currentStackTrace() {
-    StackTraceElement[] stack = Thread.currentThread().getStackTrace();
-
-    int index = 0;
-    while (index < stack.length && !stack[index].getClassName().equals(getClass().getName())) {
-      index++;
-    };
-    // Find Playwright API call
-    while (index < stack.length && stack[index].getClassName().startsWith("com.microsoft.playwright.")) {
-      // hack for tests
-      if (stack[index].getClassName().startsWith("com.microsoft.playwright.Test")) {
-        break;
-      }
-      index++;
-    }
-    JsonArray jsonStack = new JsonArray();
-    for (; index < stack.length; index++) {
-      StackTraceElement frame = stack[index];
-      JsonObject jsonFrame = new JsonObject();
-      jsonFrame.addProperty("file", sourceFile(frame));
-      jsonFrame.addProperty("line", frame.getLineNumber());
-      jsonFrame.addProperty("function", frame.getClassName() + "." + frame.getMethodName());
-      jsonStack.add(jsonFrame);
-    }
-    return jsonStack;
-  }
-
  private WaitableResult<JsonElement> internalSendMessage(String guid, String method, JsonObject params) {
    int id = ++lastId;
    WaitableResult<JsonElement> result = new WaitableResult<>();
@@ -168,11 +119,15 @@ public class Connection {
    message.addProperty("method", method);
    message.add("params", params);
    JsonObject metadata = new JsonObject();
-    if (srcDir != null) {
-      metadata.add("stack", currentStackTrace());
-    }
-    if (apiName != null) {
+    if (apiName == null) {
+      metadata.addProperty("internal", true);
+    } else {
      metadata.addProperty("apiName", apiName);
+      // All but first message in an API call are considered internal and will be hidden from the inspector.
+      apiName = null;
+      if (stackTraceCollector != null) {
+        metadata.add("stack", stackTraceCollector.currentStackTrace());
+      }
    }
    message.add("metadata", metadata);
    transport.send(message);
@@ -303,7 +258,7 @@ public class Connection {
        break;
      case "APIRequestContext":
        // Create fake object as this API is experimental an only exposed in Node.js.
-        result = new ChannelOwner(parent, type, guid, initializer);
+        result = new APIRequestContextImpl(parent, type, guid, initializer);
        break;
      case "Frame":
        result = new FrameImpl(parent, type, guid, initializer);
@@ -314,6 +269,9 @@ public class Connection {
      case "JsonPipe":
        result = new JsonPipe(parent, type, guid, initializer);
        break;
+      case "LocalUtils":
+        result = new LocalUtils(parent, type, guid, initializer);
+        break;
      case "Page":
        result = new PageImpl(parent, type, guid, initializer);
        break;
@@ -335,12 +293,18 @@ public class Connection {
      case "Selectors":
        result = new SelectorsImpl(parent, type, guid, initializer);
        break;
+      case "Tracing":
+        result = new TracingImpl(parent, type, guid, initializer);
+        break;
      case "WebSocket":
        result = new WebSocketImpl(parent, type, guid, initializer);
        break;
      case "Worker":
        result = new WorkerImpl(parent, type, guid, initializer);
        break;
+      case "WritableStream":
+        result = new WritableStream(parent, type, guid, initializer);
+        break;
      default:
        throw new PlaywrightException("Unknown type " + type);
    }
@@ -20,7 +20,6 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.ElementHandle;
-import com.microsoft.playwright.FileChooser;
 import com.microsoft.playwright.Frame;
 import com.microsoft.playwright.options.BoundingBox;
 import com.microsoft.playwright.options.ElementState;
@@ -34,7 +33,8 @@ import java.util.Base64;
 import java.util.List;

 import static com.microsoft.playwright.impl.Serialization.*;
-import static com.microsoft.playwright.impl.Utils.convertViaJson;
+import static com.microsoft.playwright.impl.Utils.*;
+import static com.microsoft.playwright.impl.Utils.addLargeFileUploadParams;
 import static com.microsoft.playwright.options.ScreenshotType.JPEG;
 import static com.microsoft.playwright.options.ScreenshotType.PNG;

@@ -300,7 +300,7 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
  }

  @Override
-  public Frame ownerFrame() {
+  public FrameImpl ownerFrame() {
    return withLogging("ElementHandle.ownerFrame", () -> {
      JsonObject json = sendMessage("ownerFrame").getAsJsonObject();
      if (!json.has("frame")) {
@@ -435,9 +435,9 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
  @Override
  public void setChecked(boolean checked, SetCheckedOptions options) {
    if (checked) {
-      check(convertViaJson(options, CheckOptions.class));
+      check(convertType(options, CheckOptions.class));
    } else {
-      uncheck(convertViaJson(options, UncheckOptions.class));
+      uncheck(convertType(options, UncheckOptions.class));
    }
  }

@@ -456,7 +456,24 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {

  @Override
  public void setInputFiles(Path[] files, SetInputFilesOptions options) {
-    setInputFiles(Utils.toFilePayloads(files), options);
+    withLogging("ElementHandle.setInputFiles", () -> setInputFilesImpl(files, options));
+  }
+
+  void setInputFilesImpl(Path[] files, SetInputFilesOptions options) {
+    FrameImpl frame = ownerFrame();
+    if (frame == null) {
+      throw new Error("Cannot set input files to detached element");
+    }
+    if (hasLargeFile(files)) {
+      if (options == null) {
+        options = new SetInputFilesOptions();
+      }
+      JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+      addLargeFileUploadParams(files, params, frame.page().context());
+      sendMessage("setInputFilePaths", params);
+    } else {
+      setInputFilesImpl(Utils.toFilePayloads(files), options);
+    }
  }

  @Override
@@ -470,6 +487,7 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
  }

  void setInputFilesImpl(FilePayload[] files, SetInputFilesOptions options) {
+    checkFilePayloadSize(files);
    if (options == null) {
      options = new SetInputFilesOptions();
    }
@@ -23,7 +23,7 @@ import com.microsoft.playwright.options.FilePayload;

 import java.nio.file.Path;

-import static com.microsoft.playwright.impl.Utils.convertViaJson;
+import static com.microsoft.playwright.impl.Utils.convertType;

 class FileChooserImpl implements FileChooser {
  private final PageImpl page;
@@ -58,7 +58,8 @@ class FileChooserImpl implements FileChooser {

  @Override
  public void setFiles(Path[] files, SetFilesOptions options) {
-    setFiles(Utils.toFilePayloads(files), options);
+    page.withLogging("FileChooser.setInputFiles",
+      () -> element.setInputFilesImpl(files, convertType(options, ElementHandle.SetInputFilesOptions.class)));
  }

  @Override
@@ -69,6 +70,6 @@ class FileChooserImpl implements FileChooser {
  @Override
  public void setFiles(FilePayload[] files, SetFilesOptions options) {
    page.withLogging("FileChooser.setInputFiles",
-      () -> element.setInputFilesImpl(files, convertViaJson(options, ElementHandle.SetInputFilesOptions.class)));
+      () -> element.setInputFilesImpl(files, convertType(options, ElementHandle.SetInputFilesOptions.class)));
  }
 }
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+package com.microsoft.playwright.impl;
+
+import com.microsoft.playwright.options.FilePayload;
+import com.microsoft.playwright.options.FormData;
+
+import java.nio.file.Path;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class FormDataImpl implements FormData {
+  Map<String, Object> fields = new LinkedHashMap<>();
+
+  @Override
+  public FormData set(String name, String value) {
+    fields.put(name, value);
+    return this;
+  }
+
+  @Override
+  public FormData set(String name, boolean value) {
+    fields.put(name, value);
+    return this;
+  }
+
+  @Override
+  public FormData set(String name, int value) {
+    fields.put(name, value);
+    return this;
+  }
+
+  @Override
+  public FormData set(String name, Path value) {
+    fields.put(name, value);
+    return this;
+  }
+
+  @Override
+  public FormData set(String name, FilePayload value) {
+    fields.put(name, value);
+    return this;
+  }
+}
@@ -23,6 +23,7 @@ import com.microsoft.playwright.*;
 import com.microsoft.playwright.options.*;

 import java.io.IOException;
+import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -31,9 +32,9 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;

+import static com.microsoft.playwright.impl.Utils.*;
 import static com.microsoft.playwright.options.WaitUntilState.*;
 import static com.microsoft.playwright.impl.Serialization.*;
-import static com.microsoft.playwright.impl.Utils.convertViaJson;

 public class FrameImpl extends ChannelOwner implements Frame {
  private String name;
@@ -566,8 +567,8 @@ public class FrameImpl extends ChannelOwner implements Frame {
  }

  @Override
-  public LocatorImpl locator(String selector) {
-    return new LocatorImpl(this, selector);
+  public Locator locator(String selector, LocatorOptions options) {
+    return new LocatorImpl(this, selector, convertType(options, Locator.LocatorOptions.class));
  }

  boolean isVisibleImpl(String selector, IsVisibleOptions options) {
@@ -586,7 +587,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
  }

  @Override
-  public Page page() {
+  public PageImpl page() {
    return page;
  }

@@ -656,9 +657,9 @@ public class FrameImpl extends ChannelOwner implements Frame {

  void setCheckedImpl(String selector, boolean checked, SetCheckedOptions options) {
    if (checked) {
-      checkImpl(selector, convertViaJson(options, CheckOptions.class));
+      checkImpl(selector, convertType(options, CheckOptions.class));
    } else {
-      uncheckImpl(selector, convertViaJson(options, UncheckOptions.class));
+      uncheckImpl(selector, convertType(options, UncheckOptions.class));
    }
  }

@@ -686,21 +687,32 @@ public class FrameImpl extends ChannelOwner implements Frame {
    withLogging("Frame.setInputFiles", () -> setInputFilesImpl(selector, files, options));
  }

+  void setInputFilesImpl(String selector, Path[] files, SetInputFilesOptions options) {
+    if (hasLargeFile(files)) {
+      if (options == null) {
+        options = new SetInputFilesOptions();
+      }
+      JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+      addLargeFileUploadParams(files, params, page.context());
+      params.addProperty("selector", selector);
+      sendMessage("setInputFilePaths", params);
+    } else {
+      setInputFilesImpl(selector, Utils.toFilePayloads(files), options);
+    }
+  }
+
  @Override
  public void setInputFiles(String selector, FilePayload files, SetInputFilesOptions options) {
    setInputFiles(selector, new FilePayload[]{files}, options);
  }

-  void setInputFilesImpl(String selector, Path[] files, SetInputFilesOptions options) {
-    setInputFiles(selector, Utils.toFilePayloads(files), options);
-  }
-
  @Override
  public void setInputFiles(String selector, FilePayload[] files, SetInputFilesOptions options) {
    withLogging("Frame.setInputFiles", () -> setInputFilesImpl(selector, files, options));
  }

  void setInputFilesImpl(String selector, FilePayload[] files, SetInputFilesOptions options) {
+    checkFilePayloadSize(files);
    if (options == null) {
      options = new SetInputFilesOptions();
    }
@@ -807,7 +819,7 @@ public class FrameImpl extends ChannelOwner implements Frame {
  }

  void waitForLoadStateImpl(LoadState state, WaitForLoadStateOptions options) {
-    waitForLoadStateImpl(convertViaJson(state, WaitUntilState.class), options);
+    waitForLoadStateImpl(convertType(state, WaitUntilState.class), options);
  }

  private void waitForLoadStateImpl(WaitUntilState state, WaitForLoadStateOptions options) {
@@ -1011,10 +1023,23 @@ public class FrameImpl extends ChannelOwner implements Frame {
      options = new WaitForURLOptions();
    }
    if (matcher.test(url())) {
-      waitForLoadStateImpl(options.waitUntil, convertViaJson(options, WaitForLoadStateOptions.class));
+      waitForLoadStateImpl(options.waitUntil, convertType(options, WaitForLoadStateOptions.class));
      return;
    }
-    waitForNavigationImpl(() -> {}, convertViaJson(options, WaitForNavigationOptions.class), matcher);
+    waitForNavigationImpl(() -> {}, convertType(options, WaitForNavigationOptions.class), matcher);
+  }
+
+  int queryCount(String selector) {
+    JsonObject params = new JsonObject();
+    params.addProperty("selector", selector);
+    JsonObject result = sendMessage("queryCount", params).getAsJsonObject();
+    return result.get("value").getAsInt();
+  }
+
+  void highlightImpl(String selector) {
+    JsonObject params = new JsonObject();
+    params.addProperty("selector", selector);
+    sendMessage("highlight", params);
  }

  protected void handleEvent(String event, JsonObject params) {
@@ -17,6 +17,9 @@
 package com.microsoft.playwright.impl;

 import com.microsoft.playwright.FrameLocator;
+import com.microsoft.playwright.Locator;
+
+import static com.microsoft.playwright.impl.Utils.convertType;

 class FrameLocatorImpl implements FrameLocator {
  private final FrameImpl frame;
@@ -43,8 +46,8 @@ class FrameLocatorImpl implements FrameLocator {
  }

  @Override
-  public LocatorImpl locator(String selector) {
-    return new LocatorImpl(frame, frameSelector + " >> control=enter-frame >> " + selector);
+  public Locator locator(String selector, LocatorOptions options) {
+    return new LocatorImpl(frame, frameSelector + " >> control=enter-frame >> " + selector, convertType(options, Locator.LocatorOptions.class));
  }

  @Override
@@ -16,28 +16,20 @@

 package com.microsoft.playwright.impl;

-import java.util.function.Function;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;

-class WaitableAdapter<F, T> implements Waitable<T> {
-  private final Waitable<F> waitable;
-  private final Function<F, T> transformation;
+import java.nio.file.Path;

-  WaitableAdapter(Waitable<F> waitable, Function<F, T> transformation) {
-    this.waitable = waitable;
-    this.transformation = transformation;
-  }
-  @Override
-  public boolean isDone() {
-    return waitable.isDone();
+class LocalUtils extends ChannelOwner {
+  LocalUtils(ChannelOwner parent, String type, String guid, JsonObject initializer) {
+    super(parent, type, guid, initializer);
  }

-  @Override
-  public T get() {
-    return transformation.apply(waitable.get());
-  }
-
-  @Override
-  public void dispose() {
-    waitable.dispose();
+  void zip(Path zipFile, JsonArray entries) {
+    JsonObject params = new JsonObject();
+    params.addProperty("zipFile", zipFile.toString());
+    params.add("entries", entries);
+    sendMessage("zip", params);
  }
 }
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.regex.Pattern;

 import static com.microsoft.playwright.impl.Serialization.serializeArgument;
-import static com.microsoft.playwright.impl.Utils.convertViaJson;
+import static com.microsoft.playwright.impl.Utils.convertType;

 public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAssertions {
  public LocatorAssertionsImpl(Locator locator) {
@@ -41,7 +41,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    expected.string = text;
    expected.matchSubstring = true;
    expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.text", expected, text, "Locator expected to contain text", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.have.text", expected, text, "Locator expected to contain text", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -49,7 +49,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    ExpectedTextValue expected = expectedRegex(pattern);
    expected.matchSubstring = true;
    expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.text", expected, pattern, "Locator expected to contain regex", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.have.text", expected, pattern, "Locator expected to contain regex", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -62,7 +62,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
      expected.normalizeWhiteSpace = true;
      list.add(expected);
    }
-    expectImpl("to.contain.text.array", list, strings, "Locator expected to contain text", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.contain.text.array", list, strings, "Locator expected to contain text", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -74,7 +74,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
      expected.normalizeWhiteSpace = true;
      list.add(expected);
    }
-    expectImpl("to.contain.text.array", list, patterns, "Locator expected to contain text", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.contain.text.array", list, patterns, "Locator expected to contain text", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -94,7 +94,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    if (options == null) {
      options = new HasAttributeOptions();
    }
-    FrameExpectOptions commonOptions = convertViaJson(options, FrameExpectOptions.class);
+    FrameExpectOptions commonOptions = convertType(options, FrameExpectOptions.class);
    commonOptions.expressionArg = name;
    String message = "Locator expected to have attribute '" + name + "'";
    if (expectedValue instanceof Pattern) {
@@ -107,13 +107,13 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
  public void hasClass(String text, HasClassOptions options) {
    ExpectedTextValue expected = new ExpectedTextValue();
    expected.string = text;
-    expectImpl("to.have.class", expected, text, "Locator expected to have class", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.have.class", expected, text, "Locator expected to have class", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void hasClass(Pattern pattern, HasClassOptions options) {
    ExpectedTextValue expected = expectedRegex(pattern);
-    expectImpl("to.have.class", expected, pattern, "Locator expected to have class matching regex", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.have.class", expected, pattern, "Locator expected to have class matching regex", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -124,7 +124,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
      expected.string = text;
      list.add(expected);
    }
-    expectImpl("to.have.class.array", list, strings, "Locator expected to have class", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.have.class.array", list, strings, "Locator expected to have class", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -134,7 +134,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
      ExpectedTextValue expected = expectedRegex(pattern);
      list.add(expected);
    }
-    expectImpl("to.have.class.array", list, patterns, "Locator expected to have class matching regex", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.have.class.array", list, patterns, "Locator expected to have class matching regex", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -142,7 +142,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    if (options == null) {
      options = new HasCountOptions();
    }
-    FrameExpectOptions commonOptions = convertViaJson(options, FrameExpectOptions.class);
+    FrameExpectOptions commonOptions = convertType(options, FrameExpectOptions.class);
    commonOptions.expectedNumber = count;
    List<ExpectedTextValue> expectedText = null;
    expectImpl("to.have.count", expectedText, count, "Locator expected to have count", commonOptions);
@@ -165,7 +165,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    if (options == null) {
      options = new HasCSSOptions();
    }
-    FrameExpectOptions commonOptions = convertViaJson(options, FrameExpectOptions.class);
+    FrameExpectOptions commonOptions = convertType(options, FrameExpectOptions.class);
    commonOptions.expressionArg = name;
    String message = "Locator expected to have CSS property '" + name + "'";
    if (expectedValue instanceof Pattern) {
@@ -178,7 +178,13 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
  public void hasId(String id, HasIdOptions options) {
    ExpectedTextValue expected = new ExpectedTextValue();
    expected.string = id;
-    expectImpl("to.have.id", expected, id, "Locator expected to have ID", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.have.id", expected, id, "Locator expected to have ID", convertType(options, FrameExpectOptions.class));
+  }
+
+  @Override
+  public void hasId(Pattern pattern, HasIdOptions options) {
+    ExpectedTextValue expected = expectedRegex(pattern);
+    expectImpl("to.have.id", expected, pattern, "Locator expected to have ID matching regex", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -186,7 +192,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    if (options == null) {
      options = new HasJSPropertyOptions();
    }
-    FrameExpectOptions commonOptions = convertViaJson(options, FrameExpectOptions.class);
+    FrameExpectOptions commonOptions = convertType(options, FrameExpectOptions.class);
    commonOptions.expressionArg = name;
    commonOptions.expectedValue = serializeArgument(value);
    List<ExpectedTextValue> list = null;
@@ -199,7 +205,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    expected.string = text;
    expected.matchSubstring = false;
    expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.text", expected, text, "Locator expected to have text", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.have.text", expected, text, "Locator expected to have text", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -208,7 +214,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
    // Just match substring, same as containsText.
    expected.matchSubstring = true;
    expected.normalizeWhiteSpace = true;
-    expectImpl("to.have.text", expected, pattern, "Locator expected to have text matching regex", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.have.text", expected, pattern, "Locator expected to have text matching regex", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -221,7 +227,7 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
      expected.normalizeWhiteSpace = true;
      list.add(expected);
    }
-    expectImpl("to.have.text.array", list, strings, "Locator expected to have text", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.have.text.array", list, strings, "Locator expected to have text", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -233,60 +239,61 @@ public class LocatorAssertionsImpl extends AssertionsBase implements LocatorAsse
      expected.normalizeWhiteSpace = true;
      list.add(expected);
    }
-    expectImpl("to.have.text.array", list, patterns, "Locator expected to have text matching regex", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.have.text.array", list, patterns, "Locator expected to have text matching regex", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void hasValue(String value, HasValueOptions options) {
    ExpectedTextValue expected = new ExpectedTextValue();
    expected.string = value;
-    expectImpl("to.have.value", expected, value, "Locator expected to have value", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.have.value", expected, value, "Locator expected to have value", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void hasValue(Pattern pattern, HasValueOptions options) {
    ExpectedTextValue expected = expectedRegex(pattern);
-    expectImpl("to.have.value", expected, pattern, "Locator expected to have value matching regex", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.have.value", expected, pattern, "Locator expected to have value matching regex", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void isChecked(IsCheckedOptions options) {
-    expectTrue("to.be.checked", "Locator expected to be checked", convertViaJson(options, FrameExpectOptions.class));
+    String expression = (options != null && options.checked != null && !options.checked) ? "to.be.unchecked" : "to.be.checked";
+    expectTrue(expression, "Locator expected to be checked", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void isDisabled(IsDisabledOptions options) {
-    expectTrue("to.be.disabled", "Locator expected to be disabled", convertViaJson(options, FrameExpectOptions.class));
+    expectTrue("to.be.disabled", "Locator expected to be disabled", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void isEditable(IsEditableOptions options) {
-    expectTrue("to.be.editable", "Locator expected to be editable", convertViaJson(options, FrameExpectOptions.class));
+    expectTrue("to.be.editable", "Locator expected to be editable", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void isEmpty(IsEmptyOptions options) {
-    expectTrue("to.be.empty", "Locator expected to be empty", convertViaJson(options, FrameExpectOptions.class));
+    expectTrue("to.be.empty", "Locator expected to be empty", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void isEnabled(IsEnabledOptions options) {
-    expectTrue("to.be.enabled", "Locator expected to be enabled", convertViaJson(options, FrameExpectOptions.class));
+    expectTrue("to.be.enabled", "Locator expected to be enabled", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void isFocused(IsFocusedOptions options) {
-    expectTrue("to.be.focused", "Locator expected to be focused", convertViaJson(options, FrameExpectOptions.class));
+    expectTrue("to.be.focused", "Locator expected to be focused", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void isHidden(IsHiddenOptions options) {
-    expectTrue("to.be.hidden", "Locator expected to be hidden", convertViaJson(options, FrameExpectOptions.class));
+    expectTrue("to.be.hidden", "Locator expected to be hidden", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void isVisible(IsVisibleOptions options) {
-    expectTrue("to.be.visible", "Locator expected to be visible", convertViaJson(options, FrameExpectOptions.class));
+    expectTrue("to.be.visible", "Locator expected to be visible", convertType(options, FrameExpectOptions.class));
  }

  private void expectTrue(String expression, String message, FrameExpectOptions options) {
@@ -8,25 +8,82 @@ import com.microsoft.playwright.options.FilePayload;
 import com.microsoft.playwright.options.SelectOption;
 import com.microsoft.playwright.options.WaitForSelectorState;

+import java.lang.reflect.Field;
 import java.nio.file.Path;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.function.BiFunction;
+import java.util.regex.Pattern;

 import static com.microsoft.playwright.impl.Serialization.gson;
-import static com.microsoft.playwright.impl.Serialization.serializeArgument;
-import static com.microsoft.playwright.impl.Utils.convertViaJson;
+import static com.microsoft.playwright.impl.Utils.convertType;
+import static com.microsoft.playwright.impl.Utils.toJsRegexFlags;

 class LocatorImpl implements Locator {
  private final FrameImpl frame;
  private final String selector;

-  public LocatorImpl(FrameImpl frame, String selector) {
+  private static class Filters {
+    private final Map<Field, String> filterFieldToEngine = new LinkedHashMap<>();
+    private void addFilter(String name, String engine) throws NoSuchFieldException {
+      filterFieldToEngine.put(LocatorOptions.class.getField(name), engine);
+    }
+    {
+      try {
+        addFilter("has", "has");
+//        addFilter("leftOf", "left-of");
+//        addFilter("rightOf", "right-of");
+//        addFilter("above", "above");
+//        addFilter("below", "below");
+//        addFilter("near", "near");
+      } catch (NoSuchFieldException e) {
+        throw new InternalError(e);
+      }
+    }
+    String addFiltersToSelector(String selector, LocatorOptions options, Frame frame) {
+      try {
+        for (Map.Entry<Field, String> p : filterFieldToEngine.entrySet()) {
+          LocatorImpl filter = (LocatorImpl) p.getKey().get(options);
+          if (filter == null) {
+            continue;
+          }
+          if (filter.frame != frame) {
+            throw new PlaywrightException("Inner '" + p.getKey().getName() + "' locator must belong to the same frame.");
+          }
+          selector += " >> " +  p.getValue() + "=" + gson().toJson(filter.selector);
+        }
+      } catch (IllegalAccessException e) {
+        throw new PlaywrightException("Unexpected options", e);
+      }
+      return selector;
+    }
+  }
+  private static final Filters filters = new Filters();
+
+  public LocatorImpl(FrameImpl frame, String selector, LocatorOptions options) {
    this.frame = frame;
+    if (options != null) {
+      if (options.hasText != null) {
+        if (options.hasText instanceof Pattern) {
+          Pattern pattern = (Pattern) options.hasText;
+          selector += " >> :scope:text-matches(" + escapeWithQuotes(pattern.pattern()) + ", \"" + toJsRegexFlags(pattern) + "\")";
+        } else if (options.hasText instanceof String) {
+          String text = (String) options.hasText;
+          selector += " >> :scope:has-text(" + escapeWithQuotes(text) + ")";
+        }
+      }
+      selector = filters.addFiltersToSelector(selector, options, frame);
+    }
    this.selector = selector;
  }

+  private static String escapeWithQuotes(String text) {
+    return gson().toJson(text);
+  }
+
  private <R, O> R withElement(BiFunction<ElementHandle, O, R> callback, O options) {
-    ElementHandleOptions handleOptions = convertViaJson(options, ElementHandleOptions.class);
+    ElementHandleOptions handleOptions = convertType(options, ElementHandleOptions.class);
    // TODO: support deadline based timeout
 //    Double timeout = null;
 //    if (handleOptions != null) {
@@ -64,7 +121,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new CheckOptions();
    }
-    frame.check(selector, convertViaJson(options, Frame.CheckOptions.class).setStrict(true));
+    frame.check(selector, convertType(options, Frame.CheckOptions.class).setStrict(true));
  }

  @Override
@@ -72,12 +129,12 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new ClickOptions();
    }
-    frame.click(selector, convertViaJson(options, Frame.ClickOptions.class).setStrict(true));
+    frame.click(selector, convertType(options, Frame.ClickOptions.class).setStrict(true));
  }

  @Override
  public int count() {
-    return ((Number) evaluateAll("ee => ee.length")).intValue();
+    return frame.queryCount(selector);
  }

  @Override
@@ -85,7 +142,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new DblclickOptions();
    }
-    frame.dblclick(selector, convertViaJson(options, Frame.DblclickOptions.class).setStrict(true));
+    frame.dblclick(selector, convertType(options, Frame.DblclickOptions.class).setStrict(true));
  }

  @Override
@@ -93,7 +150,17 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new DispatchEventOptions();
    }
-    frame.dispatchEvent(selector, type, eventInit, convertViaJson(options, Frame.DispatchEventOptions.class).setStrict(true));
+    frame.dispatchEvent(selector, type, eventInit, convertType(options, Frame.DispatchEventOptions.class).setStrict(true));
+  }
+
+  @Override
+  public void dragTo(Locator target, DragToOptions options) {
+    if (options == null) {
+      options = new DragToOptions();
+    }
+    Frame.DragAndDropOptions frameOptions = convertType(options, Frame.DragAndDropOptions.class);
+    frameOptions.setStrict(true);
+    frame.dragAndDrop(selector, ((LocatorImpl) target).selector, frameOptions);
  }

  @Override
@@ -101,7 +168,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new ElementHandleOptions();
    }
-    Frame.WaitForSelectorOptions frameOptions = convertViaJson(options, Frame.WaitForSelectorOptions.class);
+    Frame.WaitForSelectorOptions frameOptions = convertType(options, Frame.WaitForSelectorOptions.class);
    frameOptions.setStrict(true);
    frameOptions.setState(WaitForSelectorState.ATTACHED);
    return frame.waitForSelector(selector, frameOptions);
@@ -132,12 +199,17 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new FillOptions();
    }
-    frame.fill(selector, value, convertViaJson(options, Frame.FillOptions.class).setStrict(true));
+    frame.fill(selector, value, convertType(options, Frame.FillOptions.class).setStrict(true));
+  }
+
+  @Override
+  public Locator filter(FilterOptions options) {
+    return new LocatorImpl(frame, selector, convertType(options,LocatorOptions.class));
  }

  @Override
  public Locator first() {
-    return new LocatorImpl(frame, selector + " >> nth=0");
+    return new LocatorImpl(frame, selector + " >> nth=0", null);
  }

  @Override
@@ -145,7 +217,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new FocusOptions();
    }
-    frame.focus(selector, convertViaJson(options, Frame.FocusOptions.class).setStrict(true));
+    frame.focus(selector, convertType(options, Frame.FocusOptions.class).setStrict(true));
  }

  @Override
@@ -158,7 +230,12 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new GetAttributeOptions();
    }
-    return frame.getAttribute(selector, name, convertViaJson(options, Frame.GetAttributeOptions.class).setStrict(true));
+    return frame.getAttribute(selector, name, convertType(options, Frame.GetAttributeOptions.class).setStrict(true));
+  }
+
+  @Override
+  public void highlight() {
+    frame.highlightImpl(selector);
  }

  @Override
@@ -166,7 +243,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new HoverOptions();
    }
-    frame.hover(selector, convertViaJson(options, Frame.HoverOptions.class).setStrict(true));
+    frame.hover(selector, convertType(options, Frame.HoverOptions.class).setStrict(true));
  }

  @Override
@@ -174,7 +251,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new InnerHTMLOptions();
    }
-    return frame.innerHTML(selector, convertViaJson(options, Frame.InnerHTMLOptions.class).setStrict(true));
+    return frame.innerHTML(selector, convertType(options, Frame.InnerHTMLOptions.class).setStrict(true));
  }

  @Override
@@ -182,7 +259,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new InnerTextOptions();
    }
-    return frame.innerText(selector, convertViaJson(options, Frame.InnerTextOptions.class).setStrict(true));
+    return frame.innerText(selector, convertType(options, Frame.InnerTextOptions.class).setStrict(true));
  }

  @Override
@@ -190,7 +267,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new InputValueOptions();
    }
-    return frame.inputValue(selector, convertViaJson(options, Frame.InputValueOptions.class).setStrict(true));
+    return frame.inputValue(selector, convertType(options, Frame.InputValueOptions.class).setStrict(true));
  }

  @Override
@@ -198,7 +275,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new IsCheckedOptions();
    }
-    return frame.isChecked(selector, convertViaJson(options, Frame.IsCheckedOptions.class).setStrict(true));
+    return frame.isChecked(selector, convertType(options, Frame.IsCheckedOptions.class).setStrict(true));
  }

  @Override
@@ -206,7 +283,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new IsDisabledOptions();
    }
-    return frame.isDisabled(selector, convertViaJson(options, Frame.IsDisabledOptions.class).setStrict(true));
+    return frame.isDisabled(selector, convertType(options, Frame.IsDisabledOptions.class).setStrict(true));
  }

  @Override
@@ -214,7 +291,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new IsEditableOptions();
    }
-    return frame.isEditable(selector, convertViaJson(options, Frame.IsEditableOptions.class).setStrict(true));
+    return frame.isEditable(selector, convertType(options, Frame.IsEditableOptions.class).setStrict(true));
  }

  @Override
@@ -222,7 +299,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new IsEnabledOptions();
    }
-    return frame.isEnabled(selector, convertViaJson(options, Frame.IsEnabledOptions.class).setStrict(true));
+    return frame.isEnabled(selector, convertType(options, Frame.IsEnabledOptions.class).setStrict(true));
  }

  @Override
@@ -230,7 +307,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new IsHiddenOptions();
    }
-    return frame.isHidden(selector, convertViaJson(options, Frame.IsHiddenOptions.class).setStrict(true));
+    return frame.isHidden(selector, convertType(options, Frame.IsHiddenOptions.class).setStrict(true));
  }

  @Override
@@ -238,22 +315,27 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new IsVisibleOptions();
    }
-    return frame.isVisible(selector, convertViaJson(options, Frame.IsVisibleOptions.class).setStrict(true));
+    return frame.isVisible(selector, convertType(options, Frame.IsVisibleOptions.class).setStrict(true));
  }

  @Override
  public Locator last() {
-    return new LocatorImpl(frame, selector + " >> nth=-1");
+    return new LocatorImpl(frame, selector + " >> nth=-1", null);
  }

  @Override
-  public Locator locator(String selector) {
-    return new LocatorImpl(frame, this.selector + " >> " + selector);
+  public Locator locator(String selector, LocatorOptions options) {
+    return new LocatorImpl(frame, this.selector + " >> " + selector, options);
  }

  @Override
  public Locator nth(int index) {
-    return new LocatorImpl(frame, selector + " >> nth=" + index);
+    return new LocatorImpl(frame, selector + " >> nth=" + index, null);
+  }
+
+  @Override
+  public Page page() {
+    return frame.page();
  }

  @Override
@@ -261,12 +343,12 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new PressOptions();
    }
-    frame.press(selector, key, convertViaJson(options, Frame.PressOptions.class).setStrict(true));
+    frame.press(selector, key, convertType(options, Frame.PressOptions.class).setStrict(true));
  }

  @Override
  public byte[] screenshot(ScreenshotOptions options) {
-    return withElement((h, o) -> h.screenshot(o), convertViaJson(options, ElementHandle.ScreenshotOptions.class));
+    return withElement((h, o) -> h.screenshot(o), convertType(options, ElementHandle.ScreenshotOptions.class));
  }

  @Override
@@ -274,7 +356,7 @@ class LocatorImpl implements Locator {
    withElement((h, o) -> {
      h.scrollIntoViewIfNeeded(o);
      return null;
-    }, convertViaJson(options, ElementHandle.ScrollIntoViewIfNeededOptions.class));
+    }, convertType(options, ElementHandle.ScrollIntoViewIfNeededOptions.class));
  }

  @Override
@@ -282,7 +364,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new SelectOptionOptions();
    }
-    return frame.selectOption(selector, values, convertViaJson(options, Frame.SelectOptionOptions.class).setStrict(true));
+    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
  }

  @Override
@@ -290,7 +372,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new SelectOptionOptions();
    }
-    return frame.selectOption(selector, values, convertViaJson(options, Frame.SelectOptionOptions.class).setStrict(true));
+    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
  }

  @Override
@@ -298,7 +380,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new SelectOptionOptions();
    }
-    return frame.selectOption(selector, values, convertViaJson(options, Frame.SelectOptionOptions.class).setStrict(true));
+    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
  }

  @Override
@@ -306,7 +388,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new SelectOptionOptions();
    }
-    return frame.selectOption(selector, values, convertViaJson(options, Frame.SelectOptionOptions.class).setStrict(true));
+    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
  }

  @Override
@@ -314,7 +396,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new SelectOptionOptions();
    }
-    return frame.selectOption(selector, values, convertViaJson(options, Frame.SelectOptionOptions.class).setStrict(true));
+    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
  }

  @Override
@@ -322,7 +404,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new SelectOptionOptions();
    }
-    return frame.selectOption(selector, values, convertViaJson(options, Frame.SelectOptionOptions.class).setStrict(true));
+    return frame.selectOption(selector, values, convertType(options, Frame.SelectOptionOptions.class).setStrict(true));
  }

  @Override
@@ -330,7 +412,7 @@ class LocatorImpl implements Locator {
    withElement((h, o) -> {
      h.selectText(o);
      return null;
-    }, convertViaJson(options, ElementHandle.SelectTextOptions.class));
+    }, convertType(options, ElementHandle.SelectTextOptions.class));
  }

  @Override
@@ -338,7 +420,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new SetCheckedOptions();
    }
-    frame.setChecked(selector, checked, convertViaJson(options, Frame.SetCheckedOptions.class).setStrict(true));
+    frame.setChecked(selector, checked, convertType(options, Frame.SetCheckedOptions.class).setStrict(true));
  }

  @Override
@@ -346,7 +428,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new SetInputFilesOptions();
    }
-    frame.setInputFiles(selector, files, convertViaJson(options, Frame.SetInputFilesOptions.class).setStrict(true));
+    frame.setInputFiles(selector, files, convertType(options, Frame.SetInputFilesOptions.class).setStrict(true));
  }

  @Override
@@ -354,7 +436,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new SetInputFilesOptions();
    }
-    frame.setInputFiles(selector, files, convertViaJson(options, Frame.SetInputFilesOptions.class).setStrict(true));
+    frame.setInputFiles(selector, files, convertType(options, Frame.SetInputFilesOptions.class).setStrict(true));
  }

  @Override
@@ -362,7 +444,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new SetInputFilesOptions();
    }
-    frame.setInputFiles(selector, files, convertViaJson(options, Frame.SetInputFilesOptions.class).setStrict(true));
+    frame.setInputFiles(selector, files, convertType(options, Frame.SetInputFilesOptions.class).setStrict(true));
  }

  @Override
@@ -370,7 +452,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new SetInputFilesOptions();
    }
-    frame.setInputFiles(selector, files, convertViaJson(options, Frame.SetInputFilesOptions.class).setStrict(true));
+    frame.setInputFiles(selector, files, convertType(options, Frame.SetInputFilesOptions.class).setStrict(true));
  }

  @Override
@@ -378,7 +460,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new TapOptions();
    }
-    frame.tap(selector, convertViaJson(options, Frame.TapOptions.class).setStrict(true));
+    frame.tap(selector, convertType(options, Frame.TapOptions.class).setStrict(true));
  }

  @Override
@@ -386,7 +468,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new TextContentOptions();
    }
-    return frame.textContent(selector, convertViaJson(options, Frame.TextContentOptions.class).setStrict(true));
+    return frame.textContent(selector, convertType(options, Frame.TextContentOptions.class).setStrict(true));
  }

  @Override
@@ -394,7 +476,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new TypeOptions();
    }
-    frame.type(selector, text, convertViaJson(options, Frame.TypeOptions.class).setStrict(true));
+    frame.type(selector, text, convertType(options, Frame.TypeOptions.class).setStrict(true));
  }

  @Override
@@ -402,7 +484,7 @@ class LocatorImpl implements Locator {
    if (options == null) {
      options = new UncheckOptions();
    }
-    frame.uncheck(selector, convertViaJson(options, Frame.UncheckOptions.class).setStrict(true));
+    frame.uncheck(selector, convertType(options, Frame.UncheckOptions.class).setStrict(true));
  }

  @Override
@@ -414,7 +496,7 @@ class LocatorImpl implements Locator {
  }

  private void waitForImpl(WaitForOptions options) {
-    frame.withLogging("Locator.waitFor", () -> frame.waitForSelectorImpl(selector, convertViaJson(options, Frame.WaitForSelectorOptions.class).setStrict(true), true));
+    frame.withLogging("Locator.waitFor", () -> frame.waitForSelectorImpl(selector, convertType(options, Frame.WaitForSelectorOptions.class).setStrict(true), true));
  }

  @Override
@@ -426,6 +508,15 @@ class LocatorImpl implements Locator {
    return frame.withLogging("Locator.expect", () -> expectImpl(expression, options));
  }

+  JsonObject toProtocol() {
+    JsonObject result = new JsonObject();
+    JsonObject frameJson = new JsonObject();
+    frameJson.addProperty("guid", frame.guid);
+    result.add("frame", frameJson);
+    result.addProperty("selector", selector);
+    return result;
+  }
+
  private FrameExpectResult expectImpl(String expression, FrameExpectOptions options) {
    if (options == null) {
      options = new FrameExpectOptions();
@@ -20,7 +20,7 @@ import com.google.gson.JsonObject;
 import com.microsoft.playwright.Mouse;

 import static com.microsoft.playwright.impl.Serialization.gson;
-import static com.microsoft.playwright.impl.Utils.convertViaJson;
+import static com.microsoft.playwright.impl.Utils.convertType;

 class MouseImpl implements Mouse {
  private final ChannelOwner page;
@@ -54,7 +54,7 @@ class MouseImpl implements Mouse {
    if (options == null) {
      clickOptions = new ClickOptions();
    } else {
-      clickOptions = convertViaJson(options, ClickOptions.class);
+      clickOptions = convertType(options, ClickOptions.class);
    }
    clickOptions.clickCount = 2;
    click(x, y, clickOptions);
@@ -22,7 +22,7 @@ import com.microsoft.playwright.assertions.PageAssertions;
 import java.util.regex.Pattern;

 import static com.microsoft.playwright.impl.UrlMatcher.resolveUrl;
-import static com.microsoft.playwright.impl.Utils.convertViaJson;
+import static com.microsoft.playwright.impl.Utils.convertType;

 public class PageAssertionsImpl extends AssertionsBase implements PageAssertions {
  private final PageImpl actualPage;
@@ -40,13 +40,14 @@ public class PageAssertionsImpl extends AssertionsBase implements PageAssertions
  public void hasTitle(String title, HasTitleOptions options) {
    ExpectedTextValue expected = new ExpectedTextValue();
    expected.string = title;
-    expectImpl("to.have.title", expected, title, "Page title expected to be", convertViaJson(options, FrameExpectOptions.class));
+    expected.normalizeWhiteSpace = true;
+    expectImpl("to.have.title", expected, title, "Page title expected to be", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void hasTitle(Pattern pattern, HasTitleOptions options) {
    ExpectedTextValue expected = expectedRegex(pattern);
-    expectImpl("to.have.title", expected, pattern, "Page title expected to match regex", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.have.title", expected, pattern, "Page title expected to match regex", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -56,13 +57,13 @@ public class PageAssertionsImpl extends AssertionsBase implements PageAssertions
      url = resolveUrl(actualPage.context().baseUrl, url);
    }
    expected.string = url;
-    expectImpl("to.have.url", expected, url, "Page URL expected to be", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.have.url", expected, url, "Page URL expected to be", convertType(options, FrameExpectOptions.class));
  }

  @Override
  public void hasURL(Pattern pattern, HasURLOptions options) {
    ExpectedTextValue expected = expectedRegex(pattern);
-    expectImpl("to.have.url", expected, pattern, "Page URL expected to match regex", convertViaJson(options, FrameExpectOptions.class));
+    expectImpl("to.have.url", expected, pattern, "Page URL expected to match regex", convertType(options, FrameExpectOptions.class));
  }

  @Override
@@ -28,11 +28,11 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;

+import static com.microsoft.playwright.impl.Serialization.gson;
+import static com.microsoft.playwright.impl.Utils.convertType;
+import static com.microsoft.playwright.impl.Utils.isSafeCloseError;
 import static com.microsoft.playwright.options.ScreenshotType.JPEG;
 import static com.microsoft.playwright.options.ScreenshotType.PNG;
-import static com.microsoft.playwright.impl.Serialization.gson;
-import static com.microsoft.playwright.impl.Utils.convertViaJson;
-import static com.microsoft.playwright.impl.Utils.isSafeCloseError;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.Files.readAllBytes;
 import static java.util.Arrays.asList;
@@ -170,7 +170,9 @@ public class PageImpl extends ChannelOwner implements Page {
        try {
          bindingCall.call(binding);
        } catch (RuntimeException e) {
-          e.printStackTrace();
+          if (!isSafeCloseError(e.getMessage())) {
+            logWithTimestamp(e.getMessage());
+          }
        }
      }
    } else if ("load".equals(event)) {
@@ -556,7 +558,7 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public ElementHandle querySelector(String selector, QuerySelectorOptions options) {
    return withLogging("Page.querySelector", () -> mainFrame.querySelectorImpl(
-      selector, convertViaJson(options, Frame.QuerySelectorOptions.class)));
+      selector, convertType(options, Frame.QuerySelectorOptions.class)));
  }

  @Override
@@ -567,7 +569,7 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public Object evalOnSelector(String selector, String pageFunction, Object arg, EvalOnSelectorOptions options) {
    return withLogging("Page.evalOnSelector", () -> mainFrame.evalOnSelectorImpl(
-      selector, pageFunction, arg, convertViaJson(options, Frame.EvalOnSelectorOptions.class)));
+      selector, pageFunction, arg, convertType(options, Frame.EvalOnSelectorOptions.class)));
  }

  @Override
@@ -601,13 +603,13 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public ElementHandle addScriptTag(AddScriptTagOptions options) {
    return withLogging("Page.addScriptTag",
-      () -> mainFrame.addScriptTagImpl(convertViaJson(options, Frame.AddScriptTagOptions.class)));
+      () -> mainFrame.addScriptTagImpl(convertType(options, Frame.AddScriptTagOptions.class)));
  }

  @Override
  public ElementHandle addStyleTag(AddStyleTagOptions options) {
    return withLogging("Page.addStyleTag",
-      () -> mainFrame.addStyleTagImpl(convertViaJson(options, Frame.AddStyleTagOptions.class)));
+      () -> mainFrame.addStyleTagImpl(convertType(options, Frame.AddStyleTagOptions.class)));
  }

  @Override
@@ -618,13 +620,13 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public void check(String selector, CheckOptions options) {
    withLogging("Page.check",
-      () -> mainFrame.checkImpl(selector, convertViaJson(options, Frame.CheckOptions.class)));
+      () -> mainFrame.checkImpl(selector, convertType(options, Frame.CheckOptions.class)));
  }

  @Override
  public void click(String selector, ClickOptions options) {
    withLogging("Page.click",
-      () -> mainFrame.clickImpl(selector, convertViaJson(options, Frame.ClickOptions.class)));
+      () -> mainFrame.clickImpl(selector, convertType(options, Frame.ClickOptions.class)));
  }

  @Override
@@ -640,13 +642,13 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public void dblclick(String selector, DblclickOptions options) {
    withLogging("Page.dblclick",
-      () -> mainFrame.dblclickImpl(selector, convertViaJson(options, Frame.DblclickOptions.class)));
+      () -> mainFrame.dblclickImpl(selector, convertType(options, Frame.DblclickOptions.class)));
  }

  @Override
  public void dispatchEvent(String selector, String type, Object eventInit, DispatchEventOptions options) {
    withLogging("Page.dispatchEvent",
-      () -> mainFrame.dispatchEventImpl(selector, type, eventInit, convertViaJson(options, Frame.DispatchEventOptions.class)));
+      () -> mainFrame.dispatchEventImpl(selector, type, eventInit, convertType(options, Frame.DispatchEventOptions.class)));
  }

  @Override
@@ -703,13 +705,13 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public void fill(String selector, String value, FillOptions options) {
    withLogging("Page.fill",
-      () -> mainFrame.fillImpl(selector, value, convertViaJson(options, Frame.FillOptions.class)));
+      () -> mainFrame.fillImpl(selector, value, convertType(options, Frame.FillOptions.class)));
  }

  @Override
  public void focus(String selector, FocusOptions options) {
    withLogging("Page.focus",
-      () -> mainFrame.focusImpl(selector, convertViaJson(options, Frame.FocusOptions.class)));
+      () -> mainFrame.focusImpl(selector, convertType(options, Frame.FocusOptions.class)));
  }

  @Override
@@ -759,7 +761,7 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public String getAttribute(String selector, String name, GetAttributeOptions options) {
    return withLogging("Page.getAttribute",
-      () -> mainFrame.getAttributeImpl(selector, name, convertViaJson(options, Frame.GetAttributeOptions.class)));
+      () -> mainFrame.getAttributeImpl(selector, name, convertType(options, Frame.GetAttributeOptions.class)));
  }

  @Override
@@ -798,44 +800,41 @@ public class PageImpl extends ChannelOwner implements Page {

  @Override
  public ResponseImpl navigate(String url, NavigateOptions options) {
-    return withLogging("Page.navigate", () ->
-      mainFrame.navigateImpl(url, convertViaJson(options, Frame.NavigateOptions.class)));
+    return withLogging("Page.navigate", () -> mainFrame.navigateImpl(url, convertType(options, Frame.NavigateOptions.class)));
  }

  @Override
  public void hover(String selector, HoverOptions options) {
-    withLogging("Page.hover", () ->
-      mainFrame.hoverImpl(selector, convertViaJson(options, Frame.HoverOptions.class)));
+    withLogging("Page.hover", () -> mainFrame.hoverImpl(selector, convertType(options, Frame.HoverOptions.class)));
  }

  @Override
  public void dragAndDrop(String source, String target, DragAndDropOptions options) {
-    withLogging("Page.dragAndDrop", () ->
-      mainFrame.dragAndDropImpl(source, target, convertViaJson(options, Frame.DragAndDropOptions.class)));
+    withLogging("Page.dragAndDrop", () -> mainFrame.dragAndDropImpl(source, target, convertType(options, Frame.DragAndDropOptions.class)));
  }

  @Override
  public String innerHTML(String selector, InnerHTMLOptions options) {
    return withLogging("Page.innerHTML",
-      () -> mainFrame.innerHTMLImpl(selector, convertViaJson(options, Frame.InnerHTMLOptions.class)));
+      () -> mainFrame.innerHTMLImpl(selector, convertType(options, Frame.InnerHTMLOptions.class)));
  }

  @Override
  public String innerText(String selector, InnerTextOptions options) {
    return withLogging("Page.innerText",
-      () -> mainFrame.innerTextImpl(selector, convertViaJson(options, Frame.InnerTextOptions.class)));
+      () -> mainFrame.innerTextImpl(selector, convertType(options, Frame.InnerTextOptions.class)));
  }

  @Override
  public String inputValue(String selector, InputValueOptions options) {
    return withLogging("Page.inputValue",
-      () -> mainFrame.inputValueImpl(selector, convertViaJson(options, Frame.InputValueOptions.class)));
+      () -> mainFrame.inputValueImpl(selector, convertType(options, Frame.InputValueOptions.class)));
  }

  @Override
  public boolean isChecked(String selector, IsCheckedOptions options) {
    return withLogging("Page.isChecked",
-      () -> mainFrame.isCheckedImpl(selector, convertViaJson(options, Frame.IsCheckedOptions.class)));
+      () -> mainFrame.isCheckedImpl(selector, convertType(options, Frame.IsCheckedOptions.class)));
  }

  @Override
@@ -846,31 +845,31 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public boolean isDisabled(String selector, IsDisabledOptions options) {
    return withLogging("Page.isDisabled",
-      () -> mainFrame.isDisabledImpl(selector, convertViaJson(options, Frame.IsDisabledOptions.class)));
+      () -> mainFrame.isDisabledImpl(selector, convertType(options, Frame.IsDisabledOptions.class)));
  }

  @Override
  public boolean isEditable(String selector, IsEditableOptions options) {
    return withLogging("Page.isEditable",
-      () -> mainFrame.isEditableImpl(selector, convertViaJson(options, Frame.IsEditableOptions.class)));
+      () -> mainFrame.isEditableImpl(selector, convertType(options, Frame.IsEditableOptions.class)));
  }

  @Override
  public boolean isEnabled(String selector, IsEnabledOptions options) {
    return withLogging("Page.isEnabled",
-      () -> mainFrame.isEnabledImpl(selector, convertViaJson(options, Frame.IsEnabledOptions.class)));
+      () -> mainFrame.isEnabledImpl(selector, convertType(options, Frame.IsEnabledOptions.class)));
  }

  @Override
  public boolean isHidden(String selector, IsHiddenOptions options) {
    return withLogging("Page.isHidden",
-      () -> mainFrame.isHiddenImpl(selector, convertViaJson(options, Frame.IsHiddenOptions.class)));
+      () -> mainFrame.isHiddenImpl(selector, convertType(options, Frame.IsHiddenOptions.class)));
  }

  @Override
  public boolean isVisible(String selector, IsVisibleOptions options) {
    return withLogging("Page.isVisible",
-      () -> mainFrame.isVisibleImpl(selector, convertViaJson(options, Frame.IsVisibleOptions.class)));
+      () -> mainFrame.isVisibleImpl(selector, convertType(options, Frame.IsVisibleOptions.class)));
  }

  @Override
@@ -879,8 +878,8 @@ public class PageImpl extends ChannelOwner implements Page {
  }

  @Override
-  public LocatorImpl locator(String selector) {
-    return mainFrame.locator(selector);
+  public Locator locator(String selector, LocatorOptions options) {
+    return mainFrame.locator(selector, convertType(options, Frame.LocatorOptions.class));
  }

  @Override
@@ -933,7 +932,7 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public void press(String selector, String key, PressOptions options) {
    withLogging("Page.press",
-      () -> mainFrame.pressImpl(selector, key, convertViaJson(options, Frame.PressOptions.class)));
+      () -> mainFrame.pressImpl(selector, key, convertType(options, Frame.PressOptions.class)));
  }

  @Override
@@ -941,6 +940,11 @@ public class PageImpl extends ChannelOwner implements Page {
    return withLogging("Page.reload", () -> reloadImpl(options));
  }

+  @Override
+  public APIRequestContextImpl request() {
+    return browserContext.request();
+  }
+
  private Response reloadImpl(ReloadOptions options) {
    if (options == null) {
      options = new ReloadOptions();
@@ -1030,8 +1034,18 @@ public class PageImpl extends ChannelOwner implements Page {
        }
      }
    }
+    List<Locator> mask = options.mask;
+    options.mask = null;
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+    options.mask = mask;
    params.remove("path");
+    if (mask != null) {
+      JsonArray maskArray = new JsonArray();
+      for (Locator locator: mask) {
+        maskArray.add(((LocatorImpl) locator).toProtocol());
+      }
+      params.add("mask", maskArray);
+    }
    JsonObject json = sendMessage("screenshot", params).getAsJsonObject();

    byte[] buffer = Base64.getDecoder().decode(json.get("binary").getAsString());
@@ -1044,25 +1058,25 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public List<String> selectOption(String selector, SelectOption[] values, SelectOptionOptions options) {
    return withLogging("Page.selectOption",
-      () -> mainFrame.selectOptionImpl(selector, values, convertViaJson(options, Frame.SelectOptionOptions.class)));
+      () -> mainFrame.selectOptionImpl(selector, values, convertType(options, Frame.SelectOptionOptions.class)));
  }

  @Override
  public List<String> selectOption(String selector, ElementHandle[] values, SelectOptionOptions options) {
    return withLogging("Page.selectOption",
-      () -> mainFrame.selectOptionImpl(selector, values, convertViaJson(options, Frame.SelectOptionOptions.class)));
+      () -> mainFrame.selectOptionImpl(selector, values, convertType(options, Frame.SelectOptionOptions.class)));
  }

  @Override
  public void setChecked(String selector, boolean checked, SetCheckedOptions options) {
    withLogging("Page.setChecked",
-      () -> mainFrame.setCheckedImpl(selector, checked, convertViaJson(options, Frame.SetCheckedOptions.class)));
+      () -> mainFrame.setCheckedImpl(selector, checked, convertType(options, Frame.SetCheckedOptions.class)));
  }

  @Override
  public void setContent(String html, SetContentOptions options) {
    withLogging("Page.setContent",
-      () -> mainFrame.setContentImpl(html, convertViaJson(options, Frame.SetContentOptions.class)));
+      () -> mainFrame.setContentImpl(html, convertType(options, Frame.SetContentOptions.class)));
  }

  @Override
@@ -1109,7 +1123,7 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public void setInputFiles(String selector, Path[] files, SetInputFilesOptions options) {
    withLogging("Page.setInputFiles",
-      () -> mainFrame.setInputFilesImpl(selector, files, convertViaJson(options, Frame.SetInputFilesOptions.class)));
+      () -> mainFrame.setInputFilesImpl(selector, files, convertType(options, Frame.SetInputFilesOptions.class)));
  }

  @Override
@@ -1120,7 +1134,7 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public void setInputFiles(String selector, FilePayload[] files, SetInputFilesOptions options) {
    withLogging("Page.setInputFiles",
-      () -> mainFrame.setInputFilesImpl(selector, files, convertViaJson(options, Frame.SetInputFilesOptions.class)));
+      () -> mainFrame.setInputFilesImpl(selector, files, convertType(options, Frame.SetInputFilesOptions.class)));
  }

  @Override
@@ -1136,13 +1150,13 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public void tap(String selector, TapOptions options) {
    withLogging("Page.tap",
-      () -> mainFrame.tapImpl(selector, convertViaJson(options, Frame.TapOptions.class)));
+      () -> mainFrame.tapImpl(selector, convertType(options, Frame.TapOptions.class)));
  }

  @Override
  public String textContent(String selector, TextContentOptions options) {
    return withLogging("Page.textContent",
-      () -> mainFrame.textContentImpl(selector, convertViaJson(options, Frame.TextContentOptions.class)));
+      () -> mainFrame.textContentImpl(selector, convertType(options, Frame.TextContentOptions.class)));
  }

  @Override
@@ -1158,13 +1172,13 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public void type(String selector, String text, TypeOptions options) {
    withLogging("Page.type",
-      () -> mainFrame.typeImpl(selector, text, convertViaJson(options, Frame.TypeOptions.class)));
+      () -> mainFrame.typeImpl(selector, text, convertType(options, Frame.TypeOptions.class)));
  }

  @Override
  public void uncheck(String selector, UncheckOptions options) {
    withLogging("Page.uncheck",
-      () -> mainFrame.uncheckImpl(selector, convertViaJson(options, Frame.UncheckOptions.class)));
+      () -> mainFrame.uncheckImpl(selector, convertType(options, Frame.UncheckOptions.class)));
  }

  @Override
@@ -1237,13 +1251,13 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public JSHandle waitForFunction(String pageFunction, Object arg, WaitForFunctionOptions options) {
    return withLogging("Page.waitForFunction",
-      () -> mainFrame.waitForFunctionImpl(pageFunction, arg, convertViaJson(options, Frame.WaitForFunctionOptions.class)));
+      () -> mainFrame.waitForFunctionImpl(pageFunction, arg, convertType(options, Frame.WaitForFunctionOptions.class)));
  }

  @Override
  public void waitForLoadState(LoadState state, WaitForLoadStateOptions options) {
    withWaitLogging("Page.waitForLoadState", () -> {
-      mainFrame.waitForLoadStateImpl(state, convertViaJson(options, Frame.WaitForLoadStateOptions.class));
+      mainFrame.waitForLoadStateImpl(state, convertType(options, Frame.WaitForLoadStateOptions.class));
      return null;
    });
  }
@@ -1377,7 +1391,7 @@ public class PageImpl extends ChannelOwner implements Page {
  @Override
  public ElementHandle waitForSelector(String selector, WaitForSelectorOptions options) {
    return withLogging("Page.waitForSelector",
-      () -> mainFrame.waitForSelectorImpl(selector, convertViaJson(options, Frame.WaitForSelectorOptions.class)));
+      () -> mainFrame.waitForSelectorImpl(selector, convertType(options, Frame.WaitForSelectorOptions.class)));
  }

  @Override
@@ -1401,7 +1415,7 @@ public class PageImpl extends ChannelOwner implements Page {
  }

  private void waitForURL(UrlMatcher matcher, WaitForURLOptions options) {
-    withLogging("Page.waitForURL", () -> mainFrame.waitForURLImpl(matcher, convertViaJson(options, Frame.WaitForURLOptions.class)));
+    withLogging("Page.waitForURL", () -> mainFrame.waitForURLImpl(matcher, convertType(options, Frame.WaitForURLOptions.class)));
  }

  @Override
@@ -17,6 +17,7 @@
 package com.microsoft.playwright.impl;

 import com.google.gson.JsonObject;
+import com.microsoft.playwright.APIRequest;
 import com.microsoft.playwright.Playwright;
 import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.Selectors;
@@ -36,10 +37,11 @@ public class PlaywrightImpl extends ChannelOwner implements Playwright {
      if (options != null && options.env != null) {
        env = options.env;
      }
-      Path driver = Driver.ensureDriverInstalled(env);
+      Path driver = Driver.ensureDriverInstalled(env, true);
      ProcessBuilder pb = new ProcessBuilder(driver.toString(), "run-driver");
      pb.redirectError(ProcessBuilder.Redirect.INHERIT);
      pb.environment().putAll(env);
+      Driver.setRequiredEnvironmentVariables(pb);
      Process p = pb.start();
      Connection connection = new Connection(new PipeTransport(p.getInputStream(), p.getOutputStream()));
      PlaywrightImpl result = connection.initializePlaywright();
@@ -55,7 +57,9 @@ public class PlaywrightImpl extends ChannelOwner implements Playwright {
  private final BrowserTypeImpl firefox;
  private final BrowserTypeImpl webkit;
  private final SelectorsImpl selectors;
-  private SharedSelectors sharedSelectors;;
+  private final APIRequestImpl apiRequest;
+  private final LocalUtils localUtils;
+  private SharedSelectors sharedSelectors;

  PlaywrightImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
@@ -64,12 +68,17 @@ public class PlaywrightImpl extends ChannelOwner implements Playwright {
    webkit = parent.connection.getExistingObject(initializer.getAsJsonObject("webkit").get("guid").getAsString());

    selectors = connection.getExistingObject(initializer.getAsJsonObject("selectors").get("guid").getAsString());
+    apiRequest = new APIRequestImpl(this);
+    localUtils = connection.getExistingObject(initializer.getAsJsonObject("utils").get("guid").getAsString());
+    chromium.localUtils = localUtils;
+    firefox.localUtils = localUtils;
+    webkit.localUtils = localUtils;
  }

  void initSharedSelectors(PlaywrightImpl parent) {
    assert sharedSelectors == null;
    if (parent == null) {
-      sharedSelectors = new SharedSelectors();;
+      sharedSelectors = new SharedSelectors();
    } else {
      sharedSelectors = parent.sharedSelectors;
    }
@@ -90,6 +99,11 @@ public class PlaywrightImpl extends ChannelOwner implements Playwright {
    return firefox;
  }

+  @Override
+  public APIRequest request() {
+    return apiRequest;
+  }
+
  @Override
  public BrowserTypeImpl webkit() {
    return webkit;
@@ -43,6 +43,8 @@ class SerializedValue{
  }
  O[] o;
  Number h;
+  Integer id;
+  Integer ref;
 }

 class SerializedArgument{
@@ -0,0 +1,121 @@
+/*
+ * 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.
+ */
+
+package com.microsoft.playwright.impl;
+
+import com.microsoft.playwright.options.FormData;
+import com.microsoft.playwright.options.RequestOptions;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class RequestOptionsImpl implements RequestOptions {
+  Map<String, Object> params;
+  String method;
+  Map<String, String> headers;
+  Object data;
+  FormDataImpl form;
+  FormDataImpl multipart;
+  Boolean failOnStatusCode;
+  Boolean ignoreHTTPSErrors;
+  Double timeout;
+
+  @Override
+  public RequestOptions setHeader(String name, String value) {
+    if (headers == null) {
+      headers = new LinkedHashMap<>();
+    }
+    headers.put(name, value);
+    return this;
+  }
+
+  @Override
+  public RequestOptions setData(String data) {
+    this.data = data;
+    return this;
+  }
+
+  @Override
+  public RequestOptions setData(byte[] data) {
+    this.data = data;
+    return this;
+  }
+
+  @Override
+  public RequestOptions setData(Object data) {
+    this.data = data;
+    return this;
+  }
+
+  @Override
+  public RequestOptions setForm(FormData form) {
+    this.form = (FormDataImpl) form;
+    return this;
+  }
+
+  @Override
+  public RequestOptions setMethod(String method) {
+    this.method = method;
+    return this;
+  }
+
+  @Override
+  public RequestOptions setMultipart(FormData form) {
+    this.multipart = (FormDataImpl) form;
+    return this;
+  }
+
+  @Override
+  public RequestOptions setQueryParam(String name, String value) {
+    return setQueryParamImpl(name, value);
+  }
+
+  @Override
+  public RequestOptions setQueryParam(String name, boolean value) {
+    return setQueryParamImpl(name, value);
+  }
+
+  @Override
+  public RequestOptions setQueryParam(String name, int value) {
+    return setQueryParamImpl(name, value);
+  }
+
+  private RequestOptions setQueryParamImpl(String name, Object value) {
+    if (params == null) {
+      params = new LinkedHashMap<>();
+    }
+    params.put(name, value);
+    return this;
+  }
+
+  @Override
+  public RequestOptions setTimeout(double timeout) {
+    this.timeout = timeout;
+    return this;
+  }
+
+  @Override
+  public RequestOptions setFailOnStatusCode(boolean failOnStatusCode) {
+    this.failOnStatusCode = failOnStatusCode;
+    return this;
+  }
+
+  @Override
+  public RequestOptions setIgnoreHTTPSErrors(boolean ignoreHTTPSErrors) {
+    this.ignoreHTTPSErrors = ignoreHTTPSErrors;
+    return this;
+  }
+}
@@ -18,7 +18,6 @@ package com.microsoft.playwright.impl;

 import com.google.gson.JsonObject;
 import com.microsoft.playwright.PlaywrightException;
-import com.microsoft.playwright.Request;
 import com.microsoft.playwright.Route;

 import java.io.IOException;
@@ -29,12 +28,15 @@ import java.util.LinkedHashMap;
 import java.util.Map;

 public class RouteImpl extends ChannelOwner implements Route {
+  private boolean handled;
+
  public RouteImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
  }

  @Override
  public void abort(String errorCode) {
+    startHandling();
    withLogging("Route.abort", () -> {
      JsonObject params = new JsonObject();
      params.addProperty("errorCode", errorCode);
@@ -44,6 +46,7 @@ public class RouteImpl extends ChannelOwner implements Route {

  @Override
  public void resume(ResumeOptions options) {
+    startHandling();
    withLogging("Route.resume", () -> resumeImpl(options));
  }

@@ -78,6 +81,7 @@ public class RouteImpl extends ChannelOwner implements Route {

  @Override
  public void fulfill(FulfillOptions options) {
+    startHandling();
    withLogging("Route.fulfill", () -> fulfillImpl(options));
  }

@@ -86,16 +90,30 @@ public class RouteImpl extends ChannelOwner implements Route {
      options = new FulfillOptions();
    }

-    int status = options.status == null ? 200 : options.status;
-    String body = "";
+    Integer status = options.status;
+    Map<String, String> headersOption = options.headers;
+    String fetchResponseUid = null;
+
+    if (options.response != null) {
+      if (status == null) {
+        status = options.response.status();
+      }
+      if (headersOption == null) {
+        headersOption = options.response.headers();
+      }
+    }
+    if (status == null) {
+      status = 200;
+    }
+    String body = null;
    boolean isBase64 = false;
    int length = 0;
    if (options.path != null) {
      try {
-         byte[] buffer = Files.readAllBytes(options.path);
-         body = Base64.getEncoder().encodeToString(buffer);
-         isBase64 = true;
-         length = buffer.length;
+        byte[] buffer = Files.readAllBytes(options.path);
+        body = Base64.getEncoder().encodeToString(buffer);
+        isBase64 = true;
+        length = buffer.length;
      } catch (IOException e) {
        throw new PlaywrightException("Failed to read from file: " + options.path, e);
      }
@@ -107,11 +125,22 @@ public class RouteImpl extends ChannelOwner implements Route {
      body = Base64.getEncoder().encodeToString(options.bodyBytes);
      isBase64 = true;
      length = options.bodyBytes.length;
+    } else if (options.response != null) {
+      APIResponseImpl response = (APIResponseImpl) options.response;
+      if (response.context.connection == connection) {
+        fetchResponseUid = response.fetchUid();
+      } else {
+        byte[] bodyBytes = response.body();
+        body = Base64.getEncoder().encodeToString(bodyBytes);
+        isBase64 = true;
+        length = bodyBytes.length;
+      }
    }

+
    Map<String, String> headers = new LinkedHashMap<>();
-    if (options.headers != null) {
-      for (Map.Entry<String, String> h : options.headers.entrySet()) {
+    if (headersOption != null) {
+      for (Map.Entry<String, String> h : headersOption.entrySet()) {
        headers.put(h.getKey().toLowerCase(), h.getValue());
      }
    }
@@ -128,11 +157,21 @@ public class RouteImpl extends ChannelOwner implements Route {
    params.add("headers", Serialization.toProtocol(headers));
    params.addProperty("isBase64", isBase64);
    params.addProperty("body", body);
+    if (fetchResponseUid != null) {
+      params.addProperty("fetchResponseUid", fetchResponseUid);
+    }
    sendMessageAsync("fulfill", params);
  }

  @Override
-  public Request request() {
+  public RequestImpl request() {
    return connection.getExistingObject(initializer.getAsJsonObject("request").get("guid").getAsString());
  }
+
+  private void startHandling() {
+    if (handled) {
+      throw new PlaywrightException("Route is already handled!");
+    }
+    handled = true;
+  }
 }
@@ -33,14 +33,17 @@ import java.nio.file.Path;
 import java.util.*;

 class Serialization {
-  private static Gson gson = new GsonBuilder()
+  private static final Gson gson = new GsonBuilder()
    .registerTypeAdapter(SameSiteAttribute.class, new SameSiteAdapter().nullSafe())
    .registerTypeAdapter(BrowserChannel.class, new ToLowerCaseAndDashSerializer<BrowserChannel>())
    .registerTypeAdapter(ColorScheme.class, new ToLowerCaseAndDashSerializer<ColorScheme>())
    .registerTypeAdapter(Media.class, new ToLowerCaseSerializer<Media>())
    .registerTypeAdapter(ForcedColors.class, new ToLowerCaseSerializer<ForcedColors>())
    .registerTypeAdapter(ReducedMotion.class, new ToLowerCaseAndDashSerializer<ReducedMotion>())
+    .registerTypeAdapter(ScreenshotAnimations.class, new ToLowerCaseSerializer<ScreenshotAnimations>())
    .registerTypeAdapter(ScreenshotType.class, new ToLowerCaseSerializer<ScreenshotType>())
+    .registerTypeAdapter(ScreenshotScale.class, new ToLowerCaseSerializer<ScreenshotScale>())
+    .registerTypeAdapter(ScreenshotCaret.class, new ToLowerCaseSerializer<ScreenshotCaret>())
    .registerTypeAdapter(MouseButton.class, new ToLowerCaseSerializer<MouseButton>())
    .registerTypeAdapter(LoadState.class, new ToLowerCaseSerializer<LoadState>())
    .registerTypeAdapter(WaitUntilState.class, new ToLowerCaseSerializer<WaitUntilState>())
@@ -50,7 +53,7 @@ class Serialization {
    .registerTypeHierarchyAdapter(JSHandleImpl.class, new HandleSerializer())
    .registerTypeAdapter((new TypeToken<Map<String, String>>(){}).getType(), new StringMapSerializer())
    .registerTypeAdapter((new TypeToken<Map<String, Object>>(){}).getType(), new FirefoxUserPrefsSerializer())
-    .registerTypeHierarchyAdapter(Path.class, new PathSerializer()).create();;
+    .registerTypeHierarchyAdapter(Path.class, new PathSerializer()).create();

  static Gson gson() {
    return gson;
@@ -68,82 +71,128 @@ class Serialization {
    return result;
  }

-  private static SerializedValue serializeValue(Object value, List<JSHandleImpl> handles, int depth) {
-    if (depth > 100) {
-      throw new PlaywrightException("Maximum argument depth exceeded");
+  private static class ValueSerializer {
+    // hashCode() of a map containing itself as a key will throw stackoverflow exception,
+    // so we user wrappers.
+    private static class HashableValue {
+      final Object value;
+      HashableValue(Object value) {
+        this.value = value;
+      }
+
+      @Override
+      public boolean equals(Object o) {
+        return value == ((HashableValue) o).value;
+      }
+
+      @Override
+      public int hashCode() {
+        return System.identityHashCode(value);
+      }
    }
-    SerializedValue result = new SerializedValue();
-    if (value instanceof JSHandleImpl) {
-      result.h = handles.size();
-      handles.add((JSHandleImpl) value);
+    private final Map<HashableValue, Integer> valueToId = new HashMap<>();
+    private int lastId = 0;
+    private final List<JSHandleImpl> handles = new ArrayList<>();
+    private final SerializedValue serializedValue;
+
+    ValueSerializer(Object value) {
+      serializedValue = serializeValue(value);
+    }
+
+    SerializedArgument toSerializedArgument() {
+      SerializedArgument result = new SerializedArgument();
+      result.value = serializedValue;
+      result.handles = new Channel[handles.size()];
+      int i = 0;
+      for (JSHandleImpl handle : handles) {
+        result.handles[i] = new Channel();
+        result.handles[i].guid = handle.guid;
+        ++i;
+      }
      return result;
    }
-    if (value == null) {
-      result.v = "undefined";
-    } else if (value instanceof Double) {
-      double d = ((Double) value);
-      if (d == Double.POSITIVE_INFINITY) {
-        result.v = "Infinity";
-      } else if (d == Double.NEGATIVE_INFINITY) {
-        result.v = "-Infinity";
-      } else if (d == -0) {
-        result.v = "-0";
-      } else if (Double.isNaN(d)) {
-        result.v = "NaN";
+
+    private SerializedValue serializeValue(Object value) {
+      SerializedValue result = new SerializedValue();
+      if (value instanceof JSHandleImpl) {
+        result.h = handles.size();
+        handles.add((JSHandleImpl) value);
+        return result;
+      }
+      if (value == null) {
+        result.v = "undefined";
+      } else if (value instanceof Double) {
+        double d = ((Double) value);
+        if (d == Double.POSITIVE_INFINITY) {
+          result.v = "Infinity";
+        } else if (d == Double.NEGATIVE_INFINITY) {
+          result.v = "-Infinity";
+        } else if (d == -0) {
+          result.v = "-0";
+        } else if (Double.isNaN(d)) {
+          result.v = "NaN";
+        } else {
+          result.n = d;
+        }
+      } else if (value instanceof Boolean) {
+        result.b = (Boolean) value;
+      } else if (value instanceof Integer) {
+        result.n = (Integer) value;
+      } else if (value instanceof String) {
+        result.s = (String) value;
      } else {
-        result.n = d;
+        HashableValue mapKey = new HashableValue(value);
+        Integer id = valueToId.get(mapKey);
+        if (id != null) {
+          result.ref = id;
+        } else {
+          result.id = ++lastId;
+          valueToId.put(mapKey, lastId);
+          if (value instanceof List) {
+            List<SerializedValue> list = new ArrayList<>();
+            for (Object o : (List<?>) value) {
+              list.add(serializeValue(o));
+            }
+            result.a = list.toArray(new SerializedValue[0]);
+          } else if (value instanceof Map) {
+            List<SerializedValue.O> list = new ArrayList<>();
+            @SuppressWarnings("unchecked")
+            Map<String, ?> map = (Map<String, ?>) value;
+            for (Map.Entry<String, ?> e : map.entrySet()) {
+              SerializedValue.O o = new SerializedValue.O();
+              o.k = e.getKey();
+              o.v = serializeValue(e.getValue());
+              list.add(o);
+            }
+            result.o = list.toArray(new SerializedValue.O[0]);
+          } else if (value instanceof Object[]) {
+            List<SerializedValue> list = new ArrayList<>();
+            for (Object o : (Object[]) value) {
+              list.add(serializeValue(o));
+            }
+            result.a = list.toArray(new SerializedValue[0]);
+          } else {
+            throw new PlaywrightException("Unsupported type of argument: " + value);
+          }
+        }
      }
-    } else if (value instanceof Boolean) {
-      result.b = (Boolean) value;
-    } else if (value instanceof Integer) {
-      result.n = (Integer) value;
-    } else if (value instanceof String) {
-      result.s = (String) value;
-    } else if (value instanceof List) {
-      List<SerializedValue> list = new ArrayList<>();
-      for (Object o : (List<?>) value) {
-        list.add(serializeValue(o, handles, depth + 1));
-      }
-      result.a = list.toArray(new SerializedValue[0]);
-    } else if (value instanceof Map) {
-      List<SerializedValue.O> list = new ArrayList<>();
-      @SuppressWarnings("unchecked")
-      Map<String, ?> map = (Map<String, ?>) value;
-      for (Map.Entry<String, ?> e : map.entrySet()) {
-        SerializedValue.O o = new SerializedValue.O();
-        o.k = e.getKey();
-        o.v = serializeValue(e.getValue(), handles, depth + 1);
-        list.add(o);
-      }
-      result.o = list.toArray(new SerializedValue.O[0]);
-    } else if (value instanceof Object[]) {
-      List<SerializedValue> list = new ArrayList<>();
-      for (Object o : (Object[]) value) {
-        list.add(serializeValue(o, handles, depth + 1));
-      }
-      result.a = list.toArray(new SerializedValue[0]);
-    } else {
-      throw new PlaywrightException("Unsupported type of argument: " + value);
+      return result;
    }
-    return result;
  }

  static SerializedArgument serializeArgument(Object arg) {
-    SerializedArgument result = new SerializedArgument();
-    List<JSHandleImpl> handles = new ArrayList<>();
-    result.value = serializeValue(arg, handles, 0);
-    result.handles = new Channel[handles.size()];
-    int i = 0;
-    for (JSHandleImpl handle : handles) {
-      result.handles[i] = new Channel();
-      result.handles[i].guid = handle.guid;
-      ++i;
-    }
-    return result;
+    return new ValueSerializer(arg).toSerializedArgument();
+  }
+
+  static <T> T deserialize(SerializedValue value) {
+    return deserialize(value, new HashMap<>());
  }

  @SuppressWarnings("unchecked")
-  static <T> T deserialize(SerializedValue value) {
+  private static <T> T deserialize(SerializedValue value, Map<Integer, Object> idToValue) {
+    if (value.ref != null) {
+      return (T) idToValue.get(value.ref);
+    }
    if (value.n != null) {
      if (value.n.doubleValue() == (double) value.n.intValue()) {
        return (T) Integer.valueOf(value.n.intValue());
@@ -174,15 +223,17 @@ class Serialization {
    }
    if (value.a != null) {
      List<Object> list = new ArrayList<>();
+      idToValue.put(value.id, list);
      for (SerializedValue v : value.a) {
-        list.add(deserialize(v));
+        list.add(deserialize(v, idToValue));
      }
      return (T) list;
    }
    if (value.o != null) {
      Map<String, Object> map = new LinkedHashMap<>();
+      idToValue.put(value.id, map);
      for (SerializedValue.O o : value.o) {
-        map.put(o.k, deserialize(o.v));
+        map.put(o.k, deserialize(o.v, idToValue));
      }
      return (T) map;
    }
@@ -209,18 +260,30 @@ class Serialization {
    }
  }

+  static JsonArray toJsonArray(Path[] files) {
+    JsonArray jsonFiles = new JsonArray();
+    for (Path p : files) {
+      jsonFiles.add(p.toAbsolutePath().toString());
+    }
+    return jsonFiles;
+  }
+
  static JsonArray toJsonArray(FilePayload[] files) {
    JsonArray jsonFiles = new JsonArray();
    for (FilePayload p : files) {
-      JsonObject jsonFile = new JsonObject();
-      jsonFile.addProperty("name", p.name);
-      jsonFile.addProperty("mimeType", p.mimeType);
-      jsonFile.addProperty("buffer", Base64.getEncoder().encodeToString(p.buffer));
-      jsonFiles.add(jsonFile);
+      jsonFiles.add(toProtocol(p));
    }
    return jsonFiles;
  }

+  static JsonObject toProtocol(FilePayload p) {
+    JsonObject jsonFile = new JsonObject();
+    jsonFile.addProperty("name", p.name);
+    jsonFile.addProperty("mimeType", p.mimeType);
+    jsonFile.addProperty("buffer", Base64.getEncoder().encodeToString(p.buffer));
+    return jsonFile;
+  }
+
  static JsonArray toProtocol(ElementHandle[] handles) {
    JsonArray jsonElements = new JsonArray();
    for (ElementHandle handle : handles) {
@@ -232,11 +295,15 @@ class Serialization {
  }

  static JsonArray toProtocol(Map<String, String> map) {
+    return toNameValueArray(map);
+  }
+
+  static JsonArray toNameValueArray(Map<String, ?> map) {
    JsonArray array = new JsonArray();
-    for (Map.Entry<String, String> e : map.entrySet()) {
+    for (Map.Entry<String, ?> e : map.entrySet()) {
      JsonObject item = new JsonObject();
      item.addProperty("name", e.getKey());
-      item.addProperty("value", e.getValue());
+      item.add("value", gson().toJsonTree(e.getValue()));
      array.add(item);
    }
    return array;
@@ -0,0 +1,115 @@
+/*
+ * 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.
+ */
+
+package com.microsoft.playwright.impl;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.microsoft.playwright.PlaywrightException;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.stream.Collectors;
+
+class StackTraceCollector {
+  private final List<Path> srcDirs;
+  private final Map<Path, String> classToSourceCache = new HashMap<>();
+
+  static StackTraceCollector createFromEnv() {
+    String srcRoots = System.getenv("PLAYWRIGHT_JAVA_SRC");
+    if (srcRoots == null) {
+      return null;
+    }
+    List<Path> srcDirs = Arrays.stream(srcRoots.split(File.pathSeparator)).map(p -> Paths.get(p)).collect(Collectors.toList());
+    for (Path srcDir: srcDirs) {
+      if (!Files.exists(srcDir.toAbsolutePath())) {
+        throw new PlaywrightException("Source location specified in PLAYWRIGHT_JAVA_SRC doesn't exist: '" + srcDir.toAbsolutePath() + "'");
+      }
+    }
+    return new StackTraceCollector(srcDirs);
+  }
+
+  private StackTraceCollector(List<Path> srcDirs) {
+    this.srcDirs = srcDirs;
+  }
+
+  private String sourceFile(StackTraceElement frame) {
+    String pkg = frame.getClassName();
+    int lastDot = pkg.lastIndexOf('.');
+    if (lastDot == -1) {
+      pkg = "";
+    } else {
+      pkg = frame.getClassName().substring(0, lastDot + 1);
+    }
+    pkg = pkg.replace('.', File.separatorChar);
+    String file = frame.getFileName();
+    if (file == null) {
+      return "";
+    }
+    return resolveSourcePath(Paths.get(pkg).resolve(file));
+  }
+
+  private String resolveSourcePath(Path relativePath) {
+    String path = classToSourceCache.get(relativePath);
+    if (path == null) {
+      for (Path dir : srcDirs) {
+        Path absolutePath = dir.resolve(relativePath);
+        if (Files.exists(absolutePath)) {
+          path = absolutePath.toString();
+          classToSourceCache.put(relativePath, path);
+          break;
+        }
+      }
+      if (path == null) {
+        path = "";
+        classToSourceCache.put(relativePath, path);
+      }
+    }
+    return path;
+  }
+
+  JsonArray currentStackTrace() {
+    StackTraceElement[] stack = Thread.currentThread().getStackTrace();
+
+    int index = 0;
+    while (index < stack.length && !stack[index].getClassName().equals(getClass().getName())) {
+      index++;
+    };
+    // Find Playwright API call
+    while (index < stack.length && stack[index].getClassName().startsWith("com.microsoft.playwright.")) {
+      // hack for tests
+      if (stack[index].getClassName().startsWith("com.microsoft.playwright.Test")) {
+        break;
+      }
+      index++;
+    }
+    JsonArray jsonStack = new JsonArray();
+    for (; index < stack.length; index++) {
+      StackTraceElement frame = stack[index];
+      JsonObject jsonFrame = new JsonObject();
+      jsonFrame.addProperty("file", sourceFile(frame));
+      jsonFrame.addProperty("line", frame.getLineNumber());
+      jsonFrame.addProperty("function", frame.getClassName() + "." + frame.getMethodName());
+      jsonStack.add(jsonFrame);
+    }
+    return jsonStack;
+  }
+
+
+}
@@ -16,47 +16,62 @@

 package com.microsoft.playwright.impl;

-import com.google.gson.JsonElement;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
+import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.Tracing;

 import java.nio.file.Path;

 import static com.microsoft.playwright.impl.Serialization.gson;

-class TracingImpl implements Tracing {
-  private final BrowserContextImpl context;
+class TracingImpl extends ChannelOwner implements Tracing {
+  LocalUtils localUtils;
+  boolean isRemote;

-  TracingImpl(BrowserContextImpl context) {
-    this.context = context;
+  TracingImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
+    super(parent, type, guid, initializer);
  }

  private void stopChunkImpl(Path path) {
    JsonObject params = new JsonObject();
-    params.addProperty("save", path != null);
-    params.addProperty("skipCompress", false);
-    JsonObject json = context.sendMessage("tracingStopChunk", params).getAsJsonObject();
+    String mode = "doNotSave";
+    if (path != null) {
+      if (isRemote) {
+        mode = "compressTrace";
+      } else {
+        mode = "compressTraceAndSources";
+      }
+    }
+    params.addProperty("mode", mode);
+    JsonObject json = sendMessage("tracingStopChunk", params).getAsJsonObject();
    if (!json.has("artifact")) {
      return;
    }
-    ArtifactImpl artifact = context.connection.getExistingObject(json.getAsJsonObject("artifact").get("guid").getAsString());
+    ArtifactImpl artifact = connection.getExistingObject(json.getAsJsonObject("artifact").get("guid").getAsString());
    // In case of CDP connection browser is null but since the connection is established by
    // the driver it is safe to consider the artifact local.
-    if (context.browser() != null && context.browser().isRemote) {
+    if (isRemote) {
      artifact.isRemote = true;
    }
    artifact.saveAs(path);
    artifact.delete();
+
+    // Add local sources to the remote trace if necessary.
+    if (isRemote && json.has("sourceEntries")) {
+      JsonArray entries = json.getAsJsonArray("sourceEntries");
+      localUtils.zip(path, entries);
+    }
  }

  @Override
  public void start(StartOptions options) {
-    context.withLogging("Tracing.start", () -> startImpl(options));
+    withLogging("Tracing.start", () -> startImpl(options));
  }

  @Override
  public void startChunk(StartChunkOptions options) {
-    context.withLogging("Tracing.startChunk", () -> {
+    withLogging("Tracing.startChunk", () -> {
      startChunkImpl(options);
    });
  }
@@ -66,7 +81,7 @@ class TracingImpl implements Tracing {
      options = new StartChunkOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    context.sendMessage("tracingStartChunk", params);
+    sendMessage("tracingStartChunk", params);
  }

  private void startImpl(StartOptions options) {
@@ -74,21 +89,28 @@ class TracingImpl implements Tracing {
      options = new StartOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    context.sendMessage("tracingStart", params);
-    context.sendMessage("tracingStartChunk");
+    boolean includeSources = options.sources != null && options.sources;
+    if (includeSources) {
+      if (!connection.isCollectingStacks()) {
+        throw new PlaywrightException("Source root directory must be specified via PLAYWRIGHT_JAVA_SRC environment variable when source collection is enabled");
+      }
+      params.addProperty("sources", true);
+    }
+    sendMessage("tracingStart", params);
+    sendMessage("tracingStartChunk");
  }

  @Override
  public void stop(StopOptions options) {
-    context.withLogging("Tracing.stop", () -> {
+    withLogging("Tracing.stop", () -> {
      stopChunkImpl(options == null ? null : options.path);
-      context.sendMessage("tracingStop");
+      sendMessage("tracingStop");
    });
  }

  @Override
  public void stopChunk(StopChunkOptions options) {
-    context.withLogging("Tracing.stopChunk", () -> {
+    withLogging("Tracing.stopChunk", () -> {
      stopChunkImpl(options == null ? null : options.path);
    });
  }
@@ -16,7 +16,8 @@

 package com.microsoft.playwright.impl;

-import com.google.gson.*;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
 import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.options.FilePayload;
 import com.microsoft.playwright.options.HttpHeader;
@@ -24,32 +25,57 @@ import com.microsoft.playwright.options.HttpHeader;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.reflect.Type;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.*;
+import java.util.regex.Pattern;
+
+import static com.microsoft.playwright.impl.Serialization.toJsonArray;

 class Utils {
-  // TODO: generate converter.
-  static <F, T> T convertViaJson(F f, Class<T> t) {
-    Gson gson = new GsonBuilder()
-      // Necessary to avoid access to private fields/classes,
-      // see https://github.com/microsoft/playwright-java/issues/423
-      .registerTypeAdapter(Optional.class, new OptionalSerializer())
-      .create();
-    String json = gson.toJson(f);
-    return gson.fromJson(json, t);
-  }
+  static <F, T> T convertType(F f, Class<T> t) {
+    if (f == null) {
+      return null;
+    }

-  private static class OptionalSerializer implements JsonSerializer<Optional> {
-    @Override
-    public JsonElement serialize(Optional src, Type typeOfSrc, JsonSerializationContext context) {
-      JsonObject result = new JsonObject();
-      if (src.isPresent()) {
-        result.add("value", context.serialize(src.get()));
+    // Make sure shallow copy is sufficient
+    if (!t.getSuperclass().equals(Object.class) && !t.getSuperclass().equals(Enum.class)) {
+      throw new PlaywrightException("Cannot convert to " + t.getCanonicalName() + " that has superclass " + t.getSuperclass().getCanonicalName());
+    }
+    if (!f.getClass().getSuperclass().equals(t.getSuperclass())) {
+      throw new PlaywrightException("Cannot convert from " + t.getCanonicalName() + " that has superclass " + t.getSuperclass().getCanonicalName());
+    }
+
+    if (f instanceof Enum) {
+      return (T) Enum.valueOf((Class) t, ((Enum) f).name());
+    }
+
+    try {
+      T result = t.getDeclaredConstructor().newInstance();
+      for (Field toField : t.getDeclaredFields()) {
+        // Skip fields added by test coverage tools, see https://github.com/microsoft/playwright-java/issues/802
+        if (toField.isSynthetic()) {
+          continue;
+        }
+        if (Modifier.isStatic(toField.getModifiers())) {
+            throw new RuntimeException("Unexpected field modifiers: " + t.getCanonicalName() + "." + toField.getName() + ", modifiers: " + toField.getModifiers());
+        }
+        try {
+          Field fromField = f.getClass().getDeclaredField(toField.getName());
+          Object value = fromField.get(f);
+          if (value != null) {
+            toField.set(result, value);
+          }
+        } catch (NoSuchFieldException e) {
+          continue;
+        }
      }
      return result;
+    } catch (Exception e) {
+      throw new PlaywrightException("Internal error", e);
    }
  }

@@ -62,7 +88,7 @@ class Utils {
    for (int i = 0; i < glob.length(); ++i) {
      char c = glob.charAt(i);
      if (escapeGlobChars.contains(c)) {
-        tokens.append("\\" + c);
+        tokens.append("\\").append(c);
        continue;
      }
      if (c == '*') {
@@ -100,7 +126,7 @@ class Utils {
            tokens.append('|');
            break;
          }
-          tokens.append("\\" + c);
+          tokens.append("\\").append(c);
          break;
        default:
          tokens.append(c);
@@ -123,20 +149,67 @@ class Utils {
    return mimeType;
  }

+  static final int maxUplodBufferSize = 50 * 1024 * 1024;
+
+  static boolean hasLargeFile(Path[] files) {
+    for (Path file: files) {
+      try {
+        if (Files.size(file)> maxUplodBufferSize) {
+          return true;
+        }
+      } catch (IOException e) {
+        throw new PlaywrightException("Cannot get file size.", e);
+      }
+    }
+    return false;
+  }
+
+  static void addLargeFileUploadParams(Path[] files, JsonObject params, BrowserContextImpl context) {
+    if (context.browser().isRemote) {
+      List<WritableStream> streams = new ArrayList<>();
+      JsonArray jsonStreams = new JsonArray();
+      for (Path path : files) {
+        WritableStream temp = context.createTempFile(path.getFileName().toString());
+        streams.add(temp);
+        try (OutputStream out = temp.stream()) {
+          Files.copy(path, out);
+        } catch (IOException e) {
+          throw new PlaywrightException("Failed to copy file to remote server.", e);
+        }
+        jsonStreams.add(temp.toProtocol());
+      }
+      params.add("streams", jsonStreams);
+    } else {
+      params.add("localPaths", toJsonArray(files));
+    }
+  }
+
+  static void checkFilePayloadSize(FilePayload[] files) {
+    for (FilePayload file: files) {
+      if (file.buffer.length > maxUplodBufferSize) {
+        throw new PlaywrightException("Cannot set buffer larger than 50Mb, please write it to a file and pass its path instead.");
+      }
+    }
+  }
+
  static FilePayload[] toFilePayloads(Path[] files) {
    List<FilePayload> payloads = new ArrayList<>();
    for (Path file : files) {
-      byte[] buffer;
-      try {
-        buffer = Files.readAllBytes(file);
-      } catch (IOException e) {
-        throw new PlaywrightException("Failed to read from file", e);
-      }
-      payloads.add(new FilePayload(file.getFileName().toString(), mimeType(file), buffer));
+      payloads.add(toFilePayload(file));
    }
    return payloads.toArray(new FilePayload[0]);
  }

+  static FilePayload toFilePayload(Path file) {
+    byte[] buffer;
+    try {
+      buffer = Files.readAllBytes(file);
+    } catch (IOException e) {
+      throw new PlaywrightException("Failed to read from file", e);
+    }
+    return new FilePayload(file.getFileName().toString(), null, buffer);
+  }
+
  static void mkParentDirs(Path file) {
    Path dir = file.getParent();
    if (dir != null) {
@@ -144,7 +217,7 @@ class Utils {
        try {
          Files.createDirectories(dir);
        } catch (IOException e) {
-          throw new PlaywrightException("Failed to create parent directory: " + dir.toString(), e);
+          throw new PlaywrightException("Failed to create parent directory: " + dir, e);
        }
      }
    }
@@ -177,7 +250,7 @@ class Utils {
  }

  static boolean isSafeCloseError(String error) {
-    return error.endsWith("Browser has been closed") || error.endsWith("Target page, context or browser has been closed");
+    return error.contains("Browser has been closed") || error.contains("Target page, context or browser has been closed");
  }

  static String createGuid() {
@@ -196,4 +269,24 @@ class Utils {
    }
    return map;
  }
+
+  static String toJsRegexFlags(Pattern pattern) {
+    String regexFlags = "";
+    if ((pattern.flags() & Pattern.CASE_INSENSITIVE) != 0) {
+      // Case-insensitive search.
+      regexFlags += "i";
+    }
+    if ((pattern.flags() & Pattern.DOTALL) != 0) {
+      // Allows . to match newline characters.
+      regexFlags += "s";
+    }
+    if ((pattern.flags() & Pattern.MULTILINE) != 0) {
+      // Multi-line search.
+      regexFlags += "m";
+    }
+    if ((pattern.flags() & ~(Pattern.MULTILINE | Pattern.CASE_INSENSITIVE | Pattern.DOTALL)) != 0) {
+      throw new PlaywrightException("Unexpected RegEx flag, only CASE_INSENSITIVE, DOTALL and MULTILINE are supported.");
+    }
+    return regexFlags;
+  }
 }
@@ -22,7 +22,4 @@ interface Waitable<T> {
  boolean isDone();
  T get();
  void dispose();
-  default <U> Waitable<U> apply(Function<T, U> transform) {
-    return new WaitableAdapter<T, U>(this, transform);
-  }
 }
@@ -0,0 +1,39 @@
+package com.microsoft.playwright.impl;
+
+import com.google.gson.JsonObject;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+class WritableStream extends ChannelOwner {
+  WritableStream(ChannelOwner parent, String type, String guid, JsonObject initializer) {
+    super(parent, type, guid, initializer);
+  }
+
+  OutputStream stream() {
+    return new OutputStream() {
+      @Override
+      public void write(int b) throws IOException {
+        write(new byte[] { (byte) b });
+      }
+
+      @Override
+      public void write(byte[] b, int off, int len) throws IOException {
+        JsonObject params = new JsonObject();
+        ByteBuffer buffer = ByteBuffer.wrap(b, off, len);
+        ByteBuffer encoded = Base64.getEncoder().encode(buffer);
+        params.addProperty("binary", new String(encoded.array(), StandardCharsets.UTF_8));
+        sendMessage("write", params);
+      }
+    };
+  }
+
+  JsonObject toProtocol() {
+    JsonObject json = new JsonObject();
+    json.addProperty("guid", guid);
+    return json;
+  }
+}
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+
+package com.microsoft.playwright.options;
+
+import com.microsoft.playwright.impl.FormDataImpl;
+import java.nio.file.Path;
+
+/**
+ * The {@code FormData} is used create form data that is sent via {@code APIRequestContext}.
+ * <pre>{@code
+ * import com.microsoft.playwright.options.FormData;
+ * ...
+ * FormData form = FormData.create()
+ *     .set("firstName", "John")
+ *     .set("lastName", "Doe")
+ *     .set("age", 30);
+ * page.request().post("http://localhost/submit", RequestOptions.create().setForm(form));
+ * }</pre>
+ */
+public interface FormData {
+  /**
+   * Creates new instance of {@code FormData}.
+   */
+  static FormData create() {
+    return new FormDataImpl();
+  }
+  /**
+   * Sets a field on the form. File values can be passed either as {@code Path} or as {@code FilePayload}.
+   *
+   * @param name Field name.
+   * @param value Field value.
+   */
+  FormData set(String name, String value);
+  /**
+   * Sets a field on the form. File values can be passed either as {@code Path} or as {@code FilePayload}.
+   *
+   * @param name Field name.
+   * @param value Field value.
+   */
+  FormData set(String name, boolean value);
+  /**
+   * Sets a field on the form. File values can be passed either as {@code Path} or as {@code FilePayload}.
+   *
+   * @param name Field name.
+   * @param value Field value.
+   */
+  FormData set(String name, int value);
+  /**
+   * Sets a field on the form. File values can be passed either as {@code Path} or as {@code FilePayload}.
+   *
+   * @param name Field name.
+   * @param value Field value.
+   */
+  FormData set(String name, Path value);
+  /**
+   * Sets a field on the form. File values can be passed either as {@code Path} or as {@code FilePayload}.
+   *
+   * @param name Field name.
+   * @param value Field value.
+   */
+  FormData set(String name, FilePayload value);
+}
+
@@ -0,0 +1,133 @@
+/*
+ * 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.
+ */
+
+package com.microsoft.playwright.options;
+
+import com.microsoft.playwright.impl.RequestOptionsImpl;
+
+/**
+ * The {@code RequestOptions} allows to create form data to be sent via {@code APIRequestContext}.
+ * <pre>{@code
+ * context.request().post(
+ *   "https://example.com/submit",
+ *   RequestOptions.create()
+ *     .setQueryParam("page", 1)
+ *     .setData("My data"));
+ * }</pre>
+ */
+public interface RequestOptions {
+  /**
+   * Creates new instance of {@code RequestOptions}.
+   */
+  static RequestOptions create() {
+    return new RequestOptionsImpl();
+  }
+  /**
+   * Sets the request's post data.
+   *
+   * @param data Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string and
+   * {@code content-type} header will be set to {@code application/json} if not explicitly set. Otherwise the {@code content-type} header will
+   * be set to {@code application/octet-stream} if not explicitly set.
+   */
+  RequestOptions setData(String data);
+  /**
+   * Sets the request's post data.
+   *
+   * @param data Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string and
+   * {@code content-type} header will be set to {@code application/json} if not explicitly set. Otherwise the {@code content-type} header will
+   * be set to {@code application/octet-stream} if not explicitly set.
+   */
+  RequestOptions setData(byte[] data);
+  /**
+   * Sets the request's post data.
+   *
+   * @param data Allows to set post data of the request. If the data parameter is an object, it will be serialized to json string and
+   * {@code content-type} header will be set to {@code application/json} if not explicitly set. Otherwise the {@code content-type} header will
+   * be set to {@code application/octet-stream} if not explicitly set.
+   */
+  RequestOptions setData(Object data);
+  /**
+   *
+   *
+   * @param failOnStatusCode Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status codes.
+   */
+  RequestOptions setFailOnStatusCode(boolean failOnStatusCode);
+  /**
+   * Provides {@code FormData} object that will be serialized as html form using {@code application/x-www-form-urlencoded} encoding and
+   * sent as this request body. If this parameter is specified {@code content-type} header will be set to
+   * {@code application/x-www-form-urlencoded} unless explicitly provided.
+   *
+   * @param form Form data to be serialized as html form using {@code application/x-www-form-urlencoded} encoding and sent as this request
+   * body.
+   */
+  RequestOptions setForm(FormData form);
+  /**
+   * Sets an HTTP header to the request.
+   *
+   * @param name Header name.
+   * @param value Header value.
+   */
+  RequestOptions setHeader(String name, String value);
+  /**
+   *
+   *
+   * @param ignoreHTTPSErrors Whether to ignore HTTPS errors when sending network requests.
+   */
+  RequestOptions setIgnoreHTTPSErrors(boolean ignoreHTTPSErrors);
+  /**
+   * Changes the request method (e.g. <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/PUT">PUT</a> or <a
+   * href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/POST">POST</a>).
+   *
+   * @param method Request method, e.g. <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/POST">POST</a>.
+   */
+  RequestOptions setMethod(String method);
+  /**
+   * Provides {@code FormData} object that will be serialized as html form using {@code multipart/form-data} encoding and sent as this
+   * request body. If this parameter is specified {@code content-type} header will be set to {@code multipart/form-data} unless
+   * explicitly provided.
+   *
+   * @param form Form data to be serialized as html form using {@code multipart/form-data} encoding and sent as this request body.
+   */
+  RequestOptions setMultipart(FormData form);
+  /**
+   * Adds a query parameter to the request URL.
+   *
+   * @param name Parameter name.
+   * @param value Parameter value.
+   */
+  RequestOptions setQueryParam(String name, String value);
+  /**
+   * Adds a query parameter to the request URL.
+   *
+   * @param name Parameter name.
+   * @param value Parameter value.
+   */
+  RequestOptions setQueryParam(String name, boolean value);
+  /**
+   * Adds a query parameter to the request URL.
+   *
+   * @param name Parameter name.
+   * @param value Parameter value.
+   */
+  RequestOptions setQueryParam(String name, int value);
+  /**
+   * Sets request timeout in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout.
+   *
+   * @param timeout Request timeout in milliseconds.
+   */
+  RequestOptions setTimeout(double timeout);
+}
+
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+package com.microsoft.playwright.options;
+
+public enum ScreenshotAnimations {
+  DISABLED,
+  ALLOW
+}
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+package com.microsoft.playwright.options;
+
+public enum ScreenshotCaret {
+  HIDE,
+  INITIAL
+}
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+package com.microsoft.playwright.options;
+
+public enum ScreenshotScale {
+  CSS,
+  DEVICE
+}
@@ -0,0 +1,66 @@
+package com.microsoft.playwright;
+
+import com.sun.net.httpserver.HttpExchange;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class MultipartFormData {
+  static MultipartFormData parseRequest(HttpExchange exchange) throws IOException {
+    ByteArrayOutputStream bodyBytes = new ByteArrayOutputStream();
+    try (OutputStream output = bodyBytes) {
+      Utils.copy(exchange.getRequestBody(), output);
+    }
+    String body = new String(bodyBytes.toByteArray(), StandardCharsets.UTF_8);
+    String contentType = exchange.getRequestHeaders().get("content-type").get(0);
+    Matcher matcher = Pattern.compile("boundary=(.*)$").matcher(contentType);
+    if (!matcher.find()) {
+      throw new RuntimeException("Boundary not found!");
+    }
+    String boundary = matcher.group(1);
+    return new MultipartFormData(body, boundary);
+  }
+
+  static class Field {
+    final String filename;
+    final String content;
+
+    Field(String filename, String content) {
+      this.filename = filename;
+      this.content = content;
+    }
+  }
+
+  final List<Field> fields = new ArrayList<>();
+
+  MultipartFormData(String body, String boundary) {
+    String[] parts = Pattern.compile("--" + boundary + "(--)?\r\n", Pattern.MULTILINE).split(body);
+    for (String part : parts) {
+      if (part.trim().length() == 0) {
+        continue;
+      }
+      String[] headersAndContent = Pattern.compile("\r\n\r\n", Pattern.MULTILINE).split(part);
+      if (headersAndContent.length != 2) {
+        throw new RuntimeException("Unexpected format: " + part);
+      }
+      String headers = headersAndContent[0];
+      String filename = null;
+      for (String header: Pattern.compile("\r\n", Pattern.MULTILINE).split(headers)) {
+        Matcher matcher = Pattern.compile("content-disposition: .*filename=\"([^\"]+)\"", Pattern.CASE_INSENSITIVE).matcher(header);
+        if (!matcher.find()) {
+          continue;
+        }
+        filename = matcher.group(1);
+      }
+      String content = headersAndContent[1];
+      content = content.substring(0, content.length() - "\r\n".length());
+      fields.add(new Field(filename, content));
+    }
+  }
+}
@@ -98,12 +98,14 @@ public class Server implements HttpHandler {
  }

  static class Request {
+    public final String url;
    public final String method;
    // TODO: make a copy to ensure thread safety?
    public final Headers headers;
    public final byte[] postBody;

    Request(HttpExchange exchange) throws IOException {
+      url = exchange.getRequestURI().toString();
      method = exchange.getRequestMethod();
      headers = exchange.getRequestHeaders();
      ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -163,8 +165,6 @@ public class Server implements HttpHandler {
        exchange.sendResponseHeaders(401, 0);
        try (Writer writer = new OutputStreamWriter(exchange.getResponseBody())) {
          writer.write("HTTP Error 401 Unauthorized: Access is denied");
-          // TODO: notify subscriber?
-          exchange.getResponseBody().close();
        }
        return;
      }
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+package com.microsoft.playwright;
+
+import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
+
+import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestAPIResponseAssertions extends TestBase {
+  @Test
+  void passWithResponse() {
+    APIResponse res = page.request().get(server.EMPTY_PAGE);
+    assertThat(res).isOK();
+  }
+
+  @Test
+  void passWithNot() {
+    APIResponse res = page.request().get(server.PREFIX + "/unknown");
+    assertThat(res).not().isOK();
+  }
+
+  @Test
+  void fail() {
+    APIResponse res = page.request().get(server.PREFIX + "/unknown");
+    boolean didThrow = false;
+    try {
+      assertThat(res).isOK();
+    } catch (AssertionFailedError e) {
+      didThrow = true;
+      assertTrue(e.getMessage().contains("→ GET " + server.PREFIX + "/unknown"), "Actual error: " + e.toString());
+      assertTrue(e.getMessage().contains("← 404 Not Found"), "Actual error: " + e.toString());
+    }
+    assertTrue(didThrow);
+  }
+}
@@ -26,7 +26,6 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;

 import static com.microsoft.playwright.Utils.assertJsonEquals;
-import static com.microsoft.playwright.Utils.getOS;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
@@ -58,6 +57,7 @@ public class TestBrowserContextAddCookies extends TestBase {
      .setDomain(cookies.get(0).domain)
      .setPath(cookies.get(0).path)
      .setExpires(cookies.get(0).expires)
+      .setSameSite(cookies.get(0).sameSite)
    ));
    assertJsonEquals(new Gson().toJson(cookies), context.cookies());
  }
@@ -32,11 +32,8 @@ public class TestBrowserContextCredentials extends TestBase {
  @DisabledIf(value="isChromiumHeadful", disabledReason="fail")
  void shouldFailWithoutCredentials() {
    server.setAuth("/empty.html", "user", "pass");
-    BrowserContext context = browser.newContext();
-    Page page = context.newPage();
    Response response = page.navigate(server.EMPTY_PAGE);
    assertEquals(401, response.status());
-    context.close();
  }

  void shouldWorkWithSetHTTPCredentials() {
@@ -46,34 +43,35 @@ public class TestBrowserContextCredentials extends TestBase {
  @Test
  void shouldWorkWithCorrectCredentials() {
    server.setAuth("/empty.html", "user", "pass");
-    BrowserContext context = browser.newContext(new Browser.NewContextOptions()
-      .setHttpCredentials("user", "pass"));
-    Page page = context.newPage();
-    Response response = page.navigate(server.EMPTY_PAGE);
-    assertEquals(200, response.status());
-    context.close();
+    try (BrowserContext context = browser.newContext(new Browser.NewContextOptions()
+      .setHttpCredentials("user", "pass"))) {
+      Page page = context.newPage();
+      Response response = page.navigate(server.EMPTY_PAGE);
+      assertEquals(200, response.status());
+    }
  }

  @Test
  void shouldFailWithWrongCredentials() {
    server.setAuth("/empty.html", "user", "pass");
-    BrowserContext context = browser.newContext(new Browser.NewContextOptions().setHttpCredentials("foo", "bar"));
-    Page page = context.newPage();
-    Response response = page.navigate(server.EMPTY_PAGE);
-    assertEquals(401, response.status());
-    context.close();
+    try (BrowserContext context = browser.newContext(new Browser.NewContextOptions()
+      .setHttpCredentials("foo", "bar"))) {
+      Page page = context.newPage();
+      Response response = page.navigate(server.EMPTY_PAGE);
+      assertEquals(401, response.status());
+    }
  }

  @Test
  void shouldReturnResourceBody() {
    server.setAuth("/playground.html", "user", "pass");
-    BrowserContext context = browser.newContext(new Browser.NewContextOptions()
-      .setHttpCredentials("user", "pass"));
-    Page page = context.newPage();
-    Response response = page.navigate(server.PREFIX + "/playground.html");
-    assertEquals(200, response.status());
-    assertEquals("Playground", page.title());
-    assertTrue(new String(response.body()).contains("Playground"));
-    context.close();
+    try (BrowserContext context = browser.newContext(new Browser.NewContextOptions()
+      .setHttpCredentials("user", "pass"))) {
+      Page page = context.newPage();
+      Response response = page.navigate(server.PREFIX + "/playground.html");
+      assertEquals(200, response.status());
+      assertEquals("Playground", page.title());
+      assertTrue(new String(response.body()).contains("Playground"));
+    }
  }
 }
@@ -0,0 +1,683 @@
+package com.microsoft.playwright;
+
+import com.google.gson.Gson;
+import com.microsoft.playwright.options.*;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import static com.microsoft.playwright.Utils.*;
+import static java.util.Arrays.asList;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TestBrowserContextFetch extends TestBase {
+  @Test
+  void getShouldWork() {
+    APIResponse response = context.request().get(server.PREFIX + "/simple.json");
+    assertEquals(server.PREFIX + "/simple.json", response.url());
+    assertEquals(200, response.status());
+    assertEquals("OK", response.statusText());
+    assertNotNull(response.ok());
+    assertEquals(server.PREFIX + "/simple.json", response.url());
+    assertEquals("application/json", response.headers().get("content-type"));
+    Optional<HttpHeader> contentType = response.headersArray().stream().filter(h -> "content-type".equals(h.name.toLowerCase())).findFirst();
+    assertTrue(contentType.isPresent());
+    assertEquals("application/json", contentType.get().value);
+    assertEquals("{\"foo\": \"bar\"}\n", response.text());
+  }
+
+  @Test
+  void fetchShouldWork() {
+    APIResponse response = context.request().fetch(server.PREFIX + "/simple.json");
+    assertEquals(server.PREFIX + "/simple.json", response.url());
+    assertEquals(200, response.status());
+    assertEquals("OK", response.statusText());
+    assertNotNull(response.ok());
+    assertEquals(server.PREFIX + "/simple.json", response.url());
+    Optional<HttpHeader> contentType = response.headersArray().stream().filter(h -> "content-type".equals(h.name.toLowerCase())).findFirst();
+    assertTrue(contentType.isPresent());
+    assertEquals("application/json", contentType.get().value);
+    assertEquals("{\"foo\": \"bar\"}\n", response.text());
+  }
+
+  //     server.setRoute("/one-style.css", exchange -> exchange.getResponseBody().close());
+  @Test
+  void shouldThrowOnNetworkError() {
+    server.setRoute("/test", exchange -> exchange.getResponseBody().close());
+    try {
+      context.request().get(server.PREFIX + "/test");
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("socket hang up"), e.getMessage());
+    }
+  }
+
+  @Test
+  void shouldThrowOnNetworkErrorAfterRedirect() {
+    server.setRedirect("/redirect", "/test");
+    server.setRoute("/test", exchange -> exchange.getResponseBody().close());
+    try {
+      context.request().get(server.PREFIX + "/redirect");
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("socket hang up"), e.getMessage());
+    }
+  }
+
+  @Test
+  void shouldThrowOnNetworkErrorWhenSendingBody() {
+    server.setRoute("/test", exchange -> {
+      exchange.getResponseHeaders().add("content-type", "text/html");
+      exchange.sendResponseHeaders(200, 4096);
+      try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
+        writer.write("<title>A");
+      }
+    });
+    try {
+      context.request().get(server.PREFIX + "/test");
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("aborted"), e.getMessage());
+    }
+  }
+
+  @Test
+  void shouldThrowOnNetworkErrorWhenSendingBodyAfterRedirect() {
+    server.setRedirect("/redirect", "/test");
+    server.setRoute("/test", exchange -> {
+      exchange.getResponseHeaders().add("content-type", "text/html");
+      exchange.sendResponseHeaders(200, 4096);
+      try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
+        writer.write("<title>A");
+      }
+    });
+    try {
+      context.request().get(server.PREFIX + "/redirect");
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("aborted"), e.getMessage());
+    }
+  }
+
+  @Test
+  void shouldAddSessionCookiesToRequest() throws ExecutionException, InterruptedException {
+    Cookie cookie = new Cookie("username", "John Doe");
+    cookie.domain = "localhost";
+    cookie.path = "/";
+    cookie.expires = -1.0;
+    cookie.httpOnly = false;
+    cookie.secure = false;
+    cookie.sameSite = SameSiteAttribute.LAX;
+    context.addCookies(asList(cookie));
+    Future<Server.Request> req = server.futureRequest("/simple.json");
+    context.request().get(server.PREFIX + "/simple.json");
+    assertEquals(asList("username=John Doe"), req.get().headers.get("cookie"));
+  }
+
+  @Test
+  void getShouldSupportQueryParams() throws ExecutionException, InterruptedException {
+    Future<Server.Request> req = server.futureRequest("/empty.html");
+    context.request().get(server.EMPTY_PAGE + "?p1=foo",
+      RequestOptions.create().setQueryParam("p1", "v1").setQueryParam("парам2", "знач2"));
+    assertNotNull(req.get());
+    assertEquals("/empty.html?p1=v1&%D0%BF%D0%B0%D1%80%D0%B0%D0%BC2=%D0%B7%D0%BD%D0%B0%D1%872", req.get().url);
+  }
+
+  ;
+
+  @Test
+  void getShouldSupportFailOnStatusCode() {
+    try {
+      context.request().get(server.PREFIX + "/does-not-exist.html", RequestOptions.create().setFailOnStatusCode(true));
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("404 Not Found"), e.getMessage());
+    }
+  }
+
+  @Test
+  @Disabled("Error: socket hang up")
+  void getShouldSupportIgnoreHTTPSErrorsOption() {
+    APIResponse response = context.request().get(httpsServer.EMPTY_PAGE, RequestOptions.create().setIgnoreHTTPSErrors(true));
+    assertEquals(200, response.status());
+  }
+
+  @Test
+  void shouldNotAddContextCookieIfCookieHeaderPassedAsAParameter() throws ExecutionException, InterruptedException {
+    Cookie cookie = new Cookie("username", "John Doe");
+    cookie.domain = "localhost";
+    cookie.path = "/";
+    cookie.expires = -1.0;
+    cookie.httpOnly = false;
+    cookie.secure = false;
+    cookie.sameSite = SameSiteAttribute.LAX;
+    context.addCookies(asList(cookie));
+    Future<Server.Request> req = server.futureRequest("/empty.html");
+    context.request().get(server.EMPTY_PAGE, RequestOptions.create().setHeader("Cookie", "foo=bar"));
+    assertEquals(asList("foo=bar"), req.get().headers.get("cookie"));
+  }
+
+  @Test
+  void shouldFollowRedirects() throws ExecutionException, InterruptedException {
+    server.setRedirect("/redirect1", "/redirect2");
+    server.setRedirect("/redirect2", "/simple.json");
+    Cookie cookie = new Cookie("username", "John Doe");
+    cookie.domain = "localhost";
+    cookie.path = "/";
+    cookie.expires = -1.0;
+    cookie.httpOnly = false;
+    cookie.secure = false;
+    cookie.sameSite = SameSiteAttribute.LAX;
+    context.addCookies(asList(cookie));
+
+    Future<Server.Request> req = server.futureRequest("/simple.json");
+    APIResponse response = context.request().get(server.PREFIX + "/redirect1");
+    assertEquals(asList("username=John Doe"), req.get().headers.get("cookie"));
+    assertEquals(server.PREFIX + "/simple.json", response.url());
+    assertEquals("{\"foo\": \"bar\"}\n", response.text());
+  }
+
+  @Test
+  void shouldAddCookiesFromSetCookieHeader() {
+    server.setRoute("/setcookie.html", exchange -> {
+      exchange.getResponseHeaders().add("Set-Cookie", "session=value");
+      exchange.getResponseHeaders().add("Set-Cookie", "foo=bar; max-age=3600");
+      exchange.sendResponseHeaders(200, 0);
+      exchange.getResponseBody().close();
+    });
+
+    context.request().get(server.PREFIX + "/setcookie.html");
+    List<Cookie> cookies = context.cookies();
+    assertEquals(2, cookies.size());
+    cookies.sort(Comparator.comparing(a -> a.name));
+    assertEquals("foo", cookies.get(0).name);
+    assertEquals("bar", cookies.get(0).value);
+    assertEquals("session", cookies.get(1).name);
+    assertEquals("value", cookies.get(1).value);
+    page.navigate(server.EMPTY_PAGE);
+    assertEquals(asList("foo=bar", "session=value"), page.evaluate("() => document.cookie.split(';').map(s => s.trim()).sort()"));
+  }
+
+  @Test
+  @Disabled("Default Java's HTTP server throws on 'CONNECT non-existent.com:80 HTTP/1.1' because path is null.")
+  void shouldWorkWithContextLevelProxy() throws ExecutionException, InterruptedException {
+    server.setRoute("/target.html", exchange -> {
+      exchange.getResponseHeaders().add("Content-Type", "text/plain; charset=utf-8");
+      exchange.sendResponseHeaders(200, 0);
+      try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
+        writer.write("<title>Served by the proxy</title>");
+      }
+    });
+    try (Browser browser = browserType.launch(new BrowserType.LaunchOptions().setProxy("http://per-context"))) {
+      BrowserContext context = browser.newContext(new Browser.NewContextOptions().setProxy("localhost:" + server.PORT));
+      Future<Server.Request> request = server.futureRequest("/target.html");
+      APIResponse response = context.request().get("http://non-existent.com/target.html");
+
+      assertEquals(200, response.status());
+      assertEquals("/target.html", request.get().url);
+    }
+  }
+
+
+  @Test
+  void shouldWorkWithHttpCredentials() throws ExecutionException, InterruptedException {
+    server.setAuth("/empty.html", "user", "pass");
+
+    String base64 = Base64.getEncoder().encodeToString("user:pass".getBytes(StandardCharsets.UTF_8));;
+    Future<Server.Request> request = server.futureRequest("/empty.html");
+    APIResponse response = context.request().get(server.EMPTY_PAGE, RequestOptions.create()
+      .setHeader("authorization", "Basic " + base64));
+    assertEquals(200, response.status());
+    assertEquals("/empty.html", request.get().url);
+  }
+
+  @Test
+  void shouldWorkWithSetHTTPCredentials() {
+    server.setAuth("/empty.html", "user", "pass");
+    APIResponse response1 = context.request().get(server.EMPTY_PAGE);
+    assertEquals(401, response1.status());
+
+    try (BrowserContext context2 = browser.newContext(
+      new Browser.NewContextOptions().setHttpCredentials("user", "pass"))) {
+      APIResponse response2 = context2.request().get(server.EMPTY_PAGE);
+      assertEquals(200, response2.status());
+    }
+  }
+
+  @Test
+  void shouldReturnErrorWithWrongCredentials() {
+    server.setAuth("/empty.html", "user", "pass");
+    try (BrowserContext context = browser.newContext(
+      new Browser.NewContextOptions().setHttpCredentials("user", "wrong"))) {
+      APIResponse response = context.request().get(server.EMPTY_PAGE);
+      assertEquals(401, response.status());
+    }
+  }
+
+  @Test
+  void postShouldSupportPostData() throws ExecutionException, InterruptedException {
+    Future<Server.Request> request = server.futureRequest("/simple.json");
+    APIResponse response = context.request().post(server.PREFIX + "/simple.json",
+      RequestOptions.create().setData("My request"));
+    assertEquals("POST", request.get().method);
+    assertEquals("My request", new String(request.get().postBody));
+    assertEquals(200, response.status());
+    assertEquals("/simple.json", request.get().url);
+  }
+
+  @Test
+  void deleteShouldSupportPostData() throws ExecutionException, InterruptedException {
+    Future<Server.Request> request = server.futureRequest("/simple.json");
+    APIResponse response = context.request().delete(server.PREFIX + "/simple.json",
+      RequestOptions.create().setData("My request"));
+    assertEquals("DELETE", request.get().method);
+    assertEquals("My request", new String(request.get().postBody));
+    assertEquals(200, response.status());
+    assertEquals("/simple.json", request.get().url);
+  }
+
+  @Test
+  void patchShouldSupportPostData() throws ExecutionException, InterruptedException {
+    Future<Server.Request> request = server.futureRequest("/simple.json");
+    APIResponse response = context.request().patch(server.PREFIX + "/simple.json",
+      RequestOptions.create().setData("My request"));
+    assertEquals("PATCH", request.get().method);
+    assertEquals("My request", new String(request.get().postBody));
+    assertEquals(200, response.status());
+    assertEquals("/simple.json", request.get().url);
+  }
+
+  @Test
+  void putShouldSupportPostData() throws ExecutionException, InterruptedException {
+    Future<Server.Request> request = server.futureRequest("/simple.json");
+    APIResponse response = context.request().put(server.PREFIX + "/simple.json",
+      RequestOptions.create().setData("My request"));
+    assertEquals("PUT", request.get().method);
+    assertEquals("My request", new String(request.get().postBody));
+    assertEquals(200, response.status());
+    assertEquals("/simple.json", request.get().url);
+  }
+
+
+  @Test
+  void shouldAddDefaultHeaders() throws ExecutionException, InterruptedException {
+    Future<Server.Request> request = server.futureRequest("/empty.html");
+    context.request().get(server.EMPTY_PAGE);
+
+    assertEquals(asList("*/*"), request.get().headers.get("accept"));
+    Object userAgent = page.evaluate("() => navigator.userAgent");
+    assertEquals(asList(userAgent), request.get().headers.get("user-agent"));
+    assertEquals(asList("gzip,deflate,br"), request.get().headers.get("accept-encoding"));
+  }
+
+  @Test
+  void shouldSendContentLength() throws ExecutionException, InterruptedException {
+    byte[] bytes = new byte[256];
+    for (int i = 0; i < 256; i++) {
+      bytes[i] = (byte) i;
+    }
+    Future<Server.Request> request = server.futureRequest("/empty.html");
+    context.request().post(server.EMPTY_PAGE, RequestOptions.create().setData(bytes));
+    assertEquals(asList("256"), request.get().headers.get("content-length"));
+    assertEquals(asList("application/octet-stream"), request.get().headers.get("content-type"));
+  }
+
+  @Test
+  void shouldAddDefaultHeadersToRedirects() throws ExecutionException, InterruptedException {
+    server.setRedirect("/redirect", "/empty.html");
+    Future<Server.Request> request = server.futureRequest("/empty.html");
+    context.request().get(server.PREFIX + "/redirect");
+
+    assertEquals(asList("*/*"), request.get().headers.get("accept"));
+    Object userAgent = page.evaluate("() => navigator.userAgent");
+    assertEquals(asList(userAgent), request.get().headers.get("user-agent"));
+    assertEquals(asList("gzip,deflate,br"), request.get().headers.get("accept-encoding"));
+  }
+
+  @Test
+  void shouldAllowToOverrideDefaultHeaders() throws ExecutionException, InterruptedException {
+    Future<Server.Request> request = server.futureRequest("/empty.html");
+    context.request().get(server.EMPTY_PAGE, RequestOptions.create()
+        .setHeader(
+          "User-Agent", "Playwright")
+        .setHeader("Accept", "text/html")
+        .setHeader("Accept-Encoding", "br"));
+    assertEquals(asList("text/html"), request.get().headers.get("accept"));
+    assertEquals(asList("Playwright"), request.get().headers.get("user-agent"));
+    assertEquals(asList("br"), request.get().headers.get("accept-encoding"));
+  }
+
+  @Test
+  void shouldPropagateCustomHeadersWithRedirects() throws ExecutionException, InterruptedException {
+    server.setRedirect("/a/redirect1", "/b/c/redirect2");
+    server.setRedirect("/b/c/redirect2", "/simple.json");
+    Future<Server.Request> req1 = server.futureRequest("/a/redirect1");
+    Future<Server.Request> req2 = server.futureRequest("/b/c/redirect2");
+    Future<Server.Request> req3 = server.futureRequest("/simple.json");
+    context.request().get(server.PREFIX + "/a/redirect1",
+      RequestOptions.create().setHeader("foo", "bar"));
+    assertEquals(asList("bar"), req1.get().headers.get("foo"));
+    assertEquals(asList("bar"), req2.get().headers.get("foo"));
+    assertEquals(asList("bar"), req3.get().headers.get("foo"));
+  }
+
+  @Test
+  void shouldPropagateExtraHttpHeadersWithRedirects() throws ExecutionException, InterruptedException {
+    server.setRedirect("/a/redirect1", "/b/c/redirect2");
+    server.setRedirect("/b/c/redirect2", "/simple.json");
+    context.setExtraHTTPHeaders(mapOf("My-Secret", "Value"));
+    Future<Server.Request> req1 = server.futureRequest("/a/redirect1");
+    Future<Server.Request> req2 = server.futureRequest("/b/c/redirect2");
+    Future<Server.Request> req3 = server.futureRequest("/simple.json");
+    context.request().get(server.PREFIX + "/a/redirect1");
+
+    assertEquals(asList("Value"), req1.get().headers.get("my-secret"));
+    assertEquals(asList("Value"), req2.get().headers.get("my-secret"));
+    assertEquals(asList("Value"), req3.get().headers.get("my-secret"));
+  }
+
+  @Test
+  void shouldThrowOnInvalidHeaderValue() {
+    try {
+      context.request().get(server.EMPTY_PAGE, RequestOptions.create()
+        .setHeader("foo", "недопустимое значение"));
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("Invalid character in header content"), e.getMessage());
+    }
+  }
+
+  @Test
+  void shouldThrowOnNonHttpSProtocol() {
+    try {
+      context.request().get("data:text/plain,test");
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("Protocol \"data:\" not supported"), e.getMessage());
+    }
+    try {
+      context.request().get("file:///tmp/foo");
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("Protocol \"file:\" not supported"), e.getMessage());
+    }
+  }
+
+  @Test
+  void shouldSupportTimeoutOption() {
+    server.setRoute("/slow", exchange -> {
+      exchange.getResponseHeaders().add("content-type", "text/html");
+      exchange.sendResponseHeaders(200, 4096);
+    });
+
+    try {
+      context.request().get(server.PREFIX + "/slow", RequestOptions.create().setTimeout(100));
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("Request timed out after 100ms"), e.getMessage());
+    }
+  }
+
+  @Test
+  void shouldSupportATimeoutOf0() {
+    server.setRoute("/slow", exchange -> {
+      exchange.getResponseHeaders().add("content-type", "text/html");
+      exchange.sendResponseHeaders(200, 4);
+      try {
+        Thread.sleep(100);
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+      }
+      try (OutputStreamWriter writer = new OutputStreamWriter(exchange.getResponseBody())) {
+        writer.write("done");
+      }
+    });
+    APIResponse response = context.request().get(server.PREFIX + "/slow",
+      RequestOptions.create().setTimeout(0));
+    assertEquals("done", response.text());
+  }
+
+  @Test
+  void shouldRespectTimeoutAfterRedirects() {
+    server.setRedirect("/redirect", "/slow");
+    server.setRoute("/slow", exchange -> {
+      exchange.getResponseHeaders().add("content-type", "text/html");
+      exchange.sendResponseHeaders(200, 4096);
+    });
+
+    context.setDefaultTimeout(100);
+    try {
+      context.request().get(server.PREFIX + "/redirect");
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("Request timed out after 100ms"), e.getMessage());
+    }
+  }
+
+  @Test
+  void shouldDispose() {
+    APIResponse response = context.request().get(server.PREFIX + "/simple.json");
+    assertEquals("{\"foo\": \"bar\"}\n", response.text());
+    response.dispose();
+    try {
+      response.body();
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("Response has been disposed"), e.getMessage());
+    }
+  }
+
+  @Test
+  void shouldDisposeWhenContextCloses() {
+    APIResponse response = context.request().get(server.PREFIX + "/simple.json");
+    assertEquals("{\"foo\": \"bar\"}\n", response.text());
+    context.close();
+    try {
+      response.body();
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("Response has been disposed") ||
+        e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
+    }
+  }
+  @Test
+  void shouldOverrideRequestParameters() throws ExecutionException, InterruptedException {
+    Request pageReq = page.waitForRequest("**/*", () -> page.navigate(server.EMPTY_PAGE));
+    Future<Server.Request> req = server.futureRequest("/empty.html");
+    context.request().fetch(pageReq, RequestOptions.create().setMethod("POST")
+        .setHeader("foo", "bar")
+        .setData("data"));
+    assertEquals("POST", req.get().method);
+    assertEquals(asList("bar"), req.get().headers.get("foo"));
+    assertEquals("data", new String(req.get().postBody));
+  }
+
+  @Test
+  void shouldSupportApplicationXWwwFormUrlencoded() throws ExecutionException, InterruptedException {
+    Future<Server.Request> req = server.futureRequest("/empty.html");
+    context.request().post(server.EMPTY_PAGE, RequestOptions.create().setForm(
+      FormData.create()
+        .set("firstName", "John")
+        .set("lastName", "Doe")
+        .set("file", "f.js")));
+
+    assertEquals("POST", req.get().method);
+    assertEquals(asList("application/x-www-form-urlencoded"), req.get().headers.get("content-type"));
+    String body = new String(req.get().postBody);
+    assertTrue(body.contains("firstName=John"));
+    assertTrue(body.contains("lastName=Doe"));
+    assertTrue(body.contains("file=f.js"));
+  }
+
+  @Test
+  void shouldEncodeToApplicationJsonByDefault() throws ExecutionException, InterruptedException {
+    Map<String, Object> data = mapOf(
+      "firstName", "John",
+      "lastName", "Doe",
+      "file", mapOf("name", "f.js")
+    );
+    Future<Server.Request> req = server.futureRequest("/empty.html");
+    context.request().post(server.EMPTY_PAGE, RequestOptions.create().setData(data));
+    assertEquals("POST", req.get().method);
+    assertEquals(asList("application/json"), req.get().headers.get("content-type"));
+    String body = new String(req.get().postBody);
+    assertEquals(new Gson().toJson(data), body);
+  }
+
+  @Test
+  void shouldSupportMultipartFormData() throws ExecutionException, InterruptedException {
+    Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
+
+    FilePayload file = new FilePayload("f.js", "text/javascript",
+      "var x = 10;\r\n;console.log(x);".getBytes(StandardCharsets.UTF_8));
+    APIResponse response = context.request().post(server.EMPTY_PAGE, RequestOptions.create().setMultipart(
+      FormData.create()
+        .set("firstName", "John")
+        .set("lastName", "Doe")
+        .set("file", file)));
+
+    assertEquals("POST", serverRequest.get().method);
+    List<String> contentType = serverRequest.get().headers.get("content-type");
+    assertNotNull(contentType);
+    assertEquals(1, contentType.size());
+    assertTrue(contentType.get(0).contains("multipart/form-data"), contentType.get(0));
+
+    String body = new String(serverRequest.get().postBody);
+    assertTrue(body.contains("content-disposition: form-data; name=\"firstName\"\r\n" +
+      "\r\n" +
+      "John"), body);
+    assertTrue(body.contains("content-disposition: form-data; name=\"lastName\"\r\n" +
+      "\r\n" +
+      "Doe"), body);
+    assertTrue(body.contains("content-disposition: form-data; name=\"file\"; filename=\"f.js\"\r\n" +
+      "content-type: text/javascript\r\n" +
+      "\r\n" +
+      "var x = 10;\r\n" +
+      ";console.log(x);"), body);
+    assertEquals(200, response.status());
+  }
+
+  @Test
+  void shouldSupportMultipartFormDataWithPathValues(@TempDir Path tmp) throws ExecutionException, InterruptedException, IOException {
+    Future<Server.Request> serverRequest = server.futureRequest("/empty.html");
+
+    Path path = tmp.resolve("simplezip.json");
+    try (FileOutputStream output = new FileOutputStream(path.toFile())) {
+      output.write("{\"foo\":\"bar\"}".getBytes(StandardCharsets.UTF_8));
+    }
+    APIResponse response = context.request().post(server.EMPTY_PAGE, RequestOptions.create().setMultipart(
+      FormData.create()
+        .set("firstName", "John")
+        .set("lastName", "Doe")
+        .set("file", path)));
+
+    assertEquals("POST", serverRequest.get().method);
+    List<String> contentType = serverRequest.get().headers.get("content-type");
+    assertNotNull(contentType);
+    assertEquals(1, contentType.size());
+    assertTrue(contentType.get(0).contains("multipart/form-data"), contentType.get(0));
+
+    String body = new String(serverRequest.get().postBody);
+    assertTrue(body.contains("content-disposition: form-data; name=\"firstName\"\r\n" +
+      "\r\n" +
+      "John"), body);
+    assertTrue(body.contains("content-disposition: form-data; name=\"lastName\"\r\n" +
+      "\r\n" +
+      "Doe"), body);
+    assertTrue(body.contains("content-disposition: form-data; name=\"file\"; filename=\"simplezip.json\"\r\n" +
+      "content-type: application/json\r\n" +
+      "\r\n" +
+      "{\"foo\":\"bar\"}"), body);
+    assertEquals(200, response.status());
+  }
+
+  @Test
+  void shouldSerializeDataToJsonRegardlessOfContentType() throws ExecutionException, InterruptedException {
+    Map<String, Object> data = mapOf(
+      "firstName", "John",
+      "lastName", "Doe");
+    Future<Server.Request> req = server.futureRequest("/empty.html");
+    context.request().post(server.EMPTY_PAGE, RequestOptions.create()
+      .setHeader("content-type", "unknown")
+      .setData(data));
+    assertEquals("POST", req.get().method);
+    assertEquals(asList("unknown"), req.get().headers.get("content-type"));
+    String body = new String(req.get().postBody);
+    assertEquals(new Gson().toJson(data), body);
+  }
+
+  @Test
+  void shouldThrowWhenDataPassedForUnsupportedRequest() {
+    try {
+      context.request().fetch(server.EMPTY_PAGE, RequestOptions.create()
+        .setMethod("GET").setData("bar"));
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("Method GET does not accept post data"), e.getMessage());
+    }
+  }
+
+
+  @Test
+  void contextRequestShouldExportSameStorageStateAsContext() {
+    server.setRoute("/setcookie.html", exchange -> {
+      exchange.getResponseHeaders().add("Set-Cookie", "a=b");
+      exchange.getResponseHeaders().add("Set-Cookie", "c=d");
+      exchange.sendResponseHeaders(200, 0);
+      exchange.getResponseBody().close();
+    });
+    context.request().get(server.PREFIX + "/setcookie.html");
+    String contextState = context.storageState();
+    assertEquals(2, context.cookies().size());
+    String requestState = context.request().storageState();
+    assertEquals(contextState, requestState);
+    String pageState = page.request().storageState();
+    assertEquals(contextState, pageState);
+  }
+
+  @Test
+  void shouldAcceptBoolAndNumericParams() throws ExecutionException, InterruptedException {
+    Future<Server.Request> req = server.futureRequest("/empty.html");
+    page.request().get(server.EMPTY_PAGE, RequestOptions.create()
+      .setQueryParam("str", "s")
+      .setQueryParam("num", 10)
+      .setQueryParam("bool", true)
+      .setQueryParam("bool2", false));
+    assertEquals("/empty.html?str=s&num=10&bool=true&bool2=false", req.get().url);
+  }
+
+  @Test
+  void shouldAbortRequestsWhenBrowserContextCloses() {
+    server.setRoute("/empty.html", exchange -> {
+    });
+
+    BrowserContext context = browser.newContext();
+    Page page = context.newPage();
+
+    page.exposeFunction("closeContext", (Object... args) -> {
+      context.close();
+      return null;
+    });
+    page.evaluate("() => setTimeout(closeContext, 1000);");
+    try {
+      context.request().get(server.EMPTY_PAGE);
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("Request context disposed"), e.getMessage());
+    }
+
+    try {
+      context.request().post(server.EMPTY_PAGE);
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      assertTrue(e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
+    }
+  }
+}
@@ -16,6 +16,7 @@

 package com.microsoft.playwright;

+import com.sun.net.httpserver.Filter;
 import org.junit.jupiter.api.Test;

 import java.util.ArrayList;
@@ -33,10 +34,19 @@ public class TestBrowserContextNetworkEvents extends TestBase {
    page.setContent("<a target=_blank rel=noopener href='/one-style.html'>yo</a>");
    Page page1 = context.waitForPage(() -> page.click("a"));
    page1.waitForLoadState();
-    assertEquals(asList(
-      server.EMPTY_PAGE,
-      server.PREFIX + "/one-style.html",
-      server.PREFIX + "/one-style.css"), requests);
+    // In firefox one-style.css is requested multiple times.
+    if (isFirefox()) {
+      assertEquals(asList(
+        server.EMPTY_PAGE,
+        server.PREFIX + "/one-style.html",
+        server.PREFIX + "/one-style.css",
+        server.PREFIX + "/one-style.css"), requests);
+    } else {
+      assertEquals(asList(
+        server.EMPTY_PAGE,
+        server.PREFIX + "/one-style.html",
+        server.PREFIX + "/one-style.css"), requests);
+    }
  }

  @Test
@@ -47,10 +57,19 @@ public class TestBrowserContextNetworkEvents extends TestBase {
    page.setContent("<a target=_blank rel=noopener href='/one-style.html'>yo</a>");
    Page page1 = context.waitForPage(() -> page.click("a"));
    page1.waitForLoadState();
-    assertEquals(asList(
-      server.EMPTY_PAGE,
-      server.PREFIX + "/one-style.html",
-      server.PREFIX + "/one-style.css"), responses);
+    // In firefox one-style.css is requested multiple times.
+    if (isFirefox()) {
+      assertEquals(asList(
+        server.EMPTY_PAGE,
+        server.PREFIX + "/one-style.html",
+        server.PREFIX + "/one-style.css",
+        server.PREFIX + "/one-style.css"), responses);
+    } else {
+      assertEquals(asList(
+        server.EMPTY_PAGE,
+        server.PREFIX + "/one-style.html",
+        server.PREFIX + "/one-style.css"), responses);
+    }
  }

  @Test
@@ -59,7 +78,12 @@ public class TestBrowserContextNetworkEvents extends TestBase {
    List<Request> failedRequests = new ArrayList<>();
    context.onRequestFailed(request -> failedRequests.add(request));
    page.navigate(server.PREFIX + "/one-style.html");
-    assertEquals(1, failedRequests.size());
+    // In firefox one-style.css is requested multiple times.
+    if (isFirefox()) {
+      assertTrue(failedRequests.size() > 0);
+    } else {
+      assertEquals(1, failedRequests.size());
+    }
    assertTrue(failedRequests.get(0).url().contains("one-style.css"));
    assertNull(failedRequests.get(0).response());
    assertEquals("stylesheet", failedRequests.get(0).resourceType());
@@ -16,10 +16,13 @@

 package com.microsoft.playwright;

+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import java.util.function.Consumer;

 import static java.util.Arrays.asList;
@@ -134,4 +137,74 @@ public class TestBrowserContextRoute extends TestBase {
    page.navigate(server.EMPTY_PAGE);
    assertEquals(2, intercepted[0]);
  }
+
+  @Test
+  void shouldOverwritePostBodyWithEmptyString() throws ExecutionException, InterruptedException {
+    boolean[] routeHandled = {false};
+    context.route("**/empty.html", route -> {
+      route.resume(new Route.ResumeOptions().setPostData(""));
+      routeHandled[0] = true;
+    });
+
+    Future<Server.Request> req = server.futureRequest("/empty.html");
+    page.setContent("<script>\n" +
+      "        (async () => {\n" +
+      "            await fetch('" + server.EMPTY_PAGE + "', {\n" +
+      "              method: 'POST',\n" +
+      "              body: 'original',\n" +
+      "            });\n" +
+      "        })()\n" +
+      "      </script>");
+    while (!routeHandled[0]) {
+      page.waitForTimeout(100);
+    }
+    byte[] body = req.get().postBody;
+    assertEquals(0, body.length);
+  }
+
+  @Test
+  void shouldNotSwallowExceptionsInRoute() throws ExecutionException, InterruptedException {
+    context.route("**/empty.html", route -> {
+      throw new RuntimeException("My Exception");
+    });
+
+    try {
+      page.navigate(server.EMPTY_PAGE);
+      fail("did not throw");
+    } catch (RuntimeException e) {
+      assertTrue(e.getMessage().contains("My Exception"), e.getMessage());
+    }
+  }
+
+  @Test
+  @Disabled("Conflicts with https://github.com/microsoft/playwright-java/pull/680")
+  void shouldNotSwallowExceptionsInFulfill() throws ExecutionException, InterruptedException {
+    APIRequestContext request = playwright.request().newContext();
+    APIResponse response = request.get(server.EMPTY_PAGE);
+    response.dispose();
+    page.route("**/*", route -> {
+      // Fulfilling with dsiposed response will lead to a server-side exception.
+      route.fulfill(new Route.FulfillOptions().setResponse(response));
+    });
+    try {
+      page.navigate(server.EMPTY_PAGE);
+      fail("did not throw");
+    } catch (RuntimeException e) {
+      assertTrue(e.getMessage().contains("Fetch response has been disposed"), e.getMessage());
+    }
+  }
+
+  @Test
+  @Disabled("Conflicts with https://github.com/microsoft/playwright-java/pull/680")
+  void shouldNotSwallowExceptionsInResume() throws ExecutionException, InterruptedException {
+    page.route("**/*", route -> {
+      route.resume(new Route.ResumeOptions().setUrl("file:///tmp"));
+    });
+    try {
+      page.navigate(server.EMPTY_PAGE);
+      fail("did not throw");
+    } catch (RuntimeException e) {
+      assertTrue(e.getMessage().contains("New URL must have same protocol as overridden URL"), e.getMessage());
+    }
+  }
 }
@@ -19,21 +19,23 @@ package com.microsoft.playwright;
 import com.microsoft.playwright.impl.Driver;
 import com.microsoft.playwright.options.WaitForSelectorState;
 import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;

-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
+import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;

-import static com.microsoft.playwright.Utils.mapOf;
+import static com.microsoft.playwright.Utils.*;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Arrays.asList;
 import static org.junit.jupiter.api.Assertions.*;

@@ -59,13 +61,13 @@ public class TestBrowserTypeConnect extends TestBase {

  private static BrowserServer launchBrowserServer(BrowserType browserType) {
    try {
-      Path driver = Driver.ensureDriverInstalled(Collections.emptyMap());
+      Path driver = Driver.ensureDriverInstalled(Collections.emptyMap(), false);
      Path dir = driver.getParent();
      String node = dir.resolve(isWindows ? "node.exe" : "node").toString();
      String cliJs = dir.resolve("package/lib/cli/cli.js").toString();
      // We launch node process directly instead of using playwright.sh script as killing the script
      // process will leave node process running and killing it would be more hassle.
-      ProcessBuilder pb = new ProcessBuilder(node, cliJs, "launch-server", browserType.name());
+      ProcessBuilder pb = new ProcessBuilder(node, cliJs, "launch-server", "--browser", browserType.name());
      pb.directory(dir.toFile());
      pb.redirectError(ProcessBuilder.Redirect.INHERIT);
      BrowserServer result = new BrowserServer();
@@ -165,6 +167,7 @@ public class TestBrowserTypeConnect extends TestBase {
      }
      assertNotNull(webSocketServer.lastClientHandshake);
      assertEquals("Playwright", webSocketServer.lastClientHandshake.getFieldValue("User-Agent"));
+      assertEquals(browserType.name(), webSocketServer.lastClientHandshake.getFieldValue("x-playwright-browser"));
      assertEquals("bar", webSocketServer.lastClientHandshake.getFieldValue("foo"));
    }
  }
@@ -485,4 +488,76 @@ public class TestBrowserTypeConnect extends TestBase {
    assertTrue(Files.exists(traceFile));
    assertTrue(Files.size(traceFile) > 0);
  }
+
+  @Test
+  void shouldRecordTraceWithSources(@TempDir Path tmpDir) throws IOException {
+    Assumptions.assumeTrue(System.getenv("PLAYWRIGHT_JAVA_SRC") != null, "PLAYWRIGHT_JAVA_SRC must point to the directory containing this test source.");
+    context.tracing().start(new Tracing.StartOptions().setSources(true));
+    page.navigate(server.EMPTY_PAGE);
+    page.setContent("<button>Click</button>");
+    page.click("'Click'");
+    Path trace = tmpDir.resolve("trace1.zip");
+    context.tracing().stop(new Tracing.StopOptions().setPath(trace));
+
+    Map<String, byte[]> entries = parseTrace(trace);
+    Map<String, byte[]> sources = entries.entrySet().stream().filter(e -> e.getKey().endsWith(".txt")).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+    assertEquals(1, sources.size());
+
+    String path = getClass().getName().replace('.', File.separatorChar);
+    Path sourceFile = Paths.get(System.getenv("PLAYWRIGHT_JAVA_SRC"), path + ".java");
+    byte[] thisFile = Files.readAllBytes(sourceFile);
+    assertEquals(new String(thisFile, UTF_8), new String(sources.values().iterator().next(), UTF_8));
+  }
+
+  @Test
+  void shouldFulfillWithGlobalFetchResult() {
+    page.route("**/*", route -> {
+      APIRequestContext request = playwright.request().newContext();
+      APIResponse response = request.get(server.PREFIX + "/simple.json");
+      route.fulfill(new Route.FulfillOptions().setResponse(response));
+    });
+    Response response = page.navigate(server.EMPTY_PAGE);
+    assertEquals(200, response.status());
+    assertEquals("{\"foo\": \"bar\"}\n", response.text());
+  }
+
+  @Test
+  void shouldUploadLargeFile(@TempDir Path tmpDir) throws IOException, ExecutionException, InterruptedException {
+    Assumptions.assumeTrue(3 <= (Runtime.getRuntime().maxMemory() >> 30), "Fails if max heap size is < 3Gb");
+    page.navigate(server.PREFIX + "/input/fileupload.html");
+    Path uploadFile = tmpDir.resolve("200MB.zip");
+    String str = String.join("", Collections.nCopies(4 * 1024, "A"));
+
+    try (Writer stream = new OutputStreamWriter(Files.newOutputStream(uploadFile))) {
+      for (int i = 0; i < 50 * 1024; i++) {
+        stream.write(str);
+      }
+    }
+    Locator input = page.locator("input[type='file']");
+    JSHandle events = input.evaluateHandle("e => {\n" +
+      "    const events = [];\n" +
+      "    e.addEventListener('input', () => events.push('input'));\n" +
+      "    e.addEventListener('change', () => events.push('change'));\n" +
+      "    return events;\n" +
+      "  }");
+    input.setInputFiles(uploadFile);
+    assertEquals("200MB.zip", input.evaluate("e => e.files[0].name"));
+    assertEquals(asList("input", "change"), events.evaluate("e => e"));
+    CompletableFuture<MultipartFormData> formData = new CompletableFuture<>();
+    server.setRoute("/upload", exchange -> {
+      try {
+        MultipartFormData multipartFormData = MultipartFormData.parseRequest(exchange);
+        formData.complete(multipartFormData);
+      } catch (Exception e) {
+        e.printStackTrace();
+        formData.completeExceptionally(e);
+      }
+      exchange.sendResponseHeaders(200, -1);
+    });
+    page.click("input[type=submit]", new Page.ClickOptions().setTimeout(90_000));
+    List<MultipartFormData.Field> fields = formData.get().fields;
+    assertEquals(1, fields.size());
+    assertEquals("200MB.zip", fields.get(0).filename);
+    assertEquals(200 * 1024 * 1024, fields.get(0).content.length());
+  }
 }
@@ -111,16 +111,18 @@ public class TestDownload extends TestBase {

  @Test
  void shouldReportDownloadsWithAcceptDownloadsFalse() {
-    page.setContent("<a href='" + server.PREFIX + "/downloadWithFilename'>download</a>");
-    Download download = page.waitForDownload(() -> page.click("a"));
-    assertEquals(server.PREFIX + "/downloadWithFilename", download.url());
-    assertEquals("file.txt", download.suggestedFilename());
-    try {
-      download.path();
-      fail("did not throw");
-    } catch (PlaywrightException e) {
-      assertTrue(download.failure().contains("acceptDownloads"));
-      assertTrue(e.getMessage().contains("acceptDownloads: true"));
+    try (Page page = browser.newPage(new Browser.NewPageOptions().setAcceptDownloads(false))) {
+      page.setContent("<a href='" + server.PREFIX + "/downloadWithFilename'>download</a>");
+      Download download = page.waitForDownload(() -> page.click("a"));
+      assertEquals(server.PREFIX + "/downloadWithFilename", download.url());
+      assertEquals("file.txt", download.suggestedFilename());
+      try {
+        download.path();
+        fail("did not throw");
+      } catch (PlaywrightException e) {
+        assertTrue(download.failure().contains("acceptDownloads"));
+        assertTrue(e.getMessage().contains("acceptDownloads: true"));
+      }
    }
  }
  @Test
@@ -45,7 +45,7 @@ public class TestElementHandleBoundingBox extends TestBase {

  @Test
  void shouldHandleNestedFrames() {
-    page.setViewportSize(500, 500);
+    page.setViewportSize(616, 500);
    page.navigate(server.PREFIX + "/frames/nested-frames.html");
    Frame nestedFrame = page.frame("dos");
    assertNotNull(nestedFrame);
@@ -48,6 +48,6 @@ public class TestElementHandlePress extends TestBase {
  void shouldWorkWithNumberInput() {
    page.setContent("<input type='number' value=2 />");
    page.press("input", "1");
-    assertEquals("12", page.evalOnSelector("input", "input => input.value"));
+    assertEquals(isWebKit() ? "1" : "12", page.evalOnSelector("input", "input => input.value"));
  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Yury Semikhatsky	64115bfb60	devops: set version 1.22.0, driver to 1.22.0 (#929 )	2022-05-13 15:31:22 -07:00
Yury Semikhatsky	15eefc54af	feat: roll beta driver, remove layout selectors (#926 )	2022-05-13 00:49:59 -07:00
Yury Semikhatsky	abf245ccc7	feat: implement Locator.filter (#925 )	2022-05-12 09:39:10 -07:00
Gabriel Gavrilov	10592ce5c7	Added Selectors and Keyboard Manipulation Example (#920 )	2022-05-11 09:20:51 -07:00
Yury Semikhatsky	ef7f50c48a	feat: roll driver, implement locator filters (#921 )	2022-05-10 10:43:30 -07:00
Andrey Lushnikov	473b1ce794	devops: mark docker image as playwright official (#889 )	2022-05-06 19:07:44 -07:00
Yury Semikhatsky	98ecb7e0a0	test: unflake TestInstall.shouldThrowWhenBrowserPathIsInvalid (#916 )	2022-05-03 13:50:20 -07:00
Yury Semikhatsky	04eb228813	devops: add workflow triggering internal tests (#915 )	2022-05-02 18:01:40 -07:00
Max Schmitt	298e01ee80	chore: add arm64 Docker image (#890 )	2022-05-02 14:46:05 +01:00
Yury Semikhatsky	b6b54af13c	Revert "Revert "Add Linux/arm64 support (#883 )" (#892 )" (#905 ) This reverts commit `536af6b3d8`.	2022-04-27 17:24:12 -07:00
Yury Semikhatsky	b8d2ccae08	fix: respect isChecked options (#911 )	2022-04-26 17:01:50 -07:00
Yury Semikhatsky	59e7c0cc94	fix: convert file path to absolute in setInputFiles (#903 )	2022-04-15 12:11:52 -07:00
Yury Semikhatsky	54d0366b9e	fix: get docker version from pom.xml (#899 ) (#901 )	2022-04-12 12:15:06 -07:00
Andrey Lushnikov	9845a05544	devops: fix docker publish workflow (#898 )	2022-04-12 11:40:21 -07:00
Yury Semikhatsky	41fd9a6f75	chore: bump dev version to 1.22 (#897 )	2022-04-12 10:46:31 -07:00
Yury Semikhatsky	483cf0d473	chore: revert some inadvertent changes (#894 )	2022-04-12 08:55:05 -07:00
Yury Semikhatsky	1681c410dd	feat: large file uploads (#891 )	2022-04-12 08:33:40 -07:00
Yury Semikhatsky	9f6860539a	fix: links to documentation (#893 )	2022-04-11 19:20:29 -07:00
Yury Semikhatsky	536af6b3d8	Revert "Add Linux/arm64 support (#883 )" (#892 )	2022-04-11 17:25:13 -07:00
Yury Semikhatsky	8ce193d144	chore: roll to 1.21 beta driver (#888 )	2022-04-11 13:04:57 -07:00
Michael S. Fischer	7eddd2d2b2	Add Linux/arm64 support (#883 )	2022-04-06 18:42:39 -07:00
uchagani	447578c582	fix(driver): set driver instance to null if an exception is thrown du… (#879 )	2022-04-04 12:25:37 -07:00
Leonard Brünings	58013adfac	fix(tracing): support explicit StartOptions().setSources(false) (#866 )	2022-03-30 10:42:54 -07:00
Alex (Huy Tran)	43d12a7662	feat: enable loading alternative driver via system properties (#873 )	2022-03-30 10:42:18 -07:00
Yury Semikhatsky	1deccbb55d	chore: add logging to driver installation (#865 )	2022-03-25 12:02:47 -07:00
Yury Semikhatsky	1b2d33402e	docs: add driver update instructions	2022-03-18 09:00:34 -07:00
Yury Semikhatsky	d315e7b5bf	fix: docker publishing (#851 ) (#852 )	2022-03-14 20:31:16 -07:00
Yury Semikhatsky	7dc22aa08a	devops: do not cache mvn packages (#848 )	2022-03-14 19:01:28 -07:00
Yury Semikhatsky	5b0ef8b7bf	chore: update current version to 1.21.0-SNAPSHOT (#847 )	2022-03-14 17:16:37 -07:00
Yury Semikhatsky	43ba37817b	fix: send x-playwright-browser (#844 )	2022-03-14 15:31:19 -07:00
Yury Semikhatsky	4916ba22af	chore: roll driver (#838 )	2022-03-14 12:04:20 -07:00
uchagani	94f72694f1	chore: move chmod command to after browsers are installed and consolidate co… (#835 ) Co-authored-by: Max Schmitt <max@schmitt.mx>	2022-03-09 18:22:00 +01:00
Max Schmitt	be167a161b	devops: trigger Docker tests on Dockerfile changes (#839 )	2022-03-09 09:08:36 -08:00
Yury Semikhatsky	187d2ad6c6	devops: restore test docker trigger (#840 )	2022-03-09 09:07:07 -08:00
Max Schmitt	68a7dbc1e3	devops: publish no arm Docker for now (#837 )	2022-03-08 22:01:54 +01:00
Yury Semikhatsky	1153d473fb	feat: roll driver to 3/3/22 (#832 )	2022-03-04 08:31:13 -08:00
Max Schmitt	00d53bd1ea	devops: fix Docker publishing 2	2022-03-04 00:05:14 +01:00
Max Schmitt	d423733d9d	devops: fix Docker publishing	2022-03-04 00:00:16 +01:00
Max Schmitt	e127abb68e	chore: align Docker with upstream Docker infra (#831 )	2022-03-03 22:55:21 +01:00
Yury Semikhatsky	5ee8f23380	fix(docs): drop trailing slash from link path (#818 )	2022-02-17 15:26:10 -08:00
Yury Semikhatsky	b448a1789a	chore: roll 1.19.0 driver (#813 )	2022-02-15 14:06:06 -08:00
Yury Semikhatsky	79b2c70513	fix: catch up with recent upstream changes (#812 )	2022-02-15 08:39:27 -08:00
Max Schmitt	d476d0a98c	devops: trigger Java publish workflow on release (#811 )	2022-02-14 22:44:03 +01:00
Yury Semikhatsky	2122c5690a	fix: support multiple source dirs (#809 )	2022-02-14 09:52:29 -08:00
Yury Semikhatsky	3119102b10	fix(assertions): include expected/actual values into error message (#808 )	2022-02-11 13:02:27 -08:00
Yury Semikhatsky	838e7a40b3	feat: roll driver, support "has" option (#805 )	2022-02-10 14:11:39 -08:00
Yury Semikhatsky	ea6ede4670	fix: skip syntetic fields when converting options (#804 )	2022-02-09 11:44:46 -08:00
Yury Semikhatsky	3cdefc2931	fix: normalize whitespaces in hasTitle (#803 )	2022-02-09 09:54:46 -08:00
Yury Semikhatsky	119700a678	feat: add response param to route.fulfill (#797 )	2022-01-28 08:38:24 -08:00
Yury Semikhatsky	17a4143a83	fix: throw if route is handled twice (#796 )	2022-01-27 14:02:11 -08:00
Max Schmitt	c03f4a9384	fix: CLI don't download browers automatically and set env accordingly (#790 )	2022-01-24 12:54:49 -08:00
Andrey Lushnikov	85b671328e	chore: roll to latest 1.18 (#785 )	2022-01-19 16:42:07 -08:00
Yury Semikhatsky	11f898ca7f	test: route.resume does not throw if page is closed (#781 )	2022-01-19 13:19:33 -08:00
Yury Semikhatsky	2aef5c6742	fix: hide internal call from inspector log (#783 )	2022-01-19 13:18:47 -08:00
Yury Semikhatsky	897d441c02	fix: include var name into tracing error message (#779 )	2022-01-19 10:42:47 -08:00
Andrey Lushnikov	f4c69faad3	chore: cut v1.18.0 (#777 )	2022-01-19 08:42:53 -08:00
Andrey Lushnikov	6b30c0b3d2	fix: pass required env variables for new driver (#774 ) Fixes #772	2022-01-19 05:15:37 -08:00
Yury Semikhatsky	a006d51872	chore: merge assertions module into playwright (#773 )	2022-01-18 12:22:15 -08:00
Yury Semikhatsky	f411bf4194	chore: roll driver to 01/13/22 (#771 )	2022-01-13 23:55:50 -08:00
Yury Semikhatsky	25a0927056	feat: roll driver, comoute count in util world (#769 )	2022-01-10 13:20:20 -08:00
Yury Semikhatsky	e9b379f5ed	test: unroute predicate (#768 )	2022-01-10 12:41:10 -08:00
Yury Semikhatsky	0c1d491c14	feat: roll driver, implement APIResponse assertions (#764 )	2022-01-06 17:16:19 -08:00
Yury Semikhatsky	b09b9aecfb	feat: custom temp dir for driver via playwright.driver.tmpdir property (#763 )	2022-01-06 14:36:39 -08:00
Yury Semikhatsky	e926c1ae82	feat(tracing): collect sources for remote tracing (#755 )	2021-12-20 12:20:57 -08:00
Yury Semikhatsky	86e91590cb	feat: include source files in trace (#754 )	2021-12-17 16:58:00 -08:00
Yury Semikhatsky	963afac983	feat: make --version return java package version (#748 )	2021-12-16 14:38:15 -08:00
Yury Semikhatsky	c230bed27e	feat: roll driver, implement hasText locator option (#747 )	2021-12-16 13:03:26 -08:00
Yury Semikhatsky	a4348f250f	feat: inclide Implementation-Version into manifest (#743 )	2021-12-09 17:17:52 -08:00
Yury Semikhatsky	52d31a173e	devops: run tests on Java 17 (#740 )	2021-12-08 09:34:52 -08:00
Yury Semikhatsky	cf534a0586	feat: roll to 1.18.0-alpha-nov-29-2021 (#725 )	2021-11-30 15:05:05 -08:00
Yury Semikhatsky	fa3bdebcbb	chore: remove unused script (#724 )	2021-11-30 12:21:29 -08:00
Bruno Borges	0467aa7d4a	chore: No more need for jbang-catalog.json (#721 )	2021-11-29 08:45:59 -08:00
codeboyzhou	8d84afccec	fix(scripts): install_local_driver.sh can't download driver successfully (#722 )	2021-11-29 08:41:12 -08:00
Yury Semikhatsky	7d1026ea9c	feat: request API with shared RequestOptions and FormData (#718 )	2021-11-19 17:35:59 -08:00
Yury Semikhatsky	0076b8f8a9	chore: bump version in examples (#716 )	2021-11-19 08:58:07 -08:00
Yury Semikhatsky	4d379726e5	test: fix WARNING: sendResponseHeaders:... (#713 )	2021-11-18 17:18:55 -08:00
Yury Semikhatsky	b4100a4d68	chore: roll driver to 1.18.0-alpha-1637257604000 (#711 )	2021-11-18 16:52:36 -08:00
Andrey Lushnikov	3b4d8dc955	chore: proper driver URL detection (#709 ) Since Nov 16, 2021, we have the following conventions: - Drivers published from tip-of-tree have an `-alpha` version and are stored at `/next` subfolder on Azure Storage. - Drivers auto-published for each commit of the release branch have a `-beta` version and are stored at `/next` subfolder on Azure Storage. - Drivers published due to a release might have `-rc` as part of the version, and are stored in root subfolder on Azure Storage. We no longer have driver versions that include "next" as part of the version. I kept it for backwards compatibility.	2021-11-17 18:32:01 -08:00
Yury Semikhatsky	d71795801c	chore: roll driver to 1.18.0-alpha-1637178126000 (#708 )	2021-11-17 14:04:33 -08:00
Yury Semikhatsky	16c7b7f25e	chore: use try resource in auth tests (#707 )	2021-11-17 11:52:24 -08:00
Yury Semikhatsky	f739ae28e8	chore: convert using reflection instead of Gson (#705 )	2021-11-16 22:33:38 -08:00
Yury Semikhatsky	9f8ff0e7a1	feat: APIRequest & co (#704 )	2021-11-15 17:30:09 -08:00
Yury Semikhatsky	f782ca6339	chore: bump dev version to 1.18 (#703 )	2021-11-15 15:10:23 -08:00
Yury Semikhatsky	90ccaa195f	devops: clean old build before updating readme (#702 )	2021-11-15 15:08:08 -08:00