Move hf/*http-request* to e/*http-request*

*http-request* is specific to the Electric

src-docs/user/demo_chat_extended.cljc

@@ -1,7 +1,6 @@
 (ns user.demo-chat-extended
   (:require
    contrib.str
-   [hyperfiddle.api :as hf]
    [hyperfiddle.electric :as e]
    [hyperfiddle.electric-dom2 :as dom]))
 
@@ -41,8 +40,8 @@
 (e/defn ChatExtended []
   (e/client
     (dom/h1 (dom/text "Multiplayer chat app with auth and presence"))
-    (let [session-id (e/server (get-in hf/*http-request* [:headers "sec-websocket-key"]))
-          username (e/server (get-in hf/*http-request* [:cookies "username" :value]))]
+    (let [session-id (e/server (get-in e/*http-request* [:headers "sec-websocket-key"]))
+          username (e/server (get-in e/*http-request* [:cookies "username" :value]))]
       (if-not (some? username)
         (do (dom/p (dom/text "Set login cookie here: ") (dom/a (dom/props {::dom/href "/auth"}) (dom/text "/auth")) (dom/text " (blank password)"))
             (dom/p (dom/text "Example HTTP endpoint is here: ")

src/contrib/element_syntax.cljc

@@ -76,7 +76,6 @@
     (:require
       contrib.str
       [contrib.element-syntax :refer [<%]]
-      [hyperfiddle.api :as hf]
       [hyperfiddle.electric :as e]
       [hyperfiddle.electric-dom2 :as dom]))
 
@@ -113,8 +112,8 @@
   (e/defn App []
     (e/client
       (<% :h1 "Multiplayer chat app with auth and presence")
-      (let [session-id (e/server (get-in hf/*http-request* [:headers "sec-websocket-key"]))
-            username (e/server (get-in hf/*http-request* [:cookies "username" :value]))]
+      (let [session-id (e/server (get-in e/*http-request* [:headers "sec-websocket-key"]))
+            username (e/server (get-in e/*http-request* [:cookies "username" :value]))]
         (if-not (some? username)
           (do (<% :p "Set login cookie here: " (<% :a {:href "/auth"} "/auth") " (blank password)")
               (<% :p "Example HTTP endpoint is here: "

src/hyperfiddle/api.cljc

@@ -131,8 +131,6 @@
 
 (defmacro branch [& body] `(new Branch (e/fn [] ~@body)))
 
-(def ^:dynamic *http-request* "Bound to the HTTP request of the page in which the current Electric program is running." nil)
-
 (e/def page-drop -1)
 (e/def page-take -1)
 

src/hyperfiddle/electric.cljc

@@ -397,3 +397,5 @@ running on a remote host.
                              {:status :waiting
                               :since  time
                               :delay  1000})))))))
+
+(def ^:dynamic *http-request* "Bound to the HTTP request of the page in which the current Electric program is running." nil)

src/hyperfiddle/electric_jetty_adapter.clj

@@ -84,7 +84,7 @@
   program named by the client. Original HTTP upgrade ring request map is
   accessible using `(ring.adapter.jetty9/req-of ws)`."
   [ring-req write-msg read-msg]
-  (binding [hf/*http-request* ring-req]
+  (binding [e/*http-request* ring-req]
     ;; Electric can resolve any dynamic var bound at this point
     (let [resolvef (bound-fn [not-found x] (r/dynamic-resolve not-found x))]
       (m/sp