dorkbox · dorkbox · Jul 23, 2023 · Jul 24, 2023 · Jul 24, 2023 · Jul 24, 2023
diff --git a/LICENSE b/LICENSE
diff --git a/LICENSE.MPLv2 b/LICENSE.MPLv2
diff --git a/README.md b/README.md
@@ -1,89 +1,66 @@
 Network
 =======
 
-###### [![Dorkbox](https://badge.dorkbox.com/dorkbox.svg "Dorkbox")](https://git.dorkbox.com/dorkbox/Network) [![Github](https://badge.dorkbox.com/github.svg "Github")](https://github.com/dorkbox/Network) [![Gitlab](https://badge.dorkbox.com/gitlab.svg "Gitlab")](https://gitlab.com/dorkbox/Network) [![Bitbucket](https://badge.dorkbox.com/bitbucket.svg "Bitbucket")](https://bitbucket.org/dorkbox/Network)
+###### [![Dorkbox](https://badge.dorkbox.com/dorkbox.svg "Dorkbox")](https://git.dorkbox.com/dorkbox/Network) [![Github](https://badge.dorkbox.com/github.svg "Github")](https://github.com/dorkbox/Network) [![Gitlab](https://badge.dorkbox.com/gitlab.svg "Gitlab")](https://gitlab.com/dorkbox/Network)
 
 
-The Network project is an encrypted, high-performance, event-driven/reactive Network stack with DNS and RMI, using Netty, Kryo, KryoNet RMI, and LZ4 via TCP/UDP. 
+The Network project is an ~~encrypted~~, high-performance, event-driven/reactive Network stack with DNS and RMI, using Aeron, Kryo, KryoNet RMI, ~~encryption and LZ4 via UDP.~~ 
 
 These are the main features:
-* The connection between endpoints is AES256-GCM / EC curve25519. (WIP, this was updated for use with Aeron, which changes this)
-* The connection data is LZ4 compressed and byte-packed for small payload sizes. (WIP, this was updated for use with Aeron, which 
-  changes this)
-- The connection supports:
+
+~~* The connection between endpoints is AES256-GCM / EC curve25519. (WIP, this was updated for use with Aeron, which changes this)~~
+~~* The connection data is LZ4 compressed and byte-packed for small payload sizes. (WIP, this was updated for use with Aeron, which 
+  changes this)~~
+### The connection supports:
+ - Sending object (via the Kryo serialization framework)
+ - Sending arbitrarily large objects
  - Remote Method Invocation
    - Blocking
    - Non-Blocking
    - Void returns
    - Exceptions can be returned
    - Kotlin coroutine suspend functions
- - Sending data when Idle
+ - ~~Sending data when Idle~~
  - "Pinging" the remote end (for measuring round-trip time)
  - Firewall connections by IP+CIDR
- - Specify the connection type (nothing, compress, compress+encrypt)
+ - ~~Specify the connection type (nothing, compress, compress+encrypt)~~
 
+- The available transports is UDP
 
