feat: filter IPFS addrs correctly

Author: dryajov

src/index.js

@@ -3,7 +3,6 @@
 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')
@@ -68,12 +67,7 @@ class TCP {
       multiaddrs = [multiaddrs]
     }
     return multiaddrs.filter((ma) => {
-      if (includes(ma.protoNames(), 'p2p-circuit')) {
-        return false
-      } else if (includes(ma.protoNames(), 'ipfs')) {
-        ma = ma.decapsulate('ipfs')
-      }
-      return mafmt.TCP.matches(ma)
+      return mafmt.TCP.matches(ma) || mafmt.TCP_IPFS.matches(ma)
     })
   }
 }

test/index.spec.js

@@ -273,8 +273,9 @@ describe('filter addrs', () => {
     const mh2 = multiaddr('/ip4/127.0.0.1/udp/9090')
     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 valid = tcp.filter([mh1, mh2, mh3, mh4])
+    const valid = tcp.filter([mh1, mh2, mh3, mh4, mh5])
     expect(valid.length).to.equal(2)
     expect(valid[0]).to.deep.equal(mh1)
     expect(valid[1]).to.deep.equal(mh4)