Merge 0.23 -> main

.github/workflows/ci.yml

@@ -140,11 +140,11 @@ jobs:
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: mkdir -p ember-core/js/target ember-server/js/target examples/ember-server-h2/target examples/ember/target examples/ember-client-h2/target blaze-client/target server/jvm/target examples/target scalafix-internal/input/target blaze-server/target scalafix-internal/tests/target scalatags/target target examples/docker/target twirl/target unidocs/target .js/target site/target laws/.jvm/target tests/jvm/target client/js/target tomcat-server/target prometheus-metrics/target scalafix-internal/output/target servlet/target examples/tomcat/target examples/jetty/target boopickle/.js/target testing/jvm/target core/js/target testing/js/target ember-server/jvm/target circe/.js/target okhttp-client/target laws/.js/target examples/blaze/target jawn/.js/target tests/js/target .jvm/target scalafix-internal/rules/target .native/target client/jvm/target blaze-core/target circe/.jvm/target dsl/.js/target examples/war/target jetty-client/target ember-client/jvm/target boopickle/.jvm/target play-json/target core/jvm/target scala-xml/target dsl/.jvm/target dropwizard-metrics/target jetty-server/target node-serverless/target ember-core/jvm/target jawn/.jvm/target server/js/target ember-client/js/target bench/target project/target
+        run: mkdir -p ember-core/js/target ember-server/js/target examples/ember-server-h2/target examples/ember/target examples/ember-client-h2/target blaze-client/target server/jvm/target examples/target scalafix-internal/input/target blaze-server/target scalafix-internal/tests/target scalatags/target target examples/docker/target twirl/target unidocs/target .js/target site/target laws/.jvm/target tests/jvm/target client/js/target tomcat-server/target prometheus-metrics/target scalafix-internal/output/target servlet/target examples/tomcat/target examples/jetty/target boopickle/.js/target testing/jvm/target core/js/target testing/js/target ember-server/jvm/target circe/.js/target okhttp-client/target laws/.js/target examples/blaze/target jawn/.js/target tests/js/target .jvm/target scalafix-internal/rules/target .native/target client/jvm/target blaze-core/target circe/.jvm/target dsl/.js/target jetty-client/target ember-client/jvm/target boopickle/.jvm/target play-json/target core/jvm/target scala-xml/target dsl/.jvm/target dropwizard-metrics/target jetty-server/target node-serverless/target ember-core/jvm/target jawn/.jvm/target server/js/target js-artifact-size-test/target ember-client/js/target bench/target project/target
 
       - name: Compress target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: tar cf targets.tar ember-core/js/target ember-server/js/target examples/ember-server-h2/target examples/ember/target examples/ember-client-h2/target blaze-client/target server/jvm/target examples/target scalafix-internal/input/target blaze-server/target scalafix-internal/tests/target scalatags/target target examples/docker/target twirl/target unidocs/target .js/target site/target laws/.jvm/target tests/jvm/target client/js/target tomcat-server/target prometheus-metrics/target scalafix-internal/output/target servlet/target examples/tomcat/target examples/jetty/target boopickle/.js/target testing/jvm/target core/js/target testing/js/target ember-server/jvm/target circe/.js/target okhttp-client/target laws/.js/target examples/blaze/target jawn/.js/target tests/js/target .jvm/target scalafix-internal/rules/target .native/target client/jvm/target blaze-core/target circe/.jvm/target dsl/.js/target examples/war/target jetty-client/target ember-client/jvm/target boopickle/.jvm/target play-json/target core/jvm/target scala-xml/target dsl/.jvm/target dropwizard-metrics/target jetty-server/target node-serverless/target ember-core/jvm/target jawn/.jvm/target server/js/target ember-client/js/target bench/target project/target
