WIP: ClientStorage.scala,GlobalState.scala,UrlConfig.scala,AuthControls.scala,Components.scala,CreateNewPrompt.scala,DoodleView.scala,MembersModal.scala,NewProjectPrompt.scala

Author: fdietze

webApp/src/main/scala/wust/webApp/ClientStorage.scala

@@ -2,6 +2,8 @@ package wust.webApp
 
 import wust.util.Memo
 import wust.ids._
+import wust.graph.Graph
+import wust.graph.Page
 import collection.mutable
 import cats.effect.SyncIO
 import io.circe._
@@ -15,22 +17,32 @@ import wust.api.Authentication
 import wust.api.serialize.Circe._
 import wust.graph.GraphChanges
 import wust.webUtil.outwatchHelpers._
+import wust.util.time.time
 
-import scala.util.{Failure, Success, Try}
+import scala.util.{ Failure, Success, Try }
 import wust.facades.segment.Segment
 
 class ClientStorage(implicit owner: Ctx.Owner) {
-  import org.scalajs.dom.ext.{LocalStorage => internal}
+  import org.scalajs.dom.ext.{ LocalStorage => internal }
 
   object keys {
     val auth = "wust.auth"
     val sidebarOpen = "wust.sidebar.open"
     val sidebarWithProjects = "wust.sidebar.projects"
     val taglistOpen = "wust.taglist.open"
     val filterlistOpen = "wust.filterlist.open"
-    def pendingChanges(userId:UserId) = s"wust.pendingchanges.${userId.toUuid.toString}"
-    def pendingChangesInvalid(userId:UserId) = s"wust.pendingchanges.invalid.${userId.toUuid.toString}"
+    def pendingChanges(userId: UserId) = s"wust.pendingchanges.${userId.toUuid.toString}"
+    def pendingChangesInvalid(userId: UserId) = s"wust.pendingchanges.invalid.${userId.toUuid.toString}"
     val backendTimeDelta = "wust.backendtimedelta"
+    def pageCache(page: Page) = new {
+      val baseKey = page.parentId match {
+        case Some(parentId) => s"wust.pageCache.${parentId.toUuid.toString}"
+        case None           => s"wust.pageCache.empty"
+      }
+      val graph = s"${baseKey}.graph"
+      val time = s"${baseKey}.time"
+      val keys = List(graph, time)
+    }
   }
 
   private def toJson[T: Encoder](value: T): String = value.asJson.noSpaces
@@ -51,8 +63,30 @@ class ClientStorage(implicit owner: Ctx.Owner) {
     }
   }
 
