From eff06cd8bb06ab7929c3ca694867bef240f8f356 Mon Sep 17 00:00:00 2001 From: liquidz Date: Mon, 22 Jan 2024 22:30:38 +0900 Subject: [PATCH] fix: Fix interceptors to use writer --- src/elin/interceptor/connect.clj | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/elin/interceptor/connect.clj b/src/elin/interceptor/connect.clj index 1b12da92..ae5e113a 100644 --- a/src/elin/interceptor/connect.clj +++ b/src/elin/interceptor/connect.clj @@ -1,15 +1,18 @@ (ns elin.interceptor.connect (:require [clojure.core.async :as async] + [elin.function.host :as e.f.host] [elin.protocol.rpc :as e.p.rpc] [elin.util.file :as e.u.file])) (def port-auto-detecting-interceptor {:name ::port-auto-detecting-interceptor - :enter (fn [{:as ctx :keys [cwd host port]}] + :enter (fn [{:as ctx :keys [elin host port]}] (if (and host port) ctx - (let [nrepl-port-file (e.u.file/find-file-in-parent-directories cwd ".nrepl-port") + (let [{:keys [writer]} elin + cwd (e.f.host/get-current-working-directory writer) + nrepl-port-file (e.u.file/find-file-in-parent-directories cwd ".nrepl-port") host' (or host "localhost") port' (some-> nrepl-port-file (slurp) @@ -18,13 +21,14 @@ (def output-channel-interceptor {:name ::output-channel-interceptor - :leave (fn [{:as ctx :keys [message client]}] + :leave (fn [{:as ctx :keys [elin client]}] (when client (async/go-loop [] - (let [ch (get-in client [:connection :output-channel]) + (let [{:keys [writer]} elin + ch (get-in client [:connection :output-channel]) {:keys [text]} (async/