-- The available transports are TCP and UDP
-- There are simple wrapper classes for:
-  - Server
-  - Client
-  * MultiCast Broadcast client and server discovery (WIP, this was updated for use with Aeron, which changes this)
-
-
-- Note: There is a maximum packet size for UDP, 508 bytes *to guarantee it's unfragmented*
-
-- This is for cross-platform use, specifically - linux 32/64, mac 64, and windows 32/64. Java 1.8+
+- This is for cross-platform use, specifically - linux 32/64, mac 64, and windows 32/64. Java 1.11+
+- This library is designed to be used with kotlin, specifically the use of coroutines.
 
 ``` java
-public static
-class AMessage {
-    public
-    AMessage() {
-    }
+val configurationServer = ServerConfiguration()
+configurationServer.settingsStore = Storage.Memory() // don't want to persist anything on disk!
+configurationServer.port = 2000
+configurationServer.enableIPv4 = true
+
+val server: Server<Connection> = Server(configurationServer)
+
+server.onMessage<String> { message ->
+    logger.error("Received message '$message'")
 }
 
-KryoCryptoSerializationManager.DEFAULT.register(AMessage.class);
-
-Configuration configuration = new Configuration();
-configuration.tcpPort = tcpPort;
-configuration.host = host;
-
-final Server server = new Server(configuration);
-addEndPoint(server);
-server.bind(false);
-
-server.listeners()
-      .add(new Listener<AMessage>() {
-          @Override
-          public
-          void received(Connection connection, AMessage object) {
-              System.err.println("Server received message from client. Bouncing back.");
-              connection.send()
-                        .TCP(object);
-          }
-      });
-
-Client client = new Client(configuration);
-client.disableRemoteKeyValidation();
-addEndPoint(client);
-client.connect(5000);
-
-client.listeners()
-      .add(new Listener<AMessage>() {
-          @Override
-          public
-          void received(Connection connection, AMessage object) {
-              ClientSendTest.this.checkPassed.set(true);
-              System.err.println("Tada! It's been bounced back.");
-              server.stop();
-          }
-      });
-
-client.send()
-      .TCP(new AMessage());
+server.bind()
+
+
+
+val configurationClient = ClientConfiguration()
+configurationClient.settingsStore = Storage.Memory() // don't want to persist anything on disk!
+configurationClient.port = 2000
+
+val client: Client<Connection> = Client(configurationClient)
+
+client.onConnect {
+    send("client test message")
+}
+
+client.connect()
 
 ```
 
+
 &nbsp; 
 &nbsp; 
 
@@ -95,7 +72,7 @@ Maven Info
     <dependency>
       <groupId>com.dorkbox</groupId>
       <artifactId>Network</artifactId>
