chore: update zio-http to RC23 & tapir 0.20.0-M7

ghostdogpr · Jan 28, 2022 · 2d1a5ab · 2d1a5ab
1 parent bbde4aa
commit 2d1a5ab
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 56 deletions.
diff --git a/adapters/zio-http/src/main/scala/caliban/ZHttpAdapter.scala b/adapters/zio-http/src/main/scala/caliban/ZHttpAdapter.scala
@@ -40,20 +40,21 @@ object ZHttpAdapter {
     queryExecution: QueryExecution = QueryExecution.Parallel,
     webSocketHooks: WebSocketHooks[R, E] = WebSocketHooks.empty
   ): HttpApp[R with Clock, E] =
-    HttpApp.responseM(
+    Http.responseZIO[R with Clock, E](
       for {
         ref <- Ref.make(Map.empty[String, Promise[Any, Unit]])
-      } yield Response.socket(
-        socketHandler[R, E](
-          ref,
-          interpreter,
-          skipValidation,
-          enableIntrospection,
-          keepAliveTime,
-          queryExecution,
-          webSocketHooks
+        app <- Response.fromSocketApp[R with Clock](
+          socketHandler[R, E](
+            ref,
+            interpreter,
+            skipValidation,
+            enableIntrospection,
+            keepAliveTime,
+            queryExecution,
+            webSocketHooks
+          )
         )
-      )
+      } yield app
     )
 
   private def socketHandler[R, E](
@@ -64,7 +65,7 @@ object ZHttpAdapter {
     keepAliveTime: Option[Duration],
     queryExecution: QueryExecution,
     webSocketHooks: WebSocketHooks[R, E] = WebSocketHooks.empty
-  ): SocketApp[R with Clock, E] = {
+  ): SocketApp[R with Clock] = {
     val routes = Socket.collect[WebSocketFrame] { case Text(text) =>
       ZStream
         .fromEffect(ZIO.fromEither(decode[GraphQLWSInput](text)))
@@ -120,7 +121,7 @@ object ZHttpAdapter {
         .map(output => WebSocketFrame.Text(output.asJson.noSpaces))
     }
 
-    SocketApp.message(routes) ++ SocketApp.protocol(protocol)
+    SocketApp(routes).withProtocol(protocol)
   }
 
   private val protocol = SocketProtocol.subProtocol("graphql-ws")

diff --git a/adapters/zio-http/src/test/scala/caliban/ZHttpAdapterSpec.scala b/adapters/zio-http/src/test/scala/caliban/ZHttpAdapterSpec.scala
@@ -21,15 +21,15 @@ object ZHttpAdapterSpec extends DefaultRunnableSpec {
       _           <- Server
                        .start(
                          8088,
-                         Http.route {
-                           case _ -> Root / "api" / "graphql" => ZHttpAdapter.makeHttpService(interpreter)
-                           case _ -> Root / "ws" / "graphql"  => ZHttpAdapter.makeWebSocketService(interpreter)
+                         Http.route[Request] {
+                           case _ -> !! / "api" / "graphql" => ZHttpAdapter.makeHttpService(interpreter)
+                           case _ -> !! / "ws" / "graphql"  => ZHttpAdapter.makeWebSocketService(interpreter)
                          }
                        )
                        .forkManaged
       _           <- clock.sleep(3 seconds).toManaged_
     } yield ())
-      .provideCustomLayer(TestService.make(sampleCharacters) ++ Uploads.empty ++ Clock.live)
+      .provideCustomLayer(TestService.make(sampleCharacters) ++ Uploads.empty +!+ Clock.live)
       .toLayer
 
   def spec: ZSpec[ZEnv, Any] = {

diff --git a/build.sbt b/build.sbt
@@ -6,7 +6,7 @@ val scala213 = "2.13.8"
 val scala3   = "3.1.0"
 val allScala = Seq(scala212, scala213, scala3)
 
-val akkaVersion            = "2.6.17"
+val akkaVersion            = "2.6.18"
 val catsEffect2Version     = "2.5.4"
 val catsEffect3Version     = "3.3.4"
 val circeVersion           = "0.14.1"
@@ -17,14 +17,14 @@ val mercatorVersion        = "0.2.1"
 val playVersion            = "2.8.13"
 val playJsonVersion        = "2.9.2"
 val sttpVersion            = "3.3.18"
-val tapirVersion           = "0.19.3"
+val tapirVersion           = "0.20.0-M7"
 val zioVersion             = "1.0.13"
 val zioInteropCats2Version = "2.5.1.0"
 val zioInteropCats3Version = "3.2.9.0"
 val zioConfigVersion       = "1.0.10"
 val zqueryVersion          = "0.2.10"
 val zioJsonVersion         = "0.1.5"
-val zioHttpVersion         = "1.0.0.0-RC17"
+val zioHttpVersion         = "1.0.0.0-RC23"
 
 inThisBuild(
   List(

diff --git a/examples/src/main/scala/example/stitching/ExampleApp.scala b/examples/src/main/scala/example/stitching/ExampleApp.scala
@@ -93,15 +93,13 @@ object Configuration {
   )
 }
 
-import zio._
 import zio.stream._
 import zhttp.http._
 import zhttp.service.Server
 import caliban.ZHttpAdapter
 
 object ExampleApp extends App {
-  private val graphiql =
-    Http.succeed(Response.http(content = HttpData.fromStream(ZStream.fromResource("graphiql.html"))))
+  private val graphiql = Http.fromStream(ZStream.fromResource("graphiql.html"))
 
   override def run(args: List[String]): ZIO[ZEnv, Nothing, ExitCode] =
     (for {
@@ -110,10 +108,10 @@ object ExampleApp extends App {
       _           <- Server
                        .start(
                          8088,
-                         Http.route {
-                           case _ -> Root / "api" / "graphql" => ZHttpAdapter.makeHttpService(interpreter)
-                           case _ -> Root / "ws" / "graphql"  => ZHttpAdapter.makeWebSocketService(interpreter)
-                           case _ -> Root / "graphiql"        => graphiql
+                         Http.route[Request] {
+                           case _ -> !! / "api" / "graphql" => ZHttpAdapter.makeHttpService(interpreter)
+                           case _ -> !! / "ws" / "graphql"  => ZHttpAdapter.makeWebSocketService(interpreter)
+                           case _ -> !! / "graphiql"        => graphiql
                          }
                        )
                        .forever

diff --git a/examples/src/main/scala/example/ziohttp/AuthExampleApp.scala b/examples/src/main/scala/example/ziohttp/AuthExampleApp.scala
@@ -7,7 +7,6 @@ import caliban.interop.tapir.{ StreamTransformer, WebSocketHooks }
 import caliban.schema.GenericSchema
 import example.ExampleData._
 import example.{ ExampleApi, ExampleService }
-import io.netty.handler.codec.http.{ HttpHeaderNames, HttpHeaderValues }
 import zhttp.http._
 import zhttp.service.Server
 import zio._
@@ -42,7 +41,7 @@ object Auth {
       .toLayer
 
   object WebSockets {
-    private val wsSession = Http.fromEffect(Ref.make[Option[String]](None))
+    private val wsSession = Http.fromZIO(Ref.make[Option[String]](None))
 
     def live[R <: Has[Auth] with Clock](
       interpreter: GraphQLInterpreter[R, CalibanError]
@@ -84,11 +83,11 @@ object Auth {
   }
 
   def middleware[R, B](
-    app: Http[R, Throwable, Request, Response[R, Throwable]]
+    app: Http[R, Throwable, Request, Response]
   ): HttpApp[R with Has[Auth], Throwable] =
     Http
-      .fromEffectFunction[Request] { (request: Request) =>
-        val user = request.headers.find(_.name == "Authorization").map(_.value.toString())
+      .fromFunctionZIO[Request] { (request: Request) =>
+        val user = request.getHeaders.getAuthorization.map(_.toString())
 
         ZIO.serviceWith[Auth](_.setUser(user)).as(app)
       }
@@ -108,24 +107,18 @@ object Authed extends GenericSchema[ZEnv with Has[Auth]] {
 }
 
 object AuthExampleApp extends App {
-  private val graphiql =
-    Http.succeed(
-      Response.http(
-        content = HttpData.fromStream(ZStream.fromResource("graphiql.html")),
-        headers = List(Header(HttpHeaderNames.CONTENT_TYPE, HttpHeaderValues.TEXT_HTML))
-      )
-    )
+  private val graphiql = Http.fromStream(ZStream.fromResource("graphiql.html"))
 
   override def run(args: List[String]): ZIO[ZEnv, Nothing, ExitCode] =
     (for {
       interpreter <- (ExampleApi.api |+| Authed.api).interpreter
       _           <- Server
                        .start(
                          8088,
-                         Http.route {
-                           case _ -> Root / "api" / "graphql" => Auth.middleware(ZHttpAdapter.makeHttpService(interpreter))
-                           case _ -> Root / "ws" / "graphql"  => Auth.WebSockets.live(interpreter)
-                           case _ -> Root / "graphiql"        => graphiql
+                         Http.route[Request] {
+                           case _ -> !! / "api" / "graphql" => Auth.middleware(ZHttpAdapter.makeHttpService(interpreter))
+                           case _ -> !! / "ws" / "graphql"  => Auth.WebSockets.live(interpreter)
+                           case _ -> !! / "graphiql"        => graphiql
                          }
                        )
                        .forever

diff --git a/examples/src/main/scala/example/ziohttp/ExampleApp.scala b/examples/src/main/scala/example/ziohttp/ExampleApp.scala
@@ -4,31 +4,24 @@ import example.ExampleData._
 import example.{ ExampleApi, ExampleService }
 
 import caliban.ZHttpAdapter
-import io.netty.handler.codec.http.{HttpHeaderNames, HttpHeaderValues}
 import zio._
 import zio.stream._
 import zhttp.http._
 import zhttp.service.Server
 
 object ExampleApp extends App {
-  private val graphiql =
-    Http.succeed(
-      Response.http(
-        content = HttpData.fromStream(ZStream.fromResource("graphiql.html")),
-        headers = List(Header(HttpHeaderNames.CONTENT_TYPE, HttpHeaderValues.TEXT_HTML))
-      )
-    )
+  private val graphiql = Http.fromStream(ZStream.fromResource("graphiql.html"))
 
   override def run(args: List[String]): ZIO[ZEnv, Nothing, ExitCode] =
     (for {
       interpreter <- ExampleApi.api.interpreter
       _           <- Server
                        .start(
                          8088,
-                         Http.route {
-                           case _ -> Root / "api" / "graphql" => ZHttpAdapter.makeHttpService(interpreter)
-                           case _ -> Root / "ws" / "graphql"  => ZHttpAdapter.makeWebSocketService(interpreter)
-                           case _ -> Root / "graphiql"        => graphiql
+                         Http.route[Request] {
+                           case _ -> !! / "api" / "graphql" => ZHttpAdapter.makeHttpService(interpreter)
+                           case _ -> !! / "ws" / "graphql"  => ZHttpAdapter.makeWebSocketService(interpreter)
+                           case _ -> !! / "graphiql"        => graphiql
                          }
                        )
                        .forever

diff --git a/interop/tapir/src/main/scala/caliban/interop/tapir/TapirAdapter.scala b/interop/tapir/src/main/scala/caliban/interop/tapir/TapirAdapter.scala
@@ -124,7 +124,7 @@ object TapirAdapter {
     requestCodec: JsonCodec[GraphQLRequest],
     mapCodec: JsonCodec[Map[String, Seq[String]]],
     responseCodec: JsonCodec[GraphQLResponse[E]]
-  ): PublicEndpoint[(Seq[Part[Array[Byte]]], ServerRequest), StatusCode, GraphQLResponse[E], Any] =
+  ): PublicEndpoint[UploadRequest, StatusCode, GraphQLResponse[E], Any] =
     endpoint.post
       .in(multipartBody)
       .in(extractFromRequest(identity))