+  def getGraph(page: Page): Option[Graph] = {
+    val storageKey = keys.pageCache(page)
+    val encodedOpt = internal(storageKey.graph)
+    encodedOpt flatMap { encoded =>
+      decode[Graph](encoded) match {
+        case Left(_) =>
+          // cannot decode cache -> prune this entry
+          storageKey.keys.foreach(internal.remove)
+          None
+        case Right(decoded) => Some(decoded)
+      }
+    }
+  }
+
+  def updateGraph(page: Page, graph: Graph): Unit = {
+    time(s"writing to cache: $page") {
+      val storageKey = keys.pageCache(page)
+      internal.update(storageKey.graph, toJson(graph))
+      internal.update(storageKey.time, EpochMilli.now.toString)
+    }
+  }
+
   val auth: Var[Option[Authentication]] = {
-    if(canAccessLs) {
+    if (canAccessLs) {
       LocalStorage
         .handlerWithoutEvents[SyncIO](keys.auth)
         .unsafeRunSync()
@@ -61,48 +95,47 @@ class ClientStorage(implicit owner: Ctx.Owner) {
     } else Var(None)
   }
 
-  def addPendingGraphChange(userId: UserId, change:GraphChanges) = {
+  def addPendingGraphChange(userId: UserId, change: GraphChanges) = {
     pendingChanges(userId).update(_ :+ toJson(change))
   }
 
   def clearPendingGraphChanges(userId: UserId) = {
     pendingChanges(userId).update(_ => List.empty)
   }
 
-  def getDecodablePendingGraphChanges(userId: UserId):List[GraphChanges] = {
+  def getDecodablePendingGraphChanges(userId: UserId): List[GraphChanges] = {
     val all = pendingChanges(userId).now
     val validEncodedBuilder = mutable.ListBuffer.empty[String]
     val validDecodedBuilder = mutable.ListBuffer.empty[GraphChanges]
     val invalidBuilder = mutable.ListBuffer.empty[String]
     all.foreach { encoded =>
       decode[GraphChanges](encoded) match {
-        case Left(error) => 
+        case Left(error) =>
           invalidBuilder += encoded
           Segment.trackError("Failed to decode pending GraphChange", s"${error.toString}: ${encoded}")
-        case Right(valid) => 
+        case Right(valid) =>
           validEncodedBuilder += encoded
           validDecodedBuilder += valid
       }
     }
 
     val invalid = invalidBuilder.result()
 
-    if(invalid.nonEmpty) {
+    if (invalid.nonEmpty) {
       pendingChangesInvalid(userId).update(_ ++ invalid)
       pendingChanges(userId)() = validEncodedBuilder.result()
     }
 
     validDecodedBuilder.result()
   }
 
-
   val pendingChanges = Memo.mutableHashMapMemo[UserId, Var[List[String]]](pendingChangesByUser)
   val pendingChangesInvalid = Memo.mutableHashMapMemo[UserId, Var[List[String]]](pendingChangesInvalidByUser)
 
   //TODO: howto handle with events from other tabs?
   private def pendingChangesByUser(userId: UserId): Var[List[String]] = {
     val storageKey = keys.pendingChanges(userId)
-    if(canAccessLs) {
+    if (canAccessLs) {
       LocalStorage
         .handlerWithoutEvents[SyncIO](storageKey)
         .unsafeRunSync()
@@ -113,7 +146,7 @@ class ClientStorage(implicit owner: Ctx.Owner) {
 
   private def pendingChangesInvalidByUser(userId: UserId): Var[List[String]] = {
     val storageKey = keys.pendingChangesInvalid(userId)
-    if(canAccessLs) {
+    if (canAccessLs) {
       LocalStorage
         .handlerWithoutEvents[SyncIO](storageKey)
         .unsafeRunSync()
@@ -122,9 +155,8 @@ class ClientStorage(implicit owner: Ctx.Owner) {
     } else Var(List.empty)
   }
 
-
   val sidebarOpen: Var[Option[Boolean]] = {
-    if(canAccessLs) {
+    if (canAccessLs) {
       LocalStorage
         .handlerWithoutEvents[SyncIO](keys.sidebarOpen)
         .unsafeRunSync()
@@ -134,7 +166,7 @@ class ClientStorage(implicit owner: Ctx.Owner) {
   }
 
   val sidebarWithProjects: Var[Option[Boolean]] = {
-    if(canAccessLs) {
+    if (canAccessLs) {
       LocalStorage
         .handlerWithoutEvents[SyncIO](keys.sidebarWithProjects)
         .unsafeRunSync()
@@ -144,7 +176,7 @@ class ClientStorage(implicit owner: Ctx.Owner) {
   }
 
   val taglistOpen: Var[Option[Boolean]] = {
-    if(canAccessLs) {
+    if (canAccessLs) {
       LocalStorage
         .handlerWithoutEvents[SyncIO](keys.taglistOpen)
         .unsafeRunSync()
@@ -154,7 +186,7 @@ class ClientStorage(implicit owner: Ctx.Owner) {
   }
 
   val filterlistOpen: Var[Option[Boolean]] = {
-    if(canAccessLs) {
+    if (canAccessLs) {
       LocalStorage
         .handlerWithoutEvents[SyncIO](keys.filterlistOpen)
         .unsafeRunSync()
@@ -164,7 +196,7 @@ class ClientStorage(implicit owner: Ctx.Owner) {
   }
 
   val backendTimeDelta: Var[Long] = {
-    if(canAccessLs) {
+    if (canAccessLs) {
       LocalStorage
         .handlerWithoutEvents[SyncIO](keys.backendTimeDelta)
         .unsafeRunSync()

webApp/src/main/scala/wust/webApp/state/GlobalState.scala

@@ -1,6 +1,7 @@
 package wust.webApp.state
 
 // import acyclic.file
+import wust.webApp.ClientStorage
 import com.github.ghik.silencer.silent
 import org.scalajs.dom.experimental.permissions.PermissionState
 import org.scalajs.dom.window
@@ -19,6 +20,7 @@ import wust.webApp.views._
 import wust.webApp.{ Client, WoostConfig }
 import wust.webUtil.outwatchHelpers._
 import wust.webUtil.{ BrowserDetect, ModalConfig, Ownable }
+import wust.webUtil.Elements.defer
 import wust.facades.segment.Segment
 import outwatch.dom._
 import outwatch.dom.dsl._
@@ -175,16 +177,23 @@ object GlobalState {
   val pageExistsInGraph: Rx[Boolean] = Rx{ page().parentId.exists(rawGraph().contains) }
   val showPageNotFound = Rx { !isLoading() && !pageExistsInGraph() && viewIsContent() }
 
-  def focus(nodeId: NodeId, needsGet: Boolean = true) = {
-    val alreadyLoaded = (
+  def focus(nodeId: NodeId, view: Option[View] = GlobalState.urlConfig.now.view, needsGet: Boolean = true): Unit = focusPage(Page(nodeId), needsGet = needsGet)
+  def focusPage(page: Page, view: Option[View] = GlobalState.urlConfig.now.view, needsGet: Boolean = true): Unit = {
+    @inline def nextPage = page
+    val oldPage = GlobalState.page.now
+    val oldGraph = graph.now
+    val oldRawGraph = rawGraph.now
+    def alreadyLoaded = (
       for {
-        pageId <- page.now.parentId
-        pageIdx <- graph.now.idToIdx(pageId)
-        nodeIdx <- graph.now.idToIdx(nodeId)
-      } yield dfs.exists(_(pageIdx), dfs.withStart, graph.now.childrenIdx, isFound = { _ == nodeIdx })
+        oldPageId <- oldPage.parentId
+        oldPageIdx <- oldGraph.idToIdx(oldPageId)
+        nextPageId <- nextPage.parentId
+        nextPageIdx <- oldGraph.idToIdx(nextPageId)
+      } yield dfs.exists(_(oldPageIdx), dfs.withStart, oldGraph.childrenIdx, isFound = { _ == nextPageIdx })
     ).getOrElse(false)
 
-    urlConfig.update(_.focus(Page(nodeId), needsGet = needsGet && !alreadyLoaded))
+    defer { Client.storage.updateGraph(oldPage, oldRawGraph) }
+    urlConfig.update(_.focus(nextPage, view, needsGet = needsGet && !alreadyLoaded))
   }
 
   def focusSubPage(nodeIdOpt: Option[NodeId]) = {

webApp/src/main/scala/wust/webApp/state/UrlConfig.scala

@@ -38,11 +38,11 @@ final case class UrlConfig(
 
   def redirect: UrlConfig = copy(view = redirectTo, redirectTo = None)
 
-  @inline def focus(view: View): UrlConfig = focus(Some(view))
+  @inline private[state] def focus(view: View): UrlConfig = focus(Some(view))
   @inline def focus(page: Page, view: View): UrlConfig = focus(page, Some(view))
   @inline def focus(view: Option[View]): UrlConfig = copy(view = view, redirectTo = None, focusId = None)
   @inline def focus(page: Page, view: View, needsGet: Boolean): UrlConfig = focus(page, Some(view), needsGet)
-  def focus(page: Page, view: Option[View] = None, needsGet: Boolean = true): UrlConfig = copy(pageChange = PageChange(page, needsGet = needsGet), view = view, redirectTo = None, focusId = None, subPage = Page.empty)
+  private[state] def focus(page: Page, view: Option[View] = None, needsGet: Boolean = true): UrlConfig = copy(pageChange = PageChange(page, needsGet = needsGet), view = view, redirectTo = None, focusId = None, subPage = Page.empty)
 
 }
 

webApp/src/main/scala/wust/webApp/views/AuthControls.scala

@@ -74,7 +74,7 @@ object AuthControls {
       cls := s"tiny compact ui $buttonStyle button",
       onClick foreach {
         Client.auth.logout().foreach { _ =>
-          GlobalState.urlConfig.update(_.focus(Page.empty, View.Login))
+          GlobalState.focusPage(Page.empty, view = Some(View.Login))
         }
         FeatureState.use(Feature.ClickLogoutInAuthStatus)
         Segment.trackSignedOut()

webApp/src/main/scala/wust/webApp/views/Components.scala

@@ -151,7 +151,7 @@ object Components {
           } // Max 1 dm node with this name
           previousDmNode match {
             case Some(dmNode) if graph.can_access_node(user.id, dmNode.id) =>
-              GlobalState.urlConfig.update(_.focus(Page(dmNode.id), View.Conversation))
+              GlobalState.focus(dmNode.id, view = Some(View.Conversation))
             case _ => // create a new channel, add user as member
               val nodeId = NodeId.fresh
               val change:GraphChanges =
@@ -163,7 +163,7 @@ object Components {
                 ))
 
               GlobalState.submitChanges(change)
-              GlobalState.urlConfig.update(_.focus(Page(nodeId), View.Chat, needsGet = false))
+              GlobalState.focus(nodeId, Some(View.Chat), needsGet = false)
               ()
           }
           Segment.trackEvent("Direct Message")

webApp/src/main/scala/wust/webApp/views/CreateNewPrompt.scala

@@ -72,7 +72,7 @@ object CreateNewPrompt {
       if (addToChannels.now) {
         val channelChanges = GraphChanges.connect(Edge.Pinned)(newNode.id, GlobalState.user.now.id)
         GlobalState.submitChanges(changes merge channelChanges)
-        GlobalState.urlConfig.update(_.focus(Page(newNode.id), needsGet = false))
+        GlobalState.focus(newNode.id, needsGet = false)
       } else {
         GlobalState.submitChanges(changes).foreach { _ =>
           if(childNodes.now.nonEmpty)

webApp/src/main/scala/wust/webApp/views/DoodleView.scala

@@ -268,7 +268,7 @@ object DoodleView extends AppDefinition {
     )).foreach {
       val nodeId = NodeId.fresh
       GlobalState.submitChanges(createNode(nodeId))
-      GlobalState.urlConfig.update(_.focus(Page(nodeId), needsGet = false))
+      GlobalState.focus(nodeId, needsGet = false)
       ()
     }
 

webApp/src/main/scala/wust/webApp/views/MembersModal.scala

@@ -120,7 +120,7 @@ object MembersModal {
       if (membership.userId == GlobalState.user.now.id) {
         needAction() = Some(NeedAction(
           { () =>
-            GlobalState.urlConfig.update(_.focus(Page.empty))
+            GlobalState.focusPage(Page.empty)
             GlobalState.uiModalClose.onNext(())
             action()
           },

webApp/src/main/scala/wust/webApp/views/NewProjectPrompt.scala

@@ -52,7 +52,7 @@ object NewProjectPrompt {
       val views = if (selectedViews.now.isEmpty) None else Some(selectedViews.now.toList)
       GlobalState.submitChanges(GraphChanges.newProject(nodeId, GlobalState.user.now.id, newName, views) merge sub.changes(nodeId) merge extraChanges(nodeId))
 
-      if (focusNewProject) GlobalState.urlConfig.update(_.focus(Page(nodeId), needsGet = false))
+      if (focusNewProject) GlobalState.focus(nodeId, needsGet = false)
 
       FeatureState.use(Feature.CreateProject)
       selectedViews.now.foreach (ViewModificationMenu.trackAddViewFeature)