+        run: tar cf targets.tar ember-core/js/target ember-server/js/target examples/ember-server-h2/target examples/ember/target examples/ember-client-h2/target blaze-client/target server/jvm/target examples/target scalafix-internal/input/target blaze-server/target scalafix-internal/tests/target scalatags/target target examples/docker/target twirl/target unidocs/target .js/target site/target laws/.jvm/target tests/jvm/target client/js/target tomcat-server/target prometheus-metrics/target scalafix-internal/output/target servlet/target examples/tomcat/target examples/jetty/target boopickle/.js/target testing/jvm/target core/js/target testing/js/target ember-server/jvm/target circe/.js/target okhttp-client/target laws/.js/target examples/blaze/target jawn/.js/target tests/js/target .jvm/target scalafix-internal/rules/target .native/target client/jvm/target blaze-core/target circe/.jvm/target dsl/.js/target jetty-client/target ember-client/jvm/target boopickle/.jvm/target play-json/target core/jvm/target scala-xml/target dsl/.jvm/target dropwizard-metrics/target jetty-server/target node-serverless/target ember-core/jvm/target jawn/.jvm/target server/js/target js-artifact-size-test/target ember-client/js/target bench/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')

.scala-steward.conf

@@ -37,5 +37,7 @@ updates.ignore = [
   { groupId = "com.eed3si9n", artifactId = "sbt-buildinfo" },
   { groupId = "org.apache.tomcat" },
   { groupId = "com.github.sbt", artifactId = "sbt-native-packager" },
-  { groupId = "com.github.tkawachi", artifactId = "sbt-doctest" }
+  { groupId = "com.github.tkawachi", artifactId = "sbt-doctest" },
+  { groupId = "org.typelevel", artifactId = "cats-parse" },
+  { groupId = "org.scala-lang.modules", artifactId = "scala-xml" }
 ]

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.4.3
+version = 3.5.0
 
 style = default
 

blaze-client/src/main/scala/org/http4s/blaze/client/Http1Connection.scala

@@ -260,23 +260,9 @@ private final class Http1Connection[F[_]](
       idleTimeoutS: F[Either[Throwable, Unit]],
       idleRead: Option[Future[ByteBuffer]],
   ): F[Response[F]] =
