Merge branch 'series/0.5' into series/0.7

Author: hamnis

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
@@ -46,7 +46,7 @@ jobs:
       - name: Setup Java (temurin@17)
         id: setup-java-temurin-17
         if: matrix.java == 'temurin@17'
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 17
@@ -92,7 +92,7 @@ jobs:
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
           path: targets.tar
@@ -108,7 +108,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
@@ -118,7 +118,7 @@ jobs:
       - name: Setup Java (temurin@17)
         id: setup-java-temurin-17
         if: matrix.java == 'temurin@17'
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 17
@@ -129,7 +129,7 @@ jobs:
         run: sbt +update
 
       - name: Download target directories (2.13, rootJVM)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM
 
@@ -139,7 +139,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.12, rootJVM)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM
 
@@ -149,7 +149,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (3, rootJVM)
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v6
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM
 
@@ -192,7 +192,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
@@ -202,7 +202,7 @@ jobs:
       - name: Setup Java (temurin@17)
         id: setup-java-temurin-17
         if: matrix.java == 'temurin@17'
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 17
@@ -227,12 +227,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (fast)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Java (temurin@11)
         id: setup-java-temurin-11
         if: matrix.java == 'temurin@11'
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 11

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.9.4
+version = 3.10.2
 runner.dialect = scala213
 style = default
 

build.sbt

@@ -1,7 +1,7 @@
 import com.typesafe.tools.mima.core._
 
 val Scala212 = "2.12.20"
-val Scala213 = "2.13.16"
+val Scala213 = "2.13.18"
 
 inThisBuild(
   Seq(
@@ -13,21 +13,21 @@ inThisBuild(
     ),
     licenses := Seq(License.Apache2),
     tlBaseVersion := "0.7",
-    crossScalaVersions := Seq(Scala213, Scala212, "3.3.6"),
+    crossScalaVersions := Seq(Scala213, Scala212, "3.3.7"),
     ThisBuild / scalaVersion := Scala213,
     tlJdkRelease := Some(11),
     githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"))
   )
 )
 
-val http4sVersion = "0.23.30"
+val http4sVersion = "0.23.33"
 
-val jetty = "12.0.25"
+val jetty = "12.1.5"
 
-val netty = "4.2.4.Final"
+val netty = "4.2.7.Final"
 