-      <version>5.32</version>
+      <version>6.15</version>
     </dependency>
 </dependencies>
 ```
@@ -105,11 +82,11 @@ Gradle Info
 ```
 dependencies {
     ...
-    implementation("com.dorkbox:Network:5.32")
+    implementation("com.dorkbox:Network:6.15")
 }
 ```
 
 License
 ---------
-This project is © 2021 dorkbox llc, and is distributed under the terms of the Apache v2.0 License. See file "LICENSE" for further 
+This project is © 2023 dorkbox llc, and is distributed under the terms of the Apache v2.0 License. See file "LICENSE" for further 
 references.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 dorkbox, llc
+ * Copyright 2023 dorkbox, llc
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import java.time.Instant
-
 ///////////////////////////////
 //////    PUBLISH TO SONATYPE / MAVEN CENTRAL
 ////// TESTING : (to local maven repo) <'publish and release' - 'publishToMavenLocal'>
@@ -25,28 +23,29 @@ import java.time.Instant
 gradle.startParameter.showStacktrace = ShowStacktrace.ALWAYS   // always show the stacktrace!
 
 plugins {
-    id("com.dorkbox.GradleUtils") version "2.17"
-    id("com.dorkbox.Licensing") version "2.12"
-    id("com.dorkbox.VersionUpdate") version "2.5"
-    id("com.dorkbox.GradlePublish") version "1.12"
+    id("com.dorkbox.GradleUtils") version "3.18"
+    id("com.dorkbox.Licensing") version "2.28"
+    id("com.dorkbox.VersionUpdate") version "2.8"
+    id("com.dorkbox.GradlePublish") version "1.22"
+
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 
-    kotlin("jvm") version "1.6.10"
+    kotlin("jvm") version "1.9.0"
 }
 
+@Suppress("ConstPropertyName")
 object Extras {
     // set for the project
     const val description = "High-performance, event-driven/reactive network stack for Java 11+"
     const val group = "com.dorkbox"
-    const val version = "5.32"
+    const val version = "6.15"
 
     // set as project.ext
     const val name = "Network"
     const val id = "Network"
     const val vendor = "Dorkbox LLC"
     const val vendorUrl = "https://dorkbox.com"
     const val url = "https://git.dorkbox.com/dorkbox/Network"
-
-    val buildDate = Instant.now().toString()
 }
 
 ///////////////////////////////
@@ -60,31 +59,38 @@ GradleUtils.compileConfiguration(JavaVersion.VERSION_11) {
     // enable the use of inline classes. see https://kotlinlang.org/docs/reference/inline-classes.html
     freeCompilerArgs = listOf("-Xinline-classes")
 }
-//NOTE: we do not support JPMS yet, as there are some libraries missing support for it still
 
 
-// ratelimiter, "other" package
+//val kotlin = project.extensions.getByType(org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension::class.java).sourceSets.getByName("main").kotlin
+//kotlin.apply {
+//    setSrcDirs(project.files("src"))
+//    include("**/*.kt") // want to include kotlin files for the source. 'setSrcDirs' resets includes...
+//}
+
+// TODO: driver name resolution: https://github.com/real-logic/aeron/wiki/Driver-Name-Resolution
+//  this keeps us from having to restart the media driver when a connection changes IP addresses
+
+// TODO: virtual threads in java21 for polling?
+
+// if we are sending a SMALL byte array, then we SEND IT DIRECTLY in a more optimized manner (because we can count size info!)
+//   other side has to be able to parse/know that this was sent directly as bytes. It could be game state data, or voice data, etc.
+// another idea is to be able to "send" a stream of bytes (this would also get chunked/etc!). if chunked, these are fixed byte sizes!
+// -- the first byte manage: byte/message/stream/etc, no-crypt, crypt, crypt+compress
+// - connection.inputStream() --> behaves as an input stream to remote endpoint --> connection.outputStream()
+//   -- open/close/flush/etc commands also go through
+//   -- this can be used to stream files/audio/etc VERY easily
+//   -- have a createInputStream(), which will cause the outputStream() on the remote end to be created.
+//     --- this remote outputStream is a file, raw??? this is setup by createInputStream() on the remote end
+// - state-machine for kryo class registrations?
+
+// ratelimiter, "other" package, send-on-idle
 // rest of unit tests
 // getConnectionUpgradeType
 // ability to send with a function callback (using RMI waiter type stuff for callbacks)
-// use conscrypt?!
 
 // java 14 is faster with aeron!
-// NOTE: now using aeron instead of netty
-// todo: remove BC! use conscrypt instead, or native java? (if possible. we are java 11 now, instead of 1.6)
 
 
-// also, NOT using bouncastle, but instead the google one
-// better SSL library
-// implementation("org.conscrypt:conscrypt-openjdk-uber:2.2.1")
-//    init {
-//            try {
-//                Security.insertProviderAt(Conscrypt.newProvider(), 1);
-//            }
-//            catch (e: Throwable) {
-//                e.printStackTrace();
-//            }
-//        }
 
 
 licensing {
@@ -134,66 +140,92 @@ tasks.jar.get().apply {
         attributes["Specification-Vendor"] = Extras.vendor
 
         attributes["Implementation-Title"] = "${Extras.group}.${Extras.id}"
-        attributes["Implementation-Version"] = Extras.buildDate
+        attributes["Implementation-Version"] = GradleUtils.now()
         attributes["Implementation-Vendor"] = Extras.vendor
     }
 }
 
+
+val shadowJar: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar by tasks
+shadowJar.apply {
+    manifest.inheritFrom(tasks.jar.get().manifest)
+
+    manifest.attributes.apply {
+        put("Main-Class", "dorkboxTest.network.app.AeronClientServerForever")
+    }
+
+    mergeServiceFiles()
+
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+
+    from(sourceSets.test.get().output)
+    configurations = listOf(project.configurations.testRuntimeClasspath.get())
+
+    archiveBaseName.set(project.name + "-all")
+}
+
+
 dependencies {
-    api("org.jetbrains.kotlinx:atomicfu:0.17.3")
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2")
+    api("org.jetbrains.kotlinx:atomicfu:0.23.0")
+    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
 
     // https://github.com/dorkbox
-    api("com.dorkbox:ByteUtilities:1.5")
-    api("com.dorkbox:Collections:1.1")
-    api("com.dorkbox:MinLog:2.4")
-    api("com.dorkbox:NetworkDNS:2.7.1")
-    api("com.dorkbox:NetworkUtils:2.18")
-    api("com.dorkbox:ObjectPool:4.0")
-    api("com.dorkbox:OS:1.0")
-    api("com.dorkbox:Serializers:2.7")
-    api("com.dorkbox:Storage:1.1")
+    api("com.dorkbox:ByteUtilities:2.1")
+    api("com.dorkbox:ClassUtils:1.3")
+    api("com.dorkbox:Collections:2.7")
+    api("com.dorkbox:HexUtilities:1.1")
+    api("com.dorkbox:JNA:1.4")
+    api("com.dorkbox:MinLog:2.7")
+    api("com.dorkbox:NetworkDNS:2.16")
+    api("com.dorkbox:NetworkUtils:2.23")
+    api("com.dorkbox:OS:1.11")
+    api("com.dorkbox:Serializers:2.9")
+    api("com.dorkbox:Storage:1.11")
     api("com.dorkbox:Updates:1.1")
-    api("com.dorkbox:Utilities:1.29")
+    api("com.dorkbox:Utilities:1.48")
+
+
+    // how we bypass using reflection/jpms to access fields for java17+
+    api("org.javassist:javassist:3.29.2-GA")
+
+
+    val jnaVersion = "5.13.0"
+    api("net.java.dev.jna:jna-jpms:${jnaVersion}")
+    api("net.java.dev.jna:jna-platform-jpms:${jnaVersion}")
 
 
-    // we include ALL of aeron, in case we need to debug aeron behavior
     // https://github.com/real-logic/aeron
-    val aeronVer = "1.38.1"
-    api("io.aeron:aeron-all:$aeronVer")
-//    api("io.aeron:aeron-client:$aeronVer")
-//    api("io.aeron:aeron-driver:$aeronVer")
+    val aeronVer = "1.42.1"
+    api("io.aeron:aeron-driver:$aeronVer")
+    // ALL of aeron, in case we need to debug aeron behavior
+//    api("io.aeron:aeron-all:$aeronVer")
+//    api("org.agrona:agrona:1.18.2") // sources for this aren't included in aeron-all!
 
     // https://github.com/EsotericSoftware/kryo
-    api("com.esotericsoftware:kryo:5.3.0") {
+    api("com.esotericsoftware:kryo:5.5.0") {
         exclude("com.esotericsoftware", "minlog") // we use our own minlog, that logs to SLF4j instead
     }
 
-    // https://github.com/jpountz/lz4-java
-//    implementation("net.jpountz.lz4:lz4:1.3.0")
 
-    // this is NOT the same thing as LMAX disruptor.
-    // This is just a slightly faster queue than LMAX. (LMAX is a fast queue + other things w/ a difficult DSL)
-    // https://github.com/conversant/disruptor_benchmark
-    // https://www.youtube.com/watch?v=jVMOgQgYzWU
-    //api("com.conversantmedia:disruptor:1.2.19")
+    // https://github.com/lz4/lz4-java
+    api("org.lz4:lz4-java:1.8.0")
 
-    // https://github.com/jhalterman/typetools
-    api("net.jodah:typetools:0.6.3")
 
     // Expiring Map (A high performance thread-safe map that expires entries)
     // https://github.com/jhalterman/expiringmap
-    api("net.jodah:expiringmap:0.5.10")
+    api("net.jodah:expiringmap:0.5.11")
 
     // https://github.com/MicroUtils/kotlin-logging
-    api("io.github.microutils:kotlin-logging:2.1.23")
-    api("org.slf4j:slf4j-api:1.8.0-beta4")
-
+//    api("io.github.microutils:kotlin-logging:3.0.5")
+    implementation("org.slf4j:slf4j-api:2.0.9")
 
 
 
     testImplementation("junit:junit:4.13.2")
-    testImplementation("ch.qos.logback:logback-classic:1.3.0-alpha4")
+    testImplementation("ch.qos.logback:logback-classic:1.4.5")
+    testImplementation("io.aeron:aeron-all:$aeronVer")
+
+    testImplementation("com.dorkbox:Config:2.1")
 }
 
 publishToSonatype {

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,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists