make sure to remove clients when they disconnect so that remote process don't fall over trying to send io messages to them

Signed-off-by: Chris Granger <ibdknox@gmail.com>

Author: ibdknox

lein-light-nrepl/project.clj

@@ -1,4 +1,4 @@
-(defproject lein-light-nrepl "0.0.15"
+(defproject lein-light-nrepl "0.0.16"
   :description "FIXME: write description"
   :url "http://example.com/FIXME"
   :license {:name "Eclipse Public License"

lein-light-nrepl/src/lighttable/nrepl/core.clj

@@ -12,8 +12,11 @@
 
 (def ^{:dynamic true} *ltmsg* nil)
 (def server (atom nil))
-(def clients (atom []))
+(def clients (atom {}))
 (def old-out System/out)
+(def old-err System/err)
+(def old-*out* *out*)
+(def old-*err* *err*)
 (def my-settings (atom {:name "clj"
                         :dir (fs/absolute-path fs/*cwd*)
                         :type "lein-light-nrepl"
@@ -63,11 +66,11 @@
        (transport/send (:transport msg) (response-for msg {:op (name op) :id (or (:id msg) (:client-id @my-settings)) :encoding encoding :data data}))))))
 
 (defn broadcast [op data]
-  (doseq [client @clients]
+  (doseq [client (vals @clients)]
     (respond client op data)))
 
 (defn broadcast-to [id op data]
-  (doseq [client @clients]
+  (doseq [client (vals @clients)]
     (respond (assoc client :id id) op data)))
 
 (defn safe-respond-to [id op data]
@@ -76,7 +79,10 @@
     (broadcast-to id op data)))
 
 (defn capture-client [msg]
-  (swap! clients conj (select-keys msg [:session :transport])))
+  (swap! clients assoc (-> msg :session meta :id) (select-keys msg [:session :transport])))
+
+(defn remove-client [msg]
+  (swap! clients dissoc (-> msg :session meta :id)))
 
 (defn queued [{:keys [op session id transport] :as msg} executor]
   (queue-eval session executor
@@ -152,6 +158,12 @@
     (alter-var-root #'*err* (fn [_] err))
     ))
 
+(defn restore-io []
+  (System/setOut old-out)
+  (System/setErr old-err)
+  (alter-var-root #'*out* (fn [_] old-*out*))
+  (alter-var-root #'*err* (fn [_] old-*err*)))
+
 (defn start [info]
   ;(reset! server (start-server :port 7888 :handler (default-handler #'lighttable-ops)))
   )

lein-light-nrepl/src/lighttable/nrepl/handler.clj

@@ -28,8 +28,12 @@
   [h & {:keys [executor] :or {executor (core/configure-executor)}}]
   (fn [{:keys [op session interrupt-id id transport] :as msg}]
     (cond
-     (= op "client.close") (when-not (:remote @core/my-settings)
-                             (System/exit 0))
+     (= op "client.close") (do
+                             (core/remove-client msg)
+                             (when (empty? @core/clients)
+                               (core/restore-io))
+                             (when-not (:remote @core/my-settings)
+                                (System/exit 0)))
      (= op "client.init") (do
                             (core/capture-client msg)
                             (core/redirect-io msg)

plugin.edn

@@ -1,5 +1,5 @@
 {:name "Clojure"
- :version "0.0.9"
+ :version "0.0.10"
  :author "Kodowa"
  :source "https://github.com/LightTable/Clojure"
  :desc "Clojure integration for Light Table"

runner/src/leiningen/light_nrepl.clj

@@ -33,7 +33,7 @@
         init (if-let [cur-init (-> project :repl-options :init)]
                (list 'do cur-init init)
                init)
-        profile {:dependencies '[[lein-light-nrepl/lein-light-nrepl "0.0.15"]
+        profile {:dependencies '[[lein-light-nrepl/lein-light-nrepl "0.0.16"]
                                  [org.clojure/tools.reader "0.8.3"]]
                  :repl-options {:nrepl-middleware ['lighttable.nrepl.handler/lighttable-ops]
                                  :init (with-meta init {:replace true})}}