fix: package drivers for all platforms (#114)

driver-bundle/src/main/java/com/microsoft/playwright/impl/DriverJar.java

@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright.impl;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.concurrent.TimeUnit;
+
+public class DriverJar extends Driver {
+  private final Path driverTempDir;
+
+  DriverJar() throws IOException, URISyntaxException, InterruptedException {
+    driverTempDir = Files.createTempDirectory("playwright-java-");
+    driverTempDir.toFile().deleteOnExit();
+    ClassLoader classloader = Thread.currentThread().getContextClassLoader();
+    Path path = Paths.get(classloader.getResource("driver/" + platformDir()).toURI());
+    Files.list(path).forEach(filePath -> {
+      try {
+        extractResource(filePath, driverTempDir);
+      } catch (IOException e) {
+        throw new RuntimeException("Failed to extract driver from " + path, e);
+      }
+    });
+
+    Path driver = driverTempDir.resolve("playwright-cli");
+    ProcessBuilder pb = new ProcessBuilder(driver.toString(), "install");
+    pb.redirectError(ProcessBuilder.Redirect.INHERIT);
+    pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
+    Process p = pb.start();
+    boolean result = p.waitFor(10, TimeUnit.MINUTES);
+    if (!result) {
+      System.err.println("Timed out waiting for browsers to install");
+    }
+  }
+
+  private static String platformDir() {
+    String name = System.getProperty("os.name").toLowerCase();
+    if (name.contains("windows")) {
+      return "win32_x64";
+    }
+    if (name.contains("linux")) {
+      return "linux";
+    }
+    if (name.contains("mac os x")) {
+      return "mac";
+    }
+    throw new RuntimeException("Unexpected os.name value: " + name);
+  }
+
+  private static Path extractResource(Path from, Path toDir) throws IOException {
+    Path path = toDir.resolve(from.getFileName());
+    Files.copy(from, path);
+    path.toFile().setExecutable(true);
+    path.toFile().deleteOnExit();
+//    System.out.println("extracting: " + from.toString() + " to " + path.toString());
+    return path;
+  }
+
+  @Override
+  Path driverDir() {
+    return driverTempDir;
+  }
+}

driver-bundle/src/main/resources/.gitignore

@@ -0,0 +1,2 @@
+driver/
+local-driver/

driver-bundle/src/test/java/com/microsoft/playwright/TestInstall.java

@@ -0,0 +1,43 @@
+/*
+ * 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 org.junit.jupiter.api.Test;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class TestInstall {
+  @Test
+  void playwrightCliInstalled() throws Exception {
+    // Clear system property to ensure that the driver is loaded from jar.
+    System.clearProperty("playwright.cli.dir");
+    Path cli = Driver.ensureDriverInstalled();
+    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");
+  }
+}