feat: web api service can now use both Chrome and Firefox based on av…

…ailability
AlmasB · Feb 23, 2024 · 96aaafd · 96aaafd
1 parent 0a76bfe
commit 96aaafd
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 8 deletions.
diff --git a/fxgl-intelligence/src/main/kotlin/com/almasb/fxgl/intelligence/WebAPIService.kt b/fxgl-intelligence/src/main/kotlin/com/almasb/fxgl/intelligence/WebAPIService.kt
@@ -15,6 +15,8 @@ import javafx.beans.property.ReadOnlyBooleanWrapper
 import org.openqa.selenium.WebDriver
 import org.openqa.selenium.chrome.ChromeDriver
 import org.openqa.selenium.chrome.ChromeOptions
+import org.openqa.selenium.firefox.FirefoxDriver
+import org.openqa.selenium.firefox.FirefoxOptions
 
 /**
  * Provides access to JS-driven implementation.
@@ -65,21 +67,50 @@ abstract class WebAPIService(server: LocalWebSocketServer, private val apiURL: S
                     stop()
                 }
 
-                val options = ChromeOptions()
-                options.addArguments("--headless=new")
-                options.addArguments("--use-fake-ui-for-media-stream")
-
-                webDriver = ChromeDriver(options)
-                webDriver!!.get(apiURL)
+                webDriver = loadWebDriverAndPage(apiURL)
 
                 onWebDriverLoaded(webDriver!!)
             } catch (e: Exception) {
-                log.warning("Failed to start Chrome web driver. Ensure Chrome is installed in default location")
+                log.warning("Failed to start web driver.")
                 log.warning("Error data", e)
             }
         }
     }
 
+    private fun loadWebDriverAndPage(url: String): WebDriver {
+        val driverSuppliers = listOf(
+                { loadChromeDriver() },
+                { loadFirefoxDriver() }
+        )
+
+        driverSuppliers.forEach { supplier ->
+            try {
+                val driver = supplier()
+                driver.get(url)
+                return driver
+            } catch (e: Exception) {
+                log.warning("Failed to load web driver/page. Ensure Chrome or Firefox is installed in default location", e)
+            }
+        }
+
+        throw RuntimeException("No valid driver was able to load: $url")
+    }
+
+    private fun loadFirefoxDriver(): WebDriver {
+        val options = FirefoxOptions()
+        options.addArguments("--headless")
+
+        return FirefoxDriver(options)
+    }
+
+    private fun loadChromeDriver(): WebDriver {
+        val options = ChromeOptions()
+        options.addArguments("--headless=new")
+        options.addArguments("--use-fake-ui-for-media-stream")
+
+        return ChromeDriver(options)
+    }
+
     /**
      * Stops this service.
      * No-op if it has not started via start() before.

diff --git a/pom.xml b/pom.xml
@@ -95,7 +95,7 @@
         <attach.version>4.0.17</attach.version>
         <jackson.version>2.14.2</jackson.version>
         <websocket.version>1.5.5</websocket.version>
-        <selenium.version>4.17.0</selenium.version>
+        <selenium.version>4.18.1</selenium.version>
         <slf4j.version>2.0.6</slf4j.version>
 
         <!-- test dependencies -->