Refactoring package go-mc/bot

bot/pinglist.go

@@ -2,9 +2,12 @@ package bot
 
 import (
 	"fmt"
+	"net"
+	"strconv"
 	"time"
 
-	"github.com/Tnze/go-mc/net"
+	"github.com/Tnze/go-mc/data/packetid"
+	mcnet "github.com/Tnze/go-mc/net"
 	pk "github.com/Tnze/go-mc/net/packet"
 )
 
@@ -12,49 +15,70 @@ import (
 // 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))
+func PingAndList(addr string) ([]byte, time.Duration, error) {
+	addrSrv, err := parseAddress(&net.Resolver{}, addr)
 	if err != nil {
-		return nil, 0, fmt.Errorf("bot: dial fail: %v", err)
+		return nil, 0, LoginErr{"parse address", err}
 	}
-	return pingAndList(addr, port, conn)
+
+	conn, err := mcnet.DialMC(addrSrv)
+	if err != nil {
+		return nil, 0, LoginErr{"dial connection", err}
+	}
+	return pingAndList(addr, 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) {
+func PingAndListTimeout(addr string, timeout time.Duration) ([]byte, time.Duration, error) {
 	deadLine := time.Now().Add(timeout)
 
-	conn, err := net.DialMCTimeout(fmt.Sprintf("%s:%d", addr, port), timeout)
+	addrSrv, err := parseAddress(&net.Resolver{}, addr)
 	if err != nil {
-		return nil, 0, fmt.Errorf("bot: dial fail: %v", err)
+		return nil, 0, LoginErr{"parse address", err}
+	}
+
+	conn, err := mcnet.DialMCTimeout(addrSrv, timeout)
+	if err != nil {
+		return nil, 0, err
 	}
 
 	err = conn.Socket.SetDeadline(deadLine)
 	if err != nil {
-		return nil, 0, fmt.Errorf("bot: set deadline fail: %v", err)
+		return nil, 0, LoginErr{"set deadline", err}
 	}
 
-	return pingAndList(addr, port, conn)
+	return pingAndList(addr, conn)
 }
 
-func pingAndList(addr string, port int, conn *net.Conn) ([]byte, time.Duration, error) {
+func pingAndList(addr string, conn *mcnet.Conn) ([]byte, time.Duration, error) {
+	// Split Host and Port
+	host, portStr, err := net.SplitHostPort(addr)
+	if err != nil {
+		return nil, 0, LoginErr{"split address", err}
+	}
+	port, err := strconv.Atoi(portStr)
+	if err != nil {
+		return nil, 0, LoginErr{"parse port", err}
+	}
+
+	const Handshake = 0x00
 	//握手
-	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),
-		))
+	err = conn.WritePacket(pk.Marshal(
+		Handshake,                  //Handshake packet ID
+		pk.VarInt(ProtocolVersion), //Protocol version
+		pk.String(host),            //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))
+	err = conn.WritePacket(pk.Marshal(
+		packetid.PingStart,
+	))
 	if err != nil {
 		return nil, 0, fmt.Errorf("bot: send list packect fail: %v", err)
 	}
@@ -72,7 +96,10 @@ func pingAndList(addr string, port int, conn *net.Conn) ([]byte, time.Duration,
 
 	//PING
 	startTime := time.Now()
-	err = conn.WritePacket(pk.Marshal(0x01, pk.Long(startTime.Unix())))
+	err = conn.WritePacket(pk.Marshal(
+		packetid.PingServerbound,
+		pk.Long(startTime.Unix()),
+	))
 	if err != nil {
 		return nil, 0, fmt.Errorf("bot: send ping packect fail: %v", err)
 	}