fix: 启动浏览器判断文件名与产品是否符合

fanyong920 · Dec 30, 2024 · b4b5d99 · b4b5d99
1 parent aca6fdf
commit b4b5d99
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 2 deletions.
diff --git a/src/main/java/com/ruiyun/jvppeteer/cdp/core/BrowserFetcher.java b/src/main/java/com/ruiyun/jvppeteer/cdp/core/BrowserFetcher.java
@@ -697,6 +697,68 @@ private String relativeExecutablePath(String revision, String versionPath) {
         return executablePath;
     }
 
+    /**
+     * 获取浏览器的文件名
+     * @param product 产品
+     * @return 文件名
+     */
+    public static String fileName(Product product){
+        String platform = detectBrowserPlatform();
+        if (Product.Chrome.equals(product)) {
+            if (MAC_ARM64.equals(platform) || MAC_X64.equals(platform)) {
+                return  "Google Chrome for Testing";
+            } else if (LINUX.equals(platform)) {
+               return  "chrome";
+            } else if (WIN32.equals(platform) || WIN64.equals(platform)) {
+                return  "chrome.exe";
+            } else {
+                throw new IllegalArgumentException("Unsupported platform: " + platform);
+            }
+        } else if (Product.Chromium.equals(product)) {
+            if (MAC_ARM64.equals(platform) || MAC_X64.equals(platform)) {
+                return  "Chromium";
+            } else if (LINUX.equals(platform)) {
+               return  "chrome";
+            } else if (WIN32.equals(platform) || WIN64.equals(platform)) {
+               return  "chrome.exe";
+            } else {
+                throw new IllegalArgumentException("Unsupported platform: " + platform);
+            }
+        } else if (Product.Chromedriver.equals(product)) {
+            if (MAC_ARM64.equals(platform) || MAC_X64.equals(platform)) {
+               return  "chromedriver";
+            } else if (LINUX.equals(platform)) {
+               return  "chromedriver";
+            } else if (WIN32.equals(platform) || WIN64.equals(platform)) {
+              return  "chromedriver.exe";
+            } else {
+                throw new IllegalArgumentException("Unsupported platform: " + platform);
+            }
+        } else if (Product.Chrome_headless_shell.equals(product)) {
+            if (MAC_ARM64.equals(platform) || MAC_X64.equals(platform)) {
+               return  "chrome-headless-shell";
+            } else if (LINUX.equals(platform)) {
+                return  "chrome-headless-shell";
+            } else if (WIN32.equals(platform) || WIN64.equals(platform)) {
+               return  "chrome-headless-shell.exe";
+            } else {
+                throw new IllegalArgumentException("Unsupported platform: " + platform);
+            }
+        } else if (Product.Firefox.equals(product)) {
+            if (MAC_ARM64.equals(platform) || MAC_X64.equals(platform)) {
+                return  "firefox";
+            } else if (LINUX.equals(platform)) {
+               return  "firefox";
+            } else if (WIN32.equals(platform) || WIN64.equals(platform)) {
+                return  "firefox.exe";
+            } else {
+                throw new IllegalArgumentException("Unsupported platform: " + platform);
+            }
+        } else {
+            throw new IllegalArgumentException("Unsupported product: " + product);
+        }
+    }
+
     /**
      * 检测给定的路径是否存在
      *

diff --git a/src/main/java/com/ruiyun/jvppeteer/launch/ChromeLauncher.java b/src/main/java/com/ruiyun/jvppeteer/launch/ChromeLauncher.java
@@ -1,6 +1,7 @@
 package com.ruiyun.jvppeteer.launch;
 
 import com.ruiyun.jvppeteer.api.core.Browser;
+import com.ruiyun.jvppeteer.cdp.core.BrowserFetcher;
 import com.ruiyun.jvppeteer.cdp.entities.BrowserLaunchArgumentOptions;
 import com.ruiyun.jvppeteer.cdp.entities.LaunchOptions;
 import com.ruiyun.jvppeteer.common.Constant;
@@ -33,7 +34,7 @@ public Browser launch(LaunchOptions options) throws IOException {
             options.setArgs(new ArrayList<>());
         }
         this.executablePath = this.computeExecutablePath(options.getExecutablePath(), options.getPreferredRevision());
-        if (!Paths.get(this.executablePath).getFileName().toString().toLowerCase().contains(options.getProduct().getProduct())) {
+        if (!Paths.get(this.executablePath).getFileName().toString().toLowerCase().contains(BrowserFetcher.fileName(options.getProduct()))) {
             throw new LaunchException("The ExecutablePath does not match the product, The executablePath is " + this.executablePath + ",but the product is " + options.getProduct());
         }
 

diff --git a/src/main/java/com/ruiyun/jvppeteer/launch/FirefoxLauncher.java b/src/main/java/com/ruiyun/jvppeteer/launch/FirefoxLauncher.java
@@ -1,6 +1,7 @@
 package com.ruiyun.jvppeteer.launch;
 
 import com.ruiyun.jvppeteer.api.core.Browser;
+import com.ruiyun.jvppeteer.cdp.core.BrowserFetcher;
 import com.ruiyun.jvppeteer.cdp.entities.LaunchOptions;
 import com.ruiyun.jvppeteer.cdp.entities.Protocol;
 import com.ruiyun.jvppeteer.common.Constant;
@@ -40,7 +41,7 @@ public Browser launch(LaunchOptions options) throws IOException {
             options.setArgs(new ArrayList<>());
         }
         this.executablePath = this.computeExecutablePath(options.getExecutablePath(), options.getPreferredRevision());
-        if (!Paths.get(this.executablePath).getFileName().toString().toLowerCase().contains(options.getProduct().getProduct())) {
+        if (!Paths.get(this.executablePath).getFileName().toString().toLowerCase().contains(BrowserFetcher.fileName(options.getProduct()))) {
             throw new LaunchException("The ExecutablePath does not match the product, The executablePath is " + this.executablePath + ",but the product is " + options.getProduct());
         }
         //临时的 UserDataDir