mobile/home-assistant-android
mobile/home-assistant-android
1
0
Fork 0
mirror of https://github.com/home-assistant/android synced 2024-10-15 12:32:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Catch exceptions while sending websocket messages (#3046)

Browse source 
- Don't crash the app when the connection is closed while a message was still being sent on the websocket. Instead return null like what is done for invalid messages.
This commit is contained in:
Joris Pelgröm 2022-11-09 22:16:05 +01:00 committed by GitHub
parent afa8a83496
commit e1c636e44e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
common/src/main/java/io/homeassistant/companion/android/common/data/websocket/impl/WebSocketRepositoryImpl.kt
View file

@ -60,6 +60,7 @@ import okio.ByteString
import java.io.IOException
import java.util.concurrent.atomic.AtomicLong
import javax.inject.Inject
import kotlin.coroutines.resumeWithException
class WebSocketRepositoryImpl @Inject constructor(
private val okHttpClient: OkHttpClient,
@ -378,21 +379,26 @@ class WebSocketRepositoryImpl @Inject constructor(
private suspend fun sendMessage(request: WebSocketRequest): SocketResponse? {
return if (connect()) {
withTimeoutOrNull(30000) {
suspendCancellableCoroutine { cont ->
// Lock on the connection so that we fully send before allowing another send.
// This should prevent out of order errors.
connection?.let {
synchronized(it) {
val requestId = id.getAndIncrement()
val outbound = request.message.plus("id" to requestId)
Log.d(TAG, "Sending message $requestId: $outbound")
activeMessages[requestId] = request.apply {
onResponse = cont
try {
suspendCancellableCoroutine { cont ->
// Lock on the connection so that we fully send before allowing another send.
// This should prevent out of order errors.
connection?.let {
synchronized(it) {
val requestId = id.getAndIncrement()
val outbound = request.message.plus("id" to requestId)
Log.d(TAG, "Sending message $requestId: $outbound")
activeMessages[requestId] = request.apply {
onResponse = cont
}
connection?.send(mapper.writeValueAsString(outbound))
Log.d(TAG, "Message number $requestId sent")
}
connection?.send(mapper.writeValueAsString(outbound))
Log.d(TAG, "Message number $requestId sent")
}
}
} catch (e: Exception) {
Log.e(TAG, "Exception while sending message", e)
null
}
}
} else {
@ -508,7 +514,7 @@ class WebSocketRepositoryImpl @Inject constructor(
.filterValues { it.eventFlow == null }
.forEach {
it.value.onResponse?.let { cont ->
if (cont.isActive) cont.resumeWith(Result.failure(IOException()))
if (cont.isActive) cont.resumeWithException(IOException())
}
activeMessages.remove(it.key)
}