Stream events and responses

core/src/TestLiveView.scala

@@ -1,3 +1,6 @@
+package scalive
+package playground
+
 import scalive.*
 
 final case class MyModel(
@@ -6,14 +9,13 @@ final case class MyModel(
   elems: List[Elem] = List.empty)
 final case class Elem(name: String, age: Int)
 
-class TestView(initialModel: MyModel) extends LiveView[String, TestView.Event]:
+class TestView(initialModel: MyModel) extends LiveView[TestView.Event]:
   import TestView.Event.*
 
   private val modelVar = Var[MyModel](initialModel)
 
-  override def handleServerEvent(e: TestView.Event): Unit =
-    e match
-      case UpdateModel(f) => modelVar.update(f)
+  def handleEvent =
+    case UpdateModel(f) => modelVar.update(f)
 
   val el: HtmlElement =
     div(

core/src/main.scala

@@ -1,5 +1,12 @@
+package scalive
+package playground
+
 import scalive.*
-import zio.json.JsonCodec
+import zio.json.*
+
+extension (lv: LiveView[?])
+  def renderHtml: String =
+    HtmlBuilder.build(lv.el)
 
 @main
 def main =
@@ -10,20 +17,19 @@ def main =
       Elem("c", 30)
     )
   )
-  val s = Socket("", "", TestView(initModel))
+  val lv = TestView(initModel)
   println("Init")
-  println(s.renderHtml())
-  s.syncClient
-  s.syncClient
+  println(lv.renderHtml)
+  println(lv.diff().toJsonPretty)
 
   println("Edit class attribue")
