Merge pull request #3286 from HenrikJannsen/use-mailbox-message-if-node-is-not-initialized

Use mailbox message if node is not initialized

Author: HenrikJannsen

chat/src/main/java/bisq/chat/ChatChannelService.java

@@ -83,7 +83,7 @@ public void addMessage(M message, C channel) {
     protected boolean isValid(M message) {
         String authorUserProfileId = message.getAuthorUserProfileId();
         if (bannedUserService.isUserProfileBanned(authorUserProfileId)) {
-            log.warn("Message invalid as sender is banned. AuthorUserProfileId={}", authorUserProfileId);
+            //log.warn("Message invalid as sender is banned. AuthorUserProfileId={}", authorUserProfileId);
             return false;
         }
         if (bannedUserService.isRateLimitExceeding(authorUserProfileId)) {

identity/src/main/java/bisq/identity/IdentityService.java

@@ -42,7 +42,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
 
 @Slf4j
@@ -89,30 +88,13 @@ public CompletableFuture<Boolean> initialize() {
             return CompletableFuture.completedFuture(true);
         }
 
-        CompletableFuture<Boolean> resultFuture = new CompletableFuture<>();
-        AtomicInteger numFailures = new AtomicInteger();
         // We get called after networkService with the default node is already initialized.
         // We publish now all onion services of our active identities.
-        networkService.getSupportedTransportTypes()
-                .forEach(transportType -> {
-                    initializeAllActiveIdentities(transportType)
-                            .whenComplete((list, throwable) -> {
-                                if (throwable == null) {
-                                    // We complete if one transport has published all identities
-                                    if (!resultFuture.isDone()) {
-                                        resultFuture.complete(true);
-                                    }
-                                } else {
-                                    numFailures.incrementAndGet();
-                                    // If all transports fail we let the result fail.
-                                    if (!resultFuture.isDone() && numFailures.get() >= networkService.getSupportedTransportTypes().size()) {
-                                        resultFuture.completeExceptionally(throwable);
-                                    }
-                                }
-                            });
-                });
+        // We do not wait for them to be completed as with many identities and in case tor is slow that could
+        // trigger startup timeouts.
+        networkService.getSupportedTransportTypes().forEach(this::initializeAllActiveIdentities);
 
-        return resultFuture;
+        return CompletableFuture.completedFuture(true);
     }
 
     @Override

network/network/src/main/java/bisq/network/NetworkService.java

@@ -74,6 +74,8 @@
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
@@ -281,7 +283,24 @@ public CompletableFuture<SendMessageResult> confidentialSend(EnvelopePayloadMess
                                     senderKeyPair,
                                     senderNetworkId);
                         },
-                        NETWORK_IO_POOL));
+                        NETWORK_IO_POOL))
+                .orTimeout(2, TimeUnit.SECONDS)
+                .whenComplete((result, throwable) -> {
+                    if (throwable != null) {
+                        if (throwable instanceof TimeoutException) {
+                            log.warn("TimeoutException at confidentialSend. Node for give networkId is not initialized. " +
+                                    "We send the message as mailbox message");
+                            supplyAsync(() -> {
+                                        ThreadName.set(this, "confidentialSend");
+                                        return serviceNodesByTransport.confidentialSend(envelopePayloadMessage,
+                                                receiverNetworkId,
+                                                senderKeyPair,
+                                                senderNetworkId);
+                                    },
+                                    NETWORK_IO_POOL);
+                        }
+                    }
+                });
     }
 
     // TODO (low prio): Not used. Consider to remove it so it wont get used accidentally.

network/network/src/main/java/bisq/network/p2p/services/confidential/ConfidentialMessageService.java

@@ -159,11 +159,11 @@ public SendConfidentialMessageResult send(EnvelopePayloadMessage envelopePayload
         SendConfidentialMessageResult result;
         String receiverAddress = receiverNetworkId.getAddresses();
         long start = System.currentTimeMillis();
-
-        // Node gets initialized at higher level services
-        nodesById.assertNodeIsInitialized(senderNetworkId);
-
         try {
+            // Node gets initialized at higher level services.
+            // In case it is not yet initialized, we let it fail and send the message as mailbox messsage
+            nodesById.assertNodeIsInitialized(senderNetworkId);
+
             CountDownLatch countDownLatch = new CountDownLatch(1);
             AtomicBoolean peerDetectedOffline = new AtomicBoolean();
             runAsync(() -> {

network/network/src/main/java/bisq/network/p2p/services/data/inventory/InventoryHandler.java

@@ -138,7 +138,11 @@ private void printReceivedInventory(InventoryResponse response) {
                 : "All data received from peer";
         String size = ByteUnit.BYTE.toKB((double) inventory.getCachedSerializedSize().orElse(0)) + " KB";
         String passed = MathUtils.roundDouble((System.currentTimeMillis() - requestTs) / 1000d, 2) + " sec.";
-        log.info("\n##########################################################################################\nReceived {} of inventory data from: {} after {}; \n{}\n##########################################################################################\n{}\n##########################################################################################", size, connection.getPeerAddress().getFullAddress(), passed, maxSizeReached, report);
+        log.info("\n##########################################################################################\n" +
+                "Received {} of inventory data from: {} after {}; \n{}" +
+                "\n##########################################################################################\n{}" +
+                "\n##########################################################################################",
+                size, connection.getPeerAddress().getFullAddress(), passed, maxSizeReached, report);
     }
 
     @Override

network/network/src/main/java/bisq/network/p2p/services/data/inventory/InventoryRequest.java

@@ -39,7 +39,6 @@ public final class InventoryRequest implements BroadcastMessage, Request {
     private final InventoryFilter inventoryFilter;
     private final int nonce;
 
-
     public InventoryRequest(InventoryFilter inventoryFilter, int nonce) {
         this(VERSION, inventoryFilter, nonce);
     }