[nop] Misc housekeeping

Author: ptaoussanis

src/taoensso/sente.cljc

@@ -80,9 +80,10 @@
   (:require
    [clojure.string     :as str]
    [clojure.core.async :as async :refer [<! >! put! chan go go-loop]]
-   [taoensso.encore    :as enc   :refer [have have! have? swap-in! reset-in! swapped]]
+   [taoensso.encore    :as enc   :refer [swap-in! reset-in! swapped]]
+   [taoensso.truss     :as truss]
    [taoensso.timbre    :as timbre]
-   [taoensso.sente.interfaces :as interfaces])
+   [taoensso.sente.interfaces :as i])
 
   #?(:cljs (:require-macros [taoensso.sente :as sente-macros :refer [elide-require]]))
   #?(:clj  (:import [org.java_websocket.client WebSocketClient])))
@@ -207,7 +208,7 @@
   [packer packed]
   (let [[clj ?cb-uuid]
         (try
-          (interfaces/unpack packer packed)
+          (i/unpack packer packed)
           (catch #?(:clj Throwable :cljs :default) t
             (timbre/errorf t "Failed to unpack: %s" packed)
             [[:chsk/bad-package packed] nil]))
@@ -220,7 +221,7 @@
   "[clj ?cb-uuid]->packed"
   ([packer clj         ] (pack packer clj nil))
   ([packer clj ?cb-uuid]
-   (interfaces/pack packer
+   (i/pack packer
      (if-some [cb-uuid (if (= ?cb-uuid :ajax-cb) 0 ?cb-uuid)]
        [clj cb-uuid]
        [clj        ]))))
@@ -230,7 +231,7 @@
     (pack default-edn-packer [:foo])))
 
 (deftype EdnPacker []
-  interfaces/IPacker
+  i/IPacker
   (pack   [_ x] (enc/pr-edn   x))
   (unpack [_ s] (enc/read-edn s)))
 
