Use session exec in refresh middleware

Author: cichli

src/cider/nrepl/middleware/refresh.clj

@@ -16,7 +16,7 @@
    [nrepl.transport :as transport]
    [orchard.misc :as u]))
 
-(defonce ^:private refresh-tracker (agent (track/tracker)))
+(defonce ^:private refresh-tracker (volatile! (track/tracker)))
 
 (defn- user-refresh-dirs
   "Directories to watch and reload, as configured by the user.
@@ -122,7 +122,6 @@
                         :before before}))
 
     (let [resolved? (resolve-and-invoke before msg)]
-
       (transport/send
        transport
        (response-for msg
@@ -143,7 +142,6 @@
                           :after after}))
 
       (let [resolved? (resolve-and-invoke after msg)]
-
         (transport/send
          transport
          (response-for msg {:status (if resolved?
@@ -155,36 +153,40 @@
         (error-reply {:error e} msg)))))
 
 (defn- refresh-reply
-  [{:keys [dirs transport] :as msg}]
-  (send-off refresh-tracker
-            (fn [tracker]
-              (try
-                (before-reply msg)
-
-                (-> tracker
-                    (dir/scan-dirs (or (seq dirs) (user-refresh-dirs))
-                                   (select-keys msg [:platform :add-all?]))
-                    (remove-disabled)
-                    (doto (reloading-reply msg))
-                    (reload/track-reload)
-                    (doto (result-reply msg))
-                    (doto (after-reply msg)))
-
-                (catch Throwable e
-                  (error-reply {:error e} msg)
-                  tracker)
-
-                (finally
-                  (transport/send
-                   transport
-                   (response-for msg {:status :done})))))))
+  [{:keys [dirs transport session id] :as msg}]
+  (let [{:keys [exec]} (meta session)]
+    (exec id
+          (fn []
+            (locking refresh-tracker
+              (vswap! refresh-tracker
+                      (fn [tracker]
+                        (try
+                          (before-reply msg)
+
+                          (-> tracker
+                              (dir/scan-dirs (or (seq dirs) (user-refresh-dirs))
+                                             (select-keys msg [:platform :add-all?]))
+                              (remove-disabled)
+                              (doto (reloading-reply msg))
+                              (reload/track-reload)
+                              (doto (result-reply msg))
+                              (doto (after-reply msg)))
+
+                          (catch Throwable e
+                            (error-reply {:error e} msg)
+                            tracker))))))
+          (fn []
+            (transport/send transport (response-for msg {:status :done}))))))
 
 (defn- clear-reply
-  [{:keys [transport] :as msg}]
-  (send-off refresh-tracker (constantly (track/tracker)))
-  (transport/send
-   transport
-   (response-for msg {:status :done})))
+  [{:keys [transport session id] :as msg}]
+  (let [{:keys [exec]} (meta session)]
+    (exec id
+          (fn []
+            (locking refresh-tracker
+              (vreset! refresh-tracker (track/tracker))))
+          (fn []
+            (transport/send transport (response-for msg {:status :done}))))))
 
 (defn handle-refresh [handler msg]
   (case (:op msg)