Sync housekeeping

Author: ptaoussanis

example-project/project.clj

@@ -16,7 +16,7 @@
    [org.clojure/tools.nrepl   "0.2.12"] ; Optional, for Cider
 
    [com.taoensso/sente        "1.10.0-SNAPSHOT"] ; <--- Sente
-   [com.taoensso/timbre       "4.6.0"]
+   [com.taoensso/timbre       "4.7.2"]
 
    ;;; TODO Choose (uncomment) a supported web server -----------------------
    [http-kit                             "2.2.0"] ; Default

project.clj

@@ -13,9 +13,9 @@
   :dependencies
   [[org.clojure/clojure      "1.5.1"]
    [org.clojure/core.async   "0.2.385"]
-   [com.taoensso/encore      "2.64.1"]
+   [com.taoensso/encore      "2.67.1"]
    [org.clojure/tools.reader "0.10.0"]
-   [com.taoensso/timbre      "4.6.0"]]
+   [com.taoensso/timbre      "4.7.2"]]
 
   :plugins [[lein-cljsbuild "1.1.3"]
             ;;

src/taoensso/sente.cljc

@@ -79,11 +79,12 @@
 
   #?(:cljs
      (:require-macros
-      [cljs.core.async.macros :as asyncm :refer (go go-loop)])))
+      [cljs.core.async.macros :as asyncm :refer (go go-loop)]
+      [taoensso.sente :as sente-macros :refer (elide-require)])))
 
 (if (vector? taoensso.encore/encore-version)
-  (enc/assert-min-encore-version [2 53 1])
-  (enc/assert-min-encore-version  2.53))
+  (enc/assert-min-encore-version [2 67 1])
+  (enc/assert-min-encore-version  2.67))
 
 #?(:cljs (def ^:private node-target? (= *target* "nodejs")))
 
@@ -124,7 +125,7 @@
 (defn client-event-msg? [x]
   (and
     (map? x)
-    (enc/keys= x #{:ch-recv :send-fn :state :event :id :?data})
+    (enc/ks= #{:ch-recv :send-fn :state :event :id :?data} x)
     (let [{:keys [ch-recv send-fn state event]} x]
       (and
         (enc/chan? ch-recv)
@@ -135,9 +136,9 @@
 (defn server-event-msg? [x]
   (and
     (map? x)
-    (enc/keys= x #{:ch-recv :send-fn :connected-uids
-                   :ring-req :client-id
-                   :event :id :?data :?reply-fn :uid})
+    (enc/ks= #{:ch-recv :send-fn :connected-uids
+               :ring-req :client-id
+               :event :id :?data :?reply-fn :uid} x)
     (let [{:keys [ch-recv send-fn connected-uids
                   ring-req client-id event ?reply-fn]} x]
       (and
@@ -768,7 +769,7 @@
    (defn- assert-send-args [x ?timeout-ms ?cb]
      (assert-event x)
      (assert (or (and (nil? ?timeout-ms) (nil? ?cb))
-                 (and (enc/nneg-int? ?timeout-ms)))
+                 (and (enc/nat-int? ?timeout-ms)))
              (str "cb requires a timeout; timeout-ms should be a +ive integer: " ?timeout-ms))
      (assert (or (nil? ?cb) (ifn? ?cb) (enc/chan? ?cb))
              (str "cb should be nil, an ifn, or a channel: " (type ?cb)))))
@@ -829,7 +830,7 @@
                cb-ch ?cb]
            (fn [reply]
              (put! cb-ch
-               [(keyword (str (enc/fq-name ev-id) ".cb"))
+               [(keyword (str (enc/as-qname ev-id) ".cb"))
                 reply])))))))
 
 #?(:cljs
@@ -877,13 +878,14 @@
 
        :handled)))
 
