refactor: Move IHost to elin.protocol.host.rpc/IRpc

src/elin/component/lazy_host.clj

@@ -2,6 +2,7 @@
   (:require
    [clojure.core.async :as async]
    [com.stuartsierra.component :as component]
+   [elin.protocol.host.rpc :as e.p.h.rpc]
    [elin.protocol.rpc :as e.p.rpc]
    [taoensso.timbre :as timbre]))
 
@@ -17,11 +18,12 @@
           (let [[type & args] (async/<! ch)]
             (case type
               ::request! (let [[ch & args] args
-                               res (async/<! (apply e.p.rpc/request! host args))]
+                               res (async/<! (apply e.p.h.rpc/request! host args))]
                            (async/put! ch res))
-              ::notify! (apply e.p.rpc/notify! host args)
-              ::response! (apply e.p.rpc/response! host args)
-              ::flush! (e.p.rpc/flush! host)
+              ::notify! (apply e.p.h.rpc/notify! host args)
+              ::response! (apply e.p.h.rpc/response! host args)
+              ::flush! (e.p.h.rpc/flush! host)
+
               ::call-function (let [[ch & args] args
                                     res (async/<! (apply e.p.rpc/call-function host args))]
                                 (async/put! ch res))
@@ -47,24 +49,24 @@
   (set-host! [_ host]
     (reset! host-store host))
 
-  e.p.rpc/IHost
+  e.p.h.rpc/IRpc
   (request! [_ content]
     (if-let [host @host-store]
-      (e.p.rpc/request! host content)
+      (e.p.h.rpc/request! host content)
       (let [ch (async/promise-chan)]
         (async/put! host-channel [::request! ch content])
         ch)))
   (notify! [_ content]
     (if-let [host @host-store]
-      (e.p.rpc/notify! host content)
+      (e.p.h.rpc/notify! host content)
       (async/put! host-channel [::notify! content])))
   (response! [_ id error result]
     (if-let [host @host-store]
-      (e.p.rpc/response! host id error result)
+      (e.p.h.rpc/response! host id error result)
       (async/put! host-channel [::response! id error result])))
   (flush! [_]
     (if-let [host @host-store]
-      (e.p.rpc/flush! host)
+      (e.p.h.rpc/flush! host)
       (async/put! host-channel [::flush!])))
 
   e.p.rpc/IFunction

src/elin/component/server.clj

@@ -34,10 +34,10 @@
                         (catch Exception ex
                           [nil (ex-message ex)]))]
         (when (e.p.h.rpc/request? message)
-          (e.p.rpc/response! host
-                             (:id (e.p.h.rpc/parse-message message))
-                             err res)
-          (e.p.rpc/flush! host))))))
+          (e.p.h.rpc/response! host
+                               (:id (e.p.h.rpc/parse-message message))
+                               err res)
+          (e.p.h.rpc/flush! host))))))
 
 (defrecord Server
   [;; COMPONENTS

src/elin/component/server/nvim.clj

@@ -53,7 +53,7 @@
 
 (defrecord NvimHost
   [output-stream response-manager]
-  e.p.rpc/IHost
+  e.p.h.rpc/IRpc
   (request! [_ content]
     (let [id (e.u.id/next-id)
           ch (async/promise-chan)]
@@ -79,20 +79,20 @@
 
   e.p.rpc/IFunction
   (call-function [this method params]
-    (e.p.rpc/request! this ["nvim_call_function" [method params]]))
+    (e.p.h.rpc/request! this ["nvim_call_function" [method params]]))
 
   (notify-function [this method params]
-    (e.p.rpc/notify! this ["nvim_call_function" [method params]]))
+    (e.p.h.rpc/notify! this ["nvim_call_function" [method params]]))
 
   (echo-text [this text]
-    (e.p.rpc/notify! this ["nvim_echo" [[[text "Normal"]] false {}]]))
+    (e.p.h.rpc/notify! this ["nvim_echo" [[[text "Normal"]] false {}]]))
   (echo-text [this text highlight]
-    (e.p.rpc/notify! this ["nvim_echo" [[[text highlight]] false {}]]))
+    (e.p.h.rpc/notify! this ["nvim_echo" [[[text highlight]] false {}]]))
 
   (echo-message [this text]
     (e.p.rpc/echo-message this text "Normal"))
   (echo-message [this text highlight]
-    (e.p.rpc/notify! this ["nvim_echo" [[[text highlight]] true {}]])))
+    (e.p.h.rpc/notify! this ["nvim_echo" [[[text highlight]] true {}]])))
 
 (defn start-server
   [{:keys [host server-socket on-accept stop-signal]}]

src/elin/component/server/vim.clj

@@ -52,7 +52,7 @@
 
 (defrecord VimHost
   [output-stream response-manager]
-  e.p.rpc/IHost
+  e.p.h.rpc/IRpc
   (request! [_ [method :as content]]
     (let [id (cond
                (= "call" method) (nth content 3)
@@ -76,20 +76,20 @@
 
   e.p.rpc/IFunction
   (call-function [this method params]
-    (e.p.rpc/request! this ["call" method params (e.u.id/next-id)]))
+    (e.p.h.rpc/request! this ["call" method params (e.u.id/next-id)]))
 
   (notify-function [this method params]
-    (e.p.rpc/notify! this ["call" method params]))
+    (e.p.h.rpc/notify! this ["call" method params]))
 
   (echo-text [this text]
     (e.p.rpc/echo-text this text "Normal"))
   (echo-text [this text highlight]
-    (e.p.rpc/notify! this ["call" "elin#internal#echo" [text highlight]]))
+    (e.p.h.rpc/notify! this ["call" "elin#internal#echo" [text highlight]]))
 
   (echo-message [this text]
     (e.p.rpc/echo-message this text "Normal"))
   (echo-message [this text highlight]
-    (e.p.rpc/notify! this ["call" "elin#internal#echom" [text highlight]])))
+    (e.p.h.rpc/notify! this ["call" "elin#internal#echom" [text highlight]])))
 
 (defn start-server
   [{:keys [host server-socket on-accept stop-signal]}]

src/elin/protocol/host/rpc.clj

@@ -4,3 +4,9 @@
   (request? [this])
   (response? [this])
   (parse-message [this]))