-    F.async[Response[F]] { cb =>
-      F.delay {
-        idleRead match {
-          case Some(read) =>
-            handleRead(read, cb, closeOnFinish, doesntHaveBody, "Initial Read", idleTimeoutS)
-          case None =>
-            handleRead(
-              channelRead(),
-              cb,
-              closeOnFinish,
-              doesntHaveBody,
-              "Initial Read",
-              idleTimeoutS,
-            )
-        }
-        None
-      }
+    F.async_[Response[F]] { cb =>
+      val read = idleRead.getOrElse(channelRead())
+      handleRead(read, cb, closeOnFinish, doesntHaveBody, "Initial Read", idleTimeoutS)
     }
 
   // this method will get some data, and try to continue parsing using the implicit ec

blaze-core/src/main/scala/org/http4s/blazecore/IdleTimeoutStage.scala

@@ -90,18 +90,25 @@ private[http4s] final class IdleTimeoutStage[A](
     @tailrec def go(): Unit =
       timeoutState.get() match {
         case Disabled =>
-          val newCancel = exec.schedule(timeoutTask, timeout)
-          if (timeoutState.compareAndSet(Disabled, Enabled(timeoutTask, newCancel))) ()
-          else {
-            newCancel.cancel()
-            go()
+          tryScheduling(timeoutTask) match {
+            case Some(newCancel) =>
+              if (timeoutState.compareAndSet(Disabled, Enabled(timeoutTask, newCancel))) ()
+              else {
+                newCancel.cancel()
+                go()
+              }
+            case None => ()
           }
         case old @ Enabled(_, oldCancel) =>
-          val newCancel = exec.schedule(timeoutTask, timeout)
-          if (timeoutState.compareAndSet(old, Enabled(timeoutTask, newCancel))) oldCancel.cancel()
-          else {
-            newCancel.cancel()
-            go()
+          tryScheduling(timeoutTask) match {
+            case Some(newCancel) =>
+              if (timeoutState.compareAndSet(old, Enabled(timeoutTask, newCancel)))
+                oldCancel.cancel()
+              else {
+                newCancel.cancel()
+                go()
+              }
+            case None => ()
           }
         case _ => ()
       }
@@ -112,18 +119,21 @@ private[http4s] final class IdleTimeoutStage[A](
   @tailrec private def resetTimeout(): Unit =
     timeoutState.get() match {
       case old @ Enabled(timeoutTask, oldCancel) =>
-        val newCancel = exec.schedule(timeoutTask, timeout)
-        if (timeoutState.compareAndSet(old, Enabled(timeoutTask, newCancel))) oldCancel.cancel()
-        else {
-          newCancel.cancel()
-          resetTimeout()
+        tryScheduling(timeoutTask) match {
+          case Some(newCancel) =>
+            if (timeoutState.compareAndSet(old, Enabled(timeoutTask, newCancel))) oldCancel.cancel()
+            else {
+              newCancel.cancel()
+              resetTimeout()
+            }
+          case None => ()
         }
       case _ => ()
     }
 
   @tailrec def cancelTimeout(): Unit =
     timeoutState.get() match {
-      case old @ IdleTimeoutStage.Enabled(_, cancel) =>
+      case old @ Enabled(_, cancel) =>
         if (timeoutState.compareAndSet(old, Disabled)) cancel.cancel()
         else cancelTimeout()
       case _ => ()

build.sbt

@@ -75,14 +75,14 @@ lazy val modules: List[CompositeProject] = List(
   twirl,
   scalatags,
   bench,
+  jsArtifactSizeTest,
   unidocs,
   examples,
   examplesBlaze,
   examplesDocker,
   examplesEmber,
   examplesJetty,
   examplesTomcat,
-  examplesWar,
   scalafixInternalRules,
   scalafixInternalInput,
   scalafixInternalOutput,
@@ -100,10 +100,8 @@ lazy val root = tlCrossRootProject
   .aggregate(modules: _*)
 
 lazy val core = libraryCrossProject("core")
-  .enablePlugins(
-    BuildInfoPlugin,
-    MimeLoaderPlugin,
-  )
+  .enablePlugins(BuildInfoPlugin)
+  .jvmEnablePlugins(MimeLoaderPlugin)
   .settings(
     description := "Core http4s library for servers and clients",
     startYear := Some(2013),
@@ -536,6 +534,31 @@ lazy val bench = http4sProject("bench")
   )
   .dependsOn(core.jvm, circe.jvm, emberCore.jvm)
 
+lazy val jsArtifactSizeTest = http4sProject("js-artifact-size-test")
+  .enablePlugins(ScalaJSPlugin, NoPublishPlugin)
+  .settings(
+    scalaJSUseMainModuleInitializer := true,
+    Test / test := {
+      val log = streams.value.log
+      val file = (Compile / fullOptJS).value.data
+      val size = io.Using.fileInputStream(file) { in =>
+        var size = 0L
+        IO.gzip(in, _ => size += 1)
+        size
+      }
+      val sizeKB = size / 1000
+      // not a hard target. increase *moderately* if need be
+      // linking MimeDB results in a 100 KB increase. don't let that happen :)
+      val targetKB = 350
+      val msg = s"fullOptJS+gzip generated ${sizeKB} KB artifact (target: <$targetKB KB)"
+      if (sizeKB < targetKB)
+        log.info(msg)
+      else
+        sys.error(msg)
+    },
+  )
+  .dependsOn(client.js, circe.js)
+
 lazy val unidocs = http4sProject("unidocs")
   .enablePlugins(TypelevelUnidocPlugin)
   .settings(
@@ -550,7 +573,6 @@ lazy val unidocs = http4sProject("unidocs")
           examplesDocker,
           examplesJetty,
           examplesTomcat,
-          examplesWar,
           examplesEmber,
           exampleEmberServerH2,
           exampleEmberClientH2,
@@ -578,7 +600,6 @@ lazy val docs = http4sProject("site")
       cryptobits,
     ),
     description := "Documentation for http4s",
-    mdocIn := (Compile / sourceDirectory).value / "mdoc",
     tlFatalWarningsInCi := false,
     fork := false,
   )
@@ -674,18 +695,6 @@ lazy val examplesTomcat = exampleProject("examples-tomcat")
   )
   .dependsOn(tomcatServer)
 
-// Run this with jetty:start
-lazy val examplesWar = exampleProject("examples-war")
-  .enablePlugins(JettyPlugin)
-  .settings(
-    description := "Example of a WAR deployment of an http4s service",
-    startYear := Some(2014),
-    fork := true,
-    libraryDependencies += javaxServletApi % Provided,
-    Jetty / containerLibs := List(jettyRunner),
-  )
-  .dependsOn(servlet)
-
 lazy val scalafixInternalRules = project
   .in(file("scalafix-internal/rules"))
   .enablePlugins(NoPublishPlugin)

core/shared/src/main/scala/org/http4s/MediaType.scala

@@ -166,10 +166,7 @@ object MediaRange {
     if (subType === "*")
       MediaRange.standard.getOrElse(mainType.toLowerCase, new MediaRange(mainType))
     else
-      MediaType.all.getOrElse(
-        (mainType.toLowerCase, subType.toLowerCase),
-        new MediaType(mainType.toLowerCase, subType.toLowerCase),
-      )
+      MediaType.getMediaType(mainType, subType)
 
   implicit val http4sShowForMediaRange: Show[MediaRange] =
     Show.show(s => s"${s.mainType}/*${MediaRange.extensionsToString(s)}")
@@ -263,13 +260,24 @@ object MediaType extends MimeDB {
   // Curiously text/event-stream isn't included in MimeDB
   lazy val `text/event-stream` = new MediaType("text", "event-stream")
 
-  lazy val all: Map[(String, String), MediaType] =
-    (`text/event-stream` :: allMediaTypes)
-      .map(m => (m.mainType.toLowerCase, m.subType.toLowerCase) -> m)
-      .toMap
+  // Accessing this would force the entire MimeDB to be linked on JS (roughly 400 KB after fullOptJS).
+  // Anything that uses it (such as extensionMap) should be lazily initialized and never called in a
+  // JS application where artifact size matters (i.e. browser applications).
+  private[this] var _all: Map[(String, String), MediaType] = null
+  def all: Map[(String, String), MediaType] = {
+    if (_all eq null)
+      _all = (`text/event-stream` :: allMediaTypes)
+        .map(m => (m.mainType.toLowerCase, m.subType.toLowerCase) -> m)
+        .toMap
+    _all
+  }
 
-  val extensionMap: Map[String, MediaType] =
-    allMediaTypes.flatMap(m => m.fileExtensions.map(_ -> m)).toMap
+  private[this] var _extensionMap: Map[String, MediaType] = null
+  def extensionMap: Map[String, MediaType] = {
+    if (_extensionMap eq null)
+      _extensionMap = allMediaTypes.flatMap(m => m.fileExtensions.map(_ -> m)).toMap
+    _extensionMap
+  }
 
   val parser: Parser[MediaType] = {
     val mediaType = MediaRange.mediaRangeParser(getMediaType)
@@ -296,11 +304,17 @@ object MediaType extends MimeDB {
   def unsafeParse(s: String): MediaType =
     parse(s).fold(throw _, identity)
 
-  private[http4s] def getMediaType(mainType: String, subType: String): MediaType =
-    MediaType.all.getOrElse(
-      (mainType.toLowerCase, subType.toLowerCase),
-      new MediaType(mainType.toLowerCase, subType.toLowerCase),
-    )
+  private[http4s] def getMediaType(_mainType: String, _subType: String): MediaType = {
+    val mainType = _mainType.toLowerCase
+    val subType = _subType.toLowerCase
+    if (Platform.isJvm)
+      MediaType.all.getOrElse(
+        (mainType, subType),
+        new MediaType(mainType, subType),
+      )
+    else // don't link the MimeDB!!!!
+      new MediaType(mainType, subType, binary = isBinary(mainType, subType))
+  }
 
   implicit val http4sEqForMediaType: Eq[MediaType] =
     Eq.fromUniversalEquals
@@ -317,4 +331,79 @@ object MediaType extends MimeDB {
         writer
       }
     }
+
+  // this is duplicated from project/MimeLoader.scala
+  // but only includes trues since false is fallback
+  private[this] def isBinary(mainType: String, subType: String): Boolean =
+    mainType match {
+      case "audio" => true
+      case "image" => true
+      case "video" => true
+      case "application" =>
+        subType match {
+          case "base64" => true
+          case "excel" => true
+          case "font-woff" => true
+          case "gnutar" => true
+          case "gzip" => true
+          case "hal+json" => true
+          case "java-archive" => true
+          case "json" => true
+          case "lha" => true
+          case "lzx" => true
+          case "mspowerpoint" => true
+          case "msword" => true
+          case "octet-stream" => true
+          case "pdf" => true
+          case "problem+json" => true
+          case "postscript" => true
+          case "vnd.api+json" => true
+          case "vnd.google-earth.kmz" => true
+          case "vnd.ms-fontobject" => true
+          case "vnd.oasis.opendocument.chart" => true
+          case "vnd.oasis.opendocument.database" => true
+          case "vnd.oasis.opendocument.formula" => true
+          case "vnd.oasis.opendocument.graphics" => true
+          case "vnd.oasis.opendocument.image" => true
+          case "vnd.oasis.opendocument.presentation" => true
+          case "vnd.oasis.opendocument.spreadsheet" => true
+          case "vnd.oasis.opendocument.text" => true
+          case "vnd.oasis.opendocument.text-master" => true
+          case "vnd.oasis.opendocument.text-web" => true
+          case "vnd.openxmlformats-officedocument.presentationml.presentation" => true
+          case "vnd.openxmlformats-officedocument.presentationml.slide" => true
+          case "vnd.openxmlformats-officedocument.presentationml.slideshow" => true
+          case "vnd.openxmlformats-officedocument.presentationml.template" => true
+          case "vnd.openxmlformats-officedocument.spreadsheetml.sheet" => true
+          case "vnd.openxmlformats-officedocument.spreadsheetml.template" => true
+          case "vnd.openxmlformats-officedocument.wordprocessingml.document" => true
+          case "vnd.openxmlformats-officedocument.wordprocessingml.template" => true
+          case "x-7z-compressed" => true
+          case "x-ace-compressed" => true
+          case "x-apple-diskimage" => true
+          case "x-arc-compressed" => true
+          case "x-bzip" => true
+          case "x-bzip2" => true
+          case "x-chrome-extension" => true
+          case "x-compress" => true
+          case "x-debian-package" => true
+          case "x-dvi" => true
+          case "x-font-truetype" => true
+          case "x-font-opentype" => true
+          case "x-gtar" => true
+          case "x-gzip" => true
+          case "x-latex" => true
+          case "x-rar-compressed" => true
+          case "x-redhat-package-manager" => true
+          case "x-shockwave-flash" => true
+          case "x-tar" => true
+          case "x-tex" => true
+          case "x-texinfo" => true
+          case "x-x509-ca-cert" => true
+          case "x-xpinstall" => true
+          case "zip" => true
+          case _ => false
+        }
+      case _ => false
+    }
 }