Merge pull request #3290 from HenrikJannsen/small-fixes

Small fixes

Author: HenrikJannsen

i18n/src/main/resources/application.properties

@@ -17,7 +17,7 @@ splash.applicationServiceState.slowStartup.deleteTor=Delete Tor directory and sh
 # suppress inspection "UnusedProperty"
 splash.applicationServiceState.INITIALIZE_APP=Starting Bisq
 # suppress inspection "UnusedProperty"
-splash.applicationServiceState.INITIALIZE_NETWORK=Initialize P2P network
+splash.applicationServiceState.INITIALIZE_NETWORK=Bootstrap to P2P network
 # suppress inspection "UnusedProperty"
 splash.applicationServiceState.INITIALIZE_WALLET=Initialize wallet
 # suppress inspection "UnusedProperty"

network/network/src/main/java/bisq/network/p2p/node/Node.java

@@ -18,16 +18,16 @@
 package bisq.network.p2p.node;
 
 
+import bisq.common.network.Address;
+import bisq.common.network.TransportConfig;
+import bisq.common.network.TransportType;
 import bisq.common.observable.Observable;
 import bisq.common.threading.ThreadName;
 import bisq.common.timer.Scheduler;
 import bisq.common.util.CompletableFutureUtils;
 import bisq.common.util.ExceptionUtil;
 import bisq.common.util.StringUtils;
 import bisq.network.NetworkService;
-import bisq.common.network.Address;
-import bisq.common.network.TransportConfig;
-import bisq.common.network.TransportType;
 import bisq.network.identity.NetworkId;
 import bisq.network.p2p.message.EnvelopePayloadMessage;
 import bisq.network.p2p.node.authorization.AuthorizationService;
@@ -201,9 +201,9 @@ public void initialize() {
         if (startingStateLatch.isPresent() && startingStateLatch.get().getCount() > 0) {
             try {
                 log.info("Our node is still starting up. We block the calling thread until state is RUNNING or a throw and exception after a timeout. Node: {}", getNodeInfo());
-                boolean success = startingStateLatch.get().await(120, TimeUnit.SECONDS); //hsUploadTimeout
+                boolean success = startingStateLatch.get().await(120, TimeUnit.SECONDS);
                 if (!success) {
-                    String errorMessage = "State did not change from STARTING to RUNNING in 120 sec. Node: " + getNodeInfo();
+                    String errorMessage = "We got called a repeated initialize. State has not change from STARTING to RUNNING in 120 sec. Node: " + getNodeInfo();
                     log.warn(errorMessage);
                     throw new RuntimeException(new TimeoutException(errorMessage));
                 } else {
@@ -554,14 +554,11 @@ public void handleNetworkMessage(EnvelopePayloadMessage envelopePayloadMessage,
         if (findConnection(connection).isEmpty()) {
             // TODO for now we delay the shutdown call to not introduce a bigger change in behaviour.
             //  We need to test more to see if that case happens and why, and if there might be valid listeners.
-            log.warn("""
-                            We got handleNetworkMessage called from an orphaned connection which is not managed by our \
-                            outboundConnectionsByAddress or inboundConnectionsByAddress maps. \
-                            We close after a short delay that connection to avoid memory leaks. \
-                            We still notify listeners as its is unclear yet if there are valid listeners in that case.\
-                                                        
-                            envelopePayloadMessage={}
-                            connection={}""",
+            log.warn("We got handleNetworkMessage called from an orphaned connection which is not managed by our\n" +
+                            "outboundConnectionsByAddress or inboundConnectionsByAddress maps.\n" +
+                            "We close after a short delay that connection to avoid memory leaks.\n" +
+                            "We still notify listeners as its is unclear yet if there are valid listeners in that case.\n" +
+                            "envelopePayloadMessage={} connection={}",
                     StringUtils.truncate(envelopePayloadMessage), connection);
             Scheduler.run(() -> connection.shutdown(CloseReason.ORPHANED_CONNECTION))
                     .host(this)

support/src/main/java/bisq/support/mediation/MediationRequestService.java

@@ -26,6 +26,8 @@
 import bisq.chat.bisq_easy.open_trades.BisqEasyOpenTradeChannelService;
 import bisq.common.application.Service;
 import bisq.common.observable.Pin;
+import bisq.common.observable.collection.CollectionObserver;
+import bisq.common.timer.Scheduler;
 import bisq.common.util.DateUtils;
 import bisq.contract.bisq_easy.BisqEasyContract;
 import bisq.i18n.Res;
@@ -65,6 +67,7 @@ public class MediationRequestService implements Service, ConfidentialMessageServ
     private final BannedUserService bannedUserService;
     private final Set<MediatorsResponse> pendingMediatorsResponseMessages = new CopyOnWriteArraySet<>();
     private Pin channeldPin;
+    private Scheduler throttleUpdatesScheduler;
 
     public MediationRequestService(NetworkService networkService,
                                    ChatService chatService,
@@ -98,6 +101,10 @@ public CompletableFuture<Boolean> shutdown() {
             channeldPin.unbind();
             channeldPin = null;
         }
+        if (throttleUpdatesScheduler != null) {
+            throttleUpdatesScheduler.stop();
+            throttleUpdatesScheduler = null;
+        }
         return CompletableFuture.completedFuture(true);
     }
 
@@ -229,7 +236,27 @@ private void processMediationResponse(MediatorsResponse mediatorsResponse) {
                                     mediatorsResponse.getTradeId());
                             pendingMediatorsResponseMessages.add(mediatorsResponse);
                             if (channeldPin == null) {
-                                channeldPin = bisqEasyOpenTradeChannelService.getChannels().addObserver(this::maybeProcessPendingMediatorsResponseMessages);
+                                channeldPin = bisqEasyOpenTradeChannelService.getChannels().addObserver(new CollectionObserver<>() {
+                                    @Override
+                                    public void add(BisqEasyOpenTradeChannel element) {
+                                        // Delay and ignore too frequent updates
+                                        if (throttleUpdatesScheduler == null) {
+                                            throttleUpdatesScheduler = Scheduler.run(() -> {
+                                                        maybeProcessPendingMediatorsResponseMessages();
+                                                        throttleUpdatesScheduler = null;
+                                                    })
+                                                    .after(1000);
+                                        }
+                                    }
+
+                                    @Override
+                                    public void remove(Object element) {
+                                    }
+
+                                    @Override
+                                    public void clear() {
+                                    }
+                                });
                             }
                         });
     }