+
+(defprotocol IRpc
+  (request! [this content])
+  (notify! [this content])
+  (response! [this id error result])
+  (flush! [this]))

src/elin/protocol/rpc.clj

@@ -3,12 +3,6 @@
 (defprotocol ILazyHost
   (set-host! [this host]))
 
-(defprotocol IHost
-  (request! [this content])
-  (notify! [this content])
-  (response! [this id error result])
-  (flush! [this]))
-
 (defprotocol IFunction
   (call-function [this method params])
   (notify-function [this method params])

test/elin/component/lazy_host_test.clj

@@ -3,6 +3,7 @@
    [clojure.core.async :as async]
    [clojure.test :as t]
    [com.stuartsierra.component :as component]
+   [elin.protocol.host.rpc :as e.p.h.rpc]
    [elin.protocol.rpc :as e.p.rpc]
    [elin.system :as e.system]
    [elin.test-helper :as h]))
@@ -17,9 +18,9 @@
         host (h/test-host {:handler #(do (swap! wrote conj %)
                                          "OK")})]
     (try
-      (e.p.rpc/notify! lazy-host ["before"])
+      (e.p.h.rpc/notify! lazy-host ["before"])
       (e.p.rpc/set-host! lazy-host host)
-      (e.p.rpc/notify! lazy-host ["after"])
+      (e.p.h.rpc/notify! lazy-host ["after"])
 
       (t/is (= [[2 "after"]] @wrote))
 

test/elin/test_helper/host.clj

@@ -1,6 +1,7 @@
 (ns elin.test-helper.host
   (:require
    [clojure.core.async :as async]
+   [elin.protocol.host.rpc :as e.p.h.rpc]
    [elin.protocol.rpc :as e.p.rpc]
    [elin.schema.server :as e.s.server]
    [elin.test-helper.message :as h.message]
@@ -9,7 +10,7 @@
 
 (defrecord TestHost ; {{{
   [host-store outputs option]
-  e.p.rpc/IHost
+  e.p.h.rpc/IRpc
   (request! [_ content]
     (let [id (e.u.id/next-id)
           {:keys [handler]} option
@@ -32,7 +33,7 @@
 
   e.p.rpc/IFunction
   (call-function [this method params]
-    (e.p.rpc/request! this ["test_call_function" [method params]]))
+    (e.p.h.rpc/request! this ["test_call_function" [method params]]))
 
   (echo-text [_ text]
     (swap! outputs conj text))