Artifact should have same version as release. (#974 )

cherry-pick(#978,#984): recent test fixes (#985 )
cherry-pick(#982 ): feat: roll driver to 1.23.1-beta, implement routeFromHar.update (#983 )
2026-05-23 19:23:20 +00:00 · 2022-07-01 14:21:42 -07:00 · 2022-06-30 14:47:57 -07:00 · 2022-06-30 13:17:18 -07:00 · 2022-06-28 09:14:00 -07:00 · 2022-06-28 08:50:34 -07:00
364 changed files with 11696 additions and 35652 deletions
@@ -1,115 +0,0 @@
-{
-  "hydrated": false,
-  "properties": {
-    "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/suppressions",
-    "hydrationStatus": "This file does not contain identifying data. It is safe to check into your repo. To hydrate this file with identifying data, run `guardian hydrate --help` and follow the guidance."
-  },
-  "version": "1.0.0",
-  "suppressionSets": {
-    "default": {
-      "name": "default",
-      "createdDate": "2024-02-06 20:37:57Z",
-      "lastUpdatedDate": "2024-02-06 20:37:57Z"
-    }
-  },
-  "results": {
-    "de854c6ab9b27b1ec642cec1a51059b92f88815a231c1c8f4b8e71d9e378f174": {
-      "signature": "de854c6ab9b27b1ec642cec1a51059b92f88815a231c1c8f4b8e71d9e378f174",
-      "alternativeSignatures": [
-        "79827cf2e75a7f99eec716562fb9fa0d49014ac96b7afc76d29d79a33e8edd94"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "ebe0026db71ae4bb2d8e76b706198003079a5c095658de8dd49e67f7e572ea46": {
-      "signature": "ebe0026db71ae4bb2d8e76b706198003079a5c095658de8dd49e67f7e572ea46",
-      "alternativeSignatures": [],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "bb02ef965dce40b6c950b6d0cf8a9f41c08c5e33f17268fb208f3687b11ffa26": {
-      "signature": "bb02ef965dce40b6c950b6d0cf8a9f41c08c5e33f17268fb208f3687b11ffa26",
-      "alternativeSignatures": [
-        "3a8630eaccc2c5c39ae78836bb115bf55557058bad206fdad7dbe4f0ae466ed1"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "dffa3e24f6dc7542d741b2fab22eec657aca441a51cee515ca9bb4932995a416": {
-      "signature": "dffa3e24f6dc7542d741b2fab22eec657aca441a51cee515ca9bb4932995a416",
-      "alternativeSignatures": [
-        "56a4b454840e2c21d44a76d9ab09fde76fba682ce7508a3f6abf7b411d389e56"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "5dbcaaac8cdccc6df557cbde94e5d7e0f1c8a67546ba82a1b85b629030f3d311": {
-      "signature": "5dbcaaac8cdccc6df557cbde94e5d7e0f1c8a67546ba82a1b85b629030f3d311",
-      "alternativeSignatures": [
-        "fdb8e8af8d5697f767d0e55194f91d4a089d981555e00d058ba866acb8602014"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "b7db026b2a60bdb63af1c0938ac16d9414bb4d38e9efdc51626e12aa55f6b72f": {
-      "signature": "b7db026b2a60bdb63af1c0938ac16d9414bb4d38e9efdc51626e12aa55f6b72f",
-      "alternativeSignatures": [
-        "bf7bb897e644659827d8dc8d55f719296d3ab94dc750b666ce90d8057361d9d5"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "aa702d85554c352e3016e3ec3d790df489833dc97e3733c58b57915ec125f47b": {
-      "signature": "aa702d85554c352e3016e3ec3d790df489833dc97e3733c58b57915ec125f47b",
-      "alternativeSignatures": [
-        "948787329d52a66b4691383c81af407b03e68344a6685bbab3cfa8eb8db34f81"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "38174b5c9b474c3c0278d4c4173c14022e03dec3dc4db5ced51d2ca8459e7f2a": {
-      "signature": "38174b5c9b474c3c0278d4c4173c14022e03dec3dc4db5ced51d2ca8459e7f2a",
-      "alternativeSignatures": [
-        "a9efa99679f3966da96a8b89f1250576cfceda774556d43ea89ea84289967276"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "08a4e1be4662d897e5b2b7a7dc6d6901405462cd2d5f8ad433c13e12a8503fb6": {
-      "signature": "08a4e1be4662d897e5b2b7a7dc6d6901405462cd2d5f8ad433c13e12a8503fb6",
-      "alternativeSignatures": [
-        "009132f89939956a3f4471bb13353394015c9a7e675d118aa427e75f05658e05"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    },
-    "551d69737553150380e58bc9a8ae1e8f17da931561ea4e195781fb8cad225188": {
-      "signature": "551d69737553150380e58bc9a8ae1e8f17da931561ea4e195781fb8cad225188",
-      "alternativeSignatures": [
-        "617ad56322c5fb82a162b0b583e676d66a8e76b0d444aaab487865e4bf89e83b"
-      ],
-      "memberOf": [
-        "default"
-      ],
-      "createdDate": "2024-02-06 20:37:57Z"
-    }
-  }
-}
@@ -1,97 +0,0 @@
-pr: none
-
-trigger:
-  tags:
-    include:
-    - '*'
-
-resources:
-  repositories:
-  - repository: 1esPipelines
-    type: git
-    name: 1ESPipelineTemplates/1ESPipelineTemplates
-    ref: refs/tags/release
-
-extends:
-  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
-  parameters:
-    pool:
-      name: DevDivPlaywrightAzurePipelinesUbuntu2204
-      os: linux
-    sdl:
-      sourceAnalysisPool:
-        name: DevDivPlaywrightAzurePipelinesWindows2022
-        # The image must be windows-based due to restrictions of the SDL tools. See: https://aka.ms/AAo6v8e
-        # In the case of a windows build, this can be the same as the above pool image.
-        os: windows
-      suppression:
-        suppressionFile: $(Build.SourcesDirectory)\.azure-pipelines\guardian\SDL\.gdnsuppress
-    stages:
-    - stage: Stage
-      jobs:
-      - job: Build
-        templateContext:
-          outputs:
-          - output: pipelineArtifact
-            path: $(Build.ArtifactStagingDirectory)/esrp-build
-            artifact: esrp-build
-        steps:
-        - bash: |
-            if [[ ! "$CURRENT_BRANCH" =~ ^v1\..* ]]; then
-              echo "Can only publish from a release tag branch (v1.*)."
-              echo "Unexpected branch name: $CURRENT_BRANCH"
-              exit 1
-            fi
-          env:
-            CURRENT_BRANCH: ${{ variables['Build.SourceBranchName'] }}
-          displayName: "Check the branch is a release branch"
-        
-        - bash: |
-            echo "importing GPG key:"
-            # Pipeline variables do not preserve line ends so we use base64 instead of --armored as a workaround.
-            echo $GPG_PRIVATE_KEY_BASE64 | base64 -d | gpg --batch --import
-            echo "list keys after import:"
-            gpg --list-keys
-          env:
-           GPG_PRIVATE_KEY_BASE64: $(GPG_PRIVATE_KEY_BASE64) # secret variable has to be mapped to an env variable
-          displayName: "Import gpg key"
-        
-        - bash: ./scripts/download_driver.sh
-          displayName: 'Download driver'
-        
-        - bash: mvn -B deploy -D skipTests --no-transfer-progress --activate-profiles release -D gpg.passphrase=$GPG_PASSPHRASE -DaltDeploymentRepository=snapshot-repo::default::file:$(Build.ArtifactStagingDirectory)/esrp-build
-          displayName: 'Build and deploy to a local directory'
-          env:
-            GPG_PASSPHRASE: $(GPG_PASSPHRASE) # secret variable has to be mapped to an env variable
-
-      - job: Publish
-        dependsOn: Build
-        templateContext:
-          type: releaseJob
-          isProduction: true
-          inputs:
-          - input: pipelineArtifact
-            artifactName: esrp-build
-            targetPath: $(Build.ArtifactStagingDirectory)/esrp-build
-        steps:
-          - checkout: none
-          - task: EsrpRelease@9
-            inputs:
-              connectedservicename: 'Playwright-ESRP-PME'
-              usemanagedidentity: true
-              keyvaultname: 'playwright-esrp-pme'
-              signcertname: 'ESRP-Release-Sign'
-              clientid: '13434a40-7de4-4c23-81a3-d843dc81c2c5'
-              intent: 'PackageDistribution'
-              contenttype: 'Maven'
-              # Keeping it commented out as a workaround for:
-              # https://portal.microsofticm.com/imp/v3/incidents/incident/499972482/summary
-              # contentsource: 'folder'
-              folderlocation: '$(Build.ArtifactStagingDirectory)/esrp-build'
-              waitforreleasecompletion: true
-              owners: 'yurys@microsoft.com'
-              approvers: 'yurys@microsoft.com'
-              serviceendpointurl: 'https://api.esrp.microsoft.com'
-              mainpublisher: 'Playwright'
-              domaintenantid: '975f013f-7f24-47e8-a7d3-abc4752bf346'
-            displayName: 'ESRP Release to Maven'
@@ -1,22 +0,0 @@
---
-name: playwright-roll
-description: Roll Playwright Java to a new version
---
-
-Help the user roll to a new version of Playwright.
-ROLLING.md contains general instructions and scripts.
-
-Start with updating the version and generating the API to see the state of things.
-Afterwards, work through the list of changes that need to be backported.
-You can find a list of pull requests that might need to be taking into account in the issue titled "Backport changes".
-Work through them one-by-one and check off the items that you have handled.
-Not all of them will be relevant, some might have partially been reverted, etc. - so feel free to check with the upstream release branch.
-
-Rolling includes:
- updating client implementation to match changes in the upstream JS implementation (see ../playwright/packages/playwright-core/src/client)
- adding a couple of new tests to verify new/changed functionality
-
-## Tips & Tricks
- Project checkouts are in the parent directory (`../`).
- When updating checkboxes, store the issue content into /tmp and edit it there, then update the issue based on the file
- use the "gh" cli to interact with GitHub
@@ -1,28 +0,0 @@
-// For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/java
-{
-	"name": "Java",
-	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/java:1-21-bookworm",
-
-	"features": {
-		"ghcr.io/devcontainers/features/java:1": {
-			"version": "none",
-			"installGradle": "false",
-			"installMaven": "true"
-		},
-		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
-	}
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "java -version",
-
-	// Configure tool-specific properties.
-	// "customizations": {},
-
-	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	// "remoteUser": "root"
-}
@@ -1,5 +1,3 @@
 # text files must be lf for golden file tests to work
-* text=auto eol=lf
-
-# make project show as TS on GitHub
-*.js linguist-detectable=false
+*.txt eol=lf
+*.json eol=lf
@@ -0,0 +1,41 @@
+---
+name: Bug Report
+about: Something doesn't work like it should? Tell us!
+title: "[BUG]"
+labels: ''
+assignees: ''
+
+---
+
+**Context:**
+- Playwright Version: [what Playwright version do you use?]
+- Operating System: [e.g. Windows, Linux or Mac]
+- Browser: [e.g. All, Chromium, Firefox, WebKit]
+- Extra: [any specific details about your environment]
+
+<!-- CLI to auto-capture this info -->
+<!-- npx envinfo --preset playwright --markdown -->
+
+**Code Snippet**
+
+Help us help you! Put down a short code snippet that illustrates your bug and
+that we can run and debug locally. For example:
+
+```java
+import com.microsoft.playwright.*;
+
+public class ExampleReproducible {
+  public static void main(String[] args) {
+    try (Playwright playwright = Playwright.create()) {
+      Browser browser = playwright.chromium().launch();
+      BrowserContext context = browser.newContext();
+      Page page = context.newPage();
+      // ...
+    }
+  }
+}
+```
+
+**Describe the bug**
+
+Add any other details about the problem here.
@@ -1,95 +0,0 @@
-name: Bug Report 🪲
-description: Create a bug report to help us improve
-title: '[Bug]: '
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # Please follow these steps first:
-  - type: markdown
-    attributes:
-      value: |
-        ## Troubleshoot
-        If Playwright is not behaving the way you expect, we'd ask you to look at the [documentation](https://playwright.dev/java/docs/intro) and search the issue tracker for evidence supporting your expectation.
-        Please make reasonable efforts to troubleshoot and rule out issues with your code, the configuration, or any 3rd party libraries you might be using.
-        Playwright offers [several debugging tools](https://playwright.dev/java/docs/debug) that you can use to troubleshoot your issues.
-  - type: markdown
-    attributes:
-      value: |
-        ## Ask for help through appropriate channels
-        If you feel unsure about the cause of the problem, consider asking for help on for example [StackOverflow](https://stackoverflow.com/questions/ask) or our [Discord channel](https://aka.ms/playwright/discord) before posting a bug report. The issue tracker is not a help forum.
-  - type: markdown
-    attributes:
-      value: |
-        ## Make a minimal reproduction
-        To file the report, you will need a GitHub repository with a minimal (but complete) example and simple/clear steps on how to reproduce the bug.
-        The simpler you can make it, the more likely we are to successfully verify and fix the bug.
-  - type: markdown
-    attributes:
-      value: |
-        > [!IMPORTANT]
-        > Bug reports without a minimal reproduction will be rejected.
-
-        ---
-  - type: input
-    id: version
-    attributes:
-      label: Version
-      description: |
-        The version of Playwright you are using.
-        Is it the [latest](https://github.com/microsoft/playwright-java/releases)? Test and see if the bug has already been fixed.
-      placeholder: ex. 1.41.1
-    validations:
-      required: true
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Steps to reproduce
-      description: Please link to a repository with a minimal reproduction and describe accurately how we can reproduce/verify the bug.
-      placeholder: |
-        Example steps (replace with your own):
-        1. Clone my repo at https://github.com/<myuser>/example
-        2. mvn test
-        3. You should see the error come up
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected behavior
-      description: A description of what you expect to happen.
-      placeholder: I expect to see X or Y
-    validations:
-      required: true
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: Actual behavior
-      description: |
-        A clear and concise description of the unexpected behavior.
-        Please include any relevant output here, especially any error messages.
-      placeholder: A bug happened!
-    validations:
-      required: true
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional context
-      description: Anything else that might be relevant
-    validations:
-      required: false
-  - type: textarea
-    id: envinfo
-    attributes:
-      label: Environment
-      description: |
-        Please provide information about the environment you are running in.
-      placeholder: |
-        - Operating System: [Ubuntu 22.04]
-        - CPU: [arm64]
-        - Browser: [All, Chromium, Firefox, WebKit]
-        - Java Version: [20]
-        - Maven Version: [3.8.6]
-        - Other info:
-    validations:
-      required: true
@@ -1,5 +1,4 @@
-blank_issues_enabled: false
 contact_links:
-  - name: Join our Discord Server
-    url: https://aka.ms/playwright/discord
-    about: Ask questions and discuss with other community members
+  - name: Join our Slack community
+    url: https://aka.ms/playwright-slack
+    about: Ask questions and discuss with other community members
@@ -1,29 +0,0 @@
-name: Documentation 📖
-description: Submit a request to add or update documentation
-title: '[Docs]: '
-labels: ['Documentation :book:']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ### Thank you for helping us improve our documentation!
-        Please be sure you are looking at [the Next version of the documentation](https://playwright.dev/java/docs/next/intro) before opening an issue here.
-  - type: textarea
-    id: links
-    attributes:
-      label: Page(s)
-      description: |
-        Links to one or more documentation pages that should be modified.
-        If you are reporting an issue with a specific section of a page, try to link directly to the nearest anchor.
-        If you are suggesting that a new page be created, link to the parent of the proposed page.
-    validations:
-      required: true
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: |
-        Describe the change you are requesting.
-        If the issue pertains to a single function or matcher, be sure to specify the entire call signature.
-    validations:
-      required: true
@@ -1,30 +0,0 @@
-name: Feature Request 🚀
-description: Submit a proposal for a new feature
-title: '[Feature]: '
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ### Thank you for taking the time to suggest a new feature!
-  - type: textarea
-    id: description
-    attributes:
-      label: '🚀 Feature Request'
-      description: A clear and concise description of what the feature is.
-    validations:
-      required: true
-  - type: textarea
-    id: example
-    attributes:
-      label: Example
-      description: Describe how this feature would be used.
-    validations:
-      required: false
-  - type: textarea
-    id: motivation
-    attributes:
-      label: Motivation
-      description: |
-        Outline your motivation for the proposal. How will it make Playwright better?
-    validations:
-      required: true
@@ -0,0 +1,11 @@
+---
+name: Feature request
+about: Request new features to be added
+title: "[Feature]"
+labels: ''
+assignees: ''
+
+---
+
+Let us know what functionality you'd like to see in Playwright and what your use case is.
+Do you think others might benefit from this as well?
@@ -0,0 +1,10 @@
+---
+name: I have a question
+about: Feel free to ask us your questions!
+title: "[Question]"
+labels: ''
+assignees: ''
+
+---
+
+
@@ -1,27 +0,0 @@
-name: 'Questions / Help 💬'
-description: If you have questions, please check StackOverflow or Discord
-title: '[Please read the message below]'
-labels: [':speech_balloon: Question']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        ## Questions and Help 💬
-
-        This issue tracker is reserved for bug reports and feature requests.
-
-        For anything else, such as questions or getting help, please see:
-
-        - [The Playwright documentation](https://playwright.dev/java)
-        - [Our Discord server](https://aka.ms/playwright/discord)
-  - type: checkboxes
-    id: no-post
-    attributes:
-      label: |
-        Please do not submit this issue.
-      description: |
-        > [!IMPORTANT]
-        > This issue will be closed.
-      options:
-        - label: I understand
-          required: true
@@ -0,0 +1,38 @@
+---
+name: Report regression
+about: Functionality that used to work and does not any more
+title: "[REGRESSION]: "
+labels: ''
+assignees: ''
+
+---
+
+**Context:**
+- GOOD Playwright Version: [what Playwright version worked nicely?]
+- BAD Playwright Version: [what Playwright version doesn't work any more?]
+- Operating System: [e.g. Windows, Linux or Mac]
+- Extra: [any specific details about your environment]
+
+**Code Snippet**
+
+Help us help you! Put down a short code snippet that illustrates your bug and
+that we can run and debug locally. For example:
+
+```java
+import com.microsoft.playwright.*;
+
+public class ExampleReproducible {
+  public static void main(String[] args) {
+    try (Playwright playwright = Playwright.create()) {
+      Browser browser = playwright.chromium().launch();
+      BrowserContext context = browser.newContext();
+      Page page = context.newPage();
+      // ...
+    }
+  }
+}
+```
+
+**Describe the bug**
+
+Add any other details about the problem here.
@@ -1,90 +0,0 @@
-name: Report regression
-description: Functionality that used to work and does not any more
-title: "[Regression]: "
-body:
-  - type: markdown
-    attributes:
-      value: |
-        # Please follow these steps first:
-  - type: markdown
-    attributes:
-      value: |
-        ## Make a minimal reproduction
-        To file the report, you will need a GitHub repository with a minimal (but complete) example and simple/clear steps on how to reproduce the regression.
-        The simpler you can make it, the more likely we are to successfully verify and fix the regression.
-  - type: markdown
-    attributes:
-      value: |
-        > [!IMPORTANT]
-        > Regression reports without a minimal reproduction will be rejected.
-
-        ---
-  - type: input
-    id: goodVersion
-    attributes:
-      label: Last Good Version
-      description: |
-        Last version of Playwright where the feature was working.
-      placeholder: ex. 1.40.1
-    validations:
-      required: true
-  - type: input
-    id: badVersion
-    attributes:
-      label: First Bad Version
-      description: |
-        First version of Playwright where the feature was broken.
-        Is it the [latest](https://github.com/microsoft/playwright-java/releases)? Test and see if the regression has already been fixed.
-      placeholder: ex. 1.41.1
-    validations:
-      required: true
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Steps to reproduce
-      description: Please link to a repository with a minimal reproduction and describe accurately how we can reproduce/verify the bug.
-      placeholder: |
-        Example steps (replace with your own):
-        1. Clone my repo at https://github.com/<myuser>/example
-        2. mvn test
-        3. You should see the error come up
-    validations:
-      required: true
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected behavior
-      description: A description of what you expect to happen.
-      placeholder: I expect to see X or Y
-    validations:
-      required: true
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: Actual behavior
-      description: A clear and concise description of the unexpected behavior.
-      placeholder: A bug happened!
-    validations:
-      required: true
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional context
-      description: Anything else that might be relevant
-    validations:
-      required: false
-  - type: textarea
-    id: envinfo
-    attributes:
-      label: Environment
-      description: |
-        Please provide information about the environment you are running in.
-      placeholder: |
-        - Operating System: [Ubuntu 22.04]
-        - CPU: [arm64]
-        - Browser: [All, Chromium, Firefox, WebKit]
-        - Java Version: [20]
-        - Maven Version: [3.8.6]
-        - Other info:
-    validations:
-      required: true
@@ -1,27 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "maven"
-    directory: "/" # Location of the pom.xml file
-    schedule:
-      interval: "monthly"
-    open-pull-requests-limit: 10
-    groups:
-      # Create a group of dependencies to be updated together in one pull request
-      all:
-        applies-to: version-updates
-        patterns:
-          - "*"
-        update-types:
-          - "minor"
-          - "patch"
-    allow:
-      - dependency-type: "direct" # Optional: Only update direct dependencies
-      - dependency-type: "indirect" # Optional: Only update indirect (transitive) dependencies
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-    groups:
-      actions:
-        patterns:
-          - "*" 
@@ -0,0 +1,32 @@
+name: Publish
+on:
+  release:
+    types: [published]
+  push:
+    branches:
+      - main
+jobs:
+  build:
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: microsoft/playwright-github-action@v1.5.0
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+          server-id: ossrh # Value of the distributionManagement/repository/id field of the pom.xml
+          server-username: MAVEN_USERNAME # env variable for username in deploy
+          server-password: MAVEN_PASSWORD # env variable for token in deploy
+          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
+      - name: Download drivers
+        shell: bash
+        run: scripts/download_driver_for_all_platforms.sh
+      - name: Publish to Maven Central
+        run: mvn deploy --batch-mode -D skipTests --activate-profiles release --no-transfer-progress
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
@@ -0,0 +1,25 @@
+name: "devrelease:docker"
+
+on:
+  push:
+    branches:
+      - main
+jobs:
+  publish-canary-docker:
+    name: "publish to DockerHub"
+    runs-on: ubuntu-20.04
+    if: github.repository == 'microsoft/playwright-java'
+    steps:
+    - uses: actions/checkout@v2
+    - uses: azure/docker-login@v1
+      with:
+        login-server: playwright.azurecr.io
+        username: playwright
+        password: ${{ secrets.DOCKER_PASSWORD }}
+    - uses: actions/checkout@v2
+    - 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
@@ -1,30 +0,0 @@
-name: Publish Release Docker
-on:
-  release:
-    types: [published]
-  workflow_dispatch:
-jobs:
-  publish-canary-docker:
-    name: publish to DockerHub
-    runs-on: ubuntu-22.04
-    permissions:
-      id-token: write   # This is required for OIDC login (azure/login) to succeed
-      contents: read    # This is required for actions/checkout to succeed
-    environment: Docker
-    if: github.repository == 'microsoft/playwright-java'
-    steps:
-    - uses: actions/checkout@v6
-    - name: Azure login
-      uses: azure/login@v2
-      with:
-        client-id: ${{ secrets.AZURE_DOCKER_CLIENT_ID }}
-        tenant-id: ${{ secrets.AZURE_DOCKER_TENANT_ID }}
-        subscription-id: ${{ secrets.AZURE_DOCKER_SUBSCRIPTION_ID }}
-    - name: Login to ACR via OIDC
-      run: az acr login --name playwright
-    - name: Set up Docker QEMU for arm64 docker builds
-      uses: docker/setup-qemu-action@v3
-      with:
-        platforms: arm64
-    - uses: actions/checkout@v6
-    - run: ./utils/docker/publish_docker.sh stable
@@ -0,0 +1,33 @@
+name: Publish Release Docker
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+    inputs:
+      is_release:
+        required: true
+        type: boolean
+        description: "Is this a release image?"
+    branches:
+      - release-*
+jobs:
+  publish-canary-docker:
+    name: publish to DockerHub
+    runs-on: ubuntu-20.04
+    if: github.repository == 'microsoft/playwright-java'
+    steps:
+    - uses: actions/checkout@v2
+    - uses: azure/docker-login@v1
+      with:
+        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
+    - 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')
@@ -8,8 +8,6 @@ on:
    branches:
      - main
      - release-*
-env:
-  PW_MAX_RETRIES: 3
 jobs:
  dev:
    timeout-minutes: 30
@@ -20,25 +18,24 @@ jobs:
        browser: [chromium, firefox, webkit]
    runs-on: ${{ matrix.os }}
    steps:
-    - uses: actions/checkout@v6
+    - uses: actions/checkout@v2
+    - uses: microsoft/playwright-github-action@v1
    - name: Set up JDK 1.8
-      uses: actions/setup-java@v5
+      uses: actions/setup-java@v2
      with:
        distribution: zulu
        java-version: 8
    - name: Download drivers
      shell: bash
-      run: scripts/download_driver.sh
+      run: scripts/download_driver_for_all_platforms.sh
    - name: Build & Install
      run: mvn -B install -D skipTests --no-transfer-progress
-    - name: Install browsers
-      run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install --with-deps" -f playwright/pom.xml --no-transfer-progress
    - name: Run tests
-      run: mvn test --no-transfer-progress --fail-at-end -D org.slf4j.simpleLogger.showDateTime=true -D org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
+      run: mvn test --no-transfer-progress --fail-at-end
      env:
        BROWSER: ${{ matrix.browser }}
    - name: Run tracing tests w/ sources
-      run: mvn test --no-transfer-progress --fail-at-end --projects=playwright -D test=*TestTracing* -D org.slf4j.simpleLogger.showDateTime=true -D org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
+      run: mvn test --no-transfer-progress --fail-at-end -D test=*TestTracing*
      env:
        BROWSER: ${{ matrix.browser }}
        PLAYWRIGHT_JAVA_SRC: src/test/java
@@ -65,34 +62,29 @@ jobs:
            browser-channel: msedge
    runs-on: ${{ matrix.os }}
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v2
+      - 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@v5
+        uses: actions/setup-java@v2
        with:
          distribution: zulu
          java-version: 8
      - name: Download drivers
        shell: bash
-        run: scripts/download_driver.sh
+        run: scripts/download_driver_for_all_platforms.sh
      - name: Build & Install
        run: mvn -B install -D skipTests --no-transfer-progress
-      - name: Install browsers
-        run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install --with-deps" -f playwright/pom.xml --no-transfer-progress
-      - name: Install MS Edge
-        if: matrix.browser-channel == 'msedge' && matrix.os == 'macos-latest'
-        shell: bash
-        run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install msedge" -f playwright/pom.xml
      - name: Run tests
-        run: mvn test --no-transfer-progress --fail-at-end -D org.slf4j.simpleLogger.showDateTime=true -D org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
+        run: mvn test --no-transfer-progress --fail-at-end
        env:
          BROWSER: chromium
          BROWSER_CHANNEL: ${{ matrix.browser-channel }}

-  Java_21:
+  Java_17:
    timeout-minutes: 30
    strategy:
      fail-fast: false
@@ -100,19 +92,18 @@ jobs:
        browser: [chromium, firefox, webkit]
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
-      - name: Set up JDK 21
-        uses: actions/setup-java@v5
+      - 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: 21
+          java-version: 17
      - name: Download drivers
        shell: bash
-        run: scripts/download_driver.sh
+        run: scripts/download_driver_for_all_platforms.sh
      - name: Build & Install
        run: mvn -B install -D skipTests --no-transfer-progress
-      - name: Install browsers
-        run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install --with-deps" -f playwright/pom.xml --no-transfer-progress
      - name: Run tests
        run: mvn test --no-transfer-progress --fail-at-end
        env:
@@ -13,15 +13,15 @@ jobs:
    timeout-minutes: 30
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v2
      - name: Cache Maven packages
-        uses: actions/cache@v4
+        uses: actions/cache@v2
        with:
          path: ~/.m2
          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
          restore-keys: ${{ runner.os }}-m2
      - name: Download drivers
-        run: scripts/download_driver.sh
+        run: scripts/download_driver_for_all_platforms.sh
      - name: Intall Playwright
        run: mvn install -D skipTests --no-transfer-progress
      - name: Test CLI
@@ -29,6 +29,3 @@ jobs:
      - name: Test CLI version
        shell: bash
        run: tools/test-cli-version/test.sh
-      - name: Test CLI Fatjar
-        shell: bash
-        run: tools/test-cli-fatjar/test.sh
@@ -1,4 +1,4 @@
-name: Docker
+name: Test Docker
 on:
  push:
    paths:
@@ -11,42 +11,20 @@ on:
    paths:
      - .github/workflows/test_docker.yml
      - '**/Dockerfile*'
-      - scripts/DRIVER_VERSION
+      - scripts/CLI_VERSION
      - '**/pom.xml'
    branches:
      - main
      - release-*
 jobs:
  test:
-    name: Test
-    timeout-minutes: 120
-    runs-on: ${{ matrix.runs-on }}
-    env:
-      PW_MAX_RETRIES: 3
-    strategy:
-      fail-fast: false
-      matrix:
-        flavor: [jammy, noble]
-        runs-on: [ubuntu-24.04, ubuntu-24.04-arm]
+    timeout-minutes: 60
+    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v2
      - name: Build Docker image
+        run: bash utils/docker/build.sh --amd64 focal playwright-java:localbuild-focal
+      - name: Test
        run: |
-          ARCH="${{ matrix.runs-on == 'ubuntu-24.04-arm' && 'arm64' || 'amd64' }}"
-          bash utils/docker/build.sh --$ARCH ${{ matrix.flavor }} playwright-java:localbuild-${{ matrix.flavor }}
-      - name: Start container
-        run: |
-            CONTAINER_ID=$(docker run --rm -e CI -e PW_MAX_RETRIES --ipc=host -v "$(pwd)":/root/playwright --name playwright-docker-test -d -t playwright-java:localbuild-${{ matrix.flavor }} /bin/bash)
-            echo "CONTAINER_ID=$CONTAINER_ID" >> $GITHUB_ENV
-
-      - name: Run test in container
-        run: |
-            docker exec "$CONTAINER_ID" /root/playwright/tools/test-local-installation/create_project_and_run_tests.sh
-
-      - name: Test ClassLoader
-        run: |
-            docker exec "${CONTAINER_ID}" /root/playwright/tools/test-spring-boot-starter/package_and_run_async_test.sh
-
-      - name: Stop container
-        run: |
-            docker stop "$CONTAINER_ID"
+          CONTAINER_ID="$(docker run --rm --ipc=host -v $(pwd):/root/playwright --name playwright-docker-test -d -t playwright-java:localbuild-focal /bin/bash)"
+          docker exec "${CONTAINER_ID}" /root/playwright/tools/test-local-installation/create_project_and_run_tests.sh
@@ -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 }}
@@ -19,15 +19,12 @@ jobs:
    timeout-minutes: 30
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v2
+      - uses: microsoft/playwright-github-action@v1
      - name: Download drivers
-        run: scripts/download_driver.sh
+        run: scripts/download_driver_for_all_platforms.sh
      - name: Regenerate APIs
        run: scripts/generate_api.sh
-      - name: Build & Install
-        run: mvn -B install -D skipTests --no-transfer-progress
-      - name: Install browsers
-        run: mvn exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install --with-deps" -f playwright/pom.xml --no-transfer-progress
      - name: Update browser versions in README
        run: scripts/update_readme.sh
      - name: Verify API is up to date
@@ -20,12 +20,14 @@ git clone https://github.com/microsoft/playwright-java
 cd playwright-java
 ```

-2. Run the following script to download Playwright driver for all platforms into `driver-bundle/src/main/resources/driver/` directory (browser binaries for Chromium, Firefox and WebKit will be automatically downloaded later on first Playwright run).
+2. Run the following script to download playwright-cli binaries for all platforms into `driver-bundle/src/main/resources/driver/` directory (browser binaries for Chromium, Firefox and WebKit will be automatically downloaded later on first Playwright run).

 ```bash
-scripts/download_driver.sh
+scripts/download_driver_for_all_platforms.sh
 ```

+Names of published driver archives can be found at https://github.com/microsoft/playwright-cli/actions
+
 ### Building and running the tests with Maven

 ```bash
@@ -39,19 +41,25 @@ BROWSER=chromium mvn test -Dtest=TestPageNetworkSizes

 ### Generating API

-Public Java API is generated from api.json which is produced by `print-api-json` command of playwright CLI. To regenerate Java interfaces for the current driver run the following commands:
+Public Java API is generated from api.json which is produced by `playwright-cli print-api-json`. To regenerate
+Java interfaces for the current driver run the following commands:

 ```bash
-./scripts/download_driver.sh
+./scripts/download_driver_for_all_platforms.sh
 ./scripts/generate_api.sh
 ```

 #### Updating driver version

-Versions of published driver archives can be found in [publish canary](https://github.com/microsoft/playwright/actions/workflows/publish_canary.yml) and [publish release](https://github.com/microsoft/playwright/actions/workflows/publish_release_driver.yml) actions logs. To update the driver to a particular version run the following command:
+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
-scripts/roll_driver.sh [version]
+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
@@ -1,3 +0,0 @@
-path_classifiers:
-  tests:
-    - "playwright/src/test/**"
@@ -2,7 +2,8 @@

 [![javadoc](https://javadoc.io/badge2/com.microsoft.playwright/playwright/javadoc.svg)](https://javadoc.io/doc/com.microsoft.playwright/playwright)
 [![maven version](https://img.shields.io/maven-central/v/com.microsoft.playwright/playwright)](https://search.maven.org/search?q=com.microsoft.playwright)
-[![Join Discord](https://img.shields.io/badge/join-discord-infomational)](https://aka.ms/playwright/discord)
+[![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/https/oss.sonatype.org/com.microsoft.playwright/playwright.svg)](https://oss.sonatype.org/content/repositories/snapshots/com/microsoft/playwright/playwright/)
+[![Join Slack](https://img.shields.io/badge/join-slack-infomational)](https://aka.ms/playwright-slack)

 #### [Website](https://playwright.dev/java/) | [API reference](https://www.javadoc.io/doc/com.microsoft.playwright/playwright/latest/index.html)

@@ -10,21 +11,53 @@ Playwright is a Java library to automate [Chromium](https://www.chromium.org/Hom

 |          | Linux | macOS | Windows |
 |   :---   | :---: | :---: | :---:   |
-| Chromium <!-- GEN:chromium-version -->145.0.7632.6<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
-| WebKit <!-- GEN:webkit-version -->26.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
-| Firefox <!-- GEN:firefox-version -->146.0.1<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Chromium <!-- GEN:chromium-version -->104.0.5112.20<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| WebKit <!-- GEN:webkit-version -->15.4<!-- GEN:stop --> | ✅ | ✅ | ✅ |
+| Firefox <!-- GEN:firefox-version -->100.0.2<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |

-## Documentation
+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.

-[https://playwright.dev/java/docs/intro](https://playwright.dev/java/docs/intro)
+* [Usage](#usage)
+  - [Add Maven dependency](#add-maven-dependency)
+  - [Is Playwright thread-safe?](#is-playwright-thread-safe)
+* [Examples](#examples)
+  - [Page screenshot](#page-screenshot)
+  - [Mobile and geolocation](#mobile-and-geolocation)
+  - [Evaluate JavaScript in browser](#evaluate-javascript-in-browser)
+  - [Intercept network requests](#intercept-network-requests)
+* [Documentation](#documentation)
+* [Contributing](#contributing)
+* [Is Playwright for Java ready?](#is-playwright-for-java-ready)

-## API Reference
+## Usage

-[https://playwright.dev/java/docs/api/class-playwright](https://playwright.dev/java/docs/api/class-playwright)
+Playwright requires **Java 8** or newer.

-## Example
+#### Add Maven dependency

-This code snippet navigates to Playwright homepage in Chromium, Firefox and WebKit, and saves 3 screenshots.
+Playwright is distributed as a set of [Maven](https://maven.apache.org/what-is-maven.html) modules. The easiest way to use it is to add one dependency to your Maven `pom.xml` file as described below. If you're not familiar with Maven please refer to its [documentation](https://maven.apache.org/guides/getting-started/maven-in-five-minutes.html).
+
+To run Playwright simply add following dependency to your Maven project:
+
+```xml
+<dependency>
+  <groupId>com.microsoft.playwright</groupId>
+  <artifactId>playwright</artifactId>
+  <version>1.23.0</version>
+</dependency>
+```
+
+#### Is Playwright thread-safe?
+
+No, Playwright is not thread safe, i.e. all its methods as well as methods on all objects created by it (such as BrowserContext, Browser, Page etc.) are expected to be called on the same thread where Playwright object was created or proper synchronization should be implemented to ensure only one thread calls Playwright methods at any given time. Having said that it's okay to create multiple Playwright instances each on its own thread.
+
+## Examples
+
+You can find Maven project with the examples [here](./examples).
+
+#### Page screenshot
+
+This code snippet navigates to whatsmyuseragent.org in Chromium, Firefox and WebKit, and saves 3 screenshots.

 ```java
 import com.microsoft.playwright.*;
@@ -45,7 +78,7 @@ public class PageScreenshot {
        try (Browser browser = browserType.launch()) {
          BrowserContext context = browser.newContext();
          Page page = context.newPage();
-          page.navigate("https://playwright.dev/");
+          page.navigate("http://whatsmyuseragent.org/");
          page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("screenshot-" + browserType.name() + ".png")));
        }
      }
@@ -54,9 +87,100 @@ public class PageScreenshot {
 }
 ```

-## Other languages
+#### Mobile and geolocation

-More comfortable in another programming language? [Playwright](https://playwright.dev) is also available in
- [Node.js (JavaScript / TypeScript)](https://playwright.dev/docs/intro),
- [Python](https://playwright.dev/python/docs/intro).
- [.NET](https://playwright.dev/dotnet/docs/intro),
+This snippet emulates Mobile Chromium on a device at a given geolocation, navigates to openstreetmap.org, performs action and takes a screenshot.
+
+```java
+import com.microsoft.playwright.options.*;
+import com.microsoft.playwright.*;
+
+import java.nio.file.Paths;
+
+import static java.util.Arrays.asList;
+
+public class MobileAndGeolocation {
+  public static void main(String[] args) {
+    try (Playwright playwright = Playwright.create()) {
+      Browser browser = playwright.chromium().launch();
+      BrowserContext context = browser.newContext(new Browser.NewContextOptions()
+        .setUserAgent("Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3765.0 Mobile Safari/537.36")
+        .setViewportSize(411, 731)
+        .setDeviceScaleFactor(2.625)
+        .setIsMobile(true)
+        .setHasTouch(true)
+        .setLocale("en-US")
+        .setGeolocation(41.889938, 12.492507)
+        .setPermissions(asList("geolocation")));
+      Page page = context.newPage();
+      page.navigate("https://www.openstreetmap.org/");
+      page.click("a[data-original-title=\"Show My Location\"]");
+      page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("colosseum-pixel2.png")));
+    }
+  }
+}
+```
+
+#### Evaluate JavaScript in browser
+
+This code snippet navigates to example.com in Firefox, and executes a script in the page context.
+
+```java
+import com.microsoft.playwright.*;
+
+public class EvaluateInBrowserContext {
+  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://www.example.com/");
+      Object dimensions = page.evaluate("() => {\n" +
+        "  return {\n" +
+        "      width: document.documentElement.clientWidth,\n" +
+        "      height: document.documentElement.clientHeight,\n" +
+        "      deviceScaleFactor: window.devicePixelRatio\n" +
+        "  }\n" +
+        "}");
+      System.out.println(dimensions);
+    }
+  }
+}
+```
+
+#### Intercept network requests
+
+This code snippet sets up request routing for a WebKit page to log all network requests.
+
+```java
+import com.microsoft.playwright.*;
+
+public class InterceptNetworkRequests {
+  public static void main(String[] args) {
+    try (Playwright playwright = Playwright.create()) {
+      Browser browser = playwright.webkit().launch();
+      BrowserContext context = browser.newContext();
+      Page page = context.newPage();
+      page.route("**", route -> {
+        System.out.println(route.request().url());
+        route.resume();
+      });
+      page.navigate("http://todomvc.com");
+    }
+  }
+}
+```
+
+## Documentation
+
+Check out our official [documentation site](https://playwright.dev/java).
+
+You can also browse [javadoc online](https://www.javadoc.io/doc/com.microsoft.playwright/playwright/latest/index.html).
+
+## Contributing
+
+Follow [the instructions](https://github.com/microsoft/playwright-java/blob/main/CONTRIBUTING.md#getting-code) to build the project from source and install the driver.
+
+## Is Playwright for Java ready?
+
+Yes, Playwright for Java is ready. v1.10.0 is the first stable release. Going forward we will adhere to [semantic versioning](https://semver.org/) of the API.
@@ -2,18 +2,12 @@

 * make sure to have at least Java 8 and Maven 3.6.3
 * clone playwright for java: http://github.com/microsoft/playwright-java
-* `./scripts/roll_driver.sh 1.47.0-beta-1726138322000`
+* set new driver version in `scripts/CLI_VERSION`
+* regenerate API: `./scripts/download_driver_for_all_platforms.sh -f && ./scripts/generate_api.sh && ./scripts/update_readme.sh`
 * commit & send PR with the roll

-## Finding driver version
-
-For development versions of Playwright, you can find the latest version by looking at [publish_canary](https://github.com/microsoft/playwright/actions/workflows/publish_canary.yml) workflow -> `publish canary NPM & Publish canary Docker` -> `build & publish driver` step -> `PACKAGE_VERSION`
-<img width="960" alt="image" src="https://github.com/microsoft/playwright-java/assets/9798949/4f33a7f1-b39a-4179-8ae7-fb1d84094c75">
-
-
 # Updating Version

 ```bash
 ./scripts/set_maven_version.sh 1.15.0
 ```
-
@@ -1,17 +0,0 @@
-# Support
-
-## How to file issues and get help
-
-This project uses GitHub issues to track bugs and feature requests. Please search the [existing issues][gh-issues] before filing new ones to avoid duplicates. For new issues, file your bug or feature request as a new issue using corresponding template.
-
-For help and questions about using this project, please see the [docs site for Playwright for Java][docs].
-
-Join our community [Discord Server][discord-server] to connect with other developers using Playwright and ask questions in our 'help-playwright' forum.
-
-## Microsoft Support Policy
-
-Support for Playwright for Java is limited to the resources listed above.
-
-[gh-issues]: https://github.com/microsoft/playwright-java/issues/
-[docs]: https://playwright.dev/java/
-[discord-server]: https://aka.ms/playwright/discord
@@ -6,7 +6,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.58.0</version>
+    <version>1.23.0</version>
  </parent>

  <artifactId>driver-bundle</artifactId>
@@ -16,6 +16,25 @@
    It is intended to be used on the systems where Playwright driver is not preinstalled.
  </description>

+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <configuration>
+          <excludeResources>true</excludeResources>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
  <dependencies>
    <dependency>
      <groupId>com.microsoft.playwright</groupId>
@@ -14,9 +14,7 @@
 * limitations under the License.
 */

-package com.microsoft.playwright.impl.driver.jar;
-
-import com.microsoft.playwright.impl.driver.Driver;
+package com.microsoft.playwright.impl;

 import java.io.IOException;
 import java.net.URI;
@@ -28,9 +26,7 @@ import java.util.concurrent.TimeUnit;

 public class DriverJar extends Driver {
  private static final String PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD";
-  private static final String SELENIUM_REMOTE_URL = "SELENIUM_REMOTE_URL";
  private final Path driverTempDir;
-  private Path preinstalledNodePath;

  public DriverJar() throws IOException {
    // Allow specifying custom path for the driver installation
@@ -41,29 +37,13 @@ public class DriverJar extends Driver {
      ? Files.createTempDirectory(prefix)
      : Files.createTempDirectory(Paths.get(alternativeTmpdir), prefix);
    driverTempDir.toFile().deleteOnExit();
-    String nodePath = System.getProperty("playwright.nodejs.path");
-    if (nodePath != null) {
-      preinstalledNodePath = Paths.get(nodePath);
-      if (!Files.exists(preinstalledNodePath)) {
-        throw new RuntimeException("Invalid Node.js path specified: " + nodePath);
-      }
-    }
    logMessage("created DriverJar: " + driverTempDir);
  }

  @Override
-  protected void initialize(Boolean installBrowsers) throws Exception {
-    if (preinstalledNodePath == null && env.containsKey(PLAYWRIGHT_NODEJS_PATH)) {
-      preinstalledNodePath = Paths.get(env.get(PLAYWRIGHT_NODEJS_PATH));
-      if (!Files.exists(preinstalledNodePath)) {
-        throw new RuntimeException("Invalid Node.js path specified: " + preinstalledNodePath);
-      }
-    } else if (preinstalledNodePath != null) {
-      // Pass the env variable to the driver process.
-      env.put(PLAYWRIGHT_NODEJS_PATH, preinstalledNodePath.toString());
-    }
+  protected void initialize(Map<String, String> env, Boolean installBrowsers) throws Exception {
    extractDriverToTempDir();
-    logMessage("extracted driver from jar to " + driverDir());
+    logMessage("extracted driver from jar to " + driverPath());
    if (installBrowsers)
      installBrowsers(env);
  }
@@ -74,19 +54,16 @@ public class DriverJar extends Driver {
      skip = System.getenv(PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD);
    }
    if (skip != null && !"0".equals(skip) && !"false".equals(skip)) {
-      logMessage("Skipping browsers download because `PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD` env variable is set");
+      System.out.println("Skipping browsers download because `PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD` env variable is set");
      return;
    }
-    if (env.get(SELENIUM_REMOTE_URL) != null || System.getenv(SELENIUM_REMOTE_URL) != null) {
-      logMessage("Skipping browsers download because `SELENIUM_REMOTE_URL` env variable is set");
-      return;
-    }
-    Path driver = driverDir();
+    Path driver = driverPath();
    if (!Files.exists(driver)) {
      throw new RuntimeException("Failed to find driver: " + driver);
    }
-    ProcessBuilder pb = createProcessBuilder();
-    pb.command().add("install");
+    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();
@@ -105,25 +82,13 @@ public class DriverJar extends Driver {
    return name.endsWith(".sh") || name.endsWith(".exe") || !name.contains(".");
  }

-  private FileSystem initFileSystem(URI uri) throws IOException {
-    try {
-      return FileSystems.newFileSystem(uri, Collections.emptyMap());
-    } catch (FileSystemAlreadyExistsException e) {
-      return null;
-    }
-  }
-
-  public static URI getDriverResourceURI() throws URISyntaxException {
-    ClassLoader classloader = DriverJar.class.getClassLoader();
-    return classloader.getResource("driver/" + platformDir()).toURI();
-  }
-
-  void extractDriverToTempDir() throws URISyntaxException, IOException {
-    URI originalUri = getDriverResourceURI();
+  private void extractDriverToTempDir() throws URISyntaxException, IOException {
+    ClassLoader classloader = Thread.currentThread().getContextClassLoader();
+    URI originalUri = classloader.getResource("driver/" + platformDir()).toURI();
    URI uri = maybeExtractNestedJar(originalUri);

    // Create zip filesystem if loading from jar.
-    try (FileSystem fileSystem = "jar".equals(uri.getScheme()) ? initFileSystem(uri) : null) {
+    try (FileSystem fileSystem = "jar".equals(uri.getScheme()) ? FileSystems.newFileSystem(uri, Collections.emptyMap()) : null) {
      Path srcRoot = Paths.get(uri);
      // jar file system's .relativize gives wrong results when used with
      // spring-boot-maven-plugin, convert to the default filesystem to
@@ -131,12 +96,6 @@ public class DriverJar extends Driver {
      // See https://github.com/microsoft/playwright-java/issues/306
      Path srcRootDefaultFs = Paths.get(srcRoot.toString());
      Files.walk(srcRoot).forEach(fromPath -> {
-        if (preinstalledNodePath != null) {
-          String fileName = fromPath.getFileName().toString();
-          if ("node.exe".equals(fileName) || "node".equals(fileName)) {
-            return;
-          }
-        }
        Path relative = srcRootDefaultFs.relativize(Paths.get(fromPath.toString()));
        Path toPath = driverTempDir.resolve(relative.toString());
        try {
@@ -193,17 +152,13 @@ public class DriverJar extends Driver {
      }
    }
    if (name.contains("mac os x")) {
-      if (arch.equals("aarch64")) {
-        return "mac-arm64";
-      } else {
-        return "mac";
-      }
+      return "mac";
    }
    throw new RuntimeException("Unexpected os.name value: " + name);
  }

  @Override
-  public Path driverDir() {
+  Path driverDir() {
    return driverTempDir;
  }
 }
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.impl.Driver;
+import com.microsoft.playwright.impl.DriverJar;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.MalformedURLException;
+import java.net.ServerSocket;
+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.*;
+
+public class TestInstall {
+  private static boolean isPortAvailable(int port) {
+    try (ServerSocket ignored = new ServerSocket(port)) {
+      return true;
+    } catch (IOException ignored) {
+      return false;
+    }
+  }
+
+  private static int unusedPort() {
+    for (int i = 10000; i < 11000; i++) {
+      if (isPortAvailable(i)) {
+        return i;
+      }
+    }
+    throw new RuntimeException("Cannot find unused local port");
+  }
+
+  @BeforeEach
+  void clearSystemProperties() {
+    // Clear system property to ensure that the driver is loaded from jar.
+    System.clearProperty("playwright.cli.dir");
+    System.clearProperty("playwright.driver.tmpdir");
+    // Clear system property to ensure that the default driver is loaded.
+    System.clearProperty("playwright.driver.impl");
+  }
+
+  @Test
+  void shouldThrowWhenBrowserPathIsInvalid(@TempDir Path tmpDir) throws MalformedURLException, ClassNotFoundException, NoSuchMethodException, NoSuchFieldException, IllegalAccessException {
+    Map<String,String> env = new HashMap<>();
+
+    // On macOS we can only use 127.0.0.1, so pick unused port instead.
+    // https://superuser.com/questions/458875/how-do-you-get-loopback-addresses-other-than-127-0-0-1-to-work-on-os-x
+    env.put("PLAYWRIGHT_DOWNLOAD_HOST", "https://127.0.0.1:" + unusedPort());
+    // Make sure the browsers are not installed yet by pointing at an empty dir.
+    env.put("PLAYWRIGHT_BROWSERS_PATH", tmpDir.toString());
+    env.put("PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD", "false");
+
+    // Reset instance field value to null for the test.
+    Field field = Driver.class.getDeclaredField("instance");
+    field.setAccessible(true);
+    Object value = field.get(Driver.class);
+    field.set(Driver.class, null);
+
+    for (int i = 0; i < 2; i++){
+      RuntimeException exception = assertThrows(RuntimeException.class, () -> Driver.ensureDriverInstalled(env, true));
+      String message = exception.getMessage();
+      assertTrue(message.contains("Failed to create driver"), message);
+    }
+
+    field.set(Driver.class, value);
+  }
+
+  @Test
+  void playwrightCliInstalled() throws Exception {
+    Path cli = Driver.ensureDriverInstalled(Collections.emptyMap(), false);
+    assertTrue(Files.exists(cli));
+
+    ProcessBuilder pb = new ProcessBuilder(cli.toString(), "install");
+    pb.redirectError(ProcessBuilder.Redirect.INHERIT);
+    pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
+    Process p = pb.start();
+    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());
+  }
+}
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) Microsoft Corporation.
- * <p>
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.driver.jar;
-
-import com.microsoft.playwright.impl.driver.Driver;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-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 com.microsoft.playwright.impl.driver.Driver.PLAYWRIGHT_NODEJS_PATH;
-import static java.util.Collections.singletonMap;
-import static org.junit.jupiter.api.Assertions.*;
-
-public class TestInstall {
-  private static boolean isPortAvailable(int port) {
-    try (ServerSocket ignored = new ServerSocket(port)) {
-      return true;
-    } catch (IOException ignored) {
-      return false;
-    }
-  }
-
-  private static int unusedPort() {
-    for (int i = 10000; i < 11000; i++) {
-      if (isPortAvailable(i)) {
-        return i;
-      }
-    }
-    throw new RuntimeException("Cannot find unused local port");
-  }
-
-  @BeforeEach
-  void clearSystemProperties() {
-    // Clear system property to ensure that the driver is loaded from jar.
-    System.clearProperty("playwright.cli.dir");
-    System.clearProperty("playwright.driver.tmpdir");
-    System.clearProperty("playwright.nodejs.path");
-    // Clear system property to ensure that the default driver is loaded.
-    System.clearProperty("playwright.driver.impl");
-  }
-
-  @Test
-  void shouldThrowWhenBrowserPathIsInvalid(@TempDir Path tmpDir) throws NoSuchFieldException, IllegalAccessException {
-    Map<String,String> env = new HashMap<>();
-
-    // On macOS we can only use 127.0.0.1, so pick unused port instead.
-    // https://superuser.com/questions/458875/how-do-you-get-loopback-addresses-other-than-127-0-0-1-to-work-on-os-x
-    env.put("PLAYWRIGHT_DOWNLOAD_HOST", "https://127.0.0.1:" + unusedPort());
-    // Make sure the browsers are not installed yet by pointing at an empty dir.
-    env.put("PLAYWRIGHT_BROWSERS_PATH", tmpDir.toString());
-    env.put("PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD", "false");
-
-    RuntimeException exception = assertThrows(RuntimeException.class, () -> Driver.createAndInstall(env, true));
-    String message = exception.getMessage();
-    assertTrue(message.contains("Failed to create driver"), message);
-  }
-
-  @Test
-  void playwrightCliInstalled() throws Exception {
-    Driver driver = Driver.createAndInstall(Collections.emptyMap(), false);
-    assertTrue(Files.exists(driver.driverDir()));
-
-    ProcessBuilder pb = driver.createProcessBuilder();
-    pb.command().add("install");
-    pb.redirectError(ProcessBuilder.Redirect.INHERIT);
-    pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
-    Process p = pb.start();
-    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.driverDir().startsWith(tmpdir), "Driver path: " + driver.driverDir() + " tmp: " + tmpdir);
-  }
-
-  @Test
-  void playwrightDriverDefaultImpl() {
-    assertDoesNotThrow(() -> Driver.createAndInstall(Collections.emptyMap(), false));
-  }
-
-  @Test
-  void playwrightDriverAlternativeImpl() throws NoSuchFieldException, IllegalAccessException {
-    System.setProperty("playwright.driver.impl", "com.microsoft.playwright.impl.AlternativeDriver");
-    RuntimeException thrown =
-      assertThrows(
-        RuntimeException.class,
-        () -> Driver.createAndInstall(Collections.emptyMap(), false));
-    assertEquals("Failed to create driver", thrown.getMessage());
-  }
-
-  @Test
-  void canPassPreinstalledNodeJsAsSystemProperty(@TempDir Path tmpDir) throws IOException, URISyntaxException, InterruptedException {
-    String nodePath = extractNodeJsToTemp();
-    System.setProperty("playwright.nodejs.path", nodePath);
-    Driver driver = Driver.createAndInstall(Collections.emptyMap(), false);
-    canSpecifyPreinstalledNodeJsShared(driver, tmpDir);
-  }
-
-  @Test
-  void canSpecifyPreinstalledNodeJsAsEnv(@TempDir Path tmpDir) throws IOException, URISyntaxException, InterruptedException {
-    String nodePath = extractNodeJsToTemp();
-    Driver driver = Driver.createAndInstall(singletonMap(PLAYWRIGHT_NODEJS_PATH, nodePath), false);
-    canSpecifyPreinstalledNodeJsShared(driver, tmpDir);
-  }
-
-
-  private static String extractNodeJsToTemp() throws URISyntaxException, IOException {
-    DriverJar auxDriver = new DriverJar();
-    auxDriver.extractDriverToTempDir();
-    String nodePath = auxDriver.driverDir().resolve(isWindows() ? "node.exe" : "node").toString();
-    return nodePath;
-  }
-
-  private static boolean isWindows() {
-    String name = System.getProperty("os.name").toLowerCase();
-    return name.contains("win");
-  }
-
-  private static void canSpecifyPreinstalledNodeJsShared(Driver driver, Path tmpDir) throws IOException, URISyntaxException, InterruptedException {
-    Path builtinNode = driver.driverDir().resolve("node");
-    assertFalse(Files.exists(builtinNode), builtinNode.toString());
-    Path builtinNodeExe = driver.driverDir().resolve("node.exe");
-    assertFalse(Files.exists(builtinNodeExe), builtinNodeExe.toString());
-
-    ProcessBuilder pb = driver.createProcessBuilder();
-    pb.command().add("--version");
-    pb.redirectError(ProcessBuilder.Redirect.INHERIT);
-    Path out = tmpDir.resolve("out.txt");
-    pb.redirectOutput(out.toFile());
-    Process p = pb.start();
-    boolean result = p.waitFor(1, TimeUnit.MINUTES);
-    assertTrue(result, "Timed out waiting for version to be printed");
-    String stdout = new String(Files.readAllBytes(out), StandardCharsets.UTF_8);
-    assertTrue(stdout.contains("Version "), stdout);
-  }
-}
@@ -6,7 +6,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.58.0</version>
+    <version>1.23.0</version>
  </parent>

  <artifactId>driver</artifactId>
@@ -15,6 +15,22 @@
    This module provides API for discovery and launching of Playwright driver.
  </description>

+  <build>
+    <plugins>
+      <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>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
  <dependencies>
    <dependency>
      <groupId>org.junit.jupiter</groupId>
@@ -14,14 +14,14 @@
 * limitations under the License.
 */

-package com.microsoft.playwright.impl.driver;
+package com.microsoft.playwright.impl;

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

-import static com.microsoft.playwright.impl.driver.DriverLogging.logWithTimestamp;
+import static com.microsoft.playwright.impl.DriverLogging.logWithTimestamp;

 /**
 * This class provides access to playwright-cli. It can be either preinstalled
@@ -29,9 +29,6 @@ import static com.microsoft.playwright.impl.driver.DriverLogging.logWithTimestam
 * loaded from the driver-bundle module if that module is in the classpath.
 */
 public abstract class Driver {
-  protected final Map<String, String> env = new LinkedHashMap<>(System.getenv());
-  public static final String PLAYWRIGHT_NODEJS_PATH = "PLAYWRIGHT_NODEJS_PATH";
-
  private static Driver instance;

  private static class PreinstalledDriver extends Driver {
@@ -42,45 +39,46 @@ public abstract class Driver {
    }

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

    @Override
-    public Path driverDir() {
+    Path driverDir() {
      return driverDir;
    }
  }

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

-  private void initialize(Map<String, String> env, Boolean installBrowsers) throws Exception {
-    this.env.putAll(env);
-    initialize(installBrowsers);
-  }
-  protected abstract void initialize(Boolean installBrowsers) throws Exception;
+  protected abstract void initialize(Map<String, String> env, Boolean installBrowsers) throws Exception;

-  public ProcessBuilder createProcessBuilder() {
-    String nodePath = env.get("PLAYWRIGHT_NODEJS_PATH");
-    if (nodePath == null) {
-      String node = System.getProperty("os.name").toLowerCase().contains("windows") ? "node.exe" : "node";
-      nodePath = driverDir().resolve(node).toAbsolutePath().toString();
-    }
-    ProcessBuilder pb = new ProcessBuilder(nodePath);
-    pb.command().add(driverDir().resolve("package").resolve("cli.js").toAbsolutePath().toString());
-    pb.environment().putAll(env);
+  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);
    }
-    return pb;
  }

  private static String getMajorJavaVersion() {
@@ -94,31 +92,20 @@ public abstract class Driver {
    }
    return version;
  }
-  public static Driver createAndInstall(Map<String, String> env, Boolean installBrowsers) {
-    try {
-      Driver instance = newInstance();
-      logMessage("initializing driver");
-      instance.initialize(env, installBrowsers);
-      logMessage("driver initialized.");
-      return instance;
-    } catch (Exception exception) {
-      throw new RuntimeException("Failed to create driver", exception);
-    }
-  }

-  private static Driver newInstance() throws Exception {
+  private static Driver createDriver() throws Exception {
    String pathFromProperty = System.getProperty("playwright.cli.dir");
    if (pathFromProperty != null) {
      return new PreinstalledDriver(Paths.get(pathFromProperty));
    }

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

-  public abstract Path driverDir();
+  abstract Path driverDir();

  protected static void logMessage(String message) {
    // This matches log format produced by the server.
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package com.microsoft.playwright.impl.driver;
+package com.microsoft.playwright.impl;

 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -6,17 +6,16 @@

  <groupId>org.example</groupId>
  <artifactId>examples</artifactId>
-  <version>1.58.0</version>
+  <version>1.23.0</version>
  <name>Playwright Client Examples</name>
  <properties>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <playwright.version>1.58.0</playwright.version>
  </properties>
  <dependencies>
    <dependency>
      <groupId>com.microsoft.playwright</groupId>
      <artifactId>playwright</artifactId>
-      <version>${playwright.version}</version>
+      <version>1.23.0</version>
    </dependency>
  </dependencies>
  <build>
@@ -24,7 +23,7 @@
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.12.1</version>
+        <version>3.1</version>
        <configuration>
          <source>1.8</source>
          <target>1.8</target>
@@ -34,7 +34,7 @@ public class PageScreenshot {
        try (Browser browser = browserType.launch()) {
          BrowserContext context = browser.newContext();
          Page page = context.newPage();
-          page.navigate("https://playwright.dev/");
+          page.navigate("http://whatsmyuseragent.org/");
          page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("screenshot-" + browserType.name() + ".png")));
        }
      }
@@ -24,7 +24,7 @@ public class WebKitScreenshot {
    try (Playwright playwright = Playwright.create()) {
      Browser browser = playwright.webkit().launch();
      Page page = browser.newPage();
-      page.navigate("https://playwright.dev/");
+      page.navigate("http://whatsmyuseragent.org/");
      page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("example.png")));
    }
  }
@@ -7,7 +7,7 @@
  <parent>
    <groupId>com.microsoft.playwright</groupId>
    <artifactId>parent-pom</artifactId>
-    <version>1.58.0</version>
+    <version>1.23.0</version>
  </parent>

  <artifactId>playwright</artifactId>
@@ -21,14 +21,26 @@

  <build>
    <plugins>
+      <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 combine.self="append">
+        <configuration>
          <subpackages>com.microsoft.playwright</subpackages>
          <excludePackageNames>com.microsoft.playwright.impl</excludePackageNames>
        </configuration>
      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-jar-plugin</artifactId>
@@ -57,23 +69,10 @@
      <groupId>org.java-websocket</groupId>
      <artifactId>Java-WebSocket</artifactId>
    </dependency>
-    <!-- 
-      The following slf4j-simple dependency resolves the warning:
-      'SLF4J(W): No SLF4J providers were found.'
-      This warning is produced by the org.java-websocket library.
-    -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-    </dependency>
    <dependency>
      <groupId>org.junit.jupiter</groupId>
      <artifactId>junit-jupiter-engine</artifactId>
    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-params</artifactId>
-    </dependency>
    <dependency>
      <groupId>org.opentest4j</groupId>
      <artifactId>opentest4j</artifactId>
@@ -21,89 +21,57 @@ 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
- * com.microsoft.playwright.Playwright#request Playwright.request()}. For more information see {@code APIRequestContext}.
+ * 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 com.microsoft.playwright.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:
+     * 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} 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;
    /**
-     * TLS Client Authentication allows the server to request a client certificate and verify it.
-     *
-     * <p> <strong>Details</strong>
-     *
-     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
-     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
-     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
-     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
-     *
-     * <p> Client certificate authentication is only active when at least one client certificate is provided. If you want to reject
-     * all client certificates sent by the server, you need to provide a client certificate with an {@code origin} that does
-     * not match any of the domains you plan to visit.
-     *
-     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
-     * replacing {@code localhost} with {@code local.playwright}.
-     */
-    public List<ClientCertificate> clientCertificates;
-    /**
-     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+     * An object containing additional HTTP headers to be sent with every request.
     */
    public Map<String, String> extraHTTPHeaders;
    /**
-     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status codes.
-     */
-    public Boolean failOnStatusCode;
-    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
-     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     * 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;
-    /**
-     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
-     * exceeded. Defaults to {@code 20}. Pass {@code 0} to not follow redirects. This can be overwritten for each request
-     * individually.
-     */
-    public Integer maxRedirects;
    /**
     * 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 com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()} or {@link
-     * com.microsoft.playwright.APIRequestContext#storageState APIRequestContext.storageState()}. Either a path to the file
-     * with saved storage, or the value returned by one of {@link com.microsoft.playwright.BrowserContext#storageState
-     * BrowserContext.storageState()} or {@link com.microsoft.playwright.APIRequestContext#storageState
+     * 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 com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()}. Path to the
-     * file with saved storage state.
+     * 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.
+     * Maximum time in milliseconds to wait for the response. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout.
     */
    public Double timeout;
    /**
@@ -112,14 +80,13 @@ public interface APIRequest {
    public String userAgent;

    /**
-     * Methods like {@link com.microsoft.playwright.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:
+     * 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} 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>
@@ -129,50 +96,20 @@ public interface APIRequest {
      return this;
    }
    /**
-     * TLS Client Authentication allows the server to request a client certificate and verify it.
-     *
-     * <p> <strong>Details</strong>
-     *
-     * <p> An array of client certificates to be used. Each certificate object must have either both {@code certPath} and {@code
-     * keyPath}, a single {@code pfxPath}, or their corresponding direct value equivalents ({@code cert} and {@code key}, or
-     * {@code pfx}). Optionally, {@code passphrase} property should be provided if the certificate is encrypted. The {@code
-     * origin} property should be provided with an exact match to the request origin that the certificate is valid for.
-     *
-     * <p> Client certificate authentication is only active when at least one client certificate is provided. If you want to reject
-     * all client certificates sent by the server, you need to provide a client certificate with an {@code origin} that does
-     * not match any of the domains you plan to visit.
-     *
-     * <p> <strong>NOTE:</strong> When using WebKit on macOS, accessing {@code localhost} will not pick up client certificates. You can make it work by
-     * replacing {@code localhost} with {@code local.playwright}.
-     */
-    public NewContextOptions setClientCertificates(List<ClientCertificate> clientCertificates) {
-      this.clientCertificates = clientCertificates;
-      return this;
-    }
-    /**
-     * An object containing additional HTTP headers to be sent with every request. Defaults to none.
+     * An object containing additional HTTP headers to be sent with every request.
     */
    public NewContextOptions setExtraHTTPHeaders(Map<String, String> extraHTTPHeaders) {
      this.extraHTTPHeaders = extraHTTPHeaders;
      return this;
    }
    /**
-     * Whether to throw on response codes other than 2xx and 3xx. By default response object is returned for all status codes.
-     */
-    public NewContextOptions setFailOnStatusCode(boolean failOnStatusCode) {
-      this.failOnStatusCode = failOnStatusCode;
-      return this;
-    }
-    /**
-     * Credentials for <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Authentication">HTTP authentication</a>. If
-     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     * 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>. If
-     * no origin is specified, the username and password are sent to any servers upon unauthorized responses.
+     * 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;
@@ -185,15 +122,6 @@ public interface APIRequest {
      this.ignoreHTTPSErrors = ignoreHTTPSErrors;
      return this;
    }
-    /**
-     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
-     * exceeded. Defaults to {@code 20}. Pass {@code 0} to not follow redirects. This can be overwritten for each request
-     * individually.
-     */
-    public NewContextOptions setMaxRedirects(int maxRedirects) {
-      this.maxRedirects = maxRedirects;
-      return this;
-    }
    /**
     * Network proxy settings.
     */
@@ -209,10 +137,9 @@ public interface APIRequest {
    }
    /**
     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()} or {@link
-     * com.microsoft.playwright.APIRequestContext#storageState APIRequestContext.storageState()}. Either a path to the file
-     * with saved storage, or the value returned by one of {@link com.microsoft.playwright.BrowserContext#storageState
-     * BrowserContext.storageState()} or {@link com.microsoft.playwright.APIRequestContext#storageState
+     * 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) {
@@ -221,16 +148,15 @@ public interface APIRequest {
    }
    /**
     * Populates context with given storage state. This option can be used to initialize context with logged-in information
-     * obtained via {@link com.microsoft.playwright.BrowserContext#storageState BrowserContext.storageState()}. Path to the
-     * file with saved storage state.
+     * 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.
+     * 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;
@@ -246,16 +172,12 @@ public interface APIRequest {
  }
  /**
   * Creates new instances of {@code APIRequestContext}.
-   *
-   * @since v1.16
   */
  default APIRequestContext newContext() {
    return newContext(null);
  }
  /**
   * Creates new instances of {@code APIRequestContext}.
-   *
-   * @since v1.16
   */
  APIRequestContext newContext(NewContextOptions options);
 }
@@ -23,58 +23,31 @@ 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 com.microsoft.playwright.BrowserContext#request
- * BrowserContext.request()} or {@link com.microsoft.playwright.Page#request Page.request()}. It is also possible to create
- * a new APIRequestContext instance manually by calling {@link com.microsoft.playwright.APIRequest#newContext
- * APIRequest.newContext()}.
+ * <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> <strong>Cookie management</strong>
+ * <p> **Cookie management**
 *
- * <p> {@code APIRequestContext} returned by {@link com.microsoft.playwright.BrowserContext#request BrowserContext.request()}
- * and {@link com.microsoft.playwright.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> {@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 should create a new {@code APIRequestContext} by
- * calling {@link com.microsoft.playwright.APIRequest#newContext APIRequest.newContext()}. Such {@code APIRequestContext}
- * object will have its own isolated cookie storage.
+ * <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 DisposeOptions {
-    /**
-     * The reason to be reported to the operations interrupted by the context disposal.
-     */
-    public String reason;
-
-    /**
-     * The reason to be reported to the operations interrupted by the context disposal.
-     */
-    public DisposeOptions setReason(String reason) {
-      this.reason = reason;
-      return this;
-    }
-  }
  class StorageStateOptions {
-    /**
-     * Set to {@code true} to include IndexedDB in the storage state snapshot.
-     */
-    public Boolean indexedDB;
    /**
     * 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;

-    /**
-     * Set to {@code true} to include IndexedDB in the storage state snapshot.
-     */
-    public StorageStateOptions setIndexedDB(boolean indexedDB) {
-      this.indexedDB = indexedDB;
-      return this;
-    }
    /**
     * 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.
@@ -90,7 +63,6 @@ public interface APIRequestContext {
   * The method will automatically follow redirects.
   *
   * @param url Target URL.
-   * @since v1.16
   */
  default APIResponse delete(String url) {
    return delete(url, null);
@@ -102,62 +74,19 @@ public interface APIRequestContext {
   *
   * @param url Target URL.
   * @param params Optional request parameters.
-   * @since v1.16
   */
  APIResponse delete(String url, RequestOptions params);
  /**
-   * All responses returned by {@link com.microsoft.playwright.APIRequestContext#get APIRequestContext.get()} and similar
-   * methods are stored in the memory, so that you can later call {@link com.microsoft.playwright.APIResponse#body
-   * APIResponse.body()}.This method discards all its resources, calling any method on disposed {@code APIRequestContext}
-   * will throw an exception.
-   *
-   * @since v1.16
+   * 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.
   */
-  default void dispose() {
-    dispose(null);
-  }
-  /**
-   * All responses returned by {@link com.microsoft.playwright.APIRequestContext#get APIRequestContext.get()} and similar
-   * methods are stored in the memory, so that you can later call {@link com.microsoft.playwright.APIResponse#body
-   * APIResponse.body()}.This method discards all its resources, calling any method on disposed {@code APIRequestContext}
-   * will throw an exception.
-   *
-   * @since v1.16
-   */
-  void dispose(DisposeOptions options);
+  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.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> JSON objects can be passed directly to the request:
-   * <pre>{@code
-   * Map<String, Object> data = new HashMap();
-   * data.put("title", "Book Title");
-   * data.put("body", "John Doe");
-   * request.fetch("https://example.com/api/createBook", RequestOptions.create().setMethod("post").setData(data));
-   * }</pre>
-   *
-   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
-   * multipart/form-data} encoding, by specifiying the {@code multipart} parameter:
-   * <pre>{@code
-   * // Pass file path to the form data constructor:
-   * Path file = Paths.get("team.csv");
-   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMethod("post").setMultipart(
-   *     FormData.create().set("fileField", file)));
-   *
-   * // Or you can pass the file content directly as FilePayload object:
-   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
-   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.fetch("https://example.com/api/uploadScript",
-   *   RequestOptions.create().setMethod("post").setMultipart(
-   *     FormData.create().set("fileField", filePayload)));
-   * }</pre>
-   *
   * @param urlOrRequest Target URL or Request to get all parameters from.
-   * @since v1.16
   */
  default APIResponse fetch(String urlOrRequest) {
    return fetch(urlOrRequest, null);
@@ -166,71 +95,15 @@ public interface APIRequestContext {
   * 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.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> JSON objects can be passed directly to the request:
-   * <pre>{@code
-   * Map<String, Object> data = new HashMap();
-   * data.put("title", "Book Title");
-   * data.put("body", "John Doe");
-   * request.fetch("https://example.com/api/createBook", RequestOptions.create().setMethod("post").setData(data));
-   * }</pre>
-   *
-   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
-   * multipart/form-data} encoding, by specifiying the {@code multipart} parameter:
-   * <pre>{@code
-   * // Pass file path to the form data constructor:
-   * Path file = Paths.get("team.csv");
-   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMethod("post").setMultipart(
-   *     FormData.create().set("fileField", file)));
-   *
-   * // Or you can pass the file content directly as FilePayload object:
-   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
-   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.fetch("https://example.com/api/uploadScript",
-   *   RequestOptions.create().setMethod("post").setMultipart(
-   *     FormData.create().set("fileField", filePayload)));
-   * }</pre>
-   *
   * @param urlOrRequest Target URL or Request to get all parameters from.
   * @param params Optional request parameters.
-   * @since v1.16
   */
  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.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> JSON objects can be passed directly to the request:
-   * <pre>{@code
-   * Map<String, Object> data = new HashMap();
-   * data.put("title", "Book Title");
-   * data.put("body", "John Doe");
-   * request.fetch("https://example.com/api/createBook", RequestOptions.create().setMethod("post").setData(data));
-   * }</pre>
-   *
-   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
-   * multipart/form-data} encoding, by specifiying the {@code multipart} parameter:
-   * <pre>{@code
-   * // Pass file path to the form data constructor:
-   * Path file = Paths.get("team.csv");
-   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMethod("post").setMultipart(
-   *     FormData.create().set("fileField", file)));
-   *
-   * // Or you can pass the file content directly as FilePayload object:
-   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
-   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.fetch("https://example.com/api/uploadScript",
-   *   RequestOptions.create().setMethod("post").setMultipart(
-   *     FormData.create().set("fileField", filePayload)));
-   * }</pre>
-   *
   * @param urlOrRequest Target URL or Request to get all parameters from.
-   * @since v1.16
   */
  default APIResponse fetch(Request urlOrRequest) {
    return fetch(urlOrRequest, null);
@@ -239,36 +112,8 @@ public interface APIRequestContext {
   * 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.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> JSON objects can be passed directly to the request:
-   * <pre>{@code
-   * Map<String, Object> data = new HashMap();
-   * data.put("title", "Book Title");
-   * data.put("body", "John Doe");
-   * request.fetch("https://example.com/api/createBook", RequestOptions.create().setMethod("post").setData(data));
-   * }</pre>
-   *
-   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
-   * multipart/form-data} encoding, by specifiying the {@code multipart} parameter:
-   * <pre>{@code
-   * // Pass file path to the form data constructor:
-   * Path file = Paths.get("team.csv");
-   * APIResponse response = request.fetch("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMethod("post").setMultipart(
-   *     FormData.create().set("fileField", file)));
-   *
-   * // Or you can pass the file content directly as FilePayload object:
-   * FilePayload filePayload = new FilePayload("f.js", "text/javascript",
-   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.fetch("https://example.com/api/uploadScript",
-   *   RequestOptions.create().setMethod("post").setMultipart(
-   *     FormData.create().set("fileField", filePayload)));
-   * }</pre>
-   *
   * @param urlOrRequest Target URL or Request to get all parameters from.
   * @param params Optional request parameters.
-   * @since v1.16
   */
  APIResponse fetch(Request urlOrRequest, RequestOptions params);
  /**
@@ -276,17 +121,7 @@ public interface APIRequestContext {
   * response. The method will populate request cookies from the context and update context cookies from the response. The
   * method will automatically follow redirects.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> Request parameters can be configured with {@code params} option, they will be serialized into the URL search parameters:
-   * <pre>{@code
-   * request.get("https://example.com/api/getText", RequestOptions.create()
-   *   .setQueryParam("isbn", "1234")
-   *   .setQueryParam("page", 23));
-   * }</pre>
-   *
   * @param url Target URL.
-   * @since v1.16
   */
  default APIResponse get(String url) {
    return get(url, null);
@@ -296,18 +131,8 @@ public interface APIRequestContext {
   * response. The method will populate request cookies from the context and update context cookies from the response. The
   * method will automatically follow redirects.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> Request parameters can be configured with {@code params} option, they will be serialized into the URL search parameters:
-   * <pre>{@code
-   * request.get("https://example.com/api/getText", RequestOptions.create()
-   *   .setQueryParam("isbn", "1234")
-   *   .setQueryParam("page", 23));
-   * }</pre>
-   *
   * @param url Target URL.
   * @param params Optional request parameters.
-   * @since v1.16
   */
  APIResponse get(String url, RequestOptions params);
  /**
@@ -316,7 +141,6 @@ public interface APIRequestContext {
   * method will automatically follow redirects.
   *
   * @param url Target URL.
-   * @since v1.16
   */
  default APIResponse head(String url) {
    return head(url, null);
@@ -328,7 +152,6 @@ public interface APIRequestContext {
   *
   * @param url Target URL.
   * @param params Optional request parameters.
-   * @since v1.16
   */
  APIResponse head(String url, RequestOptions params);
  /**
@@ -337,7 +160,6 @@ public interface APIRequestContext {
   * The method will automatically follow redirects.
   *
   * @param url Target URL.
-   * @since v1.16
   */
  default APIResponse patch(String url) {
    return patch(url, null);
@@ -349,7 +171,6 @@ public interface APIRequestContext {
   *
   * @param url Target URL.
   * @param params Optional request parameters.
-   * @since v1.16
   */
  APIResponse patch(String url, RequestOptions params);
  /**
@@ -357,45 +178,7 @@ public interface APIRequestContext {
   * response. The method will populate request cookies from the context and update context cookies from the response. The
   * method will automatically follow redirects.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> JSON objects can be passed directly to the request:
-   * <pre>{@code
-   * Map<String, Object> data = new HashMap();
-   * data.put("title", "Book Title");
-   * data.put("body", "John Doe");
-   * request.post("https://example.com/api/createBook", RequestOptions.create().setData(data));
-   * }</pre>
-   *
-   * <p> To send form data to the server use {@code form} option. Its value will be encoded into the request body with {@code
-   * application/x-www-form-urlencoded} encoding (see below how to use {@code multipart/form-data} form encoding to send
-   * files):
-   * <pre>{@code
-   * request.post("https://example.com/api/findBook", RequestOptions.create().setForm(
-   *     FormData.create().set("title", "Book Title").set("body", "John Doe")
-   * ));
-   * }</pre>
-   *
-   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
-   * multipart/form-data} encoding. Use {@code FormData} to construct request body and pass it to the request as {@code
-   * multipart} parameter:
-   * <pre>{@code
-   * // Pass file path to the form data constructor:
-   * Path file = Paths.get("team.csv");
-   * APIResponse response = request.post("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMultipart(
-   *     FormData.create().set("fileField", file)));
-   *
-   * // Or you can pass the file content directly as FilePayload object:
-   * FilePayload filePayload1 = new FilePayload("f1.js", "text/javascript",
-   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.post("https://example.com/api/uploadScript",
-   *   RequestOptions.create().setMultipart(
-   *     FormData.create().set("fileField", filePayload)));
-   * }</pre>
-   *
   * @param url Target URL.
-   * @since v1.16
   */
  default APIResponse post(String url) {
    return post(url, null);
@@ -405,46 +188,8 @@ public interface APIRequestContext {
   * response. The method will populate request cookies from the context and update context cookies from the response. The
   * method will automatically follow redirects.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> JSON objects can be passed directly to the request:
-   * <pre>{@code
-   * Map<String, Object> data = new HashMap();
-   * data.put("title", "Book Title");
-   * data.put("body", "John Doe");
-   * request.post("https://example.com/api/createBook", RequestOptions.create().setData(data));
-   * }</pre>
-   *
-   * <p> To send form data to the server use {@code form} option. Its value will be encoded into the request body with {@code
-   * application/x-www-form-urlencoded} encoding (see below how to use {@code multipart/form-data} form encoding to send
-   * files):
-   * <pre>{@code
-   * request.post("https://example.com/api/findBook", RequestOptions.create().setForm(
-   *     FormData.create().set("title", "Book Title").set("body", "John Doe")
-   * ));
-   * }</pre>
-   *
-   * <p> The common way to send file(s) in the body of a request is to upload them as form fields with {@code
-   * multipart/form-data} encoding. Use {@code FormData} to construct request body and pass it to the request as {@code
-   * multipart} parameter:
-   * <pre>{@code
-   * // Pass file path to the form data constructor:
-   * Path file = Paths.get("team.csv");
-   * APIResponse response = request.post("https://example.com/api/uploadTeamList",
-   *   RequestOptions.create().setMultipart(
-   *     FormData.create().set("fileField", file)));
-   *
-   * // Or you can pass the file content directly as FilePayload object:
-   * FilePayload filePayload1 = new FilePayload("f1.js", "text/javascript",
-   *       "console.log(2022);".getBytes(StandardCharsets.UTF_8));
-   * APIResponse response = request.post("https://example.com/api/uploadScript",
-   *   RequestOptions.create().setMultipart(
-   *     FormData.create().set("fileField", filePayload)));
-   * }</pre>
-   *
   * @param url Target URL.
   * @param params Optional request parameters.
-   * @since v1.16
   */
  APIResponse post(String url, RequestOptions params);
  /**
@@ -453,7 +198,6 @@ public interface APIRequestContext {
   * method will automatically follow redirects.
   *
   * @param url Target URL.
-   * @since v1.16
   */
  default APIResponse put(String url) {
    return put(url, null);
@@ -465,14 +209,11 @@ public interface APIRequestContext {
   *
   * @param url Target URL.
   * @param params Optional request parameters.
-   * @since v1.16
   */
  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.
-   *
-   * @since v1.16
   */
  default String storageState() {
    return storageState(null);
@@ -480,8 +221,6 @@ public interface APIRequestContext {
  /**
   * Returns storage state for this request context, contains current cookies and local storage snapshot if it was passed to
   * the constructor.
-   *
-   * @since v1.16
   */
  String storageState(StorageStateOptions options);
 }
@@ -20,63 +20,45 @@ import com.microsoft.playwright.options.*;
 import java.util.*;

 /**
- * {@code APIResponse} class represents responses returned by {@link com.microsoft.playwright.APIRequestContext#get
- * APIRequestContext.get()} and similar methods.
+ * {@code APIResponse} class represents responses returned by {@link APIRequestContext#get APIRequestContext.get()} and similar
+ * methods.
 */
 public interface APIResponse {
  /**
   * Returns the buffer with response body.
-   *
-   * @since v1.16
   */
  byte[] body();
  /**
   * Disposes the body of this response. If not called then the body will stay in memory until the context closes.
-   *
-   * @since v1.16
   */
  void dispose();
  /**
   * An object with all the response HTTP headers associated with this response.
-   *
-   * @since v1.16
   */
  Map<String, String> headers();
  /**
-   * An array with all the response 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.
-   *
-   * @since v1.16
+   * 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.
-   *
-   * @since v1.16
   */
  boolean ok();
  /**
   * Contains the status code of the response (e.g., 200 for a success).
-   *
-   * @since v1.16
   */
  int status();
  /**
   * Contains the status text of the response (e.g. usually an "OK" for a success).
-   *
-   * @since v1.16
   */
  String statusText();
  /**
   * Returns the text representation of response body.
-   *
-   * @since v1.16
   */
  String text();
  /**
   * Contains the URL of the response.
-   *
-   * @since v1.16
   */
  String url();
 }
@@ -1,94 +0,0 @@
-/*
- * 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 java.util.function.Consumer;
-import com.google.gson.JsonObject;
-
-/**
- * The {@code CDPSession} instances are used to talk raw Chrome Devtools Protocol:
- * <ul>
- * <li> protocol methods can be called with {@code session.send} method.</li>
- * <li> protocol events can be subscribed to with {@code session.on} method.</li>
- * </ul>
- *
- * <p> Useful links:
- * <ul>
- * <li> Documentation on DevTools Protocol can be found here: <a
- * href="https://chromedevtools.github.io/devtools-protocol/">DevTools Protocol Viewer</a>.</li>
- * <li> Getting Started with DevTools Protocol: https://github.com/aslushnikov/getting-started-with-cdp/blob/master/README.md</li>
- * </ul>
- * <pre>{@code
- * CDPSession client = page.context().newCDPSession(page);
- * client.send("Runtime.enable");
- *
- * client.on("Animation.animationCreated", (event) -> System.out.println("Animation created!"));
- *
- * JsonObject response = client.send("Animation.getPlaybackRate");
- * double playbackRate = response.get("playbackRate").getAsDouble();
- * System.out.println("playback rate is " + playbackRate);
- *
- * JsonObject params = new JsonObject();
- * params.addProperty("playbackRate", playbackRate / 2);
- * client.send("Animation.setPlaybackRate", params);
- * }</pre>
- */
-public interface CDPSession {
-  /**
-   * Detaches the CDPSession from the target. Once detached, the CDPSession object won't emit any events and can't be used to
-   * send messages.
-   *
-   * @since v1.8
-   */
-  void detach();
-  /**
-   *
-   *
-   * @param method Protocol method name.
-   * @since v1.8
-   */
-  default JsonObject send(String method) {
-    return send(method, null);
-  }
-  /**
-   *
-   *
-   * @param method Protocol method name.
-   * @param args Optional method parameters.
-   * @since v1.8
-   */
-  JsonObject send(String method, JsonObject args);
-  /**
-   * Register an event handler for events with the specified event name. The given handler will be called for every event
-   * with the given name.
-   *
-   * @param eventName CDP event name.
-   * @param handler Event handler.
-   * @since v1.37
-   */
-  void on(String eventName, Consumer<JsonObject> handler);
-  /**
-   * Unregister an event handler for events with the specified event name. The given handler will not be called anymore for
-   * events with the given name.
-   *
-   * @param eventName CDP event name.
-   * @param handler Event handler.
-   * @since v1.37
-   */
-  void off(String eventName, Consumer<JsonObject> handler);
-}
-
@@ -16,7 +16,7 @@

 package com.microsoft.playwright;

-import com.microsoft.playwright.impl.driver.Driver;
+import com.microsoft.playwright.impl.Driver;

 import java.io.IOException;
 import java.nio.file.Path;
@@ -29,9 +29,10 @@ import static java.util.Arrays.asList;
 */
 public class CLI {
  public static void main(String[] args) throws IOException, InterruptedException {
-    Driver driver = Driver.ensureDriverInstalled(Collections.emptyMap(), false);
-    ProcessBuilder pb = driver.createProcessBuilder();
+    Path driver = Driver.ensureDriverInstalled(Collections.emptyMap(), false);
+    ProcessBuilder pb = new ProcessBuilder(driver.toString());
    pb.command().addAll(asList(args));
+    Driver.setRequiredEnvironmentVariables(pb);
    String version = Playwright.class.getPackage().getImplementationVersion();
    if (version != null) {
      pb.environment().put("PW_CLI_DISPLAY_VERSION", version);
@@ -1,366 +0,0 @@
-/*
- * 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 java.util.Date;
-
-/**
- * Accurately simulating time-dependent behavior is essential for verifying the correctness of applications. Learn more
- * about <a href="https://playwright.dev/java/docs/clock">clock emulation</a>.
- *
- * <p> Note that clock is installed for the entire {@code BrowserContext}, so the time in all the pages and iframes is
- * controlled by the same clock.
- */
-public interface Clock {
-  class InstallOptions {
-    /**
-     * Time to initialize with, current system time by default.
-     */
-    public Object time;
-
-    /**
-     * Time to initialize with, current system time by default.
-     */
-    public InstallOptions setTime(long time) {
-      this.time = time;
-      return this;
-    }
-    /**
-     * Time to initialize with, current system time by default.
-     */
-    public InstallOptions setTime(String time) {
-      this.time = time;
-      return this;
-    }
-    /**
-     * Time to initialize with, current system time by default.
-     */
-    public InstallOptions setTime(Date time) {
-      this.time = time;
-      return this;
-    }
-  }
-  /**
-   * Advance the clock by jumping forward in time. Only fires due timers at most once. This is equivalent to user closing the
-   * laptop lid for a while and reopening it later, after given time.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().fastForward(1000);
-   * page.clock().fastForward("30:00");
-   * }</pre>
-   *
-   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are "08"
-   * for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
-   * @since v1.45
-   */
-  void fastForward(long ticks);
-  /**
-   * Advance the clock by jumping forward in time. Only fires due timers at most once. This is equivalent to user closing the
-   * laptop lid for a while and reopening it later, after given time.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().fastForward(1000);
-   * page.clock().fastForward("30:00");
-   * }</pre>
-   *
-   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are "08"
-   * for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
-   * @since v1.45
-   */
-  void fastForward(String ticks);
-  /**
-   * Install fake implementations for the following time-related functions:
-   * <ul>
-   * <li> {@code Date}</li>
-   * <li> {@code setTimeout}</li>
-   * <li> {@code clearTimeout}</li>
-   * <li> {@code setInterval}</li>
-   * <li> {@code clearInterval}</li>
-   * <li> {@code requestAnimationFrame}</li>
-   * <li> {@code cancelAnimationFrame}</li>
-   * <li> {@code requestIdleCallback}</li>
-   * <li> {@code cancelIdleCallback}</li>
-   * <li> {@code performance}</li>
-   * </ul>
-   *
-   * <p> Fake timers are used to manually control the flow of time in tests. They allow you to advance time, fire timers, and
-   * control the behavior of time-dependent functions. See {@link com.microsoft.playwright.Clock#runFor Clock.runFor()} and
-   * {@link com.microsoft.playwright.Clock#fastForward Clock.fastForward()} for more information.
-   *
-   * @since v1.45
-   */
-  default void install() {
-    install(null);
-  }
-  /**
-   * Install fake implementations for the following time-related functions:
-   * <ul>
-   * <li> {@code Date}</li>
-   * <li> {@code setTimeout}</li>
-   * <li> {@code clearTimeout}</li>
-   * <li> {@code setInterval}</li>
-   * <li> {@code clearInterval}</li>
-   * <li> {@code requestAnimationFrame}</li>
-   * <li> {@code cancelAnimationFrame}</li>
-   * <li> {@code requestIdleCallback}</li>
-   * <li> {@code cancelIdleCallback}</li>
-   * <li> {@code performance}</li>
-   * </ul>
-   *
-   * <p> Fake timers are used to manually control the flow of time in tests. They allow you to advance time, fire timers, and
-   * control the behavior of time-dependent functions. See {@link com.microsoft.playwright.Clock#runFor Clock.runFor()} and
-   * {@link com.microsoft.playwright.Clock#fastForward Clock.fastForward()} for more information.
-   *
-   * @since v1.45
-   */
-  void install(InstallOptions options);
-  /**
-   * Advance the clock, firing all the time-related callbacks.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().runFor(1000);
-   * page.clock().runFor("30:00");
-   * }</pre>
-   *
-   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are "08"
-   * for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
-   * @since v1.45
-   */
-  void runFor(long ticks);
-  /**
-   * Advance the clock, firing all the time-related callbacks.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().runFor(1000);
-   * page.clock().runFor("30:00");
-   * }</pre>
-   *
-   * @param ticks Time may be the number of milliseconds to advance the clock by or a human-readable string. Valid string formats are "08"
-   * for eight seconds, "01:00" for one minute and "02:34:10" for two hours, 34 minutes and ten seconds.
-   * @since v1.45
-   */
-  void runFor(String ticks);
-  /**
-   * Advance the clock by jumping forward in time and pause the time. Once this method is called, no timers are fired unless
-   * {@link com.microsoft.playwright.Clock#runFor Clock.runFor()}, {@link com.microsoft.playwright.Clock#fastForward
-   * Clock.fastForward()}, {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} or {@link
-   * com.microsoft.playwright.Clock#resume Clock.resume()} is called.
-   *
-   * <p> Only fires due timers at most once. This is equivalent to user closing the laptop lid for a while and reopening it at
-   * the specified time and pausing.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd");
-   * page.clock().pauseAt(format.parse("2020-02-02"));
-   * page.clock().pauseAt("2020-02-02");
-   * }</pre>
-   *
-   * <p> For best results, install the clock before navigating the page and set it to a time slightly before the intended test
-   * time. This ensures that all timers run normally during page loading, preventing the page from getting stuck. Once the
-   * page has fully loaded, you can safely use {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} to pause the
-   * clock.
-   * <pre>{@code
-   * // Initialize clock with some time before the test time and let the page load
-   * // naturally. `Date.now` will progress as the timers fire.
-   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd'T'HH:mm:ss");
-   * page.clock().install(new Clock.InstallOptions().setTime(format.parse("2024-12-10T08:00:00")));
-   * page.navigate("http://localhost:3333");
-   * page.clock().pauseAt(format.parse("2024-12-10T10:00:00"));
-   * }</pre>
-   *
-   * @param time Time to pause at.
-   * @since v1.45
-   */
-  void pauseAt(long time);
-  /**
-   * Advance the clock by jumping forward in time and pause the time. Once this method is called, no timers are fired unless
-   * {@link com.microsoft.playwright.Clock#runFor Clock.runFor()}, {@link com.microsoft.playwright.Clock#fastForward
-   * Clock.fastForward()}, {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} or {@link
-   * com.microsoft.playwright.Clock#resume Clock.resume()} is called.
-   *
-   * <p> Only fires due timers at most once. This is equivalent to user closing the laptop lid for a while and reopening it at
-   * the specified time and pausing.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd");
-   * page.clock().pauseAt(format.parse("2020-02-02"));
-   * page.clock().pauseAt("2020-02-02");
-   * }</pre>
-   *
-   * <p> For best results, install the clock before navigating the page and set it to a time slightly before the intended test
-   * time. This ensures that all timers run normally during page loading, preventing the page from getting stuck. Once the
-   * page has fully loaded, you can safely use {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} to pause the
-   * clock.
-   * <pre>{@code
-   * // Initialize clock with some time before the test time and let the page load
-   * // naturally. `Date.now` will progress as the timers fire.
-   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd'T'HH:mm:ss");
-   * page.clock().install(new Clock.InstallOptions().setTime(format.parse("2024-12-10T08:00:00")));
-   * page.navigate("http://localhost:3333");
-   * page.clock().pauseAt(format.parse("2024-12-10T10:00:00"));
-   * }</pre>
-   *
-   * @param time Time to pause at.
-   * @since v1.45
-   */
-  void pauseAt(String time);
-  /**
-   * Advance the clock by jumping forward in time and pause the time. Once this method is called, no timers are fired unless
-   * {@link com.microsoft.playwright.Clock#runFor Clock.runFor()}, {@link com.microsoft.playwright.Clock#fastForward
-   * Clock.fastForward()}, {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} or {@link
-   * com.microsoft.playwright.Clock#resume Clock.resume()} is called.
-   *
-   * <p> Only fires due timers at most once. This is equivalent to user closing the laptop lid for a while and reopening it at
-   * the specified time and pausing.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd");
-   * page.clock().pauseAt(format.parse("2020-02-02"));
-   * page.clock().pauseAt("2020-02-02");
-   * }</pre>
-   *
-   * <p> For best results, install the clock before navigating the page and set it to a time slightly before the intended test
-   * time. This ensures that all timers run normally during page loading, preventing the page from getting stuck. Once the
-   * page has fully loaded, you can safely use {@link com.microsoft.playwright.Clock#pauseAt Clock.pauseAt()} to pause the
-   * clock.
-   * <pre>{@code
-   * // Initialize clock with some time before the test time and let the page load
-   * // naturally. `Date.now` will progress as the timers fire.
-   * SimpleDateFormat format = new SimpleDateFormat("yyy-MM-dd'T'HH:mm:ss");
-   * page.clock().install(new Clock.InstallOptions().setTime(format.parse("2024-12-10T08:00:00")));
-   * page.navigate("http://localhost:3333");
-   * page.clock().pauseAt(format.parse("2024-12-10T10:00:00"));
-   * }</pre>
-   *
-   * @param time Time to pause at.
-   * @since v1.45
-   */
-  void pauseAt(Date time);
-  /**
-   * Resumes timers. Once this method is called, time resumes flowing, timers are fired as usual.
-   *
-   * @since v1.45
-   */
-  void resume();
-  /**
-   * Makes {@code Date.now} and {@code new Date()} return fixed fake time at all times, keeps all the timers running.
-   *
-   * <p> Use this method for simple scenarios where you only need to test with a predefined time. For more advanced scenarios,
-   * use {@link com.microsoft.playwright.Clock#install Clock.install()} instead. Read docs on <a
-   * href="https://playwright.dev/java/docs/clock">clock emulation</a> to learn more.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setFixedTime(new Date());
-   * page.clock().setFixedTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setFixedTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setFixedTime(long time);
-  /**
-   * Makes {@code Date.now} and {@code new Date()} return fixed fake time at all times, keeps all the timers running.
-   *
-   * <p> Use this method for simple scenarios where you only need to test with a predefined time. For more advanced scenarios,
-   * use {@link com.microsoft.playwright.Clock#install Clock.install()} instead. Read docs on <a
-   * href="https://playwright.dev/java/docs/clock">clock emulation</a> to learn more.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setFixedTime(new Date());
-   * page.clock().setFixedTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setFixedTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setFixedTime(String time);
-  /**
-   * Makes {@code Date.now} and {@code new Date()} return fixed fake time at all times, keeps all the timers running.
-   *
-   * <p> Use this method for simple scenarios where you only need to test with a predefined time. For more advanced scenarios,
-   * use {@link com.microsoft.playwright.Clock#install Clock.install()} instead. Read docs on <a
-   * href="https://playwright.dev/java/docs/clock">clock emulation</a> to learn more.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setFixedTime(new Date());
-   * page.clock().setFixedTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setFixedTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setFixedTime(Date time);
-  /**
-   * Sets system time, but does not trigger any timers. Use this to test how the web page reacts to a time shift, for example
-   * switching from summer to winter time, or changing time zones.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setSystemTime(new Date());
-   * page.clock().setSystemTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setSystemTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setSystemTime(long time);
-  /**
-   * Sets system time, but does not trigger any timers. Use this to test how the web page reacts to a time shift, for example
-   * switching from summer to winter time, or changing time zones.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setSystemTime(new Date());
-   * page.clock().setSystemTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setSystemTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setSystemTime(String time);
-  /**
-   * Sets system time, but does not trigger any timers. Use this to test how the web page reacts to a time shift, for example
-   * switching from summer to winter time, or changing time zones.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.clock().setSystemTime(new Date());
-   * page.clock().setSystemTime(new SimpleDateFormat("yyy-MM-dd").parse("2020-02-02"));
-   * page.clock().setSystemTime("2020-02-02");
-   * }</pre>
-   *
-   * @param time Time to be set in milliseconds.
-   * @since v1.45
-   */
-  void setSystemTime(Date time);
-}
-
@@ -19,71 +19,47 @@ package com.microsoft.playwright;
 import java.util.*;

 /**
- * {@code ConsoleMessage} objects are dispatched by page via the {@link com.microsoft.playwright.Page#onConsoleMessage
- * Page.onConsoleMessage()} event. For each console message logged in the page there will be corresponding event in the
- * Playwright context.
+ * {@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 console messages and print them to the standard output.
+ * // Listen for all System.out.printlns
 * page.onConsoleMessage(msg -> System.out.println(msg.text()));
 *
- * // Listen for all console messages and print errors to the standard output.
+ * // 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 console message
+ * // 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
+ * msg.args().get(0).jsonValue() // hello
+ * msg.args().get(1).jsonValue() // 42
 * }</pre>
 */
 public interface ConsoleMessage {
  /**
-   * List of arguments passed to a {@code console} function call. See also {@link
-   * com.microsoft.playwright.Page#onConsoleMessage Page.onConsoleMessage()}.
-   *
-   * @since v1.8
+   * List of arguments passed to a {@code console} function call. See also {@link Page#onConsoleMessage Page.onConsoleMessage()}.
   */
  List<JSHandle> args();
  /**
   * URL of the resource followed by 0-based line and column numbers in the resource formatted as {@code URL:line:column}.
-   *
-   * @since v1.8
   */
  String location();
-  /**
-   * The page that produced this console message, if any.
-   *
-   * @since v1.34
-   */
-  Page page();
  /**
   * The text of the console message.
-   *
-   * @since v1.8
   */
  String text();
  /**
-   * One of the following values: {@code "log"}, {@code "debug"}, {@code "info"}, {@code "error"}, {@code "warning"}, {@code
-   * "dir"}, {@code "dirxml"}, {@code "table"}, {@code "trace"}, {@code "clear"}, {@code "startGroup"}, {@code
-   * "startGroupCollapsed"}, {@code "endGroup"}, {@code "assert"}, {@code "profile"}, {@code "profileEnd"}, {@code "count"},
-   * {@code "timeEnd"}.
-   *
-   * @since v1.8
+   * One of the following values: {@code "log"}, {@code "debug"}, {@code "info"}, {@code "error"}, {@code "warning"}, {@code "dir"}, {@code "dirxml"}, {@code "table"},
+   * {@code "trace"}, {@code "clear"}, {@code "startGroup"}, {@code "startGroupCollapsed"}, {@code "endGroup"}, {@code "assert"}, {@code "profile"}, {@code "profileEnd"},
+   * {@code "count"}, {@code "timeEnd"}.
   */
  String type();
-  /**
-   * The web worker or service worker that produced this console message, if any. Note that console messages from web workers
-   * also have non-null {@link com.microsoft.playwright.ConsoleMessage#page ConsoleMessage.page()}.
-   *
-   * @since v1.57
-   */
-  Worker worker();
 }

@@ -18,8 +18,7 @@ package com.microsoft.playwright;


 /**
- * {@code Dialog} objects are dispatched by page via the {@link com.microsoft.playwright.Page#onDialog Page.onDialog()}
- * event.
+ * {@code Dialog} objects are dispatched by page via the {@link Page#onDialog Page.onDialog()} event.
 *
 * <p> An example of using {@code Dialog} class:
 * <pre>{@code
@@ -42,17 +41,15 @@ package com.microsoft.playwright;
 * }
 * }</pre>
 *
- * <p> <strong>NOTE:</strong> Dialogs are dismissed automatically, unless there is a {@link com.microsoft.playwright.Page#onDialog Page.onDialog()}
- * listener. When listener is present, it **must** either {@link com.microsoft.playwright.Dialog#accept Dialog.accept()} or
- * {@link com.microsoft.playwright.Dialog#dismiss Dialog.dismiss()} the dialog - otherwise the page will <a
+ * <p> <strong>NOTE:</strong> Dialogs are dismissed automatically, unless there is a {@link Page#onDialog Page.onDialog()} listener. When listener is
+ * present, it **must** either {@link Dialog#accept Dialog.accept()} or {@link Dialog#dismiss Dialog.dismiss()} the dialog
+ * - otherwise the page will <a
 * href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/EventLoop#never_blocking">freeze</a> waiting for the
 * dialog, and actions like click will never finish.
 */
 public interface Dialog {
  /**
   * Returns when the dialog has been accepted.
-   *
-   * @since v1.8
   */
  default void accept() {
    accept(null);
@@ -61,37 +58,22 @@ public interface Dialog {
   * Returns when the dialog has been accepted.
   *
   * @param promptText A text to enter in prompt. Does not cause any effects if the dialog's {@code type} is not prompt. Optional.
-   * @since v1.8
   */
  void accept(String promptText);
  /**
   * If dialog is prompt, returns default prompt value. Otherwise, returns empty string.
-   *
-   * @since v1.8
   */
  String defaultValue();
  /**
   * Returns when the dialog has been dismissed.
-   *
-   * @since v1.8
   */
  void dismiss();
  /**
   * A message displayed in the dialog.
-   *
-   * @since v1.8
   */
  String message();
-  /**
-   * The page that initiated this dialog, if available.
-   *
-   * @since v1.34
-   */
-  Page page();
  /**
   * Returns dialog's type, can be one of {@code alert}, {@code beforeunload}, {@code confirm} or {@code prompt}.
-   *
-   * @since v1.8
   */
  String type();
 }
@@ -20,95 +20,73 @@ import java.io.InputStream;
 import java.nio.file.Path;

 /**
- * {@code Download} objects are dispatched by page via the {@link com.microsoft.playwright.Page#onDownload
- * Page.onDownload()} event.
+ * {@code Download} objects are dispatched by page via the {@link Page#onDownload Page.onDownload()} event.
 *
 * <p> All the downloaded files belonging to the browser context are deleted when the browser context is closed.
 *
- * <p> Download event is emitted once the download starts. Download path becomes available once download completes.
+ * <p> Download event is emitted once the download starts. Download path becomes available once download completes:
 * <pre>{@code
- * // Wait for the download to start
+ * // wait for download to start
+ * Download download  = page.waitForDownload(() -> page.click("a"));
+ * // wait for download to complete
+ * Path path = download.path();
+ * }</pre>
+ * <pre>{@code
+ * // wait for download to start
 * Download download = page.waitForDownload(() -> {
- *     // Perform the action that initiates download
- *     page.getByText("Download file").click();
+ *   page.click("a");
 * });
- *
- * // Wait for the download process to complete and save the downloaded file somewhere
- * download.saveAs(Paths.get("/path/to/save/at/", download.suggestedFilename()));
+ * // wait for download to complete
+ * Path path = download.path();
 * }</pre>
 */
 public interface Download {
  /**
-   * Cancels a download. Will not fail if the download is already finished or canceled. Upon successful cancellations, {@code
-   * download.failure()} would resolve to {@code "canceled"}.
-   *
-   * @since v1.13
+   * Cancels a download. Will not fail if the download is already finished or canceled. Upon successful cancellations,
+   * {@code download.failure()} would resolve to {@code "canceled"}.
   */
  void cancel();
  /**
-   * Returns a readable stream for a successful download, or throws for a failed/canceled download.
-   *
-   * <p> <strong>NOTE:</strong> If you don't need a readable stream, it's usually simpler to read the file from disk after the download completed. See
-   * {@link com.microsoft.playwright.Download#path Download.path()}.
-   *
-   * @since v1.8
+   * Returns readable stream for current download or {@code null} if download failed.
   */
  InputStream createReadStream();
  /**
   * Deletes the downloaded file. Will wait for the download to finish if necessary.
-   *
-   * @since v1.8
   */
  void delete();
  /**
   * Returns download error if any. Will wait for the download to finish if necessary.
-   *
-   * @since v1.8
   */
  String failure();
  /**
   * Get the page that the download belongs to.
-   *
-   * @since v1.12
   */
  Page page();
  /**
-   * Returns path to the downloaded file for a successful download, or throws for a failed/canceled download. The method will
-   * wait for the download to finish if necessary. The method throws when connected remotely.
+   * Returns path to the downloaded file in case of successful download. The method will wait for the download to finish if
+   * necessary. The method throws when connected remotely.
   *
-   * <p> Note that the download's file name is a random GUID, use {@link com.microsoft.playwright.Download#suggestedFilename
-   * Download.suggestedFilename()} to get suggested file name.
-   *
-   * @since v1.8
+   * <p> Note that the download's file name is a random GUID, use {@link Download#suggestedFilename Download.suggestedFilename()}
+   * to get suggested file name.
   */
  Path path();
  /**
   * Copy the download to a user-specified path. It is safe to call this method while the download is still in progress. Will
   * wait for the download to finish if necessary.
   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * download.saveAs(Paths.get("/path/to/save/at/", download.suggestedFilename()));
-   * }</pre>
-   *
   * @param path Path where the download should be copied.
-   * @since v1.8
   */
  void saveAs(Path path);
  /**
   * Returns suggested filename for this download. It is typically computed by the browser from the <a
-   * href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Disposition">{@code Content-Disposition}</a>
-   * response header or the {@code download} attribute. See the spec on <a
+   * href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Disposition">{@code Content-Disposition}</a> response
+   * header or the {@code download} attribute. See the spec on <a
   * href="https://html.spec.whatwg.org/#downloading-resources">whatwg</a>. Different browsers can use different logic for
   * computing it.
-   *
-   * @since v1.8
   */
  String suggestedFilename();
  /**
   * Returns downloaded url.
-   *
-   * @since v1.8
   */
  String url();
 }
@@ -20,39 +20,40 @@ import com.microsoft.playwright.options.*;
 import java.nio.file.Path;

 /**
- * {@code FileChooser} objects are dispatched by the page in the {@link com.microsoft.playwright.Page#onFileChooser
- * Page.onFileChooser()} event.
+ * {@code FileChooser} objects are dispatched by the page in the {@link Page#onFileChooser Page.onFileChooser()} event.
 * <pre>{@code
- * FileChooser fileChooser = page.waitForFileChooser(() -> page.getByText("Upload file").click());
+ * FileChooser fileChooser = page.waitForFileChooser(() -> page.click("upload"));
 * fileChooser.setFiles(Paths.get("myfile.pdf"));
 * }</pre>
 */
 public interface FileChooser {
  class SetFilesOptions {
    /**
-     * @deprecated This option has no effect.
+     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
+     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
+     * inaccessible pages. Defaults to {@code false}.
     */
    public Boolean noWaitAfter;
    /**
-     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
-     * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()} or {@link com.microsoft.playwright.Page#setDefaultTimeout Page.setDefaultTimeout()}
-     * methods.
+     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be changed by
+     * using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link Page#setDefaultTimeout
+     * Page.setDefaultTimeout()} methods.
     */
    public Double timeout;

    /**
-     * @deprecated This option has no effect.
+     * Actions that initiate navigations are waiting for these navigations to happen and for pages to start loading. You can
+     * opt out of waiting via setting this flag. You would only need this option in the exceptional cases such as navigating to
+     * inaccessible pages. Defaults to {@code false}.
     */
    public SetFilesOptions setNoWaitAfter(boolean noWaitAfter) {
      this.noWaitAfter = noWaitAfter;
      return this;
    }
    /**
-     * Maximum time in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
-     * value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()} or {@link com.microsoft.playwright.Page#setDefaultTimeout Page.setDefaultTimeout()}
-     * methods.
+     * Maximum time in milliseconds, defaults to 30 seconds, pass {@code 0} to disable timeout. The default value can be changed by
+     * using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()} or {@link Page#setDefaultTimeout
+     * Page.setDefaultTimeout()} methods.
     */
    public SetFilesOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -61,84 +62,62 @@ public interface FileChooser {
  }
  /**
   * Returns input element associated with this file chooser.
-   *
-   * @since v1.8
   */
  ElementHandle element();
  /**
   * Returns whether this file chooser accepts multiple files.
-   *
-   * @since v1.8
   */
  boolean isMultiple();
  /**
   * Returns page this file chooser belongs to.
-   *
-   * @since v1.8
   */
  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 current working directory. For empty array, clears the selected files.
-   *
-   * @since v1.8
+   * 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 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 current working directory. For empty array, clears the selected files.
-   *
-   * @since v1.8
+   * 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 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 current working directory. For empty array, clears the selected files.
-   *
-   * @since v1.8
+   * 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 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 current working directory. For empty array, clears the selected files.
-   *
-   * @since v1.8
+   * 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 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 current working directory. For empty array, clears the selected files.
-   *
-   * @since v1.8
+   * 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 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 current working directory. For empty array, clears the selected files.
-   *
-   * @since v1.8
+   * 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 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 current working directory. For empty array, clears the selected files.
-   *
-   * @since v1.8
+   * 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 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 current working directory. For empty array, clears the selected files.
-   *
-   * @since v1.8
+   * 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 current working directory. For empty array, clears the selected files.
   */
  void setFiles(FilePayload[] files, SetFilesOptions options);
 }
@@ -19,32 +19,27 @@ package com.microsoft.playwright;
 import java.util.*;

 /**
- * JSHandle represents an in-page JavaScript object. JSHandles can be created with the {@link
- * com.microsoft.playwright.Page#evaluateHandle Page.evaluateHandle()} method.
+ * JSHandle represents an in-page JavaScript object. JSHandles can be created with the {@link Page#evaluateHandle
+ * Page.evaluateHandle()} method.
 * <pre>{@code
 * JSHandle windowHandle = page.evaluateHandle("() => window");
 * // ...
 * }</pre>
 *
 * <p> JSHandle prevents the referenced JavaScript object being garbage collected unless the handle is exposed with {@link
- * com.microsoft.playwright.JSHandle#dispose JSHandle.dispose()}. JSHandles are auto-disposed when their origin frame gets
- * navigated or the parent context gets destroyed.
+ * JSHandle#dispose JSHandle.dispose()}. JSHandles are auto-disposed when their origin frame gets navigated or the parent
+ * context gets destroyed.
 *
- * <p> JSHandle instances can be used as an argument in {@link com.microsoft.playwright.Page#evalOnSelector
- * Page.evalOnSelector()}, {@link com.microsoft.playwright.Page#evaluate Page.evaluate()} and {@link
- * com.microsoft.playwright.Page#evaluateHandle Page.evaluateHandle()} methods.
+ * <p> JSHandle instances can be used as an argument in {@link Page#evalOnSelector Page.evalOnSelector()}, {@link Page#evaluate
+ * Page.evaluate()} and {@link Page#evaluateHandle Page.evaluateHandle()} methods.
 */
 public interface JSHandle {
  /**
   * Returns either {@code null} or the object handle itself, if the object handle is an instance of {@code ElementHandle}.
-   *
-   * @since v1.8
   */
  ElementHandle asElement();
  /**
   * The {@code jsHandle.dispose} method stops referencing the element handle.
-   *
-   * @since v1.8
   */
  void dispose();
  /**
@@ -53,18 +48,17 @@ public interface JSHandle {
   * <p> This method passes this handle as the first argument to {@code expression}.
   *
   * <p> If {@code expression} returns a <a
-   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@code
-   * handle.evaluate} would wait for the promise to resolve and return its value.
+   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then
+   * {@code handle.evaluate} would wait for the promise to resolve and return its value.
   *
-   * <p> <strong>Usage</strong>
+   * <p> Examples:
   * <pre>{@code
   * ElementHandle tweetHandle = page.querySelector(".tweet .retweets");
   * assertEquals("10 retweets", tweetHandle.evaluate("node => node.innerText"));
   * }</pre>
   *
-   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
-   * automatically invoked.
-   * @since v1.8
+   * @param expression JavaScript expression to be evaluated in the browser context. If it looks like a function declaration, it is interpreted
+   * as a function. Otherwise, evaluated as an expression.
   */
  default Object evaluate(String expression) {
    return evaluate(expression, null);
@@ -75,19 +69,18 @@ public interface JSHandle {
   * <p> This method passes this handle as the first argument to {@code expression}.
   *
   * <p> If {@code expression} returns a <a
-   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@code
-   * handle.evaluate} would wait for the promise to resolve and return its value.
+   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then
+   * {@code handle.evaluate} would wait for the promise to resolve and return its value.
   *
-   * <p> <strong>Usage</strong>
+   * <p> Examples:
   * <pre>{@code
   * ElementHandle tweetHandle = page.querySelector(".tweet .retweets");
   * assertEquals("10 retweets", tweetHandle.evaluate("node => node.innerText"));
   * }</pre>
   *
-   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
-   * automatically invoked.
+   * @param expression JavaScript expression to be evaluated in the browser context. If it looks like a function declaration, it is interpreted
+   * as a function. Otherwise, evaluated as an expression.
   * @param arg Optional argument to pass to {@code expression}.
-   * @since v1.8
   */
  Object evaluate(String expression, Object arg);
  /**
@@ -95,18 +88,17 @@ public interface JSHandle {
   *
   * <p> This method passes this handle as the first argument to {@code expression}.
   *
-   * <p> The only difference between {@code jsHandle.evaluate} and {@code jsHandle.evaluateHandle} is that {@code
-   * jsHandle.evaluateHandle} returns {@code JSHandle}.
+   * <p> The only difference between {@code jsHandle.evaluate} and {@code jsHandle.evaluateHandle} is that {@code jsHandle.evaluateHandle} returns
+   * {@code JSHandle}.
   *
   * <p> If the function passed to the {@code jsHandle.evaluateHandle} returns a <a
-   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@code
-   * jsHandle.evaluateHandle} would wait for the promise to resolve and return its value.
+   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then
+   * {@code jsHandle.evaluateHandle} would wait for the promise to resolve and return its value.
   *
-   * <p> See {@link com.microsoft.playwright.Page#evaluateHandle Page.evaluateHandle()} for more details.
+   * <p> See {@link Page#evaluateHandle Page.evaluateHandle()} for more details.
   *
-   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
-   * automatically invoked.
-   * @since v1.8
+   * @param expression JavaScript expression to be evaluated in the browser context. If it looks like a function declaration, it is interpreted
+   * as a function. Otherwise, evaluated as an expression.
   */
  default JSHandle evaluateHandle(String expression) {
    return evaluateHandle(expression, null);
@@ -116,41 +108,35 @@ public interface JSHandle {
   *
   * <p> This method passes this handle as the first argument to {@code expression}.
   *
-   * <p> The only difference between {@code jsHandle.evaluate} and {@code jsHandle.evaluateHandle} is that {@code
-   * jsHandle.evaluateHandle} returns {@code JSHandle}.
+   * <p> The only difference between {@code jsHandle.evaluate} and {@code jsHandle.evaluateHandle} is that {@code jsHandle.evaluateHandle} returns
+   * {@code JSHandle}.
   *
   * <p> If the function passed to the {@code jsHandle.evaluateHandle} returns a <a
-   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@code
-   * jsHandle.evaluateHandle} would wait for the promise to resolve and return its value.
+   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then
+   * {@code jsHandle.evaluateHandle} would wait for the promise to resolve and return its value.
   *
-   * <p> See {@link com.microsoft.playwright.Page#evaluateHandle Page.evaluateHandle()} for more details.
+   * <p> See {@link Page#evaluateHandle Page.evaluateHandle()} for more details.
   *
-   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
-   * automatically invoked.
+   * @param expression JavaScript expression to be evaluated in the browser context. If it looks like a function declaration, it is interpreted
+   * as a function. Otherwise, evaluated as an expression.
   * @param arg Optional argument to pass to {@code expression}.
-   * @since v1.8
   */
  JSHandle evaluateHandle(String expression, Object arg);
  /**
   * The method returns a map with **own property names** as keys and JSHandle instances for the property values.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
-   * JSHandle handle = page.evaluateHandle("() => ({ window, document })");
+   * JSHandle handle = page.evaluateHandle("() => ({window, document}"););
   * Map<String, JSHandle> properties = handle.getProperties();
   * JSHandle windowHandle = properties.get("window");
   * JSHandle documentHandle = properties.get("document");
   * handle.dispose();
   * }</pre>
-   *
-   * @since v1.8
   */
  Map<String, JSHandle> getProperties();
  /**
   * Fetches a single property from the referenced object.
   *
   * @param propertyName property to get
-   * @since v1.8
   */
  JSHandle getProperty(String propertyName);
  /**
@@ -158,8 +144,6 @@ public interface JSHandle {
   *
   * <p> <strong>NOTE:</strong> The method will return an empty JSON object if the referenced object is not stringifiable. It will throw an error if the
   * object has circular references.
-   *
-   * @since v1.8
   */
  Object jsonValue();
 }
@@ -19,13 +19,11 @@ package com.microsoft.playwright;
 import com.microsoft.playwright.options.*;

 /**
- * Keyboard provides an api for managing a virtual keyboard. The high level api is {@link
- * com.microsoft.playwright.Keyboard#type Keyboard.type()}, which takes raw characters and generates proper {@code
- * keydown}, {@code keypress}/{@code input}, and {@code keyup} events on your page.
+ * Keyboard provides an api for managing a virtual keyboard. The high level api is {@link Keyboard#type Keyboard.type()},
+ * which takes raw characters and generates proper keydown, keypress/input, and keyup events on your page.
 *
- * <p> For finer control, you can use {@link com.microsoft.playwright.Keyboard#down Keyboard.down()}, {@link
- * com.microsoft.playwright.Keyboard#up Keyboard.up()}, and {@link com.microsoft.playwright.Keyboard#insertText
- * Keyboard.insertText()} to manually fire events as if they were generated from a real keyboard.
+ * <p> For finer control, you can use {@link Keyboard#down Keyboard.down()}, {@link Keyboard#up Keyboard.up()}, and {@link
+ * Keyboard#insertText Keyboard.insertText()} to manually fire events as if they were generated from a real keyboard.
 *
 * <p> An example of holding down {@code Shift} in order to select and delete some text:
 * <pre>{@code
@@ -48,7 +46,10 @@ import com.microsoft.playwright.options.*;
 *
 * <p> An example to trigger select-all with the keyboard
 * <pre>{@code
- * page.keyboard().press("ControlOrMeta+A");
+ * // on Windows and Linux
+ * page.keyboard().press("Control+A");
+ * // on macOS
+ * page.keyboard().press("Meta+A");
 * }</pre>
 */
 public interface Keyboard {
@@ -88,80 +89,62 @@ public interface Keyboard {
   * character to generate the text for. A superset of the {@code key} values can be found <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values">here</a>. Examples of the keys are:
   *
-   * <p> {@code F1} - {@code F12}, {@code Digit0}- {@code Digit9}, {@code KeyA}- {@code KeyZ}, {@code Backquote}, {@code Minus},
-   * {@code Equal}, {@code Backslash}, {@code Backspace}, {@code Tab}, {@code Delete}, {@code Escape}, {@code ArrowDown},
-   * {@code End}, {@code Enter}, {@code Home}, {@code Insert}, {@code PageDown}, {@code PageUp}, {@code ArrowRight}, {@code
-   * ArrowUp}, etc.
+   * <p> {@code F1} - {@code F12}, {@code Digit0}- {@code Digit9}, {@code KeyA}- {@code KeyZ}, {@code Backquote}, {@code Minus}, {@code Equal}, {@code Backslash}, {@code Backspace}, {@code Tab},
+   * {@code Delete}, {@code Escape}, {@code ArrowDown}, {@code End}, {@code Enter}, {@code Home}, {@code Insert}, {@code PageDown}, {@code PageUp}, {@code ArrowRight}, {@code ArrowUp}, etc.
   *
-   * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}, {@code ControlOrMeta}. {@code ControlOrMeta} resolves to {@code Control} on Windows and Linux and to {@code
-   * Meta} on macOS.
+   * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code ShiftLeft}.
   *
   * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
   *
-   * <p> If {@code key} is a single character, it is case-sensitive, so the values {@code a} and {@code A} will generate
-   * different respective texts.
+   * <p> If {@code key} is a single character, it is case-sensitive, so the values {@code a} and {@code A} will generate different respective
+   * texts.
   *
-   * <p> If {@code key} is a modifier key, {@code Shift}, {@code Meta}, {@code Control}, or {@code Alt}, subsequent key presses
-   * will be sent with that modifier active. To release the modifier key, use {@link com.microsoft.playwright.Keyboard#up
-   * Keyboard.up()}.
+   * <p> If {@code key} is a modifier key, {@code Shift}, {@code Meta}, {@code Control}, or {@code Alt}, subsequent key presses will be sent with that modifier
+   * active. To release the modifier key, use {@link Keyboard#up Keyboard.up()}.
   *
-   * <p> After the key is pressed once, subsequent calls to {@link com.microsoft.playwright.Keyboard#down Keyboard.down()} will
-   * have <a href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat">repeat</a> set to true. To release
-   * the key, use {@link com.microsoft.playwright.Keyboard#up Keyboard.up()}.
+   * <p> After the key is pressed once, subsequent calls to {@link Keyboard#down Keyboard.down()} will have <a
+   * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/repeat">repeat</a> set to true. To release the key,
+   * use {@link Keyboard#up Keyboard.up()}.
   *
   * <p> <strong>NOTE:</strong> Modifier keys DO influence {@code keyboard.down}. Holding down {@code Shift} will type the text in upper case.
   *
   * @param key Name of the key to press or a character to generate, such as {@code ArrowLeft} or {@code a}.
-   * @since v1.8
   */
  void down(String key);
  /**
   * Dispatches only {@code input} event, does not emit the {@code keydown}, {@code keyup} or {@code keypress} events.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * page.keyboard().insertText("嗨");
   * }</pre>
   *
-   * <p> <strong>NOTE:</strong> Modifier keys DO NOT effect {@code keyboard.insertText}. Holding down {@code Shift} will not type the text in upper
-   * case.
+   * <p> <strong>NOTE:</strong> Modifier keys DO NOT effect {@code keyboard.insertText}. Holding down {@code Shift} will not type the text in upper case.
   *
   * @param text Sets input to the specified text value.
-   * @since v1.8
   */
  void insertText(String text);
  /**
-   * <strong>NOTE:</strong> In most cases, you should use {@link com.microsoft.playwright.Locator#press Locator.press()} instead.
-   *
-   * <p> {@code key} can specify the intended <a
+   * {@code key} can specify the intended <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key">keyboardEvent.key</a> value or a single
   * character to generate the text for. A superset of the {@code key} values can be found <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values">here</a>. Examples of the keys are:
   *
-   * <p> {@code F1} - {@code F12}, {@code Digit0}- {@code Digit9}, {@code KeyA}- {@code KeyZ}, {@code Backquote}, {@code Minus},
-   * {@code Equal}, {@code Backslash}, {@code Backspace}, {@code Tab}, {@code Delete}, {@code Escape}, {@code ArrowDown},
-   * {@code End}, {@code Enter}, {@code Home}, {@code Insert}, {@code PageDown}, {@code PageUp}, {@code ArrowRight}, {@code
-   * ArrowUp}, etc.
+   * <p> {@code F1} - {@code F12}, {@code Digit0}- {@code Digit9}, {@code KeyA}- {@code KeyZ}, {@code Backquote}, {@code Minus}, {@code Equal}, {@code Backslash}, {@code Backspace}, {@code Tab},
+   * {@code Delete}, {@code Escape}, {@code ArrowDown}, {@code End}, {@code Enter}, {@code Home}, {@code Insert}, {@code PageDown}, {@code PageUp}, {@code ArrowRight}, {@code ArrowUp}, etc.
   *
-   * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}, {@code ControlOrMeta}. {@code ControlOrMeta} resolves to {@code Control} on Windows and Linux and to {@code
-   * Meta} on macOS.
+   * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code ShiftLeft}.
   *
   * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
   *
-   * <p> If {@code key} is a single character, it is case-sensitive, so the values {@code a} and {@code A} will generate
-   * different respective texts.
+   * <p> If {@code key} is a single character, it is case-sensitive, so the values {@code a} and {@code A} will generate different respective
+   * texts.
   *
-   * <p> Shortcuts such as {@code key: "Control+o"}, {@code key: "Control++} or {@code key: "Control+Shift+T"} are supported as
-   * well. When specified with the modifier, modifier is pressed and being held while the subsequent key is being pressed.
-   *
-   * <p> <strong>Usage</strong>
+   * <p> Shortcuts such as {@code key: "Control+o"} or {@code key: "Control+Shift+T"} are supported as well. When specified with the
+   * modifier, modifier is pressed and being held while the subsequent key is being pressed.
   * <pre>{@code
   * Page page = browser.newPage();
   * page.navigate("https://keycode.info");
   * page.keyboard().press("A");
-   * page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("A.png")));
+   * page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("A.png"));
   * page.keyboard().press("ArrowLeft");
   * page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("ArrowLeft.png")));
   * page.keyboard().press("Shift+O");
@@ -169,46 +152,36 @@ public interface Keyboard {
   * browser.close();
   * }</pre>
   *
-   * <p> Shortcut for {@link com.microsoft.playwright.Keyboard#down Keyboard.down()} and {@link
-   * com.microsoft.playwright.Keyboard#up Keyboard.up()}.
+   * <p> Shortcut for {@link Keyboard#down Keyboard.down()} and {@link Keyboard#up Keyboard.up()}.
   *
   * @param key Name of the key to press or a character to generate, such as {@code ArrowLeft} or {@code a}.
-   * @since v1.8
   */
  default void press(String key) {
    press(key, null);
  }
  /**
-   * <strong>NOTE:</strong> In most cases, you should use {@link com.microsoft.playwright.Locator#press Locator.press()} instead.
-   *
-   * <p> {@code key} can specify the intended <a
+   * {@code key} can specify the intended <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key">keyboardEvent.key</a> value or a single
   * character to generate the text for. A superset of the {@code key} values can be found <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values">here</a>. Examples of the keys are:
   *
-   * <p> {@code F1} - {@code F12}, {@code Digit0}- {@code Digit9}, {@code KeyA}- {@code KeyZ}, {@code Backquote}, {@code Minus},
-   * {@code Equal}, {@code Backslash}, {@code Backspace}, {@code Tab}, {@code Delete}, {@code Escape}, {@code ArrowDown},
-   * {@code End}, {@code Enter}, {@code Home}, {@code Insert}, {@code PageDown}, {@code PageUp}, {@code ArrowRight}, {@code
-   * ArrowUp}, etc.
+   * <p> {@code F1} - {@code F12}, {@code Digit0}- {@code Digit9}, {@code KeyA}- {@code KeyZ}, {@code Backquote}, {@code Minus}, {@code Equal}, {@code Backslash}, {@code Backspace}, {@code Tab},
+   * {@code Delete}, {@code Escape}, {@code ArrowDown}, {@code End}, {@code Enter}, {@code Home}, {@code Insert}, {@code PageDown}, {@code PageUp}, {@code ArrowRight}, {@code ArrowUp}, etc.
   *
-   * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code
-   * ShiftLeft}, {@code ControlOrMeta}. {@code ControlOrMeta} resolves to {@code Control} on Windows and Linux and to {@code
-   * Meta} on macOS.
+   * <p> Following modification shortcuts are also supported: {@code Shift}, {@code Control}, {@code Alt}, {@code Meta}, {@code ShiftLeft}.
   *
   * <p> Holding down {@code Shift} will type the text that corresponds to the {@code key} in the upper case.
   *
-   * <p> If {@code key} is a single character, it is case-sensitive, so the values {@code a} and {@code A} will generate
-   * different respective texts.
+   * <p> If {@code key} is a single character, it is case-sensitive, so the values {@code a} and {@code A} will generate different respective
+   * texts.
   *
-   * <p> Shortcuts such as {@code key: "Control+o"}, {@code key: "Control++} or {@code key: "Control+Shift+T"} are supported as
-   * well. When specified with the modifier, modifier is pressed and being held while the subsequent key is being pressed.
-   *
-   * <p> <strong>Usage</strong>
+   * <p> Shortcuts such as {@code key: "Control+o"} or {@code key: "Control+Shift+T"} are supported as well. When specified with the
+   * modifier, modifier is pressed and being held while the subsequent key is being pressed.
   * <pre>{@code
   * Page page = browser.newPage();
   * page.navigate("https://keycode.info");
   * page.keyboard().press("A");
-   * page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("A.png")));
+   * page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("A.png"));
   * page.keyboard().press("ArrowLeft");
   * page.screenshot(new Page.ScreenshotOptions().setPath(Paths.get("ArrowLeft.png")));
   * page.keyboard().press("Shift+O");
@@ -216,24 +189,15 @@ public interface Keyboard {
   * browser.close();
   * }</pre>
   *
-   * <p> Shortcut for {@link com.microsoft.playwright.Keyboard#down Keyboard.down()} and {@link
-   * com.microsoft.playwright.Keyboard#up Keyboard.up()}.
+   * <p> Shortcut for {@link Keyboard#down Keyboard.down()} and {@link Keyboard#up Keyboard.up()}.
   *
   * @param key Name of the key to press or a character to generate, such as {@code ArrowLeft} or {@code a}.
-   * @since v1.8
   */
  void press(String key, PressOptions options);
  /**
-   * <strong>NOTE:</strong> In most cases, you should use {@link com.microsoft.playwright.Locator#fill Locator.fill()} instead. You only need to
-   * press keys one by one if there is special keyboard handling on the page - in this case use {@link
-   * com.microsoft.playwright.Locator#pressSequentially Locator.pressSequentially()}.
+   * Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text.
   *
-   * <p> Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text.
-   *
-   * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link com.microsoft.playwright.Keyboard#press
-   * Keyboard.press()}.
-   *
-   * <p> <strong>Usage</strong>
+   * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link Keyboard#press Keyboard.press()}.
   * <pre>{@code
   * // Types instantly
   * page.keyboard().type("Hello");
@@ -246,22 +210,14 @@ public interface Keyboard {
   * <p> <strong>NOTE:</strong> For characters that are not on a US keyboard, only an {@code input} event will be sent.
   *
   * @param text A text to type into a focused element.
-   * @since v1.8
   */
  default void type(String text) {
    type(text, null);
  }
  /**
-   * <strong>NOTE:</strong> In most cases, you should use {@link com.microsoft.playwright.Locator#fill Locator.fill()} instead. You only need to
-   * press keys one by one if there is special keyboard handling on the page - in this case use {@link
-   * com.microsoft.playwright.Locator#pressSequentially Locator.pressSequentially()}.
+   * Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text.
   *
-   * <p> Sends a {@code keydown}, {@code keypress}/{@code input}, and {@code keyup} event for each character in the text.
-   *
-   * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link com.microsoft.playwright.Keyboard#press
-   * Keyboard.press()}.
-   *
-   * <p> <strong>Usage</strong>
+   * <p> To press a special key, like {@code Control} or {@code ArrowDown}, use {@link Keyboard#press Keyboard.press()}.
   * <pre>{@code
   * // Types instantly
   * page.keyboard().type("Hello");
@@ -274,14 +230,12 @@ public interface Keyboard {
   * <p> <strong>NOTE:</strong> For characters that are not on a US keyboard, only an {@code input} event will be sent.
   *
   * @param text A text to type into a focused element.
-   * @since v1.8
   */
  void type(String text, TypeOptions options);
  /**
   * Dispatches a {@code keyup} event.
   *
   * @param key Name of the key to press or a character to generate, such as {@code ArrowLeft} or {@code a}.
-   * @since v1.8
   */
  void up(String key);
 }
@@ -21,12 +21,7 @@ import com.microsoft.playwright.options.*;
 /**
 * The Mouse class operates in main-frame CSS pixels relative to the top-left corner of the viewport.
 *
- * <p> <strong>NOTE:</strong> If you want to debug where the mouse moved, you can use the <a
- * href="https://playwright.dev/java/docs/trace-viewer-intro">Trace viewer</a> or <a
- * href="https://playwright.dev/java/docs/running-tests">Playwright Inspector</a>. A red dot showing the location of the
- * mouse will be shown for every mouse action.
- *
- * <p> Every {@code page} object has its own Mouse, accessible with {@link com.microsoft.playwright.Page#mouse Page.mouse()}.
+ * <p> Every {@code page} object has its own Mouse, accessible with {@link Page#mouse Page.mouse()}.
 * <pre>{@code
 * // Using ‘page.mouse’ to trace a 100x100 square.
 * page.mouse().move(0, 0);
@@ -127,16 +122,12 @@ public interface Mouse {
  }
  class MoveOptions {
    /**
-     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between Playwright's current
-     * cursor position and the provided destination. When set to 1, emits a single {@code mousemove} event at the destination
-     * location.
+     * Defaults to 1. Sends intermediate {@code mousemove} events.
     */
    public Integer steps;

    /**
-     * Defaults to 1. Sends {@code n} interpolated {@code mousemove} events to represent travel between Playwright's current
-     * cursor position and the provided destination. When set to 1, emits a single {@code mousemove} event at the destination
-     * location.
+     * Defaults to 1. Sends intermediate {@code mousemove} events.
     */
    public MoveOptions setSteps(int steps) {
      this.steps = steps;
@@ -169,103 +160,65 @@ public interface Mouse {
    }
  }
  /**
-   * Shortcut for {@link com.microsoft.playwright.Mouse#move Mouse.move()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()}, {@link com.microsoft.playwright.Mouse#up Mouse.up()}.
-   *
-   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
-   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
-   * @since v1.8
+   * Shortcut for {@link Mouse#move Mouse.move()}, {@link Mouse#down Mouse.down()}, {@link Mouse#up Mouse.up()}.
   */
  default void click(double x, double y) {
    click(x, y, null);
  }
  /**
-   * Shortcut for {@link com.microsoft.playwright.Mouse#move Mouse.move()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()}, {@link com.microsoft.playwright.Mouse#up Mouse.up()}.
-   *
-   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
-   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
-   * @since v1.8
+   * Shortcut for {@link Mouse#move Mouse.move()}, {@link Mouse#down Mouse.down()}, {@link Mouse#up Mouse.up()}.
   */
  void click(double x, double y, ClickOptions options);
  /**
-   * Shortcut for {@link com.microsoft.playwright.Mouse#move Mouse.move()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()}, {@link com.microsoft.playwright.Mouse#up Mouse.up()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()} and {@link com.microsoft.playwright.Mouse#up Mouse.up()}.
-   *
-   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
-   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
-   * @since v1.8
+   * Shortcut for {@link Mouse#move Mouse.move()}, {@link Mouse#down Mouse.down()}, {@link Mouse#up Mouse.up()}, {@link
+   * Mouse#down Mouse.down()} and {@link Mouse#up Mouse.up()}.
   */
  default void dblclick(double x, double y) {
    dblclick(x, y, null);
  }
  /**
-   * Shortcut for {@link com.microsoft.playwright.Mouse#move Mouse.move()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()}, {@link com.microsoft.playwright.Mouse#up Mouse.up()}, {@link com.microsoft.playwright.Mouse#down
-   * Mouse.down()} and {@link com.microsoft.playwright.Mouse#up Mouse.up()}.
-   *
-   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
-   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
-   * @since v1.8
+   * Shortcut for {@link Mouse#move Mouse.move()}, {@link Mouse#down Mouse.down()}, {@link Mouse#up Mouse.up()}, {@link
+   * Mouse#down Mouse.down()} and {@link Mouse#up Mouse.up()}.
   */
  void dblclick(double x, double y, DblclickOptions options);
  /**
   * Dispatches a {@code mousedown} event.
-   *
-   * @since v1.8
   */
  default void down() {
    down(null);
  }
  /**
   * Dispatches a {@code mousedown} event.
-   *
-   * @since v1.8
   */
  void down(DownOptions options);
  /**
   * Dispatches a {@code mousemove} event.
-   *
-   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
-   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
-   * @since v1.8
   */
  default void move(double x, double y) {
    move(x, y, null);
  }
  /**
   * Dispatches a {@code mousemove} event.
-   *
-   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
-   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
-   * @since v1.8
   */
  void move(double x, double y, MoveOptions options);
  /**
   * Dispatches a {@code mouseup} event.
-   *
-   * @since v1.8
   */
  default void up() {
    up(null);
  }
  /**
   * Dispatches a {@code mouseup} event.
-   *
-   * @since v1.8
   */
  void up(UpOptions options);
  /**
-   * Dispatches a {@code wheel} event. This method is usually used to manually scroll the page. See <a
-   * href="https://playwright.dev/java/docs/input#scrolling">scrolling</a> for alternative ways to scroll.
+   * Dispatches a {@code wheel} event.
   *
   * <p> <strong>NOTE:</strong> Wheel events may cause scrolling if they are not handled, and this method does not wait for the scrolling to finish
   * before returning.
   *
   * @param deltaX Pixels to scroll horizontally.
   * @param deltaY Pixels to scroll vertically.
-   * @since v1.15
   */
  void wheel(double deltaX, double deltaY);
 }
@@ -58,53 +58,39 @@ public interface Playwright extends AutoCloseable {
  }
  /**
   * This object can be used to launch or connect to Chromium, returning instances of {@code Browser}.
-   *
-   * @since v1.8
   */
  BrowserType chromium();
  /**
   * This object can be used to launch or connect to Firefox, returning instances of {@code Browser}.
-   *
-   * @since v1.8
   */
  BrowserType firefox();
  /**
   * Exposes API that can be used for the Web API testing.
-   *
-   * @since v1.16
   */
  APIRequest request();
  /**
   * Selectors can be used to install custom selector engines. See <a
-   * href="https://playwright.dev/java/docs/extensibility">extensibility</a> for more information.
-   *
-   * @since v1.8
+   * href="https://playwright.dev/java/docs/selectors">Working with selectors</a> for more information.
   */
  Selectors selectors();
  /**
   * This object can be used to launch or connect to WebKit, returning instances of {@code Browser}.
-   *
-   * @since v1.8
   */
  BrowserType webkit();
  /**
   * Terminates this instance of Playwright, will also close all created browsers if they are still running.
-   *
-   * @since v1.9
   */
  void close();
  /**
-   * Launches new Playwright driver process and connects to it. {@link com.microsoft.playwright.Playwright#close
-   * Playwright.close()} should be called when the instance is no longer needed.
+   * Launches new Playwright driver process and connects to it. {@link Playwright#close Playwright.close()} should be called
+   * when the instance is no longer needed.
   * <pre>{@code
-   * Playwright playwright = Playwright.create();
+   * Playwright playwright = Playwright.create()) {
   * Browser browser = playwright.webkit().launch();
   * Page page = browser.newPage();
   * page.navigate("https://www.w3.org/");
   * playwright.close();
   * }</pre>
-   *
-   * @since v1.10
   */
  static Playwright create(CreateOptions options) {
    return PlaywrightImpl.create(options);
@@ -22,124 +22,81 @@ import java.util.*;
 /**
 * Whenever the page sends a request for a network resource the following sequence of events are emitted by {@code Page}:
 * <ul>
- * <li> {@link com.microsoft.playwright.Page#onRequest Page.onRequest()} emitted when the request is issued by the page.</li>
- * <li> {@link com.microsoft.playwright.Page#onResponse Page.onResponse()} emitted when/if the response status and headers are
- * received for the request.</li>
- * <li> {@link com.microsoft.playwright.Page#onRequestFinished Page.onRequestFinished()} emitted when the response body is
- * downloaded and the request is complete.</li>
+ * <li> {@link Page#onRequest Page.onRequest()} emitted when the request is issued by the page.</li>
+ * <li> {@link Page#onResponse Page.onResponse()} emitted when/if the response status and headers are received for the request.</li>
+ * <li> {@link Page#onRequestFinished Page.onRequestFinished()} emitted when the response body is downloaded and the request is
+ * complete.</li>
 * </ul>
 *
- * <p> If request fails at some point, then instead of {@code "requestfinished"} event (and possibly instead of 'response'
- * event), the  {@link com.microsoft.playwright.Page#onRequestFailed Page.onRequestFailed()} event is emitted.
+ * <p> If request fails at some point, then instead of {@code "requestfinished"} event (and possibly instead of 'response' event),
+ * the  {@link Page#onRequestFailed Page.onRequestFailed()} event is emitted.
 *
 * <p> <strong>NOTE:</strong> HTTP Error responses, such as 404 or 503, are still successful responses from HTTP standpoint, so request will complete
 * with {@code "requestfinished"} event.
 *
- * <p> If request gets a 'redirect' response, the request is successfully finished with the {@code requestfinished} event, and
- * a new request is  issued to a redirected url.
+ * <p> If request gets a 'redirect' response, the request is successfully finished with the 'requestfinished' event, and a new
+ * request is  issued to a redirected url.
 */
 public interface Request {
  /**
   * An object with all the request HTTP headers associated with this request. The header names are lower-cased.
-   *
-   * @since v1.15
   */
  Map<String, String> allHeaders();
  /**
   * The method returns {@code null} unless this request has failed, as reported by {@code requestfailed} event.
   *
-   * <p> <strong>Usage</strong>
-   *
   * <p> Example of logging of all the failed requests:
   * <pre>{@code
   * page.onRequestFailed(request -> {
   *   System.out.println(request.url() + " " + request.failure());
   * });
   * }</pre>
-   *
-   * @since v1.8
   */
  String failure();
  /**
   * Returns the {@code Frame} that initiated this request.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * String frameUrl = request.frame().url();
-   * }</pre>
-   *
-   * <p> <strong>Details</strong>
-   *
-   * <p> Note that in some cases the frame is not available, and this method will throw.
-   * <ul>
-   * <li> When request originates in the Service Worker. You can use {@code request.serviceWorker()} to check that.</li>
-   * <li> When navigation request is issued before the corresponding frame is created. You can use {@link
-   * com.microsoft.playwright.Request#isNavigationRequest Request.isNavigationRequest()} to check that.</li>
-   * </ul>
-   *
-   * <p> Here is an example that handles all the cases:
-   *
-   * @since v1.8
   */
  Frame frame();
  /**
   * An object with the request HTTP headers. The header names are lower-cased. Note that this method does not return
-   * security-related headers, including cookie-related ones. You can use {@link com.microsoft.playwright.Request#allHeaders
-   * Request.allHeaders()} for complete list of headers that include {@code cookie} information.
-   *
-   * @since v1.8
+   * security-related headers, including cookie-related ones. You can use {@link Request#allHeaders Request.allHeaders()} for
+   * complete list of headers that include {@code cookie} information.
   */
  Map<String, String> headers();
  /**
-   * An array with all the request HTTP headers associated with this request. Unlike {@link
-   * com.microsoft.playwright.Request#allHeaders Request.allHeaders()}, header names are NOT lower-cased. Headers with
-   * multiple entries, such as {@code Set-Cookie}, appear in the array multiple times.
-   *
-   * @since v1.15
+   * An array with all the request HTTP headers associated with this request. Unlike {@link Request#allHeaders
+   * Request.allHeaders()}, header names are NOT lower-cased. Headers with multiple entries, such as {@code Set-Cookie}, appear in
+   * the array multiple times.
   */
  List<HttpHeader> headersArray();
  /**
-   * Returns the value of the header matching the name. The name is case-insensitive.
+   * Returns the value of the header matching the name. The name is case insensitive.
   *
   * @param name Name of the header.
-   * @since v1.15
   */
  String headerValue(String name);
  /**
   * Whether this request is driving frame's navigation.
-   *
-   * <p> Some navigation requests are issued before the corresponding frame is created, and therefore do not have {@link
-   * com.microsoft.playwright.Request#frame Request.frame()} available.
-   *
-   * @since v1.8
   */
  boolean isNavigationRequest();
  /**
   * Request's method (GET, POST, etc.)
-   *
-   * @since v1.8
   */
  String method();
  /**
   * Request's post body, if any.
-   *
-   * @since v1.8
   */
  String postData();
  /**
   * Request's post body in a binary form, if any.
-   *
-   * @since v1.8
   */
  byte[] postDataBuffer();
  /**
   * Request that was redirected by the server to this one, if any.
   *
-   * <p> When the server responds with a redirect, Playwright creates a new {@code Request} object. The two requests are
-   * connected by {@code redirectedFrom()} and {@code redirectedTo()} methods. When multiple server redirects has happened,
-   * it is possible to construct the whole redirect chain by repeatedly calling {@code redirectedFrom()}.
-   *
-   * <p> <strong>Usage</strong>
+   * <p> When the server responds with a redirect, Playwright creates a new {@code Request} object. The two requests are connected by
+   * {@code redirectedFrom()} and {@code redirectedTo()} methods. When multiple server redirects has happened, it is possible to
+   * construct the whole redirect chain by repeatedly calling {@code redirectedFrom()}.
   *
   * <p> For example, if the website {@code http://example.com} redirects to {@code https://example.com}:
   * <pre>{@code
@@ -152,49 +109,35 @@ public interface Request {
   * Response response = page.navigate("https://google.com");
   * System.out.println(response.request().redirectedFrom()); // null
   * }</pre>
-   *
-   * @since v1.8
   */
  Request redirectedFrom();
  /**
   * New request issued by the browser if the server responded with redirect.
   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> This method is the opposite of {@link com.microsoft.playwright.Request#redirectedFrom Request.redirectedFrom()}:
+   * <p> This method is the opposite of {@link Request#redirectedFrom Request.redirectedFrom()}:
   * <pre>{@code
   * System.out.println(request.redirectedFrom().redirectedTo() == request); // true
   * }</pre>
-   *
-   * @since v1.8
   */
  Request redirectedTo();
  /**
   * Contains the request's resource type as it was perceived by the rendering engine. ResourceType will be one of the
-   * following: {@code document}, {@code stylesheet}, {@code image}, {@code media}, {@code font}, {@code script}, {@code
-   * texttrack}, {@code xhr}, {@code fetch}, {@code eventsource}, {@code websocket}, {@code manifest}, {@code other}.
-   *
-   * @since v1.8
+   * following: {@code document}, {@code stylesheet}, {@code image}, {@code media}, {@code font}, {@code script}, {@code texttrack}, {@code xhr}, {@code fetch}, {@code eventsource},
+   * {@code websocket}, {@code manifest}, {@code other}.
   */
  String resourceType();
  /**
   * Returns the matching {@code Response} object, or {@code null} if the response was not received due to error.
-   *
-   * @since v1.8
   */
  Response response();
  /**
   * Returns resource size information for given request.
-   *
-   * @since v1.15
   */
  Sizes sizes();
  /**
   * Returns resource timing information for given request. Most of the timing values become available upon the response,
   * {@code responseEnd} becomes available when request finishes. Find more information at <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/PerformanceResourceTiming">Resource Timing API</a>.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * page.onRequestFinished(request -> {
   *   Timing timing = request.timing();
@@ -202,14 +145,10 @@ public interface Request {
   * });
   * page.navigate("http://example.com");
   * }</pre>
-   *
-   * @since v1.8
   */
  Timing timing();
  /**
   * URL of the request.
-   *
-   * @since v1.8
   */
  String url();
 }
@@ -25,113 +25,81 @@ import java.util.*;
 public interface Response {
  /**
   * An object with all the response HTTP headers associated with this response.
-   *
-   * @since v1.15
   */
  Map<String, String> allHeaders();
  /**
   * Returns the buffer with response body.
-   *
-   * @since v1.8
   */
  byte[] body();
  /**
   * Waits for this response to finish, returns always {@code null}.
-   *
-   * @since v1.8
   */
  String finished();
  /**
   * Returns the {@code Frame} that initiated this response.
-   *
-   * @since v1.8
   */
  Frame frame();
  /**
-   * Indicates whether this Response was fulfilled by a Service Worker's Fetch Handler (i.e. via <a
+   * Indicates whether this Response was fullfilled by a Service Worker's Fetch Handler (i.e. via <a
   * href="https://developer.mozilla.org/en-US/docs/Web/API/FetchEvent/respondWith">FetchEvent.respondWith</a>).
-   *
-   * @since v1.23
   */
  boolean fromServiceWorker();
  /**
   * An object with the response HTTP headers. The header names are lower-cased. Note that this method does not return
-   * security-related headers, including cookie-related ones. You can use {@link com.microsoft.playwright.Response#allHeaders
-   * Response.allHeaders()} for complete list of headers that include {@code cookie} information.
-   *
-   * @since v1.8
+   * security-related headers, including cookie-related ones. You can use {@link Response#allHeaders Response.allHeaders()}
+   * for complete list of headers that include {@code cookie} information.
   */
  Map<String, String> headers();
  /**
-   * An array with all the request HTTP headers associated with this response. Unlike {@link
-   * com.microsoft.playwright.Response#allHeaders Response.allHeaders()}, header names are NOT lower-cased. Headers with
-   * multiple entries, such as {@code Set-Cookie}, appear in the array multiple times.
-   *
-   * @since v1.15
+   * An array with all the request HTTP headers associated with this response. Unlike {@link Response#allHeaders
+   * Response.allHeaders()}, header names are NOT lower-cased. Headers with multiple entries, such as {@code Set-Cookie}, appear in
+   * the array multiple times.
   */
  List<HttpHeader> headersArray();
  /**
-   * Returns the value of the header matching the name. The name is case-insensitive. If multiple headers have the same name
-   * (except {@code set-cookie}), they are returned as a list separated by {@code , }. For {@code set-cookie}, the {@code \n}
-   * separator is used. If no headers are found, {@code null} is returned.
+   * Returns the value of the header matching the name. The name is case insensitive. If multiple headers have the same name
+   * (except {@code set-cookie}), they are returned as a list separated by {@code , }. For {@code set-cookie}, the {@code \n} separator is used. If
+   * no headers are found, {@code null} is returned.
   *
   * @param name Name of the header.
-   * @since v1.15
   */
  String headerValue(String name);
  /**
-   * Returns all values of the headers matching the name, for example {@code set-cookie}. The name is case-insensitive.
+   * Returns all values of the headers matching the name, for example {@code set-cookie}. The name is case insensitive.
   *
   * @param name Name of the header.
-   * @since v1.15
   */
  List<String> headerValues(String name);
  /**
   * Contains a boolean stating whether the response was successful (status in the range 200-299) or not.
-   *
-   * @since v1.8
   */
  boolean ok();
  /**
   * Returns the matching {@code Request} object.
-   *
-   * @since v1.8
   */
  Request request();
  /**
   * Returns SSL and other security information.
-   *
-   * @since v1.13
   */
  SecurityDetails securityDetails();
  /**
   * Returns the IP address and port of the server.
-   *
-   * @since v1.13
   */
  ServerAddr serverAddr();
  /**
   * Contains the status code of the response (e.g., 200 for a success).
-   *
-   * @since v1.8
   */
  int status();
  /**
   * Contains the status text of the response (e.g. usually an "OK" for a success).
-   *
-   * @since v1.8
   */
  String statusText();
  /**
   * Returns the text representation of response body.
-   *
-   * @since v1.8
   */
  String text();
  /**
   * Contains the URL of the response.
-   *
-   * @since v1.8
   */
  String url();
 }
@@ -20,9 +20,8 @@ import java.nio.file.Path;
 import java.util.*;

 /**
- * Whenever a network route is set up with {@link com.microsoft.playwright.Page#route Page.route()} or {@link
- * com.microsoft.playwright.BrowserContext#route BrowserContext.route()}, the {@code Route} object allows to handle the
- * route.
+ * 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>.
 */
@@ -33,11 +32,11 @@ public interface Route {
     */
    public Map<String, String> headers;
    /**
-     * If set changes the request method (e.g. GET or POST).
+     * If set changes the request method (e.g. GET or POST)
     */
    public String method;
    /**
-     * If set changes the post data of request.
+     * If set changes the post data of request
     */
    public Object postData;
    /**
@@ -53,21 +52,21 @@ public interface Route {
      return this;
    }
    /**
-     * If set changes the request method (e.g. GET or POST).
+     * If set changes the request method (e.g. GET or POST)
     */
    public ResumeOptions setMethod(String method) {
      this.method = method;
      return this;
    }
    /**
-     * If set changes the post data of request.
+     * If set changes the post data of request
     */
    public ResumeOptions setPostData(String postData) {
      this.postData = postData;
      return this;
    }
    /**
-     * If set changes the post data of request.
+     * If set changes the post data of request
     */
    public ResumeOptions setPostData(byte[] postData) {
      this.postData = postData;
@@ -87,11 +86,11 @@ public interface Route {
     */
    public Map<String, String> headers;
    /**
-     * If set changes the request method (e.g. GET or POST).
+     * If set changes the request method (e.g. GET or POST)
     */
    public String method;
    /**
-     * If set changes the post data of request.
+     * If set changes the post data of request
     */
    public Object postData;
    /**
@@ -108,21 +107,21 @@ public interface Route {
      return this;
    }
    /**
-     * If set changes the request method (e.g. GET or POST).
+     * If set changes the request method (e.g. GET or POST)
     */
    public FallbackOptions setMethod(String method) {
      this.method = method;
      return this;
    }
    /**
-     * If set changes the post data of request.
+     * If set changes the post data of request
     */
    public FallbackOptions setPostData(String postData) {
      this.postData = postData;
      return this;
    }
    /**
-     * If set changes the post data of request.
+     * If set changes the post data of request
     */
    public FallbackOptions setPostData(byte[] postData) {
      this.postData = postData;
@@ -137,99 +136,6 @@ public interface Route {
      return this;
    }
  }
-  class FetchOptions {
-    /**
-     * If set changes the request HTTP headers. Header values will be converted to a string.
-     */
-    public Map<String, String> headers;
-    /**
-     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
-     * exceeded. Defaults to {@code 20}. Pass {@code 0} to not follow redirects.
-     */
-    public Integer maxRedirects;
-    /**
-     * Maximum number of times network errors should be retried. Currently only {@code ECONNRESET} error is retried. Does not
-     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to {@code 0} - no
-     * retries.
-     */
-    public Integer maxRetries;
-    /**
-     * If set changes the request method (e.g. GET or POST).
-     */
-    public String method;
-    /**
-     * If set changes the post data of request.
-     */
-    public Object postData;
-    /**
-     * Request timeout in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout.
-     */
-    public Double timeout;
-    /**
-     * If set changes the request URL. New URL must have same protocol as original one.
-     */
-    public String url;
-
-    /**
-     * If set changes the request HTTP headers. Header values will be converted to a string.
-     */
-    public FetchOptions setHeaders(Map<String, String> headers) {
-      this.headers = headers;
-      return this;
-    }
-    /**
-     * Maximum number of request redirects that will be followed automatically. An error will be thrown if the number is
-     * exceeded. Defaults to {@code 20}. Pass {@code 0} to not follow redirects.
-     */
-    public FetchOptions setMaxRedirects(int maxRedirects) {
-      this.maxRedirects = maxRedirects;
-      return this;
-    }
-    /**
-     * Maximum number of times network errors should be retried. Currently only {@code ECONNRESET} error is retried. Does not
-     * retry based on HTTP response codes. An error will be thrown if the limit is exceeded. Defaults to {@code 0} - no
-     * retries.
-     */
-    public FetchOptions setMaxRetries(int maxRetries) {
-      this.maxRetries = maxRetries;
-      return this;
-    }
-    /**
-     * If set changes the request method (e.g. GET or POST).
-     */
-    public FetchOptions setMethod(String method) {
-      this.method = method;
-      return this;
-    }
-    /**
-     * If set changes the post data of request.
-     */
-    public FetchOptions setPostData(String postData) {
-      this.postData = postData;
-      return this;
-    }
-    /**
-     * If set changes the post data of request.
-     */
-    public FetchOptions setPostData(byte[] postData) {
-      this.postData = postData;
-      return this;
-    }
-    /**
-     * Request timeout in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout.
-     */
-    public FetchOptions setTimeout(double timeout) {
-      this.timeout = timeout;
-      return this;
-    }
-    /**
-     * If set changes the request URL. New URL must have same protocol as original one.
-     */
-    public FetchOptions setUrl(String url) {
-      this.url = url;
-      return this;
-    }
-  }
  class FulfillOptions {
    /**
     * Optional response body as text.
@@ -248,13 +154,13 @@ public interface Route {
     */
    public Map<String, String> headers;
    /**
-     * File path to respond with. The content type will be inferred from file extension. If {@code path} is a relative path,
-     * then it is resolved relative to the current working directory.
+     * File path to respond with. The content type will be inferred from file extension. If {@code path} is a relative path, then it
+     * 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.
+     * {@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;
    /**
@@ -291,16 +197,16 @@ public interface Route {
      return this;
    }
    /**
-     * File path to respond with. The content type will be inferred from file extension. If {@code path} is a relative path,
-     * then it is resolved relative to the current working directory.
+     * File path to respond with. The content type will be inferred from file extension. If {@code path} is a relative path, then it
+     * is resolved relative to the current working directory.
     */
    public FulfillOptions setPath(Path path) {
      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.
+     * {@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;
@@ -316,8 +222,6 @@ public interface Route {
  }
  /**
   * Aborts the route's request.
-   *
-   * @since v1.8
   */
  default void abort() {
    abort(null);
@@ -329,11 +233,11 @@ public interface Route {
   * <ul>
   * <li> {@code "aborted"} - An operation was aborted (due to user action)</li>
   * <li> {@code "accessdenied"} - Permission to access a resource, other than the network, was denied</li>
-   * <li> {@code "addressunreachable"} - The IP address is unreachable. This usually means that there is no route to the specified
-   * host or network.</li>
+   * <li> {@code "addressunreachable"} - The IP address is unreachable. This usually means that there is no route to the specified host
+   * or network.</li>
   * <li> {@code "blockedbyclient"} - The client chose to block the request.</li>
-   * <li> {@code "blockedbyresponse"} - The request failed because the response was delivered along with requirements which are
-   * not met ('X-Frame-Options' and 'Content-Security-Policy' ancestor checks, for instance).</li>
+   * <li> {@code "blockedbyresponse"} - The request failed because the response was delivered along with requirements which are not met
+   * ('X-Frame-Options' and 'Content-Security-Policy' ancestor checks, for instance).</li>
   * <li> {@code "connectionaborted"} - A connection timed out as a result of not receiving an ACK for data sent.</li>
   * <li> {@code "connectionclosed"} - A connection was closed (corresponding to a TCP FIN).</li>
   * <li> {@code "connectionfailed"} - A connection attempt failed.</li>
@@ -344,13 +248,10 @@ public interface Route {
   * <li> {@code "timedout"} - An operation timed out.</li>
   * <li> {@code "failed"} - A generic failure occurred.</li>
   * </ul>
-   * @since v1.8
   */
  void abort(String errorCode);
  /**
-   * Sends route's request to the network with optional overrides.
-   *
-   * <p> <strong>Usage</strong>
+   * Continues route's request with optional overrides.
   * <pre>{@code
   * page.route("**\/*", route -> {
   *   // Override headers
@@ -360,30 +261,12 @@ public interface Route {
   *   route.resume(new Route.ResumeOptions().setHeaders(headers));
   * });
   * }</pre>
-   *
-   * <p> <strong>Details</strong>
-   *
-   * <p> The {@code headers} option applies to both the routed request and any redirects it initiates. However, {@code url},
-   * {@code method}, and {@code postData} only apply to the original request and are not carried over to redirected requests.
-   *
-   * <p> {@link com.microsoft.playwright.Route#resume Route.resume()} will immediately send the request to the network, other
-   * matching handlers won't be invoked. Use {@link com.microsoft.playwright.Route#fallback Route.fallback()} If you want
-   * next matching handler in the chain to be invoked.
-   *
-   * <p> <strong>NOTE:</strong> Some request headers are **forbidden** and cannot be overridden (for example, {@code Cookie}, {@code Host}, {@code
-   * Content-Length} and others, see <a
-   * href="https://developer.mozilla.org/en-US/docs/Glossary/Forbidden_request_header">this MDN page</a> for full list). If
-   * an override is provided for a forbidden header, it will be ignored and the original request header will be used.To set custom cookies, use {@link com.microsoft.playwright.BrowserContext#addCookies BrowserContext.addCookies()}.
-   *
-   * @since v1.8
   */
  default void resume() {
    resume(null);
  }
  /**
-   * Sends route's request to the network with optional overrides.
-   *
-   * <p> <strong>Usage</strong>
+   * Continues route's request with optional overrides.
   * <pre>{@code
   * page.route("**\/*", route -> {
   *   // Override headers
@@ -393,32 +276,11 @@ public interface Route {
   *   route.resume(new Route.ResumeOptions().setHeaders(headers));
   * });
   * }</pre>
-   *
-   * <p> <strong>Details</strong>
-   *
-   * <p> The {@code headers} option applies to both the routed request and any redirects it initiates. However, {@code url},
-   * {@code method}, and {@code postData} only apply to the original request and are not carried over to redirected requests.
-   *
-   * <p> {@link com.microsoft.playwright.Route#resume Route.resume()} will immediately send the request to the network, other
-   * matching handlers won't be invoked. Use {@link com.microsoft.playwright.Route#fallback Route.fallback()} If you want
-   * next matching handler in the chain to be invoked.
-   *
-   * <p> <strong>NOTE:</strong> Some request headers are **forbidden** and cannot be overridden (for example, {@code Cookie}, {@code Host}, {@code
-   * Content-Length} and others, see <a
-   * href="https://developer.mozilla.org/en-US/docs/Glossary/Forbidden_request_header">this MDN page</a> for full list). If
-   * an override is provided for a forbidden header, it will be ignored and the original request header will be used.To set custom cookies, use {@link com.microsoft.playwright.BrowserContext#addCookies BrowserContext.addCookies()}.
-   *
-   * @since v1.8
   */
  void resume(ResumeOptions options);
  /**
-   * Continues route's request with optional overrides. The method is similar to {@link com.microsoft.playwright.Route#resume
-   * Route.resume()} with the difference that other matching handlers will be invoked before sending the request.
-   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> When several routes match the given pattern, they run in the order opposite to their registration. That way the last
-   * registered route can always override all the previous ones. In the example below, request will be handled by the
+   * When several routes match the given pattern, they run in the order opposite to their registration. That way the last
+   * registered route can always override all the previos ones. In the example below, request will be handled by the
   * bottom-most handler first, then it'll fall back to the previous one and in the end will be aborted by the first
   * registered route.
   * <pre>{@code
@@ -473,23 +335,13 @@ public interface Route {
   *   route.fallback(new Route.ResumeOptions().setHeaders(headers));
   * });
   * }</pre>
-   *
-   * <p> Use {@link com.microsoft.playwright.Route#resume Route.resume()} to immediately send the request to the network, other
-   * matching handlers won't be invoked in that case.
-   *
-   * @since v1.23
   */
  default void fallback() {
    fallback(null);
  }
  /**
-   * Continues route's request with optional overrides. The method is similar to {@link com.microsoft.playwright.Route#resume
-   * Route.resume()} with the difference that other matching handlers will be invoked before sending the request.
-   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> When several routes match the given pattern, they run in the order opposite to their registration. That way the last
-   * registered route can always override all the previous ones. In the example below, request will be handled by the
+   * When several routes match the given pattern, they run in the order opposite to their registration. That way the last
+   * registered route can always override all the previos ones. In the example below, request will be handled by the
   * bottom-most handler first, then it'll fall back to the previous one and in the end will be aborted by the first
   * registered route.
   * <pre>{@code
@@ -544,72 +396,11 @@ public interface Route {
   *   route.fallback(new Route.ResumeOptions().setHeaders(headers));
   * });
   * }</pre>
-   *
-   * <p> Use {@link com.microsoft.playwright.Route#resume Route.resume()} to immediately send the request to the network, other
-   * matching handlers won't be invoked in that case.
-   *
-   * @since v1.23
   */
  void fallback(FallbackOptions options);
-  /**
-   * Performs the request and fetches result without fulfilling it, so that the response could be modified and then
-   * fulfilled.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.route("https://dog.ceo/api/breeds/list/all", route -> {
-   *   APIResponse response = route.fetch();
-   *   JsonObject json = new Gson().fromJson(response.text(), JsonObject.class);
-   *   JsonObject message = itemObj.get("json").getAsJsonObject();
-   *   message.set("big_red_dog", new JsonArray());
-   *   route.fulfill(new Route.FulfillOptions()
-   *     .setResponse(response)
-   *     .setBody(json.toString()));
-   * });
-   * }</pre>
-   *
-   * <p> <strong>Details</strong>
-   *
-   * <p> Note that {@code headers} option will apply to the fetched request as well as any redirects initiated by it. If you want
-   * to only apply {@code headers} to the original request, but not to redirects, look into {@link
-   * com.microsoft.playwright.Route#resume Route.resume()} instead.
-   *
-   * @since v1.29
-   */
-  default APIResponse fetch() {
-    return fetch(null);
-  }
-  /**
-   * Performs the request and fetches result without fulfilling it, so that the response could be modified and then
-   * fulfilled.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * page.route("https://dog.ceo/api/breeds/list/all", route -> {
-   *   APIResponse response = route.fetch();
-   *   JsonObject json = new Gson().fromJson(response.text(), JsonObject.class);
-   *   JsonObject message = itemObj.get("json").getAsJsonObject();
-   *   message.set("big_red_dog", new JsonArray());
-   *   route.fulfill(new Route.FulfillOptions()
-   *     .setResponse(response)
-   *     .setBody(json.toString()));
-   * });
-   * }</pre>
-   *
-   * <p> <strong>Details</strong>
-   *
-   * <p> Note that {@code headers} option will apply to the fetched request as well as any redirects initiated by it. If you want
-   * to only apply {@code headers} to the original request, but not to redirects, look into {@link
-   * com.microsoft.playwright.Route#resume Route.resume()} instead.
-   *
-   * @since v1.29
-   */
-  APIResponse fetch(FetchOptions options);
  /**
   * Fulfills route's request with given response.
   *
-   * <p> <strong>Usage</strong>
-   *
   * <p> An example of fulfilling all requests with 404 responses:
   * <pre>{@code
   * page.route("**\/*", route -> {
@@ -625,8 +416,6 @@ public interface Route {
   * page.route("**\/xhr_endpoint", route -> route.fulfill(
   *   new Route.FulfillOptions().setPath(Paths.get("mock_data.json"))));
   * }</pre>
-   *
-   * @since v1.8
   */
  default void fulfill() {
    fulfill(null);
@@ -634,8 +423,6 @@ public interface Route {
  /**
   * Fulfills route's request with given response.
   *
-   * <p> <strong>Usage</strong>
-   *
   * <p> An example of fulfilling all requests with 404 responses:
   * <pre>{@code
   * page.route("**\/*", route -> {
@@ -651,14 +438,10 @@ public interface Route {
   * page.route("**\/xhr_endpoint", route -> route.fulfill(
   *   new Route.FulfillOptions().setPath(Paths.get("mock_data.json"))));
   * }</pre>
-   *
-   * @since v1.8
   */
  void fulfill(FulfillOptions options);
  /**
   * A request to be routed.
-   *
-   * @since v1.8
   */
  Request request();
 }
@@ -20,21 +20,21 @@ import java.nio.file.Path;

 /**
 * Selectors can be used to install custom selector engines. See <a
- * href="https://playwright.dev/java/docs/extensibility">extensibility</a> for more information.
+ * href="https://playwright.dev/java/docs/selectors">Working with selectors</a> for more information.
 */
 public interface Selectors {
  class RegisterOptions {
    /**
     * Whether to run this selector engine in isolated JavaScript environment. This environment has access to the same DOM, but
-     * not any JavaScript objects from the frame's scripts. Defaults to {@code false}. Note that running as a content script is
-     * not guaranteed when this engine is used together with other registered engines.
+     * not any JavaScript objects from the frame's scripts. Defaults to {@code false}. Note that running as a content script is not
+     * guaranteed when this engine is used together with other registered engines.
     */
    public Boolean contentScript;

    /**
     * Whether to run this selector engine in isolated JavaScript environment. This environment has access to the same DOM, but
-     * not any JavaScript objects from the frame's scripts. Defaults to {@code false}. Note that running as a content script is
-     * not guaranteed when this engine is used together with other registered engines.
+     * not any JavaScript objects from the frame's scripts. Defaults to {@code false}. Note that running as a content script is not
+     * guaranteed when this engine is used together with other registered engines.
     */
    public RegisterOptions setContentScript(boolean contentScript) {
      this.contentScript = contentScript;
@@ -42,13 +42,9 @@ public interface Selectors {
    }
  }
  /**
-   * Selectors must be registered before creating the page.
-   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> An example of registering selector engine that queries elements based on a tag name:
+   * An example of registering selector engine that queries elements based on a tag name:
   * <pre>{@code
-   * // Script that evaluates to a selector engine instance. The script is evaluated in the page context.
+   * // Script that evaluates to a selector engine instance.
   * String createTagNameEngine = "{\n" +
   *   "  // Returns the first element matching given selector in the root's subtree.\n" +
   *   "  query(root, selector) {\n" +
@@ -66,29 +62,24 @@ public interface Selectors {
   * page.setContent("<div><button>Click me</button></div>");
   * // Use the selector prefixed with its name.
   * Locator button = page.locator("tag=button");
-   * // Combine it with built-in locators.
-   * page.locator("tag=div").getByText("Click me").click();
+   * // Combine it with other selector engines.
+   * page.click("tag=div >> text=\"Click me\"");
   * // Can use it in any methods supporting selectors.
   * int buttonCount = (int) page.locator("tag=button").count();
   * browser.close();
   * }</pre>
   *
-   * @param name Name that is used in selectors as a prefix, e.g. {@code {name: 'foo'}} enables {@code foo=myselectorbody} selectors. May
-   * only contain {@code [a-zA-Z0-9_]} characters.
-   * @param script Script that evaluates to a selector engine instance. The script is evaluated in the page context.
-   * @since v1.8
+   * @param name Name that is used in selectors as a prefix, e.g. {@code {name: 'foo'}} enables {@code foo=myselectorbody} selectors. May only
+   * contain {@code [a-zA-Z0-9_]} characters.
+   * @param script Script that evaluates to a selector engine instance.
   */
  default void register(String name, String script) {
    register(name, script, null);
  }
  /**
-   * Selectors must be registered before creating the page.
-   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> An example of registering selector engine that queries elements based on a tag name:
+   * An example of registering selector engine that queries elements based on a tag name:
   * <pre>{@code
-   * // Script that evaluates to a selector engine instance. The script is evaluated in the page context.
+   * // Script that evaluates to a selector engine instance.
   * String createTagNameEngine = "{\n" +
   *   "  // Returns the first element matching given selector in the root's subtree.\n" +
   *   "  query(root, selector) {\n" +
@@ -106,27 +97,22 @@ public interface Selectors {
   * page.setContent("<div><button>Click me</button></div>");
   * // Use the selector prefixed with its name.
   * Locator button = page.locator("tag=button");
-   * // Combine it with built-in locators.
-   * page.locator("tag=div").getByText("Click me").click();
+   * // Combine it with other selector engines.
+   * page.click("tag=div >> text=\"Click me\"");
   * // Can use it in any methods supporting selectors.
   * int buttonCount = (int) page.locator("tag=button").count();
   * browser.close();
   * }</pre>
   *
-   * @param name Name that is used in selectors as a prefix, e.g. {@code {name: 'foo'}} enables {@code foo=myselectorbody} selectors. May
-   * only contain {@code [a-zA-Z0-9_]} characters.
-   * @param script Script that evaluates to a selector engine instance. The script is evaluated in the page context.
-   * @since v1.8
+   * @param name Name that is used in selectors as a prefix, e.g. {@code {name: 'foo'}} enables {@code foo=myselectorbody} selectors. May only
+   * contain {@code [a-zA-Z0-9_]} characters.
+   * @param script Script that evaluates to a selector engine instance.
   */
  void register(String name, String script, RegisterOptions options);
  /**
-   * Selectors must be registered before creating the page.
-   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> An example of registering selector engine that queries elements based on a tag name:
+   * An example of registering selector engine that queries elements based on a tag name:
   * <pre>{@code
-   * // Script that evaluates to a selector engine instance. The script is evaluated in the page context.
+   * // Script that evaluates to a selector engine instance.
   * String createTagNameEngine = "{\n" +
   *   "  // Returns the first element matching given selector in the root's subtree.\n" +
   *   "  query(root, selector) {\n" +
@@ -144,29 +130,24 @@ public interface Selectors {
   * page.setContent("<div><button>Click me</button></div>");
   * // Use the selector prefixed with its name.
   * Locator button = page.locator("tag=button");
-   * // Combine it with built-in locators.
-   * page.locator("tag=div").getByText("Click me").click();
+   * // Combine it with other selector engines.
+   * page.click("tag=div >> text=\"Click me\"");
   * // Can use it in any methods supporting selectors.
   * int buttonCount = (int) page.locator("tag=button").count();
   * browser.close();
   * }</pre>
   *
-   * @param name Name that is used in selectors as a prefix, e.g. {@code {name: 'foo'}} enables {@code foo=myselectorbody} selectors. May
-   * only contain {@code [a-zA-Z0-9_]} characters.
-   * @param script Script that evaluates to a selector engine instance. The script is evaluated in the page context.
-   * @since v1.8
+   * @param name Name that is used in selectors as a prefix, e.g. {@code {name: 'foo'}} enables {@code foo=myselectorbody} selectors. May only
+   * contain {@code [a-zA-Z0-9_]} characters.
+   * @param script Script that evaluates to a selector engine instance.
   */
  default void register(String name, Path script) {
    register(name, script, null);
  }
  /**
-   * Selectors must be registered before creating the page.
-   *
-   * <p> <strong>Usage</strong>
-   *
-   * <p> An example of registering selector engine that queries elements based on a tag name:
+   * An example of registering selector engine that queries elements based on a tag name:
   * <pre>{@code
-   * // Script that evaluates to a selector engine instance. The script is evaluated in the page context.
+   * // Script that evaluates to a selector engine instance.
   * String createTagNameEngine = "{\n" +
   *   "  // Returns the first element matching given selector in the root's subtree.\n" +
   *   "  query(root, selector) {\n" +
@@ -184,26 +165,17 @@ public interface Selectors {
   * page.setContent("<div><button>Click me</button></div>");
   * // Use the selector prefixed with its name.
   * Locator button = page.locator("tag=button");
-   * // Combine it with built-in locators.
-   * page.locator("tag=div").getByText("Click me").click();
+   * // Combine it with other selector engines.
+   * page.click("tag=div >> text=\"Click me\"");
   * // Can use it in any methods supporting selectors.
   * int buttonCount = (int) page.locator("tag=button").count();
   * browser.close();
   * }</pre>
   *
-   * @param name Name that is used in selectors as a prefix, e.g. {@code {name: 'foo'}} enables {@code foo=myselectorbody} selectors. May
-   * only contain {@code [a-zA-Z0-9_]} characters.
-   * @param script Script that evaluates to a selector engine instance. The script is evaluated in the page context.
-   * @since v1.8
+   * @param name Name that is used in selectors as a prefix, e.g. {@code {name: 'foo'}} enables {@code foo=myselectorbody} selectors. May only
+   * contain {@code [a-zA-Z0-9_]} characters.
+   * @param script Script that evaluates to a selector engine instance.
   */
  void register(String name, Path script, RegisterOptions options);
-  /**
-   * Defines custom attribute name to be used in {@link com.microsoft.playwright.Page#getByTestId Page.getByTestId()}. {@code
-   * data-testid} is used by default.
-   *
-   * @param attributeName Test id attribute name.
-   * @since v1.27
-   */
-  void setTestIdAttribute(String attributeName);
 }

@@ -20,20 +20,10 @@ package com.microsoft.playwright;
 /**
 * The Touchscreen class operates in main-frame CSS pixels relative to the top-left corner of the viewport. Methods on the
 * touchscreen can only be used in browser contexts that have been initialized with {@code hasTouch} set to true.
- *
- * <p> This class is limited to emulating tap gestures. For examples of other gestures simulated by manually dispatching touch
- * events, see the <a href="https://playwright.dev/java/docs/touch-events">emulating legacy touch events</a> page.
 */
 public interface Touchscreen {
  /**
   * Dispatches a {@code touchstart} and {@code touchend} event with a single touch at the position ({@code x},{@code y}).
-   *
-   * <p> <strong>NOTE:</strong> {@link com.microsoft.playwright.Page#tap Page.tap()} the method will throw if {@code hasTouch} option of the browser
-   * context is false.
-   *
-   * @param x X coordinate relative to the main frame's viewport in CSS pixels.
-   * @param y Y coordinate relative to the main frame's viewport in CSS pixels.
-   * @since v1.8
   */
  void tap(double x, double y);
 }
@@ -16,19 +16,12 @@

 package com.microsoft.playwright;

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

 /**
 * 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.
 *
- * <p> <strong>NOTE:</strong> You probably want to <a href="https://playwright.dev/docs/api/class-testoptions#test-options-trace">enable tracing in
- * your config file</a> instead of using {@code context.tracing}.The {@code context.tracing} API captures browser operations and network activity, but it doesn't record test assertions
- * (like {@code expect} calls). We recommend <a
- * href="https://playwright.dev/docs/api/class-testoptions#test-options-trace">enabling tracing through Playwright Test
- * configuration</a>, which includes those assertions and provides a more complete trace for debugging test failures.
- *
 * <p> Start recording a trace before performing actions. At the end, stop tracing and save it to a file.
 * <pre>{@code
 * Browser browser = chromium.launch();
@@ -45,10 +38,8 @@ import java.nio.file.Path;
 public interface Tracing {
  class StartOptions {
    /**
-     * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
-     * tracesDir} directory specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify
-     * the final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stop
-     * Tracing.stop()} instead.
+     * If specified, the trace is going to be saved into the file with the given name inside the {@code tracesDir} folder specified
+     * in {@link BrowserType#launch BrowserType.launch()}.
     */
    public String name;
    /**
@@ -65,8 +56,8 @@ public interface Tracing {
    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).
+     * provided via {@code PLAYWRIGHT_JAVA_SRC} environment variable (the paths should be separated by ';' on Windows and by ':' on
+     * other platforms).
     */
    public Boolean sources;
    /**
@@ -75,10 +66,8 @@ public interface Tracing {
    public String title;

    /**
-     * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
-     * tracesDir} directory specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify
-     * the final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stop
-     * Tracing.stop()} instead.
+     * If specified, the trace is going to be saved into the file with the given name inside the {@code tracesDir} folder specified
+     * in {@link BrowserType#launch BrowserType.launch()}.
     */
    public StartOptions setName(String name) {
      this.name = name;
@@ -104,8 +93,8 @@ public interface Tracing {
    }
    /**
     * 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).
+     * 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;
@@ -120,28 +109,11 @@ public interface Tracing {
    }
  }
  class StartChunkOptions {
-    /**
-     * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
-     * tracesDir} directory specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify
-     * the final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stopChunk
-     * Tracing.stopChunk()} instead.
-     */
-    public String name;
    /**
     * Trace name to be shown in the Trace Viewer.
     */
    public String title;

-    /**
-     * If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the {@code
-     * tracesDir} directory specified in {@link com.microsoft.playwright.BrowserType#launch BrowserType.launch()}. To specify
-     * the final trace zip file name, you need to pass {@code path} option to {@link com.microsoft.playwright.Tracing#stopChunk
-     * Tracing.stopChunk()} instead.
-     */
-    public StartChunkOptions setName(String name) {
-      this.name = name;
-      return this;
-    }
    /**
     * Trace name to be shown in the Trace Viewer.
     */
@@ -150,29 +122,6 @@ public interface Tracing {
      return this;
    }
  }
-  class GroupOptions {
-    /**
-     * Specifies a custom location for the group to be shown in the trace viewer. Defaults to the location of the {@link
-     * com.microsoft.playwright.Tracing#group Tracing.group()} call.
-     */
-    public Location location;
-
-    /**
-     * Specifies a custom location for the group to be shown in the trace viewer. Defaults to the location of the {@link
-     * com.microsoft.playwright.Tracing#group Tracing.group()} call.
-     */
-    public GroupOptions setLocation(String file) {
-      return setLocation(new Location(file));
-    }
-    /**
-     * Specifies a custom location for the group to be shown in the trace viewer. Defaults to the location of the {@link
-     * com.microsoft.playwright.Tracing#group Tracing.group()} call.
-     */
-    public GroupOptions setLocation(Location location) {
-      this.location = location;
-      return this;
-    }
-  }
  class StopOptions {
    /**
     * Export trace into the file with the given path.
@@ -189,14 +138,14 @@ public interface Tracing {
  }
  class StopChunkOptions {
    /**
-     * Export trace collected since the last {@link com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} call into
-     * the file with the given path.
+     * Export trace collected since the last {@link Tracing#startChunk Tracing.startChunk()} call into the file with the given
+     * path.
     */
    public Path path;

    /**
-     * Export trace collected since the last {@link com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} call into
-     * the file with the given path.
+     * Export trace collected since the last {@link Tracing#startChunk Tracing.startChunk()} call into the file with the given
+     * path.
     */
    public StopChunkOptions setPath(Path path) {
      this.path = path;
@@ -205,14 +154,6 @@ public interface Tracing {
  }
  /**
   * Start tracing.
-   *
-   * <p> <strong>NOTE:</strong> You probably want to <a href="https://playwright.dev/docs/api/class-testoptions#test-options-trace">enable tracing in
-   * your config file</a> instead of using {@code Tracing.start}.The {@code context.tracing} API captures browser operations and network activity, but it doesn't record test assertions
-   * (like {@code expect} calls). We recommend <a
-   * href="https://playwright.dev/docs/api/class-testoptions#test-options-trace">enabling tracing through Playwright Test
-   * configuration</a>, which includes those assertions and provides a more complete trace for debugging test failures.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * context.tracing().start(new Tracing.StartOptions()
   *   .setScreenshots(true)
@@ -222,22 +163,12 @@ public interface Tracing {
   * context.tracing().stop(new Tracing.StopOptions()
   *   .setPath(Paths.get("trace.zip")));
   * }</pre>
-   *
-   * @since v1.12
   */
  default void start() {
    start(null);
  }
  /**
   * Start tracing.
-   *
-   * <p> <strong>NOTE:</strong> You probably want to <a href="https://playwright.dev/docs/api/class-testoptions#test-options-trace">enable tracing in
-   * your config file</a> instead of using {@code Tracing.start}.The {@code context.tracing} API captures browser operations and network activity, but it doesn't record test assertions
-   * (like {@code expect} calls). We recommend <a
-   * href="https://playwright.dev/docs/api/class-testoptions#test-options-trace">enabling tracing through Playwright Test
-   * configuration</a>, which includes those assertions and provides a more complete trace for debugging test failures.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * context.tracing().start(new Tracing.StartOptions()
   *   .setScreenshots(true)
@@ -247,17 +178,12 @@ public interface Tracing {
   * context.tracing().stop(new Tracing.StopOptions()
   *   .setPath(Paths.get("trace.zip")));
   * }</pre>
-   *
-   * @since v1.12
   */
  void start(StartOptions options);
  /**
-   * Start a new trace chunk. If you'd like to record multiple traces on the same {@code BrowserContext}, use {@link
-   * com.microsoft.playwright.Tracing#start Tracing.start()} once, and then create multiple trace chunks with {@link
-   * com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} and {@link com.microsoft.playwright.Tracing#stopChunk
-   * Tracing.stopChunk()}.
-   *
-   * <p> <strong>Usage</strong>
+   * Start a new trace chunk. If you'd like to record multiple traces on the same {@code BrowserContext}, use {@link Tracing#start
+   * Tracing.start()} once, and then create multiple trace chunks with {@link Tracing#startChunk Tracing.startChunk()} and
+   * {@link Tracing#stopChunk Tracing.stopChunk()}.
   * <pre>{@code
   * context.tracing().start(new Tracing.StartOptions()
   *   .setScreenshots(true)
@@ -266,7 +192,7 @@ public interface Tracing {
   * page.navigate("https://playwright.dev");
   *
   * context.tracing().startChunk();
-   * page.getByText("Get Started").click();
+   * page.click("text=Get Started");
   * // Everything between startChunk and stopChunk will be recorded in the trace.
   * context.tracing().stopChunk(new Tracing.StopChunkOptions()
   *   .setPath(Paths.get("trace1.zip")));
@@ -277,19 +203,14 @@ public interface Tracing {
   * context.tracing().stopChunk(new Tracing.StopChunkOptions()
   *   .setPath(Paths.get("trace2.zip")));
   * }</pre>
-   *
-   * @since v1.15
   */
  default void startChunk() {
    startChunk(null);
  }
  /**
-   * Start a new trace chunk. If you'd like to record multiple traces on the same {@code BrowserContext}, use {@link
-   * com.microsoft.playwright.Tracing#start Tracing.start()} once, and then create multiple trace chunks with {@link
-   * com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} and {@link com.microsoft.playwright.Tracing#stopChunk
-   * Tracing.stopChunk()}.
-   *
-   * <p> <strong>Usage</strong>
+   * Start a new trace chunk. If you'd like to record multiple traces on the same {@code BrowserContext}, use {@link Tracing#start
+   * Tracing.start()} once, and then create multiple trace chunks with {@link Tracing#startChunk Tracing.startChunk()} and
+   * {@link Tracing#stopChunk Tracing.stopChunk()}.
   * <pre>{@code
   * context.tracing().start(new Tracing.StartOptions()
   *   .setScreenshots(true)
@@ -298,7 +219,7 @@ public interface Tracing {
   * page.navigate("https://playwright.dev");
   *
   * context.tracing().startChunk();
-   * page.getByText("Get Started").click();
+   * page.click("text=Get Started");
   * // Everything between startChunk and stopChunk will be recorded in the trace.
   * context.tracing().stopChunk(new Tracing.StopChunkOptions()
   *   .setPath(Paths.get("trace1.zip")));
@@ -309,88 +230,26 @@ public interface Tracing {
   * context.tracing().stopChunk(new Tracing.StopChunkOptions()
   *   .setPath(Paths.get("trace2.zip")));
   * }</pre>
-   *
-   * @since v1.15
   */
  void startChunk(StartChunkOptions options);
-  /**
-   * <strong>NOTE:</strong> Use {@code test.step} instead when available.
-   *
-   * <p> Creates a new group within the trace, assigning any subsequent API calls to this group, until {@link
-   * com.microsoft.playwright.Tracing#groupEnd Tracing.groupEnd()} is called. Groups can be nested and will be visible in the
-   * trace viewer.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * // All actions between group and groupEnd
-   * // will be shown in the trace viewer as a group.
-   * page.context().tracing().group("Open Playwright.dev > API");
-   * page.navigate("https://playwright.dev/");
-   * page.getByRole(AriaRole.LINK, new Page.GetByRoleOptions().setName("API")).click();
-   * page.context().tracing().groupEnd();
-   * }</pre>
-   *
-   * @param name Group name shown in the trace viewer.
-   * @since v1.49
-   */
-  default void group(String name) {
-    group(name, null);
-  }
-  /**
-   * <strong>NOTE:</strong> Use {@code test.step} instead when available.
-   *
-   * <p> Creates a new group within the trace, assigning any subsequent API calls to this group, until {@link
-   * com.microsoft.playwright.Tracing#groupEnd Tracing.groupEnd()} is called. Groups can be nested and will be visible in the
-   * trace viewer.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * // All actions between group and groupEnd
-   * // will be shown in the trace viewer as a group.
-   * page.context().tracing().group("Open Playwright.dev > API");
-   * page.navigate("https://playwright.dev/");
-   * page.getByRole(AriaRole.LINK, new Page.GetByRoleOptions().setName("API")).click();
-   * page.context().tracing().groupEnd();
-   * }</pre>
-   *
-   * @param name Group name shown in the trace viewer.
-   * @since v1.49
-   */
-  void group(String name, GroupOptions options);
-  /**
-   * Closes the last group created by {@link com.microsoft.playwright.Tracing#group Tracing.group()}.
-   *
-   * @since v1.49
-   */
-  void groupEnd();
  /**
   * Stop tracing.
-   *
-   * @since v1.12
   */
  default void stop() {
    stop(null);
  }
  /**
   * Stop tracing.
-   *
-   * @since v1.12
   */
  void stop(StopOptions options);
  /**
-   * Stop the trace chunk. See {@link com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} for more details
-   * about multiple trace chunks.
-   *
-   * @since v1.15
+   * Stop the trace chunk. See {@link Tracing#startChunk Tracing.startChunk()} for more details about multiple trace chunks.
   */
  default void stopChunk() {
    stopChunk(null);
  }
  /**
-   * Stop the trace chunk. See {@link com.microsoft.playwright.Tracing#startChunk Tracing.startChunk()} for more details
-   * about multiple trace chunks.
-   *
-   * @since v1.15
+   * Stop the trace chunk. See {@link Tracing#startChunk Tracing.startChunk()} for more details about multiple trace chunks.
   */
  void stopChunk(StopChunkOptions options);
 }
@@ -27,15 +27,11 @@ import java.nio.file.Path;
 public interface Video {
  /**
   * Deletes the video file. Will wait for the video to finish if necessary.
-   *
-   * @since v1.11
   */
  void delete();
  /**
   * Returns the file system path this video will be recorded to. The video is guaranteed to be written to the filesystem
   * upon closing the browser context. This method throws when connected remotely.
-   *
-   * @since v1.8
   */
  Path path();
  /**
@@ -43,7 +39,6 @@ public interface Video {
   * the page has closed. This method waits until the page is closed and the video is fully saved.
   *
   * @param path Path where the video should be saved.
-   * @since v1.11
   */
  void saveAs(Path path);
 }
@@ -1,47 +0,0 @@
-/*
- * 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;
-
-
-/**
- * {@code WebError} class represents an unhandled exception thrown in the page. It is dispatched via the {@link
- * com.microsoft.playwright.BrowserContext#onWebError BrowserContext.onWebError()} event.
- * <pre>{@code
- * // Log all uncaught errors to the terminal
- * context.onWebError(webError -> {
- *   System.out.println("Uncaught exception: " + webError.error());
- * });
- *
- * // Navigate to a page with an exception.
- * page.navigate("data:text/html,<script>throw new Error('Test')</script>");
- * }</pre>
- */
-public interface WebError {
-  /**
-   * The page that produced this unhandled exception, if any.
-   *
-   * @since v1.38
-   */
-  Page page();
-  /**
-   * Unhandled error that was thrown.
-   *
-   * @since v1.38
-   */
-  String error();
-}
-
@@ -20,10 +20,7 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;

 /**
- * The {@code WebSocket} class represents WebSocket connections within a page. It provides the ability to inspect and
- * manipulate the data being transmitted and received.
- *
- * <p> If you want to intercept or modify WebSocket frames, consider using {@code WebSocketRoute}.
+ * The {@code WebSocket} class represents websocket connections in the page.
 */
 public interface WebSocket {

@@ -69,9 +66,8 @@ public interface WebSocket {
     */
    public Predicate<WebSocketFrame> predicate;
    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
     */
    public Double timeout;

@@ -83,9 +79,8 @@ public interface WebSocket {
      return this;
    }
    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
     */
    public WaitForFrameReceivedOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -98,9 +93,8 @@ public interface WebSocket {
     */
    public Predicate<WebSocketFrame> predicate;
    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
     */
    public Double timeout;

@@ -112,9 +106,8 @@ public interface WebSocket {
      return this;
    }
    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
     */
    public WaitForFrameSentOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -123,54 +116,46 @@ public interface WebSocket {
  }
  /**
   * Indicates that the web socket has been closed.
-   *
-   * @since v1.8
   */
  boolean isClosed();
  /**
   * Contains the URL of the WebSocket.
-   *
-   * @since v1.8
   */
  String url();
  /**
-   * Performs action and waits for a frame to be sent. If predicate is provided, it passes {@code WebSocketFrame} value into
-   * the {@code predicate} function and waits for {@code predicate(webSocketFrame)} to return a truthy value. Will throw an
-   * error if the WebSocket or Page is closed before the frame is received.
+   * Performs action and waits for a frame to be sent. If predicate is provided, it passes {@code WebSocketFrame} value into the
+   * {@code predicate} function and waits for {@code predicate(webSocketFrame)} to return a truthy value. Will throw an error if the
+   * WebSocket or Page is closed before the frame is received.
   *
   * @param callback Callback that performs the action triggering the event.
-   * @since v1.10
   */
  default WebSocketFrame waitForFrameReceived(Runnable callback) {
    return waitForFrameReceived(null, callback);
  }
  /**
-   * Performs action and waits for a frame to be sent. If predicate is provided, it passes {@code WebSocketFrame} value into
-   * the {@code predicate} function and waits for {@code predicate(webSocketFrame)} to return a truthy value. Will throw an
-   * error if the WebSocket or Page is closed before the frame is received.
+   * Performs action and waits for a frame to be sent. If predicate is provided, it passes {@code WebSocketFrame} value into the
+   * {@code predicate} function and waits for {@code predicate(webSocketFrame)} to return a truthy value. Will throw an error if the
+   * WebSocket or Page is closed before the frame is received.
   *
   * @param callback Callback that performs the action triggering the event.
-   * @since v1.10
   */
  WebSocketFrame waitForFrameReceived(WaitForFrameReceivedOptions options, Runnable callback);
  /**
-   * Performs action and waits for a frame to be sent. If predicate is provided, it passes {@code WebSocketFrame} value into
-   * the {@code predicate} function and waits for {@code predicate(webSocketFrame)} to return a truthy value. Will throw an
-   * error if the WebSocket or Page is closed before the frame is sent.
+   * Performs action and waits for a frame to be sent. If predicate is provided, it passes {@code WebSocketFrame} value into the
+   * {@code predicate} function and waits for {@code predicate(webSocketFrame)} to return a truthy value. Will throw an error if the
+   * WebSocket or Page is closed before the frame is sent.
   *
   * @param callback Callback that performs the action triggering the event.
-   * @since v1.10
   */
  default WebSocketFrame waitForFrameSent(Runnable callback) {
    return waitForFrameSent(null, callback);
  }
  /**
-   * Performs action and waits for a frame to be sent. If predicate is provided, it passes {@code WebSocketFrame} value into
-   * the {@code predicate} function and waits for {@code predicate(webSocketFrame)} to return a truthy value. Will throw an
-   * error if the WebSocket or Page is closed before the frame is sent.
+   * Performs action and waits for a frame to be sent. If predicate is provided, it passes {@code WebSocketFrame} value into the
+   * {@code predicate} function and waits for {@code predicate(webSocketFrame)} to return a truthy value. Will throw an error if the
+   * WebSocket or Page is closed before the frame is sent.
   *
   * @param callback Callback that performs the action triggering the event.
-   * @since v1.10
   */
  WebSocketFrame waitForFrameSent(WaitForFrameSentOptions options, Runnable callback);
 }
@@ -18,21 +18,17 @@ package com.microsoft.playwright;


 /**
- * The {@code WebSocketFrame} class represents frames sent over {@code WebSocket} connections in the page. Frame payload is
- * returned by either {@link com.microsoft.playwright.WebSocketFrame#text WebSocketFrame.text()} or {@link
- * com.microsoft.playwright.WebSocketFrame#binary WebSocketFrame.binary()} method depending on the its type.
+ * The {@code WebSocketFrame} class represents frames sent over {@code WebSocket} connections in the page. Frame payload is returned by
+ * either {@link WebSocketFrame#text WebSocketFrame.text()} or {@link WebSocketFrame#binary WebSocketFrame.binary()} method
+ * depending on the its type.
 */
 public interface WebSocketFrame {
  /**
   * Returns binary payload.
-   *
-   * @since v1.9
   */
  byte[] binary();
  /**
   * Returns text payload.
-   *
-   * @since v1.9
   */
  String text();
 }
@@ -1,223 +0,0 @@
-/*
- * 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 java.util.function.BiConsumer;
-import java.util.function.Consumer;
-
-/**
- * Whenever a <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket">{@code WebSocket}</a> route is set up
- * with {@link com.microsoft.playwright.Page#routeWebSocket Page.routeWebSocket()} or {@link
- * com.microsoft.playwright.BrowserContext#routeWebSocket BrowserContext.routeWebSocket()}, the {@code WebSocketRoute}
- * object allows to handle the WebSocket, like an actual server would do.
- *
- * <p> <strong>Mocking</strong>
- *
- * <p> By default, the routed WebSocket will not connect to the server. This way, you can mock entire communication over the
- * WebSocket. Here is an example that responds to a {@code "request"} with a {@code "response"}.
- * <pre>{@code
- * page.routeWebSocket("wss://example.com/ws", ws -> {
- *   ws.onMessage(frame -> {
- *     if ("request".equals(frame.text()))
- *       ws.send("response");
- *   });
- * });
- * }</pre>
- *
- * <p> Since we do not call {@link com.microsoft.playwright.WebSocketRoute#connectToServer WebSocketRoute.connectToServer()}
- * inside the WebSocket route handler, Playwright assumes that WebSocket will be mocked, and opens the WebSocket inside the
- * page automatically.
- *
- * <p> Here is another example that handles JSON messages:
- * <pre>{@code
- * page.routeWebSocket("wss://example.com/ws", ws -> {
- *   ws.onMessage(frame -> {
- *     JsonObject json = new JsonParser().parse(frame.text()).getAsJsonObject();
- *     if ("question".equals(json.get("request").getAsString())) {
- *       Map<String, String> result = new HashMap();
- *       result.put("response", "answer");
- *       ws.send(gson.toJson(result));
- *     }
- *   });
- * });
- * }</pre>
- *
- * <p> <strong>Intercepting</strong>
- *
- * <p> Alternatively, you may want to connect to the actual server, but intercept messages in-between and modify or block them.
- * Calling {@link com.microsoft.playwright.WebSocketRoute#connectToServer WebSocketRoute.connectToServer()} returns a
- * server-side {@code WebSocketRoute} instance that you can send messages to, or handle incoming messages.
- *
- * <p> Below is an example that modifies some messages sent by the page to the server. Messages sent from the server to the
- * page are left intact, relying on the default forwarding.
- * <pre>{@code
- * page.routeWebSocket("/ws", ws -> {
- *   WebSocketRoute server = ws.connectToServer();
- *   ws.onMessage(frame -> {
- *     if ("request".equals(frame.text()))
- *       server.send("request2");
- *     else
- *       server.send(frame.text());
- *   });
- * });
- * }</pre>
- *
- * <p> After connecting to the server, all **messages are forwarded** between the page and the server by default.
- *
- * <p> However, if you call {@link com.microsoft.playwright.WebSocketRoute#onMessage WebSocketRoute.onMessage()} on the
- * original route, messages from the page to the server **will not be forwarded** anymore, but should instead be handled by
- * the {@code handler}.
- *
- * <p> Similarly, calling {@link com.microsoft.playwright.WebSocketRoute#onMessage WebSocketRoute.onMessage()} on the
- * server-side WebSocket will **stop forwarding messages** from the server to the page, and {@code handler} should take
- * care of them.
- *
- * <p> The following example blocks some messages in both directions. Since it calls {@link
- * com.microsoft.playwright.WebSocketRoute#onMessage WebSocketRoute.onMessage()} in both directions, there is no automatic
- * forwarding at all.
- * <pre>{@code
- * page.routeWebSocket("/ws", ws -> {
- *   WebSocketRoute server = ws.connectToServer();
- *   ws.onMessage(frame -> {
- *     if (!"blocked-from-the-page".equals(frame.text()))
- *       server.send(frame.text());
- *   });
- *   server.onMessage(frame -> {
- *     if (!"blocked-from-the-server".equals(frame.text()))
- *       ws.send(frame.text());
- *   });
- * });
- * }</pre>
- */
-public interface WebSocketRoute {
-  class CloseOptions {
-    /**
-     * Optional <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#code">close code</a>.
-     */
-    public Integer code;
-    /**
-     * Optional <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason">close reason</a>.
-     */
-    public String reason;
-
-    /**
-     * Optional <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#code">close code</a>.
-     */
-    public CloseOptions setCode(int code) {
-      this.code = code;
-      return this;
-    }
-    /**
-     * Optional <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason">close reason</a>.
-     */
-    public CloseOptions setReason(String reason) {
-      this.reason = reason;
-      return this;
-    }
-  }
-  /**
-   * Closes one side of the WebSocket connection.
-   *
-   * @since v1.48
-   */
-  default void close() {
-    close(null);
-  }
-  /**
-   * Closes one side of the WebSocket connection.
-   *
-   * @since v1.48
-   */
-  void close(CloseOptions options);
-  /**
-   * By default, routed WebSocket does not connect to the server, so you can mock entire WebSocket communication. This method
-   * connects to the actual WebSocket server, and returns the server-side {@code WebSocketRoute} instance, giving the ability
-   * to send and receive messages from the server.
-   *
-   * <p> Once connected to the server:
-   * <ul>
-   * <li> Messages received from the server will be **automatically forwarded** to the WebSocket in the page, unless {@link
-   * com.microsoft.playwright.WebSocketRoute#onMessage WebSocketRoute.onMessage()} is called on the server-side {@code
-   * WebSocketRoute}.</li>
-   * <li> Messages sent by the <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/send">{@code
-   * WebSocket.send()}</a> call in the page will be **automatically forwarded** to the server, unless {@link
-   * com.microsoft.playwright.WebSocketRoute#onMessage WebSocketRoute.onMessage()} is called on the original {@code
-   * WebSocketRoute}.</li>
-   * </ul>
-   *
-   * <p> See examples at the top for more details.
-   *
-   * @since v1.48
-   */
-  WebSocketRoute connectToServer();
-  /**
-   * Allows to handle <a href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close">{@code WebSocket.close}</a>.
-   *
-   * <p> By default, closing one side of the connection, either in the page or on the server, will close the other side. However,
-   * when {@link com.microsoft.playwright.WebSocketRoute#onClose WebSocketRoute.onClose()} handler is set up, the default
-   * forwarding of closure is disabled, and handler should take care of it.
-   *
-   * @param handler Function that will handle WebSocket closure. Received an optional <a
-   * href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#code">close code</a> and an optional <a
-   * href="https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/close#reason">close reason</a>.
-   * @since v1.48
-   */
-  void onClose(BiConsumer<Integer, String> handler);
-  /**
-   * This method allows to handle messages that are sent by the WebSocket, either from the page or from the server.
-   *
-   * <p> When called on the original WebSocket route, this method handles messages sent from the page. You can handle this
-   * messages by responding to them with {@link com.microsoft.playwright.WebSocketRoute#send WebSocketRoute.send()},
-   * forwarding them to the server-side connection returned by {@link com.microsoft.playwright.WebSocketRoute#connectToServer
-   * WebSocketRoute.connectToServer()} or do something else.
-   *
-   * <p> Once this method is called, messages are not automatically forwarded to the server or to the page - you should do that
-   * manually by calling {@link com.microsoft.playwright.WebSocketRoute#send WebSocketRoute.send()}. See examples at the top
-   * for more details.
-   *
-   * <p> Calling this method again will override the handler with a new one.
-   *
-   * @param handler Function that will handle messages.
-   * @since v1.48
-   */
-  void onMessage(Consumer<WebSocketFrame> handler);
-  /**
-   * Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called on
-   * the result of {@link com.microsoft.playwright.WebSocketRoute#connectToServer WebSocketRoute.connectToServer()}, sends
-   * the message to the server. See examples at the top for more details.
-   *
-   * @param message Message to send.
-   * @since v1.48
-   */
-  void send(String message);
-  /**
-   * Sends a message to the WebSocket. When called on the original WebSocket, sends the message to the page. When called on
-   * the result of {@link com.microsoft.playwright.WebSocketRoute#connectToServer WebSocketRoute.connectToServer()}, sends
-   * the message to the server. See examples at the top for more details.
-   *
-   * @param message Message to send.
-   * @since v1.48
-   */
-  void send(byte[] message);
-  /**
-   * URL of the WebSocket created in the page.
-   *
-   * @since v1.48
-   */
-  String url();
-}
-
@@ -17,12 +17,11 @@
 package com.microsoft.playwright;

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

 /**
 * The Worker class represents a <a href="https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API">WebWorker</a>.
- * {@code worker} event is emitted on the page object to signal a worker creation. {@code close} event is emitted on the
- * worker object when the worker is gone.
+ * {@code worker} event is emitted on the page object to signal a worker creation. {@code close} event is emitted on the worker object
+ * when the worker is gone.
 * <pre>{@code
 * page.onWorker(worker -> {
 *   System.out.println("Worker created: " + worker.url());
@@ -45,78 +44,35 @@ public interface Worker {
   */
  void offClose(Consumer<Worker> handler);

-  /**
-   * Emitted when JavaScript within the worker calls one of console API methods, e.g. {@code console.log} or {@code
-   * console.dir}.
-   */
-  void onConsole(Consumer<ConsoleMessage> handler);
-  /**
-   * Removes handler that was previously added with {@link #onConsole onConsole(handler)}.
-   */
-  void offConsole(Consumer<ConsoleMessage> handler);
-
  class WaitForCloseOptions {
    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
     */
    public Double timeout;

    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
+     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The default
+     * value can be changed by using the {@link BrowserContext#setDefaultTimeout BrowserContext.setDefaultTimeout()}.
     */
    public WaitForCloseOptions setTimeout(double timeout) {
      this.timeout = timeout;
      return this;
    }
  }
-  class WaitForConsoleMessageOptions {
-    /**
-     * Receives the {@code ConsoleMessage} object and resolves to true when the waiting should resolve.
-     */
-    public Predicate<ConsoleMessage> predicate;
-    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
-     */
-    public Double timeout;
-
-    /**
-     * Receives the {@code ConsoleMessage} object and resolves to true when the waiting should resolve.
-     */
-    public WaitForConsoleMessageOptions setPredicate(Predicate<ConsoleMessage> predicate) {
-      this.predicate = predicate;
-      return this;
-    }
-    /**
-     * Maximum time to wait for in milliseconds. Defaults to {@code 30000} (30 seconds). Pass {@code 0} to disable timeout. The
-     * default value can be changed by using the {@link com.microsoft.playwright.BrowserContext#setDefaultTimeout
-     * BrowserContext.setDefaultTimeout()}.
-     */
-    public WaitForConsoleMessageOptions setTimeout(double timeout) {
-      this.timeout = timeout;
-      return this;
-    }
-  }
  /**
   * Returns the return value of {@code expression}.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} returns a <a
+   * <p> If the function passed to the {@link Worker#evaluate Worker.evaluate()} returns a <a
   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@link
-   * com.microsoft.playwright.Worker#evaluate Worker.evaluate()} would wait for the promise to resolve and return its value.
+   * Worker#evaluate Worker.evaluate()} would wait for the promise to resolve and return its value.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} returns a
-   * non-[Serializable] value, then {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} returns {@code
-   * undefined}. Playwright also supports transferring some additional values that are not serializable by {@code JSON}:
-   * {@code -0}, {@code NaN}, {@code Infinity}, {@code -Infinity}.
+   * <p> If the function passed to the {@link Worker#evaluate Worker.evaluate()} returns a non-[Serializable] value, then {@link
+   * Worker#evaluate Worker.evaluate()} returns {@code undefined}. Playwright also supports transferring some additional values
+   * that are not serializable by {@code JSON}: {@code -0}, {@code NaN}, {@code Infinity}, {@code -Infinity}.
   *
-   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
-   * automatically invoked.
-   * @since v1.8
+   * @param expression JavaScript expression to be evaluated in the browser context. If it looks like a function declaration, it is interpreted
+   * as a function. Otherwise, evaluated as an expression.
   */
  default Object evaluate(String expression) {
    return evaluate(expression, null);
@@ -124,36 +80,31 @@ public interface Worker {
  /**
   * Returns the return value of {@code expression}.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} returns a <a
+   * <p> If the function passed to the {@link Worker#evaluate Worker.evaluate()} returns a <a
   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@link
-   * com.microsoft.playwright.Worker#evaluate Worker.evaluate()} would wait for the promise to resolve and return its value.
+   * Worker#evaluate Worker.evaluate()} would wait for the promise to resolve and return its value.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} returns a
-   * non-[Serializable] value, then {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} returns {@code
-   * undefined}. Playwright also supports transferring some additional values that are not serializable by {@code JSON}:
-   * {@code -0}, {@code NaN}, {@code Infinity}, {@code -Infinity}.
+   * <p> If the function passed to the {@link Worker#evaluate Worker.evaluate()} returns a non-[Serializable] value, then {@link
+   * Worker#evaluate Worker.evaluate()} returns {@code undefined}. Playwright also supports transferring some additional values
+   * that are not serializable by {@code JSON}: {@code -0}, {@code NaN}, {@code Infinity}, {@code -Infinity}.
   *
-   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
-   * automatically invoked.
+   * @param expression JavaScript expression to be evaluated in the browser context. If it looks like a function declaration, it is interpreted
+   * as a function. Otherwise, evaluated as an expression.
   * @param arg Optional argument to pass to {@code expression}.
-   * @since v1.8
   */
  Object evaluate(String expression, Object arg);
  /**
   * Returns the return value of {@code expression} as a {@code JSHandle}.
   *
-   * <p> The only difference between {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} and {@link
-   * com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} is that {@link
-   * com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} returns {@code JSHandle}.
+   * <p> The only difference between {@link Worker#evaluate Worker.evaluate()} and {@link Worker#evaluateHandle
+   * Worker.evaluateHandle()} is that {@link Worker#evaluateHandle Worker.evaluateHandle()} returns {@code JSHandle}.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} returns a
-   * <a href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then
-   * {@link com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} would wait for the promise to resolve and
-   * return its value.
+   * <p> If the function passed to the {@link Worker#evaluateHandle Worker.evaluateHandle()} returns a <a
+   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@link
+   * Worker#evaluateHandle Worker.evaluateHandle()} would wait for the promise to resolve and return its value.
   *
-   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
-   * automatically invoked.
-   * @since v1.8
+   * @param expression JavaScript expression to be evaluated in the browser context. If it looks like a function declaration, it is interpreted
+   * as a function. Otherwise, evaluated as an expression.
   */
  default JSHandle evaluateHandle(String expression) {
    return evaluateHandle(expression, null);
@@ -161,32 +112,23 @@ public interface Worker {
  /**
   * Returns the return value of {@code expression} as a {@code JSHandle}.
   *
-   * <p> The only difference between {@link com.microsoft.playwright.Worker#evaluate Worker.evaluate()} and {@link
-   * com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} is that {@link
-   * com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} returns {@code JSHandle}.
+   * <p> The only difference between {@link Worker#evaluate Worker.evaluate()} and {@link Worker#evaluateHandle
+   * Worker.evaluateHandle()} is that {@link Worker#evaluateHandle Worker.evaluateHandle()} returns {@code JSHandle}.
   *
-   * <p> If the function passed to the {@link com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} returns a
-   * <a href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then
-   * {@link com.microsoft.playwright.Worker#evaluateHandle Worker.evaluateHandle()} would wait for the promise to resolve and
-   * return its value.
+   * <p> If the function passed to the {@link Worker#evaluateHandle Worker.evaluateHandle()} returns a <a
+   * href='https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise'>Promise</a>, then {@link
+   * Worker#evaluateHandle Worker.evaluateHandle()} would wait for the promise to resolve and return its value.
   *
-   * @param expression JavaScript expression to be evaluated in the browser context. If the expression evaluates to a function, the function is
-   * automatically invoked.
+   * @param expression JavaScript expression to be evaluated in the browser context. If it looks like a function declaration, it is interpreted
+   * as a function. Otherwise, evaluated as an expression.
   * @param arg Optional argument to pass to {@code expression}.
-   * @since v1.8
   */
  JSHandle evaluateHandle(String expression, Object arg);
-  /**
-   *
-   *
-   * @since v1.8
-   */
  String url();
  /**
   * Performs action and waits for the Worker to close.
   *
   * @param callback Callback that performs the action triggering the event.
-   * @since v1.10
   */
  default Worker waitForClose(Runnable callback) {
    return waitForClose(null, callback);
@@ -195,24 +137,7 @@ public interface Worker {
   * Performs action and waits for the Worker to close.
   *
   * @param callback Callback that performs the action triggering the event.
-   * @since v1.10
   */
  Worker waitForClose(WaitForCloseOptions options, Runnable callback);
-  /**
-   * Performs action and waits for a console message.
-   *
-   * @param callback Callback that performs the action triggering the event.
-   * @since v1.57
-   */
-  default ConsoleMessage waitForConsoleMessage(Runnable callback) {
-    return waitForConsoleMessage(null, callback);
-  }
-  /**
-   * Performs action and waits for a console message.
-   *
-   * @param callback Callback that performs the action triggering the event.
-   * @since v1.57
-   */
-  ConsoleMessage waitForConsoleMessage(WaitForConsoleMessageOptions options, Runnable callback);
 }

@@ -18,18 +18,19 @@ 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.
+ * 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");
+ *     ...
+ *     APIResponse response = page.request().get('https://playwright.dev');
 *     assertThat(response).isOK();
 *   }
 * }
@@ -42,19 +43,13 @@ public interface APIResponseAssertions {
   * <pre>{@code
   * assertThat(response).not().isOK();
   * }</pre>
-   *
-   * @since v1.20
   */
  APIResponseAssertions not();
  /**
-   * Ensures the response status code is within {@code 200..299} range.
-   *
-   * <p> <strong>Usage</strong>
+   * Ensures the response status code is within [200..299] range.
   * <pre>{@code
   * assertThat(response).isOK();
   * }</pre>
-   *
-   * @since v1.18
   */
  void isOK();
 }
@@ -19,18 +19,19 @@ package com.microsoft.playwright.assertions;
 import java.util.regex.Pattern;

 /**
- * The {@code PageAssertions} class provides assertion methods that can be used to make assertions about the {@code Page}
- * state in the tests.
+ * 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 PageAssertions} 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() {
- *     // ...
- *     page.getByText("Sign in").click();
+ *     ...
+ *     page.click("#login");
 *     assertThat(page).hasURL(Pattern.compile(".*\/login"));
 *   }
 * }
@@ -39,12 +40,12 @@ import java.util.regex.Pattern;
 public interface PageAssertions {
  class HasTitleOptions {
    /**
-     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     * Time to retry the assertion for.
     */
    public Double timeout;

    /**
-     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     * Time to retry the assertion for.
     */
    public HasTitleOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -53,25 +54,12 @@ public interface PageAssertions {
  }
  class HasURLOptions {
    /**
-     * Whether to perform case-insensitive match. {@code ignoreCase} option takes precedence over the corresponding regular
-     * expression parameter if specified. A provided predicate ignores this flag.
-     */
-    public Boolean ignoreCase;
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     * Time to retry the assertion for.
     */
    public Double timeout;

    /**
-     * Whether to perform case-insensitive match. {@code ignoreCase} option takes precedence over the corresponding regular
-     * expression parameter if specified. A provided predicate ignores this flag.
-     */
-    public HasURLOptions setIgnoreCase(boolean ignoreCase) {
-      this.ignoreCase = ignoreCase;
-      return this;
-    }
-    /**
-     * Time to retry the assertion for in milliseconds. Defaults to {@code 5000}.
+     * Time to retry the assertion for.
     */
    public HasURLOptions setTimeout(double timeout) {
      this.timeout = timeout;
@@ -84,112 +72,86 @@ public interface PageAssertions {
   * <pre>{@code
   * assertThat(page).not().hasURL("error");
   * }</pre>
-   *
-   * @since v1.20
   */
  PageAssertions not();
  /**
   * Ensures the page has the given title.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * assertThat(page).hasTitle("Playwright");
   * }</pre>
   *
   * @param titleOrRegExp Expected title or RegExp.
-   * @since v1.20
   */
  default void hasTitle(String titleOrRegExp) {
    hasTitle(titleOrRegExp, null);
  }
  /**
   * Ensures the page has the given title.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * assertThat(page).hasTitle("Playwright");
   * }</pre>
   *
   * @param titleOrRegExp Expected title or RegExp.
-   * @since v1.20
   */
  void hasTitle(String titleOrRegExp, HasTitleOptions options);
  /**
   * Ensures the page has the given title.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * assertThat(page).hasTitle("Playwright");
   * }</pre>
   *
   * @param titleOrRegExp Expected title or RegExp.
-   * @since v1.20
   */
  default void hasTitle(Pattern titleOrRegExp) {
    hasTitle(titleOrRegExp, null);
  }
  /**
   * Ensures the page has the given title.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * assertThat(page).hasTitle("Playwright");
   * }</pre>
   *
   * @param titleOrRegExp Expected title or RegExp.
-   * @since v1.20
   */
  void hasTitle(Pattern titleOrRegExp, HasTitleOptions options);
  /**
   * Ensures the page is navigated to the given URL.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * assertThat(page).hasURL(".com");
   * }</pre>
   *
-   * @param urlOrRegExp Expected URL string or RegExp.
-   * @since v1.20
+   * @param urlOrRegExp Expected substring or RegExp.
   */
  default void hasURL(String urlOrRegExp) {
    hasURL(urlOrRegExp, null);
  }
  /**
   * Ensures the page is navigated to the given URL.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * assertThat(page).hasURL(".com");
   * }</pre>
   *
-   * @param urlOrRegExp Expected URL string or RegExp.
-   * @since v1.20
+   * @param urlOrRegExp Expected substring or RegExp.
   */
  void hasURL(String urlOrRegExp, HasURLOptions options);
  /**
   * Ensures the page is navigated to the given URL.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * assertThat(page).hasURL(".com");
   * }</pre>
   *
-   * @param urlOrRegExp Expected URL string or RegExp.
-   * @since v1.20
+   * @param urlOrRegExp Expected substring or RegExp.
   */
  default void hasURL(Pattern urlOrRegExp) {
    hasURL(urlOrRegExp, null);
  }
  /**
   * Ensures the page is navigated to the given URL.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * assertThat(page).hasURL(".com");
   * }</pre>
   *
-   * @param urlOrRegExp Expected URL string or RegExp.
-   * @since v1.20
+   * @param urlOrRegExp Expected substring or RegExp.
   */
  void hasURL(Pattern urlOrRegExp, HasURLOptions options);
 }
@@ -20,7 +20,6 @@ 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.AssertionsTimeout;
 import com.microsoft.playwright.impl.LocatorAssertionsImpl;
 import com.microsoft.playwright.impl.PageAssertionsImpl;

@@ -30,36 +29,34 @@ import com.microsoft.playwright.impl.PageAssertionsImpl;
 *
 * <p> Consider the following example:
 * <pre>{@code
+ * ...
 * import static com.microsoft.playwright.assertions.PlaywrightAssertions.assertThat;
 *
 * public class TestExample {
- *   // ...
+ *   ...
 *   @Test
 *   void statusBecomesSubmitted() {
- *     // ...
- *     page.locator("#submit-button").click();
+ *     ...
+ *     page.click("#submit-button");
 *     assertThat(page.locator(".status")).hasText("Submitted");
 *   }
 * }
 * }</pre>
 *
- * <p> Playwright will be re-testing the node with the selector {@code .status} until fetched Node has the {@code "Submitted"}
- * text. It will be re-fetching the node and checking it over and over, until the condition is met or until the timeout is
- * reached. You can pass this timeout as an option.
+ * <p> Playwright will be re-testing the node with the selector {@code .status} until fetched Node has the {@code "Submitted"} text. It
+ * will be re-fetching the node and checking it over and over, until the condition is met or until the timeout is reached.
+ * You can pass this timeout as an option.
 *
 * <p> By default, the timeout for assertions is set to 5 seconds.
 */
 public interface PlaywrightAssertions {
  /**
   * Creates a {@code APIResponseAssertions} object for the given {@code APIResponse}.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * PlaywrightAssertions.assertThat(response).isOK();
   * }</pre>
   *
   * @param response {@code APIResponse} object to use for assertions.
-   * @since v1.18
   */
  static APIResponseAssertions assertThat(APIResponse response) {
    return new APIResponseAssertionsImpl(response);
@@ -67,14 +64,11 @@ public interface PlaywrightAssertions {

  /**
   * Creates a {@code LocatorAssertions} object for the given {@code Locator}.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * PlaywrightAssertions.assertThat(locator).isVisible();
   * }</pre>
   *
   * @param locator {@code Locator} object to use for assertions.
-   * @since v1.18
   */
  static LocatorAssertions assertThat(Locator locator) {
    return new LocatorAssertionsImpl(locator);
@@ -82,33 +76,15 @@ public interface PlaywrightAssertions {

  /**
   * Creates a {@code PageAssertions} object for the given {@code Page}.
-   *
-   * <p> <strong>Usage</strong>
   * <pre>{@code
   * PlaywrightAssertions.assertThat(page).hasTitle("News");
   * }</pre>
   *
   * @param page {@code Page} object to use for assertions.
-   * @since v1.18
   */
  static PageAssertions assertThat(Page page) {
    return new PageAssertionsImpl(page);
  }

-  /**
-   * Changes default timeout for Playwright assertions from 5 seconds to the specified value.
-   *
-   * <p> <strong>Usage</strong>
-   * <pre>{@code
-   * PlaywrightAssertions.setDefaultAssertionTimeout(30_000);
-   * }</pre>
-   *
-   * @param timeout Timeout in milliseconds.
-   * @since v1.25
-   */
-  static void setDefaultAssertionTimeout(double timeout) {
-    AssertionsTimeout.setDefaultTimeout(timeout);
-  }
-
 }

@@ -1,22 +1,8 @@
-/*
- * 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.*;
+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;
@@ -29,7 +15,6 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.Base64;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;

 import static com.microsoft.playwright.impl.Serialization.*;
@@ -37,9 +22,6 @@ import static com.microsoft.playwright.impl.Utils.toFilePayload;

 class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
  private final TracingImpl tracing;
-  private String disposeReason;
-
-  protected TimeoutSettings timeoutSettings = new TimeoutSettings();

  APIRequestContextImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
@@ -52,18 +34,13 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
  }

  @Override
-  public void dispose(DisposeOptions options) {
-    if (options == null) {
-      options = new DisposeOptions();
-    }
-    disposeReason = options.reason;
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("dispose", params, NO_TIMEOUT);
+  public void dispose() {
+    withLogging("APIRequestContext.dispose", () -> sendMessage("dispose"));
  }

  @Override
  public APIResponse fetch(String urlOrRequest, RequestOptions options) {
-    return fetchImpl(urlOrRequest, (RequestOptionsImpl) options);
+    return withLogging("APIRequestContext.fetch", () -> fetchImpl(urlOrRequest, (RequestOptionsImpl) options));
  }

  @Override
@@ -85,13 +62,9 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
  }

  private APIResponse fetchImpl(String url, RequestOptionsImpl options) {
-    if (disposeReason != null) {
-      throw new PlaywrightException(disposeReason);
-    }
    if (options == null) {
      options = new RequestOptionsImpl();
    }
-    options.timeout = timeoutSettings.timeout(options.timeout);
    JsonObject params = new JsonObject();
    params.addProperty("url", url);
    if (options.params != null) {
@@ -99,7 +72,7 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
      for (Map.Entry<String, ?> e : options.params.entrySet()) {
        queryParams.put(e.getKey(), "" + e.getValue());
      }
-      params.add("params", toNameValueArray(queryParams.entrySet()));
+      params.add("params", toNameValueArray(queryParams));
    }
    if (options.method != null) {
      params.addProperty("method", options.method);
@@ -112,14 +85,11 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
      byte[] bytes = null;
      if (options.data instanceof byte[]) {
        bytes = (byte[]) options.data;
-      } else if (options.data instanceof String) {
-        String stringData = (String) options.data;
-        if (!isJsonContentType(options.headers) || isJsonParsable(stringData)) {
-          bytes = (stringData).getBytes(StandardCharsets.UTF_8);
-        }
+      } else if (options.data instanceof String && !isJsonContentType(options.headers)) {
+        bytes = ((String) options.data).getBytes(StandardCharsets.UTF_8);
      }
      if (bytes == null) {
-        params.addProperty("jsonData", jsonDataSerializer.toJson(options.data));
+        params.add("jsonData", gson().toJsonTree(options.data));
      } else {
        String base64 = Base64.getEncoder().encodeToString(bytes);
        params.addProperty("postData", base64);
@@ -131,25 +101,16 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
    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);
    }
-    if (options.maxRedirects != null) {
-      if (options.maxRedirects < 0) {
-        throw new PlaywrightException("'maxRedirects' should be greater than or equal to '0'");
-      }
-      params.addProperty("maxRedirects", options.maxRedirects);
-    }
-    if (options.maxRetries != null) {
-      if (options.maxRetries < 0) {
-        throw new PlaywrightException("'maxRetries' must be greater than or equal to '0'");
-      }
-      params.addProperty("maxRetries", options.maxRetries);
-    }
-    JsonObject json = sendMessage("fetch", params, timeoutSettings.timeout(options.timeout)).getAsJsonObject();
+    JsonObject json = sendMessage("fetch", params).getAsJsonObject();
    return new APIResponseImpl(this, json.getAsJsonObject("response"));
  }

@@ -165,9 +126,9 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
    return false;
  }

-  private static JsonArray serializeMultipartData(List<? extends Map.Entry<String, Object>> data) {
+  private static JsonArray serializeMultipartData(Map<String, Object> data) {
    JsonArray result = new JsonArray();
-    for (Map.Entry<String, ?> e : data) {
+    for (Map.Entry<String, Object> e : data.entrySet()) {
      FilePayload filePayload = null;
      if (e.getValue() instanceof FilePayload) {
        filePayload = (FilePayload) e.getValue();
@@ -215,16 +176,18 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {

  @Override
  public String storageState(StorageStateOptions options) {
-    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;
+    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 = Utils.clone((RequestOptionsImpl) options);
+    RequestOptionsImpl impl = (RequestOptionsImpl) options;
    if (impl == null) {
      impl = new RequestOptionsImpl();
    }
@@ -233,21 +196,4 @@ class APIRequestContextImpl extends ChannelOwner implements APIRequestContext {
    }
    return impl;
  }
-
-  private static boolean isJsonParsable(String value) {
-    try {
-      JsonElement result = JsonParser.parseString(value);
-      if (result != null && result.isJsonPrimitive()) {
-        JsonPrimitive primitive = result.getAsJsonPrimitive();
-        if (primitive.isString() && value.equals(primitive.getAsString())) {
-          // Gson parses unquoted strings too, but we don't want to treat them
-          // as valid JSON.
-          return false;
-        }
-      }
-      return true;
-    } catch (JsonSyntaxException error) {
-      return false;
-    }
-  }
 }
@@ -1,35 +1,15 @@
-/*
- * 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.Gson;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.APIRequest;
 import com.microsoft.playwright.PlaywrightException;
-import com.microsoft.playwright.options.ClientCertificate;

 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.util.List;

-import static com.microsoft.playwright.impl.ChannelOwner.NO_TIMEOUT;
 import static com.microsoft.playwright.impl.Serialization.gson;
-import static com.microsoft.playwright.impl.Utils.addToProtocol;

 class APIRequestImpl implements APIRequest {
  private final PlaywrightImpl playwright;
@@ -40,10 +20,12 @@ class APIRequestImpl implements APIRequest {

  @Override
  public APIRequestContextImpl newContext(NewContextOptions options) {
+    return playwright.withLogging("APIRequest.newContext", () -> newContextImpl(options));
+  }
+
+  private APIRequestContextImpl newContextImpl(NewContextOptions options) {
    if (options == null) {
      options = new NewContextOptions();
-    } else {
-      options = Utils.clone(options);
    }
    if (options.storageStatePath != null) {
      try {
@@ -59,19 +41,13 @@ class APIRequestImpl implements APIRequest {
      storageState = new Gson().fromJson(options.storageState, JsonObject.class);
      options.storageState = null;
    }
-    List<ClientCertificate> clientCertificateList = options.clientCertificates;
-    options.clientCertificates = null;
-    Double timeout = options.timeout;
-    // Timeout is handled on the client.
-    options.timeout = null;
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    if (storageState != null) {
      params.add("storageState", storageState);
    }
-    addToProtocol(params, clientCertificateList);
-    JsonObject result = playwright.sendMessage("newRequest", params, NO_TIMEOUT).getAsJsonObject();
+
+    JsonObject result = playwright.sendMessage("newRequest", params).getAsJsonObject();
    APIRequestContextImpl context = playwright.connection.getExistingObject(result.getAsJsonObject("request").get("guid").getAsString());
-    context.timeoutSettings.setDefaultTimeout(timeout);
    return context;
  }
 }
@@ -21,7 +21,6 @@ import com.microsoft.playwright.assertions.APIResponseAssertions;
 import org.opentest4j.AssertionFailedError;

 import java.util.List;
-import java.util.regex.Pattern;

 public class APIResponseAssertionsImpl implements APIResponseAssertions {
  private final APIResponse actual;
@@ -55,20 +54,6 @@ public class APIResponseAssertionsImpl implements APIResponseAssertions {
    if (!log.isEmpty()) {
      log = "\nCall log:\n" + log;
    }
-
-    String contentType = actual.headers().get("content-type");
-    boolean isTextEncoding = contentType == null ? false : isTextualMimeType(contentType);
-    String responseText = "";
-    if (isTextEncoding) {
-      String text = actual.text();
-      if (text != null) {
-        responseText = "\nResponse text:\n" + (text.length() > 1000 ? text.substring(0, 1000) : text);
-      }
-    }
-
-    throw new AssertionFailedError(message + log + responseText);
-  }
-  static boolean isTextualMimeType(String mimeType) {
-    return Pattern.matches("^(text/.*?|application/(json|(x-)?javascript|xml.*?|ecmascript|graphql|x-www-form-urlencoded)|image/svg(\\+xml)?|application/.*?(\\+json|\\+xml))(;\\s*charset=.*)?$", mimeType);
+    throw new AssertionFailedError(message + log);
  }
 }
@@ -17,6 +17,7 @@
 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;
@@ -28,7 +29,6 @@ import java.util.Base64;
 import java.util.List;
 import java.util.Map;

-import static com.microsoft.playwright.impl.ChannelOwner.NO_TIMEOUT;
 import static com.microsoft.playwright.impl.Serialization.gson;
 import static com.microsoft.playwright.impl.Utils.isSafeCloseError;
 import static java.util.Arrays.asList;
@@ -46,27 +46,31 @@ class APIResponseImpl implements APIResponse {

  @Override
  public byte[] body() {
-    try {
-      JsonObject params = new JsonObject();
-      params.addProperty("fetchUid", fetchUid());
-      JsonObject json = context.sendMessage("fetchResponseBody", params, NO_TIMEOUT).getAsJsonObject();
-      if (!json.has("binary")) {
-        throw new PlaywrightException("Response has been disposed");
+    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;
      }
-      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() {
-    JsonObject params = new JsonObject();
-    params.addProperty("fetchUid", fetchUid());
-    context.sendMessage("disposeAPIResponse", params, NO_TIMEOUT);
+    context.withLogging("APIResponse.dispose", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("fetchUid", fetchUid());
+      context.sendMessage("disposeAPIResponse", params);
+    });
  }

  @Override
@@ -112,7 +116,7 @@ class APIResponseImpl implements APIResponse {
  List<String> fetchLog() {
    JsonObject params = new JsonObject();
    params.addProperty("fetchUid", fetchUid());
-    JsonObject json = context.sendMessage("fetchLog", params, NO_TIMEOUT).getAsJsonObject();
+    JsonObject json = context.sendMessage("fetchLog", params).getAsJsonObject();
    JsonArray log = json.get("log").getAsJsonArray();
    return gson().fromJson(log, new TypeToken<List<String>>() {}.getType());
  }
@@ -19,8 +19,6 @@ package com.microsoft.playwright.impl;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.PlaywrightException;

-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
@@ -28,30 +26,20 @@ import java.nio.file.Path;
 import static com.microsoft.playwright.impl.Utils.writeToFile;

 class ArtifactImpl extends ChannelOwner {
+  boolean isRemote;
  public ArtifactImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
  }

  public InputStream createReadStream() {
    JsonObject result = sendMessage("stream").getAsJsonObject();
+    if (!result.has("stream")) {
+      return null;
+    }
    Stream stream = connection.getExistingObject(result.getAsJsonObject("stream").get("guid").getAsString());
    return stream.stream();
  }

-  byte[] readAllBytes() {
-    final int bufLen = 1024 * 1024;
-    byte[] buf = new byte[bufLen];
-    int readLen;
-    try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); InputStream stream = createReadStream()) {
-      while ((readLen = stream.read(buf, 0, bufLen)) != -1) {
-        outputStream.write(buf, 0, readLen);
-      }
-      return outputStream.toByteArray();
-    } catch (IOException e) {
-      throw new PlaywrightException("Failed to read artifact",  e);
-    }
-  }
-
  public void cancel() {
    sendMessage("cancel");
  }
@@ -69,7 +57,7 @@ class ArtifactImpl extends ChannelOwner {
  }

  public Path pathAfterFinished() {
-    if (connection.isRemote) {
+    if (isRemote) {
      throw new PlaywrightException("Path is not available when using browserType.connect(). Use download.saveAs() to save a local copy.");
    }
    JsonObject json = sendMessage("pathAfterFinished").getAsJsonObject();
@@ -77,7 +65,7 @@ class ArtifactImpl extends ChannelOwner {
  }

  public void saveAs(Path path) {
-    if (connection.isRemote) {
+    if (isRemote) {
      JsonObject jsonObject = sendMessage("saveAsStream").getAsJsonObject();
      Stream stream = connection.getExistingObject(jsonObject.getAsJsonObject("stream").get("guid").getAsString());
      writeToFile(stream.stream(), path);
@@ -86,6 +74,6 @@ class ArtifactImpl extends ChannelOwner {

    JsonObject params = new JsonObject();
    params.addProperty("path", path.toString());
-    sendMessage("saveAs", params, NO_TIMEOUT);
+    sendMessage("saveAs", params);
  }
 }
@@ -16,10 +16,10 @@

 package com.microsoft.playwright.impl;

+import com.microsoft.playwright.PlaywrightException;
 import org.opentest4j.AssertionFailedError;
 import org.opentest4j.ValueWrapper;

-import java.lang.reflect.Field;
 import java.util.Collection;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -28,56 +28,53 @@ import java.util.stream.Collectors;
 import static com.microsoft.playwright.impl.Utils.toJsRegexFlags;
 import static java.util.Arrays.asList;

-abstract class AssertionsBase {
+class AssertionsBase {
+  final LocatorImpl actualLocator;
  final boolean isNot;

-  AssertionsBase(boolean isNot) {
+  AssertionsBase(LocatorImpl actual, boolean isNot) {
+    this.actualLocator = actual;
    this.isNot = isNot;
  }

-  void expectImpl(String expression, ExpectedTextValue textValue, Object expected, String message, FrameExpectOptions options, String title) {
-    expectImpl(expression, asList(textValue), expected, message, options, title);
+  void expectImpl(String expression, ExpectedTextValue textValue, Object expected, String message, FrameExpectOptions options) {
+    expectImpl(expression, asList(textValue), expected, message, options);
  }

-  void expectImpl(String expression, List<ExpectedTextValue> expectedText, Object expected, String message, FrameExpectOptions options, String title) {
+  void expectImpl(String expression, List<ExpectedTextValue> expectedText, Object expected, String message, FrameExpectOptions options) {
    if (options == null) {
      options = new FrameExpectOptions();
    }
    options.expectedText = expectedText;
-    expectImpl(expression, options, expected, message, title);
+    options.isNot = isNot;
+    expectImpl(expression, options, expected, message);
  }

-  void expectImpl(String expression, FrameExpectOptions expectOptions, Object expected, String message, String title) {
+  void expectImpl(String expression, FrameExpectOptions expectOptions, Object expected, String message) {
    if (expectOptions.timeout == null) {
-      expectOptions.timeout = AssertionsTimeout.defaultTimeout;
+      expectOptions.timeout = 5_000.0;
    }
-    expectOptions.isNot = isNot;
-    if (isNot) {
+    if (expectOptions.isNot) {
      message = message.replace("expected to", "expected not to");
    }
-    FrameExpectResult result = doExpect(expression, expectOptions, title);
+    FrameExpectResult result = actualLocator.expect(expression, expectOptions);
    if (result.matches == isNot) {
      Object actual = result.received == null ? null : Serialization.deserialize(result.received);
-      String log = (result.log == null) ? "" : String.join("\n", result.log);
+      String log = String.join("\n", result.log);
      if (!log.isEmpty()) {
        log = "\nCall log:\n" + log;
      }
-      if (result.errorMessage != null) {
-        message += "\n" + result.errorMessage;
-      }
      if (expected == null) {
        throw new AssertionFailedError(message + log);
      }
      ValueWrapper expectedValue = formatValue(expected);
      ValueWrapper actualValue = formatValue(actual);
-      message += "\nExpected: " + expectedValue.getStringRepresentation() + "\nReceived: " + actualValue.getStringRepresentation() + "\n";
+      message += ": " + expectedValue.getStringRepresentation() + "\nReceived: " + actualValue.getStringRepresentation() + "\n";
      throw new AssertionFailedError(message + log, expectedValue, actualValue);
    }
  }

-  abstract FrameExpectResult doExpect(String expression, FrameExpectOptions expectOptions, String title);
-
-  protected static ValueWrapper formatValue(Object value) {
+  private static ValueWrapper formatValue(Object value) {
    if (value == null || !value.getClass().isArray()) {
      return ValueWrapper.create(value);
    }
@@ -94,17 +91,4 @@ abstract class AssertionsBase {
    }
    return expected;
  }
-
-  static Boolean shouldIgnoreCase(Object options) {
-    if (options == null) {
-      return null;
-    }
-    try {
-      Field fromField = options.getClass().getDeclaredField("ignoreCase");
-      Object value = fromField.get(options);
-      return (Boolean) value;
-    } catch (NoSuchFieldException | IllegalAccessException e) {
-      return null;
-    }
-  }
 }
@@ -1,30 +0,0 @@
-/*
- * 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.PlaywrightException;
-
-public class AssertionsTimeout {
-  static double defaultTimeout = 5_000;
-
-  public static void setDefaultTimeout(double ms) {
-    if (ms < 0) {
-      throw new PlaywrightException("Timeout cannot be negative");
-    }
-    defaultTimeout = ms;
-  }
-}
@@ -78,11 +78,11 @@ class BindingCall extends ChannelOwner {

      JsonObject params = new JsonObject();
      params.add("result", gson().toJsonTree(serializeArgument(result)));
-      sendMessage("resolve", params, NO_TIMEOUT);
+      sendMessage("resolve", params);
    } catch (RuntimeException exception) {
      JsonObject params = new JsonObject();
      params.add("error", gson().toJsonTree(serializeError(exception)));
-      sendMessage("reject", params, NO_TIMEOUT);
+      sendMessage("reject", params);
    }
  }
 }
@@ -29,44 +29,31 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
-import java.util.function.BooleanSupplier;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;

-import static com.microsoft.playwright.impl.Serialization.*;
-import static com.microsoft.playwright.impl.Utils.*;
+import static com.microsoft.playwright.impl.Serialization.addHarUrlFilter;
+import static com.microsoft.playwright.impl.Serialization.gson;
+import static com.microsoft.playwright.impl.Utils.isSafeCloseError;
+import static com.microsoft.playwright.impl.Utils.toJsRegexFlags;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.Files.readAllBytes;
 import static java.util.Arrays.asList;

 class BrowserContextImpl extends ChannelOwner implements BrowserContext {
-  protected BrowserImpl browser;
+  private final BrowserImpl browser;
  private final TracingImpl tracing;
  private final APIRequestContextImpl request;
-  private final ClockImpl clock;
  final List<PageImpl> pages = new ArrayList<>();
-
  final Router routes = new Router();
-  final WebSocketRouter webSocketRoutes = new WebSocketRouter();
-  private boolean closingOrClosed;
-  private final WaitableEvent<EventType, ?> closePromise;
+  private boolean isClosedOrClosing;
  final Map<String, BindingCallback> bindings = new HashMap<>();
  PageImpl ownerPage;
-  private String closeReason;
-
-  private static final Map<EventType, String> eventSubscriptions() {
-    Map<EventType, String> result = new HashMap<>();
-    result.put(EventType.CONSOLE, "console");
-    result.put(EventType.DIALOG, "dialog");
-    result.put(EventType.REQUEST, "request");
-    result.put(EventType.RESPONSE, "response");
-    result.put(EventType.REQUESTFINISHED, "requestFinished");
-    result.put(EventType.REQUESTFAILED, "requestFailed");
-    return result;
-  }
-  private final ListenerCollection<EventType> listeners = new ListenerCollection<>(eventSubscriptions(), this);
+  private final ListenerCollection<EventType> listeners = new ListenerCollection<>();
  final TimeoutSettings timeoutSettings = new TimeoutSettings();
+  Path videosDir;
+  URL baseUrl;
  final Map<String, HarRecorder> harRecorders = new HashMap<>();

  static class HarRecorder {
@@ -81,10 +68,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {

  enum EventType {
    CLOSE,
-    CONSOLE,
-    DIALOG,
    PAGE,
-    WEBERROR,
    REQUEST,
    REQUESTFAILED,
    REQUESTFINISHED,
@@ -93,48 +77,28 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {

  BrowserContextImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
-    tracing = connection.getExistingObject(initializer.getAsJsonObject("tracing").get("guid").getAsString());
-    request = connection.getExistingObject(initializer.getAsJsonObject("requestContext").get("guid").getAsString());
-    request.timeoutSettings = timeoutSettings;
-    clock = new ClockImpl(this);
-    closePromise = new WaitableEvent<>(listeners, EventType.CLOSE);
-  }
-
-  Path videosDir() {
-    JsonObject recordVideo = initializer.getAsJsonObject("options").getAsJsonObject("recordVideo");
-    if (recordVideo == null) {
-      return null;
+    if (parent instanceof BrowserImpl) {
+      browser = (BrowserImpl) parent;
+    } else {
+      browser = null;
    }
-    return Paths.get(recordVideo.get("dir").getAsString());
+    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());
  }

-  URL baseUrl() {
-    JsonElement url = initializer.getAsJsonObject("options").get("baseURL");
-    if (url != null) {
-      try {
-        return new URL(url.getAsString());
-      } catch (MalformedURLException e) {
-      }
+  void setRecordHar(Path path, HarContentPolicy policy) {
+    if (path != null) {
+      harRecorders.put("", new HarRecorder(path, policy));
    }
-    return null;
  }

-  String effectiveCloseReason() {
-    if (closeReason != null) {
-      return closeReason;
+  void setBaseUrl(String spec) {
+    try {
+      this.baseUrl = new URL(spec);
+    } catch (MalformedURLException e) {
+      this.baseUrl = null;
    }
-    if (browser != null) {
-      return browser.closeReason;
-    }
-    return null;
-  }
-
-  @Override
-  public void onBackgroundPage(Consumer<Page> handler) {
-  }
-
-  @Override
-  public void offBackgroundPage(Consumer<Page> handler) {
  }

  @Override
@@ -147,26 +111,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    listeners.remove(EventType.CLOSE, handler);
  }

-  @Override
-  public void onConsoleMessage(Consumer<ConsoleMessage> handler) {
-    listeners.add(EventType.CONSOLE, handler);
-  }
-
-  @Override
-  public void offConsoleMessage(Consumer<ConsoleMessage> handler) {
-    listeners.remove(EventType.CONSOLE, handler);
-  }
-
-  @Override
-  public void onDialog(Consumer<Dialog> handler) {
-    listeners.add(EventType.DIALOG, handler);
-  }
-
-  @Override
-  public void offDialog(Consumer<Dialog> handler) {
-    listeners.remove(EventType.DIALOG, handler);
-  }
-
  @Override
  public void onPage(Consumer<Page> handler) {
    listeners.add(EventType.PAGE, handler);
@@ -177,16 +121,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    listeners.remove(EventType.PAGE, handler);
  }

-  @Override
-  public void onWebError(Consumer<WebError> handler) {
-    listeners.add(EventType.WEBERROR, handler);
-  }
-
-  @Override
-  public void offWebError(Consumer<WebError> handler) {
-    listeners.remove(EventType.WEBERROR, handler);
-  }
-
  @Override
  public void onRequest(Consumer<Request> handler) {
    listeners.add(EventType.REQUEST, handler);
@@ -227,11 +161,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    listeners.remove(EventType.RESPONSE, handler);
  }

-  @Override
-  public ClockImpl clock() {
-    return clock;
-  }
-
  private <T> T waitForEventWithTimeout(EventType eventType, Runnable code, Predicate<T> predicate, Double timeout) {
    List<Waitable<T>> waitables = new ArrayList<>();
    waitables.add(new WaitableEvent<>(listeners, eventType, predicate));
@@ -242,7 +171,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {

  @Override
  public Page waitForPage(WaitForPageOptions options, Runnable code) {
-    return withWaitLogging("BrowserContext.close", logger -> waitForPageImpl(options, code));
+    return withWaitLogging("BrowserContext.close", () -> waitForPageImpl(options, code));
  }

  private Page waitForPageImpl(WaitForPageOptions options, Runnable code) {
@@ -253,35 +182,32 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
  }

  @Override
-  public CDPSession newCDPSession(Page page) {
-    JsonObject params = new JsonObject();
-    params.add("page", ((PageImpl) page).toProtocolRef());
-    JsonObject result = sendMessage("newCDPSession", params, NO_TIMEOUT).getAsJsonObject();
-    return connection.getExistingObject(result.getAsJsonObject("session").get("guid").getAsString());
+  public void close() {
+    withLogging("BrowserContext.close", () -> closeImpl());
  }

  @Override
-  public CDPSession newCDPSession(Frame frame) {
-    JsonObject params = new JsonObject();
-    params.add("frame", ((FrameImpl) frame).toProtocolRef());
-    JsonObject result = sendMessage("newCDPSession", params, NO_TIMEOUT).getAsJsonObject();
-    return connection.getExistingObject(result.getAsJsonObject("session").get("guid").getAsString());
+  public List<Cookie> cookies(String url) {
+    return cookies(url == null ? new ArrayList<>() : Collections.singletonList(url));
  }

-  @Override
-  public void close(CloseOptions options) {
-    if (!closingOrClosed) {
-      closingOrClosed = true;
-      if (options == null) {
-        options = new CloseOptions();
-      }
-      closeReason = options.reason;
-      request.dispose(convertType(options, APIRequestContext.DisposeOptions.class));
+  private void closeImpl() {
+    if (isClosedOrClosing) {
+      return;
+    }
+    isClosedOrClosing = true;
+    try {
      for (Map.Entry<String, HarRecorder> entry : harRecorders.entrySet()) {
        JsonObject params = new JsonObject();
        params.addProperty("harId", entry.getKey());
-        JsonObject json = sendMessage("harExport", params, NO_TIMEOUT).getAsJsonObject();
+        JsonObject json = sendMessage("harExport", params).getAsJsonObject();
        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 (browser() != null && browser().isRemote) {
+          artifact.isRemote = true;
+        }
+
        // Server side will compress artifact if content is attach or if file is .zip.
        HarRecorder harParams = entry.getValue();
        boolean isCompressed = harParams.contentPolicy == HarContentPolicy.ATTACH || harParams.path.toString().endsWith(".zip");
@@ -292,51 +218,51 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
          JsonObject unzipParams = new JsonObject();
          unzipParams.addProperty("zipFile", tmpPath);
          unzipParams.addProperty("harFile", harParams.path.toString());
-          connection.localUtils.sendMessage("harUnzip", unzipParams, NO_TIMEOUT);
+          connection.localUtils.sendMessage("harUnzip", unzipParams);
        } else {
          artifact.saveAs(harParams.path);
        }
        artifact.delete();
      }
-      JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-      sendMessage("close", params, NO_TIMEOUT);
+
+      sendMessage("close");
+    } catch (PlaywrightException e) {
+      if (!isSafeCloseError(e)) {
+        throw e;
+      }
    }
-    runUntil(() -> {}, closePromise);
  }

-  @Override
-  public List<Cookie> cookies(String url) {
-    return cookies(url == null ? new ArrayList<>() : Collections.singletonList(url));
-  }
-
-
  @Override
  public void addCookies(List<Cookie> cookies) {
-    JsonObject params = new JsonObject();
-    params.add("cookies", gson().toJsonTree(cookies));
-    sendMessage("addCookies", params, NO_TIMEOUT);
+    withLogging("BrowserContext.addCookies", () -> {
+      JsonObject params = new JsonObject();
+      params.add("cookies", gson().toJsonTree(cookies));
+      sendMessage("addCookies", params);
+    });
  }

  @Override
  public void addInitScript(String script) {
-    JsonObject params = new JsonObject();
-    params.addProperty("source", script);
-    sendMessage("addInitScript", params, NO_TIMEOUT);
+    withLogging("BrowserContext.addInitScript", () -> addInitScriptImpl(script));
  }

  @Override
  public void addInitScript(Path path) {
-    try {
-      byte[] bytes = readAllBytes(path);
-      addInitScript(new String(bytes, UTF_8));
-    } catch (IOException e) {
-      throw new PlaywrightException("Failed to read script from file", e);
-    }
+    withLogging("BrowserContext.addInitScript", () -> {
+      try {
+        byte[] bytes = readAllBytes(path);
+        addInitScriptImpl(new String(bytes, UTF_8));
+      } catch (IOException e) {
+        throw new PlaywrightException("Failed to read script from file", e);
+      }
+    });
  }

-  @Override
-  public List<Page> backgroundPages() {
-    return Collections.emptyList();
+  private void addInitScriptImpl(String script) {
+    JsonObject params = new JsonObject();
+    params.addProperty("source", script);
+    sendMessage("addInitScript", params);
  }

  @Override
@@ -345,47 +271,34 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
  }

  @Override
-  public void clearCookies(ClearCookiesOptions options) {
-    if (options == null) {
-      options = new ClearCookiesOptions();
-    }
-    JsonObject params = new JsonObject();
-    setStringOrRegex(params, "name", options.name);
-    setStringOrRegex(params, "domain", options.domain);
-    setStringOrRegex(params, "path", options.path);
-    sendMessage("clearCookies", params, NO_TIMEOUT);
-  }
-
-  private static void setStringOrRegex(JsonObject params, String name, Object value) {
-    if (value instanceof String) {
-      params.addProperty(name, (String) value);
-    } else if (value instanceof Pattern) {
-      Pattern pattern = (Pattern) value;
-      params.addProperty(name + "RegexSource", pattern.pattern());
-      params.addProperty(name + "RegexFlags", toJsRegexFlags(pattern));
-    }
+  public void clearCookies() {
+    withLogging("BrowserContext.clearCookies", () -> sendMessage("clearCookies"));
  }

  @Override
  public void clearPermissions() {
-    sendMessage("clearPermissions");
+    withLogging("BrowserContext.clearPermissions", () -> sendMessage("clearPermissions"));
  }

  @Override
  public List<Cookie> cookies(List<String> urls) {
+    return withLogging("BrowserContext.cookies", () -> cookiesImpl(urls));
+  }
+
+  private List<Cookie> cookiesImpl(List<String> urls) {
    JsonObject params = new JsonObject();
    if (urls == null) {
      urls = new ArrayList<>();
    }
    params.add("urls", gson().toJsonTree(urls));
-    JsonObject json = sendMessage("cookies", params, NO_TIMEOUT).getAsJsonObject();
+    JsonObject json = sendMessage("cookies", params).getAsJsonObject();
    Cookie[] cookies = gson().fromJson(json.getAsJsonArray("cookies"), Cookie[].class);
    return asList(cookies);
  }

  @Override
  public void exposeBinding(String name, BindingCallback playwrightBinding, ExposeBindingOptions options) {
-    exposeBindingImpl(name, playwrightBinding, options);
+    withLogging("BrowserContext.exposeBinding", () -> exposeBindingImpl(name, playwrightBinding, options));
  }

  private void exposeBindingImpl(String name, BindingCallback playwrightBinding, ExposeBindingOptions options) {
@@ -404,16 +317,21 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    if (options != null && options.handle != null && options.handle) {
      params.addProperty("needsHandle", true);
    }
-    sendMessage("exposeBinding", params, NO_TIMEOUT);
+    sendMessage("exposeBinding", params);
  }

  @Override
  public void exposeFunction(String name, FunctionCallback playwrightFunction) {
-    exposeBindingImpl(name, (BindingCallback.Source source, Object... args) -> playwrightFunction.call(args), null);
+    withLogging("BrowserContext.exposeFunction",
+      () -> exposeBindingImpl(name, (BindingCallback.Source source, Object... args) -> playwrightFunction.call(args), null));
  }

  @Override
  public void grantPermissions(List<String> permissions, GrantPermissionsOptions options) {
+    withLogging("BrowserContext.grantPermissions", () -> grantPermissionsImpl(permissions, options));
+  }
+
+  private void grantPermissionsImpl(List<String> permissions, GrantPermissionsOptions options) {
    if (options == null) {
      options = new GrantPermissionsOptions();
    }
@@ -422,11 +340,15 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.add("permissions", gson().toJsonTree(permissions));
-    sendMessage("grantPermissions", params, NO_TIMEOUT);
+    sendMessage("grantPermissions", params);
  }

  @Override
  public PageImpl newPage() {
+    return withLogging("BrowserContext.newPage", () -> newPageImpl());
+  }
+
+  private PageImpl newPageImpl() {
    if (ownerPage != null) {
      throw new PlaywrightException("Please use browser.newContext()");
    }
@@ -446,7 +368,7 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {

  @Override
  public void route(String url, Consumer<Route> handler, RouteOptions options) {
-    route(UrlMatcher.forGlob(baseUrl(), url, this.connection.localUtils, false), handler, options);
+    route(new UrlMatcher(baseUrl, url), handler, options);
  }

  @Override
@@ -465,118 +387,108 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
      options = new RouteFromHAROptions();
    }
    if (options.update != null && options.update) {
-      recordIntoHar(null, har, options, null);
+      recordIntoHar(null, har, options);
      return;
    }
-    UrlMatcher matcher = UrlMatcher.forOneOf(baseUrl(), options.url, this.connection.localUtils, false);
+    UrlMatcher matcher = UrlMatcher.forOneOf(baseUrl, options.url);
    HARRouter harRouter = new HARRouter(connection.localUtils, har, options.notFound);
    onClose(context -> harRouter.dispose());
    route(matcher, route -> harRouter.handle(route), null);
  }

  private void route(UrlMatcher matcher, Consumer<Route> handler, RouteOptions options) {
-    routes.add(matcher, handler, options == null ? null : options.times);
-    updateInterceptionPatterns();
+    withLogging("BrowserContext.route", () -> {
+      routes.add(matcher, handler, options == null ? null : options.times);
+      if (routes.size() == 1) {
+        JsonObject params = new JsonObject();
+        params.addProperty("enabled", true);
+        sendMessage("setNetworkInterceptionEnabled", params);
+      }
+    });
  }

-  @Override
-  public void routeWebSocket(String url, Consumer<WebSocketRoute> handler) {
-    routeWebSocketImpl(UrlMatcher.forGlob(baseUrl(), url, this.connection.localUtils, true), handler);
-  }
-
-  @Override
-  public void routeWebSocket(Pattern pattern, Consumer<WebSocketRoute> handler) {
-    routeWebSocketImpl(new UrlMatcher(pattern), handler);
-  }
-
-  @Override
-  public void routeWebSocket(Predicate<String> predicate, Consumer<WebSocketRoute> handler) {
-    routeWebSocketImpl(new UrlMatcher(predicate), handler);
-  }
-
-  private void routeWebSocketImpl(UrlMatcher matcher, Consumer<WebSocketRoute> handler) {
-    webSocketRoutes.add(matcher, handler);
-    updateWebSocketInterceptionPatterns();
-  }
-
-  void recordIntoHar(PageImpl page, Path har, RouteFromHAROptions options, HarContentPolicy contentPolicy) {
-    if (contentPolicy == null) {
-      contentPolicy = Utils.convertType(options.updateContent, HarContentPolicy.class);
-    }
-    if (contentPolicy == null) {
-      contentPolicy = HarContentPolicy.ATTACH;
-    }
-
+  void recordIntoHar(PageImpl page, Path har, RouteFromHAROptions options) {
    JsonObject params = new JsonObject();
    if (page != null) {
      params.add("page", page.toProtocolRef());
    }
-    JsonObject recordHarArgs = new JsonObject();
-    recordHarArgs.addProperty("zip", har.toString().endsWith(".zip"));
-    recordHarArgs.addProperty("content", contentPolicy.name().toLowerCase());
-    recordHarArgs.addProperty("mode", (options.updateMode == null ? HarMode.MINIMAL : options.updateMode).name().toLowerCase());
-    addHarUrlFilter(recordHarArgs, options.url);
-
-    params.add("options", recordHarArgs);
-    JsonObject json = sendMessage("harStart", params, NO_TIMEOUT).getAsJsonObject();
+    JsonObject jsonOptions = new JsonObject();
+    jsonOptions.addProperty("path", har.toAbsolutePath().toString());
+    jsonOptions.addProperty("content", HarContentPolicy.ATTACH.name().toLowerCase());
+    jsonOptions.addProperty("mode", HarMode.MINIMAL.name().toLowerCase());
+    addHarUrlFilter(jsonOptions, options.url);
+    params.add("options", jsonOptions);
+    JsonObject json = sendMessage("harStart", params).getAsJsonObject();
    String harId = json.get("harId").getAsString();
-    harRecorders.put(harId, new HarRecorder(har, contentPolicy));
+    harRecorders.put(harId, new HarRecorder(har, HarContentPolicy.ATTACH));
  }

  @Override
  public void setDefaultNavigationTimeout(double timeout) {
-    timeoutSettings.setDefaultNavigationTimeout(timeout);
+    withLogging("BrowserContext.setDefaultNavigationTimeout", () -> {
+      timeoutSettings.setDefaultNavigationTimeout(timeout);
+      JsonObject params = new JsonObject();
+      params.addProperty("timeout", timeout);
+      sendMessage("setDefaultNavigationTimeoutNoReply", params);
+    });
  }

  @Override
  public void setDefaultTimeout(double timeout) {
-    timeoutSettings.setDefaultTimeout(timeout);
+    withLogging("BrowserContext.setDefaultTimeout", () -> {
+      timeoutSettings.setDefaultTimeout(timeout);
+      JsonObject params = new JsonObject();
+      params.addProperty("timeout", timeout);
+      sendMessage("setDefaultTimeoutNoReply", params);
+    });
  }

  @Override
  public void setExtraHTTPHeaders(Map<String, String> headers) {
-    JsonObject params = new JsonObject();
-    JsonArray jsonHeaders = new JsonArray();
-    for (Map.Entry<String, String> e : headers.entrySet()) {
-      JsonObject header = new JsonObject();
-      header.addProperty("name", e.getKey());
-      header.addProperty("value", e.getValue());
-      jsonHeaders.add(header);
-    }
-    params.add("headers", jsonHeaders);
-    sendMessage("setExtraHTTPHeaders", params, NO_TIMEOUT);
+    withLogging("BrowserContext.setExtraHTTPHeaders", () -> {
+      JsonObject params = new JsonObject();
+      JsonArray jsonHeaders = new JsonArray();
+      for (Map.Entry<String, String> e : headers.entrySet()) {
+        JsonObject header = new JsonObject();
+        header.addProperty("name", e.getKey());
+        header.addProperty("value", e.getValue());
+        jsonHeaders.add(header);
+      }
+      params.add("headers", jsonHeaders);
+      sendMessage("setExtraHTTPHeaders", params);
+    });
  }

  @Override
  public void setGeolocation(Geolocation geolocation) {
-    JsonObject params = new JsonObject();
-    if (geolocation != null) {
-      params.add("geolocation", gson().toJsonTree(geolocation));
-    }
-    sendMessage("setGeolocation", params, NO_TIMEOUT);
+    withLogging("BrowserContext.setGeolocation", () -> {
+      JsonObject params = new JsonObject();
+      if (geolocation != null) {
+        params.add("geolocation", gson().toJsonTree(geolocation));
+      }
+      sendMessage("setGeolocation", params);
+    });
  }

  @Override
  public void setOffline(boolean offline) {
-    JsonObject params = new JsonObject();
-    params.addProperty("offline", offline);
-    sendMessage("setOffline", params, NO_TIMEOUT);
+    withLogging("BrowserContext.setOffline", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("offline", offline);
+      sendMessage("setOffline", params);
+    });
  }

  @Override
  public String storageState(StorageStateOptions options) {
-    if (options == null) {
-      options = new StorageStateOptions();
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    params.remove("path");
-    JsonElement json = sendMessage("storageState", params, NO_TIMEOUT);
-
-    String storageState = json.toString();
-    if (options.path != null) {
-      Utils.writeToFile(storageState.getBytes(StandardCharsets.UTF_8), options.path);
-    }
-    return storageState;
+    return withLogging("BrowserContext.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;
+    });
  }

  @Override
@@ -584,15 +496,9 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    return tracing;
  }

-  @Override
-  public void unrouteAll() {
-    routes.removeAll();
-    updateInterceptionPatterns();
-  }
-
  @Override
  public void unroute(String url, Consumer<Route> handler) {
-    unroute(UrlMatcher.forGlob(this.baseUrl(), url, this.connection.localUtils, false), handler);
+    unroute(new UrlMatcher(this.baseUrl, url), handler);
  }

  @Override
@@ -605,27 +511,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
    unroute(new UrlMatcher(url), handler);
  }

-  @Override
-  public void waitForCondition(BooleanSupplier predicate, WaitForConditionOptions options) {
-    List<Waitable<Void>> waitables = new ArrayList<>();
-    waitables.add(new WaitableContextClose<>());
-    waitables.add(timeoutSettings.createWaitable(options == null ? null : options.timeout));
-    waitables.add(new WaitablePredicate<>(predicate));
-    runUntil(() -> {}, new WaitableRace<>(waitables));
-  }
-
-  @Override
-  public ConsoleMessage waitForConsoleMessage(WaitForConsoleMessageOptions options, Runnable code) {
-    return withWaitLogging("BrowserContext.waitForConsoleMessage", logger -> waitForConsoleMessageImpl(options, code));
-  }
-
-  private ConsoleMessage waitForConsoleMessageImpl(WaitForConsoleMessageOptions options, Runnable code) {
-    if (options == null) {
-      options = new WaitForConsoleMessageOptions();
-    }
-    return waitForEventWithTimeout(EventType.CONSOLE, code, options.predicate, options.timeout);
-  }
-
  private class WaitableContextClose<R> extends WaitableEvent<EventType, R> {
    WaitableContextClose() {
      super(BrowserContextImpl.this.listeners, EventType.CLOSE);
@@ -633,81 +518,44 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {

    @Override
    public R get() {
-      throw new TargetClosedError(effectiveCloseReason());
+      throw new PlaywrightException("Context closed");
    }
  }

  private void unroute(UrlMatcher matcher, Consumer<Route> handler) {
-    routes.remove(matcher, handler);
-    updateInterceptionPatterns();
+    withLogging("BrowserContext.unroute", () -> {
+      routes.remove(matcher, handler);
+      maybeDisableNetworkInterception();
+    });
  }

-  private void updateInterceptionPatterns() {
-    sendMessage("setNetworkInterceptionPatterns", routes.interceptionPatterns(), NO_TIMEOUT);
-  }
-
-  private void updateWebSocketInterceptionPatterns() {
-    sendMessage("setWebSocketInterceptionPatterns", webSocketRoutes.interceptionPatterns(), NO_TIMEOUT);
+  private void maybeDisableNetworkInterception() {
+    if (routes.size() == 0) {
+      JsonObject params = new JsonObject();
+      params.addProperty("enabled", false);
+      sendMessage("setNetworkInterceptionEnabled", params);
+    }
  }

  void handleRoute(RouteImpl route) {
    Router.HandleResult handled = routes.handle(route);
-    if (handled != Router.HandleResult.NoMatchingHandler) {
-      updateInterceptionPatterns();
+    if (handled == Router.HandleResult.FoundMatchingHandler) {
+      maybeDisableNetworkInterception();
    }
-    if (handled == Router.HandleResult.NoMatchingHandler || handled == Router.HandleResult.Fallback) {
-      route.resume(null, true);
+    if (!route.isHandled()){
+      route.resume();
    }
  }

-  void handleWebSocketRoute(WebSocketRouteImpl route) {
-    if (!webSocketRoutes.handle(route)) {
-      route.connectToServer();
-    }
-  }
-
-  WaitableResult<JsonElement> pause() {
-    return sendMessageAsync("pause", new JsonObject());
+  void pause() {
+    sendMessage("pause");
  }

  @Override
  protected void handleEvent(String event, JsonObject params) {
-    if ("dialog".equals(event)) {
-      String guid = params.getAsJsonObject("dialog").get("guid").getAsString();
-      DialogImpl dialog = connection.getExistingObject(guid);
-      boolean hasListeners = false;
-      if (listeners.hasListeners(EventType.DIALOG)) {
-        hasListeners = true;
-        listeners.notify(EventType.DIALOG, dialog);
-      }
-      PageImpl page = dialog.page();
-      if (page != null) {
-        if (page.listeners.hasListeners(PageImpl.EventType.DIALOG)) {
-          hasListeners = true;
-          page.listeners.notify(PageImpl.EventType.DIALOG, dialog);
-        }
-      }
-      // Although we do similar handling on the server side, we still need this logic
-      // on the client side due to a possible race condition between two async calls:
-      // a) removing "dialog" listener subscription (client->server)
-      // b) actual "dialog" event (server->client)
-      if (!hasListeners) {
-        if ("beforeunload".equals(dialog.type())) {
-          try {
-            dialog.accept();
-          } catch (PlaywrightException e) {
-          }
-        } else {
-          dialog.dismiss();
-        }
-      }
-    } else if ("route".equals(event)) {
+    if ("route".equals(event)) {
      RouteImpl route = connection.getExistingObject(params.getAsJsonObject("route").get("guid").getAsString());
-      route.browserContext = this;
      handleRoute(route);
-    } else if ("webSocketRoute".equals(event)) {
-      WebSocketRouteImpl route = connection.getExistingObject(params.getAsJsonObject("webSocketRoute").get("guid").getAsString());
-      handleWebSocketRoute(route);
    } else if ("page".equals(event)) {
      PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
      pages.add(page);
@@ -721,23 +569,6 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
      if (binding != null) {
        bindingCall.call(binding);
      }
-    } else if ("console".equals(event)) {
-      PageImpl page = null;
-      if (params.has("page")) {
-        page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
-      }
-      WorkerImpl worker = null;
-      if (params.has("worker")) {
-        worker = connection.getExistingObject(params.getAsJsonObject("worker").get("guid").getAsString());
-      }
-      ConsoleMessageImpl message = new ConsoleMessageImpl(connection, params, page, worker);
-      listeners.notify(BrowserContextImpl.EventType.CONSOLE, message);
-      if (worker != null) {
-        worker.listeners.notify(WorkerImpl.EventType.CONSOLE, message);
-      }
-      if (page != null) {
-        page.listeners.notify(PageImpl.EventType.CONSOLE, message);
-      }
    } else if ("request".equals(event)) {
      String guid = params.getAsJsonObject("request").get("guid").getAsString();
      RequestImpl request = connection.getExistingObject(guid);
@@ -781,79 +612,23 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
        PageImpl page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
        page.listeners.notify(PageImpl.EventType.RESPONSE, response);
      }
-    } else if ("pageError".equals(event)) {
-      String errorStr = parseError(params.getAsJsonObject("error"));
-      PageImpl page;
-      try {
-        page = connection.getExistingObject(params.getAsJsonObject("page").get("guid").getAsString());
-      } catch (PlaywrightException e) {
-        page = null;
-      }
-      listeners.notify(BrowserContextImpl.EventType.WEBERROR, new WebErrorImpl(page, errorStr));
-      if (page != null) {
-        page.listeners.notify(PageImpl.EventType.PAGEERROR, errorStr);
-      }
    } else if ("close".equals(event)) {
      didClose();
    }
  }

  void didClose() {
-    closingOrClosed = true;
+    isClosedOrClosing = true;
    if (browser != null) {
      browser.contexts.remove(this);
-      browser.browserType.playwright.selectors.contextsForSelectors.remove(this);
    }
    listeners.notify(EventType.CLOSE, this);
  }

-  WritableStream createTempFile(String name, long lastModifiedMs) {
+  WritableStream createTempFile(String name) {
    JsonObject params = new JsonObject();
    params.addProperty("name", name);
-    params.addProperty("lastModifiedMs", lastModifiedMs);
-    JsonObject json = sendMessage("createTempFile", params, NO_TIMEOUT).getAsJsonObject();
+    JsonObject json = sendMessage("createTempFile", params).getAsJsonObject();
    return connection.getExistingObject(json.getAsJsonObject("writableStream").get("guid").getAsString());
  }
-
-  protected void initializeHarFromOptions(Browser.NewContextOptions options) {
-    if (options.recordHarPath == null) {
-      if (options.recordHarOmitContent != null) {
-        throw new PlaywrightException("recordHarOmitContent is set but recordHarPath is null");
-      }
-      if (options.recordHarUrlFilter != null) {
-        throw new PlaywrightException("recordHarUrlFilter is set but recordHarPath is null");
-      }
-      if (options.recordHarMode != null) {
-        throw new PlaywrightException("recordHarMode is set but recordHarPath is null");
-      }
-      if (options.recordHarContent != null) {
-        throw new PlaywrightException("recordHarContent is set but recordHarPath is null");
-      }
-      return;
-    }
-
-    HarContentPolicy contentPolicy = options.recordHarContent;
-    if (contentPolicy == null && options.recordHarOmitContent != null && options.recordHarOmitContent == true) {
-      contentPolicy = HarContentPolicy.OMIT;
-    }
-    if (contentPolicy == null) {
-      contentPolicy = options.recordHarPath.endsWith(".zip") ? HarContentPolicy.ATTACH : HarContentPolicy.EMBED;
-    }
-    RouteFromHAROptions routeFromHAROptions = new RouteFromHAROptions();
-
-    if (options.recordHarUrlFilter instanceof String) {
-      routeFromHAROptions.setUrl((String) options.recordHarUrlFilter);
-    } else if (options.recordHarUrlFilter instanceof Pattern) {
-      routeFromHAROptions.setUrl((Pattern) options.recordHarUrlFilter);
-    }
-
-    if (options.recordHarMode != null) {
-      routeFromHAROptions.updateMode = options.recordHarMode;
-    } else {
-      routeFromHAROptions.updateMode = HarMode.FULL;
-    }
-    routeFromHAROptions.url = options.recordHarUrlFilter;
-
-    recordIntoHar(null, options.recordHarPath, routeFromHAROptions, contentPolicy);
-  }
 }
@@ -20,6 +20,7 @@ import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.*;
+import com.microsoft.playwright.options.HarContentPolicy;

 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -27,19 +28,20 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;
+import java.util.regex.Pattern;

+import static com.microsoft.playwright.impl.Serialization.addHarUrlFilter;
 import static com.microsoft.playwright.impl.Serialization.gson;
 import static com.microsoft.playwright.impl.Utils.*;
+import static com.microsoft.playwright.impl.Utils.convertType;

 class BrowserImpl extends ChannelOwner implements Browser {
  final Set<BrowserContextImpl> contexts = new HashSet<>();
  private final ListenerCollection<EventType> listeners = new ListenerCollection<>();
+  boolean isRemote;
  boolean isConnectedOverWebSocket;
  private boolean isConnected = true;
  BrowserTypeImpl browserType;
-  BrowserType.LaunchOptions launchOptions;
-  private Path tracePath;
-  String closeReason;

  enum EventType {
    DISCONNECTED,
@@ -65,11 +67,11 @@ class BrowserImpl extends ChannelOwner implements Browser {
  }

  @Override
-  public void close(CloseOptions options) {
-    if (options == null) {
-      options = new CloseOptions();
-    }
-    closeReason = options.reason;
+  public void close() {
+    withLogging("Browser.close", () -> closeImpl());
+  }
+
+  private void closeImpl() {
    if (isConnectedOverWebSocket) {
      try {
        connection.close();
@@ -110,20 +112,16 @@ class BrowserImpl extends ChannelOwner implements Browser {

  @Override
  public BrowserContextImpl newContext(NewContextOptions options) {
+    return withLogging("Browser.newContext", () -> newContextImpl(options));
+  }
+
+  private BrowserContextImpl newContextImpl(NewContextOptions options) {
    if (options == null) {
      options = new NewContextOptions();
    } else {
      // Make a copy so that we can nullify some fields below.
      options = convertType(options, NewContextOptions.class);
    }
-
-    NewContextOptions harOptions = Utils.clone(options);
-    options.recordHarContent = null;
-    options.recordHarMode = null;
-    options.recordHarPath = null;
-    options.recordHarOmitContent = null;
-    options.recordHarUrlFilter = null;
-
    if (options.storageStatePath != null) {
      try {
        byte[] bytes = Files.readAllBytes(options.storageStatePath);
@@ -138,13 +136,54 @@ class BrowserImpl extends ChannelOwner implements Browser {
      storageState = new Gson().fromJson(options.storageState, JsonObject.class);
      options.storageState = null;
    }
+    JsonObject recordHar = null;
+    Path recordHarPath = options.recordHarPath;
+    HarContentPolicy harContentPolicy = null;
+    if (options.recordHarPath != null) {
+      recordHar = new JsonObject();
+      recordHar.addProperty("path", options.recordHarPath.toString());
+      if (options.recordHarContent != null) {
+        harContentPolicy = options.recordHarContent;
+      } else if (options.recordHarOmitContent != null && options.recordHarOmitContent) {
+        harContentPolicy = HarContentPolicy.OMIT;
+      }
+      if (harContentPolicy != null) {
+        recordHar.addProperty("content", harContentPolicy.name().toLowerCase());
+      }
+      if (options.recordHarMode != null) {
+        recordHar.addProperty("mode", options.recordHarMode.name().toLowerCase());
+      }
+      addHarUrlFilter(recordHar, options.recordHarUrlFilter);
+      options.recordHarPath = null;
+      options.recordHarMode = null;
+      options.recordHarOmitContent = null;
+      options.recordHarContent = null;
+      options.recordHarUrlFilter = null;
+    } else {
+      if (options.recordHarOmitContent != null) {
+        throw new PlaywrightException("recordHarOmitContent is set but recordHarPath is null");
+      }
+      if (options.recordHarUrlFilter != null) {
+        throw new PlaywrightException("recordHarUrlFilter is set but recordHarPath is null");
+      }
+      if (options.recordHarMode != null) {
+        throw new PlaywrightException("recordHarMode is set but recordHarPath is null");
+      }
+      if (options.recordHarContent != null) {
+        throw new PlaywrightException("recordHarContent is set but recordHarPath is null");
+      }
+    }
+
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    if (storageState != null) {
      params.add("storageState", storageState);
    }
+    if (recordHar != null) {
+      params.add("recordHar", recordHar);
+    }
    if (options.recordVideoDir != null) {
      JsonObject recordVideo = new JsonObject();
-      recordVideo.addProperty("dir", options.recordVideoDir.toAbsolutePath().toString());
+      recordVideo.addProperty("dir", options.recordVideoDir.toString());
      if (options.recordVideoSize != null) {
        recordVideo.add("size", gson().toJsonTree(options.recordVideoSize));
      }
@@ -164,54 +203,46 @@ class BrowserImpl extends ChannelOwner implements Browser {
        params.addProperty("noDefaultViewport", true);
      }
    }
-    addToProtocol(params, options.clientCertificates);
-    params.remove("acceptDownloads");
-    if (options.acceptDownloads != null) {
-      params.addProperty("acceptDownloads", options.acceptDownloads ? "accept" : "deny");
-    }
-    params.add("selectorEngines", gson().toJsonTree(browserType.playwright.selectors.selectorEngines));
-    params.addProperty("testIdAttributeName", browserType.playwright.selectors.testIdAttributeName);
-    JsonElement result = sendMessage("newContext", params, NO_TIMEOUT);
+    JsonElement result = sendMessage("newContext", params);
    BrowserContextImpl context = connection.getExistingObject(result.getAsJsonObject().getAsJsonObject("context").get("guid").getAsString());
-    context.initializeHarFromOptions(harOptions);
+    context.videosDir = options.recordVideoDir;
+    if (options.baseURL != null) {
+      context.setBaseUrl(options.baseURL);
+    }
+    context.setRecordHar(recordHarPath, harContentPolicy);
+    contexts.add(context);
    return context;
  }

  @Override
  public Page newPage(NewPageOptions options) {
-    return withTitle("Create Page", () -> newPageImpl(options));
+    return withLogging("Browser.newPage", () -> newPageImpl(options));
  }

  @Override
  public void startTracing(Page page, StartTracingOptions options) {
+    withLogging("Browser.startTracing", () -> startTracingImpl(page, options));
+  }
+
+  private void startTracingImpl(Page page, StartTracingOptions options) {
    if (options == null) {
      options = new StartTracingOptions();
    }
-    tracePath = options.path;
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    if (page != null) {
      params.add("page", ((PageImpl) page).toProtocolRef());
    }
-    sendMessage("startTracing", params, NO_TIMEOUT);
+    sendMessage("startTracing", params);
  }

  @Override
  public byte[] stopTracing() {
+    return withLogging("Browser.stopTracing", () -> stopTracingImpl());
+  }
+
+  private byte[] stopTracingImpl() {
    JsonObject json = sendMessage("stopTracing").getAsJsonObject();
-    ArtifactImpl artifact = connection.getExistingObject(json.getAsJsonObject().getAsJsonObject("artifact").get("guid").getAsString());
-    byte[] data = artifact.readAllBytes();
-    artifact.delete();
-    if (tracePath != null) {
-      try {
-        Files.createDirectories(tracePath.getParent());
-        Files.write(tracePath, data);
-      } catch (IOException e) {
-        throw new PlaywrightException("Failed to write trace file", e);
-      } finally {
-        tracePath = null;
-      }
-    }
-    return data;
+    return Base64.getDecoder().decode(json.get("binary").getAsString());
  }

  private Page newPageImpl(NewPageOptions options) {
@@ -237,43 +268,8 @@ class BrowserImpl extends ChannelOwner implements Browser {

  @Override
  void handleEvent(String event, JsonObject parameters) {
-    switch (event) {
-      case "context":
-        didCreateContext(connection.getExistingObject(parameters.getAsJsonObject("context").get("guid").getAsString()));
-        break;
-      case "close":
-        didClose();
-        break;
-    }
-  }
-
-  @Override
-  public CDPSession newBrowserCDPSession() {
-    JsonObject params = new JsonObject();
-    JsonObject result = sendMessage("newBrowserCDPSession", params, NO_TIMEOUT).getAsJsonObject();
-    return connection.getExistingObject(result.getAsJsonObject("session").get("guid").getAsString());
-  }
-
-  protected void connectToBrowserType(BrowserTypeImpl browserType, Path tracesDir){
-    // Note: when using connect(), `browserType` is different from `this.parent`.
-    // This is why browser type is not wired up in the constructor, and instead this separate method is called later on.
-    this.browserType = browserType;
-    this.tracePath = tracesDir;
-
-    for (BrowserContextImpl context : contexts) {
-      context.tracing().setTracesDir(tracesDir);
-      browserType.playwright.selectors.contextsForSelectors.add(context);
-    }
-  }
-
-  private void didCreateContext(BrowserContextImpl context) {
-    context.browser = this;
-    contexts.add(context);
-    // Note: when connecting to a browser, initial contexts arrive before `_browserType` is set,
-    // and will be configured later in `ConnectToBrowserType`.
-    if (browserType != null) {
-      context.tracing().setTracesDir(tracePath);
-      browserType.playwright.selectors.contextsForSelectors.add(context);
+    if ("close".equals(event)) {
+      didClose();
    }
  }

@@ -22,18 +22,18 @@ import com.google.gson.JsonObject;
 import com.microsoft.playwright.Browser;
 import com.microsoft.playwright.BrowserType;
 import com.microsoft.playwright.PlaywrightException;
+import com.microsoft.playwright.options.HarContentPolicy;

 import java.io.IOException;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.function.Consumer;

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

 class BrowserTypeImpl extends ChannelOwner implements BrowserType {
-  protected PlaywrightImpl playwright;
+  LocalUtils localUtils;

  BrowserTypeImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
@@ -41,19 +41,26 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {

  @Override
  public BrowserImpl launch(LaunchOptions options) {
+    return withLogging("BrowserType.launch", () -> launchImpl(options));
+  }
+
+  private BrowserImpl launchImpl(LaunchOptions options) {
    if (options == null) {
      options = new LaunchOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    JsonElement result = sendMessage("launch", params, TimeoutSettings.launchTimeout(options.timeout));
+    JsonElement result = sendMessage("launch", params);
    BrowserImpl browser = connection.getExistingObject(result.getAsJsonObject().getAsJsonObject("browser").get("guid").getAsString());
    browser.browserType = this;
-    browser.launchOptions = options;
    return browser;
  }

  @Override
  public Browser connect(String wsEndpoint, ConnectOptions options) {
+    return withLogging("BrowserType.connect", () -> connectImpl(wsEndpoint, options));
+  }
+
+  private Browser connectImpl(String wsEndpoint, ConnectOptions options) {
    if (options == null) {
      options = new ConnectOptions();
    }
@@ -76,14 +83,9 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
      headers.addProperty("x-playwright-browser", name());
    }

-    Double timeout = options.timeout;
-    if (timeout == null) {
-      timeout = 0.0;
-    }
-
-    JsonObject json = connection.localUtils().sendMessage("connect", params, timeout).getAsJsonObject();
+    JsonObject json = sendMessage("connect", params).getAsJsonObject();
    JsonPipe pipe = connection.getExistingObject(json.getAsJsonObject("pipe").get("guid").getAsString());
-    Connection connection = new Connection(pipe, this.connection.env, this.connection.localUtils);
+    Connection connection = new Connection(pipe);
    PlaywrightImpl playwright = connection.initializePlaywright();
    if (!playwright.initializer.has("preLaunchedBrowser")) {
      try {
@@ -93,13 +95,15 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
      }
      throw new PlaywrightException("Malformed endpoint. Did you use launchServer method?");
    }
-    playwright.selectors = this.playwright.selectors;
+    playwright.initSharedSelectors(this.connection.getExistingObject("Playwright"));
    BrowserImpl browser = connection.getExistingObject(playwright.initializer.getAsJsonObject("preLaunchedBrowser").get("guid").getAsString());
+    browser.isRemote = true;
    browser.isConnectedOverWebSocket = true;
-    browser.connectToBrowserType(this, null);
+    browser.browserType = this;
    Consumer<JsonPipe> connectionCloseListener = t -> browser.notifyRemoteClosed();
    pipe.onClose(connectionCloseListener);
    browser.onDisconnected(b -> {
+      playwright.unregisterSelectors();
      pipe.offClose(connectionCloseListener);
      try {
        connection.close();
@@ -115,16 +119,26 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
    if (!"chromium".equals(name())) {
      throw new PlaywrightException("Connecting over CDP is only supported in Chromium.");
    }
+    return withLogging("BrowserType.connectOverCDP", () -> connectOverCDPImpl(endpointURL, options));
+  }
+
+  private Browser connectOverCDPImpl(String endpointURL, ConnectOverCDPOptions options) {
    if (options == null) {
      options = new ConnectOverCDPOptions();
    }

    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("endpointURL", endpointURL);
-    JsonObject json = sendMessage("connectOverCDP", params, TimeoutSettings.launchTimeout(options.timeout)).getAsJsonObject();
+    JsonObject json = sendMessage("connectOverCDP", params).getAsJsonObject();

    BrowserImpl browser = connection.getExistingObject(json.getAsJsonObject("browser").get("guid").getAsString());
-    browser.connectToBrowserType(this, null);
+    browser.isRemote = true;
+    browser.browserType = this;
+    if (json.has("defaultContext")) {
+      String contextId = json.getAsJsonObject("defaultContext").get("guid").getAsString();
+      BrowserContextImpl defaultContext = connection.getExistingObject(contextId);
+      browser.contexts.add(defaultContext);
+    }
    return browser;
  }

@@ -134,29 +148,63 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {

  @Override
  public BrowserContextImpl launchPersistentContext(Path userDataDir, LaunchPersistentContextOptions options) {
+    return withLogging("BrowserType.launchPersistentContext",
+      () -> launchPersistentContextImpl(userDataDir, options));
+  }
+
+  private BrowserContextImpl launchPersistentContextImpl(Path userDataDir, LaunchPersistentContextOptions options) {
    if (options == null) {
      options = new LaunchPersistentContextOptions();
    } else {
      // Make a copy so that we can nullify some fields below.
      options = convertType(options, LaunchPersistentContextOptions.class);
    }
-
-    Browser.NewContextOptions harOptions = convertType(options, Browser.NewContextOptions.class);
-    options.recordHarContent = null;
-    options.recordHarMode = null;
-    options.recordHarPath = null;
-    options.recordHarOmitContent = null;
-    options.recordHarUrlFilter = null;
+    JsonObject recordHar = null;
+    Path recordHarPath = options.recordHarPath;
+    HarContentPolicy harContentPolicy = null;
+    if (options.recordHarPath != null) {
+      recordHar = new JsonObject();
+      recordHar.addProperty("path", options.recordHarPath.toString());
+      if (options.recordHarContent != null) {
+        harContentPolicy = options.recordHarContent;
+      } else if (options.recordHarOmitContent != null && options.recordHarOmitContent) {
+        harContentPolicy = HarContentPolicy.OMIT;
+      }
+      if (harContentPolicy != null) {
+        recordHar.addProperty("content", harContentPolicy.name().toLowerCase());
+      }
+      if (options.recordHarMode != null) {
+        recordHar.addProperty("mode", options.recordHarMode.toString().toLowerCase());
+      }
+      addHarUrlFilter(recordHar, options.recordHarUrlFilter);
+      options.recordHarPath = null;
+      options.recordHarMode = null;
+      options.recordHarOmitContent = null;
+      options.recordHarContent = null;
+      options.recordHarUrlFilter = null;
+    } else {
+      if (options.recordHarOmitContent != null) {
+        throw new PlaywrightException("recordHarOmitContent is set but recordHarPath is null");
+      }
+      if (options.recordHarUrlFilter != null) {
+        throw new PlaywrightException("recordHarUrlFilter is set but recordHarPath is null");
+      }
+      if (options.recordHarMode != null) {
+        throw new PlaywrightException("recordHarMode is set but recordHarPath is null");
+      }
+      if (options.recordHarContent != null) {
+        throw new PlaywrightException("recordHarContent is set but recordHarPath is null");
+      }
+    }

    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    if (!userDataDir.isAbsolute() && !userDataDir.toString().isEmpty()) {
-      Path cwd = Paths.get("").toAbsolutePath();
-      userDataDir = cwd.resolve(userDataDir);
-    }
    params.addProperty("userDataDir", userDataDir.toString());
+    if (recordHar != null) {
+      params.add("recordHar", recordHar);
+    }
    if (options.recordVideoDir != null) {
      JsonObject recordVideo = new JsonObject();
-      recordVideo.addProperty("dir", options.recordVideoDir.toAbsolutePath().toString());
+      recordVideo.addProperty("dir", options.recordVideoDir.toString());
      if (options.recordVideoSize != null) {
        recordVideo.add("size", gson().toJsonTree(options.recordVideoSize));
      }
@@ -176,19 +224,13 @@ class BrowserTypeImpl extends ChannelOwner implements BrowserType {
        params.addProperty("noDefaultViewport", true);
      }
    }
-    addToProtocol(params, options.clientCertificates);
-    params.remove("acceptDownloads");
-    if (options.acceptDownloads != null) {
-      params.addProperty("acceptDownloads", options.acceptDownloads ? "accept" : "deny");
-    }
-    params.add("selectorEngines", gson().toJsonTree(playwright.selectors.selectorEngines));
-    params.addProperty("testIdAttributeName", playwright.selectors.testIdAttributeName);
-    JsonObject json = sendMessage("launchPersistentContext", params, TimeoutSettings.launchTimeout(options.timeout)).getAsJsonObject();
-    BrowserImpl browser = connection.getExistingObject(json.getAsJsonObject("browser").get("guid").getAsString());
-    browser.connectToBrowserType(this, options.tracesDir);
+    JsonObject json = sendMessage("launchPersistentContext", params).getAsJsonObject();
    BrowserContextImpl context = connection.getExistingObject(json.getAsJsonObject("context").get("guid").getAsString());
-    context.initializeHarFromOptions(harOptions);
-    context.tracing().setTracesDir(options.tracesDir);
+    context.videosDir = options.recordVideoDir;
+    if (options.baseURL != null) {
+      context.setBaseUrl(options.baseURL);
+    }
+    context.setRecordHar(recordHarPath, harContentPolicy);
    return context;
  }

@@ -1,75 +0,0 @@
-/*
- * 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.JsonElement;
-import com.google.gson.JsonObject;
-import com.microsoft.playwright.CDPSession;
-
-import java.util.HashMap;
-import java.util.function.Consumer;
-
-public class CDPSessionImpl extends ChannelOwner implements CDPSession {
-  private final ListenerCollection<String> listeners = new ListenerCollection<>(new HashMap<>(), this);
-
-  protected CDPSessionImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
-    super(parent, type, guid, initializer);
-  }
-
-  @Override
-  void handleEvent(String event, JsonObject parameters) {
-    super.handleEvent(event, parameters);
-    if ("event".equals(event)) {
-      String method = parameters.get("method").getAsString();
-      JsonObject params = null;
-      if (parameters.has("params")) {
-        params = parameters.get("params").getAsJsonObject();
-      }
-      listeners.notify(method, params);
-    }
-  }
-
-  public JsonObject send(String method) {
-    return send(method, null);
-  }
-
-  public JsonObject send(String method, JsonObject params) {
-    JsonObject args = new JsonObject();
-    if (params != null) {
-      args.add("params", params);
-    }
-    args.addProperty("method", method);
-    JsonElement response = connection.sendMessage(guid, "send", args);
-    if (response == null) return null;
-    else return response.getAsJsonObject().get("result").getAsJsonObject();
-  }
-
-  @Override
-  public void on(String event, Consumer<JsonObject> handler) {
-    listeners.add(event, handler);
-  }
-
-  @Override
-  public void off(String event, Consumer<JsonObject> handler) {
-    listeners.remove(event, handler);
-  }
-
-  @Override
-  public void detach() {
-    sendMessage("detach");
-  }
-}
@@ -18,25 +18,20 @@ package com.microsoft.playwright.impl;

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

 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.Function;
 import java.util.function.Supplier;

 class ChannelOwner extends LoggingSupport {
  final Connection connection;
-  private ChannelOwner parent;
+  private final ChannelOwner parent;
  private final Map<String, ChannelOwner> objects = new HashMap<>();

  final String type;
  final String guid;
  final JsonObject initializer;
-  private boolean wasCollected;
-
-  static Double NO_TIMEOUT = null;

  protected ChannelOwner(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    this(parent.connection, parent, type, guid, initializer);
@@ -60,75 +55,45 @@ class ChannelOwner extends LoggingSupport {
    }
  }

-  void disposeChannelOwner(boolean wasGarbageCollected) {
+  void disconnect() {
    // Clean up from parent and connection.
    if (parent != null) {
      parent.objects.remove(guid);
    }
    connection.unregisterObject(guid);
-    wasCollected = wasGarbageCollected;
    // Dispose all children.
    for (ChannelOwner child : new ArrayList<>(objects.values())) {
-      child.disposeChannelOwner(wasGarbageCollected);
+      child.disconnect();
    }
    objects.clear();
  }

-  void adopt(ChannelOwner child) {
-    child.parent.objects.remove(child.guid);
-    objects.put(child.guid, child);
-    child.parent = this;
-  }
-
-  <T> T withWaitLogging(String apiName, Function<Logger, T> code) {
+  <T> T withWaitLogging(String apiName, Supplier<T> code) {
    return new WaitForEventLogger<>(this, apiName, code).get();
  }

-
-  void withTitle(String title, Runnable code) {
-    withTitle(title, () -> {
-      code.run();
-      return null;
-    });
-  }
-
-  <T> T withTitle(String title, Supplier<T> code) {
-    String previousTitle = connection.setTitle(title);
+  @Override
+  <T> T withLogging(String apiName, Supplier<T> code) {
+    String previousApiName = connection.setApiName(apiName);
    try {
-      return code.get();
+      return super.withLogging(apiName, code);
    } finally {
-      connection.setTitle(previousTitle);
+      connection.setApiName(previousApiName);
    }
  }

-  WaitableResult<JsonElement> sendMessageAsync(String method) {
-    return sendMessageAsync(method, new JsonObject());
-  }
-
  WaitableResult<JsonElement> sendMessageAsync(String method, JsonObject params) {
-    checkNotCollected();
    return connection.sendMessageAsync(guid, method, params);
  }

  JsonElement sendMessage(String method) {
-    return sendMessage(method, new JsonObject(), NO_TIMEOUT);
+    return sendMessage(method, new JsonObject());
  }

-  JsonElement sendMessage(String method, JsonObject params, Double timeout) {
-    checkNotCollected();
-    if (timeout != null) {
-      params.addProperty("timeout", timeout);
-    } else if (params.has("timeout")) {
-      throw new PlaywrightException("Internal error: timeout must be passed explicitly.");
-    }
+  JsonElement sendMessage(String method, JsonObject params) {
    return connection.sendMessage(guid, method, params);
  }

-  private void checkNotCollected() {
-    if (wasCollected)
-      throw new PlaywrightException("The object has been collected to prevent unbounded heap growth.");
-  }
-
  <T> T runUntil(Runnable code, Waitable<T> waitable) {
    try {
      code.run();
@@ -1,136 +0,0 @@
-package com.microsoft.playwright.impl;
-
-import com.google.gson.JsonObject;
-import com.microsoft.playwright.Clock;
-
-import java.util.Date;
-
-import static com.microsoft.playwright.impl.ChannelOwner.NO_TIMEOUT;
-
-class ClockImpl implements Clock {
-  private final ChannelOwner browserContext;
-
-  ClockImpl(BrowserContextImpl browserContext) {
-    this.browserContext = browserContext;
-  }
-
-  private void sendMessageWithLogging(String method, JsonObject params) {
-    String capitalizedMethod = method.substring(0, 1).toUpperCase() + method.substring(1);
-    browserContext.sendMessage("clock" + capitalizedMethod, params, NO_TIMEOUT);
-  }
-
-  @Override
-  public void fastForward(long ticks) {
-    JsonObject params = new JsonObject();
-    params.addProperty("ticksNumber", ticks);
-    sendMessageWithLogging("fastForward", params);
-  }
-
-  @Override
-  public void fastForward(String ticks) {
-    JsonObject params = new JsonObject();
-    params.addProperty("ticksString", ticks);
-    sendMessageWithLogging("fastForward", params);
-  }
-
-  @Override
-  public void install(InstallOptions options) {
-    JsonObject params = new JsonObject();
-    if (options != null) {
-      parseTime(options.time, params);
-    }
-    sendMessageWithLogging("install", params);
-  }
-
-  @Override
-  public void runFor(long ticks) {
-    JsonObject params = new JsonObject();
-    params.addProperty("ticksNumber", ticks);
-    sendMessageWithLogging("runFor", params);
-  }
-
-  @Override
-  public void runFor(String ticks) {
-    JsonObject params = new JsonObject();
-    params.addProperty("ticksString", ticks);
-    sendMessageWithLogging("runFor", params);
-  }
-
-  @Override
-  public void pauseAt(long time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time);
-    sendMessageWithLogging("pauseAt", params);
-  }
-
-  @Override
-  public void pauseAt(String time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeString", time);
-    sendMessageWithLogging("pauseAt", params);
-  }
-
-  @Override
-  public void pauseAt(Date time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time.getTime());
-    sendMessageWithLogging("pauseAt", params);
-  }
-
-  @Override
-  public void resume() {
-    sendMessageWithLogging("resume", new JsonObject());
-  }
-
-  @Override
-  public void setFixedTime(long time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time);
-    sendMessageWithLogging("setFixedTime", params);
-  }
-
-  @Override
-  public void setFixedTime(String time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeString", time);
-    sendMessageWithLogging("setFixedTime", params);
-  }
-
-  @Override
-  public void setFixedTime(Date time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time.getTime());
-    sendMessageWithLogging("setFixedTime", params);
-  }
-
-  @Override
-  public void setSystemTime(long time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time);
-    sendMessageWithLogging("setSystemTime", params);
-  }
-
-  @Override
-  public void setSystemTime(String time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeString", time);
-    sendMessageWithLogging("setSystemTime", params);
-  }
-
-  @Override
-  public void setSystemTime(Date time) {
-    JsonObject params = new JsonObject();
-    params.addProperty("timeNumber", time.getTime());
-    sendMessageWithLogging("setSystemTime", params);
-  }
-
-  private static void parseTime(Object time, JsonObject params) {
-    if (time instanceof Long) {
-      params.addProperty("timeNumber", (Long) time);
-    } else if (time instanceof Date) {
-      params.addProperty("timeNumber", ((Date) time).getTime());
-    } else if (time instanceof String) {
-      params.addProperty("timeString", (String) time);
-    }
-  }
-}
@@ -16,21 +16,18 @@
 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.IOException;
 import java.time.Duration;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;

 import static com.microsoft.playwright.impl.Serialization.gson;
-import static java.lang.System.currentTimeMillis;

 class Message {
  int id;
@@ -39,7 +36,6 @@ class Message {
  JsonObject params;
  JsonElement result;
  SerializedError error;
-  JsonArray log;

  @Override
  public String toString() {
@@ -59,67 +55,46 @@ public class Connection {
  private final Transport transport;
  private final Map<String, ChannelOwner> objects = new HashMap<>();
  private final Root root;
-  final boolean isRemote;
  private int lastId = 0;
  private final StackTraceCollector stackTraceCollector;
  private final Map<Integer, WaitableResult<JsonElement>> callbacks = new HashMap<>();
-  private String title;
-  private boolean titleReported = false;
+  private String apiName;
  private static final boolean isLogging;
  static {
    String debug = System.getenv("DEBUG");
    isLogging = (debug != null) && debug.contains("pw:channel");
  }
  LocalUtils localUtils;
-  PlaywrightImpl playwright;
-  final Map<String, String> env;
-  private int tracingCount;

  class Root extends ChannelOwner {
    Root(Connection connection) {
      super(connection, "Root", "");
    }

-    PlaywrightImpl initialize() {
+    Playwright initialize() {
      JsonObject params = new JsonObject();
      params.addProperty("sdkLanguage", "java");
-      JsonElement result = sendMessage("initialize", params.getAsJsonObject(), NO_TIMEOUT);
+      JsonElement result = sendMessage("initialize", params.getAsJsonObject());
      return this.connection.getExistingObject(result.getAsJsonObject().getAsJsonObject("playwright").get("guid").getAsString());
    }
  }

-  Connection(Transport pipe, Map<String, String> env, LocalUtils localUtils) {
-    this(pipe, env, true);
-    this.localUtils = localUtils;
-  }
-
-  Connection(Transport transport, Map<String, String> env) {
-    this(transport, env, false);
-  }
-
-  private Connection(Transport transport, Map<String, String> env, boolean isRemote) {
-    this.env = env;
-    this.isRemote = isRemote;
+  Connection(Transport transport) {
    if (isLogging) {
      transport = new TransportLogger(transport);
    }
    this.transport = transport;
    root = new Root(this);
-    stackTraceCollector = StackTraceCollector.createFromEnv(env);
+    stackTraceCollector = StackTraceCollector.createFromEnv();
  }

-  void setIsTracing(boolean tracing) {
-    if (tracing) {
-      ++tracingCount;
-    } else {
-      --tracingCount;
-    }
+  boolean isCollectingStacks() {
+    return stackTraceCollector != null;
  }

-  String setTitle(String newTitle) {
-    String previous = title;
-    titleReported = false;
-    title = newTitle;
+  String setApiName(String name) {
+    String previous = apiName;
+    apiName = name;
    return previous;
  }

@@ -132,10 +107,10 @@ public class Connection {
  }

  public WaitableResult<JsonElement> sendMessageAsync(String guid, String method, JsonObject params) {
-    return internalSendMessage(guid, method, params, true);
+    return internalSendMessage(guid, method, params);
  }

-  private WaitableResult<JsonElement> internalSendMessage(String guid, String method, JsonObject params, boolean sendStack) {
+  private WaitableResult<JsonElement> internalSendMessage(String guid, String method, JsonObject params) {
    int id = ++lastId;
    WaitableResult<JsonElement> result = new WaitableResult<>();
    callbacks.put(id, result);
@@ -145,44 +120,23 @@ public class Connection {
    message.addProperty("method", method);
    message.add("params", params);
    JsonObject metadata = new JsonObject();
-    metadata.addProperty("wallTime", currentTimeMillis());
-    JsonArray stack = null;
-    if (titleReported) {
+    if (apiName == null) {
      metadata.addProperty("internal", true);
    } else {
-      if (title != null) {
-        metadata.addProperty("title", title);
-        // All but first message in a custom-titled API call are considered internal and will be hidden from the inspector.
-        titleReported = true;
-      }
+      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) {
-        stack = stackTraceCollector.currentStackTrace();
-        if (!stack.isEmpty()) {
-          JsonObject location = new JsonObject();
-          JsonObject frame = stack.get(0).getAsJsonObject();
-          location.addProperty("file", frame.get("file").getAsString());
-          location.addProperty("line", frame.get("line").getAsInt());
-          location.addProperty("column", frame.get("column").getAsInt());
-          metadata.add("location", location);
-        }
+        metadata.add("stack", stackTraceCollector.currentStackTrace());
      }
    }
    message.add("metadata", metadata);
    transport.send(message);
-    if (sendStack && tracingCount > 0 && stack != null && !method.startsWith("LocalUtils")) {
-      JsonObject callData = new JsonObject();
-      callData.addProperty("id", id);
-      callData.add("stack", stack);
-      JsonObject stackParams = new JsonObject();
-      stackParams.add("callData", callData);
-      internalSendMessage(localUtils.guid,"addStackToTracingNoReply", stackParams, false);
-    }
    return result;
  }

  public PlaywrightImpl initializePlaywright() {
-    playwright = root.initialize();
-    return playwright;
+    return (PlaywrightImpl) this.root.initialize();
  }

  LocalUtils localUtils() {
@@ -214,30 +168,6 @@ public class Connection {
    dispatch(messageObj);
  }

-  private static String formatCallLog(JsonArray log) {
-    if (log == null) {
-      return "";
-    }
-    boolean allEmpty = true;
-    for (JsonElement e: log) {
-      if (!e.getAsString().isEmpty()) {
-        allEmpty = false;
-        break;
-      }
-    }
-    if (allEmpty) {
-      return "";
-    }
-    List<String> lines = new ArrayList<>();
-    lines.add("");
-    lines.add("Call log:");
-    for (JsonElement e: log) {
-      lines.add("- " + e.getAsString());
-    }
-    lines.add("");
-    return String.join("\n", lines);
-  }
-
  private void dispatch(Message message) {
 //    System.out.println("Message: " + message.method + " " + message.id);
    if (message.id != 0) {
@@ -250,16 +180,12 @@ public class Connection {
      if (message.error == null) {
        callback.complete(message.result);
      } else {
-        String callLog = formatCallLog(message.log);
        if (message.error.error == null) {
-          callback.completeExceptionally(new PlaywrightException(message.error + callLog));
+          callback.completeExceptionally(new PlaywrightException(message.error.toString()));
        } else if ("TimeoutError".equals(message.error.error.name)) {
-          callback.completeExceptionally(new TimeoutError(message.error.error + callLog));
-        } else if ("TargetClosedError".equals(message.error.error.name)) {
-          callback.completeExceptionally(new TargetClosedError(message.error.error + callLog));
-
+          callback.completeExceptionally(new TimeoutError(message.error.error.toString()));
        } else {
-          callback.completeExceptionally(new DriverException(message.error.error + callLog));
+          callback.completeExceptionally(new DriverException(message.error.error));
        }
      }
      return;
@@ -273,25 +199,18 @@ public class Connection {
      createRemoteObject(message.guid, message.params);
      return;
    }
-
+    if (message.method.equals("__dispose__")) {
+      ChannelOwner object = objects.get(message.guid);
+      if (object == null) {
+        throw new PlaywrightException("Cannot find object to dispose: " + message.guid);
+      }
+      object.disconnect();
+      return;
+    }
    ChannelOwner object = objects.get(message.guid);
    if (object == null) {
      throw new PlaywrightException("Cannot find object to call " + message.method + ": " + message.guid);
    }
-    if (message.method.equals("__adopt__")) {
-      String childGuid = message.params.get("guid").getAsString();
-      ChannelOwner child = objects.get(childGuid);
-      if (child == null) {
-        throw new PlaywrightException("Unknown new child:  " + childGuid);
-      }
-      object.adopt(child);
-      return;
-    }
-    if (message.method.equals("__dispose__")) {
-      boolean wasCollected = message.params.has("reason") && "gc".equals(message.params.get("reason").getAsString());
-      object.disposeChannelOwner(wasCollected);
-      return;
-    }
    object.handleEvent(message.method, message.params);
  }

@@ -330,6 +249,9 @@ public class Connection {
      case "BrowserContext":
        result = new BrowserContextImpl(parent, type, guid, initializer);
        break;
+      case "ConsoleMessage":
+        result = new ConsoleMessageImpl(parent, type, guid, initializer);
+        break;
      case "Dialog":
        result = new DialogImpl(parent, type, guid, initializer);
        break;
@@ -353,10 +275,8 @@ public class Connection {
        result = new JsonPipe(parent, type, guid, initializer);
        break;
      case "LocalUtils":
-        result = new LocalUtils(parent, type, guid, initializer);
-        if (localUtils == null) {
-          localUtils = (LocalUtils) result;
-        }
+        localUtils = new LocalUtils(parent, type, guid, initializer);
+        result = localUtils;
        break;
      case "Page":
        result = new PageImpl(parent, type, guid, initializer);
@@ -376,7 +296,8 @@ public class Connection {
      case "Stream":
        result = new Stream(parent, type, guid, initializer);
        break;
-      case "SocksSupport":
+      case "Selectors":
+        result = new SelectorsImpl(parent, type, guid, initializer);
        break;
      case "Tracing":
        result = new TracingImpl(parent, type, guid, initializer);
@@ -384,18 +305,12 @@ public class Connection {
      case "WebSocket":
        result = new WebSocketImpl(parent, type, guid, initializer);
        break;
-      case "WebSocketRoute":
-        result = new WebSocketRouteImpl(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;
-      case "CDPSession":
-        result = new CDPSessionImpl(parent, type, guid, initializer);
-        break;
      default:
        throw new PlaywrightException("Unknown type " + type);
    }
@@ -20,33 +20,21 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.ConsoleMessage;
 import com.microsoft.playwright.JSHandle;
-import com.microsoft.playwright.Worker;

 import java.util.ArrayList;
 import java.util.List;

-public class ConsoleMessageImpl implements ConsoleMessage {
-  private final Connection connection;
-  private final PageImpl page;
-  private final WorkerImpl worker;
-  private final JsonObject initializer;
+import static com.microsoft.playwright.impl.Serialization.gson;

-  public ConsoleMessageImpl(Connection connection, JsonObject initializer, PageImpl page, WorkerImpl worker) {
-    this.connection = connection;
-    this.page = page;
-    this.worker = worker;
-    this.initializer = initializer;
+public class ConsoleMessageImpl extends ChannelOwner implements ConsoleMessage {
+  public ConsoleMessageImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
+    super(parent, type, guid, initializer);
  }

  public String type() {
    return initializer.get("type").getAsString();
  }

-  @Override
-  public Worker worker() {
-    return worker;
-  }
-
  public String text() {
    return initializer.get("text").getAsString();
  }
@@ -67,9 +55,4 @@ public class ConsoleMessageImpl implements ConsoleMessage {
      location.get("lineNumber").getAsNumber() + ":" +
      location.get("columnNumber").getAsNumber();
  }
-
-  @Override
-  public PageImpl page() {
-    return page;
-  }
 }
@@ -18,32 +18,26 @@ package com.microsoft.playwright.impl;

 import com.google.gson.JsonObject;
 import com.microsoft.playwright.Dialog;
-import com.microsoft.playwright.Page;

 class DialogImpl extends ChannelOwner implements Dialog {
-  private PageImpl page;
-
  DialogImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
-    // Note: dialogs that open early during page initialization block it.
-    // Therefore, we must report the dialog without a page to be able to handle it.
-    if (initializer.has("page")) {
-      page = connection.getExistingObject(initializer.getAsJsonObject("page").get("guid").getAsString());
-    }
  }

  @Override
  public void accept(String promptText) {
-    JsonObject params = new JsonObject();
-    if (promptText != null) {
-      params.addProperty("promptText", promptText);
-    }
-    sendMessage("accept", params, NO_TIMEOUT);
+    withLogging("Dialog.accept", () -> {
+      JsonObject params = new JsonObject();
+      if (promptText != null) {
+        params.addProperty("promptText", promptText);
+      }
+      sendMessage("accept", params);
+    });
  }

  @Override
  public void dismiss() {
-    sendMessage("dismiss");
+    withLogging("Dialog.dismiss", () -> sendMessage("dismiss"));
  }

  @Override
@@ -56,11 +50,6 @@ class DialogImpl extends ChannelOwner implements Dialog {
    return initializer.get("message").getAsString();
  }

-  @Override
-  public PageImpl page() {
-    return page;
-  }
-
  @Override
  public String type() {
    return initializer.get("type").getAsString();
@@ -46,22 +46,22 @@ class DownloadImpl implements Download {

  @Override
  public void cancel() {
-    artifact.cancel();
+    page.withLogging("Download.cancel", () -> artifact.cancel());
  }

  @Override
  public InputStream createReadStream() {
-    return artifact.createReadStream();
+    return page.withLogging("Download.createReadStream", () -> artifact.createReadStream());
  }

  @Override
  public void delete() {
-    artifact.delete();
+    page.withLogging("Download.delete", () -> artifact.delete());
  }

  @Override
  public String failure() {
-    return artifact.failure();
+    return page.withLogging("Download.failure", () -> artifact.failure());
  }

  @Override
@@ -71,11 +71,11 @@ class DownloadImpl implements Download {

  @Override
  public Path path() {
-    return artifact.pathAfterFinished();
+    return page.withLogging("Download.path", () -> artifact.pathAfterFinished());
  }

  @Override
  public void saveAs(Path path) {
-    artifact.saveAs(path);
+    page.withLogging("Download.saveAs", () -> artifact.saveAs(path));
  }
 }
@@ -22,7 +22,7 @@ import java.io.PrintStream;
 import java.io.PrintWriter;

 class DriverException extends PlaywrightException {
-  DriverException(String error) {
-    super(error);
+  DriverException(SerializedError.Error error) {
+    super(error.toString());
  }
 }
@@ -21,30 +21,26 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.ElementHandle;
 import com.microsoft.playwright.Frame;
-import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.options.BoundingBox;
 import com.microsoft.playwright.options.ElementState;
 import com.microsoft.playwright.options.FilePayload;
 import com.microsoft.playwright.options.SelectOption;

-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Base64;
 import java.util.List;

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

 public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
-  private final FrameImpl frame;
-
  ElementHandleImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
    super(parent, type, guid, initializer);
-    this.frame = (FrameImpl)parent;
  }

  @Override
@@ -54,83 +50,105 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {

  @Override
  public ElementHandle querySelector(String selector) {
-    JsonObject params = new JsonObject();
-    params.addProperty("selector", selector);
-    JsonElement json = sendMessage("querySelector", params, NO_TIMEOUT);
-    JsonObject element = json.getAsJsonObject().getAsJsonObject("element");
-    if (element == null) {
-      return null;
-    }
-    return connection.getExistingObject(element.get("guid").getAsString());
+    return withLogging("ElementHandle.querySelector", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("selector", selector);
+      JsonElement json = sendMessage("querySelector", params);
+      JsonObject element = json.getAsJsonObject().getAsJsonObject("element");
+      if (element == null) {
+        return null;
+      }
+      return connection.getExistingObject(element.get("guid").getAsString());
+    });
  }

  @Override
  public List<ElementHandle> querySelectorAll(String selector) {
-    JsonObject params = new JsonObject();
-    params.addProperty("selector", selector);
-    JsonElement json = sendMessage("querySelectorAll", params, NO_TIMEOUT);
-    JsonArray elements = json.getAsJsonObject().getAsJsonArray("elements");
-    if (elements == null) {
-      return null;
-    }
-    List<ElementHandle> handles = new ArrayList<>();
-    for (JsonElement item : elements) {
-      handles.add(connection.getExistingObject(item.getAsJsonObject().get("guid").getAsString()));
-    }
-    return handles;
+    return withLogging("ElementHandle.<", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("selector", selector);
+      JsonElement json = sendMessage("querySelectorAll", params);
+      JsonArray elements = json.getAsJsonObject().getAsJsonArray("elements");
+      if (elements == null) {
+        return null;
+      }
+      List<ElementHandle> handles = new ArrayList<>();
+      for (JsonElement item : elements) {
+        handles.add(connection.getExistingObject(item.getAsJsonObject().get("guid").getAsString()));
+      }
+      return handles;
+    });
  }

  @Override
  public Object evalOnSelector(String selector, String pageFunction, Object arg) {
-    JsonObject params = new JsonObject();
-    params.addProperty("selector", selector);
-    params.addProperty("expression", pageFunction);
-    params.add("arg", gson().toJsonTree(serializeArgument(arg)));
-    JsonElement json = sendMessage("evalOnSelector", params, NO_TIMEOUT);
-    SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class);
-    return deserialize(value);
+    return withLogging("ElementHandle.evalOnSelector", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("selector", selector);
+      params.addProperty("expression", pageFunction);
+      params.add("arg", gson().toJsonTree(serializeArgument(arg)));
+      JsonElement json = sendMessage("evalOnSelector", params);
+      SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class);
+      return deserialize(value);
+    });
  }

  @Override
  public Object evalOnSelectorAll(String selector, String pageFunction, Object arg) {
-    JsonObject params = new JsonObject();
-    params.addProperty("selector", selector);
-    params.addProperty("expression", pageFunction);
-    params.add("arg", gson().toJsonTree(serializeArgument(arg)));
-    JsonElement json = sendMessage("evalOnSelectorAll", params, NO_TIMEOUT);
-    SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class);
-    return deserialize(value);
+    return withLogging("ElementHandle.evalOnSelectorAll", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("selector", selector);
+      params.addProperty("expression", pageFunction);
+      params.add("arg", gson().toJsonTree(serializeArgument(arg)));
+      JsonElement json = sendMessage("evalOnSelectorAll", params);
+      SerializedValue value = gson().fromJson(json.getAsJsonObject().get("value"), SerializedValue.class);
+      return deserialize(value);
+    });
  }

  @Override
  public BoundingBox boundingBox() {
-    JsonObject json = sendMessage("boundingBox").getAsJsonObject();
-    if (!json.has("value")) {
-      return null;
-    }
-    return gson().fromJson(json.get("value"), BoundingBox.class);
+    return withLogging("ElementHandle.boundingBox", () -> {
+      JsonObject json = sendMessage("boundingBox").getAsJsonObject();
+      if (!json.has("value")) {
+        return null;
+      }
+      return gson().fromJson(json.get("value"), BoundingBox.class);
+    });
  }

  @Override
  public void check(CheckOptions options) {
+    withLogging("ElementHandle.check", () -> checkImpl(options));
+  }
+
+  private void checkImpl(CheckOptions options) {
    if (options == null) {
      options = new CheckOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("check", params, frame.timeout(options.timeout));
+    sendMessage("check", params);
  }

  @Override
  public void click(ClickOptions options) {
+    withLogging("ElementHandle.click", () -> clickImpl(options));
+  }
+
+  private void clickImpl(ClickOptions options) {
    if (options == null) {
      options = new ClickOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("click", params, frame.timeout(options.timeout));
+    sendMessage("click", params);
  }

  @Override
  public Frame contentFrame() {
+    return withLogging("ElementHandle.contentFrame", () -> contentFrameImpl());
+  }
+
+  private Frame contentFrameImpl() {
    JsonObject json = sendMessage("contentFrame").getAsJsonObject();
    if (!json.has("frame")) {
      return null;
@@ -140,132 +158,177 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {

  @Override
  public void dblclick(DblclickOptions options) {
+    withLogging("ElementHandle.dblclick", () -> dblclickImpl(options));
+  }
+
+  private void dblclickImpl(DblclickOptions options) {
    if (options == null) {
      options = new DblclickOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("dblclick", params, frame.timeout(options.timeout));
+    sendMessage("dblclick", params);
  }

  @Override
  public void dispatchEvent(String type, Object eventInit) {
-    JsonObject params = new JsonObject();
-    params.addProperty("type", type);
-    params.add("eventInit", gson().toJsonTree(serializeArgument(eventInit)));
-    sendMessage("dispatchEvent", params, NO_TIMEOUT);
+    withLogging("ElementHandle.dispatchEvent", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("type", type);
+      params.add("eventInit", gson().toJsonTree(serializeArgument(eventInit)));
+      sendMessage("dispatchEvent", params);
+    });
  }

  @Override
  public void fill(String value, FillOptions options) {
+    withLogging("ElementHandle.fill", () -> fillImpl(value, options));
+  }
+
+  private void fillImpl(String value, FillOptions options) {
    if (options == null) {
      options = new FillOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("value", value);
-    sendMessage("fill", params, frame.timeout(options.timeout));
+    sendMessage("fill", params);
  }

  @Override
  public void focus() {
-    sendMessage("focus");
+    withLogging("ElementHandle.focus", () -> sendMessage("focus"));
  }

  @Override
  public String getAttribute(String name) {
-    JsonObject params = new JsonObject();
-    params.addProperty("name", name);
-    JsonObject json = sendMessage("getAttribute", params, NO_TIMEOUT).getAsJsonObject();
-    return json.has("value") ? json.get("value").getAsString() : null;
+    return withLogging("ElementHandle.getAttribute", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("name", name);
+      JsonObject json = sendMessage("getAttribute", params).getAsJsonObject();
+      return json.has("value") ? json.get("value").getAsString() : null;
+    });
  }

  @Override
  public void hover(HoverOptions options) {
+    withLogging("ElementHandle.hover", () -> hoverImpl(options));
+  }
+
+  private void hoverImpl(HoverOptions options) {
    if (options == null) {
      options = new HoverOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("hover", params, frame.timeout(options.timeout));
+    sendMessage("hover", params);
  }

  @Override
  public String innerHTML() {
-    JsonObject json = sendMessage("innerHTML").getAsJsonObject();
-    return json.get("value").getAsString();
+    return withLogging("ElementHandle.innerHTML", () -> {
+      JsonObject json = sendMessage("innerHTML").getAsJsonObject();
+      return json.get("value").getAsString();
+    });
  }

  @Override
  public String innerText() {
-    JsonObject json = sendMessage("innerText").getAsJsonObject();
-    return json.get("value").getAsString();
+    return withLogging("ElementHandle.innerText", () -> {
+      JsonObject json = sendMessage("innerText").getAsJsonObject();
+      return json.get("value").getAsString();
+    });
  }

  @Override
  public String inputValue(InputValueOptions options) {
+    return withLogging("ElementHandle.inputValue", () -> inputValueImpl(options));
+  }
+
+  private String inputValueImpl(InputValueOptions options) {
    if (options == null) {
      options = new InputValueOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    JsonObject json = sendMessage("inputValue", params, NO_TIMEOUT).getAsJsonObject();
+    JsonObject json = sendMessage("inputValue", params).getAsJsonObject();
    return json.get("value").getAsString();
  }

  @Override
  public boolean isChecked() {
-    JsonObject json = sendMessage("isChecked").getAsJsonObject();
-    return json.get("value").getAsBoolean();
+    return withLogging("ElementHandle.isChecked", () -> {
+      JsonObject json = sendMessage("isChecked").getAsJsonObject();
+      return json.get("value").getAsBoolean();
+    });
  }

  @Override
  public boolean isDisabled() {
-    JsonObject json = sendMessage("isDisabled").getAsJsonObject();
-    return json.get("value").getAsBoolean();
+    return withLogging("ElementHandle.isDisabled", () -> {
+      JsonObject json = sendMessage("isDisabled").getAsJsonObject();
+      return json.get("value").getAsBoolean();
+    });
  }

  @Override
  public boolean isEditable() {
-    JsonObject json = sendMessage("isEditable").getAsJsonObject();
-    return json.get("value").getAsBoolean();
+    return withLogging("ElementHandle.isEditable", () -> {
+      JsonObject json = sendMessage("isEditable").getAsJsonObject();
+      return json.get("value").getAsBoolean();
+    });
  }

  @Override
  public boolean isEnabled() {
-    JsonObject json = sendMessage("isEnabled").getAsJsonObject();
-    return json.get("value").getAsBoolean();
+    return withLogging("ElementHandle.isEnabled", () -> {
+      JsonObject json = sendMessage("isEnabled").getAsJsonObject();
+      return json.get("value").getAsBoolean();
+    });
  }

  @Override
  public boolean isHidden() {
-    JsonObject json = sendMessage("isHidden").getAsJsonObject();
-    return json.get("value").getAsBoolean();
+    return withLogging("ElementHandle.isHidden", () -> {
+      JsonObject json = sendMessage("isHidden").getAsJsonObject();
+      return json.get("value").getAsBoolean();
+    });
  }

  @Override
  public boolean isVisible() {
-    JsonObject json = sendMessage("isVisible").getAsJsonObject();
-    return json.get("value").getAsBoolean();
+    return withLogging("ElementHandle.isVisible", () -> {
+      JsonObject json = sendMessage("isVisible").getAsJsonObject();
+      return json.get("value").getAsBoolean();
+    });
  }

  @Override
  public FrameImpl ownerFrame() {
-    JsonObject json = sendMessage("ownerFrame").getAsJsonObject();
-    if (!json.has("frame")) {
-      return null;
-    }
-    return connection.getExistingObject(json.getAsJsonObject("frame").get("guid").getAsString());
+    return withLogging("ElementHandle.ownerFrame", () -> {
+      JsonObject json = sendMessage("ownerFrame").getAsJsonObject();
+      if (!json.has("frame")) {
+        return null;
+      }
+      return connection.getExistingObject(json.getAsJsonObject("frame").get("guid").getAsString());
+    });
  }

  @Override
  public void press(String key, PressOptions options) {
+    withLogging("ElementHandle.press", () -> pressImpl(key, options));
+  }
+  private void pressImpl(String key, PressOptions options) {
    if (options == null) {
      options = new PressOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("key", key);
-    sendMessage("press", params, frame.timeout(options.timeout));
+    sendMessage("press", params);
  }

  @Override
  public byte[] screenshot(ScreenshotOptions options) {
+    return withLogging("ElementHandle.screenshot", () -> screenshotImpl(options));
+  }
+
+  private byte[] screenshotImpl(ScreenshotOptions options) {
    if (options == null) {
      options = new ScreenshotOptions();
    }
@@ -284,7 +347,7 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.remove("path");
-    JsonObject json = sendMessage("screenshot", params, frame.timeout(options.timeout)).getAsJsonObject();
+    JsonObject json = sendMessage("screenshot", params).getAsJsonObject();

    byte[] buffer = Base64.getDecoder().decode(json.get("binary").getAsString());
    if (options.path != null) {
@@ -295,11 +358,7 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {

  @Override
  public void scrollIntoViewIfNeeded(ScrollIntoViewIfNeededOptions options) {
-    if (options == null) {
-      options = new ScrollIntoViewIfNeededOptions();
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("scrollIntoViewIfNeeded", params, frame.timeout(options.timeout));
+    withLogging("ElementHandle.scrollIntoViewIfNeeded", () -> scrollIntoViewIfNeededImpl(options));
  }

  @Override
@@ -316,14 +375,11 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {

  @Override
  public List<String> selectOption(String[] values, SelectOptionOptions options) {
-    if (options == null) {
-      options = new SelectOptionOptions();
+    if (values == null) {
+      return selectOption(new SelectOption[0], options);
    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    if (values != null) {
-      params.add("options", toSelectValueOrLabel(values));
-    }
-    return selectOption(params, options.timeout);
+    return selectOption(Arrays.asList(values).stream().map(
+      v -> new SelectOption().setValue(v)).toArray(SelectOption[]::new), options);
  }

  @Override
@@ -332,6 +388,13 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
    return selectOption(values, options);
  }

+  private void scrollIntoViewIfNeededImpl(ScrollIntoViewIfNeededOptions options) {
+    if (options == null) {
+      options = new ScrollIntoViewIfNeededOptions();
+    }
+    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+    sendMessage("scrollIntoViewIfNeeded", params);
+  }

  @Override
  public List<String> selectOption(SelectOption[] values, SelectOptionOptions options) {
@@ -342,7 +405,7 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
    if (values != null) {
      params.add("options", gson().toJsonTree(values));
    }
-    return selectOption(params, options.timeout);
+    return selectOption(params);
  }

  @Override
@@ -354,21 +417,19 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
    if (values != null) {
      params.add("elements", Serialization.toProtocol(values));
    }
-    return selectOption(params, options.timeout);
+    return selectOption(params);
  }

-  private List<String> selectOption(JsonObject params, Double timeout) {
-    JsonObject json = sendMessage("selectOption", params, frame.timeout(timeout)).getAsJsonObject();
-    return parseStringList(json.getAsJsonArray("values"));
+  private List<String> selectOption(JsonObject params) {
+    return withLogging("SelectOption", () -> {
+      JsonObject json = sendMessage("selectOption", params).getAsJsonObject();
+      return parseStringList(json.getAsJsonArray("values"));
+    });
  }

  @Override
  public void selectText(SelectTextOptions options) {
-    if (options == null) {
-      options = new SelectTextOptions();
-    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("selectText", params, frame.timeout(options.timeout));
+    withLogging("ElementHandle.selectText", () -> selectTextImpl(options));
  }

  @Override
@@ -385,19 +446,34 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
    setInputFiles(new Path[]{files}, options);
  }

+  private void selectTextImpl(SelectTextOptions options) {
+    if (options == null) {
+      options = new SelectTextOptions();
+    }
+    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
+    sendMessage("selectText", params);
+  }

  @Override
  public void setInputFiles(Path[] files, SetInputFilesOptions 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 (options == null) {
-      options = new SetInputFilesOptions();
+    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);
    }
-    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    addFilePathUploadParams(files, params, frame.page().context());
-    sendMessage("setInputFiles", params, frame.timeout(options.timeout));
  }

  @Override
@@ -407,51 +483,77 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {

  @Override
  public void setInputFiles(FilePayload[] files, SetInputFilesOptions options) {
+    withLogging("ElementHandle.setInputFiles", () -> setInputFilesImpl(files, options));
+  }
+
+  void setInputFilesImpl(FilePayload[] files, SetInputFilesOptions options) {
    checkFilePayloadSize(files);
    if (options == null) {
      options = new SetInputFilesOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    params.add("payloads", Serialization.toJsonArray(files));
-    sendMessage("setInputFiles", params, frame.timeout(options.timeout));
+    params.add("files", Serialization.toJsonArray(files));
+    sendMessage("setInputFiles", params);
  }

  @Override
  public void tap(TapOptions options) {
+    withLogging("ElementHandle.tap", () -> tapImpl(options));
+  }
+
+  private void tapImpl(TapOptions options) {
    if (options == null) {
      options = new TapOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("tap", params, frame.timeout(options.timeout));
+    sendMessage("tap", params);
  }

  @Override
  public String textContent() {
-    JsonObject json = sendMessage("textContent").getAsJsonObject();
-    return json.has("value") ? json.get("value").getAsString() : null;
+    return withLogging("ElementHandle.textContent", () -> textContentImpl());
+  }
+
+  private String textContentImpl() {
+    return withLogging("ElementHandle.textContent", () -> {
+      JsonObject json = sendMessage("textContent").getAsJsonObject();
+      return json.has("value") ? json.get("value").getAsString() : null;
+    });
  }

  @Override
  public void type(String text, TypeOptions options) {
+    withLogging("ElementHandle.type", () -> typeImpl(text, options));
+  }
+
+  private void typeImpl(String text, TypeOptions options) {
    if (options == null) {
      options = new TypeOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("text", text);
-    sendMessage("type", params, frame.timeout(options.timeout));
+    sendMessage("type", params);
  }

  @Override
  public void uncheck(UncheckOptions options) {
+    withLogging("ElementHandle.uncheck", () -> uncheckImpl(options));
+  }
+
+  private void uncheckImpl(UncheckOptions options) {
    if (options == null) {
      options = new UncheckOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
-    sendMessage("uncheck", params, frame.timeout(options.timeout));
+    sendMessage("uncheck", params);
  }

  @Override
  public void waitForElementState(ElementState state, WaitForElementStateOptions options) {
+    withLogging("ElementHandle.waitForElementState", () -> waitForElementStateImpl(state, options));
+  }
+
+  private void waitForElementStateImpl(ElementState state, WaitForElementStateOptions options) {
    if (options == null) {
      options = new WaitForElementStateOptions();
    }
@@ -460,7 +562,7 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("state", toProtocol(state));
-    sendMessage("waitForElementState", params, frame.timeout(options.timeout));
+    sendMessage("waitForElementState", params);
  }

  private static String toProtocol(ElementState state) {
@@ -469,12 +571,16 @@ public class ElementHandleImpl extends JSHandleImpl implements ElementHandle {

  @Override
  public ElementHandle waitForSelector(String selector, WaitForSelectorOptions options) {
+    return withLogging("ElementHandle.waitForSelector", () -> waitForSelectorImpl(selector, options));
+  }
+
+  private ElementHandle waitForSelectorImpl(String selector, WaitForSelectorOptions options) {
    if (options == null) {
      options = new WaitForSelectorOptions();
    }
    JsonObject params = gson().toJsonTree(options).getAsJsonObject();
    params.addProperty("selector", selector);
-    JsonElement json = sendMessage("waitForSelector", params, frame.timeout(options.timeout)).getAsJsonObject();
+    JsonElement json = sendMessage("waitForSelector", params);
    JsonObject element = json.getAsJsonObject().getAsJsonObject("element");
    if (element == null) {
      return null;
@@ -58,7 +58,8 @@ class FileChooserImpl implements FileChooser {

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

  @Override
@@ -68,6 +69,7 @@ class FileChooserImpl implements FileChooser {

  @Override
  public void setFiles(FilePayload[] files, SetFilesOptions options) {
-    element.setInputFiles(files, convertType(options, ElementHandle.SetInputFilesOptions.class));
+    page.withLogging("FileChooser.setInputFiles",
+      () -> element.setInputFilesImpl(files, convertType(options, ElementHandle.SetInputFilesOptions.class)));
  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Gerard Mista	59a8490540	Artifact should have same version as release. (#974 )	2022-07-01 14:21:42 -07:00
Yury Semikhatsky	a127bfefb3	cherry-pick(#978,#984): recent test fixes (#985 )	2022-06-30 14:47:57 -07:00
Yury Semikhatsky	06082438fe	cherry-pick(#982 ): feat: roll driver to 1.23.1-beta, implement routeFromHar.update (#983 )	2022-06-30 13:17:18 -07:00
Yury Semikhatsky	b8bd59a55c	chore: mark 1.23.0 (#971 )	2022-06-28 09:14:00 -07:00
Yury Semikhatsky	e42d7bdc9a	cherry-pick(#969 ): feat: support ignoreCase option (#970 )	2022-06-28 08:50:34 -07:00