send-response

src/modular/ws/core.clj

@@ -40,26 +40,6 @@
       (doseq [uid uids]
         (send! this uid data)))))
 
-;; REPLY
-
-(defn send-response [{:as ev-msg :keys [id ?data ring-req ?reply-fn uid send-fn]}
-                     msg-type response]
-  ;(let [session (:session ring-req)
-        ;uid (:uid session)
-   ;     ]
-  ;(when (nil? ?reply-fn)
-   ; (warn "reply-fn is nil. the client did chose to use messenging communication istead of req-res communication."))
-    ;(warn "ws/session: " session)
-    ;(if (nil? uid)
-    ;  (warn "ws request uid is nil. ring-session not configured correctly.")
-    ;  (info "ws/uid: " uid))
-  (if (and msg-type response)
-    (cond
-      ?reply-fn (?reply-fn [msg-type response])
-      uid (send-fn uid [msg-type response])
-      :else (error "Cannot send ws-response: neither ?reply-fn nor uid was set!"))
-    (error "Can not send ws-response - msg-type and response have to be set, msg-type:" msg-type "response: " response)))
-
 ;; WATCH
 
 (defn connected-uids [this]

src/modular/ws/msg_handler.clj

@@ -1,13 +1,35 @@
 (ns modular.ws.msg-handler
   (:require
-   [taoensso.timbre :refer [tracef debug debugf info infof warn warnf error errorf]]
-   [modular.ws.core :refer [send-response]]))
+   [taoensso.timbre :refer [tracef debug debugf info infof warn warnf error errorf]]))
 
 (defn ws-reply [{:keys [event id ?data ring-req ?reply-fn send-fn] :as req}
                 res]
   (when ?reply-fn
     (?reply-fn res)))
 
+;; REPLY
+
+(defn send-response [{:as ev-msg :keys [id ?data ring-req ?reply-fn uid send-fn]}
+                     msg-type response]
+  ;(let [session (:session ring-req)
+        ;uid (:uid session)
+   ;     ]
+  ;(when (nil? ?reply-fn)
+   ; (warn "reply-fn is nil. the client did chose to use messenging communication istead of req-res communication."))
+    ;(warn "ws/session: " session)
+    ;(if (nil? uid)
+    ;  (warn "ws request uid is nil. ring-session not configured correctly.")
+    ;  (info "ws/uid: " uid))
+  (if (and msg-type response)
+    (cond
+      ?reply-fn (?reply-fn [msg-type response])
+      uid (send-fn uid [msg-type response])
+      :else (error "Cannot send ws-response: neither ?reply-fn nor uid was set!"))
+    (error "Can not send ws-response - msg-type and response have to be set, msg-type:" msg-type "response: " response)))
+
+
+
+
 (defmulti -event-msg-handler :id)
 
 (defmethod -event-msg-handler :chsk/uidport-open