Fix blank page in per-connection session case

nextjournal · Jul 12, 2023 · c9426b9 · c9426b9
1 parent 48291bd
commit c9426b9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/nextjournal/clerk/render.cljs b/src/nextjournal/clerk/render.cljs
@@ -611,7 +611,7 @@
 (defn set-reset-sync-atoms! [new-val] (set! *reset-sync-atoms?* new-val))
 
 (defn intern-atoms! [atom-var-name->state]
- (js/console.log :intern-atoms! atom-var-name->state)
+ #_(js/console.log :intern-atoms! atom-var-name->state)
  (let [vars-in-use (into #{} (keys atom-var-name->state))
  vars-interned @!synced-atom-vars]
  (doseq [var-name-to-unmap (set/difference vars-interned vars-in-use)]

diff --git a/src/nextjournal/clerk/sci_env.cljs b/src/nextjournal/clerk/sci_env.cljs
@@ -205,7 +205,9 @@
  (swap! render/!doc assoc ::connection-status "Reconnecting…"))
  (let [ws (js/WebSocket. ws-url)]
  (set! (.-onmessage ws) onmessage)
- (set! (.-onopen ws) (fn [e] (swap! render/!doc dissoc ::connection-status ::failed-attempts)))
+ (set! (.-onopen ws) (fn [e]
+ (render/clerk-eval (list 'nextjournal.clerk.webserver/navigate! {:nav-path (subs js/location.pathname 1) :skip-history? true}))
+ (swap! render/!doc dissoc ::connection-status ::failed-attempts)))
  (set! (.-onclose ws) (fn [e]
  (let [timeout (reconnect-timeout (::failed-attempts @render/!doc 0))]
  (swap! render/!doc

diff --git a/src/nextjournal/clerk/webserver.clj b/src/nextjournal/clerk/webserver.clj
@@ -277,7 +277,7 @@
  (binding [*session* (get-session (@!ch->req sender-ch))]
  (let [!doc (get-doc! *session*)
  {:as msg :keys [type recompute?]} (read-msg edn-string)]
- (prn :on-receive msg)
+ (create-session-doc!)
  (binding [*ns* (or (:ns @!doc)
  (create-ns 'user))]
  (case type