-val munit = "1.1.1"
-val munitScalaCheck = "1.1.0"
+val munit = "1.2.1"
+val munitScalaCheck = "1.2.0"
 
 val nativeNettyModules =
   Seq(
@@ -51,7 +51,7 @@ lazy val core = project
     libraryDependencies ++= List(
       "co.fs2" %% "fs2-core" % "3.12.0",
       "org.reactivestreams" % "reactive-streams-flow-adapters" % "1.0.2",
-      ("org.playframework.netty" % "netty-reactive-streams-http" % "3.0.4")
+      ("org.playframework.netty" % "netty-reactive-streams-http" % "3.0.6")
         .exclude("io.netty", "netty-codec-http")
         .exclude("io.netty", "netty-handler"),
       "io.netty" % "netty-codec-http" % netty,

project/build.properties

@@ -1 +1 @@
-sbt.version=1.11.4
+sbt.version=1.11.7

project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("org.http4s" % "sbt-http4s-org" % "2.0.0")
+addSbtPlugin("org.http4s" % "sbt-http4s-org" % "2.0.3")

server/src/main/scala/org/http4s/netty/server/ServerNettyModelConversion.scala

@@ -42,6 +42,7 @@ import org.http4s.Response
 import org.http4s.internal.tls._
 import org.http4s.netty.NettyModelConversion
 import org.http4s.netty.NettyModelConversion.bytebufToArray
+import org.http4s.netty.server.websocket.ZeroCopyBinaryText
 import org.http4s.server.SecureSession
 import org.http4s.server.ServerRequestKeys
 import org.http4s.websocket.WebSocketCombinedPipe
@@ -210,6 +211,9 @@ private[server] final class ServerNettyModelConversion[F[_]](implicit F: Async[F
   private[this] def wsbitsToNetty(w: WebSocketFrame): WSFrame =
     w match {
       case Text(str, last) => new TextWebSocketFrame(last, 0, str)
+      case ZeroCopyBinaryText(data, last) =>
+        // data.toArrayUnsafe to avoid copying the underlying array
+        new TextWebSocketFrame(last, 0, Unpooled.wrappedBuffer(data.toArrayUnsafe))
       case Binary(data, last) =>
         new BinaryWebSocketFrame(last, 0, Unpooled.wrappedBuffer(data.toArray))
       case Ping(data) => new PingWebSocketFrame(Unpooled.wrappedBuffer(data.toArray))

server/src/main/scala/org/http4s/netty/server/websocket/ZeroCopyBinaryText.scala

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2020 http4s.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.http4s.netty.server.websocket
+
+import org.http4s.websocket.WebSocketFrame
+import scodec.bits.ByteVector
+
+import java.nio.charset.StandardCharsets
+
+final case class ZeroCopyBinaryText(data: ByteVector, last: Boolean) extends WebSocketFrame {
+
+  lazy val str: String = new String(data.toArray, StandardCharsets.UTF_8)
+
+  override val opcode: Int = 0x1
+
+  override def toString: String = s"ZeroCopyBinaryText('$str', last: $last)"
+}
+
+object ZeroCopyBinaryText {
+  def unsafe(data: Array[Byte], last: Boolean): ZeroCopyBinaryText =
+    ZeroCopyBinaryText(ByteVector.view(data), last)
+}

server/src/test/scala/org/http4s/netty/server/ServerTest.scala

@@ -168,8 +168,6 @@ abstract class ServerTest extends IOSuite {
     server.use { server =>
       IO.delay {
         val http2 = new HttpClientTransportOverHTTP2(new HTTP2Client())
-        http2.setUseALPN(false)
-
         val client = new HttpClient(http2)
         client.start()
         try {

server/src/test/scala/org/http4s/netty/server/WebsocketTest.scala

@@ -29,13 +29,16 @@ import org.http4s.dsl.io._
 import org.http4s.implicits._
 import org.http4s.jdkhttpclient.JdkWSClient
 import org.http4s.netty.client.NettyWSClientBuilder
+import org.http4s.netty.server.websocket.ZeroCopyBinaryText
 import org.http4s.server.websocket.WebSocketBuilder2
+import org.http4s.websocket.WebSocketFrame
 import scodec.bits.ByteVector
 
 import java.net.http.HttpClient
 import scala.concurrent.duration.DurationInt
 
 abstract class WebsocketTest(_client: Resource[IO, WSClient[IO]]) extends IOSuite {
+
   import WebsocketTest._
 
   val server: IOFixture[Uri] = resourceFixture(
@@ -62,6 +65,7 @@ abstract class WebsocketTest(_client: Resource[IO, WSClient[IO]]) extends IOSuit
       .use { conn =>
         for {
           _ <- conn.send(WSFrame.Text("bar"))
+          _ <- conn.send(WSFrame.Text("zero-copy"))
           _ <- conn.sendMany(List(WSFrame.Binary(ByteVector(3, 99, 12)), WSFrame.Text("foo")))
           _ <- conn.send(WSFrame.Close(1000, "goodbye"))
           recv <- conn.receiveStream.compile.toList
@@ -70,6 +74,7 @@ abstract class WebsocketTest(_client: Resource[IO, WSClient[IO]]) extends IOSuit
       .assertEquals(
         List(
           WSFrame.Text("bar"),
+          WSFrame.Text("zero-copy"),
           WSFrame.Binary(ByteVector(3, 99, 12)),
           WSFrame.Text("foo"),
           WSFrame.Close(1000, "goodbye")
@@ -82,15 +87,22 @@ abstract class WebsocketTest(_client: Resource[IO, WSClient[IO]]) extends IOSuit
       .use { conn =>
         for {
           _ <- conn.send(WSFrame.Binary(ByteVector(15, 2, 3)))
-          _ <- conn.sendMany(List(WSFrame.Text("foo"), WSFrame.Text("bar")))
-          recv <- conn.receiveStream.take(3).compile.toList
+          _ <- conn.sendMany(
+            List(
+              WSFrame.Text("foo"),
+              WSFrame.Text("bar"),
+              WSFrame.Text("zero-copy"),
+              WSFrame.Text("zero-copy-unsafe")))
+          recv <- conn.receiveStream.take(5).compile.toList
         } yield recv
       }
       .assertEquals(
         List(
           WSFrame.Binary(ByteVector(15, 2, 3)),
           WSFrame.Text("foo"),
-          WSFrame.Text("bar")
+          WSFrame.Text("bar"),
+          WSFrame.Text("zero-copy"),
+          WSFrame.Text("zero-copy-unsafe")
         )
       )
   }
@@ -99,7 +111,15 @@ abstract class WebsocketTest(_client: Resource[IO, WSClient[IO]]) extends IOSuit
 object WebsocketTest {
   def echoRoutes(ws: WebSocketBuilder2[IO]): HttpRoutes[IO] =
     HttpRoutes.of[IO] { case _ -> Root / "echo" =>
-      ws.build(identity)
+      ws.build {
+        _.map {
+          case t: WebSocketFrame.Text if t.str == "zero-copy-unsafe" =>
+            ZeroCopyBinaryText.unsafe("zero-copy-unsafe".getBytes, last = true)
+          case t: WebSocketFrame.Text if t.str == "zero-copy" =>
+            ZeroCopyBinaryText(ByteVector("zero-copy".getBytes), last = true)
+          case frame => frame
+        }
+      }
     }
 }