export gzip writer & inline UniPacket

binary/pool.go

@@ -32,30 +32,25 @@ func PutBuffer(w *Writer) {
 	}
 }
 
-type gzipWriter struct {
-	w   *gzip.Writer
-	buf *bytes.Buffer
-}
-
 var gzipPool = sync.Pool{
 	New: func() interface{} {
 		buf := new(bytes.Buffer)
 		w := gzip.NewWriter(buf)
-		return &gzipWriter{
+		return &GzipWriter{
 			w:   w,
 			buf: buf,
 		}
 	},
 }
 
-func acquireGzipWriter() *gzipWriter {
+func AcquireGzipWriter() *GzipWriter {
-	ret := gzipPool.Get().(*gzipWriter)
+	ret := gzipPool.Get().(*GzipWriter)
 	ret.buf.Reset()
 	ret.w.Reset(ret.buf)
 	return ret
 }
 
-func releaseGzipWriter(w *gzipWriter) {
+func ReleaseGzipWriter(w *GzipWriter) {
 	// See https://golang.org/issue/23199
 	const maxSize = 1 << 16
 	if w.buf.Cap() < maxSize {

binary/reader.go

@@ -117,10 +117,8 @@ func (r *Reader) Len() int {
 }
 
 func (tlv TlvMap) Exists(key uint16) bool {
-	if _, ok := tlv[key]; ok {
+	_, ok := tlv[key]
-		return true
+	return ok
-	}
-	return false
 }
 
 // --- Network reader ---
@@ -144,13 +142,13 @@ func (r *NetworkReader) ReadByte() (byte, error) {
 func (r *NetworkReader) ReadBytes(len int) ([]byte, error) {
 	buf := make([]byte, len)
 	_, err := io.ReadFull(r.conn, buf)
-	//for i := 0; i < len; i++ {
+	// for i := 0; i < len; i++ {
-	//	b, err := r.ReadByte()
+	//	 b, err := r.ReadByte()
-	//	if err != nil {
+	//	 if err != nil {
 	//		return nil, err
-	//	}
+	//	 }
-	//	buf[i] = b
+	// 	 buf[i] = b
-	//}
+	// }
 	return buf, err
 }
 

binary/utils.go

@@ -12,6 +12,23 @@ import (
 	"github.com/Mrs4s/MiraiGo/utils"
 )
 
+type GzipWriter struct {
+	w   *gzip.Writer
+	buf *bytes.Buffer
+}
+
+func (w *GzipWriter) Write(p []byte) (int, error) {
+	return w.w.Write(p)
+}
+
+func (w *GzipWriter) Close() error {
+	return w.w.Close()
+}
+
+func (w *GzipWriter) Bytes() []byte {
+	return w.buf.Bytes()
+}
+
 func ZlibUncompress(src []byte) []byte {
 	b := bytes.NewReader(src)
 	var out bytes.Buffer
@@ -31,11 +48,11 @@ func ZlibCompress(data []byte) []byte {
 }
 
 func GZipCompress(data []byte) []byte {
-	gw := acquireGzipWriter()
+	gw := AcquireGzipWriter()
-	_, _ = gw.w.Write(data)
+	_, _ = gw.Write(data)
-	_ = gw.w.Close()
+	_ = gw.Close()
 	ret := append([]byte(nil), gw.buf.Bytes()...)
-	releaseGzipWriter(gw)
+	ReleaseGzipWriter(gw)
 	return ret
 }
 

binary/writer.go

@@ -79,20 +79,24 @@ func (w *Writer) WriteIntLvPacket(offset int, f func(writer *Writer)) {
 }
 
 func (w *Writer) WriteUniPacket(commandName string, sessionId, extraData, body []byte) {
-	w.WriteIntLvPacket(4, func(w *Writer) {
+	w1 := NewWriter()
-		w.WriteString(commandName)
+	{ // WriteIntLvPacket
-		w.WriteUInt32(8)
+		w1.WriteString(commandName)
-		w.Write(sessionId)
+		w1.WriteUInt32(8)
+		w1.Write(sessionId)
 		if len(extraData) == 0 {
-			w.WriteUInt32(0x04)
+			w1.WriteUInt32(0x04)
 		} else {
-			w.WriteUInt32(uint32(len(extraData) + 4))
+			w1.WriteUInt32(uint32(len(extraData) + 4))
-			w.Write(extraData)
+			w1.Write(extraData)
 		}
-	})
+	}
-	w.WriteIntLvPacket(4, func(w *Writer) {
+	data := w1.Bytes()
-		w.Write(body)
+	w.WriteUInt32(uint32(len(data) + 4))
-	})
+	w.Write(data)
+	PutBuffer(w1)
+	w.WriteUInt32(uint32(len(body) + 4)) // WriteIntLvPacket
+	w.Write(body)
 }
 
 func (w *Writer) WriteBytesShort(data []byte) {

protocol/packets/builders.go

@@ -27,15 +27,23 @@ func BuildLoginPacket(uin int64, bodyType byte, key, body, extraData []byte) []b
 
 func BuildUniPacket(uin int64, seq uint16, commandName string, encryptType byte, sessionID, extraData, key, body []byte) []byte {
 	return binary.NewWriterF(func(w *binary.Writer) {
-		w.WriteIntLvPacket(4, func(w *binary.Writer) {
+		w2 := binary.NewWriter()
-			w.WriteUInt32(0x0B)
+		{ // w.WriteIntLvPacket
-			w.WriteByte(encryptType)
+			w2.WriteUInt32(0x0B)
-			w.WriteUInt32(uint32(seq))
+			w2.WriteByte(encryptType)
-			w.WriteByte(0)
+			w2.WriteUInt32(uint32(seq))
-			w.WriteString(strconv.FormatInt(uin, 10))
+			w2.WriteByte(0)
-			w.EncryptAndWrite(key, binary.NewWriterF(func(w *binary.Writer) {
+			w2.WriteString(strconv.FormatInt(uin, 10))
-				w.WriteUniPacket(commandName, sessionID, extraData, body)
+
-			}))
+			// inline NewWriterF
-		})
+			w3 := binary.NewWriter()
+			w3.WriteUniPacket(commandName, sessionID, extraData, body)
+			w2.EncryptAndWrite(key, w3.Bytes())
+			binary.PutBuffer(w3)
+		}
+		data := w2.Bytes()
+		w.WriteUInt32(uint32(len(data) + 4))
+		w.Write(data)
+		binary.PutBuffer(w2)
 	})
 }

protocol/packets/global.go

@@ -3,9 +3,10 @@ package packets
 import (
 	"strconv"
 
+	"github.com/pkg/errors"
+
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/protocol/crypto"
-	"github.com/pkg/errors"
 )
 
 var (