加入网络层

This commit is contained in:
2025-06-26 23:57:54 +08:00
parent 53106465ed
commit 0f29dccec4
57 changed files with 1859 additions and 1274 deletions

View File

@@ -0,0 +1,196 @@
package websocket
import (
"bytes"
"common/net/socket"
"context"
"github.com/panjf2000/gnet/v2"
"github.com/panjf2000/gnet/v2/pkg/logging"
"sync"
"time"
)
// WSServer 实现GNet库接口
type WSServer struct {
gnet.BuiltinEventEngine
eng gnet.Engine
i socket.ISocketServer
logger logging.Logger // 日志
upgradeTimeout time.Duration // 升级超时时间
unUpgradeConn sync.Map
}
func NewWSServer(i socket.ISocketServer, logger logging.Logger, timeout time.Duration) *WSServer {
if i == nil {
return nil
}
return &WSServer{
i: i,
logger: logger,
upgradeTimeout: timeout,
unUpgradeConn: sync.Map{},
}
}
func (s *WSServer) Run(logger logging.Logger, addr string, multiCore, reusePort, tick, lockOSThread, reuseAddr bool, processNum int) error {
return gnet.Run(
s,
addr,
gnet.WithMulticore(multiCore),
gnet.WithNumEventLoop(processNum),
gnet.WithReusePort(reusePort),
gnet.WithTicker(tick),
gnet.WithLogger(logger),
gnet.WithLockOSThread(lockOSThread),
gnet.WithReuseAddr(reuseAddr),
)
}
func (s *WSServer) Stop() error {
return s.eng.Stop(context.Background())
}
func (s *WSServer) OnBoot(eng gnet.Engine) gnet.Action {
s.eng = eng
return gnet.None
}
func (s *WSServer) OnOpen(c gnet.Conn) ([]byte, gnet.Action) {
ws := &WSConn{
Conn: c,
isUpgrade: false,
openTime: time.Now().Unix(),
buf: bytes.Buffer{},
logger: s.logger,
wsMessageBuf: wsMessageBuf{
curHeader: nil,
cachedBuf: bytes.Buffer{},
},
param: make(map[string]interface{}),
}
c.SetContext(ws)
s.unUpgradeConn.Store(c.RemoteAddr().String(), ws)
d, a := s.i.OnOpen(ws)
return d, (gnet.Action)(a)
}
// OnClose fires when a connection has been closed.
// The parameter err is the last known connection error.
func (s *WSServer) OnClose(c gnet.Conn, err error) (action gnet.Action) {
s.unUpgradeConn.Delete(c.RemoteAddr().String())
tmp := c.Context()
ws, ok := tmp.(*WSConn)
if ok {
s.logger.Warnf("connection close")
return gnet.Action(s.i.OnClose(ws, err))
}
return
}
// OnTraffic fires when a local socket receives data from the peer.
func (s *WSServer) OnTraffic(c gnet.Conn) (action gnet.Action) {
tmp := c.Context()
if tmp == nil {
if s.logger != nil {
s.logger.Errorf("OnTraffic context nil: %v", c)
}
action = gnet.Close
return
}
ws, ok := tmp.(*WSConn)
if !ok {
if s.logger != nil {
s.logger.Errorf("OnTraffic convert ws error: %v", tmp)
}
action = gnet.Close
return
}
action = ws.readBytesBuf(c)
if action != gnet.None {
return
}
if !ws.isUpgrade {
var data []byte
data, ok, action = ws.upgrade()
if ok {
s.unUpgradeConn.Delete(c.RemoteAddr().String())
s.i.OnHandShake(ws)
if data != nil {
err := ws.Conn.AsyncWrite(data, nil)
if err != nil {
if ws.logger != nil {
ws.logger.Errorf("update ws write upgrade protocol error", err)
}
action = gnet.Close
}
}
}
} else {
msg, err := ws.readWsMessages()
if err != nil {
if ws.logger != nil {
ws.logger.Errorf("read ws messages errors", err)
}
return gnet.Close
}
if msg != nil {
for _, m := range msg {
a := s.i.OnMessage(ws, m.Payload)
if gnet.Action(a) != gnet.None {
action = gnet.Action(a)
}
}
}
}
return
}
// OnTick fires immediately after the engine starts and will fire again
// following the duration specified by the delay return value.
func (s *WSServer) OnTick() (delay time.Duration, action gnet.Action) {
now := time.Now().Unix()
delConn := make([]string, 0)
s.unUpgradeConn.Range(func(key, value interface{}) bool {
k, ok := key.(string)
if !ok {
return true
}
v, ok := value.(*WSConn)
if !ok {
return true
}
if now-v.openTime >= int64(s.upgradeTimeout.Seconds()) {
delConn = append(delConn, k)
}
return true
})
for _, k := range delConn {
wsConn, _ := s.unUpgradeConn.LoadAndDelete(k)
if wsConn == nil {
continue
}
v, ok := wsConn.(*WSConn)
if !ok {
continue
}
if err := v.Close(); err != nil {
if s.logger != nil {
s.logger.Errorf("upgrade ws time out close socket error: %v", err)
continue
}
}
}
d, a := s.i.OnTick()
delay = d
action = gnet.Action(a)
return
}

