feat: add get by multiaddrs (#47)

Author: mkg20001

README.md

@@ -61,9 +61,12 @@ Gets the peerInfo using it's peerId
 `peerIdLike` can be:
   - A base58 peerId string
     - Example: `QmfHZLGRxYoF87esc98DetgKwzMhE4gumCC9kq39EBrueM`
+  - A [Multiaddr](https://www.npmjs.com/package/multiaddr#api) string _with a peer-id_
+    - Example: `/ip4/127.0.0.1/tcp/1/ipfs/QmfHZLGRxYoF87esc98DetgKwzMhE4gumCC9kq39EBrueM`
   - A peerId buffer
     - Example: `<Buffer 12 20 fb cb db 25 57 c9 4c 7d 73 c6 d9 bb 83 cc e6 4d 7a de 66 59 12 94 bc 8d f3 95 5d 10 e6 ee ce 2e>`
   - A [PeerId](https://www.npmjs.com/package/peer-id#api) object
+  - A [Multiaddr](https://www.npmjs.com/package/multiaddr#api) object _with a peer-id_
   - A [PeerInfo](https://www.npmjs.com/package/peer-info#api) object
 
 # License

src/index.js

@@ -3,18 +3,25 @@
 const bs58 = require('bs58')
 const PeerId = require('peer-id')
 const PeerInfo = require('peer-info')
+const Multiaddr = require('multiaddr')
 
 function getB58Str (peer) {
   let b58Str
 
   if (typeof peer === 'string') {
-    b58Str = peer
+    if (peer.startsWith('/')) {
+      b58Str = Multiaddr(peer).getPeerId()
+    } else {
+      b58Str = peer
+    }
   } else if (Buffer.isBuffer(peer)) {
     b58Str = bs58.encode(peer).toString()
   } else if (PeerId.isPeerId(peer)) {
     b58Str = peer.toB58String()
   } else if (PeerInfo.isPeerInfo(peer)) {
     b58Str = peer.id.toB58String()
+  } else if (Multiaddr.isMultiaddr(peer)) {
+    b58Str = peer.getPeerId()
   } else {
     throw new Error('not valid PeerId or PeerInfo, or B58Str')
   }

test/peer-book.spec.js

@@ -20,6 +20,8 @@ describe('peer-book', () => {
   let p3
   let p4
 
+  let p1fullAddr
+
   before((done) => {
     async.parallel([
       (cb) => createPeerInfo([
@@ -48,6 +50,8 @@ describe('peer-book', () => {
       p3 = infos[2]
       p4 = infos[3]
 
+      p1fullAddr = p1.multiaddrs.toArray()[0].encapsulate('/ipfs/' + p1.id.toB58String())
+
       done()
     })
   })
@@ -77,6 +81,16 @@ describe('peer-book', () => {
     expect(peer).to.eql(p1)
   })
 
+  it('.get by multiaddr string', () => {
+    const peer = pb.get(String(p1fullAddr))
+    expect(peer).to.eql(p1)
+  })
+
+  it('.get by multiaddr', () => {
+    const peer = pb.get(p1fullAddr)
+    expect(peer).to.eql(p1)
+  })
+
   it('.get by B58String ', () => {
     const b58Str = p1.id.toB58String()
     const peer = pb.get(b58Str)