cleanup code and add jvmName annotation

RTAkland · Jan 4, 2025 · 8079c8a · 8079c8a
1 parent 9f74ff2
commit 8079c8a
Show file tree

Hide file tree

Showing 22 changed files with 20 additions and 85 deletions.
diff --git a/.space.kts b/.space.kts
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -8,7 +8,6 @@ repositories {
 }
 
 dependencies {
-    api(libs.gson)
     api(libs.java.websocket)
     api(rootProject)
 }
diff --git a/api/src/main/kotlin/cn/rtast/kwsify/Base64.kt b/api/src/main/kotlin/cn/rtast/kwsify/Base64.kt
diff --git a/api/src/main/kotlin/cn/rtast/kwsify/IOperation.kt b/api/src/main/kotlin/cn/rtast/kwsify/IOperation.kt
@@ -4,6 +4,7 @@
  * Date: 2024/11/30
  */
 
+@file:JvmName("IOperation")
 
 package cn.rtast.kwsify
 

diff --git a/api/src/main/kotlin/cn/rtast/kwsify/Kwsify.kt b/api/src/main/kotlin/cn/rtast/kwsify/Kwsify.kt
@@ -4,6 +4,7 @@
  * Date: 2024/11/30
  */
 
+@file:JvmName("Kwsify")
 
 package cn.rtast.kwsify
 

diff --git a/api/src/main/kotlin/cn/rtast/kwsify/Subscriber.kt b/api/src/main/kotlin/cn/rtast/kwsify/Subscriber.kt
@@ -4,6 +4,7 @@
  * Date: 2024/11/30
  */
 
+@file:JvmName("Subscriber")
 
 package cn.rtast.kwsify
 

diff --git a/src/main/kotlin/cn/rtast/kwsify/Const.kt b/src/main/kotlin/cn/rtast/kwsify/Const.kt
diff --git a/src/main/kotlin/cn/rtast/kwsify/Main.kt b/src/main/kotlin/cn/rtast/kwsify/Main.kt
@@ -7,7 +7,7 @@
 
 package cn.rtast.kwsify
 
-import cn.rtast.kwsify.util.WebsocketServer
+import cn.rtast.kwsify.util.KWsifyServer
 import kotlinx.cli.ArgParser
 import kotlinx.cli.ArgType
 import kotlinx.cli.required
@@ -16,5 +16,5 @@ fun main(args: Array<String>) {
     val parser = ArgParser("kwsify-cli")
     val port by parser.option(ArgType.Int, shortName = "p", description = "Port number").required()
     parser.parse(args)
-    WebsocketServer(port).start()
+    KWsifyServer(port).start()
 }
diff --git a/src/main/kotlin/cn/rtast/kwsify/entity/ConnectionState.kt b/src/main/kotlin/cn/rtast/kwsify/entity/ConnectionState.kt
@@ -4,6 +4,7 @@
  * Date: 2024/12/1
  */
 
+@file:JvmName("ConnectionState")
 
 package cn.rtast.kwsify.entity
 

diff --git a/src/main/kotlin/cn/rtast/kwsify/entity/HeartbeatPacket.kt b/src/main/kotlin/cn/rtast/kwsify/entity/HeartbeatPacket.kt
@@ -4,6 +4,7 @@
  * Date: 2025/1/4
  */
 
+@file:JvmName("HeartbeatPacket")
 
 package cn.rtast.kwsify.entity
 

diff --git a/src/main/kotlin/cn/rtast/kwsify/entity/OPCodePacket.kt b/src/main/kotlin/cn/rtast/kwsify/entity/OPCodePacket.kt
@@ -4,6 +4,7 @@
  * Date: 2025/1/3
  */
 
+@file:JvmName("OPCodePacket")
 
 package cn.rtast.kwsify.entity
 

diff --git a/src/main/kotlin/cn/rtast/kwsify/entity/OutboundMessageBytesPacket.kt b/src/main/kotlin/cn/rtast/kwsify/entity/OutboundMessageBytesPacket.kt
@@ -4,6 +4,7 @@
  * Date: 2025/1/3
  */
 
