enable wasm

Author: Quafadas

.gitignore

@@ -6,4 +6,5 @@ testDir
 .bsp
 out
 .bloop
-.DS_Store
+.DS_Store
+.vscode/mcp.json

.mill-version

@@ -1 +1 @@
-0.12.8
+0.12.10

routes/src/app.route.scala

@@ -19,6 +19,11 @@ def appRoute[F[_]: Files](stringPath: String)(using f: Async[F]): HttpRoutes[F]
       .fromPath(fs2.io.file.Path(stringPath) / req.uri.path.renderString, Some(req))
       .getOrElseF(f.pure(Response[F](Status.NotFound)))
 
+  case req @ GET -> Root / fName ~ "wasm" =>
+    StaticFile
+      .fromPath(fs2.io.file.Path(stringPath) / req.uri.path.renderString, Some(req))
+      .getOrElseF(f.pure(Response[F](Status.NotFound)))
+
   case req @ GET -> Root / fName ~ "map" =>
     StaticFile
       .fromPath(fs2.io.file.Path(stringPath) / req.uri.path.renderString, Some(req))

site/docs/_docs/config.md

@@ -145,18 +145,18 @@ cs launch io.github.quafadas::sjsls:{{projectVersion}} -- \
 
 ```
 
-## Static site, no build tool. 
+## Static site, no build tool.
 
-This would serve the static site build with the `docJar` tool. 
+This would serve the static site build with the `docJar` tool.
 
-```sh 
+```sh
 C:\temp\live-server-scala-cli-js> cs launch io.github.quafadas::sjsls:0.2.0 -- --path-to-index-html C:\\temp\\live-server-scala-cli-js\\out\\site\\live.dest\\site --build-tool none --browse-on-open-at /docs/index.html
 ```
 
 ***
 You need to include this javascript script tag in the body html - otherwise no page refresh.
 
-```
+```html
 <script>
     const sse = new EventSource("/refresh/v1/sse");
     sse.addEventListener("message", (e) => {

sjsls/src/middleware/ETagMiddleware.scala

@@ -19,39 +19,42 @@ import cats.syntax.all.*
 
 object ETagMiddleware:
 
+  private def respondWithEtag(mr: Ref[IO, Map[String, String]], req: Request[IO], resp: Response[IO])(
+      logger: Scribe[IO]
+  ) =
+    mr.get
+      .flatMap {
+        map =>
+          // logger.trace(s"Responding with ETag at path: ${req.uri.path}") >>
+          map.get(req.uri.path.toString.drop(1)) match
+            case Some(hash) =>
+              logger.debug(s"Found ETag: $hash in map for ${req.uri.path}") >>
+                IO(
+                  resp.putHeaders(
+                    Header.Raw(ci"ETag", hash),
+                    Header.Raw(ci"Cache-control", "Must-Revalidate"),
+                    Header.Raw(ci"Cache-control", "No-cache"),
+                    Header.Raw(ci"Cache-control", "max-age=0"),
+                    Header.Raw(ci"Cache-control", "public")
+                  )
+                )
+            case None =>
+              logger.debug("No hash found in map at path :" + req.uri.toString) >>
+                IO(
+                  resp.putHeaders(
+                    Header.Raw(ci"Cache-control", "Must-Revalidate"),
+                    Header.Raw(ci"Cache-control", "No-cache"),
+                    Header.Raw(ci"Cache-control", "max-age=0"),
+                    Header.Raw(ci"Cache-control", "public")
+                  )
+                )
+        end match
+      }
+  end respondWithEtag
+
   def apply(service: HttpRoutes[IO], mr: Ref[IO, Map[String, String]])(logger: Scribe[IO]): HttpRoutes[IO] = Kleisli {
     (req: Request[IO]) =>
 
-      def respondWithEtag(resp: Response[IO]) =
-        mr.get
-          .flatMap {
-            map =>
-              map.get(req.uri.path.toString.drop(1)) match
-                case Some(hash) =>
-                  logger.debug(req.uri.toString) >>
-                    IO(
-                      resp.putHeaders(
-                        Header.Raw(ci"ETag", hash),
-                        Header.Raw(ci"Cache-control", "Must-Revalidate"),
-                        Header.Raw(ci"Cache-control", "No-cache"),
-                        Header.Raw(ci"Cache-control", "max-age=0"),
-                        Header.Raw(ci"Cache-control", "public")
-                      )
-                    )
-                case None =>
-                  logger.debug(req.uri.toString) >>
-                    IO(
-                      resp.putHeaders(
-                        Header.Raw(ci"Cache-control", "Must-Revalidate"),
-                        Header.Raw(ci"Cache-control", "No-cache"),
-                        Header.Raw(ci"Cache-control", "max-age=0"),
-                        Header.Raw(ci"Cache-control", "public")
-                      )
-                    )
-            end match
-          }
-      end respondWithEtag
-
       req.headers.get(ci"If-None-Match") match
         case Some(header) =>
           val etag = header.head.value
@@ -65,23 +68,24 @@ object ETagMiddleware:
                     map.get(req.uri.path.toString.drop(1)) match
                       case Some(foundEt) =>
                         if etag == foundEt then
-                          logger.debug("ETag matches, returning 304") >>
+                          logger.debug(s"ETag $etag found in cache at path ${req.uri.path}, returning 304") >>
                             IO(Response[IO](Status.NotModified))
                         else
-                          logger.debug(etag) >>
-                            logger.debug("ETag doesn't match, returning 200") >>
-                            respondWithEtag(resp)
+                          logger.debug(s"$etag not found in cache at path ${req.uri.path} returning 200") >>
+                            respondWithEtag(mr, req, resp)(logger)
                         end if
                       case None =>
-                        respondWithEtag(resp)
+                        logger.debug(s"No path found in cache at path ${req.uri.path}") >>
+                          respondWithEtag(mr, req, resp)(logger)
                 }
           }
         case _ =>
-          OptionT.liftF(logger.debug("No ETag header in query, service it")) >>
+          OptionT.liftF(logger.debug("No If-None-Match ETag header in request")) >>
+            OptionT.liftF(logger.debug(s"Headers are : ${req.headers.headers.mkString(", ")} at ${req.uri.path}")) >>
             service(req).semiflatMap {
               resp =>
-                logger.trace(resp.toString) >>
-                  respondWithEtag(resp)
+                logger.debug(resp.toString) >>
+                  respondWithEtag(mr, req, resp)(logger)
             }
       end match
   }

