Fix multiple routes support

build.mill

@@ -38,7 +38,7 @@ object zio extends ScalaCommon:
 
 object example extends ScalaCommon:
   def moduleDeps = Seq(zio)
-  def mvnDeps    = Seq(mvn"dev.optics::monocle-core:3.1.0")
+  def mvnDeps    = Seq(mvn"dev.optics::monocle-core:3.1.0", mvn"dev.zio::zio-logging:2.5.1")
 
   def scaliveBundle = Task {
     os.copy(

example/src/CounterLiveView.scala

@@ -1,27 +1,20 @@
-import ExampleLiveView.*
+import CounterLiveView.*
 import monocle.syntax.all.*
 import scalive.*
 import zio.*
 import zio.json.*
 import zio.stream.ZStream
 
-class ExampleLiveView(someParam: String) extends LiveView[Msg, Model]:
+class CounterLiveView() extends LiveView[Msg, Model]:
 
   def init = ZIO.succeed(
     Model(
       isVisible = true,
-      counter = 0,
+      counter = 0
-      elems = List(
-        NestedModel("a", 10),
-        NestedModel("b", 15),
-        NestedModel("c", 20)
-      )
     )
   )
 
   def update(model: Model) =
-    case Msg.IncAge(value) =>
-      ZIO.succeed(model.focus(_.elems.index(2).age).modify(_ + value))
     case Msg.ToggleCounter =>
       ZIO.succeed(model.focus(_.isVisible).modify(!_))
     case Msg.IncCounter =>
@@ -31,38 +24,13 @@ class ExampleLiveView(someParam: String) extends LiveView[Msg, Model]:
 
   def view(model: Dyn[Model]) =
     div(
+      cls := "max-w-2xl mx-auto bg-white shadow rounded-2xl p-6 space-y-6",
       h1(
         cls := "text-2xl font-semibold tracking-tight text-gray-900",
-        someParam
+        "Counter with auto increment every second"
-      ),
-      cls    := "max-w-2xl mx-auto bg-white shadow rounded-2xl p-6 space-y-6",
-      idAttr := "42",
-      ul(
-        cls := "divide-y divide-gray-200",
-        model(_.elems).splitByIndex((_, elem) =>
-          li(
-            cls := "py-3 flex flex-wrap items-center justify-between gap-2",
-            span(
-              cls := "text-gray-700",
-              "Nom: ",
-              span(cls := "font-medium", elem(_.name))
-            ),
-            span(
-              cls := "text-sm text-gray-500",
-              "Age: ",
-              span(cls := "font-semibold text-gray-700", elem(_.age.toString))
-            )
-          )
-        )
       ),
       div(
         cls := "flex flex-wrap items-center gap-3",
-        button(
-          cls := "inline-flex items-center rounded-lg px-3 py-2 text-sm font-medium bg-gray-900 text-white shadow hover:opacity-90 focus:outline-none focus:ring-2 focus:ring-gray-900/30",
-          phx.click := Msg.IncAge(1),
-          "Inc age"
-        ),
-        span(cls := "grow"),
         button(
           cls := "inline-flex items-center rounded-lg px-3 py-2 text-sm font-medium ring-1 ring-inset ring-gray-300 text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-gray-400/30",
           phx.click := Msg.ToggleCounter,
@@ -98,18 +66,15 @@ class ExampleLiveView(someParam: String) extends LiveView[Msg, Model]:
   def subscriptions(model: Model) =
     ZStream.tick(1.second).map(_ => Msg.IncCounter).drop(1)
 
-end ExampleLiveView
+end CounterLiveView
 
-object ExampleLiveView:
+object CounterLiveView:
 
   enum Msg derives JsonCodec:
-    case IncAge(value: Int)
     case ToggleCounter
     case IncCounter
     case DecCounter
 
   final case class Model(
     isVisible: Boolean,
-    counter: Int,
+    counter: Int)
-    elems: List[NestedModel])
-  final case class NestedModel(name: String, age: Int)

example/src/Example.scala

@@ -1,18 +1,39 @@
+import scalive.{label as _, *}
 import zio.*
 import zio.http.*
-import scalive.*
+import zio.logging.ConsoleLoggerConfig
+import zio.logging.LogColor
+import zio.logging.LogFilter
+import zio.logging.LogFormat.*
+import zio.logging.consoleLogger
 
 object Example extends ZIOAppDefault:
 
+  private val logFormat =
+    label("timestamp", timestamp.fixed(32)).color(LogColor.BLUE) |-|
+      label("level", level.fixed(5)).highlight |-|
+      label("thread", fiberId).color(LogColor.WHITE) |-|
+      label("message", quoted(line)).highlight |-|
+      cause
+
+  val logFilter = LogFilter.LogLevelByNameConfig(LogLevel.Debug)
+
+  override val bootstrap =
+    Runtime.removeDefaultLoggers >>> consoleLogger(ConsoleLoggerConfig(logFormat, logFilter))
+
   val liveRouter =
     LiveRouter(
       RootLayout(_),
       List(
         LiveRoute(
-          Root,
+          Root / "counter",
+          (_, _) => CounterLiveView()
+        ),
+        LiveRoute(
+          Root / "list",
           (_, req) =>
             val q = req.queryParam("q").map("Param : " ++ _).getOrElse("No param")
-            ExampleLiveView(q)
+            ListLiveView(q)
         )
       )
     )
@@ -20,3 +41,4 @@ object Example extends ZIOAppDefault:
   val routes = liveRouter.routes @@ Middleware.serveResources(Path.empty / "static", "public")
 
   override val run = Server.serve(routes).provide(Server.default)
+end Example

example/src/ListLiveView.scala

@@ -0,0 +1,72 @@
+import ListLiveView.*
+import monocle.syntax.all.*
+import scalive.*
+import zio.*
+import zio.json.*
+import zio.stream.ZStream
+
+class ListLiveView(someParam: String) extends LiveView[Msg, Model]:
+
+  def init = ZIO.succeed(
+    Model(
+      elems = List(
+        NestedModel("a", 10),
+        NestedModel("b", 15),
+        NestedModel("c", 20)
+      )
+    )
+  )
+
+  def update(model: Model) =
+    case Msg.IncAge(value) =>
+      ZIO.succeed(model.focus(_.elems.index(2).age).modify(_ + value))
+
+  def view(model: Dyn[Model]) =
+    div(
+      h1(
+        cls := "text-2xl font-semibold tracking-tight text-gray-900",
+        someParam
+      ),
+      cls    := "max-w-2xl mx-auto bg-white shadow rounded-2xl p-6 space-y-6",
+      idAttr := "42",
+      ul(
+        cls := "divide-y divide-gray-200",
+        model(_.elems).splitByIndex((_, elem) =>
+          li(
+            cls := "py-3 flex flex-wrap items-center justify-between gap-2",
+            span(
+              cls := "text-gray-700",
+              "Nom: ",
+              span(cls := "font-medium", elem(_.name))
+            ),
+            span(
+              cls := "text-sm text-gray-500",
+              "Age: ",
+              span(cls := "font-semibold text-gray-700", elem(_.age.toString))
+            )
+          )
+        )
+      ),
+      div(
+        cls := "flex flex-wrap items-center gap-3",
+        button(
+          cls := "inline-flex items-center rounded-lg px-3 py-2 text-sm font-medium bg-gray-900 text-white shadow hover:opacity-90 focus:outline-none focus:ring-2 focus:ring-gray-900/30",
+          phx.click := Msg.IncAge(1),
+          "Inc age"
+        ),
+        span(cls := "grow")
+      )
+    )
+
+  def subscriptions(model: Model) = ZStream.empty
+
+end ListLiveView
+
+object ListLiveView:
+
+  enum Msg derives JsonCodec:
+    case IncAge(value: Int)
+
+  final case class Model(
+    elems: List[NestedModel])
+  final case class NestedModel(name: String, age: Int)

zio/src/scalive/LiveRouter.scala

@@ -61,7 +61,8 @@ class LiveChannel(private val sockets: SubscriptionRef[Map[String, Socket[?, ?]]
     lv: LiveView[Msg, Model],
     meta: WebSocketMessage.Meta
   ): RIO[Scope, Unit] =
-    sockets.updateZIO { m =>
+    sockets
+      .updateZIO { m =>
         m.get(id) match
           case Some(socket) =>
             socket.shutdown *>
@@ -72,8 +73,7 @@ class LiveChannel(private val sockets: SubscriptionRef[Map[String, Socket[?, ?]]
             Socket
               .start(id, token, lv, meta)
               .map(m.updated(id, _))
-
+      }.flatMap(_ => ZIO.logDebug(s"LiveView joined $id"))
-    }
 
   def event(id: String, value: String, meta: WebSocketMessage.Meta): UIO[Unit] =
     sockets.get.flatMap { m =>
@@ -99,7 +99,8 @@ class LiveRouter(rootLayout: HtmlElement => HtmlElement, liveRoutes: List[LiveRo
 
   private val socketApp: WebSocketApp[Any] =
     Handler.webSocket { channel =>
-      ZIO.scoped(for
+      ZIO
+        .scoped(for
           liveChannel <- LiveChannel.make()
           _           <- liveChannel.diffsStream
                  .runForeach((payload, meta) =>
@@ -125,6 +126,7 @@ class LiveRouter(rootLayout: HtmlElement => HtmlElement, liveRoutes: List[LiveRo
                  .fork
           _ <- channel
                  .receiveAll {
+                   case Read(WebSocketFrame.Close) => ZIO.logDebug("WS connection closed by client")
                    case Read(WebSocketFrame.Text(content)) =>
                      for
                        message <- ZIO
@@ -136,8 +138,8 @@ class LiveRouter(rootLayout: HtmlElement => HtmlElement, liveRoutes: List[LiveRo
                               case None    => ZIO.unit
                      yield ()
                    case _ => ZIO.unit
-               }.tapErrorCause(ZIO.logErrorCause(_))
+                 }
-      yield ())
+        yield ()).tapErrorCause(ZIO.logErrorCause(_))
 
     }
 
@@ -160,15 +162,21 @@ class LiveRouter(rootLayout: HtmlElement => HtmlElement, liveRoutes: List[LiveRo
         ZIO
           .fromEither(URL.decode(url)).flatMap(url =>
             val req = Request(url = url)
-            liveRoutes
+            liveRoutes.iterator
-              .collectFirst { route =>
+              .map(route =>
-                val pathParams = route.path.decode(req.path).getOrElse(???)
+                route.path
-                val lv         = route.liveviewBuilder(pathParams, req)
+                  .decode(req.path)
-                liveChannel
+                  .toOption
-                  .join(message.topic, session, lv, message.meta)(using route.messageCodec)
+                  .map(route.liveviewBuilder(_, req))
-                  .map(_ => None)
+                  .map(
-
+                    ZIO.logDebug(s"Joining live view ${route.path.toString} ${message.topic}") *>
-              }.getOrElse(ZIO.succeed(None))
+                      liveChannel.join(message.topic, session, _, message.meta)(
+                        using route.messageCodec
+                      )
+                  )
+              )
+              .collectFirst { case Some(join) => join.map(_ => None) }
+              .getOrElse(ZIO.succeed(None))
           )
       case Payload.Event(_, event, _) =>
         liveChannel

zio/src/scalive/Socket.scala

@@ -23,6 +23,7 @@ object Socket:
     lv: LiveView[Msg, Model],
     meta: WebSocketMessage.Meta
   ): RIO[Scope, Socket[Msg, Model]] =
+    ZIO.logAnnotate("lv", id) {
       for
         inbox  <- Queue.bounded[(Msg, WebSocketMessage.Meta)](4)
         outHub <- Hub.unbounded[(Payload, WebSocketMessage.Meta)]
@@ -67,11 +68,12 @@ object Socket:
         outbox =
           ZStream.succeed(
             Payload.okReply(LiveResponse.InitDiff(initDiff)) -> meta
-        ) ++ ZStream.unwrapScoped(ZStream.fromHubScoped(outHub)).filterNot {
+          ) ++ ZStream
+            .unwrapScoped(ZStream.fromHubScoped(outHub)).filterNot {
               case (Payload.Diff(diff), _) => diff.isEmpty
               case _                       => false
             }
       yield Socket[Msg, Model](id, token, inbox, outbox, stop)
-    end for
+    }
   end start
 end Socket