Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ import kotlinx.serialization.json.Json
import kotlinx.serialization.json.decodeFromStream
import kotlinx.serialization.SerializationException
import okhttp3.Call
import okhttp3.Callback
import okhttp3.OkHttpClient
import okhttp3.Request
import okhttp3.Response
import okhttp3.ResponseBody
import java.net.URI
import java.nio.charset.Charset
Expand Down Expand Up @@ -376,18 +378,21 @@ class OkHttpXtreamApiService(
continuation.invokeOnCancellation {
call.cancel()
}
try {
val response = call.execute()
if (continuation.isActive) {
continuation.resume(response)
} else {
response.close()
call.enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) {
if (continuation.isActive) {
continuation.resumeWithException(e)
}
}
} catch (e: Exception) {
if (continuation.isActive) {
continuation.resumeWithException(e)

override fun onResponse(call: Call, response: Response) {
if (continuation.isActive) {
continuation.resume(response)
} else {
response.close()
}
}
}
})
}

private inline fun <reified T> decodeBodyBounded(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@ import com.streamvault.data.remote.http.HttpRequestProfile
import com.streamvault.data.remote.dto.XtreamSeriesInfoResponse
import java.io.IOException
import java.net.SocketTimeoutException
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import java.util.concurrent.atomic.AtomicInteger
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withTimeout
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.cancel
import kotlinx.coroutines.cancelAndJoin
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import kotlinx.coroutines.test.runTest
import kotlinx.serialization.json.Json
Expand Down Expand Up @@ -139,33 +144,36 @@ class OkHttpXtreamApiServiceTest {

@Test
fun `streamLiveStreamRows cancels the underlying call when coroutine times out`() = runTest {
val cancellationObserved = CompletableDeferred<Unit>()
val requestStarted = CountDownLatch(1)
val cancellationObserved = CountDownLatch(1)
val service = OkHttpXtreamApiService(
client = OkHttpClient.Builder()
.addInterceptor(Interceptor { chain ->
requestStarted.countDown()
while (!chain.call().isCanceled()) {
Thread.sleep(10)
}
cancellationObserved.complete(Unit)
cancellationObserved.countDown()
throw IOException("Canceled")
})
.build(),
json = json
)

val failure = runCatching {
withTimeout(100) {
service.streamLiveStreamRows(
"https://example.test/player_api.php?action=get_live_streams&category_id=7"
) { }
}
}.exceptionOrNull()
val requestScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
val requestJob = requestScope.launch {
service.streamLiveStreamRows(
"https://example.test/player_api.php?action=get_live_streams&category_id=7"
) { }
}

assertThat(requestStarted.await(5, TimeUnit.SECONDS)).isTrue()
requestJob.cancelAndJoin()
requestScope.cancel()

assertThat(failure).isNotNull()
assertThat(requestJob.isCancelled).isTrue()
withContext(Dispatchers.Default.limitedParallelism(1)) {
withTimeout(500) {
cancellationObserved.await()
}
assertThat(cancellationObserved.await(5, TimeUnit.SECONDS)).isTrue()
}
}

Expand Down
Loading