deprecated sente/start-chsk-router-loop! replaced with sente/start-chsk-router!

matthiasn · matthiasn · commit 7eac6c5139f3 · 2014-09-11T13:34:13.000+02:00
diff --git a/Clojure-Websockets/src/clj/birdwatch/communicator.clj b/Clojure-Websockets/src/clj/birdwatch/communicator.clj
@@ -33,35 +33,20 @@
   (def connected-uids                connected-uids)) ; Watchable, read-only atom
 
 (defn- event-msg-handler
-  [{:as ev-msg :keys [ring-req event ?reply-fn]} _]
-  (let [session (:session ring-req)
-        [id data :as ev] event]
+  [{:as ev-msg :keys [event ?reply-fn]}]
+  (match event
+         [:cmd/percolate params] (p/start-percolator params)
+         [:cmd/query params]     (do
+                                   (log/info "Received query:" params)
+                                   (let [res (p/query params)] ; TODO: put request msg on channel for async handling
+                                     (chsk-send! (:uid params) [:tweet/prev-chunk res])))
+         [:cmd/missing params]   (put! c/tweet-missing-chan params)
+         [:chsk/ws-ping params]  () ; currently just do nothing with ping (no logging either)
+         :else                   (do (log/info "Unmatched event:" event)
+                                   (when-not (:dummy-reply-fn? (meta ?reply-fn))
+                                     (?reply-fn {:umatched-event-as-echoed-from-from-server event})))))
 
-    (match [id data]
-           ;; TODO: Match your events here, reply when appropriate <...>
-
-           [:cmd/percolate params]
-           (p/start-percolator params)
-
-           [:cmd/query params]
-           (do
-             (log/info "Received query:" params)
-             (let [res (p/query params)]
-               ;(doseq [t res] (chsk-send! (:uid params) [:some/tweet (:_source t)]))
-               (chsk-send! (:uid params) [:tweet/prev-chunk res])))
-
-           [:cmd/missing params]
-           (put! c/tweet-missing-chan params)
-
-           [:chsk/ws-ping params]
-           () ; currently just do nothing with ping (no logging either)
-
-           :else
-           (do (log/info "Unmatched event:" ev)
-             (when-not (:dummy-reply-fn? (meta ?reply-fn))
-               (?reply-fn {:umatched-event-as-echoed-from-from-server ev}))))))
-
-(defonce chsk-router (sente/start-chsk-router-loop! event-msg-handler ch-chsk))
+(defonce chsk-router (sente/start-chsk-router! ch-chsk event-msg-handler))
 
 ;; loop for matching connected clients with percolation matches and delivering those on the appropriate socket
 (go
diff --git a/Clojure-Websockets/src/cljs/birdwatch/communicator.cljs b/Clojure-Websockets/src/cljs/birdwatch/communicator.cljs
@@ -52,8 +52,8 @@
     (start-percolator)
     (load-prev)))
 
-(defn- event-handler [[id data :as ev] _]
-  (match [id data]
+(defn- event-handler [{:keys [event]}]
+  (match event
          [:chsk/state {:first-open? true}] (do (print "Socket established!") (start-search))
          [:chsk/state new-state]           (print "Chsk state change:" new-state)
          [:chsk/recv  payload]
@@ -64,10 +64,9 @@
                   [:tweet/prev-chunk prev-chunk] (do (put! c/prev-chunks-chan prev-chunk) (load-prev))
                   [:stats/users-count        uc] (put! c/user-count-chan uc)
                   [:stats/total-tweet-count ttc] (put! c/total-tweets-count-chan ttc)))
-         :else (print "Unmatched event: %s" ev)))
+         :else (print "Unmatched event: %s" event)))
 
-(defonce chsk-router
-  (sente/start-chsk-router-loop! event-handler ch-chsk))
+(defonce chsk-router (sente/start-chsk-router! ch-chsk event-handler))
 
 ; loop for sending messages about missing tweet to server
 (go-loop []
