From 7525aed619fd50d9e6a80125db79319fbba784f9 Mon Sep 17 00:00:00 2001
From: Anna Blume <ablumejakobsen@gmail.com>
Date: Mon, 17 Jul 2023 11:09:21 +0200
Subject: [PATCH] Make connecting to relays work

---
 relay/relay.mjs    | 12 ++++++------
 rt/src/p2p/p2p.mts | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/relay/relay.mjs b/relay/relay.mjs
index 6cb7844..a4d717e 100644
--- a/relay/relay.mjs
+++ b/relay/relay.mjs
@@ -13,9 +13,9 @@ async function main () {
   const node = await createLibp2p({
     peerId : id,
     addresses: {
-      listen: ['/ip4/0.0.0.0/tcp/5555/ws']
+      listen: ['/ip4/0.0.0.0/tcp/5555/ws'],
       // TODO check "What is next?" section
-      // announce: ['/dns4/auto-relay.libp2p.io/tcp/443/wss/p2p/QmWDn2LY8nannvSWJzruUYoLZ4vV83vfCBwd8DipvdgQc3']
+      announce: ['/dns4/auto-relay.libp2p.io/tcp/443/wss/p2p/QmWDn2LY8nannvSWJzruUYoLZ4vV83vfCBwd8DipvdgQc3']
     },
     transports: [
       webSockets()
@@ -27,11 +27,11 @@ async function main () {
       yamux(),
       mplex()
     ],
-    /*services: {
+    services: {
       identify: identifyService(),
       relay: circuitRelayServer()
-    }*/
-    relay: {
+    }
+    /*relay: {
       enabled: true,
       hop: {
         enabled: true
@@ -39,7 +39,7 @@ async function main () {
       advertise: {
         enabled: true,
       }
-    }
+    }*/
   })
 
   await node.handle("/trouperelay/keepalive", async ({ connection, stream }) => {
diff --git a/rt/src/p2p/p2p.mts b/rt/src/p2p/p2p.mts
index 1a334ac..0342e13 100644
--- a/rt/src/p2p/p2p.mts
+++ b/rt/src/p2p/p2p.mts
@@ -733,10 +733,10 @@ async function createLibp2p (_options) {
     transports: [
       tcp(),
       webSockets(),
-      /*circuitRelayTransport({
+      circuitRelayTransport({
         discoverRelays: 2, //AB: what to set this to?
         reservationConcurrency : 2,
-      })*/
+      })
     ],
     streamMuxers: [
       yamux(),
@@ -753,9 +753,9 @@ async function createLibp2p (_options) {
         interval: 20e3
       })*/
     ],
-    /*services: {
+    services: {
       identify: identifyService()
-    },*/
+    },
     relay: {
       enabled: true,
       autoRelay: {
@@ -1046,7 +1046,7 @@ async function getPeerInfo(id:string) : Promise<PeerId>{
               } else {
                   debug (`try_find_peer: attempt ${n_attempts} failed with ${nPeers()} nodes connected`)
                   // addPending (try_find_peer);
-                  setTimeout (try_find_peer, 5000)
+                  setTimeout (try_find_peer, 500)
               }   
           }
         }