+@file:JvmName("OutboundMessageBytesPacket")
 
 package cn.rtast.kwsify.entity
 

diff --git a/src/main/kotlin/cn/rtast/kwsify/entity/PublishPacket.kt b/src/main/kotlin/cn/rtast/kwsify/entity/PublishPacket.kt
@@ -4,6 +4,7 @@
  * Date: 2024/12/1
  */
 
+@file:JvmName("PublishPacket")
 
 package cn.rtast.kwsify.entity
 

diff --git a/src/main/kotlin/cn/rtast/kwsify/entity/SubscribePacket.kt b/src/main/kotlin/cn/rtast/kwsify/entity/SubscribePacket.kt
@@ -4,6 +4,7 @@
  * Date: 2024/12/1
  */
 
+@file:JvmName("SubscribePacket")
 
 package cn.rtast.kwsify.entity
 

diff --git a/src/main/kotlin/cn/rtast/kwsify/entity/UnsubscribePacket.kt b/src/main/kotlin/cn/rtast/kwsify/entity/UnsubscribePacket.kt
@@ -4,6 +4,7 @@
  * Date: 2024/12/1
  */
 
+@file:JvmName("UnsubscribePacket")
 
 package cn.rtast.kwsify.entity
 

diff --git a/src/main/kotlin/cn/rtast/kwsify/enums/OPCode.kt b/src/main/kotlin/cn/rtast/kwsify/enums/OPCode.kt
@@ -4,6 +4,8 @@
  * Date: 2024/11/30
  */
 
+@file:JvmName("OPCode")
+
 package cn.rtast.kwsify.enums
 
 object OPCode {

diff --git a/src/main/kotlin/cn/rtast/kwsify/util/Binary.kt b/src/main/kotlin/cn/rtast/kwsify/util/Binary.kt
@@ -9,10 +9,10 @@ package cn.rtast.kwsify.util
 
 import java.nio.ByteBuffer
 
-fun ByteBuffer.putBoolean(value: Boolean) {
+internal fun ByteBuffer.putBoolean(value: Boolean) {
     put(if (value) 1.toByte() else 0.toByte())
 }
 
-fun ByteBuffer.getBoolean(): Boolean {
+internal fun ByteBuffer.getBoolean(): Boolean {
     return get() == 1.toByte()
 }
diff --git a/src/main/kotlin/cn/rtast/kwsify/util/Json.kt b/src/main/kotlin/cn/rtast/kwsify/util/Json.kt
diff --git a/...n/cn/rtast/kwsify/util/WebsocketServer.kt → ...tlin/cn/rtast/kwsify/util/KWsifyServer.kt b/...n/cn/rtast/kwsify/util/WebsocketServer.kt → ...tlin/cn/rtast/kwsify/util/KWsifyServer.kt
@@ -4,6 +4,7 @@
  * Date: 2024/11/30
  */
 
+@file:JvmName("KWsifyServer")
 
 package cn.rtast.kwsify.util
 
@@ -16,7 +17,7 @@ import java.net.InetSocketAddress
 import java.nio.ByteBuffer
 import java.util.*
 
-class WebsocketServer(private val port: Int) : WebSocketServer(InetSocketAddress(port)) {
+class KWsifyServer(private val port: Int) : WebSocketServer(InetSocketAddress(port)) {
 
     private val connectionState = mutableListOf<ConnectionState>()
 

diff --git a/src/main/resources/conf.json b/src/main/resources/conf.json
diff --git a/src/test/kotlin/test/TestServer.kt b/src/test/kotlin/test/TestServer.kt
@@ -7,8 +7,8 @@
 
 package test
 
-import cn.rtast.kwsify.util.WebsocketServer
+import cn.rtast.kwsify.util.KWsifyServer
 
 fun main() {
-    WebsocketServer(8080).start()
+    KWsifyServer(8080).start()
 }
diff --git a/src/test/resources/.gitkeep b/src/test/resources/.gitkeep
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ @@
      * Date: 2024/11/30
      */
+    @file:JvmName("IOperation")
     package cn.rtast.kwsify
@@ Expand Down @@