Add HttpClientFs2Backend.resourceUsingClient (CE2), add HttpClientMon…

…ixBackend.resourceUsingClient.
softwaremill · Nov 14, 2022 · 827d314 · 827d314
1 parent 8088994
commit 827d314
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/effects/fs2-ce2/src/main/scalajvm/sttp/client3/httpclient/fs2/HttpClientFs2Backend.scala b/effects/fs2-ce2/src/main/scalajvm/sttp/client3/httpclient/fs2/HttpClientFs2Backend.scala
@@ -128,6 +128,16 @@ object HttpClientFs2Backend {
   ): Resource[F, SttpBackend[F, Fs2Streams[F] with WebSockets]] =
     Resource.make(apply(blocker, options, customizeRequest, customEncodingHandler))(_.close())
 
+  def resourceUsingClient[F[_]: ConcurrentEffect: ContextShift](
+      client: HttpClient,
+      blocker: Blocker,
+      customizeRequest: HttpRequest => HttpRequest = identity,
+      customEncodingHandler: Fs2EncodingHandler[F] = PartialFunction.empty
+  ): Resource[F, SttpBackend[F, Fs2Streams[F] with WebSockets]] =
+    Resource.make(
+      Sync[F].delay(HttpClientFs2Backend(client, blocker, closeClient = true, customizeRequest, customEncodingHandler))
+    )(_.close())
+
   def usingClient[F[_]: ConcurrentEffect: ContextShift](
       client: HttpClient,
       blocker: Blocker,

diff --git a/effects/monix/src/main/scalajvm/sttp/client3/httpclient/monix/HttpClientMonixBackend.scala b/effects/monix/src/main/scalajvm/sttp/client3/httpclient/monix/HttpClientMonixBackend.scala
@@ -119,6 +119,17 @@ object HttpClientMonixBackend {
   ): Resource[Task, SttpBackend[Task, MonixStreams with WebSockets]] =
     Resource.make(apply(options, customizeRequest, customEncodingHandler))(_.close())
 
+  def resourceUsingClient(
+      client: HttpClient,
+      customizeRequest: HttpRequest => HttpRequest = identity,
+      customEncodingHandler: MonixEncodingHandler = PartialFunction.empty
+  )(implicit
+      s: Scheduler = Scheduler.global
+  ): Resource[Task, SttpBackend[Task, MonixStreams with WebSockets]] =
+    Resource.make(
+      Task.eval(HttpClientMonixBackend(client, closeClient = true, customizeRequest, customEncodingHandler)(s))
+    )(_.close())
+
   def usingClient(
       client: HttpClient,
       customizeRequest: HttpRequest => HttpRequest = identity,