you can dial connection with timeout, and the PingAndList at /bot also.

This commit is contained in:
Tnze
2019-08-27 02:06:59 +08:00
parent 88b55a697a
commit d85d31da46
5 changed files with 112 additions and 69 deletions

View File

@ -6,8 +6,6 @@ package bot
import ( import (
"fmt" "fmt"
"time"
"github.com/Tnze/go-mc/net" "github.com/Tnze/go-mc/net"
pk "github.com/Tnze/go-mc/net/packet" pk "github.com/Tnze/go-mc/net/packet"
) )
@ -15,71 +13,6 @@ import (
// ProtocolVersion , the protocol version number of minecraft net protocol // ProtocolVersion , the protocol version number of minecraft net protocol
const ProtocolVersion = 498 const ProtocolVersion = 498
// PingAndList check server status and list online player.
// Returns a JSON data with server status, and the delay.
//
// For more information for JSON format, see https://wiki.vg/Server_List_Ping#Response
func PingAndList(addr string, port int) ([]byte, time.Duration, error) {
conn, err := net.DialMC(fmt.Sprintf("%s:%d", addr, port))
if err != nil {
return nil, 0, err
}
//握手
err = conn.WritePacket(
//Handshake Packet
pk.Marshal(
0x00, //Handshake packet ID
pk.VarInt(ProtocolVersion), //Protocol version
pk.String(addr), //Server's address
pk.UnsignedShort(port),
pk.Byte(1),
))
if err != nil {
return nil, 0, fmt.Errorf("bot: send handshake packect fail: %v", err)
}
//LIST
//请求服务器状态
err = conn.WritePacket(pk.Marshal(0))
if err != nil {
return nil, 0, fmt.Errorf("bot: send list packect fail: %v", err)
}
//服务器返回状态
recv, err := conn.ReadPacket()
if err != nil {
return nil, 0, fmt.Errorf("bot: recv list packect fail: %v", err)
}
var s pk.String
err = recv.Scan(&s)
if err != nil {
return nil, 0, fmt.Errorf("bot: scan list packect fail: %v", err)
}
//PING
startTime := time.Now()
err = conn.WritePacket(pk.Marshal(0x01, pk.Long(startTime.Unix())))
if err != nil {
return nil, 0, fmt.Errorf("bot: send ping packect fail: %v", err)
}
recv, err = conn.ReadPacket()
if err != nil {
return nil, 0, fmt.Errorf("bot: recv pong packect fail: %v", err)
}
var t pk.Long
err = recv.Scan(&t)
if err != nil {
return nil, 0, fmt.Errorf("bot: scan pong packect fail: %v", err)
}
if t != pk.Long(startTime.Unix()) {
return nil, 0, fmt.Errorf("bot: pong packect no match: %v", err)
}
return []byte(s), time.Since(startTime), err
}
// JoinServer connect a Minecraft server for playing the game. // JoinServer connect a Minecraft server for playing the game.
func (c *Client) JoinServer(addr string, port int) (err error) { func (c *Client) JoinServer(addr string, port int) (err error) {
//Connect //Connect

94
bot/pinglist.go Normal file
View File

@ -0,0 +1,94 @@
package bot
import (
"fmt"
"time"
"github.com/Tnze/go-mc/net"
pk "github.com/Tnze/go-mc/net/packet"
)
// PingAndList check server status and list online player.
// Returns a JSON data with server status, and the delay.
//
// For more information for JSON format, see https://wiki.vg/Server_List_Ping#Response
func PingAndList(addr string, port int) ([]byte, time.Duration, error) {
conn, err := net.DialMC(fmt.Sprintf("%s:%d", addr, port))
if err != nil {
return nil, 0, fmt.Errorf("bot: dial fail: %v", err)
}
return pingAndList(addr, port, conn)
}
// PingAndListTimeout PingAndLIstTimeout is the version of PingAndList with max request time.
func PingAndListTimeout(addr string, port int, timeout time.Duration) ([]byte, time.Duration, error) {
deadLine := time.Now().Add(timeout)
conn, err := net.DialMCTimeout(fmt.Sprintf("%s:%d", addr, port), timeout)
if err != nil {
return nil, 0, fmt.Errorf("bot: dial fail: %v", err)
}
err = conn.Socket.SetDeadline(deadLine)
if err != nil {
return nil, 0, fmt.Errorf("bot: set deadline fail: %v", err)
}
return pingAndList(addr, port, conn)
}
func pingAndList(addr string, port int, conn *net.Conn) ([]byte, time.Duration, error) {
//握手
err := conn.WritePacket(
//Handshake Packet
pk.Marshal(
0x00, //Handshake packet ID
pk.VarInt(ProtocolVersion), //Protocol version
pk.String(addr), //Server's address
pk.UnsignedShort(port),
pk.Byte(1),
))
if err != nil {
return nil, 0, fmt.Errorf("bot: send handshake packect fail: %v", err)
}
//LIST
//请求服务器状态
err = conn.WritePacket(pk.Marshal(0))
if err != nil {
return nil, 0, fmt.Errorf("bot: send list packect fail: %v", err)
}
//服务器返回状态
recv, err := conn.ReadPacket()
if err != nil {
return nil, 0, fmt.Errorf("bot: recv list packect fail: %v", err)
}
var s pk.String
err = recv.Scan(&s)
if err != nil {
return nil, 0, fmt.Errorf("bot: scan list packect fail: %v", err)
}
//PING
startTime := time.Now()
err = conn.WritePacket(pk.Marshal(0x01, pk.Long(startTime.Unix())))
if err != nil {
return nil, 0, fmt.Errorf("bot: send ping packect fail: %v", err)
}
recv, err = conn.ReadPacket()
if err != nil {
return nil, 0, fmt.Errorf("bot: recv pong packect fail: %v", err)
}
var t pk.Long
err = recv.Scan(&t)
if err != nil {
return nil, 0, fmt.Errorf("bot: scan pong packect fail: %v", err)
}
if t != pk.Long(startTime.Unix()) {
return nil, 0, fmt.Errorf("bot: pong packect no match: %v", err)
}
return []byte(s), time.Since(startTime), err
}

5
go.mod
View File

@ -2,4 +2,7 @@ module github.com/Tnze/go-mc
go 1.12 go 1.12
require github.com/google/uuid v1.1.1 require (
github.com/google/uuid v1.1.1
github.com/satori/go.uuid v1.2.0
)

2
go.sum
View File

@ -1,2 +1,4 @@
github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=

View File

@ -6,6 +6,7 @@ import (
"crypto/cipher" "crypto/cipher"
"io" "io"
"net" "net"
"time"
pk "github.com/Tnze/go-mc/net/packet" pk "github.com/Tnze/go-mc/net/packet"
) )
@ -51,8 +52,18 @@ func DialMC(addr string) (*Conn, error) {
}, err }, err
} }
// DialMCTimeout acts like DialMC but takes a timeout.
func DialMCTimeout(addr string, timeout time.Duration) (*Conn, error) {
conn, err := net.DialTimeout("tcp", addr, timeout)
return &Conn{
Socket: conn,
ByteReader: bufio.NewReader(conn),
Writer: conn,
}, err
}
// WrapConn warp an net.Conn to MC-Conn // WrapConn warp an net.Conn to MC-Conn
// Helps you modify the connection process (eg. set timeout). // Helps you modify the connection process (eg. using DialContext).
func WrapConn(conn net.Conn) *Conn { func WrapConn(conn net.Conn) *Conn {
return &Conn{ return &Conn{
Socket: conn, Socket: conn,