Merge pull request #1658 from pedroSG94/fix/crash-stop-socket

Fix/crash stop socket
pedroSG94 · Nov 27, 2024 · b51a9aa · b51a9aa
2 parents dbd7a9e + 4c7603f
commit b51a9aa
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 21 deletions.
diff --git a/app/src/main/java/com/pedro/streamer/rotation/CameraFragment.kt b/app/src/main/java/com/pedro/streamer/rotation/CameraFragment.kt
@@ -30,11 +30,11 @@ import android.widget.TextView
 import androidx.annotation.RequiresApi
 import androidx.fragment.app.Fragment
 import com.pedro.common.ConnectChecker
-import com.pedro.library.base.recording.RecordController
-import com.pedro.library.generic.GenericStream
 import com.pedro.encoder.input.sources.video.Camera1Source
 import com.pedro.encoder.input.sources.video.Camera2Source
 import com.pedro.extrasources.CameraXSource
+import com.pedro.library.base.recording.RecordController
+import com.pedro.library.generic.GenericStream
 import com.pedro.library.util.BitrateAdapter
 import com.pedro.streamer.R
 import com.pedro.streamer.utils.PathUtils

diff --git a/common/src/main/java/com/pedro/common/socket/TcpStreamSocket.kt b/common/src/main/java/com/pedro/common/socket/TcpStreamSocket.kt
@@ -21,22 +21,19 @@ package com.pedro.common.socket
 import io.ktor.network.selector.SelectorManager
 import io.ktor.utils.io.ByteReadChannel
 import io.ktor.utils.io.ByteWriteChannel
-import io.ktor.utils.io.readByte
 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 io.ktor.utils.io.writeStringUtf8
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withTimeout
 import java.net.ConnectException
 
 /**
  * Created by pedro on 22/9/24.
  */
 abstract class TcpStreamSocket: StreamSocket {
 
-  private val timeout = 5000L
+  protected val timeout = 5000L
   protected var input: ByteReadChannel? = null
   protected var output: ByteWriteChannel? = null
   protected var selectorManager = SelectorManager(Dispatchers.IO)
@@ -45,16 +42,16 @@ abstract class TcpStreamSocket: StreamSocket {
     output?.flush()
   }
 
-  suspend fun write(b: Int) = withTimeout(timeout) {
+  suspend fun write(b: Int) {
     output?.writeByte(b.toByte())
   }
 
-  suspend fun write(b: ByteArray) = withTimeout(timeout) {
+  suspend fun write(b: ByteArray) {
     output?.writeFully(b)
   }
 
-  suspend fun write(b: ByteArray, offset: Int, size: Int) = withTimeout(timeout) {
-    output?.writeFully(b, offset, offset + size)
+  suspend fun write(b: ByteArray, offset: Int, size: Int) {
+    output?.writeFully(b, offset, size)
   }
 
   suspend fun writeUInt16(b: Int) {
@@ -73,13 +70,13 @@ abstract class TcpStreamSocket: StreamSocket {
     writeUInt32(Integer.reverseBytes(b))
   }
 
-  suspend fun write(string: String) = withTimeout(timeout) {
+  suspend fun write(string: String) {
     output?.writeStringUtf8(string)
   }
 
-  suspend fun read(): Int = withTimeout(timeout) {
+  suspend fun read(): Int {
     val input = input ?: throw ConnectException("Read with socket closed, broken pipe")
-    input.readByte().toInt()
+    return input.readByte().toInt()
   }
 
   suspend fun readUInt16(): Int {
@@ -104,13 +101,13 @@ abstract class TcpStreamSocket: StreamSocket {
     return Integer.reverseBytes(readUInt32())
   }
 
-  suspend fun readUntil(b: ByteArray) = withTimeout(timeout) {
+  suspend fun readUntil(b: ByteArray) {
     val input = input ?: throw ConnectException("Read with socket closed, broken pipe")
     input.readFully(b)
   }
 
-  suspend fun readLine(): String? = withTimeout(timeout) {
+  suspend fun readLine(): String? {
     val input = input ?: throw ConnectException("Read with socket closed, broken pipe")
-    input.readUTF8Line()
+    return input.readUTF8Line()
   }
 }
diff --git a/common/src/main/java/com/pedro/common/socket/TcpStreamSocketImp.kt b/common/src/main/java/com/pedro/common/socket/TcpStreamSocketImp.kt
@@ -47,7 +47,12 @@ class TcpStreamSocketImp(
 
   override suspend fun connect() {
     selectorManager = SelectorManager(Dispatchers.IO)
-    val builder = aSocket(selectorManager).tcp().connect(remoteAddress = InetSocketAddress(host, port))
+    val builder = aSocket(selectorManager).tcp().connect(
+      remoteAddress = InetSocketAddress(host, port),
+      configure = {
+        if (!secured) socketTimeout = timeout
+      }
+    )
     val socket = if (secured) {
       builder.tls(Dispatchers.Default) {
         trustManager = certificate

diff --git a/common/src/main/java/com/pedro/common/socket/UdpStreamSocket.kt b/common/src/main/java/com/pedro/common/socket/UdpStreamSocket.kt
@@ -25,10 +25,9 @@ import io.ktor.network.sockets.InetSocketAddress
 import io.ktor.network.sockets.aSocket
 import io.ktor.network.sockets.isClosed
 import io.ktor.utils.io.core.ByteReadPacket
-import io.ktor.utils.io.core.remaining
+import io.ktor.utils.io.core.readBytes
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import kotlinx.io.readByteArray
 import java.net.ConnectException
 import java.net.InetAddress
 
@@ -78,7 +77,7 @@ class UdpStreamSocket(
     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)
   }
 
   suspend fun writePacket(bytes: ByteArray) {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,7 +19,7 @@ annotation = "1.9.1"
 coroutines = "1.9.0"
 junit = "4.13.2"
 mockito = "5.4.0"
-ktor = "3.0.1"
+ktor = "2.3.13"
 uvcandroid = "1.0.7"
 media3 = "1.5.0"