@@ -239,15 +240,15 @@
 (defn- coerce-packer [x]
   (if (= x :edn)
     default-edn-packer
-    (have #(satisfies? interfaces/IPacker %) x)))
+    (truss/have #(satisfies? i/IPacker %) x)))
 
 (comment
   (do
     (require '[taoensso.sente.packers.transit :as transit])
     (def ^:private default-transit-json-packer (transit/get-transit-packer)))
 
-  (let [pack   interfaces/pack
-        unpack interfaces/unpack
+  (let [pack   i/pack
+        unpack i/unpack
         data   {:a :A :b :B :c "hello world"}]
 
     (enc/qb 1e4 ; [111.96 67.26]
@@ -405,8 +406,8 @@
               packer :edn
               allowed-origins :all}}]]
 
-  (have? enc/pos-int? send-buf-ms-ajax send-buf-ms-ws)
-  (have? #(satisfies? interfaces/IServerChanAdapter %) web-server-ch-adapter)
+  (truss/have? enc/pos-int? send-buf-ms-ajax send-buf-ms-ws)
+  (truss/have? #(satisfies? i/IServerChanAdapter %) web-server-ch-adapter)
 
   (let [max-ms default-client-side-ajax-timeout-ms]
     (when (>= lp-timeout-ms max-ms)
@@ -415,7 +416,7 @@
           {:lp-timeout-ms lp-timeout-ms
            :default-client-side-ajax-timeout-ms max-ms}))))
 
-  (let [allowed-origins (have [:or set? #{:all}] allowed-origins)
+  (let [allowed-origins (truss/have [:or set? #{:all}] allowed-origins)
         packer  (coerce-packer packer)
         ch-recv (chan recv-buf-or-n)
 
@@ -430,7 +431,7 @@
         connected-uids_ (atom {:ws #{} :ajax #{} :any #{}}) ; Public
 
         connect-uid!?
-        (fn [conn-type uid] {:pre [(have? uid)]}
+        (fn [conn-type uid] {:pre [(truss/have? uid)]}
           (let [newly-connected?
                 (swap-in! connected-uids_ []
                   (fn [{:keys [ws ajax any] :as old-m}]
@@ -447,7 +448,7 @@
             newly-connected?))
 
         maybe-disconnect-uid!?
-        (fn [uid] {:pre [(have? uid)]}
+        (fn [uid] {:pre [(truss/have? uid)]}
           (let [newly-disconnected?
                 (swap-in! connected-uids_ []
                   (fn [{:keys [ws ajax any] :as old-m}]
@@ -501,8 +502,8 @@
                                (swapped m nil)))))]
 
                     (let [[buffered-evs ev-uuids] pulled]
-                      (have? vector? buffered-evs)
-                      (have? set?    ev-uuids)
+                      (truss/have? vector? buffered-evs)
+                      (truss/have? set?    ev-uuids)
 
                       (let [packed-buffered-evs (pack packer buffered-evs)]
                         (send-buffered-server-evs>clients! conn-type
@@ -516,10 +517,10 @@
                   (flush-buffer! :ajax))
 
                 (doseq [[?sch _udt] (vals (get-in @conns_ [:ws uid]))]
-                  (when-let [sch ?sch] (interfaces/sch-close! sch)))
+                  (when-let [sch ?sch] (i/sch-close! sch)))
 
                 (doseq [[?sch _udt] (vals (get-in @conns_ [:ajax uid]))]
-                  (when-let [sch ?sch] (interfaces/sch-close! sch))))
+                  (when-let [sch ?sch] (i/sch-close! sch))))
 
               (do
                 ;; Buffer event
@@ -622,7 +623,7 @@
         (enc/cond
           :if-let [resp (possible-rejection-resp ring-req)] resp
           :else
-          (interfaces/ring-req->server-ch-resp web-server-ch-adapter ring-req
+          (i/ring-req->server-ch-resp web-server-ch-adapter ring-req
             {:ring-async-resp-fn  ?ring-async-resp-fn
              :ring-async-raise-fn ?ring-async-raise-fn
 
@@ -641,7 +642,7 @@
                              (lid (user-id-fn ring-req client-id) client-id)
                              resp-clj)
 
-                           (interfaces/sch-send! server-ch websocket?
+                           (i/sch-send! server-ch websocket?
                              (pack packer resp-clj)))))]
 
                  (put-server-event-msg>ch-recv! ch-recv
@@ -704,7 +705,7 @@
                             [:chsk/handshake [uid nil]]
                             [:chsk/handshake [uid nil ?handshake-data]])]
                       ;; Returns true iff server-ch open during call
-                      (interfaces/sch-send! server-ch websocket?
+                      (i/sch-send! server-ch websocket?
                         (pack packer handshake-ev))))
 
                   on-error
@@ -729,7 +730,7 @@
                           ;; Auto reply to ping
                           (when-let [cb-uuid ?cb-uuid]
                             (timbre/debugf "[ws/on-msg] Server will auto-reply to ping from %s" lid*)
-                            (interfaces/sch-send! server-ch websocket?
+                            (i/sch-send! server-ch websocket?
                               (pack packer "pong" cb-uuid)))
 
                           (receive-event-msg! clj nil))
@@ -741,7 +742,7 @@
                               (timbre/debugf "[ws/on-msg] Server will reply to message from %s: %s" lid* resp-clj)
 
                               ;; true iff apparent success:
-                              (interfaces/sch-send! server-ch websocket?
+                              (i/sch-send! server-ch websocket?
                                 (pack packer resp-clj ?cb-uuid))))))))
 
                   on-close
@@ -826,9 +827,9 @@
 
                                       {:keys [recur? udt ms-timeout expecting-pong? force-close?]}
                                       (enc/cond
-                                        (nil? ?conn-entry)                                     {:recur? false}
-                                        (not= conn-id conn-id*)                                {:recur? false}
-                                        (when-let [sch ?sch] (not (interfaces/sch-open? sch))) {:recur? false, :force-close? true}
+                                        (nil? ?conn-entry)                            {:recur? false}
+                                        (not= conn-id conn-id*)                       {:recur? false}
+                                        (when-let [sch ?sch] (not (i/sch-open? sch))) {:recur? false, :force-close? true}
 
                                         (not= udt-t0 udt-t1) ; Activity in last kalive window
                                         {:recur? true, :udt udt-t1, :ms-timeout ws-kalive-ms, :expecting-pong? false}
@@ -838,7 +839,7 @@
                                         expecting-pong?
                                         (do
                                           ;; Was expecting pong (=> activity) in last kalive window
-                                          (interfaces/sch-close! server-ch)
+                                          (i/sch-close! server-ch)
                                           {:recur? false})
 
                                         :else
@@ -847,7 +848,7 @@
                                                  ;; conn's :on-close immediately, i.e. no need to wait
                                                  ;; for a missed pong.
                                                  ping-apparently-sent?
-                                                 (interfaces/sch-send! server-ch websocket?
+                                                 (i/sch-send! server-ch websocket?
                                                    (pack packer :chsk/ws-ping))]
 
                                           (if ws-ping-timeout-ms
@@ -897,14 +898,14 @@
                                 (when-let [[_?sch _udt conn-id*] (get-in @conns_ [:ajax uid client-id])]
                                   (when (= conn-id conn-id*)
                                     (timbre/debugf "[ajax/on-open] Polling timeout for %s" lid*)
-                                    (interfaces/sch-send! server-ch websocket?
+                                    (i/sch-send! server-ch websocket?
                                       (pack packer :chsk/timeout))))))
 
                             (when (connect-uid!? :ajax uid)
                               (timbre/infof "[ajax/on-open] uid port open for %s" lid*)
                               (receive-event-msg! [:chsk/uidport-open uid])))))))]
 
-              (interfaces/ring-req->server-ch-resp web-server-ch-adapter ring-req
+              (i/ring-req->server-ch-resp web-server-ch-adapter ring-req
                 {:ring-async-resp-fn  ?ring-async-resp-fn
                  :ring-async-raise-fn ?ring-async-raise-fn
                  :on-open             on-open
@@ -926,7 +927,7 @@
   "Actually pushes buffered events (as packed-str) to all uid's conns.
   Allows some time for possible reconnects."
   [conn-type conns_ uid packed-buffered-evs n-buffered-evs]
-  (have? [:el #{:ajax :ws}] conn-type)
+  (truss/have? [:el #{:ajax :ws}] conn-type)
   (let [;; Mean max wait time: sum*1.5 = 2790*1.5 = 4.2s
         ms-backoffs [90 180 360 720 720 720] ; => max 1+6 attempts
         websocket?  (= conn-type :ws)
@@ -942,7 +943,7 @@
                                       (when-let [[?sch _udt conn-id] (get-in @conns_ [conn-type uid client-id])]
                                         (when-let [sch ?sch]
                                           (when-not (simulated-bad-conn?)
-                                            (when (interfaces/sch-send! sch websocket? packed-buffered-evs)
+                                            (when (i/sch-send! sch websocket? packed-buffered-evs)
                                               conn-id))))]
 
                              (swap-in! conns_ [conn-type uid client-id]
@@ -1072,8 +1073,8 @@
              open-changed?)))))
 
    (defn- chsk-state->closed [state reason]
-     (have? map? state)
-     (have?
+     (truss/have? map? state)
+     (truss/have?
        [:el #{:clean :unexpected
               :requested-disconnect
               :requested-reconnect
@@ -1098,7 +1099,7 @@
      (if (or (nil? ?cb) (ifn? ?cb))
        ?cb
        (do
-         (have? enc/chan? ?cb)
+         (truss/have? enc/chan? ?cb)
          (assert-event ev)
          (let [[ev-id _] ev
                cb-ch ?cb]
@@ -1108,7 +1109,7 @@
                 reply]))))))
 
    (defn- receive-buffered-evs! [chs clj]
-     (let [buffered-evs (have vector? clj)]
+     (let [buffered-evs (truss/have vector? clj)]
 
        (timbre/tracef "Client received %s buffered evs from server: %s"
          (count buffered-evs)
@@ -1125,8 +1126,8 @@
        (let [[x1] x] (= x1 :chsk/handshake))))
 
    (defn- receive-handshake! [chsk-type chsk clj]
-     (have? [:el #{:ws :ajax}] chsk-type)
-     (have? handshake? clj)
+     (truss/have? [:el #{:ws :ajax}] chsk-type)
+     (truss/have? handshake? clj)
 
      (let [[_ [?uid _ ?handshake-data]] clj
            {:keys [chs ever-opened?_]} chsk
@@ -1349,7 +1350,7 @@
               packed (pack packer ev ?cb-uuid)]
 
           (when-let [cb-uuid ?cb-uuid]
-            (reset-in! cbs-waiting_ [cb-uuid] (have ?cb-fn))
+            (reset-in! cbs-waiting_ [cb-uuid] (truss/have ?cb-fn))
             (when-let [timeout-ms ?timeout-ms]
               (go
                 (<! (async/timeout timeout-ms))
@@ -1371,7 +1372,7 @@
             (do
               (when-let [cb-uuid ?cb-uuid]
                 (let [cb-fn* (or (pull-unused-cb-fn! cbs-waiting_ cb-uuid)
-                                 (have ?cb-fn))]
+                                 (truss/have ?cb-fn))]
                   (cb-fn* :chsk/error)))
 
               (-chsk-reconnect! chsk :ws-error)
@@ -1792,7 +1793,7 @@
 
    (defn- get-chsk-url [protocol host path type]
      (let [protocol (case protocol :http "http:" :https "https:" protocol)
-           protocol (have [:el #{"http:" "https:"}] protocol)
+           protocol (truss/have [:el #{"http:" "https:"}] protocol)
            protocol (case type
                       :ajax     protocol
                       :ws (case protocol "https:" "wss:" "http:" "ws:"))]
@@ -1855,8 +1856,8 @@
 
        _deprecated-more-opts]]
 
-     (have? [:in #{:ajax :ws :auto}] type)
-     (have? enc/nblank-str? client-id)
+     (truss/have? [:in #{:ajax :ws :auto}] type)
+     (truss/have? enc/nblank-str? client-id)
 
      (when (not (nil? _deprecated-more-opts)) (timbre/warnf "`make-channel-socket-client!` fn signature CHANGED with Sente v0.10.0."))
      (when (contains? opts :lp-timeout)       (timbre/warnf ":lp-timeout opt has CHANGED; please use :lp-timout-ms."))
@@ -1870,7 +1871,7 @@
            (let [;; Not available with React Native, etc.
                  ;; Must always provide explicit path for Java client.
                  win-loc  #?(:clj nil :cljs (enc/get-win-loc))
-                 path     (have (or path (:pathname win-loc)))]
+                 path     (truss/have (or path (:pathname win-loc)))]
 
              (if-let [f (:chsk-url-fn opts)] ; Deprecated
                [(f path win-loc :ws)
@@ -2008,8 +2009,8 @@
                   (when trace-evs? (timbre/tracef "Chsk router pre-handler event: %s" event))
                   (event-msg-handler
                     (if server?
-                      (have! server-event-msg? event-msg)
-                      (have! client-event-msg? event-msg)))
+                      (truss/have! server-event-msg? event-msg)
+                      (truss/have! client-event-msg? event-msg)))
 
                   (catch :all t1
                     (enc/try*

src/taoensso/sente/interfaces.cljc

@@ -1,8 +1,5 @@
 (ns taoensso.sente.interfaces
-  "Alpha, subject to change.
-  Public interfaces / extension points.
-  Ref. https://github.com/ptaoussanis/sente/issues/425 for more info."
-  (:require [taoensso.encore :as enc]))
+  "Public interfaces / extension points.")
 
 ;;;; Web servers
 

src/taoensso/sente/packers/transit.cljc

@@ -1,12 +1,10 @@
 (ns taoensso.sente.packers.transit
-  "Alpha - subject to change!
-  Optional Transit-format[1] IPacker implementation for use with Sente.
+  "Optional Transit-format[1] IPacker implementation for use with Sente.
   [1] https://github.com/cognitect/transit-format."
   {:author "Peter Taoussanis, @ckarlsen84"}
   (:require
-   [clojure.string    :as str]
-   [taoensso.encore   :as enc :refer [have have! have?]]
-   [taoensso.timbre   :as timbre]
+   [taoensso.encore   :as enc]
+   [taoensso.truss    :as truss]
    [cognitect.transit :as transit]
    [taoensso.sente.interfaces :as interfaces
     :refer [pack unpack]])
@@ -90,8 +88,8 @@
   ([transit-fmt] (get-transit-packer transit-fmt {} {}))
   ([transit-fmt writer-opts reader-opts]
    ;; No transit-cljs support for msgpack atm
-   (have? [:el #{:json :json-verbose #_:msgpack}] transit-fmt)
-   (have? map? writer-opts reader-opts)
+   (truss/have? [:el #{:json :json-verbose #_:msgpack}] transit-fmt)
+   (truss/have? map? writer-opts reader-opts)
    (TransitPacker. transit-fmt writer-opts reader-opts)))
 
 (comment