Add tests

Author: igor-vovk

build.sbt

@@ -24,6 +24,7 @@ lazy val noPublish = List(
 lazy val Versions = new {
   val grpc   = "1.68.1"
   val http4s = "0.23.29"
+  val logback = "1.5.12"
 }
 
 lazy val core = project
@@ -51,6 +52,8 @@ lazy val core = project
       "org.http4s" %% "http4s-client" % Versions.http4s % Test,
 
       "org.scalatest" %% "scalatest" % "3.2.19" % Test,
+
+      "ch.qos.logback" % "logback-classic" % Versions.logback % Test,
     ),
   )
 
@@ -63,7 +66,7 @@ lazy val conformance = project
     libraryDependencies ++= Seq(
       "org.http4s" %% "http4s-ember-server" % Versions.http4s,
 
-      "ch.qos.logback" % "logback-classic" % "1.5.12" % Runtime,
+      "ch.qos.logback" % "logback-classic" % Versions.logback % Runtime,
     ),
   )
 

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

@@ -4,6 +4,7 @@ import cats.Endo
 import cats.effect.Async
 import cats.effect.kernel.Resource
 import cats.implicits.*
+import fs2.{Chunk, Stream}
 import fs2.compression.Compression
 import io.grpc.*
 import io.grpc.MethodDescriptor.MethodType
@@ -19,6 +20,7 @@ import scalapb.grpc.ClientCalls
 import scalapb.json4s.{JsonFormat, Printer}
 import scalapb.{GeneratedMessage, GeneratedMessageCompanion, TextFormat}
 
+import java.net.URLDecoder
 import java.util.concurrent.atomic.AtomicReference
 import scala.concurrent.duration.*
 import scala.util.chaining.*
@@ -71,7 +73,12 @@ object ConnectRpcHttpRoutes {
                 case Some(entry) if entry.methodDescriptor.isSafe =>
                   entry.methodDescriptor.getType match
                     case MethodType.UNARY =>
-                      handleUnary(dsl, entry, req, ipChannel)
+                      val body = Stream.fromOption(req.uri.query.params.get("value"))
+                        .map(URLDecoder.decode(_, Charset.`UTF-8`.nioCharset))
+                        .flatMap(s => Stream.chunk(Chunk.array(s.getBytes)))
+                      val media = Media[F](body, req.headers)
+
+                      handleUnary(dsl, entry, media, ipChannel)
                     case unsupported =>
                       NotImplemented(connectrpc.Error(
                         code = io.grpc.Status.UNIMPLEMENTED.toConnectCode,
@@ -125,7 +132,7 @@ object ConnectRpcHttpRoutes {
   private def handleUnary[F[_] : Async](
     dsl: Http4sDsl[F],
     entry: RegistryEntry,
-    req: Request[F],
+    req: Media[F],
     channel: Channel
   )(using codec: MessageCodec[F]): F[Response[F]] = {
     import dsl.*

core/src/test/protobuf/TestService.proto

@@ -4,6 +4,11 @@ package org.ivovk.connect_rpc_scala.test;
 
 service TestService {
   rpc Add(AddRequest) returns (AddResponse) {}
+
+  // This method can be called using GET request
+  rpc Get(GetRequest) returns (GetResponse) {
+    option idempotency_level = NO_SIDE_EFFECTS;
+  }
 }
 
 message AddRequest {
@@ -14,3 +19,11 @@ message AddRequest {
 message AddResponse {
   int32 sum = 1;
 }
+
+message GetRequest {
+  string key = 1;
+}
+
+message GetResponse {
+  string value = 1;
+}

core/src/test/resources/logback.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE configuration>
+
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%-4relative %-5level %logger{35} -%kvp- %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="WARN">
+        <appender-ref ref="STDOUT"/>
+    </root>
+    <logger name="org.ivovk.connect_rpc_scala" level="TRACE"/>
+</configuration>

core/src/test/scala/org/ivovk/connect_rpc_scala/HttpTest.scala

@@ -5,14 +5,16 @@ import cats.effect.unsafe.implicits.global
 import cats.syntax.all.*
 import io.grpc.ServerServiceDefinition
 import org.http4s.client.Client
+import org.http4s.dsl.io.Root
 import org.http4s.headers.`Content-Type`
 import org.http4s.implicits.*
 import org.http4s.{Method, *}
 import org.ivovk.connect_rpc_scala.test.TestService.TestServiceGrpc.TestService
-import org.ivovk.connect_rpc_scala.test.TestService.{AddRequest, AddResponse}
+import org.ivovk.connect_rpc_scala.test.TestService.{AddRequest, AddResponse, GetRequest, GetResponse}
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
 
+import java.net.URLEncoder
 import scala.concurrent.{ExecutionContext, Future}
 import scala.jdk.CollectionConverters.*
 
@@ -21,12 +23,15 @@ class HttpTest extends AnyFunSuite, Matchers {
   object TestServiceImpl extends TestService {
     override def add(request: AddRequest): Future[AddResponse] =
       Future.successful(AddResponse(request.a + request.b))
+
+    override def get(request: GetRequest): Future[GetResponse] = {
+      Future.successful(GetResponse("Key is: " + request.key))
+    }
   }
 
   // String-JSON encoder
-  given [F[_]]: EntityEncoder[F, String] =
-    EntityEncoder.stringEncoder[F]
-      .withContentType(`Content-Type`(MediaType.application.json))
+  given [F[_]]: EntityEncoder[F, String] = EntityEncoder.stringEncoder[F]
+    .withContentType(`Content-Type`(MediaType.application.json))
 
   test("basic") {
     val services: Seq[ServerServiceDefinition] = Seq(
@@ -55,4 +60,38 @@ class HttpTest extends AnyFunSuite, Matchers {
       .unsafeRunSync()
   }
 
+  test("GET requests") {
+    val services: Seq[ServerServiceDefinition] = Seq(
+      TestService.bindService(TestServiceImpl, ExecutionContext.global)
+    )
+
+    ConnectRpcHttpRoutes.create[IO](services.toList)
+      .flatMap { routes =>
+        val client = Client.fromHttpApp(routes.orNotFound)
+
+        val requestJson = URLEncoder.encode("""{"key":"123"}""", Charset.`UTF-8`.nioCharset)
+
+        client.run(
+          Request[IO](
+            Method.GET,
+            Uri(
+              path = Root / "org.ivovk.connect_rpc_scala.test.TestService" / "Get",
+              query = Query.fromPairs("encoding" -> "json", "value" -> requestJson)
+            )
+          )
+        )
+      }
+      .use { response =>
+        for {
+          body <- response.as[String]
+          status <- response.status.pure[IO]
+        } yield {
+          assert(body == """{"value":"Key is: 123"}""")
+          assert(status == Status.Ok)
+          assert(response.headers.get[`Content-Type`].map(_.mediaType).contains(MediaType.application.json))
+        }
+      }
+      .unsafeRunSync()
+  }
+
 }