rework apis

Author: ThijsBroersen

README.md

@@ -14,7 +14,7 @@ libraryDependencies += "io.github.thijsbroersen" %% "scala-js-env-playwright" %
 ```
 Add the following line to your `build.sbt` 
 ```scala
-Test / jsEnv := new PWEnv(
+Test / jsEnv := new PlaywrightJSEnv(
       browserName = "chrome",
       headless = true
     )
@@ -65,7 +65,7 @@ libraryDependencies += "com.google.guava" % "guava" % "33.0.0-jre"
 
 ## Default configuration
 ```scala
-jsEnv := new jsenv.playwright.PWEnv(
+jsEnv := new jsenv.playwright.PlaywrightJSEnv(
   browserName = "chrome",
   headless = true,
   showLogs = false,
@@ -80,7 +80,7 @@ When not passing launchOptions, default launch options are as follows:
 
 ### Chrome/chromium
 ```scala
-jsEnv := new jsenv.playwright.PWEnv(
+jsEnv := new jsenv.playwright.PlaywrightJSEnv(
   browserName = "chrome",
   launchOptions = List(
       "--disable-extensions", 
@@ -95,7 +95,7 @@ jsEnv := new jsenv.playwright.PWEnv(
 
 ### Firefox
 ```scala
-jsEnv := new jsenv.playwright.PWEnv(
+jsEnv := new jsenv.playwright.PlaywrightJSEnv(
   browserName = "firefox",
   launchOptions = List(
       "--disable-web-security"
@@ -105,7 +105,7 @@ jsEnv := new jsenv.playwright.PWEnv(
 
 ### Webkit
 ```scala
-jsEnv := new jsenv.playwright.PWEnv(
+jsEnv := new jsenv.playwright.PlaywrightJSEnv(
   browserName = "webkit",
   launchOptions = List(
       "--disable-extensions", 
@@ -122,9 +122,9 @@ It is work in progress.
 As a workaround introducing delay in the test cases may help to keep the browser alive. 
 
 ## Debugging
-debug parameter can be passed to the PWEnv constructor to enable debugging. It will also display the version of the browser which is used.
+debug parameter can be passed to the PlaywrightJSEnv constructor to enable debugging. It will also display the version of the browser which is used.
 ```scala
-Test / jsEnv := new PWEnv(
+Test / jsEnv := new PlaywrightJSEnv(
       browserName = "chrome",
       headless = true,
       showLogs = true,

build.sbt

@@ -14,7 +14,7 @@ ThisBuild / organizationName := "ThijsBroersen"
 ThisBuild / scalaVersion := "3.7.2"
 ThisBuild / sonatypeProfileName := "io.github.thijsbroersen"
 ThisBuild / versionScheme := Some("early-semver")
-ThisBuild / tlVersionIntroduced := Map("3.7" -> "0.1.21")
+ThisBuild / tlVersionIntroduced := Map("3.7" -> "0.2.3")
 ThisBuild / tlMimaPreviousVersions := Set.empty
 ThisBuild / licenses := Seq(
   "BSD-3-Clause" -> url("https://opensource.org/licenses/BSD-3-Clause")

src/main/scala/jsenv/playwright/CEComRun.scala

@@ -1,7 +1,5 @@
 package io.github.thijsbroersen.jsenv.playwright
 
-import io.github.thijsbroersen.jsenv.playwright.PWEnv.Config
-
 import org.scalajs.jsenv.Input
 import org.scalajs.jsenv.JSComRun
 import org.scalajs.jsenv.RunConfig
@@ -13,17 +11,13 @@ import scala.concurrent._
 
 // browserName, headless, pwConfig, runConfig, input, onMessage
 class CEComRun(
-    override val browserName: String,
-    override val headless: Boolean,
-    override val pwConfig: Config,
-    override val runConfig: RunConfig,
+    override val playwrightJsEnv: PlaywrightJSEnv,
     override val input: Seq[Input],
-    override val launchOptions: List[String],
-    override val additionalLaunchOptions: List[String],
+    override val runConfig: RunConfig,
     onMessage: String => Unit
 ) extends JSComRun
     with Runner {
-  scribe.debug(s"Creating CEComRun for $browserName")
+  scribe.debug(s"Creating CEComRun for ${playwrightJsEnv.capabilities.browserName}")
   // enableCom is false for CERun and true for CEComRun
   // send is called only from JSComRun
   override def send(msg: String): Unit = {
@@ -34,7 +28,7 @@ class CEComRun(
   override protected def receivedMessage(msg: String): Unit = onMessage(msg)
 
   lazy val future: Future[Unit] =
-    jsRunPrg(browserName, headless, isComEnabled = true, pwLaunchOptions).use_.unsafeToFuture()
+    jsRunPrg(isComEnabled = true).use_.unsafeToFuture()
 
 }
 

src/main/scala/jsenv/playwright/CERun.scala

@@ -1,7 +1,5 @@
 package io.github.thijsbroersen.jsenv.playwright
 
-import io.github.thijsbroersen.jsenv.playwright.PWEnv.Config
-
 import org.scalajs.jsenv.Input
 import org.scalajs.jsenv.JSRun
 import org.scalajs.jsenv.RunConfig
@@ -12,20 +10,15 @@ import cats.effect.IO
 import scala.concurrent._
 
 class CERun(
-    override val browserName: String,
-    override val headless: Boolean,
-    override val pwConfig: Config,
-    override val runConfig: RunConfig,
+    override val playwrightJsEnv: PlaywrightJSEnv,
     override val input: Seq[Input],
-    override val launchOptions: List[String],
-    override val additionalLaunchOptions: List[String]
+    override val runConfig: RunConfig
 ) extends JSRun
     with Runner {
-  scribe.debug(s"Creating CERun for $browserName")
+  scribe.debug(s"Creating CERun for ${playwrightJsEnv.capabilities.browserName}")
+
   lazy val future: Future[Unit] =
-    jsRunPrg(browserName, headless, isComEnabled = false, pwLaunchOptions)
-      .use(_ => IO.unit)
-      .unsafeToFuture()
+    jsRunPrg(isComEnabled = false).use(_ => IO.unit).unsafeToFuture()
 
   override protected def receivedMessage(msg: String): Unit = ()
 }

src/main/scala/jsenv/playwright/FileMaterializers.scala

@@ -45,14 +45,16 @@ abstract class FileMaterializer extends AutoCloseable {
 }
 
 object FileMaterializer {
-  import PWEnv.Config.Materialization
+  import PlaywrightJSEnv.Config.Materialization
   def apply(m: Materialization): FileMaterializer = m match {
     case Materialization.Temp =>
       new TempDirFileMaterializer
 
     case Materialization.Server(contentDir, webRoot) =>
       new ServerDirFileMaterializer(contentDir, webRoot)
   }
+
+
 }
 
 /**

src/main/scala/jsenv/playwright/PageFactory.scala

@@ -2,15 +2,16 @@ package io.github.thijsbroersen.jsenv.playwright
 
 import com.microsoft.playwright.Browser
 import com.microsoft.playwright.BrowserType
-import com.microsoft.playwright.BrowserType.LaunchOptions
 import com.microsoft.playwright.Page
 import com.microsoft.playwright.Playwright
 
 import cats.effect.IO
 import cats.effect.Resource
 
+import scala.jdk.CollectionConverters._
+
 object PageFactory {
-  def pageBuilder(browser: Browser): Resource[IO, Page] =
+  private def pageBuilder(browser: Browser): Resource[IO, Page] =
     Resource.make(IO {
       val pg = browser.newContext().newPage()
       scribe.debug(s"Creating page ${pg.hashCode()} ")
@@ -22,22 +23,28 @@ object PageFactory {
 
   private def browserBuilder(
       playwright: Playwright,
-      browserName: String,
-      headless: Boolean,
-      launchOptions: LaunchOptions
+      capabilities: PlaywrightJSEnv.Capabilities
   ): Resource[IO, Browser] =
     Resource.make(IO {
 
-      val browserType: BrowserType = browserName.toLowerCase match {
-        case "chromium" | "chrome" =>
+      val launchOptions = new BrowserType.LaunchOptions().setHeadless(capabilities.headless).setArgs(capabilities.launchOptions.asJava)
+
+      val browserType: BrowserType = capabilities match
+        case capabilities: PlaywrightJSEnv.ChromeOptions =>
           playwright.chromium()
-        case "firefox" =>
+        case capabilities: PlaywrightJSEnv.FirefoxOptions =>
+          launchOptions.setFirefoxUserPrefs(
+            capabilities
+              .firefoxUserPrefs
+              // .view
+              // .mapValues(_.asInstanceOf[java.lang.Object])
+              // .toMap
+              .asJava)
           playwright.firefox()
-        case "webkit" =>
+        case capabilities: PlaywrightJSEnv.WebkitOptions =>
           playwright.webkit()
-        case _ => throw new IllegalArgumentException("Invalid browser type")
-      }
-      val browser = browserType.launch(launchOptions.setHeadless(headless))
+
+      val browser = browserType.launch(launchOptions)
       scribe.info(
         s"Creating browser ${browser.browserType().name()} version ${browser.version()} with ${browser.hashCode()}"
       )
@@ -59,17 +66,13 @@ object PageFactory {
       })
 
   def createPage(
-      browserName: String,
-      headless: Boolean,
-      launchOptions: LaunchOptions
+      capabilities: PlaywrightJSEnv.Capabilities
   ): Resource[IO, Page] =
     for {
       playwright <- playWrightBuilder
       browser <- browserBuilder(
         playwright,
-        browserName,
-        headless,
-        launchOptions
+        capabilities
       )
       page <- pageBuilder(browser)
     } yield page