Dispatch custom event when ws opens

nextjournal · Aug 2, 2023 · f923970 · f923970
1 parent 76fdd7d
commit f923970
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/nextjournal/clerk/render/editor.cljs b/src/nextjournal/clerk/render/editor.cljs
@@ -5,6 +5,7 @@
  ["@codemirror/view" :refer [keymap placeholder]]
  [applied-science.js-interop :as j]
  [clojure.string :as str]
+ [goog.events]
  [nextjournal.clerk.parser :as parser]
  [nextjournal.clerk.render :as render]
  [nextjournal.clerk.render.code :as code]
@@ -220,8 +221,7 @@
  {:key "Escape"
  :run #(reset! !show-docstring? false)}]))]))
  @!container-el))]
- ;; FIXME! we need a callback on ws ready
- (js/setTimeout #(on-eval view) 500)
+ (goog.events/listenOnce js/window "clerk.wsopen" #(on-eval view) false)
  #(.destroy view))))
  (code/use-dark-mode !view)
  [:<>

diff --git a/src/nextjournal/clerk/sci_env.cljs b/src/nextjournal/clerk/sci_env.cljs
@@ -14,6 +14,7 @@
  [clojure.string :as str]
  [edamame.core :as edamame]
  [goog.object]
+ [goog.events]
  [nextjournal.clerk.cherry-env :as cherry-env]
  [nextjournal.clerk.parser]
  [nextjournal.clerk.render :as render]
@@ -205,7 +206,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]
+ (swap! render/!doc dissoc ::connection-status ::failed-attempts)
+ (.dispatchEvent js/window (new js/Event "clerk.wsopen"))))
  (set! (.-onclose ws) (fn [e]
  (let [timeout (reconnect-timeout (::failed-attempts @render/!doc 0))]
  (swap! render/!doc