sjsls/src/static.watcher.scala

@@ -87,6 +87,10 @@ def updateMapRef(stringPath: fs2.io.file.Path, mr: Ref[IO, Map[String, String]])
     .walk(stringPath)
     .evalFilter(Files[IO].isRegularFile)
     .parEvalMap(maxConcurrent = 8)(path => fileHash(path).map(path -> _))
+    // .evalTap {
+    //   case (path, hash) =>
+    //     logger.debug(s"File $path has hash $hash")
+    // }
     .compile
     .toVector
     .flatMap(

sjsls/test/src/RoutesSpec.scala

@@ -34,6 +34,7 @@ class RoutesSuite extends CatsEffectSuite:
   val testStr = "const hi = 'Hello, world'"
   val simpleCss = "h1 {color: red;}"
   val testHash = md.digest(testStr.getBytes()).map("%02x".format(_)).mkString
+  val testBinary = os.read.bytes(os.resource / "cat.webp")
   given filesInstance: Files[IO] = Files.forAsync[IO]
 
   val files = FunFixture[os.Path](
@@ -45,6 +46,7 @@ class RoutesSuite extends CatsEffectSuite:
       os.write(tempFile, testStr)
       os.write(tempDir / "test2.js", testStr)
       os.write(tempDir / "test3.js", testStr)
+      os.write(tempDir / "test.wasm", testBinary)
       tempDir
     ,
     teardown = tempDir =>
@@ -148,6 +150,7 @@ class RoutesSuite extends CatsEffectSuite:
 
   files.test(
     "That the routes serve files on first call with a 200, that the eTag is set, and on second call with a 304, that index.html is served from SPA"
+      .only
   ) {
     tempDir =>
 
@@ -156,7 +159,7 @@ class RoutesSuite extends CatsEffectSuite:
         .root
         .clearHandlers()
         .clearModifiers()
-        .withHandler(minimumLevel = Some(Level.get("error").get))
+        .withHandler(minimumLevel = Some(Level.get("debug").get))
         .replace()
 
       val aLogger = scribe.cats[IO]
@@ -208,6 +211,17 @@ class RoutesSuite extends CatsEffectSuite:
               org.http4s.Headers.of(org.http4s.Header.Raw(ci"If-None-Match", testHash))
             )
 
+          val requestWasm = org.http4s.Request[IO](uri = org.http4s.Uri.unsafeFromString("/test.wasm"))
+
+          val checkWasm = client
+            .run(requestWasm)
+            .use {
+              resp =>
+                assertEquals(resp.status.code, 200)
+                assertEquals(resp.headers.get(ci"ETag").isDefined, true)
+                IO.unit
+            }
+
           val checkResp2 = client
             .run(request2)
             .use {
@@ -237,7 +251,7 @@ class RoutesSuite extends CatsEffectSuite:
                 assertEquals(respH.headers.get(ci"ETag").isDefined, true)
                 IO.unit
             }
-          checkResp1 >> checkResp2 >> checkRespSpa >> checkRespHtml
+          checkResp1 >> checkResp2 >> checkWasm >> checkRespSpa >> checkRespHtml
 
       }
   }