added feature: showing count of connected users in all clients

matthiasn · matthiasn · commit e8ed11613323 · 2014-09-02T14:17:45.000+02:00
diff --git a/Clojure-Websockets/resources/public/index-test.html b/Clojure-Websockets/resources/public/index-test.html
diff --git a/Clojure-Websockets/resources/public/index.html b/Clojure-Websockets/resources/public/index.html
@@ -40,6 +40,7 @@
                                     <li><a href="http://matthiasnehlsen.com/blog/2014/07/17/BirdWatch-in-ClojureScript/" target="_blank">Blog</a></li>
                                     <li><a href="https://github.com/matthiasn/BirdWatch" target="_blank">Project on GitHub</a></li>
                                     <li><a href="#" onclick="BirdWatch.legalStuff()">Legal stuff</a></li>
+                                    <li><a href="#">Connected: <strong id="users-count"></strong> users</a></li>
                                 </ul>
                             </li>
                         </ul>
diff --git a/Clojure-Websockets/src/clj/birdwatch/main.clj b/Clojure-Websockets/src/clj/birdwatch/main.clj
@@ -99,6 +99,14 @@
        (when (contains? matches (get @a/subscriptions uid))
          (chsk-send! uid [:tweet/new t]))))))
 
+;; loop sending stats about server to all connected clients
+(go
+ (while true
+   (<! (timeout 2000))
+   (let [uids (:any @connected-uids)]
+     (doseq [uid uids]
+       (chsk-send! uid [:stats/users-count (count uids)])))))
+
 (defn -main
   [& args]
   (tc/start-twitter-conn!)
diff --git a/Clojure-Websockets/src/cljs/birdwatch/core.cljs b/Clojure-Websockets/src/cljs/birdwatch/core.cljs
@@ -25,6 +25,7 @@
 ;;; Om components for the application are initialized here. Their implementation lives in the ui namespace.
 (om/root ui/tweets-view       state/app {:target (. js/document (getElementById "tweet-frame"))})
 (om/root ui/count-view        state/app {:target (. js/document (getElementById "tweet-count"))})
+(om/root ui/users-count-view  state/app {:target (. js/document (getElementById "users-count"))})
 (om/root ui/search-view       state/app {:target (. js/document (getElementById "search"))})
 (om/root ui/sort-buttons-view state/app {:target (. js/document (getElementById "sort-buttons"))})
 (om/root ui/pagination-view   state/app {:target (. js/document (getElementById "pagination"))})
diff --git a/Clojure-Websockets/src/cljs/birdwatch/tweets.cljs b/Clojure-Websockets/src/cljs/birdwatch/tweets.cljs
@@ -109,9 +109,6 @@
 (defn- event-handler [[id data :as ev] _]
   (match [id data]
 
-         [:some/tweetchunk chunk]
-         (put! prev-chunks-chan chunk)
-
          [:chsk/state {:first-open? true}]
          (do
            (print "Channel socket successfully established!")
@@ -130,7 +127,10 @@
                   [:tweet/prev-chunk chunk]
                   (do
                     (put! prev-chunks-chan chunk)
-                    (load-prev))))
+                    (load-prev))
+
+                  [:stats/users-count uc]
+                  (swap! state/app assoc :users-count uc) ))
 
          :else (print "Unmatched event: %s" ev)))
 
diff --git a/Clojure-Websockets/src/cljs/birdwatch/ui.cljs b/Clojure-Websockets/src/cljs/birdwatch/ui.cljs
@@ -16,6 +16,12 @@
     om/IRender
     (render [this] (dom/span nil (:count app)))))
 
+(defn users-count-view [app owner]
+  "rendering users counter"
+  (reify
+    om/IRender
+    (render [this] (dom/span nil (:users-count app)))))
+
 (def find-tweets {:by-id (util/tweets-by-order :tweets-map :by-id)
                   :by-followers (util/tweets-by-order :tweets-map :by-followers)
                   :by-retweets (util/tweets-by-order :retweets :by-retweets)
diff --git a/Clojure-Websockets/src/cljs/birdwatch/util.cljs b/Clojure-Websockets/src/cljs/birdwatch/util.cljs
@@ -71,9 +71,14 @@
 
 (defn initial-state []
   "function returning fresh application state"
-  {:count 0        :n 10            :retweets {}
-   :tweets-map {}  :search-text ""  :page 1
+  {:count 0
+   :n 10
+   :retweets {}
+   :tweets-map {}
+   :search-text ""
+   :page 1
    :search "*"
+   :users-count 0
    :sorted :by-rt-since-startup
    :by-followers (priority-map-by >)
    :by-retweets (priority-map-by >)
