Improved DHT API with synchronous getPeers functions.

frostwire · Jan 12, 2015 · 50147b3 · 50147b3
1 parent 5cdf54c
commit 50147b3
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 11 deletions.
diff --git a/src/com/frostwire/jlibtorrent/DHT.java b/src/com/frostwire/jlibtorrent/DHT.java
@@ -1,14 +1,17 @@
 package com.frostwire.jlibtorrent;
 
 import com.frostwire.jlibtorrent.alerts.Alert;
+import com.frostwire.jlibtorrent.alerts.DhtGetPeersReplyAlert;
 import com.frostwire.jlibtorrent.alerts.DhtImmutableItemAlert;
 import com.frostwire.jlibtorrent.swig.char_vector;
 import com.frostwire.jlibtorrent.swig.dht_item;
 import com.frostwire.jlibtorrent.swig.sha1_hash;
 
+import java.util.ArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import static com.frostwire.jlibtorrent.alerts.AlertType.DHT_GET_PEERS_REPLY_ALERT;
 import static com.frostwire.jlibtorrent.alerts.AlertType.DHT_IMMUTABLE_ITEM;
 
 /**
@@ -20,6 +23,7 @@
 public final class DHT {
 
     private static final int[] DHT_IMMUTABLE_ITEM_TYPES = {DHT_IMMUTABLE_ITEM.getSwig()};
+    private static final int[] DHT_GET_PEERS_REPLY_ALERT_TYPES = {DHT_GET_PEERS_REPLY_ALERT.getSwig()};
 
     private final Session s;
 
@@ -107,6 +111,45 @@ public void getPeers(String sha1) {
         s.dhtGetPeers(new Sha1Hash(sha1));
     }
 
+    public ArrayList<TcpEndpoint> getPeers(String sha1, long timeout, TimeUnit unit) {
+        final Sha1Hash target = new Sha1Hash(sha1);
+        final Object[] result = {new ArrayList<TcpEndpoint>()};
+        final CountDownLatch signal = new CountDownLatch(1);
+
+        AlertListener l = new AlertListener() {
+
+            @Override
+            public int[] types() {
+                return DHT_GET_PEERS_REPLY_ALERT_TYPES;
+            }
+
+            @Override
+            public void alert(Alert<?> alert) {
+                if (alert instanceof DhtGetPeersReplyAlert) {
+                    DhtGetPeersReplyAlert replyAlert = (DhtGetPeersReplyAlert) alert;
+                    if (target.equals(replyAlert.getInfoHash())) {
+                        result[0] = replyAlert.getPeers();
+                        signal.countDown();
+                    }
+                }
+            }
+        };
+
+        s.addListener(l);
+
+        s.dhtGetPeers(target);
+
+        try {
+            signal.await(timeout, unit);
+        } catch (InterruptedException e) {
+            // ignore
+        }
+
+        s.removeListener(l);
+
+        return (ArrayList<TcpEndpoint>) result[0];
+    }
+
     public void announce(String sha1, int port, int flags) {
         s.dhtAnnounce(new Sha1Hash(sha1), port, flags);
     }

diff --git a/src/com/frostwire/jlibtorrent/demo/DhtTest.java b/src/com/frostwire/jlibtorrent/demo/DhtTest.java
@@ -1,9 +1,6 @@
 package com.frostwire.jlibtorrent.demo;
 
-import com.frostwire.jlibtorrent.AlertListener;
-import com.frostwire.jlibtorrent.DHT;
-import com.frostwire.jlibtorrent.Session;
-import com.frostwire.jlibtorrent.TcpEndpoint;
+import com.frostwire.jlibtorrent.*;
 import com.frostwire.jlibtorrent.alerts.Alert;
 import com.frostwire.jlibtorrent.alerts.DhtBootstrapAlert;
 import com.frostwire.jlibtorrent.alerts.DhtGetPeersReplyAlert;
@@ -36,7 +33,7 @@ public int[] types() {
 
             @Override
             public void alert(Alert<?> alert) {
-                System.out.println(alert);
+                //System.out.println(alert);
 
                 if (alert instanceof DhtBootstrapAlert) {
                     signal.countDown();
@@ -62,18 +59,20 @@ public void alert(Alert<?> alert) {
 
         signal.await();
 
-        System.out.println("Calling dht_get_peers");
+        //System.out.println("Calling dht_get_peers");
 
-        dht.getPeers("86d0502ead28e495c9e67665340f72aa72fe304");
+        //dht.getPeers("86d0502ead28e495c9e67665340f72aa72fe304");
 
         Thread.sleep(4000);
+        dht.waitNodes(1);
 
-        dht.announce("47d0502ead28e495c9e67665340f72aa72fe304", 9999, 0);
+        //dht.announce("47d0502ead28e495c9e67665340f72aa72fe304", 9999, 0);
 
-        System.out.println("Waiting 15 seconds");
-        Thread.sleep(15000);
+        //System.out.println("Waiting 15 seconds");
+        //Thread.sleep(15000);
 
-        dht.getPeers("47d0502ead28e495c9e67665340f72aa72fe304");
+        dht.getPeers("5472d2fe734c16f28912e1e756b57e2470148b93");
+        //dht.getPeers("47d0502ead28e495c9e67665340f72aa72fe304");
 
         System.out.println("Press ENTER to exit");
         System.in.read();