-(defmacro ^:private elide-require
-  "Experimental. The presence of `js/require` calls can cause issues with
-  React Native, even if they never execute. Currently no other known
-  workarounds. Ref. https://github.com/ptaoussanis/sente/issues/247."
-  [& body]
-  (when-not (enc/get-sys-val "SENTE_ELIDE_JS_REQUIRE")
-    `(do ~@body)))
+#?(:clj
+   (defmacro ^:private elide-require
+    "Experimental. The presence of `js/require` calls can cause issues with
+    React Native, even if they never execute. Currently no other known
+    workarounds. Ref. https://github.com/ptaoussanis/sente/issues/247."
+     [& body]
+     (when-not (enc/get-sys-val "SENTE_ELIDE_JS_REQUIRE")
+       `(do ~@body))))
 
 #?(:cljs
    (def ^:private ?node-npm-websocket_
@@ -1463,23 +1465,21 @@
             stop? (= p ch-ctrl)]
 
         (when-not stop?
-          (let [{:as event-msg :keys [event]} v
-                [_ ?error]
-                (enc/catch-errors
-                  (when trace-evs? (tracef "Pre-handler event: %s" event))
-                  (event-msg-handler
-                    (if server?
-                      (have! server-event-msg? event-msg)
-                      (have! client-event-msg? event-msg))))]
-
-            (when-let [e ?error]
-              (let [[_ ?error2]
-                    (enc/catch-errors
-                      (if-let [eh error-handler]
-                        (error-handler e event-msg)
-                        (errorf e "Chsk router `event-msg-handler` error: %s" event)))]
-                (when-let [e2 ?error2]
-                  (errorf e2 "Chsk router `error-handler` error: %s" event))))
+          (let [{:as event-msg :keys [event]} v]
+
+            (enc/catching
+              (do
+                (when trace-evs? (tracef "Pre-handler event: %s" event))
+                (event-msg-handler
+                  (if server?
+                    (have! server-event-msg? event-msg)
+                    (have! client-event-msg? event-msg))))
+              e1
+              (enc/catching
+                (if-let [eh error-handler]
+                  (error-handler e1 event-msg)
+                  (errorf e1 "Chsk router `event-msg-handler` error: %s" event))
+                e2 (errorf e2 "Chsk router `error-handler` error: %s" event)))
 
             (recur)))))
 
@@ -1525,30 +1525,31 @@
 
 ;;;; Deprecated
 
-#?(:clj
-   (defn start-chsk-router-loop!
-     "DEPRECATED: Please use `start-chsk-router!` instead"
-     [event-msg-handler ch-recv]
-     (start-server-chsk-router! ch-recv
-       ;; Old handler form: (fn [ev-msg ch-recv])
-       (fn [ev-msg] (event-msg-handler ev-msg (:ch-recv ev-msg))))))
+(enc/deprecated
+  #?(:clj
+     (defn start-chsk-router-loop!
+       "DEPRECATED: Please use `start-chsk-router!` instead"
+       [event-msg-handler ch-recv]
+       (start-server-chsk-router! ch-recv
+         ;; Old handler form: (fn [ev-msg ch-recv])
+         (fn [ev-msg] (event-msg-handler ev-msg (:ch-recv ev-msg))))))
 
-#?(:cljs
-   (defn start-chsk-router-loop!
-     "DEPRECATED: Please use `start-chsk-router!` instead"
-     [event-handler ch-recv]
-     (start-client-chsk-router! ch-recv
-       ;; Old handler form: (fn [ev ch-recv])
-       (fn [ev-msg] (event-handler (:event ev-msg) (:ch-recv ev-msg))))))
+  #?(:cljs
+     (defn start-chsk-router-loop!
+       "DEPRECATED: Please use `start-chsk-router!` instead"
+       [event-handler ch-recv]
+       (start-client-chsk-router! ch-recv
+         ;; Old handler form: (fn [ev ch-recv])
+         (fn [ev-msg] (event-handler (:event ev-msg) (:ch-recv ev-msg))))))
 
-(def set-logging-level! "DEPRECATED. Please use `timbre/set-level!` instead" timbre/set-level!)
+  (def set-logging-level! "DEPRECATED. Please use `timbre/set-level!` instead" timbre/set-level!)
 
-#?(:cljs (def ajax-call "DEPRECATED: Please use `ajax-lite` instead" enc/ajax-lite))
-#?(:cljs
-   (def default-chsk-url-fn "DEPRECATED"
-     (fn [path {:as location :keys [protocol host pathname]} websocket?]
-       (let [protocol
-             (if websocket?
-               (if (= protocol "https:") "wss:" "ws:")
-               protocol)]
-         (str protocol "//" host (or path pathname))))))
+  #?(:cljs (def ajax-call "DEPRECATED: Please use `ajax-lite` instead" enc/ajax-lite))
+  #?(:cljs
+     (def default-chsk-url-fn "DEPRECATED"
+       (fn [path {:as location :keys [protocol host pathname]} websocket?]
+         (let [protocol
+               (if websocket?
+                 (if (= protocol "https:") "wss:" "ws:")
+                 protocol)]
+           (str protocol "//" host (or path pathname)))))))

src/taoensso/sente/server_adapters/dogfort.cljs

@@ -2,14 +2,16 @@
   "Sente server adapter for Node.js with Dog Fort
   (https://github.com/whamtet/dogfort)."
   {:author "Matthew Molloy <@whamtet>"}
-  (:require [taoensso.sente.server-adapters.generic-node :as generic-node]))
+  (:require
+   [taoensso.encore :as enc :refer-macros ()]
+   [taoensso.sente.server-adapters.generic-node :as generic-node]))
 
 (defn get-sch-adapter
   "Dogfort doesn't need anything special, can just use the `generic-node-ws`
   adapter."
   [] (generic-node/get-sch-adapter))
 
