fix: Lint & Fmt

Author: layou233

common/buf/buffer.go

@@ -233,7 +233,7 @@ func (b *Buffer) Release() {
 	if b == nil || b.closed || !b.managed {
 		return
 	}
-	Put(b.data)
+	Put(b.data) //nolint:errcheck
 	*b = Buffer{closed: true}
 }
 

common/mcprotocol/message.go

@@ -123,6 +123,9 @@ func (m *Message) ReadMessage(buffer *buf.Buffer) error {
 		return err
 	}
 	code, err := buffer.Peek(int(length))
+	if err != nil {
+		return err
+	}
 	err = json.Unmarshal(code, m)
 	return err
 }

common/mcprotocol/varint.go

@@ -2,8 +2,9 @@ package mcprotocol
 
 import (
 	"errors"
-	"github.com/layou233/ZBProxy/common/rw"
 	"io"
+
+	"github.com/layou233/ZBProxy/common/rw"
 )
 
 const MaxVarIntLen = 5

common/mcprotocol/varint_test.go

@@ -12,8 +12,6 @@ import (
 
 func checkWrite(t *testing.T, n int32, result [MaxVarIntLen]byte) {
 	buffer := buf.NewSize(MaxVarIntLen + 1)
-	buffer.WriteZeroN(MaxVarIntLen)
-	buffer.FullReset()
 	defer buffer.Release()
 	_, err := VarInt(n).WriteTo(buffer)
 	if err != nil {
@@ -24,7 +22,6 @@ func checkWrite(t *testing.T, n int32, result [MaxVarIntLen]byte) {
 	if !bytes.Equal(buffer.Bytes(), result[:]) {
 		t.Fatalf("VarInt WriteTo error: got %v, expect %v", buffer.Bytes(), result)
 	}
-	return
 }
 
 func checkRead(t *testing.T, n int32, result [MaxVarIntLen]byte) {
@@ -38,7 +35,6 @@ func checkRead(t *testing.T, n int32, result [MaxVarIntLen]byte) {
 	if n != vi {
 		t.Fatalf("VarInt ReadFrom error: got %v, expect %v", vi, n)
 	}
-	return
 }
 
 func TestVarInt_WriteTo(t *testing.T) {
@@ -74,15 +70,6 @@ func BenchmarkVarInt_WriteTo(b *testing.B) {
 	vi := VarInt(25565)
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		vi.WriteTo(io.Discard)
+		_, _ = vi.WriteTo(io.Discard)
 	}
 }
-
-/*func BenchmarkGoMCVarInt_WriteTo(b *testing.B) {
-	b.ReportAllocs()
-	vi := packet.VarInt(25565)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		vi.WriteTo(io.Discard)
-	}
-}*/

common/utils.go

@@ -7,6 +7,12 @@ func Must[T any](s T, err error) T {
 	return s
 }
 
+func Must0(err error) {
+	if err != nil {
+		panic(err)
+	}
+}
+
 func GetSecond[T any](_ any, r T) T {
 	return r
 }

main.go

@@ -33,7 +33,7 @@ func main() {
 	color.HiGreen("Welcome to ZBProxy %s (%s)!\n", version.Version, version.CommitHash)
 	color.HiBlack("Build Information: %s, %s/%s, CGO %s\n",
 		runtime.Version(), runtime.GOOS, runtime.GOARCH, common.CGOHint)
-	//go version.CheckUpdate()
+	// go version.CheckUpdate()
 
 	config.LoadConfig()
 

service/minecraft/handler.go

@@ -100,8 +100,8 @@ func NewConnHandler(s *config.ConfigProxyService,
 			motdLen := len(motd)
 
 			buffer.Reset(mcprotocol.MaxVarIntLen)
-			buffer.WriteByte(0x00) // Client bound : Status Response
-			mcprotocol.VarInt(motdLen).WriteTo(buffer)
+			common.Must0(buffer.WriteByte(0x00)) // Client bound : Status Response
+			common.Must(mcprotocol.VarInt(motdLen).WriteTo(buffer))
 			mcprotocol.AppendPacketLength(buffer, buffer.Len()+motdLen)
 
 			_, err = c.Write(buffer.Bytes())
@@ -159,9 +159,7 @@ func NewConnHandler(s *config.ConfigProxyService,
 	if err != nil {
 		return nil, err
 	}
-	var (
-		playerName string
-	)
+	var playerName string
 	err = mcprotocol.Scan(buffer, &packetID, &playerName)
 	if err != nil {
 		return nil, err
@@ -176,8 +174,8 @@ func NewConnHandler(s *config.ConfigProxyService,
 		msgLen := len(msg)
 
 		buffer.Reset(mcprotocol.MaxVarIntLen)
-		buffer.WriteByte(0x00) // Client bound : Disconnect (login)
-		mcprotocol.VarInt(msgLen).WriteTo(buffer)
+		common.Must0(buffer.WriteByte(0x00)) // Client bound : Disconnect (login)
+		common.Must(mcprotocol.VarInt(msgLen).WriteTo(buffer))
 		mcprotocol.AppendPacketLength(buffer, buffer.Len()+msgLen)
 
 		_, err = c.Write(buffer.Bytes())
@@ -227,8 +225,8 @@ func NewConnHandler(s *config.ConfigProxyService,
 		msgLen := len(msg)
 
 		buffer.Reset(mcprotocol.MaxVarIntLen)
-		buffer.WriteByte(0x00) // Client bound : Disconnect (login)
-		mcprotocol.VarInt(msgLen).WriteTo(buffer)
+		common.Must0(buffer.WriteByte(0x00)) // Client bound : Disconnect (login)
+		common.Must(mcprotocol.VarInt(msgLen).WriteTo(buffer))
 		mcprotocol.AppendPacketLength(buffer, buffer.Len()+msgLen)
 
 		_, err = c.Write(buffer.Bytes())
@@ -292,6 +290,9 @@ func NewConnHandler(s *config.ConfigProxyService,
 		byte(0x00),
 		playerName,
 	)
+	if err != nil {
+		return nil, err
+	}
 	err = remoteMC.WritePacket(buffer)
 	if err != nil {
 		return nil, err

service/minecraft/kick.go

@@ -31,7 +31,7 @@ func generateKickMessage(s *config.ConfigProxyService, name string) mcprotocol.M
 			{
 				Color: mcprotocol.Aqua, UnderLined: true,
 				Text: "https://github.com/layou233/ZBProxy",
-				//ClickEvent: chat.OpenURL("https://github.com/layou233/ZBProxy"),
+				// ClickEvent: chat.OpenURL("https://github.com/layou233/ZBProxy"),
 			},
 		},
 	}
@@ -60,7 +60,7 @@ func generatePlayerNumberLimitExceededMessage(s *config.ConfigProxyService, name
 			{
 				Color: mcprotocol.Aqua, UnderLined: true,
 				Text: "https://github.com/layou233/ZBProxy",
-				//ClickEvent: chat.OpenURL("https://github.com/layou233/ZBProxy"),
+				// ClickEvent: chat.OpenURL("https://github.com/layou233/ZBProxy"),
 			},
 		},
 	}

service/minecraft/motd.go

@@ -2,6 +2,7 @@ package minecraft
 
 import (
 	"encoding/json"
+
 	"github.com/layou233/ZBProxy/config"
 	"github.com/layou233/ZBProxy/service/transfer"
 	"github.com/layou233/ZBProxy/version"