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

Use Json directly to encode response in Http4sAdapter #71

Merged
merged 1 commit into from
Nov 8, 2019
Merged

Use Json directly to encode response in Http4sAdapter #71

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
62 changes: 47 additions & 15 deletions http4s/src/main/scala/caliban/Http4sAdapter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import cats.effect.syntax.all._
import cats.~>
import fs2.{ Pipe, Stream }
import io.circe.derivation.deriveDecoder
import io.circe.parser.{ decode, parse }
import io.circe.{ Decoder, Json }
import io.circe._
import io.circe.parser._
import io.circe.syntax._
import org.http4s._
import org.http4s.circe.CirceEntityCodec._
import org.http4s.dsl.Http4sDsl
Expand All @@ -25,6 +26,24 @@ object Http4sAdapter {

implicit val queryDecoder: Decoder[GraphQLRequest] = deriveDecoder[GraphQLRequest]

private def responseToJson(responseValue: ResponseValue): Json =
responseValue match {
case ResponseValue.NullValue => Json.Null
case ResponseValue.IntValue(value) => Json.fromLong(value)
case ResponseValue.FloatValue(value) => Json.fromDoubleOrString(value)
case ResponseValue.StringValue(value) => Json.fromString(value)
case ResponseValue.BooleanValue(value) => Json.fromBoolean(value)
case ResponseValue.EnumValue(value) => Json.fromString(value)
case ResponseValue.ListValue(values) => Json.arr(values.map(responseToJson): _*)
case ObjectValue(fields) => Json.obj(fields.map { case (k, v) => k -> responseToJson(v) }: _*)
case s: StreamValue => Json.fromString(s.toString)
}

implicit val resultEncoder: Encoder[ResponseValue] = (response: ResponseValue) =>
Json.obj("data" -> responseToJson(response))
implicit val errorEncoder: Encoder[CalibanError] = (err: CalibanError) =>
Json.obj("errors" -> Json.arr(Json.fromString(err.toString)))

private def jsonToValue(json: Json): Value =
json.fold(
Value.NullValue,
Expand Down Expand Up @@ -53,14 +72,9 @@ object Http4sAdapter {
HttpRoutes.of[RIO[R, *]] {
case req @ POST -> Root =>
for {
query <- req.attemptAs[GraphQLRequest].value.absolve
result <- execute(interpreter, query)
.fold(
err => s"""{"errors":["${err.toString.replace("\"", "'")}"]}""",
result => s"""{"data":$result}"""
)
json <- Task.fromEither(parse(result))
response <- Ok(json)
query <- req.attemptAs[GraphQLRequest].value.absolve
result <- execute(interpreter, query).fold(_.asJson, _.asJson)
response <- Ok(result)
} yield response
}
}
Expand All @@ -73,9 +87,19 @@ object Http4sAdapter {
def sendMessage(
sendQueue: fs2.concurrent.Queue[RIO[R, *], WebSocketFrame],
id: String,
data: String
data: ResponseValue
): RIO[R, Unit] =
sendQueue.enqueue1(WebSocketFrame.Text(s"""{"id":"$id","type":"data","payload":{"data":$data}}"""))
sendQueue.enqueue1(
WebSocketFrame.Text(
Json
.obj(
"id" -> Json.fromString(id),
"type" -> Json.fromString("data"),
"payload" -> Json.obj("data" -> responseToJson(data))
)
.noSpaces
)
)

def processMessage(
sendQueue: fs2.concurrent.Queue[RIO[R, *], WebSocketFrame],
Expand All @@ -100,17 +124,25 @@ object Http4sAdapter {
_ <- result match {
case ObjectValue((fieldName, StreamValue(stream)) :: Nil) =>
stream.foreach { item =>
sendMessage(sendQueue, id, ObjectValue(List(fieldName -> item)).toString)
sendMessage(sendQueue, id, ObjectValue(List(fieldName -> item)))
}.fork.flatMap(fiber => subscriptions.update(_.updated(id, fiber)))
case other =>
sendMessage(sendQueue, id, other.toString) *> sendQueue.enqueue1(
sendMessage(sendQueue, id, other) *> sendQueue.enqueue1(
WebSocketFrame.Text(s"""{"type":"complete","id":"$id"}""")
)
}
} yield ()).catchAll(
error =>
sendQueue.enqueue1(
WebSocketFrame.Text(s"""{"type":"complete","id":"$id","payload":"${error.toString}"}""")
WebSocketFrame.Text(
Json
.obj(
"id" -> Json.fromString(id),
"type" -> Json.fromString("complete"),
"payload" -> Json.fromString(error.toString)
)
.noSpaces
)
)
)
}
Expand Down