Armeria

softwaremill · Dec 28, 2024 · e793de3 · e793de3
1 parent aa8823b
commit e793de3
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 8 deletions.
diff --git a/armeria-backend/fs2/src/main/scala/sttp/client4/armeria/fs2/ArmeriaFs2Backend.scala b/armeria-backend/fs2/src/main/scala/sttp/client4/armeria/fs2/ArmeriaFs2Backend.scala
@@ -12,9 +12,11 @@ import sttp.capabilities.fs2.Fs2Streams
 import sttp.client4.armeria.ArmeriaWebClient.newClient
 import sttp.client4.armeria.{AbstractArmeriaBackend, BodyFromStreamMessage}
 import sttp.client4.impl.cats.CatsMonadAsyncError
-import sttp.client4.wrappers.FollowRedirectsBackend
 import sttp.client4.{wrappers, BackendOptions, StreamBackend}
 import sttp.monad.MonadAsyncError
+import sttp.client4.compression.Compressor
+import sttp.client4.impl.fs2.DeflateFs2Compressor
+import sttp.client4.impl.fs2.GZipFs2Compressor
 
 private final class ArmeriaFs2Backend[F[_]: Async](client: WebClient, closeFactory: Boolean, dispatcher: Dispatcher[F])
     extends AbstractArmeriaBackend[F, Fs2Streams[F]](client, closeFactory, new CatsMonadAsyncError) {
@@ -41,6 +43,9 @@ private final class ArmeriaFs2Backend[F[_]: Async](client: WebClient, closeFacto
         },
       dispatcher
     )
+
+  override protected def compressors: List[Compressor[R]] =
+    List(new GZipFs2Compressor[F, R](), new DeflateFs2Compressor[F, R]())
 }
 
 object ArmeriaFs2Backend {

diff --git a/armeria-backend/src/main/scala/sttp/client4/armeria/AbstractArmeriaBackend.scala b/armeria-backend/src/main/scala/sttp/client4/armeria/AbstractArmeriaBackend.scala
@@ -39,6 +39,9 @@ import sttp.client4.internal.toByteArray
 import sttp.model._
 import sttp.monad.syntax._
 import sttp.monad.{Canceler, MonadAsyncError}
+import sttp.client4.compression.Compressor
+import sttp.client4.compression.GZipDefaultCompressor
+import sttp.client4.compression.DeflateDefaultCompressor
 
 abstract class AbstractArmeriaBackend[F[_], S <: Streams[S]](
     client: WebClient = WebClient.of(),
@@ -54,6 +57,8 @@ abstract class AbstractArmeriaBackend[F[_], S <: Streams[S]](
 
   protected def streamToPublisher(stream: streams.BinaryStream): Publisher[HttpData]
 
+  protected def compressors: List[Compressor[R]] = List(new GZipDefaultCompressor(), new DeflateDefaultCompressor())
+
   override def send[T](request: GenericRequest[T, R]): F[Response[T]] =
     monad.suspend(adjustExceptions(request)(execute(request)))
 
@@ -87,7 +92,7 @@ abstract class AbstractArmeriaBackend[F[_], S <: Streams[S]](
     } finally captor.close()
   }
 
-  private def requestToArmeria(request: GenericRequest[_, Nothing]): WebClientRequestPreparation = {
+  private def requestToArmeria(request: GenericRequest[_, R]): WebClientRequestPreparation = {
     val requestPreparation = client
       .prepare()
       .disablePathParams()
@@ -102,19 +107,24 @@ abstract class AbstractArmeriaBackend[F[_], S <: Streams[S]](
       requestPreparation.responseTimeoutMillis(Long.MaxValue)
     }
 
+    val (body, contentLength) = Compressor.compressIfNeeded(request, compressors)
+
     var customContentType: Option[ArmeriaMediaType] = None
     request.headers.foreach { header =>
-      if (header.name.equalsIgnoreCase(HeaderNames.ContentType)) {
+      if (header.is(HeaderNames.ContentType)) {
         // A Content-Type will be set with the body content
         customContentType = Some(ArmeriaMediaType.parse(header.value))
-      } else {
-        requestPreparation.header(header.name, header.value)
+      } else if (!header.is(HeaderNames.ContentLength)) {
+        val _ = requestPreparation.header(header.name, header.value)
       }
     }
+    contentLength.foreach { cl =>
+      requestPreparation.header(HeaderNames.ContentLength, cl.toString)
+    }
 
     val contentType = customContentType.getOrElse(ArmeriaMediaType.parse(request.body.defaultContentType.toString()))
 
-    request.body match {
+    body match {
       case NoBody => requestPreparation
       case StringBody(s, encoding, _) =>
         val charset =

diff --git a/armeria-backend/zio/src/main/scala/sttp/client4/armeria/zio/ArmeriaZioBackend.scala b/armeria-backend/zio/src/main/scala/sttp/client4/armeria/zio/ArmeriaZioBackend.scala
@@ -13,10 +13,12 @@ import sttp.capabilities.zio.ZioStreams
 import sttp.client4.armeria.ArmeriaWebClient.newClient
 import sttp.client4.armeria.{AbstractArmeriaBackend, BodyFromStreamMessage}
 import sttp.client4.impl.zio.RIOMonadAsyncError
-import sttp.client4.wrappers.FollowRedirectsBackend
 import sttp.client4.{wrappers, BackendOptions, StreamBackend}
 import sttp.monad.MonadAsyncError
 import zio.stream.Stream
+import sttp.client4.compression.Compressor
+import sttp.client4.impl.zio.GZipZioCompressor
+import sttp.client4.impl.zio.DeflateZioCompressor
 
 private final class ArmeriaZioBackend(runtime: Runtime[Any], client: WebClient, closeFactory: Boolean)
     extends AbstractArmeriaBackend[Task, ZioStreams](client, closeFactory, new RIOMonadAsyncError[Any]) {
@@ -40,6 +42,9 @@ private final class ArmeriaZioBackend(runtime: Runtime[Any], client: WebClient,
         .run(stream.mapChunks(c => Chunk.single(HttpData.wrap(c.toArray))).toPublisher)
         .getOrThrowFiberFailure()
     }
+
+  override protected def compressors: List[Compressor[R]] =
+    List(new GZipZioCompressor[R](), new DeflateZioCompressor[R]())
 }
 
 object ArmeriaZioBackend {

diff --git a/effects/zio/src/main/scalajvm/sttp/client4/httpclient/zio/HttpClientZioBackend.scala b/effects/zio/src/main/scalajvm/sttp/client4/httpclient/zio/HttpClientZioBackend.scala
@@ -25,6 +25,7 @@ import java.util
 import java.util.concurrent.Flow.Publisher
 import java.{util => ju}
 import sttp.client4.compression.Compressor
+import sttp.client4.impl.zio.{DeflateZioCompressor, GZipZioCompressor}
 
 class HttpClientZioBackend private (
     client: HttpClient,

diff --git a/...lient4/httpclient/zio/zioCompressor.scala → ...sttp/client4/impl/zio/zioCompressor.scala b/...lient4/httpclient/zio/zioCompressor.scala → ...sttp/client4/impl/zio/zioCompressor.scala
@@ -1,4 +1,4 @@
-package sttp.client4.httpclient.zio
+package sttp.client4.impl.zio
 
 import sttp.client4._
 import sttp.client4.compression.Compressor