stepus53/dhfs
1
0
Fork 0
mirror of https://github.com/usatiuk/dhfs.git synced 2025-10-29 04:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improved peer UI

Browse Source
This commit is contained in:
Stepan Usatiuk
2025-04-23 16:37:45 +02:00
parent 2e2eb3ac97
commit 0c04079258
9 changed files with 58 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PeerManager.java
View File

@@ -180,7 +180,7 @@ public class PeerManager {
});
}
private Optional<PeerAddress> selectBestAddress(PeerId host) {
public Optional<PeerAddress> selectBestAddress(PeerId host) {
return peerDiscoveryDirectory.getForPeer(host).stream().min(Comparator.comparing(PeerAddress::type));
}

4
dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerInfo.java
View File

@@ -1,4 +1,6 @@
package com.usatiuk.dhfs.repository.webapi;
public record KnownPeerInfo(String uuid) {
import jakarta.annotation.Nullable;
public record KnownPeerInfo(String uuid, @Nullable String knownAddress) {
}

6
dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeers.java Normal file
View File

@@ -0,0 +1,6 @@
package com.usatiuk.dhfs.repository.webapi;
import java.util.List;
public record KnownPeers(List<KnownPeerInfo> peers, String selfUuid) {
}

16
dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/PeerManagementApi.java
View File

@@ -2,6 +2,7 @@ package com.usatiuk.dhfs.repository.webapi;
import com.usatiuk.dhfs.PeerId;
import com.usatiuk.dhfs.repository.PeerManager;
import com.usatiuk.dhfs.repository.PersistentPeerDataService;
import com.usatiuk.dhfs.repository.peersync.PeerInfoService;
import jakarta.inject.Inject;
import jakarta.ws.rs.DELETE;
@@ -11,6 +12,8 @@ import jakarta.ws.rs.Path;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
@Path("/peers-manage")
public class PeerManagementApi {
@@ -18,11 +21,15 @@ public class PeerManagementApi {
PeerInfoService peerInfoService;
@Inject
PeerManager peerManager;
@Inject
PersistentPeerDataService persistentPeerDataService;
@Path("known-peers")
@GET
public List<KnownPeerInfo> knownPeers() {
return peerInfoService.getPeers().stream().map(peerInfo -> new KnownPeerInfo(peerInfo.id().toString())).toList();
public KnownPeers knownPeers() {
return new KnownPeers(peerInfoService.getPeers().stream().map(peerInfo -> new KnownPeerInfo(peerInfo.id().toString(),
Optional.ofNullable(peerManager.getAddress(peerInfo.id())).map(Objects::toString).orElse(null))).toList(),
persistentPeerDataService.getSelfUuid().toString());
}
@Path("known-peers")
@@ -40,7 +47,10 @@ public class PeerManagementApi {
@Path("available-peers")
@GET
public Collection<KnownPeerInfo> availablePeers() {
return peerManager.getSeenButNotAddedHosts().stream().map(p -> new KnownPeerInfo(p.toString())).toList();
return peerManager.getSeenButNotAddedHosts().stream()
.map(p -> new KnownPeerInfo(p.toString(),
peerManager.selectBestAddress(p).map(Objects::toString).orElse(null)))
.toList();
}
@Path("peer-state")