add 100ms timeout to close command avoiding block

pedroSG94 · Sep 17, 2024 · dd4ded4 · dd4ded4
1 parent 9a22578
commit dd4ded4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpClient.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpClient.kt
@@ -42,6 +42,7 @@ import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withTimeoutOrNull
 import java.io.*
 import java.net.*
 import java.nio.ByteBuffer
@@ -515,8 +516,8 @@ class RtmpClient(private val connectChecker: ConnectChecker) {
   private suspend fun disconnect(clear: Boolean) {
     if (isStreaming) rtmpSender.stop(clear)
     runCatching {
-      socket?.let { socket ->
-        commandsManager.sendClose(socket)
+      withTimeoutOrNull(100) {
+        socket?.let { commandsManager.sendClose(it) }
       }
     }
     closeConnection()

diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspClient.kt b/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspClient.kt
@@ -420,8 +420,10 @@ class RtspClient(private val connectChecker: ConnectChecker) {
   private suspend fun disconnect(clear: Boolean) {
     if (isStreaming) rtspSender.stop()
     val error = runCatching {
-      writer?.write(commandsManager.createTeardown())
-      writer?.flush()
+      withTimeoutOrNull(100) {
+        writer?.write(commandsManager.createTeardown())
+        writer?.flush()
+      }
       connectionSocket?.close()
       reader?.close()
       reader = null

diff --git a/srt/src/main/java/com/pedro/srt/srt/SrtClient.kt b/srt/src/main/java/com/pedro/srt/srt/SrtClient.kt
@@ -49,6 +49,7 @@ import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withTimeoutOrNull
 import java.io.IOException
 import java.net.SocketTimeoutException
 import java.net.URISyntaxException
@@ -257,7 +258,9 @@ class SrtClient(private val connectChecker: ConnectChecker) {
   private suspend fun disconnect(clear: Boolean) {
     if (isStreaming) srtSender.stop(clear)
     runCatching {
-      commandsManager.writeShutdown(socket)
+      withTimeoutOrNull(100) {
+        commandsManager.writeShutdown(socket)
+      }
     }
     socket?.close()
     if (clear) {