.

Author: Quafadas

justfile

@@ -14,9 +14,14 @@ test:
 checkOpts:
   mill project.run --help
 
+
 jvmServe:
   mill -w project.runBackground --build-tool scala-cli --project-dir /Users/simon/Code/indigoLite --log-level info --browse-on-open-at / --path-to-index-html /Users/simon/Code/indigoLite/static
 
+proxy:
+  mill -w project.runBackground --project-dir /Users/simon/Code/viteless --port 3006 --proxy-prefix-path /api --proxy-target-port 8080 --log-level trace
+
+
 goViteless:
   mill -w project.run --project-dir /Users/simon/Code/viteless --styles-dir /Users/simon/Code/viteless/styles
 

project/src/build.runner.scala

@@ -127,13 +127,16 @@ def buildRunnerMill(
     .background
     .void
 
+  val millargs = List(
+    "-w",
+    s"$moduleName.fastLinkJS",
+    "-j",
+    "0"
+  ) ++ extraBuildArgs
   // TODO pipe this to stdout so that we can see linker progress / errors.
   val builder = ProcessBuilder(
     "mill",
-    List(
-      "-w",
-      s"$moduleName.fastLinkJS"
-    ) ++ extraBuildArgs
+    millargs
   ).withWorkingDirectory(workDir)
     .spawn[IO]
     .use {
@@ -147,6 +150,7 @@ def buildRunnerMill(
   for
     _ <- logger.trace("Starting buildRunnerMill").toResource
     _ <- logger.trace(s"watching path $watchLinkComplePath").toResource
+    _ <- logger.trace(s"running mill with args $millargs").toResource
     _ <- builder
     _ <- watcher
   yield ()

project/src/middleware/ETagMiddleware.scala

@@ -63,7 +63,8 @@ object ETagMiddleware:
           OptionT.liftF(logger.debug("No ETag header in query, service it")) >>
             service(req).semiflatMap {
               resp =>
-                respondWithEtag(resp)
+                logger.trace(resp.toString) >>
+                  respondWithEtag(resp)
             }
       end match
   }

project/src/proxy.http.scala

@@ -29,11 +29,14 @@ object HttpProxy:
 
           val routes: HttpRoutes[F] = HttpRoutes.of {
             case (req: Request[F]) =>
-              println(req)
+              // println("in proxy")
+              // println(req)
               val pathRendered = pathPrefix + req.uri.path.renderString
+              // println(pathRendered)
               val host = req.headers.get[Host].map(_.host).getOrElse("") // Host set otherwise empty string
               val newServers = servers.filter(_.serverNames.contains(host))
-
+              // println(host)
+              // println(newServers)
               val exact =
                 newServers
                   .flatMap(_.locations)
@@ -60,12 +63,13 @@ object HttpProxy:
                     .headOption
                     .map(_._2)
                 }
-
               proxy.fold(
                 Response[F](Status.NotFound).withEntity("No Route Found").pure[F]
               )(
-                proxyThrough[F](_, upstreams)
-                  .flatMap(uri => client.toHttpApp(req.removeHeader[Host].withUri(uri.addPath(pathRendered))))
+                proxyThrough[F](_, upstreams).flatMap {
+                  uri =>
+                    client.toHttpApp(req.removeHeader[Host].withUri(uri.addPath(pathRendered)))
+                }
               )
           }
 
@@ -77,6 +81,8 @@ object HttpProxy:
       proxyPass: String,
       upstreams: Map[String, NonEmptyList[ProxyConfig.UpstreamServer]]
   ): F[Uri] =
+    println(s"proxypass $proxyPass")
+    println(upstreams)
     if !proxyPass.contains("$") then Uri.fromString(proxyPass).liftTo[F]
     else
       extractVariable(proxyPass).flatMap {
@@ -90,6 +96,8 @@ object HttpProxy:
                 )
             )
       }
+    end if
+  end proxyThrough
 
   private def extractVariable[F[_]: ApplicativeThrow](s: String): F[(String, String, String)] =
     s.split('$').toList match
@@ -132,6 +140,8 @@ object HttpProxy:
 
   def xForwardedMiddleware[G[_], F[_]](http: Http[G, F]): Http[G, F] = Kleisli {
     (req: Request[F]) =>
+      println("in middleware")
+      println(req)
       req
         .remote
         .fold(http.run(req)) {

project/src/proxy.routes.scala

@@ -57,7 +57,7 @@ def proxyConf(proxyTarget: Option[Port], pathPrefix: Option[String]): Resource[I
                     locations = List(
                       ProxyConfig.Location(
                         matcher = LocationMatcher.Prefix(prfx),
-                        proxyPass = "http://$$backend"
+                        proxyPass = "http://$backend"
                       )
                     )
                   ),

project/src/routes.scala

@@ -60,6 +60,12 @@ def routes[F[_]: Files: MonadThrow](
           StaticFile
             .fromPath(fs2.io.file.Path(stringPath) / req.uri.path.renderString, Some(req))
             .getOrElseF(NotFound())
+
+        case req @ GET -> Root / fName ~ "map" =>
+          StaticFile
+            .fromPath(fs2.io.file.Path(stringPath) / req.uri.path.renderString, Some(req))
+            .getOrElseF(NotFound())
+
       },
       ref
     )(logger)