use ktor 2.3.13

Author: pedroSG94

common/src/main/java/com/pedro/common/socket/ktor/TcpStreamSocketKtorBase.kt

@@ -8,9 +8,9 @@ import io.ktor.network.sockets.openReadChannel
 import io.ktor.network.sockets.openWriteChannel
 import io.ktor.utils.io.ByteReadChannel
 import io.ktor.utils.io.ByteWriteChannel
+import io.ktor.utils.io.close
 import io.ktor.utils.io.readFully
 import io.ktor.utils.io.readUTF8Line
-import io.ktor.utils.io.writeByte
 import io.ktor.utils.io.writeFully
 import kotlinx.coroutines.Dispatchers
 import java.net.InetAddress
@@ -37,7 +37,10 @@ abstract class TcpStreamSocketKtorBase(
     }
 
     override suspend fun close() {
-        runCatching { output?.flushAndClose() }
+        runCatching {
+            output?.flush()
+            output?.close()
+        }
         runCatching {
             address = null
             input = null
@@ -52,7 +55,7 @@ abstract class TcpStreamSocketKtorBase(
     }
 
     override suspend fun write(bytes: ByteArray, offset: Int, size: Int) {
-        output?.writeFully(bytes, offset, offset + size)
+        output?.writeFully(bytes, offset, size)
     }
 
     override suspend fun write(b: Int) {

common/src/main/java/com/pedro/common/socket/ktor/UdpStreamSocketKtor.kt

@@ -8,10 +8,9 @@ import io.ktor.network.sockets.Datagram
 import io.ktor.network.sockets.InetSocketAddress
 import io.ktor.network.sockets.aSocket
 import io.ktor.network.sockets.isClosed
-import io.ktor.utils.io.core.remaining
+import io.ktor.utils.io.core.ByteReadPacket
+import io.ktor.utils.io.core.readBytes
 import kotlinx.coroutines.Dispatchers
-import kotlinx.io.Buffer
-import kotlinx.io.readByteArray
 import java.net.ConnectException
 import java.net.InetAddress
 
@@ -51,15 +50,15 @@ class UdpStreamSocketKtor(
     }
 
     override suspend fun write(bytes: ByteArray) {
-        val datagram = Datagram(Buffer().apply { write(bytes, 0, bytes.size) }, address)
+        val datagram = Datagram(ByteReadPacket(bytes), address)
         socket?.send(datagram)
     }
 
     override suspend fun read(): ByteArray {
         val socket = socket ?: throw ConnectException("Read with socket closed, broken pipe")
         val packet = socket.receive().packet
         val length = packet.remaining.toInt()
-        return packet.readByteArray().sliceArray(0 until length)
+        return packet.readBytes().sliceArray(0 until length)
     }
 
     override fun isConnected(): Boolean = socket?.isClosed != true

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ dokka = "2.0.0"
 appcompat = "1.6.1"
 #noinspection GradleDependency, version 2.2.0 need min sdk 21
 constraintlayout = "2.1.4"
-ktor = "3.3.2"
+ktor = "2.3.13"
 camerax = "1.5.1"
 multidex = "2.0.1"
 annotation = "1.9.1"