Add http2 support in JettyBuilder

http4s · Apr 17, 2020 · e32c732 · e32c732
1 parent bc1e7cb
commit e32c732
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -260,7 +260,8 @@ lazy val jetty = libraryProject("jetty")
   .settings(
     description := "Jetty implementation for http4s servers",
     libraryDependencies ++= Seq(
-      jettyServlet
+      jettyServlet,
+      jettyHttp2Server
     )
   )
   .dependsOn(servlet % "compile;test->test", theDsl % "test->test")

diff --git a/jetty/src/main/scala/org/http4s/server/jetty/JettyBuilder.scala b/jetty/src/main/scala/org/http4s/server/jetty/JettyBuilder.scala
@@ -9,7 +9,13 @@ import java.util
 import javax.net.ssl.{SSLContext, SSLParameters}
 import javax.servlet.{DispatcherType, Filter}
 import javax.servlet.http.HttpServlet
-import org.eclipse.jetty.server.{ServerConnector, Server => JServer}
+import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory
+import org.eclipse.jetty.server.{
+  ServerConnector,
+  HttpConfiguration,
+  HttpConnectionFactory,
+  Server => JServer
+}
 import org.eclipse.jetty.server.handler.StatisticsHandler
 import org.eclipse.jetty.servlet.{FilterHolder, ServletContextHandler, ServletHolder}
 import org.eclipse.jetty.util.component.{AbstractLifeCycle, LifeCycle}
@@ -33,6 +39,7 @@ sealed class JettyBuilder[F[_]] private (
     sslConfig: SslConfig,
     mounts: Vector[Mount[F]],
     private val serviceErrorHandler: ServiceErrorHandler[F],
+    supportHttp2: Boolean,
     banner: immutable.Seq[String]
 )(implicit protected val F: ConcurrentEffect[F])
     extends ServletContainer[F]
@@ -51,6 +58,7 @@ sealed class JettyBuilder[F[_]] private (
       sslConfig: SslConfig = sslConfig,
       mounts: Vector[Mount[F]] = mounts,
       serviceErrorHandler: ServiceErrorHandler[F] = serviceErrorHandler,
+      supportHttp2: Boolean = supportHttp2,
       banner: immutable.Seq[String] = banner
   ): Self =
     new JettyBuilder(
@@ -63,6 +71,7 @@ sealed class JettyBuilder[F[_]] private (
       sslConfig,
       mounts,
       serviceErrorHandler,
+      supportHttp2,
       banner)
 
   @deprecated(
@@ -161,15 +170,29 @@ sealed class JettyBuilder[F[_]] private (
   def withServiceErrorHandler(serviceErrorHandler: ServiceErrorHandler[F]): Self =
     copy(serviceErrorHandler = serviceErrorHandler)
 
+  /** Enables HTTP/2 connection upgrade over plain text (no TLS).
+    * See https://webtide.com/introduction-to-http2-in-jetty */
+  def withHttp2c: Self =
+    copy(supportHttp2 = true)
+
+  def withoutHttp2c: Self =
+    copy(supportHttp2 = false)
+
   def withBanner(banner: immutable.Seq[String]): Self =
     copy(banner = banner)
 
   private def getConnector(jetty: JServer): ServerConnector =
     sslConfig.makeSslContextFactory match {
       case Some(sslContextFactory) =>
+        if (supportHttp2) logger.warn("JettyBuilder does not support HTTP/2 with SSL at the moment")
         new ServerConnector(jetty, sslContextFactory)
-      case None =>
+      case None if !supportHttp2 =>
         new ServerConnector(jetty)
+      case None if supportHttp2 =>
+        val config = new HttpConfiguration()
+        val http1 = new HttpConnectionFactory(config)
+        val http2c = new HTTP2CServerConnectionFactory(config)
+        new ServerConnector(jetty, http1, http2c)
     }
 
   def resource: Resource[F, Server] =
@@ -243,6 +266,7 @@ object JettyBuilder {
     sslConfig = NoSsl,
     mounts = Vector.empty,
     serviceErrorHandler = DefaultServiceErrorHandler,
+    supportHttp2 = false,
     banner = defaults.Banner
   )
 

diff --git a/project/Http4sPlugin.scala b/project/Http4sPlugin.scala
@@ -233,6 +233,7 @@ object Http4sPlugin extends AutoPlugin {
   lazy val jettyRunner                      = "org.eclipse.jetty"      %  "jetty-runner"              % jettyServer.revision
   lazy val jettyServer                      = "org.eclipse.jetty"      %  "jetty-server"              % "9.4.28.v20200408"
   lazy val jettyServlet                     = "org.eclipse.jetty"      %  "jetty-servlet"             % jettyServer.revision
+  lazy val jettyHttp2Server                 = "org.eclipse.jetty.http2" % "http2-server"              % jettyServer.revision
   lazy val json4sCore                       = "org.json4s"             %% "json4s-core"               % "3.6.7"
   lazy val json4sJackson                    = "org.json4s"             %% "json4s-jackson"            % json4sCore.revision
   lazy val json4sNative                     = "org.json4s"             %% "json4s-native"             % json4sCore.revision