Skip to content

Extract WebSocket#do_ping, #do_close helper methods for overrides #15545

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

Merged
straight-shoota merged 3 commits into from
Apr 18, 2025
Merged

Extract WebSocket#do_ping, #do_close helper methods for overrides #15545

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9db4f2
Avoids duplicate responses to ping frames
luislavena Mar 8, 2025
a444127
Extract implicit actions around ping and close events
luislavena Apr 8, 2025
277f6e1
Remove default on_ping callback definition
luislavena Apr 9, 2025
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
16 changes: 12 additions & 4 deletions src/http/web_socket.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,7 @@ class HTTP::WebSocket
@current_message.write @buffer[0, info.size]
if info.final
message = @current_message.to_s
@on_ping.try &.call(message)
pong(message) unless closed?
do_ping(message)
@current_message.clear
end
in .pong?
Expand Down Expand Up @@ -197,8 +196,7 @@ class HTTP::WebSocket
end
message = @current_message.gets_to_end

@on_close.try &.call(code, message)
close
do_close(code, message)

@current_message.clear
break
Expand All @@ -208,6 +206,16 @@ class HTTP::WebSocket
end
end
end

private def do_close(code, message)
@on_close.try &.call(code, message)
close
end

private def do_ping(message)
@on_ping.try &.call(message)
pong(message) unless closed?
end
end

require "./web_socket/*"
Loading