-
Notifications
You must be signed in to change notification settings - Fork 63
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: resolve multiaddrs * chore: use node lts and stable for ci * chore: revert recursive option for now * chore: use released package * chore: address review * chore: address review Co-authored-by: Jacob Heun <jacobheun@gmail.com> Co-authored-by: Jacob Heun <jacobheun@gmail.com>
- Loading branch information
1 parent
64e7745
commit 525268b
Showing
8 changed files
with
218 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,8 @@ stages: | |
- cov | ||
|
||
node_js: | ||
- '10' | ||
- 'lts/*' | ||
- 'stable' | ||
|
||
os: | ||
- linux | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
'use strict' | ||
|
||
let dns | ||
|
||
try { | ||
dns = require('dns').promises | ||
} catch (err) { | ||
dns = require('dns-over-http-resolver') | ||
} | ||
|
||
module.exports = dns |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
'use strict' | ||
|
||
const Multiaddr = require('..') // eslint-disable-line no-unused-vars | ||
const protocols = require('../protocols-table') | ||
|
||
const { code: dnsaddrCode } = protocols('dnsaddr') | ||
|
||
/** | ||
* Resolver for dnsaddr addresses. | ||
* | ||
* @param {Multiaddr} addr | ||
* @returns {Promise<Array<string>>} | ||
*/ | ||
async function dnsaddrResolver (addr) { | ||
const { Resolver } = require('./dns') | ||
const resolver = new Resolver() | ||
|
||
const peerId = addr.getPeerId() | ||
const [, hostname] = addr.stringTuples().find(([proto]) => proto === dnsaddrCode) || [] | ||
|
||
const records = await resolver.resolveTxt(`_dnsaddr.${hostname}`) | ||
// @ts-ignore | ||
let addresses = records.flat().map((a) => a.split('=')[1]) | ||
|
||
if (peerId) { | ||
addresses = addresses.filter((entry) => entry.includes(peerId)) | ||
} | ||
|
||
return addresses | ||
} | ||
|
||
module.exports = { | ||
dnsaddrResolver | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
/* eslint-env mocha */ | ||
'use strict' | ||
|
||
const { expect } = require('aegir/utils/chai') | ||
const sinon = require('sinon') | ||
|
||
const multiaddr = require('../src') | ||
const resolvers = require('../src/resolvers') | ||
const { Resolver } = require('../src/resolvers/dns') | ||
|
||
const dnsaddrStub1 = [ | ||
['dnsaddr=/dnsaddr/ams-1.bootstrap.libp2p.io/p2p/QmSoLer265NRgSp2LA3dPaeykiS1J6DifTC88f5uVQKNAd'], | ||
['dnsaddr=/dnsaddr/ams-2.bootstrap.libp2p.io/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb'], | ||
['dnsaddr=/dnsaddr/lon-1.bootstrap.libp2p.io/p2p/QmSoLMeWqB7YGVLJN3pNLQpmmEk35v6wYtsMGLzSr5QBU3'], | ||
['dnsaddr=/dnsaddr/nrt-1.bootstrap.libp2p.io/p2p/QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt'], | ||
['dnsaddr=/dnsaddr/nyc-1.bootstrap.libp2p.io/p2p/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm'], | ||
['dnsaddr=/dnsaddr/sfo-2.bootstrap.libp2p.io/p2p/QmSoLnSGccFuZQJzRadHn95W2CrSFmZuTdDWP8HXaHca9z'] | ||
] | ||
|
||
const dnsaddrStub2 = [ | ||
['dnsaddr=/ip4/147.75.83.83/tcp/4001/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb'], | ||
['dnsaddr=/ip4/147.75.83.83/tcp/443/wss/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb'], | ||
['dnsaddr=/ip4/147.75.83.83/udp/4001/quic/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb'], | ||
['dnsaddr=/ip6/2604:1380:2000:7a00::1/tcp/4001/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb'], | ||
['dnsaddr=/ip6/2604:1380:2000:7a00::1/tcp/443/wss/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb'], | ||
['dnsaddr=/ip6/2604:1380:2000:7a00::1/udp/4001/quic/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb'] | ||
] | ||
|
||
describe('multiaddr resolve', () => { | ||
it('should throw if no resolver is available', async () => { | ||
const ma = multiaddr('/dnsaddr/bootstrap.libp2p.io') | ||
|
||
// Resolve | ||
await expect(ma.resolve()).to.eventually.be.rejected() | ||
.and.to.have.property('code', 'ERR_NO_AVAILABLE_RESOLVER') | ||
}) | ||
|
||
describe('dnsaddr', () => { | ||
before(() => { | ||
// Set resolvers | ||
multiaddr.resolvers.set('dnsaddr', resolvers.dnsaddrResolver) | ||
}) | ||
|
||
afterEach(() => { | ||
sinon.restore() | ||
}) | ||
|
||
it('can resolve dnsaddr without no peerId', async () => { | ||
const ma = multiaddr('/dnsaddr/bootstrap.libp2p.io') | ||
|
||
const stub = sinon.stub(Resolver.prototype, 'resolveTxt') | ||
stub.onCall(0).returns(Promise.resolve(dnsaddrStub1)) | ||
|
||
// Resolve | ||
const resolvedMas = await ma.resolve() | ||
|
||
expect(resolvedMas).to.have.length(dnsaddrStub1.length) | ||
resolvedMas.forEach((ma, index) => { | ||
const stubAddr = dnsaddrStub1[index][0].split('=')[1] | ||
|
||
expect(ma.equals(multiaddr(stubAddr))).to.equal(true) | ||
}) | ||
}) | ||
|
||
it('can resolve dnsaddr with peerId', async () => { | ||
const ma = multiaddr('/dnsaddr/bootstrap.libp2p.io/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb') | ||
|
||
const stub = sinon.stub(Resolver.prototype, 'resolveTxt') | ||
stub.onCall(0).returns(Promise.resolve(dnsaddrStub1)) | ||
stub.onCall(1).returns(Promise.resolve(dnsaddrStub2)) | ||
|
||
// Resolve | ||
const resolvedMas = await ma.resolve() | ||
|
||
expect(resolvedMas).to.have.length(1) | ||
expect(resolvedMas[0].equals(multiaddr('/dnsaddr/ams-2.bootstrap.libp2p.io/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb'))).to.eql(true) | ||
}) | ||
|
||
it('can resolve dnsaddr with peerId two levels', async () => { | ||
const ma = multiaddr('/dnsaddr/bootstrap.libp2p.io/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb') | ||
|
||
const stub = sinon.stub(Resolver.prototype, 'resolveTxt') | ||
stub.onCall(0).returns(Promise.resolve(dnsaddrStub1)) | ||
stub.onCall(1).returns(Promise.resolve(dnsaddrStub2)) | ||
|
||
// Resolve | ||
const resolvedInitialMas = await ma.resolve() | ||
const resolvedSecondMas = await Promise.all(resolvedInitialMas.map(nm => { | ||
// nm.resolvers.set('dnsaddr', resolvers.dnsaddrResolver) | ||
return nm.resolve() | ||
})) | ||
// @ts-ignore | ||
const resolvedMas = resolvedSecondMas.flat() | ||
|
||
expect(resolvedMas).to.have.length(dnsaddrStub2.length) | ||
resolvedMas.forEach((ma, index) => { | ||
const stubAddr = dnsaddrStub2[index][0].split('=')[1] | ||
|
||
expect(ma.equals(multiaddr(stubAddr))).to.equal(true) | ||
}) | ||
}) | ||
}) | ||
}) |