optimize: memory consumption

2026-06-21 19:13:20 +08:00 · 2025-05-13 00:59:05 +09:00
parent d65fc4dd71
commit df8f6affa3
19 changed files with 204 additions and 242 deletions
--- a/gold/proto/data/data.go
+++ b/gold/proto/data/data.go
@@ -1,14 +1,12 @@
 package data

 import (
-	"github.com/fumiama/orbyte/pbuf"
-
 	"github.com/fumiama/WireGold/gold/head"
 	"github.com/fumiama/WireGold/gold/link"
 )

 func init() {
-	link.RegisterDispacher(head.ProtoData, func(header *head.Packet, peer *link.Link, data pbuf.Bytes) {
+	link.RegisterDispacher(head.ProtoData, func(header *head.Packet, peer *link.Link, data []byte) {
 		peer.ToLower(header, data)
 	})
 }
--- a/gold/proto/hello/hello.go
+++ b/gold/proto/hello/hello.go
@@ -1,7 +1,6 @@
 package hello

 import (
-	"github.com/fumiama/orbyte/pbuf"
 	"github.com/sirupsen/logrus"

 	"github.com/fumiama/WireGold/gold/head"
@@ -10,17 +9,15 @@ import (
 )

 func init() {
-	link.RegisterDispacher(head.ProtoHello, func(_ *head.Packet, peer *link.Link, data pbuf.Bytes) {
-		data.V(func(b []byte) {
-			switch {
-			case len(b) == 0:
-				logrus.Warnln(file.Header(), "recv old packet, do nothing")
-			case b[0] == byte(head.HelloPing):
-				go peer.WritePacket(head.ProtoHello, []byte{byte(head.HelloPong)}, peer.Me().TTL())
-				logrus.Infoln(file.Header(), "recv, send ack")
-			default:
-				logrus.Infoln(file.Header(), "recv ack, do nothing")
-			}
-		})
+	link.RegisterDispacher(head.ProtoHello, func(_ *head.Packet, peer *link.Link, data []byte) {
+		switch {
+		case len(data) == 0:
+			logrus.Warnln(file.Header(), "recv old packet, do nothing")
+		case data[0] == byte(head.HelloPing):
+			go peer.WritePacket(head.ProtoHello, []byte{byte(head.HelloPong)}, peer.Me().TTL())
+			logrus.Infoln(file.Header(), "recv, send ack")
+		default:
+			logrus.Infoln(file.Header(), "recv ack, do nothing")
+		}
 	})
 }
--- a/gold/proto/nat/nat.go
+++ b/gold/proto/nat/nat.go
@@ -17,97 +17,93 @@ import (

 func init() {
 	// 收到通告包的处理
-	link.RegisterDispacher(head.ProtoNotify, func(_ *head.Packet, peer *link.Link, data pbuf.Bytes) {
-		data.V(func(b []byte) {
-			// 1. Data 解包
-			// ---- 使用 head.Notify 解释 packet
-			notify := make(head.Notify, 32)
-			err := json.Unmarshal(b, &notify)
-			if err != nil {
-				logrus.Errorln(file.Header(), "notify json unmarshal err:", err)
-				return
+	link.RegisterDispacher(head.ProtoNotify, func(_ *head.Packet, peer *link.Link, data []byte) {
+		// 1. Data 解包
+		// ---- 使用 head.Notify 解释 packet
+		notify := make(head.Notify, 32)
+		err := json.Unmarshal(data, &notify)
+		if err != nil {
+			logrus.Errorln(file.Header(), "notify json unmarshal err:", err)
+			return
+		}
+		// 2. endpoint注册
+		// ---- 遍历 Notify，注册对方的 endpoint 到
+		// ---- connections，注意使用读写锁connmapmu
+		for ps, ep := range notify {
+			nw, epstr := ep[0], ep[1]
+			if nw != peer.Me().EndPoint().Network() {
+				logrus.Warnln(file.Header(), "ignore different network notify", nw, "addr", epstr)
+				continue
 			}
-			// 2. endpoint注册
-			// ---- 遍历 Notify，注册对方的 endpoint 到
-			// ---- connections，注意使用读写锁connmapmu
-			for ps, ep := range notify {
-				nw, epstr := ep[0], ep[1]
-				if nw != peer.Me().EndPoint().Network() {
-					logrus.Warnln(file.Header(), "ignore different network notify", nw, "addr", epstr)
+			addr, err := p2p.NewEndPoint(nw, epstr, peer.Me().NetworkConfigs()...)
+			if err == nil {
+				p, ok := peer.Me().IsInPeer(ps)
+				if ok {
+					if bin.IsNilInterface(p.EndPoint()) || !p.EndPoint().Euqal(addr) {
+						p.SetEndPoint(addr)
+						logrus.Infoln(file.Header(), "notify set ep of peer", ps, "to", ep)
+					}
 					continue
 				}
-				addr, err := p2p.NewEndPoint(nw, epstr, peer.Me().NetworkConfigs()...)
-				if err == nil {
-					p, ok := peer.Me().IsInPeer(ps)
-					if ok {
-						if bin.IsNilInterface(p.EndPoint()) || !p.EndPoint().Euqal(addr) {
-							p.SetEndPoint(addr)
-							logrus.Infoln(file.Header(), "notify set ep of peer", ps, "to", ep)
-						}
-						continue
-					}
-				}
-				if config.ShowDebugLog {
-					logrus.Debugln(file.Header(), "notify drop invalid peer:", ps, "ep:", ep)
-				}
 			}
-		})
+			if config.ShowDebugLog {
+				logrus.Debugln(file.Header(), "notify drop invalid peer:", ps, "ep:", ep)
+			}
+		}
 	})
 	// 收到询问包的处理
-	link.RegisterDispacher(head.ProtoQuery, func(_ *head.Packet, peer *link.Link, data pbuf.Bytes) {
-		data.V(func(b []byte) {
-			// 完成data解包与notify分发
+	link.RegisterDispacher(head.ProtoQuery, func(_ *head.Packet, peer *link.Link, data []byte) {
+		// 完成data解包与notify分发

-			// 1. Data 解包
-			// ---- 使用 head.Query 解释 packet
-			// ---- 根据 Query 确定需要封装的 Notify
-			var peers head.Query
-			err := json.Unmarshal(b, &peers)
-			if err != nil {
-				logrus.Errorln(file.Header(), "query json unmarshal err:", err)
-				return
-			}
+		// 1. Data 解包
+		// ---- 使用 head.Query 解释 packet
+		// ---- 根据 Query 确定需要封装的 Notify
+		var peers head.Query
+		err := json.Unmarshal(data, &peers)
+		if err != nil {
+			logrus.Errorln(file.Header(), "query json unmarshal err:", err)
+			return
+		}

-			if peer == nil || peer.Me() == nil {
-				logrus.Errorln(file.Header(), "nil link/me")
-				return
-			}
+		if peer == nil || peer.Me() == nil {
+			logrus.Errorln(file.Header(), "nil link/me")
+			return
+		}

-			// 2. notify分发
-			// ---- 封装 Notify 到 新的 packet
-			// ---- 发送到对方
-			notify := make(head.Notify, len(peers))
-			for _, p := range peers {
-				lnk, ok := peer.Me().IsInPeer(p)
-				eps := ""
-				if peer.Me().EndPoint().Network() == "udp" { // udp has real p2p
-					if bin.IsNilInterface(lnk.EndPoint()) {
-						continue
-					}
-					eps = lnk.EndPoint().String()
-				}
-				if eps == "" {
-					eps = peer.RawEndPoint() // use registered ep only
-				}
-				if eps == "" {
+		// 2. notify分发
+		// ---- 封装 Notify 到 新的 packet
+		// ---- 发送到对方
+		notify := make(head.Notify, len(peers))
+		for _, p := range peers {
+			lnk, ok := peer.Me().IsInPeer(p)
+			eps := ""
+			if peer.Me().EndPoint().Network() == "udp" { // udp has real p2p
+				if bin.IsNilInterface(lnk.EndPoint()) {
 					continue
 				}
-				if ok && bin.IsNonNilInterface(lnk.EndPoint()) {
-					notify[p] = [2]string{
-						lnk.EndPoint().Network(),
-						eps,
-					}
+				eps = lnk.EndPoint().String()
+			}
+			if eps == "" {
+				eps = peer.RawEndPoint() // use registered ep only
+			}
+			if eps == "" {
+				continue
+			}
+			if ok && bin.IsNonNilInterface(lnk.EndPoint()) {
+				notify[p] = [2]string{
+					lnk.EndPoint().Network(),
+					eps,
 				}
 			}
-			if len(notify) > 0 {
-				logrus.Infoln(file.Header(), "query wrap", len(notify), "notify")
-				w := bin.SelectWriter()
-				_ = json.NewEncoder(w).Encode(&notify)
-				w.P(func(b *pbuf.Buffer) {
-					peer.WritePacket(head.ProtoNotify, b.Bytes(), peer.Me().TTL())
-				})
-				w.Destroy()
-			}
-		})
+		}
+		if len(notify) > 0 {
+			logrus.Infoln(file.Header(), "query wrap", len(notify), "notify")
+			w := bin.SelectWriter()
+			_ = json.NewEncoder(w).Encode(&notify)
+			w.P(func(b *pbuf.Buffer) {
+				peer.WritePacket(head.ProtoNotify, b.Bytes(), peer.Me().TTL())
+			})
+			w.Destroy()
+		}
 	})
 }