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

Streaming API error handling/reporting improvements #5141

Merged
merged 7 commits into from
Mar 24, 2020
Merged

Streaming API error handling/reporting improvements #5141

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cce9bbc
Streaming API error handling
leo-da Mar 23, 2020
b20bd4e
Stopping the stream after emitting the 1st error
leo-da Mar 24, 2020
2e82315
Cleaning up test cases, stricter type for non empty streaming fetch
leo-da Mar 24, 2020
3caa2bf
Update docs.
leo-da Mar 24, 2020
cc621fe
a few words about warnings in the Streaming API
leo-da Mar 24, 2020
b54224f
a few words about warnings in the Streaming API
leo-da Mar 24, 2020
50f66c7
Updating command formatting in the JavaScript example.
leo-da Mar 24, 2020
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
Prev Previous commit
Next Next commit
Stopping the stream after emitting the 1st error
  • Loading branch information
@leo-da
leo-da committed Mar 24, 2020
commit b20bd4ecf91edaf83b9aabe4861b17afb39348a8
14 changes: 9 additions & 5 deletions ledger-service/http-json/src/main/scala/com/digitalasset/http/WebSocketService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package com.digitalasset.http

import akka.NotUsed
import akka.http.scaladsl.model.ws.{Message, TextMessage}
import akka.stream.scaladsl.{Flow, Source}
import akka.http.scaladsl.model.ws.{Message, TextMessage, BinaryMessage}
import akka.stream.scaladsl.{Flow, Source, Sink}
import akka.stream.Materializer
import com.digitalasset.http.EndpointsCompanion._
import com.digitalasset.http.domain.{JwtPayload, SearchForeverRequest}
Expand Down Expand Up @@ -268,6 +268,7 @@ class WebSocketService(
extends LazyLogging {

import WebSocketService._
import Statement.discard
import util.ErrorOps._
import com.digitalasset.http.json.JsonProtocol._

Expand Down Expand Up @@ -319,9 +320,11 @@ class WebSocketService(
msg.toStrict(config.maxDuration).map { m =>
SprayJson.parse(m.text).liftErr(InvalidUserInput)
}
case _ =>
Future successful -\/(
InvalidUserInput("Cannot process your input, Expect a single JSON message"))
case bm: BinaryMessage =>
// ignore binary messages but drain content to avoid the stream being clogged
discard { bm.dataStream.runWith(Sink.ignore) }
Future successful -\/(InvalidUserInput(
"Invalid request. Expected a single TextMessage with JSON payload, got BinaryMessage"))
}
.via(withOptPrefix(ejv => ejv.toOption flatMap readStartingOffset))
.map {
Expand All @@ -337,6 +340,7 @@ class WebSocketService(
case (offPrefix, a) => getTransactionSourceForParty[A](jwt, jwtPayload, offPrefix, a)
}
}
.takeWhile(_.isRight, inclusive = true) // stop after emitting 1st error
.flatMapConcat {
case \/-(s) => s
case -\/(e) => Source.single(wsErrorMessage(e))
Expand Down