Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Emit a socket closed event in a non-async socket loop #67

Merged
merged 1 commit into from
Jul 9, 2024
Merged

Emit a socket closed event in a non-async socket loop #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/ws/server.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

(defmethod start-connection ((server server) &key)
(unless (eq (ready-state server) :connecting)
(return-from start-connection))
(return-from start-connection))

(let ((socket (socket server)))
(setf (read-callback socket)
Expand All @@ -81,7 +81,8 @@
while frame
do (funcall (read-callback socket) frame))
(close-connection server)
(setf (ready-state server) :closed)))))
(setf (ready-state server) :closed)
(wsd:emit :close server :code 1006 :reason "websocket connection closed")))))

(defmethod close-connection ((server server) &optional (reason "") (code (error-code :normal-closure)))
(setf (ready-state server) :closing)
Expand All @@ -101,11 +102,11 @@
:code code
:masking nil)))
(handler-case
(write-sequence-to-socket (socket server) frame
:callback callback)
(write-sequence-to-socket (socket server) frame
:callback callback)
(error ()
(setf (ready-state server) :closed)
(wsd:emit :close server :code 1006 :reason "websocket connection closed")))))
(wsd:emit :close server :code 1006 :reason "websocket connection closed")))))

(defmethod send-handshake-response ((server server) &key callback)
(let ((socket (socket server))
Expand Down