Parker2991/node-minecraft-protocol
1
0
Fork 0
mirror of https://github.com/PrismarineJS/node-minecraft-protocol.git synced 2024-11-14 19:04:59 -05:00
Code Issues Projects Releases Packages Wiki Activity

Prevent ping from hanging if the server never replies. #329

Browse source
This commit is contained in:
Henry de Jongh 2020-05-23 13:34:45 +02:00
parent 345ab6071d
commit bb88c1d612
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ping.js
View file

@ -4,6 +4,8 @@ const Client = require('./client')
const states = require('./states') const states = require('./states')
const tcpDns = require('./client/tcp_dns') const tcpDns = require('./client/tcp_dns')
const closeTimeout = 30 * 1000
module.exports = ping module.exports = ping
function ping (options, cb) { function ping (options, cb) {
@ -14,9 +16,11 @@ function ping (options, cb) {
const version = mcData.version const version = mcData.version
options.majorVersion = version.majorVersion options.majorVersion = version.majorVersion
options.protocolVersion = version.version options.protocolVersion = version.version
var closeTimer = null
const client = new Client(false, version.minecraftVersion) const client = new Client(false, version.minecraftVersion)
client.on('error', function (err) { client.on('error', function (err) {
clearTimeout(closeTimer);
cb(err) cb(err)
}) })
@ -25,6 +29,7 @@ function ping (options, cb) {
const start = Date.now() const start = Date.now()
client.once('ping', function (packet) { client.once('ping', function (packet) {
data.latency = Date.now() - start data.latency = Date.now() - start
clearTimeout(closeTimer);
cb(null, data) cb(null, data)
client.end() client.end()
}) })
@ -45,6 +50,13 @@ function ping (options, cb) {
}) })
client.state = states.STATUS client.state = states.STATUS
}) })
// timeout against servers that never reply while keeping
// the connection open and alive.
closeTimer = setTimeout(function () {
client.end()
cb(new Error("ETIMEDOUT"))
}, closeTimeout)
tcpDns(client, options) tcpDns(client, options)
options.connect(client) options.connect(client)