View File

@@ -0,0 +1,263 @@
package websocket
import (
"bufio"
"bytes"
"errors"
"github.com/gobwas/ws"
"github.com/gobwas/ws/wsutil"
"github.com/panjf2000/gnet/v2"
"github.com/panjf2000/gnet/v2/pkg/logging"
"io"
"net/url"
)
// WSConn 实现ISocketConn接口
type WSConn struct {
gnet.Conn
buf bytes.Buffer
logger logging.Logger
isUpgrade bool
isClose bool
param map[string]interface{}
openTime int64
wsMessageBuf
}
type wsMessageBuf struct {
curHeader *ws.Header
cachedBuf bytes.Buffer
}
type readWrite struct {
io.Reader
io.Writer
}
func (w *WSConn) readBytesBuf(c gnet.Conn) gnet.Action {
size := c.InboundBuffered()
if size <= 0 {
return gnet.None
}
buf := make([]byte, size)
read, err := c.Read(buf)
if err != nil {
if w.logger != nil {
w.logger.Errorf("ws read bytes buf error", err)
}
return gnet.Close
}
if read < size {
if w.logger != nil {
w.logger.Errorf("read bytes len err! size: %d read: %d", size, read)
}
return gnet.Close
}
w.buf.Write(buf)
return gnet.None
}
func (w *WSConn) upgrade() (data []byte, ok bool, action gnet.Action) {
if w.isUpgrade {
ok = true
return
}
buf := &w.buf
tmpReader := bytes.NewReader(buf.Bytes())
oldLen := tmpReader.Len()
result := &bytes.Buffer{}
tempWriter := bufio.NewWriter(result)
var err error = nil
up := ws.Upgrader{
OnRequest: w.OnRequest,
}
_, err = up.Upgrade(readWrite{tmpReader, tempWriter})
skipN := oldLen - tmpReader.Len()
if err != nil {
if errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) { //数据不完整
return
}
buf.Next(skipN)
if w.logger != nil {
w.logger.Errorf("ws upgrade error", err.Error())
}
action = gnet.Close
return
}
buf.Next(skipN)
if w.logger != nil {
w.logger.Infof("ws upgrade success conn upgrade websocket protocol!")
}
_ = tempWriter.Flush()
data = result.Bytes()
ok = true
w.isUpgrade = true
return
}
func (w *WSConn) readWsMessages() (messages []wsutil.Message, err error) {
in := &w.buf
//messages, err = wsutil.ReadClientMessage(in, messages)
//return
for {
if w.curHeader == nil {
if in.Len() < ws.MinHeaderSize { //头长度至少是2
return
}
var head ws.Header
//有可能不完整,构建新的 reader 读取 head 读取成功才实际对 in 进行读操作
tmpReader := bytes.NewReader(in.Bytes())
oldLen := tmpReader.Len()
head, err = ws.ReadHeader(tmpReader)
skipN := oldLen - tmpReader.Len()
if err != nil {
if errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) { //数据不完整
return messages, nil
}
in.Next(skipN)
return nil, err
}
_, err = io.CopyN(&w.cachedBuf, in, int64(skipN))
if err != nil {
return
}
//in.Next(skipN)
w.curHeader = &head
//err = ws.WriteHeader(&msgBuf.cachedBuf, head)
//if err != nil {
// return nil, err
//}
}
dataLen := (int)(w.curHeader.Length)
if dataLen > 0 {
if in.Len() >= dataLen {
_, err = io.CopyN(&w.cachedBuf, in, int64(dataLen))
if err != nil {
return
}
} else { //数据不完整
if w.logger != nil {
w.logger.Debugf("ws read ws message incomplete data", in.Len(), dataLen)
}
return
}
}
if w.curHeader.Fin { //当前 header 已经是一个完整消息
messages, err = wsutil.ReadClientMessage(&w.cachedBuf, messages)
if err != nil {
return nil, err
}
w.cachedBuf.Reset()
}
w.curHeader = nil
}
}
func (w *WSConn) OnRequest(u []byte) error {
parsedURL, err := url.Parse(string(u))
if err != nil {
return err
}
w.SetParam("query", parsedURL.Query())
return nil
}
func (w *WSConn) GetParam(key string) interface{} {
return w.param[key]
}
func (w *WSConn) SetParam(key string, values interface{}) {
w.param[key] = values
}
func (w *WSConn) Write(data []byte) error {
if w.isClose {
return errors.New("connection has close")
}
return w.write(data, ws.OpBinary)
}
func (w *WSConn) Close() (err error) {
defer func(Conn gnet.Conn) {
err = Conn.Close()
}(w.Conn)
return w.write(make([]byte, 0), ws.OpClose)
}
func (w *WSConn) write(data []byte, opCode ws.OpCode) error {
buf := bytes.Buffer{}
err := wsutil.WriteServerMessage(&buf, opCode, data)
if err != nil {
return err
}
return w.Conn.AsyncWrite(buf.Bytes(), nil)
}
//func (w *WSConn) Pong(data []byte) (err error) {
// buf := bytes.Buffer{}
// if data == nil {
// err = wsutil.WriteServerMessage(&buf, ws.OpPong, emptyPayload)
// } else {
// err = wsutil.WriteServerMessage(&buf, ws.OpPong, data)
// }
// if w.isClose {
// return errors.New("connection has close")
// }
// if err != nil {
// return
// }
// return w.Conn.AsyncWrite(buf.Bytes(), nil)
//}
//func (w *WSConn) Ping(data []byte) (err error) {
// buf := bytes.Buffer{}
// if data == nil {
// err = wsutil.WriteServerMessage(&buf, ws.OpPing, emptyPayload)
// } else {
// err = wsutil.WriteServerMessage(&buf, ws.OpPing, data)
// }
// if w.isClose {
// return errors.New("connection has close")
// }
// if err != nil {
// return err
// }
//
// return w.Conn.AsyncWrite(buf.Bytes(), nil)
//}
//func (w *WSConn) GetProperty(key string) (interface{}, error) {
// if w.context[key] == nil {
// return nil, errors.New("not found this key")
// }
// return w.context[key], nil
//}
//
//func (w *WSConn) SetProperty(key string, ctx interface{}) {
// w.context[key] = ctx
//}
//
//func (w *WSConn) RemoveProperty(key string) {
// delete(w.context, key)
//}
//
//func (w *WSConn) GetConnID() uint64 {
// return w.connID
//}
//
//func (w *WSConn) Clear() {
// w.context = make(map[string]interface{})
//}
//
//func (w *WSConn) GetUrlParam() map[string][]string {
// return w.urlParma
//}
//
//func (w *WSConn) SetUrlParam(key string, values []string) {
// w.urlParma[key] = values
//}