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

Optimize byte array operations in Http4sRequestBody #3772

Merged
merged 5 commits into from
May 20, 2024
Merged

Optimize byte array operations in Http4sRequestBody #3772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4267131
Optimize byte array operations in Http4sRequestBody
kciesielski May 17, 2024
2df81a9
Organize imports
kciesielski May 17, 2024
9659fab
Remove prefixes
kciesielski May 17, 2024
ee6f27c
Use more efficient .string instead of .foldMonoid
kciesielski May 17, 2024
ccd1e79
Handle wrapped exception
kciesielski May 17, 2024
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
6 changes: 4 additions & 2 deletions server/core/src/main/scala/sttp/tapir/server/interceptor/exception/ExceptionHandler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ object ExceptionHandler {

case class DefaultExceptionHandler[F[_]](response: (StatusCode, String) => ValuedEndpointOutput[_]) extends ExceptionHandler[F] {
override def apply(ctx: ExceptionContext)(implicit monad: MonadError[F]): F[Option[ValuedEndpointOutput[_]]] =
ctx.e match {
case StreamMaxLengthExceededException(maxBytes) =>
(ctx.e, ctx.e.getCause()) match {
case (StreamMaxLengthExceededException(maxBytes), _) =>
monad.unit(Some(response(StatusCode.PayloadTooLarge, s"Payload limit (${maxBytes}B) exceeded")))
case (_, StreamMaxLengthExceededException(maxBytes)) =>
monad.unit(Some(response(StatusCode.PayloadTooLarge, s"Payload limit (${maxBytes}B) exceeded")))
case _ =>
monad.unit(Some(response(StatusCode.InternalServerError, "Internal server error")))
Expand Down
21 changes: 10 additions & 11 deletions server/http4s-server/src/main/scala/sttp/tapir/server/http4s/Http4sRequestBody.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@ import cats.effect.{Async, Sync}
import cats.syntax.all._
import fs2.Chunk
import fs2.io.file.Files
import fs2.io.toInputStreamResource
import fs2.text.decodeWithCharset
import org.http4s.headers.{`Content-Disposition`, `Content-Type`}
import org.http4s.{Charset, EntityDecoder, Request, multipart}
import org.http4s.{Charset, EntityDecoder, Headers, Media, Request, multipart}
import sttp.capabilities.fs2.Fs2Streams
import sttp.model.{Header, Part}
import sttp.tapir.model.ServerRequest
import sttp.tapir.server.interpreter.{RawValue, RequestBody}
import sttp.tapir.{FileRange, InputStreamRange, RawBodyType, RawPart}

import java.io.ByteArrayInputStream
import org.http4s.Media
import org.http4s.Headers

private[http4s] class Http4sRequestBody[F[_]: Async](
serverOptions: Http4sServerOptions[F]
) extends RequestBody[F, Fs2Streams[F]] {
Expand All @@ -42,12 +40,13 @@ private[http4s] class Http4sRequestBody[F[_]: Async](

bodyType match {
case RawBodyType.StringBody(defaultCharset) =>
asByteArray.map(new String(_, charset.map(_.nioCharset).getOrElse(defaultCharset))).map(RawValue(_))
case RawBodyType.ByteArrayBody => asByteArray.map(RawValue(_))
case RawBodyType.ByteBufferBody => asChunk.map(c => RawValue(c.toByteBuffer))
case RawBodyType.InputStreamBody => asByteArray.map(b => RawValue(new ByteArrayInputStream(b)))
case RawBodyType.InputStreamRangeBody => asByteArray.map(b => RawValue(InputStreamRange(() => new ByteArrayInputStream(b))))

body.through(decodeWithCharset(charset.map(_.nioCharset).getOrElse(defaultCharset))).compile.string.map(RawValue(_))
case RawBodyType.ByteArrayBody => asByteArray.map(RawValue(_))
case RawBodyType.ByteBufferBody => asChunk.map(c => RawValue(c.toByteBuffer))
case RawBodyType.InputStreamBody =>
toInputStreamResource(body).allocated.map { case (is, _) => RawValue(is) }
case RawBodyType.InputStreamRangeBody =>
toInputStreamResource(body).allocated.map { case (is, _) => RawValue(InputStreamRange(() => is)) }
case RawBodyType.FileBody =>
serverOptions.createFile(serverRequest).flatMap { file =>
val fileSink = Files[F].writeAll(file.toPath)
Expand Down
Loading