Add Yamux and TLS and fix multiaddr (WIP)

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 11
+          java-version: 17
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2

build.gradle.kts

@@ -36,27 +36,40 @@ allprojects {
     apply(plugin = "io.spring.dependency-management")
     apply(from = "$rootDir/versions.gradle")
 
+
     repositories {
         mavenCentral()
         maven("https://artifacts.consensys.net/public/maven/maven/")
+        maven("https://jitpack.io")
+    }
+
+    sourceSets.create("jmh") {
+        compileClasspath += sourceSets["main"].runtimeClasspath
+        compileClasspath += sourceSets["testFixtures"].runtimeClasspath
+        runtimeClasspath += sourceSets["main"].runtimeClasspath
+        runtimeClasspath += sourceSets["testFixtures"].runtimeClasspath
     }
 
     dependencies {
+        api("io.netty:netty-buffer:4.1.88.Final")
+        api("io.netty:netty-codec-http2:4.1.88.Final")
+        api("io.netty:netty-transport:4.1.88.Final")
+        api("io.netty:netty-transport-classes-epoll:4.1.88.Final")
+        api("com.google.protobuf:protobuf-java:3.21.9")
+
+        implementation("com.github.peergos:noise-java:22.1.0")
 
-        implementation(kotlin("stdlib-jdk8"))
-        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
+        implementation("org.bouncycastle:bcprov-jdk15on:1.70")
+        implementation("org.bouncycastle:bcpkix-jdk15on:1.70")
 
-        implementation("com.google.guava:guava")
-        implementation("org.apache.logging.log4j:log4j-api")
+        implementation("com.github.multiformats:java-multibase:v1.1.1")
 
-        testFixturesImplementation("org.apache.logging.log4j:log4j-api")
-        testFixturesImplementation("com.google.guava:guava")
+        testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.1")
+        testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.1")
+        testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.1")
 
-        testImplementation("org.junit.jupiter:junit-jupiter")
-        testImplementation("org.junit.jupiter:junit-jupiter-params")
-        testImplementation("io.mockk:mockk")
-        testImplementation("org.assertj:assertj-core")
-        testImplementation("org.apache.logging.log4j:log4j-core")
+        testImplementation("io.mockk:mockk:1.12.2")
+        testImplementation("org.assertj:assertj-core:3.23.1")
     }
 
     java {
@@ -72,88 +85,101 @@ allprojects {
             freeCompilerArgs = listOf("-Xjvm-default=all")
         }
     }
+
     tasks.withType<Copy> {
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
     }
 
-// Parallel build execution
-    tasks.test {
-        description = "Runs the unit tests."
+    java {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
 
-        useJUnitPlatform {
-            excludeTags("interop")
+    tasks.withType<KotlinCompile> {
+        kotlinOptions.jvmTarget = "17"
+        kotlinOptions {
+            freeCompilerArgs = listOf("-Xjvm-default=all")
         }
 
-        testLogging {
-            events("FAILED")
-            exceptionFormat = TestExceptionFormat.FULL
-            showCauses = true
-            showExceptions = true
-            showStackTraces = true
-        }
+// Parallel build execution
+        tasks.test {
+            description = "Runs the unit tests."
+
+            useJUnitPlatform {
+                excludeTags("interop")
+            }
 
-        // disabling the parallel test runs for the time being due to port collisions
-        // If GRADLE_MAX_TEST_FORKS is not set, use half the available processors
+            testLogging {
+                events("FAILED")
+                exceptionFormat = TestExceptionFormat.FULL
+                showCauses = true
+                showExceptions = true
+                showStackTraces = true
+            }
+
+            // disabling the parallel test runs for the time being due to port collisions
+            // If GRADLE_MAX_TEST_FORKS is not set, use half the available processors
 //    maxParallelForks = (System.getenv("GRADLE_MAX_TEST_FORKS")?.toInt() ?:
 //    Runtime.getRuntime().availableProcessors().div(2))
-    }
+        }
 
-    kotlinter {
-        disabledRules = arrayOf("no-wildcard-imports", "enum-entry-name-case")
-    }
+        kotlinter {
+            disabledRules = arrayOf("no-wildcard-imports", "enum-entry-name-case")
+        }
 
-    val sourcesJar by tasks.registering(Jar::class) {
-        archiveClassifier.set("sources")
-        from(sourceSets.main.get().allSource)
-    }
+        val sourcesJar by tasks.registering(Jar::class) {
+            archiveClassifier.set("sources")
+            from(sourceSets.main.get().allSource)
+        }
 
-    tasks.dokkaHtml.configure {
-        outputDirectory.set(buildDir.resolve("dokka"))
-        dokkaSourceSets {
-            configureEach {
-                jdkVersion.set(11)
-                reportUndocumented.set(false)
-                externalDocumentationLink {
-                    url.set(URL("https://netty.io/4.1/api/"))
+        tasks.dokkaHtml.configure {
+            outputDirectory.set(buildDir.resolve("dokka"))
+            dokkaSourceSets {
+                configureEach {
+                    jdkVersion.set(17)
+                    reportUndocumented.set(false)
+                    externalDocumentationLink {
+                        url.set(URL("https://netty.io/4.1/api/"))
+                    }
                 }
             }
         }
-    }
 
-    val dokkaJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
-        group = JavaBasePlugin.DOCUMENTATION_GROUP
-        val dokkaJavadocTask = tasks.getByName("dokkaJavadoc")
-        dependsOn(dokkaJavadocTask)
-        archiveClassifier.set("javadoc")
-        from(dokkaJavadocTask.outputs)
-    }
+        val dokkaJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
+            group = JavaBasePlugin.DOCUMENTATION_GROUP
+            val dokkaJavadocTask = tasks.getByName("dokkaJavadoc")
+            dependsOn(dokkaJavadocTask)
+            archiveClassifier.set("javadoc")
+            from(dokkaJavadocTask.outputs)
+        }
 
-    publishing {
-        repositories {
-            maven {
-                name = "cloudsmith"
-                url = uri("https://api-g.cloudsmith.io/maven/libp2p/jvm-libp2p")
-                credentials {
-                    username = findProperty("cloudsmithUser") as String?
-                    password = findProperty("cloudsmithApiKey") as String?
+        publishing {
+            repositories {
+                maven {
+                    name = "cloudsmith"
+                    url = uri("https://api-g.cloudsmith.io/maven/libp2p/jvm-libp2p")
+                    credentials {
+                        username = findProperty("cloudsmithUser") as String?
+                        password = findProperty("cloudsmithApiKey") as String?
+                    }
                 }
             }
-        }
-        if (hasProperty("mavenArtifactId")) {
-            publications {
-                register("mavenJava", MavenPublication::class) {
-                    from(components["java"])
-                    artifact(sourcesJar.get())
-                    artifact(dokkaJar.get())
-                    groupId = "io.libp2p"
-                    artifactId = project.property("mavenArtifactId") as String
+            if (hasProperty("mavenArtifactId")) {
+                publications {
+                    register("mavenJava", MavenPublication::class) {
+                        from(components["java"])
+                        artifact(sourcesJar.get())
+                        artifact(dokkaJar.get())
+                        groupId = "io.libp2p"
+                        artifactId = project.property("mavenArtifactId") as String
+                    }
                 }
             }
         }
-    }
 
-    detekt {
-        config = files("$rootDir/detekt/config.yml")
-        buildUponDefaultConfig = true
+        detekt {
+            config = files("$rootDir/detekt/config.yml")
+            buildUponDefaultConfig = true
+        }
     }
 }

jitpack.yml

@@ -0,0 +1,2 @@
+jdk:
+  - openjdk17

libp2p/src/main/java/io/libp2p/core/dsl/HostBuilder.java

@@ -3,16 +3,15 @@
 import io.libp2p.core.Host;
 import io.libp2p.core.crypto.PrivKey;
 import io.libp2p.core.multistream.ProtocolBinding;
-import io.libp2p.core.mux.StreamMuxerProtocol;
+import io.libp2p.core.mux.*;
 import io.libp2p.core.security.SecureChannel;
 import io.libp2p.core.transport.Transport;
 import io.libp2p.transport.ConnectionUpgrader;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.function.Function;
-import java.util.function.Supplier;
+import java.util.function.*;
 
 public class HostBuilder {
     public HostBuilder() { this(DefaultMode.Standard); }
@@ -41,7 +40,7 @@ public final HostBuilder transport(
 
     @SafeVarargs
     public final HostBuilder secureChannel(
-            Function<PrivKey, SecureChannel>... secureChannels) {
+            BiFunction<PrivKey, List<String>, SecureChannel>... secureChannels) {
         secureChannels_.addAll(Arrays.asList(secureChannels));
         return this;
     }
@@ -76,7 +75,7 @@ public Host build() {
                     b.getTransports().add(t::apply)
                 );
                 secureChannels_.forEach(sc ->
-                    b.getSecureChannels().add(sc::apply)
+                    b.getSecureChannels().add((k, m) -> sc.apply(k, (List<String>)m))
                 );
                 muxers_.forEach(m ->
                     b.getMuxers().add(m.get())
@@ -91,7 +90,7 @@ public Host build() {
 
     private DefaultMode defaultMode_;
     private List<Function<ConnectionUpgrader, Transport>> transports_ = new ArrayList<>();
-    private List<Function<PrivKey, SecureChannel>> secureChannels_ = new ArrayList<>();
+    private List<BiFunction<PrivKey, List<String>, SecureChannel>> secureChannels_ = new ArrayList<>();
     private List<Supplier<StreamMuxerProtocol>> muxers_ = new ArrayList<>();
     private List<ProtocolBinding<?>> protocols_ = new ArrayList<>();
     private List<String> listenAddresses_ = new ArrayList<>();