add more interface and split entity

api/build.gradle.kts

@@ -9,5 +9,5 @@ repositories {
 
 dependencies {
     api(libs.java.websocket)
-    api(project(":server"))
+    api(project(":common"))
 }

api/src/main/kotlin/cn/rtast/kwsify/Kwsify.kt

@@ -23,10 +23,11 @@ class Kwsify(private val address: String) : IOperation {
     private val subscribers = mutableMapOf<String, MutableList<Subscriber>>()
     private val executor = Executors.newSingleThreadScheduledExecutor()
 
-    private fun startHeartbeat() {
+    private fun startHeartbeat(channel: String) {
         executor.scheduleAtFixedRate({
             val packet = HeartbeatPacket(OPCode.HEARTBEAT).toByteArray()
             websocket.send(packet)
+            subscribers[channel]?.forEach { it.onHeartbeat(channel) }
         }, 0, 10, TimeUnit.SECONDS)
     }
 
@@ -35,15 +36,19 @@ class Kwsify(private val address: String) : IOperation {
             override fun onOpen(handshakedata: ServerHandshake) {
                 val authPacket = SubscribePacket(OPCode.JOIN, UUID.randomUUID(), channel, broadcastSelf).toByteArray()
                 websocket.send(authPacket)
-                startHeartbeat()
+                subscribers[channel]?.forEach { it.onOpen(channel) }
+                startHeartbeat(channel)
             }
 
             override fun onMessage(message: String) {
             }
 
             override fun onMessage(bytes: ByteBuffer) {
                 val opcodePacket = OPCodePacket.fromByteArray(bytes.duplicate())
-                if (opcodePacket.op == OPCode.HEARTBEAT_REPLY) return
+                if (opcodePacket.op == OPCode.HEARTBEAT_REPLY) {
+                    subscribers[channel]?.forEach { it.onHeartbeatReply(channel) }
+                    return
+                }
                 val packet = OutboundMessageBytesPacket.fromByteArray(bytes)
                 val channel = packet.channel
                 subscribers[channel]?.forEach { subscriber ->

api/src/main/kotlin/cn/rtast/kwsify/Subscriber.kt

@@ -13,11 +13,28 @@ import cn.rtast.kwsify.entity.OutboundMessageBytesPacket
 interface Subscriber {
     /**
      * 接收到二进制消息时
+     * [payload] 为解析后的数据类实体
+     * [rawPacket] 为原始二进制数据包
      */
-    fun onMessage(channel: String, payload: ByteArray, packet: OutboundMessageBytesPacket) {}
+    fun onMessage(channel: String, rawPacket: ByteArray, payload: OutboundMessageBytesPacket)
 
     /**
      * websocket连接断开时
      */
     fun onClosed(channel: String)
+
+    /**
+     * websocket连接打开时
+     */
+    fun onOpen(channel: String)
+
+    /**
+     * 当客户端发送心跳包时
+     */
+    fun onHeartbeat(channel: String) {}
+
+    /**
+     * 当接收到服务端返回的心跳包时
+     */
+    fun onHeartbeatReply(channel: String) {}
 }

api/src/test/kotlin/test/kwsify/TestClient.kt → api/src/test/kotlin/kws/TestClient.kt

@@ -1,32 +1,37 @@
 /*
- * Copyright © 2024 RTAkland
+ * Copyright © 2025 RTAkland
  * Author: RTAkland
- * Date: 2024/11/30
+ * Date: 2025/1/5
  */
 
 
-package test.kwsify
+package kws
 
 import cn.rtast.kwsify.Kwsify
 import cn.rtast.kwsify.Subscriber
 import cn.rtast.kwsify.entity.OutboundMessageBytesPacket
 
+
 fun main() {
     val wsify = Kwsify("ws://127.0.0.1:8080")
     wsify.subscribe("test", true, object : Subscriber {
 
-        override fun onMessage(channel: String, payload: ByteArray, packet: OutboundMessageBytesPacket) {
+        override fun onMessage(channel: String, rawPacket: ByteArray, packet: OutboundMessageBytesPacket) {
             println(String(packet.body))
         }
 
         override fun onClosed(channel: String) {
             println("closed")
             wsify.reconnect()
         }
+
+        override fun onOpen(channel: String) {
+
+        }
     })
     Thread.sleep(1000L)
     while (true) {
         wsify.publish("test", "114514")
         Thread.sleep(1000)
     }
-}
+}

server/src/main/kotlin/cn/rtast/kwsify/util/Binary.kt → common/src/main/kotlin/cn/rtast/kwsify/util/Binary.kt

@@ -1,7 +1,7 @@
 /*
  * Copyright © 2025 RTAkland
  * Author: RTAkland
- * Date: 2025/1/3
+ * Date: 2025/1/5
  */
 
 

gradle.properties

@@ -1,6 +1,6 @@
 kotlin.code.style=official
-appVersion=2.0.0
-libVersion=2.0.0
+appVersion=2.0.1
+libVersion=2.0.1
 
 #systemProp.http.proxyHost=127.0.0.1
 #systemProp.http.proxyPort=12334

server/build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
 }
 
 dependencies {
+    implementation(project(":common"))
     implementation(libs.gson)
     implementation(libs.kotlinx.cli)
     implementation(libs.java.websocket)

server/src/main/kotlin/cn/rtast/kwsify/entity/ConnectionState.kt

@@ -1,7 +1,7 @@
 /*
- * Copyright © 2024 RTAkland
+ * Copyright © 2025 RTAkland
  * Author: RTAkland
- * Date: 2024/12/1
+ * Date: 2025/1/5
  */
 
 @file:JvmName("ConnectionState")

server/src/test/kotlin/test/TestServer.kt → server/src/test/kotlin/kws/TestServer.kt

@@ -1,14 +1,14 @@
 /*
- * Copyright © 2024 RTAkland
+ * Copyright © 2025 RTAkland
  * Author: RTAkland
- * Date: 2024/11/30
+ * Date: 2025/1/5
  */
 
 
-package test
+package kws
 
 import cn.rtast.kwsify.util.KWsifyServer
 
 fun main() {
     KWsifyServer(8080).start()
-}
+}

settings.gradle.kts

@@ -2,3 +2,4 @@ rootProject.name = "kwsify"
 
 include(":api")
 include(":server")
+include("common")