Skip to content

Use maxUnanswered parameter in ws pings #18

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use maxUnanswered parameter in ws pings #18

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
9 changes: 4 additions & 5 deletions src/main/scala/spinoco/fs2/http/websocket/WebSocket.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ object WebSocket {
case fin: FiniteDuration => time.awakeEvery[F](fin).map { _ => () }
case inf => Stream.empty
}
val control = controlStream(pingPongQ.dequeue, metronome, maxUnanswered = 3, flag = client2Server)
val control = controlStream(pingPongQ.dequeue, metronome, maxUnanswered = 3)

source
.through(decodeWebSocketFrame[F](maxFrameSize, client2Server))
Expand Down Expand Up @@ -402,17 +402,16 @@ object WebSocket {
pingPongs: Stream[F, PingPong]
, metronome: Stream[F, Unit]
, maxUnanswered: Int
, flag: Boolean
)(implicit F: Async[F]): Stream[F, WebSocketFrame] = {
(pingPongs either metronome)
.mapAccumulate(0) { case (pingsSent, in) => in match {
case Left(PingPong.Pong) => (0, Stream.empty)
case Left(PingPong.Ping) => (pingsSent, Stream.emit(pongFrame))
case Right(_) => (pingsSent + 1, Stream.emit(pingFrame))
}}
.flatMap { case (unconfirmed, out) =>
if (unconfirmed < 3) out
else Stream.fail(new Throwable(s"Maximum number of unconfirmed pings exceeded: $unconfirmed"))
.flatMap { case (unanswered, out) =>
if (unanswered < maxUnanswered) out
else Stream.fail(new Throwable(s"Maximum number of unanswered pings exceeded: $unanswered"))
}
}

Expand Down