Skip to content

Commit a636910

Browse files
committed
[#398][Fix] Expose :binary-type option via make-channel-socket-client!
Currently ~undocumented
1 parent 2a72543 commit a636910

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

src/taoensso/sente.cljc

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,8 +1141,7 @@
11411141
#?(:cljs
11421142
(defn- create-js-client-websocket!
11431143
[{:as opts
1144-
:keys [onerror-fn onmessage-fn onclose-fn binary-type
1145-
uri-str headers]}]
1144+
:keys [onerror-fn onmessage-fn onclose-fn uri-str headers binary-type]}]
11461145

11471146
(when-let [WebSocket
11481147
(or
@@ -1157,7 +1156,7 @@
11571156
;; Fires repeatedly (on each connection attempt) while server is down:
11581157
(aset "onclose" onclose-fn))
11591158

1160-
(when-let [bt binary-type] ; "arraybuffer" or "blob" (default)
1159+
(when-let [bt binary-type] ; "arraybuffer" or "blob" (js default)
11611160
(aset socket "binaryType" bt))
11621161

11631162
socket))))
@@ -1190,7 +1189,8 @@
11901189
backoff-ms-fn ; (fn [nattempt]) -> msecs
11911190
cbs-waiting_ ; {<cb-uuid> <fn> ...}
11921191
socket_
1193-
udt-last-comms_]
1192+
udt-last-comms_
1193+
ws-opts]
11941194

11951195
IChSocket
11961196
(-chsk-disconnect! [chsk reason]
@@ -1344,16 +1344,17 @@
13441344
?socket
13451345
(try
13461346
(create-websocket!
1347-
{:onerror-fn onerror-fn
1348-
:onmessage-fn onmessage-fn
1349-
:onclose-fn onclose-fn
1350-
:headers headers
1351-
:uri-str
1352-
(enc/merge-url-with-query-string url
1353-
(merge params ; 1st (don't clobber impl.):
1354-
{:client-id client-id
1355-
:csrf-token (get-client-csrf-token-str :dynamic
1356-
(:csrf-token @state_))}))})
1347+
(merge ws-opts
1348+
{:onerror-fn onerror-fn
1349+
:onmessage-fn onmessage-fn
1350+
:onclose-fn onclose-fn
1351+
:headers headers
1352+
:uri-str
1353+
(enc/merge-url-with-query-string url
1354+
(merge params ; 1st (don't clobber impl.):
1355+
{:client-id client-id
1356+
:csrf-token (get-client-csrf-token-str :dynamic
1357+
(:csrf-token @state_))}))}))
13571358

13581359
(catch #?(:clj Throwable :cljs :default) t
13591360
(errorf t "WebSocket error")
@@ -1687,7 +1688,7 @@
16871688
; w/in given msecs. Should be different to server's :ws-kalive-ms."
16881689

16891690
[path ?csrf-token-or-fn &
1690-
[{:keys [type protocol host port params headers recv-buf-or-n packer ws-kalive-ms
1691+
[{:keys [type protocol host port params headers recv-buf-or-n packer ws-kalive-ms ws-opts
16911692
client-id ajax-opts wrap-recv-evs? backoff-ms-fn]
16921693
:as opts
16931694
:or {type :auto
@@ -1754,7 +1755,8 @@
17541755
ws-chsk-opts
17551756
(merge common-chsk-opts
17561757
{:url ws-url
1757-
:backoff-ms-fn backoff-ms-fn})
1758+
:backoff-ms-fn backoff-ms-fn
1759+
:ws-opts ws-opts})
17581760

17591761
ajax-chsk-opts
17601762
(merge common-chsk-opts

0 commit comments

Comments
 (0)