handle ktor tls errors

Author: pedroSG94

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

@@ -5,6 +5,7 @@ import io.ktor.network.sockets.InetSocketAddress
 import io.ktor.network.sockets.ReadWriteSocket
 import io.ktor.network.sockets.aSocket
 import io.ktor.network.tls.tls
+import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.Dispatchers
 import java.security.SecureRandom
 import javax.net.ssl.TrustManager
@@ -16,14 +17,17 @@ class TcpStreamSocketKtor(
     private val certificate: TrustManager? = null
 ): TcpStreamSocketKtorBase(host, port) {
 
-    override suspend fun onConnectSocket(timeout: Long): ReadWriteSocket {
+    override suspend fun onConnectSocket(timeout: Long, error: (Throwable) -> Unit): ReadWriteSocket {
         selectorManager = SelectorManager(Dispatchers.IO)
         val builder = aSocket(selectorManager).tcp().connect(
             remoteAddress = InetSocketAddress(host, port),
             configure = { if (!secured) socketTimeout = timeout }
         )
         return if (secured) {
-            builder.tls(Dispatchers.IO) {
+            val tlsContext = CoroutineExceptionHandler { _, throwable ->
+                error(throwable)
+            }
+            builder.tls(tlsContext + Dispatchers.IO) {
                 trustManager = certificate
                 random = SecureRandom()
             }

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

@@ -13,6 +13,8 @@ import io.ktor.utils.io.readLine
 import io.ktor.utils.io.writeByte
 import io.ktor.utils.io.writeFully
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
+import kotlinx.io.IOException
 import java.net.InetAddress
 
 abstract class TcpStreamSocketKtorBase(
@@ -26,10 +28,12 @@ abstract class TcpStreamSocketKtorBase(
     protected var output: ByteWriteChannel? = null
     protected var selectorManager = SelectorManager(Dispatchers.IO)
 
-    abstract suspend fun onConnectSocket(timeout: Long): ReadWriteSocket
+    abstract suspend fun onConnectSocket(timeout: Long, error: (Throwable) -> Unit): ReadWriteSocket
 
     override suspend fun connect() {
-        val socket = onConnectSocket(timeout)
+        val socket = onConnectSocket(timeout) {
+            runBlocking { close() }
+        }
         input = socket.openReadChannel()
         output = socket.openWriteChannel(autoFlush = false)
         address = java.net.InetSocketAddress(host, port).address
@@ -48,23 +52,23 @@ abstract class TcpStreamSocketKtorBase(
     }
 
     override suspend fun write(bytes: ByteArray) {
-        output?.writeFully(bytes)
+        output?.writeFully(bytes) ?: throw IOException("Socket already closed")
     }
 
     override suspend fun write(bytes: ByteArray, offset: Int, size: Int) {
-        output?.writeFully(bytes, offset, offset + size)
+        output?.writeFully(bytes, offset, offset + size) ?: throw IOException("Socket already closed")
     }
 
     override suspend fun write(b: Int) {
-        output?.writeByte(b.toByte())
+        output?.writeByte(b.toByte()) ?: throw IOException("Socket already closed")
     }
 
     override suspend fun write(string: String) {
         write(string.toByteArray())
     }
 
     override suspend fun flush() {
-        output?.flush()
+        output?.flush() ?: throw IOException("Socket already closed")
     }
 
     override suspend fun read(bytes: ByteArray) {

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ dokka = "2.2.0"
 appcompat = "1.6.1"
 #noinspection GradleDependency, version 2.2.0 need min sdk 21
 constraintlayout = "2.1.4"
-ktor = "3.4.3"
+ktor = "3.5.0"
 camerax = "1.5.3"
 multidex = "2.0.1"
 annotation = "1.10.0"