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,15 @@ 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.libsession.network.SnodeClock
 import org.session.libsignal.utilities.ByteArraySlice
 import org.session.libsignal.utilities.HTTP
 import org.session.libsignal.utilities.Hex
@@ -30,6 +29,8 @@ import kotlin.time.Duration.Companion.milliseconds
 @Singleton
 class FileServerApi @Inject constructor(
     private val storage: StorageProtocol,
+    private val serverClient: ServerClient,
+    private val snodeClock: SnodeClock
 ) {
 
     companion object {
@@ -59,7 +60,10 @@ class FileServerApi @Inject constructor(
          * Always `true` under normal circumstances. You might want to disable
          * this when running over Lokinet.
          */
-        val useOnionRouting: Boolean = true
+        val useOnionRouting: Boolean = true,
+
+        // Computed fresh for each attempt (after clock resync etc.)
+        val dynamicHeaders: (suspend () -> Map<String, String>)? = null
     )
 
     private fun createBody(body: ByteArray?, parameters: Any?): RequestBody? {
@@ -75,35 +79,44 @@ class FileServerApi @Inject constructor(
     }
 
 
-    private suspend fun send(request: Request): SendResponse {
-        val urlBuilder = request.fileServer.url
-            .newBuilder()
-            .addPathSegments(request.endpoint)
-        if (request.verb == HTTP.Verb.GET) {
-            for ((key, value) in request.queryParameters) {
-                urlBuilder.addQueryParameter(key, value)
-            }
-        }
-        val requestBuilder = okhttp3.Request.Builder()
-            .url(urlBuilder.build())
-            .headers(request.headers.toHeaders())
-        when (request.verb) {
-            HTTP.Verb.GET -> requestBuilder.get()
-            HTTP.Verb.PUT -> requestBuilder.put(createBody(request.body, request.parameters) ?: RequestBody.EMPTY)
-            HTTP.Verb.POST -> requestBuilder.post(createBody(request.body, request.parameters) ?: RequestBody.EMPTY)
-            HTTP.Verb.DELETE -> requestBuilder.delete(createBody(request.body, request.parameters))
-        }
+    private suspend fun send(request: Request, operationName: String): SendResponse {
         return if (request.useOnionRouting) {
             try {
-                val response = OnionRequestAPI.sendOnionRequest(
-                    request = requestBuilder.build(),
-                    server = request.fileServer.url.host,
+                val response = serverClient.send(
+                    operationName = operationName,
+                    requestFactory = {
+                        val urlBuilder = request.fileServer.url
+                            .newBuilder()
+                            .addPathSegments(request.endpoint)
+
+                        if (request.verb == HTTP.Verb.GET) {
+                            for ((k, v) in request.queryParameters) urlBuilder.addQueryParameter(k, v)
+                        }
+
+                        val computed = request.dynamicHeaders?.invoke().orEmpty()
+                        val mergedHeaders = (request.headers + computed)
+
+                        val builder = okhttp3.Request.Builder()
+                            .url(urlBuilder.build())
+                            .headers(mergedHeaders.toHeaders())
+
+                        when (request.verb) {
+                            HTTP.Verb.GET -> builder.get()
+                            HTTP.Verb.PUT -> builder.put(createBody(request.body, request.parameters) ?: RequestBody.EMPTY)
+                            HTTP.Verb.POST -> builder.post(createBody(request.body, request.parameters) ?: RequestBody.EMPTY)
+                            HTTP.Verb.DELETE -> builder.delete(createBody(request.body, request.parameters))
+                        }
+
+                        builder.build()
+                    },
+                    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}"
                 }
@@ -144,7 +157,7 @@ class FileServerApi @Inject constructor(
                 }
             }
         )
-        val response = send(request)
+        val response = send(request, "FileServer.upload")
         val json = JsonUtil.fromJson(response.body, Map::class.java)
         val id = json["id"]!!.toString()
         val expiresEpochSeconds = (json.getOrDefault("expires", null) as? Number)?.toLong()
@@ -169,7 +182,7 @@ class FileServerApi @Inject constructor(
             verb = HTTP.Verb.GET,
             endpoint = "file/$fileId"
         )
-        return send(request)
+        return send(request, "FileServer.download")
     }
 
     suspend fun renew(fileId: String,
@@ -184,7 +197,7 @@ class FileServerApi @Inject constructor(
                     "X-FS-TTL" to it.inWholeSeconds.toString()
                 }
             } ?: mapOf()
-        ))
+        ), "FileServer.renew")
 
         resp.expires
     }
@@ -308,8 +321,6 @@ class FileServerApi @Inject constructor(
             ?: throw (Error.NoEd25519KeyPair)
 
         val blindedKeys = BlindKeyAPI.blindVersionKeyPair(secretKey)
-        val timestamp = System.currentTimeMillis().milliseconds.inWholeSeconds //  The current timestamp in seconds
-        val signature = BlindKeyAPI.blindVersionSign(secretKey, timestamp)
 
         // The hex encoded version-blinded public key with a 07 prefix
         val blindedPkHex = "07" + blindedKeys.pubKey.data.toHexString()
@@ -319,15 +330,21 @@ class FileServerApi @Inject constructor(
             verb = HTTP.Verb.GET,
             endpoint = "session_version",
             queryParameters = mapOf("platform" to "android"),
-            headers = mapOf(
-                "X-FS-Pubkey" to blindedPkHex,
-                "X-FS-Timestamp" to timestamp.toString(),
-                "X-FS-Signature" to Base64.encodeToString(signature, Base64.NO_WRAP)
-            )
+            headers = mapOf("X-FS-Pubkey" to blindedPkHex),
+            // dynamic ones recomputed every attempt:
+            dynamicHeaders = {
+                val timestamp = snodeClock.currentTimeSeconds()
+                val signature = BlindKeyAPI.blindVersionSign(secretKey, timestamp)
+
+                mapOf(
+                    "X-FS-Timestamp" to timestamp.toString(),
+                    "X-FS-Signature" to Base64.encodeToString(signature, Base64.NO_WRAP)
+                )
+            }
         )
 
         // transform the promise into a coroutine
-        val result = send(request)
+        val result = send(request, "FileServer.getClientVersion")
 
         // map out the result
         return JsonUtil.fromJson(result.body, Map::class.java).let {

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/JobQueue.kt

@@ -120,7 +120,6 @@ class JobQueue : JobDelegate {
             while (isActive) {
                 when (val job = queue.receive()) {
                     is InviteContactsJob,
-                    is NotifyPNServerJob,
                     is AttachmentUploadJob,
                     is MessageSendJob -> {
                         txQueue.send(job)
@@ -219,7 +218,6 @@ class JobQueue : JobDelegate {
             AttachmentUploadJob.KEY,
             AttachmentDownloadJob.KEY,
             MessageSendJob.KEY,
-            NotifyPNServerJob.KEY,
             OpenGroupDeleteJob.KEY,
             InviteContactsJob.KEY,
         )

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

@@ -16,7 +16,6 @@ class SessionJobManagerFactories @Inject constructor(
             AttachmentDownloadJob.KEY to attachmentDownloadJobFactory,
             AttachmentUploadJob.KEY to attachmentUploadJobFactory,
             MessageSendJob.KEY to messageSendJobFactory,
-            NotifyPNServerJob.KEY to NotifyPNServerJob.DeserializeFactory(),
             TrimThreadJob.KEY to trimThreadFactory,
             OpenGroupDeleteJob.KEY to deleteJobFactory,
             InviteContactsJob.KEY to inviteContactsJobFactory,