gered/clj-browserchannel
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add clientside browserchannel OSID/OAID param support for new sessions

Browse source
This commit is contained in:
Gered 2016-05-16 13:23:22 -04:00
parent 767a22ab09
commit 8d953d4057
1 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
clj-browserchannel/src/net/thegeez/browserchannel/client.cljs
View file

@ -174,22 +174,30 @@
(.disconnect (get-channel)))) (.disconnect (get-channel))))
(defn- connect-channel! (defn- connect-channel!
[{:keys [on-opening] :as events} {:keys [base] :as options}] [{:keys [on-opening] :as events}
{:keys [base] :as options}
{:keys [old-session-id last-array-id] :as connect-args}]
(let [state (channel-state)] (let [state (channel-state)]
(when (or (= state :closed) (when (or (= state :closed)
(= state :init)) (= state :init))
(.connect (get-channel) (.connect (get-channel)
(str base "/test") (str base "/test")
(str base "/bind")) (str base "/bind")
nil
old-session-id
; -1 is the default value set by goog.net.BrowserChannel
; not really sure that passing in -1 is a good idea though
; (that is, i don't think -1 ever gets passed in the AID param)
(if-not (= -1 last-array-id) last-array-id))
(if on-opening (on-opening))))) (if on-opening (on-opening)))))
(defn- reconnect! (defn- reconnect!
[events handler options] [events handler options connect-args]
(set-new-channel!) (set-new-channel!)
(increase-reconnect-attempt-counter!) (increase-reconnect-attempt-counter!)
(.setHandler (get-channel) handler) (.setHandler (get-channel) handler)
(apply-options! options) (apply-options! options)
(connect-channel! events options)) (connect-channel! events options connect-args))
(defn- raise-context-callbacks! (defn- raise-context-callbacks!
[array callback-k] [array callback-k]
@ -208,19 +216,21 @@
(if on-open (on-open)))) (if on-open (on-open))))
(set! (.-channelClosed handler) (set! (.-channelClosed handler)
(fn [_ pending undelivered] (fn [_ pending undelivered]
(let [last-error (:last-error @state) (let [last-error (:last-error @state)
due-to-error? (and last-error due-to-error? (and last-error
(not (some #{last-error} [:stop :ok])))] (not (some #{last-error} [:stop :ok])))
session-timeout? (= last-error :unknown-session-id)]
(when (and (:auto-reconnect? options) (when (and (:auto-reconnect? options)
due-to-error? due-to-error?
(< (:reconnect-counter @state) (< (:reconnect-counter @state)
(dec (:max-reconnect-attempts options)))) (dec (:max-reconnect-attempts options))))
(clear-reconnect-timer!) (clear-reconnect-timer!)
(js/setTimeout (js/setTimeout
#(reconnect! events handler options) #(reconnect! events handler options
(if (= last-error :unknown-session-id) (if-not session-timeout?
0 {:old-session-id (.getSessionId (get-channel))
(:reconnect-time options)))) :last-array-id (.getLastArrayId (get-channel))}))
(if session-timeout? 0 (:reconnect-time options))))
(when due-to-error? (when due-to-error?
(raise-context-callbacks! pending :on-error) (raise-context-callbacks! pending :on-error)
(raise-context-callbacks! undelivered :on-error)) (raise-context-callbacks! undelivered :on-error))
@ -324,4 +334,4 @@
(set-new-channel!) (set-new-channel!)
(.setHandler (get-channel) (->browserchannel-handler events options)) (.setHandler (get-channel) (->browserchannel-handler events options))
(apply-options! options) (apply-options! options)
(connect-channel! events options))) (connect-channel! events options nil)))