Nekojimi/FriendCloudProto
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

ConnectionManager: no longer throw IOExceptions, add async method for getting connections, and change getURIs to add explicitly advertised addresses.

Browse source
This commit is contained in:
Nekojimi 2025-10-02 00:13:01 +01:00
parent a14701f5c5
commit fee20875a1
1 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/main/java/moe/nekojimi/friendcloud/network/ConnectionManager.java
View file

@ -1,12 +1,17 @@
package moe.nekojimi.friendcloud.network; package moe.nekojimi.friendcloud.network;
import moe.nekojimi.friendcloud.Main;
import moe.nekojimi.friendcloud.objects.ObjectID; import moe.nekojimi.friendcloud.objects.ObjectID;
import moe.nekojimi.friendcloud.objects.Peer; import moe.nekojimi.friendcloud.objects.Peer;
import java.io.IOException; import java.io.IOException;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException;
import java.util.*; import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.stream.Stream;
public class ConnectionManager public class ConnectionManager
{ {
@ -31,17 +36,17 @@ public class ConnectionManager
} }
} }
public PeerConnection getNodeConnection(URI uri) throws IOException public PeerConnection getNodeConnection(URI uri)
{ {
return getNodeConnection(uri, null); return getNodeConnection(uri, null);
} }
public PeerConnection getNodeConnection(URI uri, Peer peer) throws IOException public PeerConnection getNodeConnection(URI uri, Peer peer)
{ {
purgeDeadConnections(); purgeDeadConnections();
for (PeerConnection peerConnection: activeConnections) for (PeerConnection peerConnection: activeConnections)
{ {
if (peerConnection.getUri() == uri) if (peerConnection.getUri().equals(uri))
return peerConnection; return peerConnection;
} }
@ -68,19 +73,19 @@ public class ConnectionManager
for (URI address : peer.getAddresses()) for (URI address : peer.getAddresses())
{ {
try PeerConnection connection = getNodeConnection(address, peer);
{ if (connection != null)
return getNodeConnection(address, peer); return connection;
}
catch (IOException ex)
{
System.err.println("ConnectionManager: Couldn't create PeerConnection to " + address + " : " + ex.getMessage());
}
} }
System.err.println("ConnectionManager: Failed to create PeerConnection to " + peer + "!"); System.err.println("ConnectionManager: Failed to create PeerConnection to " + peer + "!");
return null; return null;
} }
public CompletableFuture<Optional<PeerConnection>> getNodeConnectionAsync(Peer peer)
{
return CompletableFuture.supplyAsync(() -> Optional.ofNullable(getNodeConnection(peer)), Main.getInstance().getExecutor());
}
public void shutdown() public void shutdown()
{ {
for (ConnectionBackend<?> backend : backends.values()) for (ConnectionBackend<?> backend : backends.values())
@ -123,9 +128,24 @@ public class ConnectionManager
public List<URI> getURIs() public List<URI> getURIs()
{ {
return backends.values().stream() List<URI> ret = new ArrayList<>();
.filter(ConnectionBackend::isListening) for (String advertiseAddress : Main.getInstance().getArgs().getAdvertiseAddresses())
.flatMap(connectionBackend -> connectionBackend.getURIs().stream()) {
.toList(); try
{
URI uri = new URI(advertiseAddress);
ret.add(uri);
} catch (URISyntaxException e)
{
System.err.println("ERROR: " + advertiseAddress + " isn't a valid URI: " + e.getMessage());
}
}
for (ConnectionBackend<?> backend: backends.values())
{
if (!backend.isListening())
continue;
ret.addAll(backend.getURIs());
}
return ret;
} }
} }