Skip to content

Commit

Permalink
Merge pull request #5094 from armanbilge/firefox-readablestream-cancel
Browse files Browse the repository at this point in the history
Fix readable stream cancellation bug for Firefox
  • Loading branch information
rossabaker committed Aug 19, 2021
2 parents 415320f + 7c6c059 commit ea157f5
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion dom-core/src/main/scala/org/http4s/dom/package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,14 @@ package object dom {

private[dom] def closeReadableStream[F[_], A](rs: ReadableStream[A], exitCase: Resource.ExitCase)(
implicit F: Async[F]): F[Unit] = exitCase match {
case Resource.ExitCase.Succeeded => F.fromPromise(F.delay(rs.cancel(null))).void
case Resource.ExitCase.Succeeded =>
F.fromPromise {
F.delay {
// Best guess: Firefox internally locks a ReadableStream after it is "drained"
// This checks if the stream is locked before canceling it to avoid an error
if (!rs.locked) rs.cancel(null) else scalajs.js.Promise.resolve[Unit](())
}
}.void
case Resource.ExitCase.Errored(ex) =>
F.fromPromise(F.delay(rs.cancel(ex.getMessage()))).void
case Resource.ExitCase.Canceled =>
Expand Down

0 comments on commit ea157f5

Please sign in to comment.