Feature/onion request refactor

app/src/main/java/org/session/libsession/messaging/MessagingModuleConfiguration.kt

@@ -9,7 +9,9 @@ import org.session.libsession.messaging.groups.GroupManagerV2
 import org.session.libsession.messaging.groups.LegacyGroupDeprecationManager
 import org.session.libsession.messaging.jobs.MessageSendJob
 import org.session.libsession.messaging.notifications.TokenFetcher
-import org.session.libsession.snode.SnodeClock
+import org.session.libsession.network.ServerClient
+import org.session.libsession.network.SnodeClock
+import org.session.libsession.network.onion.PathManager
 import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsession.utilities.Device
 import org.session.libsession.utilities.TextSecurePreferences
@@ -28,14 +30,16 @@ class MessagingModuleConfiguration @Inject constructor(
     val configFactory: ConfigFactoryProtocol,
     val tokenFetcher: TokenFetcher,
     val groupManagerV2: GroupManagerV2,
-    val clock: SnodeClock,
     val preferences: TextSecurePreferences,
     val deprecationManager: LegacyGroupDeprecationManager,
     val recipientRepository: RecipientRepository,
     val avatarUtils: AvatarUtils,
     val proStatusManager: ProStatusManager,
     val messageSendJobFactory: MessageSendJob.Factory,
     val json: Json,
+    val snodeClock: SnodeClock,
+    val serverClient: ServerClient,
+    val pathManager: PathManager
 ) {
 
     companion object {

app/src/main/java/org/session/libsession/messaging/file_server/FileServerApi.kt

@@ -3,16 +3,14 @@ package org.session.libsession.messaging.file_server
 import android.util.Base64
 import kotlinx.coroutines.CancellationException
 import network.loki.messenger.libsession_util.Curve25519
-import network.loki.messenger.libsession_util.ED25519
 import network.loki.messenger.libsession_util.util.BlindKeyAPI
 import okhttp3.Headers.Companion.toHeaders
 import okhttp3.HttpUrl
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import org.session.libsession.database.StorageProtocol
-import org.session.libsession.snode.OnionRequestAPI
-import org.session.libsession.snode.utilities.await
+import org.session.libsession.network.ServerClient
 import org.session.libsignal.utilities.ByteArraySlice
 import org.session.libsignal.utilities.HTTP
 import org.session.libsignal.utilities.Hex
@@ -30,6 +28,7 @@ import kotlin.time.Duration.Companion.milliseconds
 @Singleton
 class FileServerApi @Inject constructor(
     private val storage: StorageProtocol,
+    private val serverClient: ServerClient
 ) {
 
     companion object {
@@ -95,15 +94,16 @@ class FileServerApi @Inject constructor(
         }
         return if (request.useOnionRouting) {
             try {
-                val response = OnionRequestAPI.sendOnionRequest(
+                val response = serverClient.send(
                     request = requestBuilder.build(),
-                    server = request.fileServer.url.host,
+                    serverBaseUrl = request.fileServer.url.host,
                     x25519PublicKey =
                         Hex.toStringCondensed(
                             Curve25519.pubKeyFromED25519(Hex.fromStringCondensed(request.fileServer.ed25519PublicKeyHex))
                         )
-                ).await()
+                )
 
+                //todo ONION  in the new architecture, an Onionresponse should always be in 200..299, otherwise an OnionError is thrown
                 check(response.code in 200..299) {
                     "Error response from file server: ${response.code}"
                 }

app/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt

@@ -13,7 +13,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentState
 import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment
 import org.session.libsession.messaging.utilities.Data
-import org.session.libsession.snode.OnionRequestAPI
+import org.session.libsession.network.model.OnionError
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.DecodedAudio
 import org.session.libsession.utilities.InputStreamMediaDataSource
@@ -94,7 +94,7 @@ class AttachmentDownloadJob @AssistedInject constructor(
             } else if (exception == Error.NoAttachment
                     || exception == Error.NoThread
                     || exception == Error.NoSender
-                    || (exception is OnionRequestAPI.HTTPRequestFailedAtDestinationException && exception.statusCode == 400)
+                    || (exception is OnionError.DestinationError && exception.status?.code == 400) //todo ONION this is matching old behaviour. Do we want this kind of error handling here?
                     || exception is NonRetryableException) {
                 attachment?.let { id ->
                     Log.d("AttachmentDownloadJob", "Setting attachment state = failed, have attachment")

app/src/main/java/org/session/libsession/messaging/jobs/InviteContactsJob.kt

@@ -18,7 +18,7 @@ import org.session.libsession.messaging.messages.control.GroupUpdated
 import org.session.libsession.messaging.sending_receiving.MessageSender
 import org.session.libsession.messaging.utilities.Data
 import org.session.libsession.messaging.utilities.MessageAuthentication.buildGroupInviteSignature
-import org.session.libsession.snode.SnodeAPI
+import org.session.libsession.network.SnodeClock
 import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsession.utilities.getGroup
 import org.session.libsession.utilities.withGroupConfigs
@@ -34,6 +34,7 @@ class InviteContactsJob @AssistedInject constructor(
     @Assisted val isReinvite: Boolean,
     private val configFactory: ConfigFactoryProtocol,
     private val messageSender: MessageSender,
+    private val snodeClock: SnodeClock
 
 ) : Job {
 
@@ -71,7 +72,7 @@ class InviteContactsJob @AssistedInject constructor(
                             configs.groupInfo.getName() to configs.groupKeys.makeSubAccount(memberSessionId)
                         }
 
-                        val timestamp = SnodeAPI.nowWithOffset
+                        val timestamp = snodeClock.currentTimeMills()
                         val signature = ED25519.sign(
                             ed25519PrivateKey = adminKey.data,
                             message = buildGroupInviteSignature(memberId, timestamp),

app/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt

@@ -6,22 +6,29 @@ import com.esotericsoftware.kryo.io.Output
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.Request
 import okhttp3.RequestBody
+import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.jobs.Job.Companion.MAX_BUFFER_SIZE_BYTES
 import org.session.libsession.messaging.sending_receiving.notifications.Server
 import org.session.libsession.messaging.utilities.Data
-import org.session.libsession.snode.OnionRequestAPI
+import org.session.libsession.network.ServerClient
+import org.session.libsession.network.onion.Version
 import org.session.libsession.snode.SnodeMessage
-import org.session.libsession.snode.Version
 import org.session.libsignal.utilities.JsonUtil
 import org.session.libsignal.utilities.Log
-import org.session.libsignal.utilities.retryIfNeeded
+import org.session.libsignal.utilities.retryWithUniformInterval
+import kotlin.coroutines.cancellation.CancellationException
 
 class NotifyPNServerJob(val message: SnodeMessage) : Job {
     override var delegate: JobDelegate? = null
     override var id: String? = null
     override var failureCount: Int = 0
 
     override val maxFailureCount: Int = 20
+
+    private val serverClient: ServerClient by lazy {
+        MessagingModuleConfiguration.shared.serverClient
+    }
+
     companion object {
         val KEY: String = "NotifyPNServerJob"
 
@@ -31,27 +38,32 @@ class NotifyPNServerJob(val message: SnodeMessage) : Job {
 
     override suspend fun execute(dispatcherName: String) {
         val server = Server.LEGACY
-        val parameters = mapOf( "data" to message.data, "send_to" to message.recipient )
+        val parameters = mapOf("data" to message.data, "send_to" to message.recipient)
         val url = "${server.url}/notify"
         val body = RequestBody.create("application/json".toMediaType(), JsonUtil.toJson(parameters))
         val request = Request.Builder().url(url).post(body).build()
-        retryIfNeeded(4) {
-            OnionRequestAPI.sendOnionRequest(
-                request,
-                server.url,
-                server.publicKey,
-                Version.V2
-            ) success { response ->
-                when (response.code) {
-                    null, 0 -> Log.d("NotifyPNServerJob", "Couldn't notify PN server due to error: ${response.message}.")
-                }
-            } fail { exception ->
-                Log.d("NotifyPNServerJob", "Couldn't notify PN server due to error: $exception.")
+
+        try {
+            // High-level application retry (4 attempts)
+            retryWithUniformInterval(maxRetryCount = 4) {
+                serverClient.send(
+                    request = request,
+                    serverBaseUrl = server.url,
+                    x25519PublicKey = server.publicKey,
+                    version = Version.V2
+                )
+
+                // todo ONION the old code was checking the status code on success and if it is null or 0 it would log it as a fail
+                // the new structure however throws all non 200.299 status as an OnionError
             }
-        } success {
+
             handleSuccess(dispatcherName)
-        } fail {
-            handleFailure(dispatcherName, it)
+
+        } catch (e: Exception) {
+            if (e is CancellationException) throw e
+
+            Log.d("NotifyPNServerJob", "Couldn't notify PN server due to error: $e.")
+            handleFailure(dispatcherName, e)
         }
     }
 

app/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupApi.kt

@@ -18,10 +18,8 @@ import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.RequestBody
 import org.session.libsession.messaging.MessagingModuleConfiguration
-import org.session.libsession.snode.OnionRequestAPI
-import org.session.libsession.snode.OnionResponse
-import org.session.libsession.snode.SnodeAPI
-import org.session.libsession.snode.utilities.await
+import org.session.libsession.network.model.OnionError
+import org.session.libsession.network.model.OnionResponse
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.Base64.encodeBytes
 import org.session.libsignal.utilities.ByteArraySlice
@@ -339,7 +337,7 @@ object OpenGroupApi {
 
             val headers = request.headers.toMutableMap()
             val nonce = ByteArray(16).also { SecureRandom().nextBytes(it) }
-            val timestamp = TimeUnit.MILLISECONDS.toSeconds(SnodeAPI.nowWithOffset)
+            val timestamp = TimeUnit.MILLISECONDS.toSeconds(MessagingModuleConfiguration.shared.snodeClock.currentTimeMills())
             val bodyHash = if (request.parameters != null) {
                 val parameterBytes = JsonUtil.toJson(request.parameters).toByteArray()
                 Hash.hash64(parameterBytes)
@@ -409,14 +407,21 @@ object OpenGroupApi {
         if (!request.room.isNullOrEmpty()) {
             requestBuilder.header("Room", request.room)
         }
-        return if (request.useOnionRouting) {
-            OnionRequestAPI.sendOnionRequest(requestBuilder.build(), request.server, serverPublicKey).fail { e ->
+
+        if (request.useOnionRouting) {
+            try {
+                return MessagingModuleConfiguration.shared.serverClient.send(
+                    request = requestBuilder.build(),
+                    serverBaseUrl = request.server,
+                    x25519PublicKey = serverPublicKey
+                )
+            } catch (e: Exception) {
                 when (e) {
-                    // No need for the stack trace for HTTP errors
-                    is HTTP.HTTPRequestFailedException -> Log.e("SOGS", "Failed onion request: ${e.message}")
+                    is OnionError -> Log.e("SOGS", "Failed onion request: ${e.message}")
                     else -> Log.e("SOGS", "Failed onion request", e)
                 }
-            }.await()
+                throw e
+            }
         } else {
             throw IllegalStateException("It's currently not allowed to send non onion routed requests.")
         }

app/src/main/java/org/session/libsession/messaging/sending_receiving/GroupMessageHandler.kt

@@ -12,7 +12,7 @@ import org.session.libsession.messaging.utilities.MessageAuthentication.buildDel
 import org.session.libsession.messaging.utilities.MessageAuthentication.buildGroupInviteSignature
 import org.session.libsession.messaging.utilities.MessageAuthentication.buildInfoChangeSignature
 import org.session.libsession.messaging.utilities.MessageAuthentication.buildMemberChangeSignature
-import org.session.libsession.snode.SnodeClock
+import org.session.libsession.network.SnodeClock
 import org.session.protos.SessionProtos
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.IdPrefix

app/src/main/java/org/session/libsession/messaging/sending_receiving/MessageParser.kt

@@ -18,7 +18,7 @@ import org.session.libsession.messaging.messages.control.TypingIndicator
 import org.session.libsession.messaging.messages.control.UnsendRequest
 import org.session.libsession.messaging.messages.visible.VisibleMessage
 import org.session.libsession.messaging.open_groups.OpenGroupApi
-import org.session.libsession.snode.SnodeClock
+import org.session.libsession.network.SnodeClock
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.ConfigFactoryProtocol
 import org.session.libsession.utilities.TextSecurePreferences

app/src/main/java/org/session/libsession/messaging/sending_receiving/MessageRequestResponseHandler.kt

@@ -6,7 +6,7 @@ import org.session.libsession.messaging.messages.ProfileUpdateHandler
 import org.session.libsession.messaging.messages.control.MessageRequestResponse
 import org.session.libsession.messaging.messages.signal.IncomingMediaMessage
 import org.session.libsession.messaging.messages.visible.VisibleMessage
-import org.session.libsession.snode.SnodeClock
+import org.session.libsession.network.SnodeClock
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.Address.Companion.toAddress
 import org.session.libsession.utilities.ConfigFactoryProtocol

app/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt

@@ -28,8 +28,8 @@ import org.session.libsession.messaging.messages.visible.VisibleMessage
 import org.session.libsession.messaging.open_groups.OpenGroupApi
 import org.session.libsession.messaging.open_groups.OpenGroupApi.Capability
 import org.session.libsession.messaging.open_groups.OpenGroupMessage
-import org.session.libsession.snode.SnodeAPI
-import org.session.libsession.snode.SnodeClock
+import org.session.libsession.network.SnodeClient
+import org.session.libsession.network.SnodeClock
 import org.session.libsession.snode.SnodeMessage
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.ConfigFactoryProtocol
@@ -62,6 +62,7 @@ class MessageSender @Inject constructor(
     private val messageSendJobFactory: MessageSendJob.Factory,
     private val messageExpirationManager: ExpiringMessageManager,
     private val snodeClock: SnodeClock,
+    private val snodeClient: SnodeClient,
     @param:ManagerScope private val scope: CoroutineScope,
 ) {
 
@@ -246,14 +247,14 @@ class MessageSender @Inject constructor(
                             "Unable to authorize group message send"
                         }
 
-                        SnodeAPI.sendMessage(
+                        snodeClient.sendMessage(
                             auth = groupAuth,
                             message = snodeMessage,
                             namespace = Namespace.GROUP_MESSAGES(),
                         )
                     }
                     is Destination.Contact -> {
-                        SnodeAPI.sendMessage(snodeMessage, auth = null, namespace = Namespace.DEFAULT())
+                        snodeClient.sendMessage(snodeMessage, auth = null, namespace = Namespace.DEFAULT())
                     }
                     is Destination.OpenGroup,
                     is Destination.OpenGroupInbox -> throw IllegalStateException("Destination should not be an open group.")

app/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageProcessor.kt

@@ -29,7 +29,7 @@ import org.session.libsession.messaging.open_groups.OpenGroupApi
 import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage
 import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier
 import org.session.libsession.messaging.utilities.WebRtcUtils
-import org.session.libsession.snode.SnodeAPI
+import org.session.libsession.network.SnodeClient
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.Address.Companion.toAddress
 import org.session.libsession.utilities.ConfigFactoryProtocol
@@ -77,6 +77,7 @@ class ReceivedMessageProcessor @Inject constructor(
     private val visibleMessageHandler: Provider<VisibleMessageHandler>,
     private val blindMappingRepository: BlindMappingRepository,
     private val messageParser: MessageParser,
+    private val snodeClient: SnodeClient
 ) {
     private val threadMutexes = ConcurrentHashMap<Address.Conversable, ReentrantLock>()
 
@@ -453,7 +454,7 @@ class ReceivedMessageProcessor @Inject constructor(
             messageDataProvider.getServerHashForMessage(messageIdToDelete)?.let { serverHash ->
                 scope.launch(Dispatchers.IO) { // using scope as we are slowly migrating to coroutines but we can't migrate everything at once
                     try {
-                        SnodeAPI.deleteMessage(author, userAuth, listOf(serverHash))
+                        snodeClient.deleteMessage(author, userAuth, listOf(serverHash))
                     } catch (e: Exception) {
                         Log.e("Loki", "Failed to delete message", e)
                     }

app/src/main/java/org/session/libsession/messaging/sending_receiving/VisibleMessageHandler.kt

@@ -19,7 +19,7 @@ import org.session.libsession.messaging.messages.visible.VisibleMessage
 import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment
 import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview
 import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel
-import org.session.libsession.snode.SnodeClock
+import org.session.libsession.network.SnodeClock
 import org.session.libsession.utilities.Address
 import org.session.libsession.utilities.Address.Companion.toAddress
 import org.session.libsession.utilities.SSKEnvironment