Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 13:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add helper to catch/wrap exceptions that originate inside runWithUnauthChatConnection.

Browse Source
This commit is contained in:
andrew-signal
2025-10-09 13:49:54 -04:00
committed by Cody Henthorne
parent 3f7b73cf5e
commit eea89d3b62
2 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsignal-service/src/main/java/org/whispersystems/signalservice/api/username/UsernameApi.kt
View File

@@ -31,7 +31,7 @@ class UsernameApi(private val unauthWebSocket: SignalWebSocket.UnauthenticatedWe
*/
fun getAciByUsername(username: Username): RequestResult<ServiceId.ACI?, Nothing> {
return runBlocking {
unauthWebSocket.runWithUnauthChatConnection { chatConnection ->
unauthWebSocket.runCatchingWithUnauthChatConnection { chatConnection ->
UnauthUsernamesService(chatConnection).lookUpUsernameHash(username.hash)
}.getOrError().map { it?.let { ServiceId.ACI.fromLibSignal(it) } }
}

42
libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/SignalWebSocket.kt
View File

@@ -14,7 +14,10 @@ import io.reactivex.rxjava3.schedulers.Schedulers
import io.reactivex.rxjava3.subjects.BehaviorSubject
import org.signal.core.util.logging.Log
import org.signal.core.util.orNull
import org.signal.libsignal.net.ChatConnection
import org.signal.libsignal.internal.CompletableFuture
import org.signal.libsignal.net.BadRequestError
import org.signal.libsignal.net.RequestResult
import org.signal.libsignal.net.UnauthenticatedChatConnection
import org.whispersystems.signalservice.api.crypto.SealedSenderAccess
import org.whispersystems.signalservice.api.messages.EnvelopeResponse
import org.whispersystems.signalservice.api.util.SleepTimer
@@ -24,6 +27,8 @@ import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessa
import org.whispersystems.signalservice.internal.websocket.WebSocketResponseMessage
import org.whispersystems.signalservice.internal.websocket.WebsocketResponse
import java.io.IOException
import java.util.concurrent.CancellationException
import java.util.concurrent.CompletionException
import java.util.concurrent.CopyOnWriteArraySet
import java.util.concurrent.TimeoutException
import kotlin.time.Duration
@@ -325,8 +330,26 @@ sealed class SignalWebSocket(
}
}
suspend fun <T> runWithUnauthChatConnection(callback: (org.signal.libsignal.net.UnauthenticatedChatConnection) -> T): T {
return getWebSocket().runWithChatConnection(callback as (ChatConnection) -> T)
suspend fun <Result, Error : BadRequestError> runCatchingWithUnauthChatConnection(
callback: (UnauthenticatedChatConnection) -> CompletableFuture<RequestResult<Result, Error>>
): CompletableFuture<RequestResult<Result, Error>> {
val requestFuture = try {
getWebSocket().runWithChatConnection { chatConnection ->
val unauthenticatedConnection = chatConnection as? UnauthenticatedChatConnection
?: throw IllegalStateException("Expected unauthenticated chat connection but got ${chatConnection::class.java.simpleName}")
callback(unauthenticatedConnection)
}
} catch (throwable: Throwable) {
return CompletableFuture.completedFuture(throwable.toNetworkRequestResult())
}
return requestFuture.handle { result, throwable ->
when {
throwable != null -> throwable.toNetworkRequestResult()
result != null -> result
else -> RequestResult.ApplicationError(IllegalStateException("RequestResult was null"))
}
}
}
}
@@ -447,3 +470,16 @@ sealed class SignalWebSocket(
fun canConnect(): Boolean
}
}
private fun <T, E : BadRequestError> Throwable.toNetworkRequestResult(): RequestResult<T, E> {
val cause = if (this is CompletionException && this.cause != null) {
this.cause!!
} else {
this
}
return when (cause) {
is IOException -> RequestResult.RetryableNetworkError(cause)
is CancellationException -> RequestResult.RetryableNetworkError(IOException("Request cancelled", cause))
else -> RequestResult.ApplicationError(cause)
}
}