Speed up path building

2025-08-12 11:07:42 +00:00 · 2021-05-13 10:31:06 +10:00
parent af84b1ef3a
commit 115bc9b159
25 changed files with 100 additions and 64 deletions
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt
@@ -5,6 +5,7 @@ import org.session.libsession.messaging.MessagingModuleConfiguration
 import org.session.libsession.messaging.file_server.FileServerAPI
 import org.session.libsession.messaging.open_groups.OpenGroupAPIV2
 import org.session.libsession.messaging.sending_receiving.attachments.AttachmentState
+import org.session.libsession.messaging.utilities.Data
 import org.session.libsession.messaging.utilities.DotNetAPI
 import org.session.libsession.utilities.DownloadUtilities
 import org.session.libsignal.service.api.crypto.AttachmentCipherInputStream
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt
@@ -8,6 +8,7 @@ import org.session.libsession.messaging.file_server.FileServerAPI
 import org.session.libsession.messaging.messages.Message
 import org.session.libsession.messaging.open_groups.OpenGroupAPIV2
 import org.session.libsession.messaging.sending_receiving.MessageSender
+import org.session.libsession.messaging.utilities.Data
 import org.session.libsession.messaging.utilities.DotNetAPI
 import org.session.libsignal.service.api.crypto.AttachmentCipherOutputStream
 import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/Job.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/Job.kt
@@ -1,5 +1,7 @@
 package org.session.libsession.messaging.jobs

