TokTok · iphydf · Feb 21, 2024
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -1,6 +1,8 @@
 load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_proto_library")
 load("@rules_java//java:defs.bzl", "java_proto_library")
+load("@rules_kotlin//kotlin:core.bzl", "kt_kotlinc_options")
 load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library", "kt_jvm_test")
+load("@rules_kotlin//kotlin:lint.bzl", "ktlint_fix", "ktlint_test")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("//tools/project:build_defs.bzl", "project")
 
@@ -73,20 +75,27 @@ cc_binary(
     ],
 )
 
+kt_kotlinc_options(
+    name = "kotlinc_options",
+    x_multi_platform = True,
+)
+
 kt_jvm_library(
     name = "jvm-toxcore-c",
     srcs = glob([
-        "lib/src/*Main/**/*.java",
-        "lib/src/*Main/**/*.kt",
+        "lib/src/commonMain/**/*.kt",
+        "lib/src/jvmMain/**/*.java",
+        "lib/src/jvmMain/**/*.kt",
     ]),
     data = ["libtox4j-c.so"],
+    kotlinc_opts = ":kotlinc_options",
     deps = [":jni_java_proto"],
 )
 
 kt_jvm_test(
     name = "ToxCoreTest",
     size = "small",
-    srcs = ["lib/src/jvmTest/java/im/tox/tox4j/core/ToxCoreTest.kt"],
+    srcs = ["lib/src/commonTest/kotlin/im/tox/tox4j/core/ToxCoreTest.kt"],
     jvm_flags = ["-Djava.library.path=jvm-toxcore-c"],
     test_class = "im.tox.tox4j.core.ToxCoreTest",
     deps = [
@@ -95,3 +104,14 @@ kt_jvm_test(
         "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
     ],
 )
+
+ktlint_fix(
+    name = "ktlint_fix",
+    srcs = glob(["lib/src/**/*.kt"]),
+)
+
+ktlint_test(
+    name = "ktlint_test",
+    size = "small",
+    srcs = glob(["lib/src/**/*.kt"]),
+)
diff --git a/docker/build-native b/docker/build-native
@@ -5,9 +5,11 @@ set -eux
 cat <<EOF >native.txt
 -p
 library
+-Xmulti-platform
 EOF
 
 find lib/src/commonMain -name '*.kt' -exec printf '{}\n-Xcommon-sources={}\n' ';' >>native.txt
+find lib/src/nativeMain -name '*.kt' -exec printf '{}\n' ';' >>native.txt
 
 kotlinc-native @native.txt
 ls
diff --git a/docker/native.Dockerfile b/docker/native.Dockerfile
@@ -26,6 +26,7 @@ ENV PATH=$PATH:/opt/kotlin/bin
 
 RUN ["touch", "Boot.kt"]
 RUN ["kotlinc-native", "-p", "library", "Boot.kt"]
+#RUN ["kotlinc-native", "-help", "-X"]
 
 WORKDIR /work/jvm-toxcore-c
 COPY lib/ /work/jvm-toxcore-c/lib/

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -11,22 +11,35 @@ repositories {
     mavenCentral()
 }
 
-dependencies {
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
+sourceSets["main"].proto {
+    srcDir("src/jvmMain/proto")
+    dependencies {
+        implementation("com.google.protobuf:protobuf-java:3.24.4")
+    }
 }
 
 kotlin {
     jvm()
+//  linuxX64()
 
     sourceSets {
         val jvmMain by getting {
+            kotlin.srcDir("${project.layout.buildDirectory}/generated/source/proto/main/java")
             dependencies {
                 implementation("com.google.protobuf:protobuf-java:3.24.4")
             }
         }
+        val commonTest by getting {
+            dependencies {
+                implementation("org.jetbrains.kotlin:kotlin-test-junit:1.9.22")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0")
+            }
+        }
     }
 }
 
+tasks["compileKotlinJvm"].dependsOn("generateProto")
+
 testing {
     suites {
         // Configure the built-in test suite

diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavAnswerException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavAnswerException.kt
@@ -31,5 +31,6 @@ class ToxavAnswerException : ToxException {
         SYNC,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavBitRateSetException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavBitRateSetException.kt
@@ -25,5 +25,6 @@ class ToxavBitRateSetException : ToxException {
         SYNC,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavCallControlException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavCallControlException.kt
@@ -27,5 +27,6 @@ class ToxavCallControlException : ToxException {
         SYNC,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavCallException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavCallException.kt
@@ -35,5 +35,6 @@ class ToxavCallException : ToxException {
         SYNC,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavNewException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavNewException.kt
@@ -27,5 +27,6 @@ class ToxavNewException : ToxException {
         NULL,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavSendFrameException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/av/exceptions/ToxavSendFrameException.kt
@@ -43,5 +43,6 @@ class ToxavSendFrameException : ToxException {
         SYNC,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/ToxCore.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/ToxCore.kt
@@ -19,6 +19,9 @@ import im.tox.tox4j.core.enums.ToxMessageType
 import im.tox.tox4j.core.enums.ToxUserStatus
 import im.tox.tox4j.core.options.ToxOptions
 
+@kotlin.ExperimentalStdlibApi
+expect fun newToxCore(options: ToxOptions): ToxCore
+
 /**
  * Interface for a basic wrapper of tox chat functionality.
  *

diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxBootstrapException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxBootstrapException.kt
@@ -27,5 +27,6 @@ class ToxBootstrapException : ToxException {
         NULL,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileControlException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileControlException.kt
@@ -41,5 +41,6 @@ class ToxFileControlException : ToxException {
         SENDQ,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileGetException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileGetException.kt
@@ -20,5 +20,6 @@ class ToxFileGetException : ToxException {
         NULL,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileSeekException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileSeekException.kt
@@ -35,5 +35,6 @@ class ToxFileSeekException : ToxException {
         SENDQ,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileSendChunkException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileSendChunkException.kt
@@ -48,5 +48,6 @@ class ToxFileSendChunkException : ToxException {
         WRONG_POSITION,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileSendException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFileSendException.kt
@@ -31,5 +31,6 @@ class ToxFileSendException : ToxException {
         TOO_MANY,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendAddException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendAddException.kt
@@ -48,5 +48,6 @@ class ToxFriendAddException : ToxException {
         TOO_LONG,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendByPublicKeyException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendByPublicKeyException.kt
@@ -15,5 +15,6 @@ class ToxFriendByPublicKeyException : ToxException {
         NULL,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendCustomPacketException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendCustomPacketException.kt
@@ -41,5 +41,6 @@ class ToxFriendCustomPacketException : ToxException {
         TOO_LONG,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendDeleteException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendDeleteException.kt
@@ -10,5 +10,6 @@ class ToxFriendDeleteException : ToxException {
         FRIEND_NOT_FOUND,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendGetPublicKeyException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendGetPublicKeyException.kt
@@ -10,5 +10,6 @@ class ToxFriendGetPublicKeyException : ToxException {
         FRIEND_NOT_FOUND,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendSendMessageException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxFriendSendMessageException.kt
@@ -35,5 +35,6 @@ class ToxFriendSendMessageException : ToxException {
         TOO_LONG,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxGetPortException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxGetPortException.kt
@@ -10,5 +10,6 @@ class ToxGetPortException : ToxException {
         NOT_BOUND,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxNewException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxNewException.kt
@@ -59,5 +59,6 @@ class ToxNewException : ToxException {
         PROXY_NOT_FOUND,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxSetInfoException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxSetInfoException.kt
@@ -15,5 +15,6 @@ class ToxSetInfoException : ToxException {
         TOO_LONG,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxSetTypingException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/core/exceptions/ToxSetTypingException.kt
@@ -10,5 +10,6 @@ class ToxSetTypingException : ToxException {
         FRIEND_NOT_FOUND,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/crypto/exceptions/ToxDecryptionException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/crypto/exceptions/ToxDecryptionException.kt
@@ -35,5 +35,6 @@ class ToxDecryptionException : ToxException {
         NULL,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/crypto/exceptions/ToxEncryptionException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/crypto/exceptions/ToxEncryptionException.kt
@@ -22,5 +22,6 @@ class ToxEncryptionException : ToxException {
         NULL,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/crypto/exceptions/ToxGetSaltException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/crypto/exceptions/ToxGetSaltException.kt
@@ -16,5 +16,6 @@ class ToxGetSaltException : ToxException {
         NULL,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/crypto/exceptions/ToxKeyDerivationException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/crypto/exceptions/ToxKeyDerivationException.kt
@@ -23,5 +23,6 @@ class ToxKeyDerivationException : ToxException {
         NULL,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/exceptions/ToxException.kt b/lib/src/commonMain/kotlin/im/tox/tox4j/exceptions/ToxException.kt
@@ -2,10 +2,10 @@ package im.tox.tox4j.exceptions
 
 abstract class ToxException constructor(val code: Enum<*>, private val extraMessage: String) :
     Exception(extraMessage) {
-        final override val message: String
-            get() =
-                when (extraMessage) {
-                    "" -> "Error code: " + code.name
-                    else -> extraMessage + ", error code: " + code.name
-                }
-    }
+    final override val message: String
+        get() =
+            when (extraMessage) {
+                "" -> "Error code: " + code.name
+                else -> extraMessage + ", error code: " + code.name
+            }
+}
diff --git a/lib/src/commonMain/kotlin/im/tox/tox4j/mkexceptions b/lib/src/commonMain/kotlin/im/tox/tox4j/mkexceptions
@@ -44,7 +44,8 @@ class Tox${prefix}${type}Exception : ToxException {
 $codes,
     }
 
-    constructor(code: Code, message: String = "") : super(code, message)
+    constructor(code: Code) : this(code, "")
+    constructor(code: Code, message: String) : super(code, message)
 }
 KOTLIN