Merge pull request #6 from davenverse/priorKnowledge

Ember For Prior Knowledge
http4s · Mar 9, 2023 · 33a7771 · 33a7771
2 parents 23209d1 + 539959f
commit 33a7771
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -41,8 +41,8 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
       "co.fs2"                      %%% "fs2-scodec"                 % fs2V,
 
       "org.http4s"                  %%% "http4s-dsl"                 % http4sV,
-      "org.http4s"                  %%% "http4s-server"              % http4sV,
-      "org.http4s"                  %%% "http4s-client"              % http4sV,
+      "org.http4s"                  %%% "http4s-ember-server"        % http4sV,
+      "org.http4s"                  %%% "http4s-ember-client"        % http4sV,
 
       "org.typelevel"               %%% "munit-cats-effect"        % munitCatsEffectV         % Test,
 

diff --git a/core/src/main/scala/org/http4s/grpc/ClientGrpc.scala b/core/src/main/scala/org/http4s/grpc/ClientGrpc.scala
@@ -5,6 +5,7 @@ import org.http4s._
 import org.http4s.client.Client
 import scodec.{Encoder, Decoder}
 import fs2._
+import org.http4s.ember.core.h2.H2Keys
 
 object ClientGrpc {
   def unaryToUnary[F[_]: Concurrent, A, B](// Stuff We can provide via codegen
@@ -21,6 +22,7 @@ object ClientGrpc {
       .putHeaders(SharedGrpc.TE, SharedGrpc.GrpcEncoding, SharedGrpc.GrpcAcceptEncoding, SharedGrpc.ContentType)
       .putHeaders(ctx.headers.map(Header.ToRaw.rawToRaw):_*)
       .withBodyStream(codecs.Messages.encodeSingle(encode)(message))
+      .withAttribute(H2Keys.Http2PriorKnowledge, ())
 
     client.run(req).use( resp => 
       codecs.Messages.decodeSingle(decode)(resp.body)
@@ -42,6 +44,7 @@ object ClientGrpc {
       .putHeaders(SharedGrpc.TE, SharedGrpc.GrpcEncoding, SharedGrpc.GrpcAcceptEncoding, SharedGrpc.ContentType)
       .putHeaders(ctx.headers.map(Header.ToRaw.rawToRaw):_*)
       .withBodyStream(codecs.Messages.encodeSingle(encode)(message))
+      .withAttribute(H2Keys.Http2PriorKnowledge, ())
 
     Stream.resource(client.run(req)).flatMap( resp => 
       codecs.Messages.decode[F, B](decode)(resp.body)
@@ -62,6 +65,7 @@ object ClientGrpc {
       .putHeaders(SharedGrpc.TE, SharedGrpc.GrpcEncoding, SharedGrpc.GrpcAcceptEncoding, SharedGrpc.ContentType)
       .putHeaders(ctx.headers.map(Header.ToRaw.rawToRaw):_*)
       .withBodyStream(codecs.Messages.encode(encode)(message))
+      .withAttribute(H2Keys.Http2PriorKnowledge, ())
 
     client.run(req).use( resp => 
       codecs.Messages.decodeSingle(decode)(resp.body)
@@ -82,6 +86,7 @@ object ClientGrpc {
       .putHeaders(SharedGrpc.TE, SharedGrpc.GrpcEncoding, SharedGrpc.GrpcAcceptEncoding, SharedGrpc.ContentType)
       .putHeaders(ctx.headers.map(Header.ToRaw.rawToRaw):_*)
       .withBodyStream(codecs.Messages.encode(encode)(message))
+      .withAttribute(H2Keys.Http2PriorKnowledge, ())
 
     Stream.resource(client.run(req)).flatMap( resp => 
       codecs.Messages.decode[F, B](decode)(resp.body)