fix bug

AsyncSocket/src/main/kotlin/cn/tursom/datagram/NioDatagram.kt

@@ -26,4 +26,8 @@ open class NioDatagram(
       nioThread.wakeup()
     }
   }
+
+  override fun toString(): String {
+    return "NioDatagram(channel=$channel, key=$key, nioThread=$nioThread)"
+  }
 }

AsyncSocket/src/main/kotlin/cn/tursom/datagram/server/AsyncDatagramServer.kt

@@ -5,18 +5,26 @@ import kotlinx.coroutines.launch
 import java.net.SocketAddress
 import java.util.concurrent.ConcurrentHashMap
 
-class AsyncDatagramServer(
+open class AsyncDatagramServer(
   port: Int,
   private val handler: suspend ServerNioDatagram.() -> Unit
 ) : LoopDatagramServer(port, DatagramProtocol) {
   private val channelMap = ConcurrentHashMap<SocketAddress, ServerNioDatagram>()
 
   private fun initChannel(address: SocketAddress): ServerNioDatagram {
-    val datagram = ServerNioDatagram(address, listenChannel, key, bossNioThread)
+    val datagram = ServerNioDatagram(address, this, listenChannel, key, bossNioThread)
-    GlobalScope.launch { handler(datagram) }
+    GlobalScope.launch {
+      datagram.use { datagram ->
+        handler(datagram)
+      }
+    }
     return datagram
   }
 
+  fun closeChannel(address: SocketAddress): ServerNioDatagram? {
+    return channelMap.remove(address)
+  }
+
   fun getChannel(address: SocketAddress): ServerNioDatagram {
     var channel = channelMap[address]
     if (channel != null) {
@@ -27,4 +35,3 @@ class AsyncDatagramServer(
     return channel
   }
 }
-

AsyncSocket/src/main/kotlin/cn/tursom/datagram/server/BufferedAsyncDatagramServer.kt

@@ -0,0 +1,9 @@
+package cn.tursom.datagram.server
+
+import cn.tursom.core.pool.MemoryPool
+
+class BufferedAsyncDatagramServer(
+  port: Int,
+  private val memoryPool: MemoryPool,
+  private val handler: suspend BufferedServerNioDatagram.() -> Unit
+) : AsyncDatagramServer(port, { handler(BufferedServerNioDatagram(memoryPool, this)) })

AsyncSocket/src/main/kotlin/cn/tursom/datagram/server/BufferedServerNioDatagram.kt

@@ -0,0 +1,15 @@
+package cn.tursom.datagram.server
+
+import cn.tursom.core.pool.MemoryPool
+import cn.tursom.datagram.AsyncDatagram
+import cn.tursom.datagram.BufferedAsyncDatagram
+import java.net.SocketAddress
+
+class BufferedServerNioDatagram(override val pool: MemoryPool, override val prevChannel: ServerNioDatagram) :
+  BufferedAsyncDatagram,
+  AsyncDatagram by prevChannel {
+  val remoteAddress: SocketAddress get() = prevChannel.remoteAddress
+  override fun toString(): String {
+    return "BufferedServerNioDatagram(pool=$pool, prevChannel=$prevChannel)"
+  }
+}

AsyncSocket/src/main/kotlin/cn/tursom/datagram/server/ServerNioDatagram.kt

@@ -18,6 +18,7 @@ import kotlin.coroutines.suspendCoroutine
 
 class ServerNioDatagram(
   val remoteAddress: SocketAddress,
+  val server: AsyncDatagramServer,
   channel: DatagramChannel,
   key: SelectionKey,
   nioThread: NioThread
@@ -78,4 +79,12 @@ class ServerNioDatagram(
     read(buf, timeout)
     return buf
   }
+
+  override fun close() {
+    server.closeChannel(remoteAddress)
+  }
+
+  override fun toString(): String {
+    return "ServerNioDatagram(remoteAddress=$remoteAddress, localAddress=${channel.localAddress})"
+  }
 }

AsyncSocket/src/main/kotlin/cn/tursom/niothread/WorkerLoopNioThread.kt

@@ -74,6 +74,10 @@ class WorkerLoopNioThread(
     }
   }
 
+  override fun toString(): String {
+    return "WorkerLoopNioThread(threadName='$threadName', selector=$selector, daemon=$daemon, timeout=$timeout, workLoop=$workLoop)"
+  }
+
   class Future<T> : NioThreadTaskFuture<T> {
     private val lock = Object()
     private var exception: Throwable? = null
@@ -111,4 +115,6 @@ class WorkerLoopNioThread(
       }
     }
   }
+
+
 }

AsyncSocket/src/main/kotlin/cn/tursom/socket/NioSocket.kt

@@ -65,6 +65,10 @@ class NioSocket(override val key: SelectionKey, override val nioThread: NioThrea
     close()
   }
 
+  override fun toString(): String {
+    return "NioSocket(key=$key, nioThread=$nioThread, channel=$channel)"
+  }
+
   /**
    * 伴生对象
    */

AsyncSocket/src/test/kotlin/cn/tursom/datagram/server/test.kt

@@ -3,18 +3,16 @@ package cn.tursom.datagram.server
 import cn.tursom.core.log
 import cn.tursom.core.pool.DirectMemoryPool
 import cn.tursom.datagram.AsyncDatagramClient
-import cn.tursom.datagram.BufferedNioDatagram
 import kotlinx.coroutines.runBlocking
 
 fun main() {
   val port = 12345
   val pool = DirectMemoryPool(1024, 16)
-  val server = AsyncDatagramServer(port) {
+  val server = BufferedAsyncDatagramServer(port, pool) {
-    val buffed = BufferedNioDatagram(pool, this)
     while (true) {
-      val buffer = buffed.read()
+      val buffer = read()
-      log("recv from client $remoteAddress: ${buffer.toString(buffer.readable)}")
+      log("$this recv from client $remoteAddress: ${buffer.toString(buffer.readable)}")
-      buffed.write(buffer)
+      write(buffer)
     }
   }
   //val server = LoopDatagramServer(port, protocol = object : NioProtocol {