+import org.session.libsession.messaging.utilities.Data
+
 interface Job {
    var delegate: JobDelegate?
    var id: String?
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt
@@ -4,6 +4,7 @@ import nl.komponents.kovenant.Promise
 import nl.komponents.kovenant.deferred
 import org.session.libsession.messaging.sending_receiving.MessageReceiver
 import org.session.libsession.messaging.sending_receiving.handle
+import org.session.libsession.messaging.utilities.Data
 import org.session.libsignal.utilities.logging.Log

 class MessageReceiveJob(val data: ByteArray, val isBackgroundPoll: Boolean, val openGroupMessageServerID: Long? = null, val openGroupID: String? = null) : Job {
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt
@@ -9,6 +9,7 @@ import org.session.libsession.messaging.messages.Destination
 import org.session.libsession.messaging.messages.Message
 import org.session.libsession.messaging.messages.visible.VisibleMessage
 import org.session.libsession.messaging.sending_receiving.MessageSender
+import org.session.libsession.messaging.utilities.Data
 import org.session.libsignal.utilities.logging.Log

 class MessageSendJob(val message: Message, val destination: Destination) : Job {
--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt
@@ -9,6 +9,7 @@ import okhttp3.Request
 import okhttp3.RequestBody

 import org.session.libsession.messaging.sending_receiving.notifications.PushNotificationAPI
+import org.session.libsession.messaging.utilities.Data
 import org.session.libsession.snode.SnodeMessage
 import org.session.libsession.snode.OnionRequestAPI

--- a/libsession/src/main/java/org/session/libsession/messaging/jobs/SessionJobInstantiator.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/SessionJobInstantiator.kt
@@ -1,5 +1,7 @@
 package org.session.libsession.messaging.jobs

+import org.session.libsession.messaging.utilities.Data
+
 class SessionJobInstantiator(private val jobFactories: Map<String, Job.Factory<out Job>>) {

    fun instantiate(jobFactoryKey: String, data: Data): Job? {
--- a/libsession/src/main/java/org/session/libsession/messaging/utilities/Data.java
+++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/Data.java
@@ -1,4 +1,4 @@
-package org.session.libsession.messaging.jobs;
+package org.session.libsession.messaging.utilities;

 import android.os.Parcelable;

@@ -12,11 +12,7 @@ import org.session.libsession.utilities.ParcelableUtil;
 import java.util.HashMap;
 import java.util.Map;

-// Introduce a dedicated Map<String, byte[]> field specifically for parcelable needs.
 public class Data {
-
-    public static final Data EMPTY = new Data.Builder().build();
-
    @JsonProperty private final Map<String, String>    strings;
    @JsonProperty private final Map<String, String[]>  stringArrays;
    @JsonProperty private final Map<String, Integer>   integers;
@@ -31,20 +27,23 @@ public class Data {
    @JsonProperty private final Map<String, boolean[]> booleanArrays;
    @JsonProperty private final Map<String, byte[]>    byteArrays;

-    public Data(@JsonProperty("strings")       @NonNull Map<String, String>    strings,
-                @JsonProperty("stringArrays")  @NonNull Map<String, String[]>  stringArrays,
-                @JsonProperty("integers")      @NonNull Map<String, Integer>   integers,
-                @JsonProperty("integerArrays") @NonNull Map<String, int[]>     integerArrays,
-                @JsonProperty("longs")         @NonNull Map<String, Long>      longs,
-                @JsonProperty("longArrays")    @NonNull Map<String, long[]>    longArrays,
-                @JsonProperty("floats")        @NonNull Map<String, Float>     floats,
-                @JsonProperty("floatArrays")   @NonNull Map<String, float[]>   floatArrays,
-                @JsonProperty("doubles")       @NonNull Map<String, Double>    doubles,
-                @JsonProperty("doubleArrays")  @NonNull Map<String, double[]>  doubleArrays,
-                @JsonProperty("booleans")      @NonNull Map<String, Boolean>   booleans,
-                @JsonProperty("booleanArrays") @NonNull Map<String, boolean[]> booleanArrays,
-                @JsonProperty("byteArrays")    @NonNull Map<String, byte[]>    byteArrays)
-    {
+    public static final Data EMPTY = new Data.Builder().build();
+
+    public Data(
+            @JsonProperty("strings")       @NonNull Map<String, String>    strings,
+            @JsonProperty("stringArrays")  @NonNull Map<String, String[]>  stringArrays,
+            @JsonProperty("integers")      @NonNull Map<String, Integer>   integers,
+            @JsonProperty("integerArrays") @NonNull Map<String, int[]>     integerArrays,
+            @JsonProperty("longs")         @NonNull Map<String, Long>      longs,
+            @JsonProperty("longArrays")    @NonNull Map<String, long[]>    longArrays,
+            @JsonProperty("floats")        @NonNull Map<String, Float>     floats,
+            @JsonProperty("floatArrays")   @NonNull Map<String, float[]>   floatArrays,
+            @JsonProperty("doubles")       @NonNull Map<String, Double>    doubles,
+            @JsonProperty("doubleArrays")  @NonNull Map<String, double[]>  doubleArrays,
+            @JsonProperty("booleans")      @NonNull Map<String, Boolean>   booleans,
+            @JsonProperty("booleanArrays") @NonNull Map<String, boolean[]> booleanArrays,
+            @JsonProperty("byteArrays")    @NonNull Map<String, byte[]>    byteArrays
+    ) {
        this.strings       = strings;
        this.stringArrays  = stringArrays;
        this.integers      = integers;
@@ -75,6 +74,7 @@ public class Data {
    }


+
    public boolean hasStringArray(@NonNull String key) {
        return stringArrays.containsKey(key);
    }
@@ -100,6 +100,7 @@ public class Data {
    }


+
    public boolean hasIntegerArray(@NonNull String key) {
        return integerArrays.containsKey(key);
    }
@@ -110,6 +111,7 @@ public class Data {
    }


+
    public boolean hasLong(@NonNull String key) {
        return longs.containsKey(key);
    }
@@ -125,6 +127,7 @@ public class Data {
    }


+
    public boolean hasLongArray(@NonNull String key) {
        return longArrays.containsKey(key);
    }
@@ -135,6 +138,7 @@ public class Data {
    }


+
    public boolean hasFloat(@NonNull String key) {
        return floats.containsKey(key);
    }
@@ -150,6 +154,7 @@ public class Data {
    }


+
    public boolean hasFloatArray(@NonNull String key) {
        return floatArrays.containsKey(key);
    }
@@ -160,6 +165,7 @@ public class Data {
    }


+
    public boolean hasDouble(@NonNull String key) {
        return doubles.containsKey(key);
    }
@@ -175,6 +181,7 @@ public class Data {
    }


+
    public boolean hasDoubleArray(@NonNull String key) {
        return floatArrays.containsKey(key);
    }
@@ -185,6 +192,7 @@ public class Data {
    }


+
    public boolean hasBoolean(@NonNull String key) {
        return booleans.containsKey(key);
    }
@@ -200,6 +208,7 @@ public class Data {
    }


+
    public boolean hasBooleanArray(@NonNull String key) {
        return booleanArrays.containsKey(key);
    }
@@ -209,6 +218,8 @@ public class Data {
        return booleanArrays.get(key);
    }

+
+
    public boolean hasByteArray(@NonNull String key) {
        return byteArrays.containsKey(key);
    }
@@ -218,6 +229,8 @@ public class Data {
        return byteArrays.get(key);
    }

+
+
    public boolean hasParcelable(@NonNull String key) {
        return byteArrays.containsKey(key);
    }
@@ -228,6 +241,8 @@ public class Data {
        return ParcelableUtil.unmarshall(bytes, creator);
    }

+
+
    private void throwIfAbsent(@NonNull Map map, @NonNull String key) {
        if (!map.containsKey(key)) {
            throw new IllegalStateException("Tried to retrieve a value with key '" + key + "', but it wasn't present.");
@@ -236,7 +251,6 @@ public class Data {


    public static class Builder {
-
        private final Map<String, String>    strings       = new HashMap<>();
        private final Map<String, String[]>  stringArrays  = new HashMap<>();
        private final Map<String, Integer>   integers      = new HashMap<>();
@@ -323,19 +337,21 @@ public class Data {
        }

        public Data build() {
-            return new Data(strings,
-                    stringArrays,
-                    integers,
-                    integerArrays,
-                    longs,
-                    longArrays,
-                    floats,
-                    floatArrays,
-                    doubles,
-                    doubleArrays,
-                    booleans,
-                    booleanArrays,
-                    byteArrays);
+            return new Data(
+                strings,
+                stringArrays,
+                integers,
+                integerArrays,
+                longs,
+                longArrays,
+                floats,
+                floatArrays,
+                doubles,
+                doubleArrays,
+                booleans,
+                booleanArrays,
+                byteArrays
+            );
        }
    }

@@ -343,5 +359,4 @@ public class Data {
        @NonNull String serialize(@NonNull Data data);
        @NonNull Data deserialize(@NonNull String serialized);
    }
-}
-
+}
--- a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
+++ b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt
@@ -53,11 +53,11 @@ object OnionRequestAPI {
    /**
     * The number of times a path can fail before it's replaced.
     */
-    private const val pathFailureThreshold = 1
+    private const val pathFailureThreshold = 3
    /**
     * The number of times a snode can fail before it's replaced.
     */
-    private const val snodeFailureThreshold = 1
+    private const val snodeFailureThreshold = 3
    /**
     * The number of guard snodes required to maintain `targetPathCount` paths.
     */
@@ -93,7 +93,7 @@ object OnionRequestAPI {
        ThreadUtils.queue { // No need to block the shared context for this
            val url = "${snode.address}:${snode.port}/get_stats/v1"
            try {
-                val json = HTTP.execute(HTTP.Verb.GET, url)
+                val json = HTTP.execute(HTTP.Verb.GET, url, 3)
                val version = json["version"] as? String
                if (version == null) { deferred.reject(Exception("Missing snode version.")); return@queue }
                if (version >= "2.0.7") {
@@ -463,7 +463,6 @@ object OnionRequestAPI {
            "method" to request.method(),
            "headers" to headers
        )
-        url.isHttps
        val destination = Destination.Server(host, target, x25519PublicKey, url.scheme(), url.port())
        return sendOnionRequest(destination, payload, isJSONRequired).recover { exception ->
            Log.d("Loki", "Couldn't reach server: $urlAsString due to error: $exception.")