Skip to content
This repository has been archived by the owner on Feb 12, 2024. It is now read-only.

fix: create HTTP servers in series #2388

Merged
merged 3 commits into from
Aug 23, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/http/index.js
Original file line number Diff line number Diff line change
@@ -23,20 +23,20 @@ function hapiInfoToMultiaddr (info) {
return toMultiaddr(uri)
}

function serverCreator (serverAddrs, createServer, ipfs) {
async function serverCreator (serverAddrs, createServer, ipfs) {
serverAddrs = serverAddrs || []
// just in case the address is just string
serverAddrs = Array.isArray(serverAddrs) ? serverAddrs : [serverAddrs]

const processServer = async address => {
const servers = []
for (const address of serverAddrs) {
const addrParts = address.split('/')
const server = await createServer(addrParts[2], addrParts[4], ipfs)
await server.start()
server.info.ma = hapiInfoToMultiaddr(server.info)
return server
servers.push(server)
}

return Promise.all(serverAddrs.map(processServer))
return servers
}

class HttpApi {
8 changes: 7 additions & 1 deletion test/http-api/inject/dns.js
Original file line number Diff line number Diff line change
@@ -20,12 +20,18 @@ module.exports = (http) => {
expect(res.result).to.have.property('Path')
})

it('resolve ipfs.enstest.eth ENS', async () => {
it('resolve ipfs.enstest.eth ENS', async function () {
const res = await api.inject({
method: 'GET',
url: '/api/v0/dns?arg=ipfs.enstest.eth'
})

// TODO: eth.link domains have no SLA yet and are liable to be down...
// Remove skip when reliable!
if (res.statusCode === 500) {
return this.skip()
}

expect(res.result).to.have.property('Path')
})
})