.

Author: Quafadas

project/src/live.server.scala

@@ -213,46 +213,6 @@ object LiveServer extends IOApp:
           .withHandler(minimumLevel = Some(Level.get(lvl).get))
           .replace()
 
-        val proxyConf2: Resource[IO, Option[Equilibrium]] = proxyTarget
-          .zip(pathPrefix)
-          .traverse {
-            (pt, prfx) =>
-              IO(
-                Equilibrium(
-                  ProxyConfig.HttpProxyConfig(
-                    servers = NonEmptyList(
-                      Server(
-                        listen = port,
-                        serverNames = List("localhost"),
-                        locations = List(
-                          ProxyConfig.Location(
-                            matcher = LocationMatcher.Prefix(prfx),
-                            proxyPass = s"http://$$backend"
-                          )
-                        )
-                      ),
-                      List()
-                    ),
-                    upstreams = List(
-                      ProxyConfig.Upstream(
-                        name = "backend",
-                        servers = NonEmptyList(
-                          ProxyConfig.UpstreamServer(
-                            host = Host.fromString("localhost").get,
-                            port = pt,
-                            weight = 5
-                          ),
-                          List()
-                        )
-                      )
-                    )
-                  )
-                )
-              )
-
-          }
-          .toResource
-
         val server = for
           _ <- logger
             .debug(
@@ -295,7 +255,8 @@ object LiveServer extends IOApp:
                 CliValidationError("path-to-index-html and styles-dir can't be defined at the same time")
               )
 