-(do ; DEPRECATED
+(enc/deprecated
   ;; These are stateful, could be problematic?
   (def dogfort-adapter "Deprecated" (get-sch-adapter))
   (def sente-web-server-adapter "Deprecated" dogfort-adapter))

src/taoensso/sente/server_adapters/generic_node.cljs

@@ -6,9 +6,10 @@
        https://github.com/theasp/sente-nodejs-example."
   {:author "Andrew Phillips <@theasp>, Matthew Molloy <@whamtet>"}
   (:require
-   [taoensso.sente.interfaces :as i]
+   [taoensso.encore :as enc :refer-macros ()]
    [taoensso.timbre :as timbre
-    :refer-macros (tracef debugf infof warnf errorf)]))
+    :refer-macros (tracef debugf infof warnf errorf)]
+   [taoensso.sente.interfaces :as i]))
 
 (defn- ws-open? [ws] (= (.-readyState ws) (.-OPEN ws)))
 
@@ -94,7 +95,7 @@
 
 (defn get-sch-adapter [] (GenericNodeServerChanAdapter.))
 
-(do ; DEPRECATED
+(enc/deprecated
   ;; These are stateful, could be problematic?
   (def generic-node-adapter "Deprecated" (get-sch-adapter))
   (def sente-web-server-adapter "Deprecated" generic-node-adapter))

src/taoensso/sente/server_adapters/http_kit.clj

@@ -1,8 +1,10 @@
 (ns taoensso.sente.server-adapters.http-kit
   "Sente server adapter for http-kit (http://www.http-kit.org/)."
   {:author "Peter Taoussanis (@ptaoussanis)"}
-  (:require [taoensso.sente.interfaces :as i]
-            [org.httpkit.server :as hk]))
+  (:require
+   [taoensso.encore :as enc]
+   [taoensso.sente.interfaces :as i]
+   [org.httpkit.server :as hk]))
 
 (extend-type org.httpkit.server.AsyncChannel
   i/IServerChan
@@ -29,6 +31,6 @@
 
 (defn get-sch-adapter [] (HttpKitServerChanAdapter.))
 
-(do ; DEPRECATED
+(enc/deprecated
   (def http-kit-adapter "Deprecated" (get-sch-adapter))
   (def sente-web-server-adapter "Deprecated" http-kit-adapter))

src/taoensso/sente/server_adapters/immutant.clj

@@ -1,8 +1,10 @@
 (ns taoensso.sente.server-adapters.immutant
   "Sente server adapter for Immutant v2+ (http://immutant.org/)."
   {:author "Toby Crawley (@tobias)"}
-  (:require [taoensso.sente.interfaces :as i]
-            [immutant.web.async :as imm]))
+  (:require
+   [taoensso.encore :as enc]
+   [taoensso.sente.interfaces :as i]
+   [immutant.web.async :as imm]))
 
 (extend-type org.projectodd.wunderboss.web.async.Channel
   i/IServerChan
@@ -30,7 +32,7 @@
 
 (defn get-sch-adapter [] (ImmutantServerChanAdapter.))
 
-(do ; DEPRECATED
+(enc/deprecated
   (defn make-immutant-adapter "Deprecated" [_opts] (get-sch-adapter))
   (def immutant-adapter "Deprecated" (get-sch-adapter))
   (def sente-web-server-adapter immutant-adapter))

src/taoensso/sente/server_adapters/nginx_clojure.clj

@@ -2,8 +2,10 @@
   "Sente server adapter for Nginx-Clojure v0.4.2+
   (http://nginx-clojure.github.io/)."
   {:author "Zhang Yuexiang (@xfeep)"}
-  (:require [taoensso.sente.interfaces :as i]
-            [nginx.clojure.core :as ncc]))
+  (:require
+   [taoensso.encore :as enc]
+   [taoensso.sente.interfaces :as i]
+   [nginx.clojure.core :as ncc]))
 
 (def ^:dynamic *max-message-size*
   nginx.clojure.WholeMessageAdapter/DEFAULT_MAX_MESSAGE_SIZE)
@@ -47,6 +49,6 @@
 
 (defn get-sch-adapter [] (NginxServerChanAdapter.))
 
-(do ; DEPRECATED
+(enc/deprecated
   (def nginx-clojure-adapter (get-sch-adapter))
   (def sente-web-server-adapter nginx-clojure-adapter))