mirror of
https://github.com/openstf/stf
synced 2025-10-04 02:09:32 +02:00
The srv resolver should be easier to use now.
This commit is contained in:
parent
23621d0bdd
commit
f0aae7d4e5
2 changed files with 30 additions and 11 deletions
|
@ -1,3 +1,6 @@
|
|||
var url = require('url')
|
||||
var util = require('util')
|
||||
|
||||
var Promise = require('bluebird')
|
||||
var dns = Promise.promisifyAll(require('dns'))
|
||||
|
||||
|
@ -58,22 +61,39 @@ function flatten(groupedRecords) {
|
|||
}, [])
|
||||
}
|
||||
|
||||
var RE_SRV = /^srv:(.*)$/
|
||||
|
||||
module.exports.sort = function(records) {
|
||||
return flatten(groupByPriority(records).map(shuffleWeighted))
|
||||
}
|
||||
|
||||
module.exports.resolve = function(domain, defaultPort) {
|
||||
var match
|
||||
if ((match = RE_SRV.exec(domain))) {
|
||||
return dns.resolveSrvAsync(match[1])
|
||||
module.exports.resolve = function(domain) {
|
||||
var parsedUrl = url.parse(domain)
|
||||
|
||||
if (!parsedUrl.protocol) {
|
||||
return Promise.reject(new Error(
|
||||
'Must include protocol in "%s"'
|
||||
, domain
|
||||
))
|
||||
}
|
||||
|
||||
if (/^srv\+/.test(parsedUrl.protocol)) {
|
||||
parsedUrl.protocol = parsedUrl.protocol.substr(4)
|
||||
return dns.resolveSrvAsync(parsedUrl.hostname)
|
||||
.then(module.exports.sort)
|
||||
.then(function(records) {
|
||||
return records.map(function(record) {
|
||||
parsedUrl.host = util.format('%s:%d', record.name, record.port)
|
||||
parsedUrl.hostname = record.name
|
||||
parsedUrl.port = record.port
|
||||
record.url = url.format(parsedUrl)
|
||||
return record
|
||||
})
|
||||
})
|
||||
}
|
||||
else {
|
||||
return Promise.resolve([{
|
||||
name: domain
|
||||
, port: defaultPort
|
||||
url: domain
|
||||
, name: parsedUrl.hostname
|
||||
, port: parsedUrl.port
|
||||
}])
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue