zilti
/
spiffy-websockets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Checking that the websocket is still open before pinging or timeing 

out the connection.
This commit is contained in:
Thomas Hintz 2014-10-17 07:19:34 -07:00
parent 3fd9e266a1
commit 4bb341913f
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
websockets.scm
View File

@ -488,7 +488,8 @@
(begin (begin
(send-frame ws 'connection-close (send-frame ws 'connection-close
(u8vector 3 (close-reason->close-code close-reason)) (u8vector 3 (close-reason->close-code close-reason))
#t))))))) #t))))
"close timeout thread")))
(thread-start! close-thread) (thread-start! close-thread)
(if (> (close-timeout) 0) (if (> (close-timeout) 0)
(unless (thread-join! close-thread (close-timeout) #f) (unless (thread-join! close-thread (close-timeout) #f)
@ -540,8 +541,10 @@
(lambda () (lambda ()
(let loop () (let loop ()
(thread-sleep! (ping-interval)) (thread-sleep! (ping-interval))
(send-message "" 'ping ws) (when (eq? (websocket-state ws) 'open)
(loop)))))) (send-message "" 'ping ws)
(loop))))
"ping thread")))
; make sure the request meets the spec for websockets ; make sure the request meets the spec for websockets
(cond ((not (and (eq? (header-value 'connection headers #f) 'upgrade) (cond ((not (and (eq? (header-value 'connection headers #f) 'upgrade)
@ -572,14 +575,16 @@
; Add one to attempt to alleviate checking the timestamp ; Add one to attempt to alleviate checking the timestamp
; right before when the timeout should happen. ; right before when the timeout should happen.
(thread-sleep! (+ 1 (connection-timeout))) (thread-sleep! (+ 1 (connection-timeout)))
(if (< (- (time->seconds (current-time)) (when (eq? (websocket-state ws) 'open)
(time->seconds (websocket-last-message-timestamp ws))) (if (< (- (time->seconds (current-time))
(connection-timeout)) (time->seconds (websocket-last-message-timestamp ws)))
(loop) (connection-timeout))
(begin (thread-signal! (websocket-user-thread ws) (loop)
(make-websocket-exception (begin (thread-signal!
(make-property-condition 'connection-timeout))) (websocket-user-thread ws)
(close-websocket ws close-reason: 'going-away)))))))) (make-websocket-exception
(make-property-condition 'connection-timeout)))
(close-websocket ws close-reason: 'going-away)))))))))
(when (> (ping-interval) 0) (when (> (ping-interval) 0)
(thread-start! ping-thread)) (thread-start! ping-thread))