fix: handle when FileSystem already exists (#1140)

Author: AriaMoradi

.github/workflows/test_cli.yml

@@ -29,3 +29,6 @@ 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

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

@@ -106,14 +106,25 @@ private static boolean isExecutable(Path filePath) {
     return name.endsWith(".sh") || name.endsWith(".exe") || !name.contains(".");
   }
 
-  void extractDriverToTempDir() throws URISyntaxException, IOException {
+  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 = Thread.currentThread().getContextClassLoader();
-    URI originalUri = classloader.getResource(
-      "driver/" + platformDir()).toURI();
+    return classloader.getResource("driver/" + platformDir()).toURI();
+  }
+
+  void extractDriverToTempDir() throws URISyntaxException, IOException {
+    URI originalUri = getDriverResourceURI();
     URI uri = maybeExtractNestedJar(originalUri);
 
     // Create zip filesystem if loading from jar.
-    try (FileSystem fileSystem = "jar".equals(uri.getScheme()) ? FileSystems.newFileSystem(uri, Collections.emptyMap()) : null) {
+    try (FileSystem fileSystem = "jar".equals(uri.getScheme()) ? initFileSystem(uri) : 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

tools/test-cli-fatjar/pom.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.microsoft.playwright</groupId>
+  <artifactId>test-cli-fatjar</artifactId>
+  <version>1.29.0-SNAPSHOT</version>
+  <name>Test Playwright Command Line FatJar</name>
+  <properties>
+    <compiler.version>1.8</compiler.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>${compiler.version}</source>
+          <target>${compiler.version}</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>com.microsoft.playwright</groupId>
+      <artifactId>playwright</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.microsoft.playwright</groupId>
+      <artifactId>driver-bundle</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>

tools/test-cli-fatjar/src/main/java/com/microsoft/playwright/testclifatjar/TestApp.java

@@ -0,0 +1,28 @@
+package com.microsoft.playwright.testclifatjar;
+
+import com.microsoft.playwright.Browser;
+import com.microsoft.playwright.Page;
+import com.microsoft.playwright.Playwright;
+import com.microsoft.playwright.impl.driver.Driver;
+import com.microsoft.playwright.impl.driver.jar.DriverJar;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.util.Collections;
+
+public class TestApp {
+  public static void main(String[] args) throws IOException, URISyntaxException {
+    URI uri = DriverJar.getDriverResourceURI();
+    FileSystem fs = FileSystems.newFileSystem(uri, Collections.emptyMap());
+    if (fs == null) {
+      throw new RuntimeException();
+    }
+    try (Playwright playwright = Playwright.create()) {
+      Browser browser = playwright.chromium().launch();
+      Page page = browser.newPage();
+    }
+  }
+}

tools/test-cli-fatjar/test.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+set +x
+
+trap "cd $(pwd -P)" EXIT
+cd "$(dirname $0)"
+
+echo "Running TestApp..."
+mvn compile exec:java -e -Dexec.mainClass=com.microsoft.playwright.testclifatjar.TestApp