Extract timeout method to RequestEntity

Author: igor-vovk

README.md

@@ -82,8 +82,8 @@ Run the following command to run Connect-RPC conformance tests:
 docker build . --output "out" --progress=plain
 ```
 
-Execution results are output in STDOUT.
-Diagnostic data from the server itself is output in the `out/out.log` file.
+Execution results are output to STDOUT.
+Diagnostic data from the server itself is written to the log file `out/out.log`.
 
 ### Conformance tests status
 

core/src/main/scala/org/ivovk/connect_rpc_scala/ConnectRpcHttpRoutes.scala

@@ -12,7 +12,7 @@ import io.grpc.stub.MetadataUtils
 import org.http4s.*
 import org.http4s.dsl.Http4sDsl
 import org.ivovk.connect_rpc_scala.http.*
-import org.ivovk.connect_rpc_scala.http.Headers.*
+import org.ivovk.connect_rpc_scala.http.Headers.`X-Test-Case-Name`
 import org.ivovk.connect_rpc_scala.http.MessageCodec.given
 import org.ivovk.connect_rpc_scala.http.QueryParams.*
 import org.slf4j.{Logger, LoggerFactory}
@@ -151,8 +151,8 @@ object ConnectRpcHttpRoutes {
             method.descriptor,
             CallOptions.DEFAULT
               .pipe(
-                req.headers.get[`Connect-Timeout-Ms`].fold[Endo[CallOptions]](identity) { header =>
-                  _.withDeadlineAfter(header.value, MILLISECONDS)
+                req.timeout.fold[Endo[CallOptions]](identity) { timeout =>
+                  _.withDeadlineAfter(timeout, MILLISECONDS)
                 }
               ),
             message

core/src/main/scala/org/ivovk/connect_rpc_scala/http/RequestEntity.scala

@@ -2,8 +2,9 @@ package org.ivovk.connect_rpc_scala.http
 
 import cats.MonadThrow
 import fs2.Stream
-import org.http4s.{Charset, Headers, Media}
 import org.http4s.headers.`Content-Type`
+import org.http4s.{Charset, Headers, Media}
+import org.ivovk.connect_rpc_scala.http.Headers.`Connect-Timeout-Ms`
 import scalapb.{GeneratedMessage as Message, GeneratedMessageCompanion as Companion}
 
 object RequestEntity {
@@ -26,6 +27,9 @@ case class RequestEntity[F[_]](
   def charset: Charset =
     contentType.flatMap(_.charset).getOrElse(Charset.`UTF-8`)
 
+  def timeout: Option[Long] =
+    headers.get[`Connect-Timeout-Ms`].map(_.value)
+
   def as[A <: Message](using M: MonadThrow[F], codec: MessageCodec[F], cmp: Companion[A]): F[A] =
     M.rethrow(codec.decode(this).value)