From fc2224a1e8c96dc11d8c506510cac322c8816df8 Mon Sep 17 00:00:00 2001
From: Alex Potsides <alex@achingbrain.net>
Date: Mon, 5 Sep 2022 12:21:31 +0200
Subject: [PATCH] deps: update tcp (#1366)

---
 examples/peer-and-content-routing/2.js |  2 +-
 package.json                           |  2 +-
 src/circuit/auto-relay.ts              |  6 ++++++
 src/connection-manager/dialer/index.ts |  5 ++++-
 test/relay/auto-relay.node.ts          | 13 ++++++++++---
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/examples/peer-and-content-routing/2.js b/examples/peer-and-content-routing/2.js
index 5df23466..d9245c48 100644
--- a/examples/peer-and-content-routing/2.js
+++ b/examples/peer-and-content-routing/2.js
@@ -40,7 +40,7 @@ const createNode = async () => {
   ])
 
   // Wait for onConnect handlers in the DHT
-  await delay(100)
+  await delay(1000)
 
   const cid = CID.parse('QmTp9VkYvnHyrqKQuFPiuZkiX9gPcqj6x5LJ1rmWuSySnL')
   await node1.contentRouting.provide(cid)
diff --git a/package.json b/package.json
index 2a1477e3..9a78c1ee 100644
--- a/package.json
+++ b/package.json
@@ -182,7 +182,7 @@
     "@libp2p/mdns": "^3.0.0",
     "@libp2p/mplex": "^5.0.0",
     "@libp2p/pubsub": "^3.0.1",
-    "@libp2p/tcp": "^3.0.0",
+    "@libp2p/tcp": "^3.0.5",
     "@libp2p/topology": "^3.0.0",
     "@libp2p/webrtc-star": "^3.0.0",
     "@libp2p/websockets": "^3.0.0",
diff --git a/src/circuit/auto-relay.ts b/src/circuit/auto-relay.ts
index a6218a03..16e1e390 100644
--- a/src/circuit/auto-relay.ts
+++ b/src/circuit/auto-relay.ts
@@ -260,6 +260,12 @@ export class AutoRelay {
         }
 
         const peerId = provider.id
+
+        if (peerId.equals(this.components.getPeerId())) {
+          // Skip the provider if it's us as dialing will fail
+          continue
+        }
+
         await this.components.getPeerStore().addressBook.add(peerId, provider.multiaddrs)
 
         await this._tryToListenOnRelay(peerId)
diff --git a/src/connection-manager/dialer/index.ts b/src/connection-manager/dialer/index.ts
index bcdc15a4..f40c735b 100644
--- a/src/connection-manager/dialer/index.ts
+++ b/src/connection-manager/dialer/index.ts
@@ -284,7 +284,10 @@ export class Dialer implements Startable, Initializable {
         throw errCode(new Error('already aborted'), codes.ERR_ALREADY_ABORTED)
       }
 
-      return await this.components.getTransportManager().dial(addr, options)
+      return await this.components.getTransportManager().dial(addr, options).catch(err => {
+        log.error('dial to %s failed', addr, err)
+        throw err
+      })
     }
 
     const dialRequest = new DialRequest({
diff --git a/test/relay/auto-relay.node.ts b/test/relay/auto-relay.node.ts
index 6dd8e0f4..77b0cf7e 100644
--- a/test/relay/auto-relay.node.ts
+++ b/test/relay/auto-relay.node.ts
@@ -205,8 +205,10 @@ describe('auto-relay', () => {
       })).to.eventually.be.rejected()
 
       // Disconnect from peer used for relay
+      const disconnectPromise = pEvent(relayLibp2p1.connectionManager, 'peer:disconnect', { timeout: 500 })
       await relayLibp2p2.stop()
-      await pEvent(relayLibp2p1.connectionManager, 'peer:disconnect', { timeout: 500 })
+      const event = await disconnectPromise
+      expect(event.detail.remotePeer.toString()).to.equal(relayLibp2p2.peerId.toString())
 
       // Should not be using the relay any more
       await expect(usingAsRelay(relayLibp2p1, relayLibp2p2, {
@@ -399,6 +401,7 @@ describe('auto-relay', () => {
       nock('http://0.0.0.0:60197')
         .post('/api/v0/dht/findprovs')
         .query(true)
+        .twice()
         .reply(200, `{"Extra":"","ID":"${provider}","Responses":[{"Addrs":${JSON.stringify(multiaddrs)},"ID":"${provider}"}],"Type":4}\n`, [
           'Content-Type', 'application/json',
           'X-Chunked-Output', '1'
@@ -432,10 +435,14 @@ describe('auto-relay', () => {
       await local.hangUp(relayAddr)
 
       // Should try to find relay service providers
-      await pWaitFor(() => contentRoutingFindProvidersSpy.callCount === 1)
+      await pWaitFor(() => contentRoutingFindProvidersSpy.callCount === 1, {
+        timeout: 1000
+      })
 
       // Wait for peer added as listen relay
-      await pWaitFor(() => local.getMultiaddrs().length === originalMultiaddrsLength + 1)
+      await pWaitFor(() => local.getMultiaddrs().length === originalMultiaddrsLength + 1, {
+        timeout: 1000
+      })
 
       const relayedAddr = local.getMultiaddrs()[local.getMultiaddrs().length - 1]
       await remote.peerStore.addressBook.set(local.peerId, [relayedAddr])