-  s.lv.handleServerEvent(
+  lv.handleEvent(
     TestView.Event.UpdateModel(_.copy(cls = "text-lg"))
   )
-  s.syncClient
+  println(lv.diff().toJsonPretty)
 
   println("Edit first and last")
-  s.lv.handleServerEvent(
+  lv.handleEvent(
     TestView.Event.UpdateModel(
       _.copy(elems =
         List(
@@ -34,11 +40,11 @@ def main =
       )
     )
   )
-  s.syncClient
-  println(s.renderHtml())
+  println(lv.diff().toJsonPretty)
+  println(lv.diff().toJsonPretty)
 
   println("Add one")
-  s.lv.handleServerEvent(
+  lv.handleEvent(
     TestView.Event.UpdateModel(
       _.copy(elems =
         List(
@@ -50,11 +56,11 @@ def main =
       )
     )
   )
-  s.syncClient
-  println(s.renderHtml())
+  println(lv.diff().toJsonPretty)
+  println(lv.renderHtml)
 
   println("Remove first")
-  s.lv.handleServerEvent(
+  lv.handleEvent(
     TestView.Event.UpdateModel(
       _.copy(elems =
         List(
@@ -65,11 +71,11 @@ def main =
       )
     )
   )
-  s.syncClient
-  println(s.renderHtml())
+  println(lv.diff().toJsonPretty)
+  println(lv.renderHtml)
 
   println("Remove all")
-  s.lv.handleServerEvent(
+  lv.handleEvent(
     TestView.Event.UpdateModel(
       _.copy(
         cls = "text-lg",
@@ -78,7 +84,7 @@ def main =
       )
     )
   )
-  s.syncClient
-  s.syncClient
-  println(s.renderHtml())
+  println(lv.diff().toJsonPretty)
+  println(lv.diff().toJsonPretty)
+  println(lv.renderHtml)
 end main

core/src/scalive/LiveView.scala

@@ -1,6 +1,11 @@
 package scalive
 
-trait LiveView[ClientEvt, ServerEvent]:
-  def handleClientEvent(evt: ClientEvt): Unit   = ()
-  def handleServerEvent(evt: ServerEvent): Unit = ()
+trait LiveView[Event]:
+  def handleEvent: Event => Unit
   val el: HtmlElement
+
+  private[scalive] def diff(trackUpdates: Boolean = true): Diff =
+    el.syncAll()
+    val diff = DiffBuilder.build(el, trackUpdates = trackUpdates)
+    el.setAllUnchanged()
+    diff

core/src/scalive/Socket.scala

@@ -1,39 +0,0 @@
-package scalive
-
-import zio.json.*
-
-final case class Socket[CliEvt: JsonCodec, SrvEvt](
-  id: String,
-  token: String,
-  lv: LiveView[CliEvt, SrvEvt]):
-  val clientEventCodec = JsonCodec[CliEvt]
-
-  private var clientInitialized = false
-
-  lv.el.syncAll()
-
-  def renderHtml(rootLayout: HtmlElement => HtmlElement = identity): String =
-    lv.el.syncAll()
-    HtmlBuilder.build(
-      rootLayout(
-        div(
-          idAttr      := id,
-          phx.session := token,
-          lv.el
-        )
-      )
-    )
-
-  def syncClient: Unit =
-    lv.el.syncAll()
-    println(DiffBuilder.build(lv.el, trackUpdates = clientInitialized).toJsonPretty)
-    clientInitialized = true
-    lv.el.setAllUnchanged()
-
-  def diff: Diff =
-    lv.el.syncAll()
-    val diff = DiffBuilder.build(lv.el, trackUpdates = clientInitialized)
-    clientInitialized = true
-    lv.el.setAllUnchanged()
-    diff
-end Socket

core/src/scalive/WebSocketMessage.scala

@@ -15,8 +15,15 @@ final case class WebSocketMessage(
   // LiveView instance id
   topic: String,
   eventType: String,
-  payload: WebSocketMessage.Payload)
+  payload: WebSocketMessage.Payload):
+  val meta = WebSocketMessage.Meta(joinRef, messageRef, topic)
 object WebSocketMessage:
+
+  final case class Meta(
+    joinRef: Option[Int],
+    messageRef: Int,
+    topic: String)
+
   given JsonCodec[WebSocketMessage] = JsonCodec[Json].transformOrFail(
     {
       case Json.Arr(

core/test/src/scalive/LiveViewSpec.scala

@@ -27,8 +27,9 @@ object LiveViewSpec extends TestSuite:
 
     test("Static only") {
       val lv =
-        new LiveView[String, Unit]:
-          val el = div("Static string")
+        new LiveView[Nothing]:
+          val el          = div("Static string")
+          def handleEvent = _ => ()
       lv.el.syncAll()
 
       test("init") {
@@ -47,14 +48,14 @@ object LiveViewSpec extends TestSuite:
 
     test("Dynamic string") {
       val lv =
-        new LiveView[UpdateEvent, Nothing]:
+        new LiveView[UpdateEvent]:
           val model = Var(TestModel())
           val el    =
             div(
               h1(model(_.title)),
               p(model(_.otherString))
             )
-          override def handleClientEvent(evt: UpdateEvent): Unit = model.update(evt.f)
+          def handleEvent = evt => model.update(evt.f)
 
       lv.el.syncAll()
       lv.el.setAllUnchanged()
@@ -75,19 +76,19 @@ object LiveViewSpec extends TestSuite:
         assertEqualsDiff(lv.el, emptyDiff)
       }
       test("diff with update") {
-        lv.handleClientEvent(UpdateEvent(_.copy(title = "title updated")))
+        lv.handleEvent(UpdateEvent(_.copy(title = "title updated")))
         assertEqualsDiff(
           lv.el,
           Json.Obj("0" -> Json.Str("title updated"))
         )
       }
       test("diff with update and no change") {
-        lv.handleClientEvent(UpdateEvent(_.copy(title = "title value")))
+        lv.handleEvent(UpdateEvent(_.copy(title = "title value")))
         assertEqualsDiff(lv.el, emptyDiff)
       }
       test("diff with update in multiple commands") {
-        lv.handleClientEvent(UpdateEvent(_.copy(title = "title updated")))
-        lv.handleClientEvent(UpdateEvent(_.copy(otherString = "other string updated")))
+        lv.handleEvent(UpdateEvent(_.copy(title = "title updated")))
+        lv.handleEvent(UpdateEvent(_.copy(otherString = "other string updated")))
         assertEqualsDiff(
           lv.el,
           Json
@@ -101,11 +102,11 @@ object LiveViewSpec extends TestSuite:
 
     test("Dynamic attribute") {
       val lv =
-        new LiveView[UpdateEvent, Nothing]:
+        new LiveView[UpdateEvent]:
           val model = Var(TestModel())
           val el    =
             div(cls := model(_.cls))
-          override def handleClientEvent(evt: UpdateEvent): Unit = model.update(evt.f)
+          def handleEvent = evt => model.update(evt.f)
 
       lv.el.syncAll()
       lv.el.setAllUnchanged()
@@ -126,7 +127,7 @@ object LiveViewSpec extends TestSuite:
         assertEqualsDiff(lv.el, emptyDiff)
       }
       test("diff with update") {
-        lv.handleClientEvent(UpdateEvent(_.copy(cls = "text-md")))
+        lv.handleEvent(UpdateEvent(_.copy(cls = "text-md")))
         assertEqualsDiff(
           lv.el,
           Json.Obj("0" -> Json.Str("text-md"))
@@ -136,7 +137,7 @@ object LiveViewSpec extends TestSuite:
 
     test("when mod") {
       val lv =
-        new LiveView[UpdateEvent, Nothing]:
+        new LiveView[UpdateEvent]:
           val model = Var(TestModel())
           val el    =
             div(
@@ -144,7 +145,7 @@ object LiveViewSpec extends TestSuite:
                 div("static string", model(_.nestedTitle))
               )
             )
-          override def handleClientEvent(evt: UpdateEvent): Unit = model.update(evt.f)
+          def handleEvent = evt => model.update(evt.f)
 
       lv.el.syncAll()
       lv.el.setAllUnchanged()
@@ -164,11 +165,11 @@ object LiveViewSpec extends TestSuite:
         assertEqualsDiff(lv.el, emptyDiff)
       }
       test("diff with unrelated update") {
-        lv.handleClientEvent(UpdateEvent(_.copy(title = "title updated")))
+        lv.handleEvent(UpdateEvent(_.copy(title = "title updated")))
         assertEqualsDiff(lv.el, emptyDiff)
       }
       test("diff when true and nested update") {
-        lv.handleClientEvent(UpdateEvent(_.copy(bool = true)))
+        lv.handleEvent(UpdateEvent(_.copy(bool = true)))
         assertEqualsDiff(
           lv.el,
           Json.Obj(
@@ -183,10 +184,10 @@ object LiveViewSpec extends TestSuite:
         )
       }
       test("diff when nested change") {
-        lv.handleClientEvent(UpdateEvent(_.copy(bool = true)))
+        lv.handleEvent(UpdateEvent(_.copy(bool = true)))
         lv.el.syncAll()
         lv.el.setAllUnchanged()
-        lv.handleClientEvent(UpdateEvent(_.copy(bool = true, nestedTitle = "nested title updated")))
+        lv.handleEvent(UpdateEvent(_.copy(bool = true, nestedTitle = "nested title updated")))
         assertEqualsDiff(
           lv.el,
           Json.Obj(
@@ -209,7 +210,7 @@ object LiveViewSpec extends TestSuite:
         )
       )
       val lv =
-        new LiveView[UpdateEvent, Nothing]:
+        new LiveView[UpdateEvent]:
           val model = Var(initModel)
           val el    =
             div(
@@ -224,7 +225,7 @@ object LiveViewSpec extends TestSuite:
                 )
               )
             )
-          override def handleClientEvent(evt: UpdateEvent): Unit = model.update(evt.f)
+          def handleEvent = evt => model.update(evt.f)
 
       lv.el.syncAll()
       lv.el.setAllUnchanged()
@@ -265,11 +266,11 @@ object LiveViewSpec extends TestSuite:
         assertEqualsDiff(lv.el, emptyDiff)
       }
       test("diff with unrelated update") {
-        lv.handleClientEvent(UpdateEvent(_.copy(title = "title updated")))
+        lv.handleEvent(UpdateEvent(_.copy(title = "title updated")))
         assertEqualsDiff(lv.el, emptyDiff)
       }
       test("diff with item changed") {
-        lv.handleClientEvent(
+        lv.handleEvent(
           UpdateEvent(_.copy(items = initModel.items.updated(2, NestedModel("c", 99))))
         )
         assertEqualsDiff(
@@ -289,7 +290,7 @@ object LiveViewSpec extends TestSuite:
         )
       }
       test("diff with item added") {
-        lv.handleClientEvent(
+        lv.handleEvent(
           UpdateEvent(
             _.copy(items = initModel.items.appended(NestedModel("d", 35)))
           )
@@ -312,7 +313,7 @@ object LiveViewSpec extends TestSuite:
         )
       }
       test("diff with first item removed") {
-        lv.handleClientEvent(
+        lv.handleEvent(
           UpdateEvent(
             _.copy(items = initModel.items.tail)
           )
@@ -339,7 +340,7 @@ object LiveViewSpec extends TestSuite:
         )
       }
       test("diff all removed") {
-        lv.handleClientEvent(UpdateEvent(_.copy(items = List.empty)))
+        lv.handleEvent(UpdateEvent(_.copy(items = List.empty)))
         assertEqualsDiff(
           lv.el,
           Json.Obj(