From 6f83f199f8311bf7782da59bc2e07df38073e65a Mon Sep 17 00:00:00 2001
From: Kyren223 <ulmliad223@gmail.com>
Date: Sun, 20 Oct 2024 20:12:12 +0300
Subject: refactor: finished refactoring server-side code

---
 internal/packet/encoders.go | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'internal/packet/encoders.go')

diff --git a/internal/packet/encoders.go b/internal/packet/encoders.go
index e70d0e8..f5841ce 100644
--- a/internal/packet/encoders.go
+++ b/internal/packet/encoders.go
@@ -1,10 +1,9 @@
 package packet
 
 import (
-	"bytes"
 	"encoding/json"
-	"io"
 
+	"github.com/kyren223/eko/pkg/assert"
 	"github.com/vmihailenco/msgpack/v5"
 )
 
@@ -13,7 +12,7 @@ type TypedMessage interface {
 }
 
 type defaultPacketEncoder struct {
-	io.Reader
+	data       []byte
 	encoding   Encoding
 	packetType PacketType
 }
@@ -26,28 +25,28 @@ func (e defaultPacketEncoder) Type() PacketType {
 	return e.packetType
 }
 
-func NewJsonEncoder(message TypedMessage) (PacketEncoder, error) {
+func (e defaultPacketEncoder) Payload() []byte {
+	return e.data
+}
+
+func NewJsonEncoder(message TypedMessage) PacketEncoder {
 	data, err := json.Marshal(message)
-	if err != nil {
-		return nil, err
-	}
+	assert.NoError(err, "encoding a message with JSON should never fail")
 
 	return defaultPacketEncoder{
-		Reader:     bytes.NewReader(data),
+		data:       data,
 		encoding:   EncodingJson,
 		packetType: message.Type(),
-	}, nil
+	}
 }
 
-func NewMsgPackEncoder(message TypedMessage) (PacketEncoder, error) {
+func NewMsgPackEncoder(message TypedMessage) PacketEncoder {
 	data, err := msgpack.Marshal(message)
-	if err != nil {
-		return nil, err
-	}
+	assert.NoError(err, "encoding a message with msg pack should never fail")
 
 	return defaultPacketEncoder{
-		Reader:     bytes.NewReader(data),
+		data:       data,
 		encoding:   EncodingMsgPack,
 		packetType: message.Type(),
-	}, nil
+	}
 }
-- 
cgit v1.3.1