-          proxyRoutes <- makeProxyRoutes(client, pathPrefix, proxyConf2)(logger)
+          proxyConf2 <- proxyConf(proxyTarget, pathPrefix)
+          proxyRoutes: HttpRoutes[IO] = makeProxyRoutes(client, proxyConf2)(logger)
 
           _ <- buildRunner(
             buildTool,

project/src/proxy.http.scala

@@ -29,6 +29,7 @@ object HttpProxy:
 
           val routes: HttpRoutes[F] = HttpRoutes.of {
             case (req: Request[F]) =>
+              println(req)
               val pathRendered = pathPrefix + req.uri.path.renderString
               val host = req.headers.get[Host].map(_.host).getOrElse("") // Host set otherwise empty string
               val newServers = servers.filter(_.serverNames.contains(host))

project/src/proxy.routes.scala

@@ -8,25 +8,78 @@ import cats.effect.kernel.Resource
 import cats.effect.std.Random
 
 import ProxyConfig.Equilibrium
+import org.http4s.server.Router
+import org.http4s.server.middleware.Logger
+import com.comcast.ip4s.Port
+import cats.data.NonEmptyList
+import ProxyConfig.Server
+import ProxyConfig.LocationMatcher
+import com.comcast.ip4s.Host
+import cats.syntax.all.*
 
 def makeProxyRoutes(
     client: Client[IO],
-    pathPrefix: Option[String],
-    proxyConfig: Resource[IO, Option[Equilibrium]]
-)(logger: Scribe[IO]): Resource[IO, HttpRoutes[IO]] =
-  proxyConfig.flatMap {
-    case Some(pc) =>
-      {
-        given R: Random[IO] = Random.javaUtilConcurrentThreadLocalRandom[IO]
-        logger.debug("setup proxy server") >>
-          IO(HttpProxy.servers[IO](pc, client, pathPrefix.getOrElse(???)).head._2)
-      }.toResource
+    proxyConfig: Option[(Equilibrium, String)]
+)(logger: Scribe[IO]): HttpRoutes[IO] =
+  proxyConfig match
+    case Some((pc, pathPrefix)) =>
+      given R: Random[IO] = Random.javaUtilConcurrentThreadLocalRandom[IO]
+      Logger.httpRoutes[IO](
+        logHeaders = true,
+        logBody = true,
+        redactHeadersWhen = _ => false,
+        logAction = Some((msg: String) => logger.trace(msg))
+      )(
+        Router(
+          pathPrefix -> HttpProxy.servers[IO](pc, client, pathPrefix).head._2
+        )
+      )
 
     case None =>
-      (
-        logger.debug("no proxy set") >>
-          IO(HttpRoutes.empty[IO])
-      ).toResource
-  }
+      HttpRoutes.empty[IO]
 
 end makeProxyRoutes
+
+def proxyConf(proxyTarget: Option[Port], pathPrefix: Option[String]): Resource[IO, Option[(Equilibrium, String)]] =
+  proxyTarget
+    .zip(pathPrefix)
+    .traverse {
+      (pt, prfx) =>
+        IO(
+          (
+            Equilibrium(
+              ProxyConfig.HttpProxyConfig(
+                servers = NonEmptyList(
+                  Server(
+                    listen = pt,
+                    serverNames = List("localhost"),
+                    locations = List(
+                      ProxyConfig.Location(
+                        matcher = LocationMatcher.Prefix(prfx),
+                        proxyPass = s"http://$$backend"
+                      )
+                    )
+                  ),
+                  List()
+                ),
+                upstreams = List(
+                  ProxyConfig.Upstream(
+                    name = "backend",
+                    servers = NonEmptyList(
+                      ProxyConfig.UpstreamServer(
+                        host = Host.fromString("localhost").get,
+                        port = pt,
+                        weight = 5
+                      ),
+                      List()
+                    )
+                  )
+                )
+              )
+            ),
+            prfx
+          )
+        )
+
+    }
+    .toResource

project/src/routes.scala

@@ -209,9 +209,9 @@ def routes[F[_]: Files: MonadThrow](
   val app = logMiddler(
     refreshRoutes
       .combineK(linkedAppWithCaching)
+      .combineK(proxyRoutes)
       .combineK(clientSpaRoutes)
       .combineK(staticAssetRoutes)
-      .combineK(proxyRoutes)
   )
 
   clientRoutingPrefix.fold(IO.unit)(s => logger.trace(s"client spa at : $s")).toResource >>

project/test/src/liveServer.test.scala

@@ -84,6 +84,24 @@ trait PlaywrightTest extends munit.FunSuite:
       os.remove.all(tempDir)
   )
 
+  val externalHtmlStyles = FunFixture[(os.Path, os.Path)](
+    setup = test =>
+      // create a temp folder
+      val tempDir = os.temp.dir()
+      val staticDir = tempDir / "assets"
+      os.makeDir(staticDir)
+      // create a file in the folder
+      os.write.over(tempDir / "hello.scala", helloWorldCode("Hello"))
+      os.write.over(staticDir / "index.less", "h1{color:red}")
+      os.write.over(staticDir / "index.html", vanillaTemplate(true).render)
+      os.proc("scala-cli", "compile", tempDir.toString).call(cwd = tempDir)
+      (tempDir, staticDir)
+    ,
+    teardown = tempDir =>
+      // Always gets called, even if test failed.
+      os.remove.all(tempDir._1)
+  )
+
   files.test("incremental") {
     testDir =>
       val thisTestPort = basePort + 1
@@ -147,7 +165,7 @@ trait PlaywrightTest extends munit.FunSuite:
       assertEquals(out.statusCode, 404)
   }
 
-  files.test("proxy server".only) {
+  files.test("proxy server") {
     testDir =>
       val backendPort = 8089
       val thisTestPort = basePort + 3
@@ -196,7 +214,7 @@ trait PlaywrightTest extends munit.FunSuite:
       assertEquals(outFail.statusCode, 404)
   }
 
-  files.test("proxy server and SPA client apps") {
+  externalHtmlStyles.test("proxy server and SPA client apps") {
     testDir =>
       val backendPort = 8090
       val thisTestPort = basePort + 3
@@ -222,17 +240,19 @@ trait PlaywrightTest extends munit.FunSuite:
             "--build-tool",
             "scala-cli",
             "--project-dir",
-            testDir.toString,
-            "--styles-dir",
-            styleDir(testDir).toString,
+            testDir._1.toString,
+            "--path-to-index-html",
+            testDir._2.toString,
             "--client-routes-prefix",
             "/app",
             "--port",
             thisTestPort.toString,
             "--proxy-target-port",
             backendPort.toString,
             "--proxy-prefix-path",
-            "/api"
+            "/api",
+            "--log-level",
+            "trace"
           )
         )
         .unsafeToFuture()
@@ -248,6 +268,7 @@ trait PlaywrightTest extends munit.FunSuite:
 
       val canGetHtml = requests.get(s"http://localhost:$thisTestPort", check = false)
       assertEquals(canGetHtml.statusCode, 200)
+
   }
 
   files.test("no styles") {