feat: skip p2p-circuit addresses

Author: dryajov

package.json

@@ -62,4 +62,4 @@
     "Richard Littauer <[email protected]>",
     "Stephen Whitmore <[email protected]>"
   ]
-}
+}

src/index.js

@@ -3,6 +3,7 @@
 const net = require('net')
 const toPull = require('stream-to-pull-stream')
 const mafmt = require('mafmt')
+const includes = require('lodash.includes')
 const isFunction = require('lodash.isfunction')
 const Connection = require('interface-connection').Connection
 const once = require('once')
@@ -66,7 +67,16 @@ class TCP {
     if (!Array.isArray(multiaddrs)) {
       multiaddrs = [multiaddrs]
     }
+
     return multiaddrs.filter((ma) => {
+      if (ma.protoNames().indexOf('p2p-circuit') > -1) {
+        return false
+      }
+
+      if (includes(ma.protoNames(), 'ipfs')) {
+        ma = ma.decapsulate('ipfs')
+      }
+
       return mafmt.TCP.matches(ma)
     })
   }

test/index.spec.js

@@ -274,8 +274,10 @@ describe('filter addrs', () => {
     const mh3 = multiaddr('/ip4/127.0.0.1/tcp/9090/http')
     const mh4 = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
     const mh5 = multiaddr('/ip4/127.0.0.1/tcp/9090/http/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
+    const mh6 = multiaddr('/ip4/127.0.0.1/tcp/9090/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw' +
+      '/p2p-circuit/ipfs/Qmb6owHp6eaWArVbcJJbQSyifyJBttMMjYV76N2hMbf5Vw')
 
-    const valid = tcp.filter([mh1, mh2, mh3, mh4, mh5])
+    const valid = tcp.filter([mh1, mh2, mh3, mh4, mh5, mh6])
     expect(valid.length).to.equal(2)
     expect(valid[0]).to.deep.equal(mh1)
     expect(valid[1]).to.deep.equal(mh4)
@@ -350,6 +352,7 @@ describe('valid Connection', () => {
       const conn = tcp.dial(ma)
 
       pull(conn, pull.onEnd(endHandler))
+
       function endHandler () {
         conn.getPeerInfo((err, peerInfo) => {
           expect(err).to.exist()
@@ -376,6 +379,7 @@ describe('valid Connection', () => {
       const conn = tcp.dial(ma)
 
       pull(conn, pull.onEnd(endHandler))
+
       function endHandler () {
         conn.setPeerInfo('arroz')
         conn.getPeerInfo((err, peerInfo) => {