From 489537d152e463f9df9f872dfff37b039a05b339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?=
 <41315874+fumiama@users.noreply.github.com>
Date: Tue, 25 Feb 2025 22:11:30 +0900
Subject: [PATCH] optimize(p2p): tcp pdu

---
 gold/p2p/tcp/pdu.go | 21 ++++++---------------
 gold/p2p/tcp/tcp.go |  5 ++---
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/gold/p2p/tcp/pdu.go b/gold/p2p/tcp/pdu.go
index d827d5f..6a1e518 100644
--- a/gold/p2p/tcp/pdu.go
+++ b/gold/p2p/tcp/pdu.go
@@ -1,18 +1,14 @@
 package tcp
 
 import (
-	"bytes"
 	"encoding/binary"
 	"errors"
 	"io"
 	"net"
-	"runtime"
 	"time"
 
 	"github.com/fumiama/WireGold/config"
 	"github.com/fumiama/WireGold/helper"
-	"github.com/fumiama/orbyte"
-	"github.com/fumiama/orbyte/pbuf"
 	"github.com/sirupsen/logrus"
 )
 
@@ -37,19 +33,16 @@ var (
 type packet struct {
 	typ packetType
 	len uint16
-	dat pbuf.Bytes
+	dat []byte
 	io.ReaderFrom
 	io.WriterTo
 }
 
-func (p *packet) pack() (net.Buffers, func()) {
-	d := helper.NewWriterF(func(w *helper.Writer) {
+func (p *packet) pack() *net.Buffers {
+	return &net.Buffers{magicbuf, helper.NewWriterF(func(w *helper.Writer) {
 		w.WriteByte(byte(p.typ))
 		w.WriteUInt16(p.len)
-	})
-	return net.Buffers{magicbuf, d.Bytes(), p.dat.Bytes()}, func() {
-		runtime.KeepAlive(d)
-	}
+	}).Trans().Bytes(), p.dat}
 }
 
 func (p *packet) Read(_ []byte) (int, error) {
@@ -87,14 +80,12 @@ func (p *packet) ReadFrom(r io.Reader) (n int64, err error) {
 	if err != nil {
 		return
 	}
-	p.dat = pbuf.BufferItemToBytes((*orbyte.Item[bytes.Buffer])(w).Trans())
+	p.dat = w.TransBytes()
 	return
 }
 
 func (p *packet) WriteTo(w io.Writer) (n int64, err error) {
-	buf, cl := p.pack()
-	defer cl()
-	return io.Copy(w, &buf)
+	return io.Copy(w, p.pack())
 }
 
 func isvalid(tcpconn *net.TCPConn, timeout time.Duration) (issub, ok bool) {
diff --git a/gold/p2p/tcp/tcp.go b/gold/p2p/tcp/tcp.go
index 83fb4f9..9db3aae 100644
--- a/gold/p2p/tcp/tcp.go
+++ b/gold/p2p/tcp/tcp.go
@@ -14,7 +14,6 @@ import (
 
 	"github.com/fumiama/WireGold/config"
 	"github.com/fumiama/WireGold/gold/p2p"
-	"github.com/fumiama/orbyte/pbuf"
 )
 
 type EndPoint struct {
@@ -378,7 +377,7 @@ func (conn *Conn) ReadFromPeer(b []byte) (int, p2p.EndPoint, error) {
 			break
 		}
 	}
-	n := copy(b, p.pckt.dat.Bytes())
+	n := copy(b, p.pckt.dat)
 	return n, p.addr, nil
 }
 
@@ -452,7 +451,7 @@ RECONNECT:
 	cnt, err := io.Copy(tcpconn, &packet{
 		typ: packetTypeNormal,
 		len: uint16(len(b)),
-		dat: pbuf.ParseBytes(b...),
+		dat: b,
 	})
 	if err != nil {
 		if subc == nil {