Merge branch 'develop' into docs/partial-messages-design

lucassaldanha · web-flow · commit 1d037d4766ad · 2026-04-26T11:40:17.000+02:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,9 +18,9 @@ plugins {
     id("java")
     id("maven-publish")
     id("org.jetbrains.dokka").version("1.9.20")
-    id("com.diffplug.spotless").version("6.25.0")
+    id("com.diffplug.spotless").version("7.2.1")
     id("java-test-fixtures")
-    id("io.spring.dependency-management").version("1.1.6")
+    id("io.spring.dependency-management").version("1.1.7")
 
     id("org.jetbrains.kotlin.android") version kotlinVersion apply false
     id("com.android.application") version "7.4.2" apply false
@@ -63,6 +63,8 @@ configure(
 
         testImplementation("org.junit.jupiter:junit-jupiter")
         testImplementation("org.junit.jupiter:junit-jupiter-params")
+        testImplementation("org.junit.platform:junit-platform-launcher")
+        testRuntimeOnly("org.junit.platform:junit-platform-engine")
         testImplementation("io.mockk:mockk")
         testImplementation("org.assertj:assertj-core")
         testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j2-impl")
@@ -84,6 +86,9 @@ configure(
     tasks.withType<Copy> {
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
     }
+    tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
+        jvmTarget = "11"
+    }
 
 // Parallel build execution
     tasks.test {
@@ -108,8 +113,10 @@ configure(
     }
 
     configure<SpotlessExtension> {
+        // https://github.com/pinterest/ktlint/releases
+        val ktlintVersion = "1.1.1"
         kotlin {
-            ktlint().editorConfigOverride(
+            ktlint(ktlintVersion).editorConfigOverride(
                 mapOf(
                     "ktlint_standard_no-wildcard-imports" to "disabled",
                     "ktlint_standard_enum-entry-name-case" to "disabled",
@@ -140,7 +147,7 @@ configure(
                 jdkVersion.set(11)
                 reportUndocumented.set(false)
                 externalDocumentationLink {
-                    url.set(URI.create("https://netty.io/4.1/api/").toURL())
+                    url.set(URI.create("https://netty.io/4.2/api/").toURL())
                 }
             }
         }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionSha256Sum=bd71102213493060956ec229d946beee57158dbd89d0e62b91bca0fa2c5f3531
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/libp2p/build.gradle.kts b/libp2p/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("com.google.protobuf").version("0.9.4")
-    id("me.champeau.jmh").version("0.7.2")
+    id("me.champeau.jmh").version("0.7.3")
 }
 
 // https://docs.gradle.org/current/userguide/java_testing.html#ex-disable-publishing-of-test-fixtures-variants
@@ -46,8 +46,6 @@ dependencies {
     testFixturesImplementation("org.junit.jupiter:junit-jupiter-api")
 
     jmhImplementation(project(":tools:schedulers"))
-    jmhImplementation("org.openjdk.jmh:jmh-core")
-    jmhAnnotationProcessor("org.openjdk.jmh:jmh-generator-annprocess")
 }
 
 protobuf {
diff --git a/libp2p/src/jmh/java/io/libp2p/pubsub/gossip/GossipScoreBenchmark.java b/libp2p/src/jmh/java/io/libp2p/pubsub/gossip/GossipScoreBenchmark.java
@@ -107,12 +107,4 @@ public void scoresDelay10000(Blackhole bh) {
       bh.consume(s);
     }
   }
-
-  /** Uncomment for debugging */
-  //    public static void main(String[] args) {
-  //        GossipScoreBenchmark benchmark = new GossipScoreBenchmark();
-  //        Blackhole blackhole = new Blackhole("Today's password is swordfish. I understand
-  // instantiating Blackholes directly is dangerous.");
-  //        benchmark.scoresDelay0(blackhole);
-  //    }
 }
diff --git a/libp2p/src/main/kotlin/io/libp2p/etc/util/netty/mux/MuxChannel.kt b/libp2p/src/main/kotlin/io/libp2p/etc/util/netty/mux/MuxChannel.kt
@@ -32,13 +32,20 @@ class MuxChannel<TData>(
         initializer(this)
     }
 
+    @Suppress("SwallowedException")
     override fun doWrite(buf: ChannelOutboundBuffer) {
         while (true) {
             val msg = buf.current() ?: break
+            if (localDisconnected) {
+                // Must not throw from doWrite — exceptions escape uncaught to the Netty event loop.
+                // Wrap buf.remove() defensively: in some Netty versions promise listeners triggered
+                // by buf.remove() can propagate back through it.
+                try {
+                    buf.remove(ConnectionClosedException("The stream was closed for writing locally: $id"))
+                } catch (e: Throwable) { }
+                continue
+            }
             try {
-                if (localDisconnected) {
-                    throw ConnectionClosedException("The stream was closed for writing locally: $id")
-                }
                 // the msg is released by both onChildWrite and buf.remove() so we need to retain
                 // however it is still to be confirmed that no buf leaks happen here TODO
                 ReferenceCountUtil.retain(msg)
diff --git a/libp2p/src/test/kotlin/io/libp2p/mux/MuxHandlerAbstractTest.kt b/libp2p/src/test/kotlin/io/libp2p/mux/MuxHandlerAbstractTest.kt
@@ -6,6 +6,7 @@ import io.libp2p.core.StreamHandler
 import io.libp2p.etc.types.fromHex
 import io.libp2p.etc.types.getX
 import io.libp2p.etc.types.toHex
+import io.libp2p.etc.util.netty.mux.MuxChannel
 import io.libp2p.etc.util.netty.mux.RemoteWriteClosed
 import io.libp2p.etc.util.netty.nettyInitializer
 import io.libp2p.mux.MuxHandlerAbstractTest.AbstractTestMuxFrame.Flag.*
@@ -442,6 +443,26 @@ abstract class MuxHandlerAbstractTest {
         }
     }
 
+    @Test
+    fun `write with localDisconnected should fail promise without throwing from doWrite`() {
+        val handler = openStreamLocal()
+        readFrameOrThrow()
+
+        // Simulate the state between localDisconnected=true and deactivate() in doDisconnect(),
+        // which is when a queued WriteTask can reach doWrite with localDisconnected=true while
+        // the channel is still active (flush0 would take the "not-yet-connected" path otherwise).
+        @Suppress("UNCHECKED_CAST")
+        (handler.ctx.channel() as MuxChannel<ByteBuf>).localDisconnected = true
+
+        val writeFuture = handler.ctx.writeAndFlush(allocateMessage("42"))
+        ech.runPendingTasks()
+
+        assertTrue(writeFuture.isDone)
+        assertThrows(ConnectionClosedException::class.java) {
+            writeFuture.sync()
+        }
+    }
+
     @Test
     fun `should throw when writing to reset stream`() {
         val handler = openStreamLocal()
diff --git a/libp2p/src/test/kotlin/io/libp2p/pubsub/gossip/GossipRpcPartsQueueTest.kt b/libp2p/src/test/kotlin/io/libp2p/pubsub/gossip/GossipRpcPartsQueueTest.kt
@@ -8,6 +8,7 @@ import io.libp2p.pubsub.gossip.builders.GossipParamsBuilder
 import io.libp2p.pubsub.gossip.builders.GossipRouterBuilder
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedInvocationConstants
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.MethodSource
@@ -186,7 +187,7 @@ class GossipRpcPartsQueueTest {
         fun mergeParams(): Stream<Arguments> = testCases.stream()
     }
 
-    @ParameterizedTest(name = "[${ParameterizedTest.INDEX_PLACEHOLDER}] {0}")
+    @ParameterizedTest(name = "[${ParameterizedInvocationConstants.INDEX_PLACEHOLDER}] {0}")
     @MethodSource("mergeParams")
     fun `mergeMessageParts() test various combinations`(
         gossipParams: GossipParams,
diff --git a/versions.gradle b/versions.gradle
@@ -9,29 +9,29 @@ dependencyManagement {
         dependency "com.google.guava:guava:33.3.1-jre"
 
         dependency "org.slf4j:slf4j-api:2.0.9"
-        dependencySet(group: 'org.apache.logging.log4j', version: '2.24.1') {
+        dependencySet(group: 'org.apache.logging.log4j', version: '2.25.4') {
             entry 'log4j-core'
             entry 'log4j-slf4j2-impl'
         }
 
-        dependencySet(group: 'org.junit.jupiter', version: '5.11.3') {
+        dependencySet(group: 'org.junit.jupiter', version: '5.13.4') {
             entry 'junit-jupiter-api'
             entry 'junit-jupiter-engine'
             entry 'junit-jupiter-params'
         }
-        dependency "io.mockk:mockk:1.13.3"
-        dependency "org.assertj:assertj-core:3.26.3"
+        dependencySet(group: 'org.junit.platform', version: '1.13.4') {
+            entry 'junit-platform-launcher'
+            entry 'junit-platform-engine'
 
-        dependencySet(group: "org.openjdk.jmh", version: "1.37") {
-            entry 'jmh-core'
-            entry 'jmh-generator-annprocess'
         }
+        dependency "io.mockk:mockk:1.13.3"
+        dependency "org.assertj:assertj-core:3.27.4"
 
         dependencySet(group: "com.google.protobuf", version: "3.25.5") {
             entry 'protobuf-java'
             entry 'protoc'
         }
-        dependencySet(group: "io.netty", version: "4.2.5.Final") {
+        dependencySet(group: "io.netty", version: "4.2.10.Final") {
             entry 'netty-common'
             entry 'netty-handler'
             entry 'netty-transport'
@@ -41,7 +41,7 @@ dependencyManagement {
             entry 'netty-codec-native-quic'
             entry 'netty-transport-classes-epoll'
         }
-        dependency "io.netty:netty-tcnative-boringssl-static:2.0.73.Final"
+        dependency "io.netty:netty-tcnative-boringssl-static:2.0.76.Final"
         dependency "com.github.multiformats:java-multibase:v1.1.1"
         dependency "tech.pegasys:noise-java:22.1.0"
         dependencySet(group: "org.bouncycastle", version: "1.78.1") {
@@ -50,4 +50,4 @@ dependencyManagement {
             entry 'bctls-jdk18on'
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id("com.google.protobuf").version("0.9.4")`
`3`		`- id("me.champeau.jmh").version("0.7.2")`
	`3`	`+ id("me.champeau.jmh").version("0.7.3")`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`// https://docs.gradle.org/current/userguide/java_testing.html#ex-disable-publishing-of-test-fixtures-variants`
`@@ -46,8 +46,6 @@ dependencies {`
`46`	`46`	`testFixturesImplementation("org.junit.jupiter:junit-jupiter-api")`
`47`	`47`
`48`	`48`	`jmhImplementation(project(":tools:schedulers"))`
`49`		`- jmhImplementation("org.openjdk.jmh:jmh-core")`
`50`		`- jmhAnnotationProcessor("org.openjdk.jmh:jmh-generator-annprocess")`
`51`	`49`	`}`
`52`	`50`
`53`	`51`	`protobuf {`
Original file line number	Diff line number	Diff line change
`@@ -107,12 +107,4 @@ public void scoresDelay10000(Blackhole bh) {`
`107`	`107`	`bh.consume(s);`
`108`	`108`	`}`
`109`	`109`	`}`
`110`		`-`
`111`		`- /** Uncomment for debugging */`
`112`		`- // public static void main(String[] args) {`
`113`		`- // GossipScoreBenchmark benchmark = new GossipScoreBenchmark();`
`114`		`- // Blackhole blackhole = new Blackhole("Today's password is swordfish. I understand`
`115`		`- // instantiating Blackholes directly is dangerous.");`
`116`		`- // benchmark.scoresDelay0(blackhole);`
`117`		`- // }`
`118`	`110`	`}`