feat: roll driver, headerValue(s), wheel (#609)

Author: yury-s

README.md

@@ -11,9 +11,9 @@ Playwright is a Java library to automate [Chromium](https://www.chromium.org/Hom
 
 |          | Linux | macOS | Windows |
 |   :---   | :---: | :---: | :---:   |
-| Chromium <!-- GEN:chromium-version -->95.0.4630.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Chromium <!-- GEN:chromium-version -->96.0.4641.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 | WebKit <!-- GEN:webkit-version -->15.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
-| Firefox <!-- GEN:firefox-version -->91.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
+| Firefox <!-- GEN:firefox-version -->92.0<!-- GEN:stop --> | :white_check_mark: | :white_check_mark: | :white_check_mark: |
 
 Headless execution is supported for all the browsers on all platforms. Check out [system requirements](https://playwright.dev/java/docs/next/intro/#system-requirements) for details.
 

playwright/src/main/java/com/microsoft/playwright/Mouse.java

@@ -212,5 +212,15 @@ default void up() {
    * Dispatches a {@code mouseup} event.
    */
   void up(UpOptions options);
+  /**
+   * 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.
+   */
+  void wheel(double deltaX, double deltaY);
 }
 

playwright/src/main/java/com/microsoft/playwright/Request.java

@@ -64,10 +64,16 @@ public interface Request {
   Map<String, String> headers();
   /**
    * 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
+   * 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.
+   *
+   * @param name Name of the header.
+   */
+  String headerValue(String name);
   /**
    * Whether this request is driving frame's navigation.
    */

playwright/src/main/java/com/microsoft/playwright/Response.java

@@ -32,7 +32,7 @@ public interface Response {
    */
   byte[] body();
   /**
-   * Waits for this response to finish, returns failure error if request failed.
+   * Waits for this response to finish, returns always {@code null}.
    */
   String finished();
   /**
@@ -46,10 +46,24 @@ public interface Response {
   Map<String, String> headers();
   /**
    * 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
+   * 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.
+   *
+   * @param name Name of the header.
+   */
+  String headerValue(String name);
+  /**
+   * 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.
+   */
+  List<String> headerValues(String name);
   /**
    * Contains a boolean stating whether the response was successful (status in the range 200-299) or not.
    */

playwright/src/main/java/com/microsoft/playwright/impl/Connection.java

@@ -305,6 +305,10 @@ private ChannelOwner createRemoteObject(String parentGuid, JsonObject params) {
       case "ElementHandle":
         result = new ElementHandleImpl(parent, type, guid, initializer);
         break;
+      case "FetchRequest":
+        // Create fake object as this API is experimental an only exposed in Node.js.
+        result = new ChannelOwner(parent, type, guid, initializer);
+        break;
       case "Frame":
         result = new FrameImpl(parent, type, guid, initializer);
         break;

playwright/src/main/java/com/microsoft/playwright/impl/MouseImpl.java

@@ -93,6 +93,16 @@ public void up(UpOptions options) {
     page.withLogging("Mouse.up", () -> upImpl(options));
   }
 
+  @Override
+  public void wheel(double deltaX, double deltaY) {
+    page.withLogging("Mouse.wheel", () -> {
+      JsonObject params = new JsonObject();
+      params.addProperty("deltaX", deltaX);
+      params.addProperty("deltaY", deltaY);
+      page.sendMessage("mouseWheel", params);
+    });
+  }
+
   private void upImpl(UpOptions options) {
     if (options == null) {
       options = new UpOptions();

playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java

@@ -125,7 +125,14 @@ protected void handleEvent(String event, JsonObject params) {
       if (listeners.hasListeners(EventType.DIALOG)) {
         listeners.notify(EventType.DIALOG, dialog);
       } else {
-        dialog.dismiss();
+        if ("beforeunload".equals(dialog.type())) {
+          try {
+            dialog.accept();
+          } catch (PlaywrightException e) {
+          }
+        } else {
+          dialog.dismiss();
+        }
       }
     } else if ("worker".equals(event)) {
       String guid = params.getAsJsonObject("worker").get("guid").getAsString();

playwright/src/main/java/com/microsoft/playwright/impl/RawHeaders.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.impl;
+
+import com.microsoft.playwright.options.HttpHeader;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+class RawHeaders {
+  private final List<HttpHeader> headersArray;
+  private final Map<String, List<String>> headersMap = new LinkedHashMap<>();
+
+  RawHeaders(List<HttpHeader> headers) {
+    headersArray = headers;
+    for (HttpHeader h: headers) {
+      String name = h.name.toLowerCase();
+      List<String> values = headersMap.get(name);
+      if (values == null) {
+        values = new ArrayList<>();
+        headersMap.put(name, values);
+      }
+      values.add(h.value);
+    }
+  }
+
+  String get(String name) {
+    List<String> values = getAll(name);
+    if (values == null) {
+      return null;
+    }
+    return String.join("set-cookie".equals(name.toLowerCase()) ? "\n" : ", ", values);
+  }
+
+  List<String> getAll(String name) {
+    return headersMap.get(name.toLowerCase());
+  }
+
+  Map<String, String> headers() {
+    Map<String, String> result = new LinkedHashMap<>();
+    for (String name: headersMap.keySet()) {
+      result.put(name, get(name));
+    }
+    return result;
+  }
+
+  List<HttpHeader> headersArray() {
+    return headersArray;
+  }
+
+}

playwright/src/main/java/com/microsoft/playwright/impl/RequestImpl.java

@@ -37,8 +37,8 @@ public class RequestImpl extends ChannelOwner implements Request {
   private final byte[] postData;
   private RequestImpl redirectedFrom;
   private RequestImpl redirectedTo;
-  private final List<HttpHeader> headers;
-  private List<HttpHeader> rawHeaders;
+  private final RawHeaders headers;
+  private RawHeaders rawHeaders;
   String failure;
   Timing timing;
   boolean didFailOrFinish;
@@ -50,7 +50,7 @@ public class RequestImpl extends ChannelOwner implements Request {
       redirectedFrom = connection.getExistingObject(initializer.getAsJsonObject("redirectedFrom").get("guid").getAsString());
       redirectedFrom.redirectedTo = this;
     }
-    headers = asList(gson().fromJson(initializer.getAsJsonArray("headers"), HttpHeader[].class));
+    headers = new RawHeaders(asList(gson().fromJson(initializer.getAsJsonArray("headers"), HttpHeader[].class)));
     if (initializer.has("postData")) {
       postData = Base64.getDecoder().decode(initializer.get("postData").getAsString());
     } else {
@@ -60,7 +60,7 @@ public class RequestImpl extends ChannelOwner implements Request {
 
   @Override
   public Map<String, String> allHeaders() {
-    return withLogging("Request.allHeaders", () -> toHeadersMap(getRawHeaders()));
+    return withLogging("Request.allHeaders", () -> getRawHeaders().headers());
   }
 
   @Override
@@ -75,12 +75,17 @@ public FrameImpl frame() {
 
   @Override
   public Map<String, String> headers() {
-    return toHeadersMap(headers);
+    return headers.headers();
   }
 
   @Override
   public List<HttpHeader> headersArray() {
-    return withLogging("Request.headersArray", () -> getRawHeaders());
+    return withLogging("Request.headersArray", () -> getRawHeaders().headersArray());
+  }
+
+  @Override
+  public String headerValue(String name) {
+    return withLogging("Request.headerValue", () -> getRawHeaders().get(name));
   }
 
   @Override
@@ -158,7 +163,7 @@ Request finalRequest() {
     return redirectedTo != null ? redirectedTo.finalRequest() : this;
   }
 
-  private List<HttpHeader> getRawHeaders() {
+  private RawHeaders getRawHeaders() {
     if (rawHeaders != null) {
       return rawHeaders;
     }
@@ -173,7 +178,7 @@ private List<HttpHeader> getRawHeaders() {
     });
 
     // The field may have been initialized in a nested call but it is ok.
-    rawHeaders = asList(gson().fromJson(rawHeadersJson, HttpHeader[].class));
+    rawHeaders = new RawHeaders(asList(gson().fromJson(rawHeadersJson, HttpHeader[].class)));
     return rawHeaders;
   }
 }

playwright/src/main/java/com/microsoft/playwright/impl/ResponseImpl.java

@@ -16,7 +16,6 @@
 
 package com.microsoft.playwright.impl;
 
-import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.Frame;
 import com.microsoft.playwright.Response;
@@ -26,32 +25,29 @@
 import com.microsoft.playwright.options.Timing;
 
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+import java.util.Map;
 
 import static com.microsoft.playwright.impl.Serialization.gson;
-import static com.microsoft.playwright.impl.Utils.toHeadersMap;
 import static java.util.Arrays.asList;
 
 public class ResponseImpl extends ChannelOwner implements Response {
-  private final Map<String, String> headers = new HashMap<>();
-  private List<HttpHeader> rawHeaders;
+  private final RawHeaders headers;
+  private RawHeaders rawHeaders;
   private final RequestImpl request;
 
   ResponseImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) {
     super(parent, type, guid, initializer);
-
-    for (JsonElement e : initializer.getAsJsonArray("headers")) {
-      JsonObject item = e.getAsJsonObject();
-      headers.put(item.get("name").getAsString().toLowerCase(), item.get("value").getAsString());
-    }
-
+    headers = new RawHeaders(asList(gson().fromJson(initializer.getAsJsonArray("headers"), HttpHeader[].class)));
     request = connection.getExistingObject(initializer.getAsJsonObject("request").get("guid").getAsString());
     request.timing = gson().fromJson(initializer.get("timing"), Timing.class);
   }
 
   @Override
   public Map<String, String> allHeaders() {
-    return withLogging("Response.allHeaders", () -> toHeadersMap(getRawHeaders()));
+    return withLogging("Response.allHeaders", () -> getRawHeaders().headers());
   }
 
   @Override
@@ -89,12 +85,22 @@ public Frame frame() {
 
   @Override
   public Map<String, String> headers() {
-    return headers;
+    return headers.headers();
   }
 
   @Override
   public List<HttpHeader> headersArray() {
-    return withLogging("Response.headersArray", () -> getRawHeaders());
+    return withLogging("Response.headersArray", () -> getRawHeaders().headersArray());
+  }
+
+  @Override
+  public String headerValue(String name) {
+    return getRawHeaders().get(name);
+  }
+
+  @Override
+  public List<String> headerValues(String name) {
+    return getRawHeaders().getAll(name);
   }
 
   @Override
@@ -149,10 +155,10 @@ public String url() {
     return initializer.get("url").getAsString();
   }
 
-  private List<HttpHeader> getRawHeaders() {
+  private RawHeaders getRawHeaders() {
     if (rawHeaders == null) {
       JsonObject json = sendMessage("rawResponseHeaders").getAsJsonObject();
-      rawHeaders = asList(gson().fromJson(json.getAsJsonArray("headers"), HttpHeader[].class));
+      rawHeaders = new RawHeaders(asList(gson().fromJson(json.getAsJsonArray("headers"), HttpHeader[].class)));
     }
     return rawHeaders;
   }