From 648cabfa9a8a05c803c6c61cd4293058279adc59 Mon Sep 17 00:00:00 2001 From: lluiscab Date: Fri, 24 Aug 2018 10:03:57 +0200 Subject: [PATCH] Fixed formatting --- src/client/tcp_dns.js | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/src/client/tcp_dns.js b/src/client/tcp_dns.js index c62a66e..0ae3bbe 100644 --- a/src/client/tcp_dns.js +++ b/src/client/tcp_dns.js @@ -2,59 +2,46 @@ const net = require('net') const dns = require('dns') module.exports = function (client, options) { - // Default options options.port = options.port || 25565 options.host = options.host || 'localhost' if (!options.connect) { - options.connect = (client) => { - // Use stream if provided if (options.stream) { client.setSocket(options.stream) client.emit('connect') - return; - } - + return + } + // If port was not defined (defauls to 25565), host is not an ip neither localhost if (options.port === 25565 && net.isIP(options.host) === 0 && options.host !== 'localhost') { - // Try to resolve SRV records for the comain dns.resolveSrv('_minecraft._tcp.' + options.host, (err, addresses) => { - // Error resolving domain if (err) { - // Could not resolve SRV lookup, connect directly - if(err.code === 'ENODATA') { - client.setSocket(net.connect(options.port, options.host)) - return; + if (err.code === 'ENODATA') { + client.setSocket(net.connect(options.port, options.host)) + return } else { - // Something else happened - return client.emit('error', err) + // Something else happened + return client.emit('error', err) } - } - + // SRV Lookup resolved conrrectly if (addresses && addresses.length > 0) { client.setSocket(net.connect(addresses[0].port, addresses[0].name)) } else { - client.emit('error', new Error("Could not resolve hostname")); + client.emit('error', new Error('Could not resolve hostname')) } - }) - } else { // Otherwise, just connect using the provided hostname and port client.setSocket(net.connect(options.port, options.host)) } - - } - } - }