Tools scala3 zio r17

.circleci/config.yml

@@ -7,8 +7,8 @@ jobs:
       - checkout
       - restore_cache:
           key: sbtcache
-      - run: sbt ++2.13.6! check
-      - run: sbt ++3.1.0! check
+      - run: sbt ++2.13.8 check
+      - run: sbt ++3.1.3 check
       - save_cache:
           key: sbtcache
           paths:
@@ -22,7 +22,7 @@ jobs:
       - checkout
       - restore_cache:
           key: sbtcache
-      - run: sbt ++2.12.14! core/test http4s/test akkaHttp/test play/test zioHttp/test examples/compile catsInterop/compile benchmarks/compile tools/test codegenSbt/test clientJVM/test monixInterop/compile tapirInterop/test federation/test
+      - run: sbt ++2.12.16! core/test http4s/test akkaHttp/test play/test zioHttp/test examples/compile catsInterop/compile benchmarks/compile tools/test codegenSbt/test clientJVM/test monixInterop/compile tapirInterop/test federation/test reporting/test
       - save_cache:
           key: sbtcache
           paths:
@@ -36,7 +36,7 @@ jobs:
       - checkout
       - restore_cache:
           key: sbtcache
-      - run: sbt ++2.12.14! core/test http4s/test akkaHttp/test play/test zioHttp/test examples/compile catsInterop/compile benchmarks/compile tools/test codegenSbt/test clientJVM/test monixInterop/compile tapirInterop/test federation/test
+      - run: sbt ++2.12.16 core/test http4s/test akkaHttp/test play/test zioHttp/test examples/compile catsInterop/compile benchmarks/compile tools/test codegenSbt/test clientJVM/test monixInterop/compile tapirInterop/test federation/test reporting/test
       - save_cache:
           key: sbtcache
           paths:
@@ -50,7 +50,7 @@ jobs:
       - checkout
       - restore_cache:
           key: sbtcache
-      - run: sbt ++2.12.14! codegenSbt/scripted
+      - run: sbt ++2.12.16 codegenSbt/scripted
       - save_cache:
           key: sbtcache
           paths:
@@ -64,7 +64,7 @@ jobs:
       - checkout
       - restore_cache:
           key: sbtcache
-      - run: sbt ++2.13.7! core/test http4s/test akkaHttp/test play/test zioHttp/test examples/compile catsInterop/compile monixInterop/compile tapirInterop/test clientJVM/test federation/test
+      - run: sbt ++2.13.8 core/test http4s/test akkaHttp/test play/test zioHttp/test examples/compile catsInterop/compile monixInterop/compile tapirInterop/test clientJVM/test federation/test reporting/test
       - save_cache:
           key: sbtcache
           paths:
@@ -78,7 +78,7 @@ jobs:
       - checkout
       - restore_cache:
           key: sbtcache
-      - run: sbt ++3.1.0! core/test catsInterop/compile monixInterop/compile clientJVM/test clientJS/compile zioHttp/test tapirInterop/test http4s/test federation/test
+      - run: sbt ++3.1.3 core/test catsInterop/compile monixInterop/compile clientJVM/test clientJS/compile zioHttp/test tapirInterop/test http4s/test federation/test reporting/test
       - save_cache:
           key: sbtcache
           paths:
@@ -92,7 +92,23 @@ jobs:
       - checkout
       - restore_cache:
           key: sbtcache
-      - run: sbt ++2.13.7! clientJS/test clientLaminextJS/Test/fastLinkJS
+      - run: sbt ++2.13.8 clientJS/test clientLaminextJS/Test/fastLinkJS
+      - save_cache:
+          key: sbtcache
+          paths:
+            - "~/.ivy2/cache"
+            - "~/.sbt"
+            - "~/.m2"
+  test213_docs:
+    docker:
+      - image: cimg/openjdk:11.0-node
+    steps:
+      - checkout
+      - restore_cache:
+          key: sbtcache
+      - run: |
+          sbt ++2.13.8 docs/mdoc
+          sbt "++2.13.8 doc"
       - save_cache:
           key: sbtcache
           paths:
@@ -175,6 +191,12 @@ workflows:
           filters:
             tags:
               only: /^v[0-9]+(\.[0-9]+)*$/
+      - test213_docs:
+          requires:
+            - lint
+          filters:
+            tags:
+              only: /^v[0-9]+(\.[0-9]+)*$/
       - test3_jdk:
           requires:
             - lint
@@ -189,6 +211,7 @@ workflows:
             - scripted212_jdk
             - test213_jdk
             - test213_js
+            - test213_docs
             - test3_jdk
           filters:
             branches:

README.md

@@ -28,8 +28,11 @@ Here is a partial list of companies using Caliban in production.
 
 Want to see your company here? [Submit a PR](https://github.com/ghostdogpr/caliban/edit/master/README.md)!
 
+* [Anduin Transactions](https://www.anduintransact.com)
 * [AutoScout24](https://www.autoscout24.de)
+* [BusinessChat.io](https://businesschat.io)
 * [Carvana](https://www.carvana.com)
+* [Conduktor](https://www.conduktor.io)
 * [Credimi](https://www.credimi.com)
 * [Devsisters](https://www.devsisters.com)
 * [Fugo.ai](https://www.fugo.ai)

adapters/akka-http/src/main/scala/caliban/AkkaHttpAdapter.scala

@@ -3,6 +3,7 @@ package caliban
 import akka.http.scaladsl.server.Route
 import akka.stream.scaladsl.{ Flow, Sink, Source }
 import akka.stream.{ Materializer, OverflowStrategy }
+import caliban.AkkaHttpAdapter.convertWebSocketEndpoint
 import caliban.execution.QueryExecution
 import caliban.interop.tapir.TapirAdapter.{ zioMonadError, CalibanPipe, ZioWebSockets }
 import caliban.interop.tapir.{ RequestInterceptor, TapirAdapter, WebSocketHooks }
@@ -14,15 +15,16 @@ import sttp.tapir.Codec.JsonCodec
 import sttp.tapir.PublicEndpoint
 import sttp.tapir.model.ServerRequest
 import sttp.tapir.server.ServerEndpoint
-import sttp.tapir.server.akkahttp.AkkaHttpServerInterpreter
+import sttp.tapir.server.akkahttp.{ AkkaHttpServerInterpreter, AkkaHttpServerOptions }
 import zio._
 import zio.duration._
 import zio.random.Random
 import zio.stream.ZStream
 
 import scala.concurrent.{ ExecutionContext, Future }
 
-object AkkaHttpAdapter {
+class AkkaHttpAdapter private (private val options: AkkaHttpServerOptions)(implicit ec: ExecutionContext) {
+  private val akkaInterpreter = AkkaHttpServerInterpreter(options)(ec)
 
   def makeHttpService[R, E](
     interpreter: GraphQLInterpreter[R, E],
@@ -42,7 +44,7 @@ object AkkaHttpAdapter {
       queryExecution,
       requestInterceptor
     )
-    AkkaHttpServerInterpreter().toRoute(endpoints.map(TapirAdapter.convertHttpEndpointToFuture(_)))
+    akkaInterpreter.toRoute(endpoints.map(TapirAdapter.convertHttpEndpointToFuture(_)))
   }
 
   def makeHttpUploadService[R, E](
@@ -64,7 +66,7 @@ object AkkaHttpAdapter {
       queryExecution,
       requestInterceptor
     )
-    AkkaHttpServerInterpreter().toRoute(TapirAdapter.convertHttpEndpointToFuture(endpoint))
+    akkaInterpreter.toRoute(TapirAdapter.convertHttpEndpointToFuture(endpoint))
   }
 
   def makeWebSocketService[R, E](
@@ -91,27 +93,46 @@ object AkkaHttpAdapter {
       requestInterceptor,
       webSocketHooks
     )
-    AkkaHttpServerInterpreter().toRoute(
+    akkaInterpreter.toRoute(
       convertWebSocketEndpoint(
         endpoint.asInstanceOf[
-          ServerEndpoint.Full[Unit, Unit, ServerRequest, StatusCode, CalibanPipe, ZioWebSockets, RIO[R, *]]
+          ServerEndpoint.Full[Unit, Unit, (ServerRequest, String), StatusCode, CalibanPipe, ZioWebSockets, RIO[R, *]]
         ]
       )
     )
   }
+}
+
+object AkkaHttpAdapter {
+
+  def default(implicit ec: ExecutionContext): AkkaHttpAdapter =
+    apply(AkkaHttpServerOptions.default)
+
+  def apply(options: AkkaHttpServerOptions)(implicit ec: ExecutionContext): AkkaHttpAdapter =
+    new AkkaHttpAdapter(options)
 
-  type AkkaPipe = Flow[GraphQLWSInput, GraphQLWSOutput, Any]
+  type AkkaPipe = Flow[GraphQLWSInput, Either[GraphQLWSClose, GraphQLWSOutput], Any]
 
   def convertWebSocketEndpoint[R](
-    endpoint: ServerEndpoint.Full[Unit, Unit, ServerRequest, StatusCode, CalibanPipe, ZioWebSockets, RIO[R, *]]
+    endpoint: ServerEndpoint.Full[Unit, Unit, (ServerRequest, String), StatusCode, CalibanPipe, ZioWebSockets, RIO[
+      R,
+      *
+    ]]
   )(implicit
     ec: ExecutionContext,
     runtime: Runtime[R],
     materializer: Materializer
   ): ServerEndpoint[AkkaStreams with WebSockets, Future] =
-    ServerEndpoint[Unit, Unit, ServerRequest, StatusCode, AkkaPipe, AkkaStreams with WebSockets, Future](
+    ServerEndpoint[Unit, Unit, (ServerRequest, String), StatusCode, AkkaPipe, AkkaStreams with WebSockets, Future](
       endpoint.endpoint
-        .asInstanceOf[PublicEndpoint[ServerRequest, StatusCode, Pipe[GraphQLWSInput, GraphQLWSOutput], Any]],
+        .asInstanceOf[
+          PublicEndpoint[
+            (ServerRequest, String),
+            StatusCode,
+            Pipe[GraphQLWSInput, Either[GraphQLWSClose, GraphQLWSOutput]],
+            Any
+          ]
+        ],
       _ => _ => Future.successful(Right(())),
       _ =>
         _ =>
@@ -128,7 +149,8 @@ object AkkaHttpAdapter {
                     sink            = Sink.foreachAsync[GraphQLWSInput](1)(input =>
                                         runtime.unsafeRunToFuture(inputQueue.offer(input).unit).future
                                       )
-                    (queue, source) = Source.queue[GraphQLWSOutput](0, OverflowStrategy.fail).preMaterialize()
+                    (queue, source) =
+                      Source.queue[Either[GraphQLWSClose, GraphQLWSOutput]](0, OverflowStrategy.fail).preMaterialize()
                     fiber          <- output.foreach(msg => ZIO.fromFuture(_ => queue.offer(msg))).forkDaemon
                     flow            = Flow.fromSinkAndSourceCoupled(sink, source).watchTermination() { (_, f) =>
                                         f.onComplete(_ => runtime.unsafeRun(fiber.interrupt))

adapters/akka-http/src/test/scala/caliban/AkkaHttpAdapterSpec.scala

@@ -3,55 +3,56 @@ package caliban
 import akka.actor.ActorSystem
 import akka.http.scaladsl.Http
 import akka.http.scaladsl.server.Directives._
+import akka.stream.Materializer
 import caliban.interop.tapir.TestData.sampleCharacters
 import caliban.interop.tapir.TestService.TestService
-import caliban.interop.tapir.{ TapirAdapterSpec, TestApi, TestService }
+import caliban.interop.tapir.{ FakeAuthorizationInterceptor, TapirAdapterSpec, TestApi, TestService }
 import caliban.uploads.Uploads
 import sttp.client3.UriContext
 import sttp.tapir.json.circe._
 import zio._
 import zio.clock.Clock
 import zio.console.Console
 import zio.duration._
-import zio.internal.Platform
 import zio.random.Random
 import zio.test.{ DefaultRunnableSpec, TestFailure, ZSpec }
 
-import scala.concurrent.ExecutionContextExecutor
 import scala.language.postfixOps
 
 object AkkaHttpAdapterSpec extends DefaultRunnableSpec {
 
-  implicit val system: ActorSystem                                                            = ActorSystem()
-  implicit val executionContext: ExecutionContextExecutor                                     = system.dispatcher
-  implicit val runtime: Runtime[TestService with Console with Clock with Random with Uploads] =
-    Runtime.unsafeFromLayer(
-      TestService.make(sampleCharacters) ++ Console.live ++ Clock.live ++ Random.live ++ Uploads.empty,
-      Platform.default
-    )
-
-  val apiLayer: ZLayer[zio.ZEnv, Throwable, Has[Unit]] =
+  val apiLayer: ZLayer[zio.ZEnv, Throwable, TestService] =
     (for {
+      runtime     <- ZManaged.runtime[TestService with Console with Clock with Random with Uploads]
+      system      <- ZManaged.make(Task.effectTotal(ActorSystem()))(sys => ZIO.fromFuture(_ => sys.terminate()).ignore)
+      ec           = system.dispatcher
+      mat          = Materializer(system)
+      service     <- ZManaged.service[TestService.Service]
       interpreter <- TestApi.api.interpreter.toManaged_
+      adapter      = AkkaHttpAdapter.default(ec)
       route        = path("api" / "graphql") {
-                       AkkaHttpAdapter.makeHttpService(interpreter)
+                       adapter.makeHttpService(interpreter, requestInterceptor = FakeAuthorizationInterceptor.bearer)(
+                         runtime,
+                         implicitly,
+                         implicitly
+                       )
                      } ~ path("upload" / "graphql") {
-                       AkkaHttpAdapter.makeHttpUploadService(interpreter)
+                       adapter.makeHttpUploadService(interpreter)(runtime, implicitly, implicitly, implicitly)
                      } ~ path("ws" / "graphql") {
-                       AkkaHttpAdapter.makeWebSocketService(interpreter)
+                       adapter.makeWebSocketService(interpreter)(ec, runtime, mat, implicitly, implicitly)
                      }
-      _           <- ZIO
-                       .fromFuture(_ => Http().newServerAt("localhost", 8088).bind(route))
-                       .toManaged(server =>
-                         ZIO.fromFuture(_ => server.unbind()).ignore *> ZIO.fromFuture(_ => system.terminate()).ignore
-                       )
+      _           <- ZIO.fromFuture { _ =>
+                       implicit val s: ActorSystem = system
+                       Http().newServerAt("localhost", 8088).bind(route)
+                     }
+                       .toManaged(server => ZIO.fromFuture(_ => server.unbind()).ignore)
       _           <- clock.sleep(3 seconds).toManaged_
-    } yield ())
+    } yield service)
       .provideCustomLayer(TestService.make(sampleCharacters) ++ Uploads.empty ++ Clock.live)
       .toLayer
 
   def spec: ZSpec[ZEnv, Any] = {
-    val suite: ZSpec[Has[Unit], Throwable] =
+    val suite: ZSpec[TestService, Throwable] =
       TapirAdapterSpec.makeSuite(
         "AkkaHttpAdapterSpec",
         uri"http://localhost:8088/api/graphql",