Reduce extensive error checking (#266)

minekube · Dec 28, 2023 · fd44931 · fd44931
1 parent aff012f
commit fd44931
Show file tree

Hide file tree

Showing 6 changed files with 335 additions and 292 deletions.
diff --git a/pkg/edition/java/proto/codec/decoder.go b/pkg/edition/java/proto/codec/decoder.go
@@ -226,9 +226,13 @@ func (d *Decoder) decodePayload(p []byte) (ctx *proto.PacketContext, err error)
 	}
 
 	// Packet is known, decode data into it.
-	if err = ctx.Packet.Decode(ctx, payload); err != nil {
-		if err == io.EOF { // payload was too short or decoder has a bug
-			err = io.ErrUnexpectedEOF
+	err = util.RecoverFunc(func() error {
+		return ctx.Packet.Decode(ctx, payload)
+	})
+	if err != nil {
+		if errors.Is(err, io.EOF) {
+			// payload was too short or packet decoder has a bug
+			err = errors.Join(err, io.ErrUnexpectedEOF)
 		}
 		return ctx, errs.NewSilentErr("error decoding packet (type: %T, id: %s, protocol: %s, direction: %s): %w",
 			ctx.Packet, ctx.PacketID, ctx.Protocol, ctx.Direction, err)

diff --git a/pkg/edition/java/proto/codec/encoder.go b/pkg/edition/java/proto/codec/encoder.go
@@ -90,7 +90,9 @@ func (e *Encoder) WritePacket(packet proto.Packet) (n int, err error) {
 		Payload:   nil,
 	}
 
-	if err = packet.Encode(ctx, buf); err != nil {
+	if err = util.RecoverFunc(func() error {
+		return packet.Encode(ctx, buf)
+	}); err != nil {
 		return
 	}