Fallback to DHT in block.get if no peers are provided

Peergos · Jul 11, 2023 · 325d3fb · 325d3fb
1 parent 15b8ff5
commit 325d3fb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/main/java/org/peergos/BitswapBlockService.java b/src/main/java/org/peergos/BitswapBlockService.java
@@ -3,6 +3,7 @@
 import io.ipfs.cid.*;
 import io.libp2p.core.*;
 import org.peergos.protocol.bitswap.*;
+import org.peergos.protocol.dht.*;
 
 import java.util.*;
 import java.util.stream.*;
@@ -11,14 +12,22 @@ public class BitswapBlockService implements BlockService {
 
     private final Host us;
     private final Bitswap bitswap;
+    private final Kademlia dht;
 
-    public BitswapBlockService(Host us, Bitswap bitswap) {
+    public BitswapBlockService(Host us, Bitswap bitswap, Kademlia dht) {
         this.us = us;
         this.bitswap = bitswap;
+        this.dht = dht;
     }
 
     @Override
     public List<HashedBlock> get(List<Want> hashes, Set<PeerId> peers, boolean addToBlockstore) {
+        if (peers.isEmpty()) {
+            List<PeerAddresses> providers = dht.findProviders(hashes.get(0).cid, us, 5).join();
+            peers = providers.stream()
+                    .map(p -> PeerId.fromBase58(p.peerId.toBase58()))
+                    .collect(Collectors.toSet());
+        }
         return bitswap.get(hashes, us, peers, addToBlockstore)
                 .stream()
                 .map(f -> f.join())

diff --git a/src/main/java/org/peergos/EmbeddedIpfs.java b/src/main/java/org/peergos/EmbeddedIpfs.java
@@ -47,7 +47,7 @@ public EmbeddedIpfs(Host node,
         this.bitswap = bitswap;
         this.p2pHttp = p2pHttp;
         this.bootstrap = bootstrap;
-        this.blocks = new BitswapBlockService(node, bitswap);
+        this.blocks = new BitswapBlockService(node, bitswap, dht);
     }
 
     public List<HashedBlock> getBlocks(List<Want> wants, Set<PeerId> peers, boolean addToLocal) {