fix: CLI don't download browers automatically and set env accordingly (#790)

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

@@ -40,9 +40,10 @@ public class DriverJar extends Driver {
   }
 
   @Override
-  protected void initialize(Map<String, String> env) throws Exception {
+  protected void initialize(Map<String, String> env, Boolean installBrowsers) throws Exception {
     extractDriverToTempDir();
-    installBrowsers(env);
+    if (installBrowsers)
+      installBrowsers(env);
   }
 
   private void installBrowsers(Map<String, String> env) throws IOException, InterruptedException {
@@ -60,6 +61,7 @@ public class DriverJar extends Driver {
     }
     ProcessBuilder pb = new ProcessBuilder(driver.toString(), "install");
     pb.environment().putAll(env);
+    setRequiredEnvironmentVariables(pb);
     pb.redirectError(ProcessBuilder.Redirect.INHERIT);
     pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
     Process p = pb.start();

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

@@ -40,7 +40,7 @@ public class TestInstall {
 
   @Test
   void playwrightCliInstalled() throws Exception {
-    Path cli = Driver.ensureDriverInstalled(Collections.emptyMap());
+    Path cli = Driver.ensureDriverInstalled(Collections.emptyMap(), false);
     assertTrue(Files.exists(cli));
 
     ProcessBuilder pb = new ProcessBuilder(cli.toString(), "install");

driver/src/main/java/com/microsoft/playwright/impl/Driver.java

@@ -35,7 +35,7 @@ public abstract class Driver {
     }
 
     @Override
-    protected void initialize(Map<String, String> env) {
+    protected void initialize(Map<String, String> env, Boolean installBrowsers) {
       // no-op
     }
 
@@ -45,11 +45,11 @@ public abstract class Driver {
     }
   }
 
-  public static synchronized Path ensureDriverInstalled(Map<String, String> env) {
+  public static synchronized Path ensureDriverInstalled(Map<String, String> env, Boolean installBrowsers) {
     if (instance == null) {
       try {
         instance = createDriver();
-        instance.initialize(env);
+        instance.initialize(env, installBrowsers);
       } catch (Exception exception) {
         throw new RuntimeException("Failed to create driver", exception);
       }
@@ -57,7 +57,7 @@ public abstract class Driver {
     return instance.driverPath();
   }
 
-  protected abstract void initialize(Map<String, String> env) throws Exception;
+  protected abstract void initialize(Map<String, String> env, Boolean installBrowsers) throws Exception;
 
   public Path driverPath() {
     String cliFileName = System.getProperty("os.name").toLowerCase().contains("windows") ?
@@ -66,9 +66,11 @@ public abstract class Driver {
   }
 
   public static void setRequiredEnvironmentVariables(ProcessBuilder pb) {
-    if (!pb.environment().containsKey("PW_CLI_TARGET_LANG")) {
-      pb.environment().put("PW_CLI_TARGET_LANG", "java");
-      pb.environment().put("PW_CLI_TARGET_LANG_VERSION", getMajorJavaVersion());
+    pb.environment().put("PW_CLI_TARGET_LANG", "java");
+    pb.environment().put("PW_CLI_TARGET_LANG_VERSION", getMajorJavaVersion());
+    String version = Driver.class.getPackage().getImplementationVersion();
+    if (version != null) {
+      pb.environment().put("PW_CLI_DISPLAY_VERSION", version);
     }
   }
 

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

@@ -29,7 +29,7 @@ import static java.util.Arrays.asList;
  */
 public class CLI {
   public static void main(String[] args) throws IOException, InterruptedException {
-    Path driver = Driver.ensureDriverInstalled(Collections.emptyMap());
+    Path driver = Driver.ensureDriverInstalled(Collections.emptyMap(), false);
     ProcessBuilder pb = new ProcessBuilder(driver.toString());
     pb.command().addAll(asList(args));
     Driver.setRequiredEnvironmentVariables(pb);

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

@@ -37,7 +37,7 @@ public class PlaywrightImpl extends ChannelOwner implements Playwright {
       if (options != null && options.env != null) {
         env = options.env;
       }
-      Path driver = Driver.ensureDriverInstalled(env);
+      Path driver = Driver.ensureDriverInstalled(env, true);
       ProcessBuilder pb = new ProcessBuilder(driver.toString(), "run-driver");
       pb.redirectError(ProcessBuilder.Redirect.INHERIT);
       pb.environment().putAll(env);

playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java

@@ -60,7 +60,7 @@ public class TestBrowserTypeConnect extends TestBase {
 
   private static BrowserServer launchBrowserServer(BrowserType browserType) {
     try {
-      Path driver = Driver.ensureDriverInstalled(Collections.emptyMap());
+      Path driver = Driver.ensureDriverInstalled(Collections.emptyMap(), false);
       Path dir = driver.getParent();
       String node = dir.resolve(isWindows ? "node.exe" : "node").toString();
       String cliJs = dir.resolve("package/lib/cli/cli.js").toString();