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

[bugfix] Return raw ZIO response body where applicable #3047

Merged
merged 3 commits into from
Jul 20, 2023
Merged

[bugfix] Return raw ZIO response body where applicable #3047

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c0a109
Return raw ZIO response body where applicable
kciesielski Jul 19, 2023
c403756
Remove reduntant val
kciesielski Jul 20, 2023
0f9a918
Make ZioHttpBodyListener private
kciesielski Jul 20, 2023
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
22 changes: 13 additions & 9 deletions server/zio-http-server/src/main/scala/sttp/tapir/server/ziohttp/ZioHttpBodyListener.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,19 @@ import scala.util.{Failure, Success, Try}
class ZioHttpBodyListener[R] extends BodyListener[RIO[R, *], ZioHttpResponseBody] {
override def onComplete(body: ZioHttpResponseBody)(cb: Try[Unit] => RIO[R, Unit]): RIO[R, ZioHttpResponseBody] =
ZIO
.environmentWith[R]
.environmentWithZIO[R]
.apply { r =>
val (stream, contentLength) = body
(
stream.onError(cause => cb(Failure(cause.squash)).orDie.provideEnvironment(r)) ++ ZStream
.fromZIO(cb(Success(())))
.provideEnvironment(r)
.drain,
contentLength
)
body match {
case ZioStreamHttpResponseBody(stream, contentLength) =>
ZIO.succeed(ZioStreamHttpResponseBody(
stream.onError(cause => cb(Failure(cause.squash)).orDie.provideEnvironment(r)) ++ ZStream
.fromZIO(cb(Success(())))
.provideEnvironment(r)
.drain,
contentLength
)
)
case raw: ZioRawHttpResponseBody => cb(Success(())).provideEnvironment(r).map(_ => raw)
}
}
}
11 changes: 8 additions & 3 deletions server/zio-http-server/src/main/scala/sttp/tapir/server/ziohttp/ZioHttpInterpreter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ trait ZioHttpInterpreter[R] {
{
case RequestResult.Response(resp) =>
val baseHeaders = resp.headers.groupBy(_.name).flatMap(sttpToZioHttpHeader).toList
val allHeaders = resp.body match {
case Some((_, Some(contentLength))) if resp.contentLength.isEmpty =>
val allHeaders = resp.body.flatMap(_.contentLength) match {
case Some(contentLength) if resp.contentLength.isEmpty =>
ZioHttpHeader.ContentLength(contentLength) :: baseHeaders
case _ => baseHeaders
}
Expand All @@ -53,7 +53,12 @@ trait ZioHttpInterpreter[R] {
Response(
status = Status.fromInt(statusCode).getOrElse(Status.Custom(statusCode)),
headers = ZioHttpHeaders(allHeaders),
body = resp.body.map { case (stream, _) => Body.fromStream(stream) }.getOrElse(Body.empty)
body = resp.body
.map {
case ZioStreamHttpResponseBody(stream, _) => Body.fromStream(stream)
case ZioRawHttpResponseBody(chunk, _) => Body.fromChunk(chunk)
}
.getOrElse(Body.empty)
)
)
case RequestResult.Failure(_) =>
Expand Down
13 changes: 13 additions & 0 deletions server/zio-http-server/src/main/scala/sttp/tapir/server/ziohttp/ZioHttpResponseBody.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package sttp.tapir.server.ziohttp

import zio.stream.ZStream
import zio.Chunk

private[ziohttp] sealed trait ZioHttpResponseBody {
def contentLength: Option[Long]
}

private[ziohttp] case class ZioStreamHttpResponseBody(stream: ZStream[Any, Throwable, Byte], val contentLength: Option[Long])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[minor] is the val needed? it is a case class?

extends ZioHttpResponseBody

private[ziohttp] case class ZioRawHttpResponseBody(bytes: Chunk[Byte], val contentLength: Option[Long]) extends ZioHttpResponseBody
25 changes: 15 additions & 10 deletions server/zio-http-server/src/main/scala/sttp/tapir/server/ziohttp/ZioHttpToResponseBody.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import sttp.tapir.{CodecFormat, RawBodyType, WebSocketBodyOutput}
import zio.Chunk
import zio.stream.ZStream

import java.nio.ByteBuffer
import java.nio.charset.Charset

class ZioHttpToResponseBody extends ToResponseBody[ZioHttpResponseBody, ZioStreams] {
Expand All @@ -20,33 +21,37 @@ class ZioHttpToResponseBody extends ToResponseBody[ZioHttpResponseBody, ZioStrea
headers: HasHeaders,
format: CodecFormat,
charset: Option[Charset]
): ZioHttpResponseBody = (v, None)
): ZioHttpResponseBody = ZioStreamHttpResponseBody(v, None)

override def fromWebSocketPipe[REQ, RESP](
pipe: streams.Pipe[REQ, RESP],
o: WebSocketBodyOutput[streams.Pipe[REQ, RESP], REQ, RESP, _, ZioStreams]
): ZioHttpResponseBody =
(ZStream.empty, None) // TODO
ZioStreamHttpResponseBody(ZStream.empty, None) // TODO

private def rawValueToEntity[R](bodyType: RawBodyType[R], r: R): ZioHttpResponseBody = {
bodyType match {
case RawBodyType.StringBody(charset) =>
val bytes = r.toString.getBytes(charset)
(ZStream.fromIterable(bytes), Some(bytes.length.toLong))
case RawBodyType.ByteArrayBody => (ZStream.fromChunk(Chunk.fromArray(r)), Some((r: Array[Byte]).length.toLong))
case RawBodyType.ByteBufferBody => (ZStream.fromChunk(Chunk.fromByteBuffer(r)), None)
case RawBodyType.InputStreamBody => (ZStream.fromInputStream(r), None)
ZioRawHttpResponseBody(Chunk.fromArray(bytes), Some(bytes.length.toLong))
case RawBodyType.ByteArrayBody =>
ZioRawHttpResponseBody(Chunk.fromArray(r), Some((r: Array[Byte]).length.toLong))
case RawBodyType.ByteBufferBody =>
val buffer: ByteBuffer = r
ZioRawHttpResponseBody(Chunk.fromByteBuffer(buffer), Some(buffer.remaining()))
case RawBodyType.InputStreamBody =>
ZioStreamHttpResponseBody(ZStream.fromInputStream(r), None)
case RawBodyType.InputStreamRangeBody =>
r.range
.map(range => (ZStream.fromInputStream(r.inputStreamFromRangeStart()).take(range.contentLength), Some(range.contentLength)))
.getOrElse((ZStream.fromInputStream(r.inputStream()), None))
.map(range => ZioStreamHttpResponseBody(ZStream.fromInputStream(r.inputStreamFromRangeStart()).take(range.contentLength), Some(range.contentLength)))
.getOrElse(ZioStreamHttpResponseBody(ZStream.fromInputStream(r.inputStream()), None))
case RawBodyType.FileBody =>
val tapirFile = r
tapirFile.range
.flatMap { r =>
r.startAndEnd.map { s =>
var count = 0L
(
ZioStreamHttpResponseBody(
ZStream
.fromPath(tapirFile.file.toPath)
.dropWhile(_ =>
Expand All @@ -58,7 +63,7 @@ class ZioHttpToResponseBody extends ToResponseBody[ZioHttpResponseBody, ZioStrea
)
}
}
.getOrElse((ZStream.fromPath(tapirFile.file.toPath), Some(tapirFile.file.length)))
.getOrElse(ZioStreamHttpResponseBody(ZStream.fromPath(tapirFile.file.toPath), Some(tapirFile.file.length)))
case RawBodyType.MultipartBody(_, _) => throw new UnsupportedOperationException("Multipart is not supported")
}
}
Expand Down
8 changes: 0 additions & 8 deletions server/zio-http-server/src/main/scala/sttp/tapir/server/ziohttp/package.scala
View file
Open in desktop

This file was deleted.