michael/grub-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use root URL for WebSocket connection (because Heroku)

Browse source
This commit is contained in:
Nicholas Kariniemi 2014-01-12 17:39:57 +02:00
parent 3b7dc67b5f
commit 73d965f8f7
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/clj/grub/core.clj
View file

@ -29,7 +29,7 @@
(include-js @js-file)])) (include-js @js-file)]))
(defroutes routes (defroutes routes
(GET "/ws" [] ws/websocket-handler) (GET "/" [] ws/websocket-handler)
(GET "/" [] (index-page)) (GET "/" [] (index-page))
(GET "*/src/cljs/grub/:file" [file] (resp/file-response file {:root "src/cljs/grub"})) (GET "*/src/cljs/grub/:file" [file] (resp/file-response file {:root "src/cljs/grub"}))
(GET "/js/public/js/:file" [file] (resp/redirect (str "/js/" file))) (GET "/js/public/js/:file" [file] (resp/redirect (str "/js/" file)))

5
src/clj/grub/websocket.clj
View file

@ -50,7 +50,7 @@
(httpkit/send! ws-channel (str event)) (httpkit/send! ws-channel (str event))
(recur)))) (recur))))
(defn setup-new-connection [ws-channel] (defn set-up-new-connection [ws-channel]
(let [[ws-channel-id client-chan] (add-connected-client! ws-channel)] (let [[ws-channel-id client-chan] (add-connected-client! ws-channel)]
(println "Client connected:" (.toString ws-channel) (str "(" ws-channel-id ")")) (println "Client connected:" (.toString ws-channel) (str "(" ws-channel-id ")"))
(println (count @connected-clients) "client(s) connected") (println (count @connected-clients) "client(s) connected")
@ -59,7 +59,8 @@
(forward-other-events-to-client client-chan ws-channel))) (forward-other-events-to-client client-chan ws-channel)))
(defn websocket-handler [request] (defn websocket-handler [request]
(httpkit/with-channel request ws-channel (setup-new-connection ws-channel))) (when (:websocket? request)
(httpkit/with-channel request channel (set-up-new-connection channel))))
(defn get-other-client-channels [my-ws-channel-id] (defn get-other-client-channels [my-ws-channel-id]
(-> @connected-clients (-> @connected-clients

2
src/cljs/grub/websocket.cljs
View file

@ -31,7 +31,7 @@
(defn get-remote-chan [to-remote] (defn get-remote-chan [to-remote]
(let [server-url (str "ws://" (.-host (.-location js/document)) "/ws") (let [server-url (str "ws://" (.-host (.-location js/document)))
handler (goog.events.EventHandler.) handler (goog.events.EventHandler.)
remote-events (chan)] remote-events (chan)]
(reset! websocket* (goog.net.WebSocket.)) (reset! websocket* (goog.net.WebSocket.))