wip

Author: fdietze

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

@@ -1,5 +1,6 @@
 package wust.webApp
 
+import wust.util.time.time
 import wust.facades.googleanalytics.Analytics
 import io.circe._
 import io.circe.parser._
@@ -11,18 +12,19 @@ import wust.webUtil.outwatchHelpers._
 import wust.api.Authentication
 import wust.api.serialize.Circe._
 import wust.graph._
+import wust.ids._
 
-import scala.util.{Failure, Success, Try}
+import scala.util.{ Failure, Success, Try }
 
 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 taglistOpen = "wust.taglist.open"
     val filterlistOpen = "wust.filterlist.open"
-    val graphChanges = "wust.graph.changes"
+    val pendingGraphChanges = "wust.graph.pendingChanges"
     val backendTimeDelta = "wust.backendtimedelta"
     val graphCachePageIndex = "wust.graphCachePageIndex"
     val graphCache = "wust.graphCache"
@@ -46,13 +48,36 @@ class ClientStorage(implicit owner: Ctx.Owner) {
     }
   }
 
-  def getGraph(page:Page):Option[Graph] = {
-    internal
+  def getGraph(page: Page): Option[Graph] = page.parentId.flatMap(getGraph)
+  def getGraph(pageId: NodeId): Option[Graph] = {
+    for {
+      value <- internal(s"${keys.graphCache}${pageId.toBase58}")
+      graph <- fromJson[Graph](value)
+    } yield graph
+  }
+
+  def updateGraph(page: Page, graph: Graph): Unit = page.parentId.foreach(updateGraph(_, graph))
+  def updateGraph(pageId: NodeId, graph: Graph): Unit = {
+    time(s"writing to cache: $graph") {
+      internal.update(
+        s"${keys.graphCache}${pageId.toBase58}",
+        toJson(graph)
+      )
+    }
+  }
+
+  def getPendingGraphChanges: Seq[GraphChanges] = {
+    internal(keys.pendingGraphChanges)
+      .flatMap(fromJson[Seq[GraphChanges]])
+      .getOrElse(Seq.empty[GraphChanges])
+  }
+
+  def addPendingGraphChanges(changes: Seq[GraphChanges]): Unit = {
+    internal.update(keys.pendingGraphChanges, toJson(getPendingGraphChanges ++ changes))
   }
-  def updateGraph(page:Page, graph:Graph):Unit = ???
 
   val auth: Var[Option[Authentication]] = {
-    if(canAccessLs) {
+    if (canAccessLs) {
       LocalStorage
         .handlerWithoutEvents(keys.auth)
         .unsafeRunSync()
@@ -61,27 +86,8 @@ class ClientStorage(implicit owner: Ctx.Owner) {
     } else Var(None)
   }
 
-  // val rawGraph: Var[List[Graph]] = {
-  //   if(canAccessLs) {
-  //     LocalStorage
-  //       .handlerWithoutEvents(keys.graphChanges)
-  //       .unsafeRunSync()
-  //       .mapHandler[List[GraphChanges]](changes => Option(toJson(changes)))(_.flatMap(fromJson[List[GraphChanges]]).getOrElse(Nil))
-  //   } else Handler.unsafe[List[GraphChanges]]
-  // }
-
-  //TODO: howto handle with events from other tabs?
-  // val graphChanges: Handler[List[GraphChanges]] = {
-  //   if(canAccessLs) {
-  //     LocalStorage
-  //       .handlerWithoutEvents(keys.graphChanges)
-  //       .unsafeRunSync()
-  //       .mapHandler[List[GraphChanges]](changes => Option(toJson(changes)))(_.flatMap(fromJson[List[GraphChanges]]).getOrElse(Nil))
-  //   } else Handler.unsafe[List[GraphChanges]]
-  // }
-
   val sidebarOpen: Var[Option[Boolean]] = {
-    if(canAccessLs) {
+    if (canAccessLs) {
       LocalStorage
         .handlerWithoutEvents(keys.sidebarOpen)
         .unsafeRunSync()
@@ -91,7 +97,7 @@ class ClientStorage(implicit owner: Ctx.Owner) {
   }
 
   val taglistOpen: Var[Option[Boolean]] = {
-    if(canAccessLs) {
+    if (canAccessLs) {
       LocalStorage
         .handlerWithoutEvents(keys.taglistOpen)
         .unsafeRunSync()
@@ -101,7 +107,7 @@ class ClientStorage(implicit owner: Ctx.Owner) {
   }
 
   val filterlistOpen: Var[Option[Boolean]] = {
-    if(canAccessLs) {
+    if (canAccessLs) {
       LocalStorage
         .handlerWithoutEvents(keys.filterlistOpen)
         .unsafeRunSync()
@@ -111,7 +117,7 @@ class ClientStorage(implicit owner: Ctx.Owner) {
   }
 
   val backendTimeDelta: Var[Long] = {
-    if(canAccessLs) {
+    if (canAccessLs) {
       LocalStorage
         .handlerWithoutEvents(keys.backendTimeDelta)
         .unsafeRunSync()

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

@@ -1,7 +1,8 @@
 package wust.webApp.state
 
 import java.util.concurrent.TimeUnit
-
+import wust.webUtil.Elements.defer
+import concurrent.Future
 import wust.facades.googleanalytics.Analytics
 import wust.facades.hotjar
 import monix.eval.Task
@@ -137,15 +138,24 @@ object GlobalStateFactory {
       }
     }
 
-    rawGraph.foreach { graph =>
-      ClientStorage
+    rawGraph.toObservable.debounce(2 second).foreach { graph =>
+      Client.storage.updateGraph(page.now, graph)
     }
 
     def getNewGraph(page: Page) = {
+      def getGraphFromApi: Future[Graph] = {
+        for {
+          graph <- Client.api.getGraph(page)
+        } yield enrichVisitedGraphWithSideEffects(page, graph)
+      }
+
       isLoading() = true
-      val graph = for {
-        graph <- Client.api.getGraph(page)
-      } yield enrichVisitedGraphWithSideEffects(page, graph)
+      val graph: Future[Graph] = if (!isOnline.now) {
+        // offline. try to read graph from cache
+        Client.storage.getGraph(page).fold(getGraphFromApi)(Future.successful)
+      } else {
+        getGraphFromApi
+      }
 
       graph.transform { result =>
         isLoading() = false
@@ -302,7 +312,7 @@ object GlobalStateFactory {
     state
   }
 
-  def setupStateDebugLogging(state: GlobalState)(implicit ctx:Ctx.Owner):Unit = {
+  def setupStateDebugLogging(state: GlobalState)(implicit ctx: Ctx.Owner): Unit = {
     import state._
 
     rawGraph.debugWithDetail((g: Graph) => s"rawGraph: ${g.toString}", (g: Graph) => g.toDetailedString)