From d0122a97711f0b10b99a6ec07a67f8a47da1886b Mon Sep 17 00:00:00 2001 From: starainrt Date: Sun, 10 Mar 2024 14:04:48 +0800 Subject: [PATCH] update go.mod & update que.go --- go.mod | 2 +- go.sum | 52 +++++++++++++++++---- que.go | 144 ++++++++++++++++++++++++++++++--------------------------- 3 files changed, 120 insertions(+), 78 deletions(-) diff --git a/go.mod b/go.mod index 8737364..b75fccc 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module b612.me/starnet go 1.16 -require b612.me/stario v0.0.8 +require b612.me/stario v0.0.9 diff --git a/go.sum b/go.sum index f14630c..631e800 100644 --- a/go.sum +++ b/go.sum @@ -1,13 +1,47 @@ -b612.me/stario v0.0.8 h1:kaA4pszAKLZJm2D9JmiuYSpgjTeE3VaO74vm+H0vBGM= -b612.me/stario v0.0.8/go.mod h1:or4ssWcxQSjMeu+hRKEgtp0X517b3zdlEOAms8Qscvw= -golang.org/x/crypto v0.0.0-20220313003712-b769efc7c000 h1:SL+8VVnkqyshUSz5iNnXtrBQzvFF2SkROm6t5RczFAE= -golang.org/x/crypto v0.0.0-20220313003712-b769efc7c000/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +b612.me/stario v0.0.9 h1:bFDlejUJMwZ12a09snZJspQsOlkqpDAl9qKPEYOGWCk= +b612.me/stario v0.0.9/go.mod h1:x4D/x8zA5SC0pj/uJAi4FyG5p4j5UZoMEZfvuRR6VNw= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/que.go b/que.go index 95d2193..efacadb 100644 --- a/que.go +++ b/que.go @@ -5,11 +5,14 @@ import ( "context" "encoding/binary" "errors" + "fmt" "os" "sync" "time" ) +var ErrDeadlineExceeded error = errors.New("deadline exceeded") + // 识别头 var header = []byte{11, 27, 19, 96, 12, 25, 02, 20} @@ -22,13 +25,13 @@ type MsgQueue struct { // StarQueue 为流数据中的消息队列分发 type StarQueue struct { + maxLength uint32 count int64 Encode bool - Reserve uint16 - Msgid uint16 - MsgPool chan MsgQueue - UnFinMsg sync.Map - LastID int //= -1 + msgID uint16 + msgPool chan MsgQueue + unFinMsg sync.Map + lastID int //= -1 ctx context.Context cancel context.CancelFunc duration time.Duration @@ -37,21 +40,22 @@ type StarQueue struct { //restoreMu sync.Mutex } -func NewQueueCtx(ctx context.Context, count int64) *StarQueue { - var que StarQueue - que.Encode = false - que.count = count - que.MsgPool = make(chan MsgQueue, count) +func NewQueueCtx(ctx context.Context, count int64, maxMsgLength uint32) *StarQueue { + var q StarQueue + q.Encode = false + q.count = count + q.maxLength = maxMsgLength + q.msgPool = make(chan MsgQueue, count) if ctx == nil { - que.ctx, que.cancel = context.WithCancel(context.Background()) + q.ctx, q.cancel = context.WithCancel(context.Background()) } else { - que.ctx, que.cancel = context.WithCancel(ctx) + q.ctx, q.cancel = context.WithCancel(ctx) } - que.duration = 0 - return &que + q.duration = 0 + return &q } func NewQueueWithCount(count int64) *StarQueue { - return NewQueueCtx(nil, count) + return NewQueueCtx(nil, count, 0) } // NewQueue 建立一个新消息队列 @@ -94,27 +98,27 @@ func ByteToUint16(src []byte) uint16 { } // BuildMessage 生成编码后的信息用于发送 -func (que *StarQueue) BuildMessage(src []byte) []byte { +func (q *StarQueue) BuildMessage(src []byte) []byte { var buff bytes.Buffer - que.Msgid++ - if que.Encode { - src = que.EncodeFunc(src) + q.msgID++ + if q.Encode { + src = q.EncodeFunc(src) } length := uint32(len(src)) buff.Write(header) buff.Write(Uint32ToByte(length)) - buff.Write(Uint16ToByte(que.Msgid)) + buff.Write(Uint16ToByte(q.msgID)) buff.Write(src) return buff.Bytes() } // BuildHeader 生成编码后的Header用于发送 -func (que *StarQueue) BuildHeader(length uint32) []byte { +func (q *StarQueue) BuildHeader(length uint32) []byte { var buff bytes.Buffer - que.Msgid++ + q.msgID++ buff.Write(header) buff.Write(Uint32ToByte(length)) - buff.Write(Uint16ToByte(que.Msgid)) + buff.Write(Uint16ToByte(q.msgID)) return buff.Bytes() } @@ -126,18 +130,18 @@ type unFinMsg struct { RecvMsg []byte } -func (que *StarQueue) push2list(msg MsgQueue) { - que.MsgPool <- msg +func (q *StarQueue) push2list(msg MsgQueue) { + q.msgPool <- msg } // ParseMessage 用于解析收到的msg信息 -func (que *StarQueue) ParseMessage(msg []byte, conn interface{}) error { - return que.parseMessage(msg, conn) +func (q *StarQueue) ParseMessage(msg []byte, conn interface{}) error { + return q.parseMessage(msg, conn) } // parseMessage 用于解析收到的msg信息 -func (que *StarQueue) parseMessage(msg []byte, conn interface{}) error { - tmp, ok := que.UnFinMsg.Load(conn) +func (q *StarQueue) parseMessage(msg []byte, conn interface{}) error { + tmp, ok := q.unFinMsg.Load(conn) if ok { //存在未完成的信息 lastMsg := tmp.(*unFinMsg) headerLen := len(lastMsg.HeaderMsg) @@ -146,7 +150,7 @@ func (que *StarQueue) parseMessage(msg []byte, conn interface{}) error { if len(msg) < 14-headerLen { //加入header头并退出 lastMsg.HeaderMsg = bytesMerge(lastMsg.HeaderMsg, msg) - que.UnFinMsg.Store(conn, lastMsg) + q.unFinMsg.Store(conn, lastMsg) return nil } //获取14字节完整的header @@ -155,28 +159,32 @@ func (que *StarQueue) parseMessage(msg []byte, conn interface{}) error { //检查收到的header是否为认证header //若不是，丢弃并重新来过 if !checkHeader(lastMsg.HeaderMsg[0:8]) { - que.UnFinMsg.Delete(conn) + q.unFinMsg.Delete(conn) if len(msg) == 0 { return nil } - return que.parseMessage(msg, conn) + return q.parseMessage(msg, conn) } //获得本数据包长度 lastMsg.LengthRecv = ByteToUint32(lastMsg.HeaderMsg[8:12]) + if q.maxLength != 0 && lastMsg.LengthRecv > q.maxLength { + q.unFinMsg.Delete(conn) + return fmt.Errorf("msg length is %d ,too large than %d", lastMsg.LengthRecv, q.maxLength) + } //获得本数据包ID lastMsg.ID = ByteToUint16(lastMsg.HeaderMsg[12:14]) //存入列表 - que.UnFinMsg.Store(conn, lastMsg) + q.unFinMsg.Store(conn, lastMsg) msg = msg[14-headerLen:] if uint32(len(msg)) < lastMsg.LengthRecv { lastMsg.RecvMsg = msg - que.UnFinMsg.Store(conn, lastMsg) + q.unFinMsg.Store(conn, lastMsg) return nil } if uint32(len(msg)) >= lastMsg.LengthRecv { lastMsg.RecvMsg = msg[0:lastMsg.LengthRecv] - if que.Encode { - lastMsg.RecvMsg = que.DecodeFunc(lastMsg.RecvMsg) + if q.Encode { + lastMsg.RecvMsg = q.DecodeFunc(lastMsg.RecvMsg) } msg = msg[lastMsg.LengthRecv:] storeMsg := MsgQueue{ @@ -184,38 +192,38 @@ func (que *StarQueue) parseMessage(msg []byte, conn interface{}) error { Msg: lastMsg.RecvMsg, Conn: conn, } - //que.restoreMu.Lock() - que.push2list(storeMsg) - //que.restoreMu.Unlock() - que.UnFinMsg.Delete(conn) - return que.parseMessage(msg, conn) + //q.restoreMu.Lock() + q.push2list(storeMsg) + //q.restoreMu.Unlock() + q.unFinMsg.Delete(conn) + return q.parseMessage(msg, conn) } } else { lastID := int(lastMsg.LengthRecv) - len(lastMsg.RecvMsg) if lastID < 0 { - que.UnFinMsg.Delete(conn) - return que.parseMessage(msg, conn) + q.unFinMsg.Delete(conn) + return q.parseMessage(msg, conn) } if len(msg) >= lastID { lastMsg.RecvMsg = bytesMerge(lastMsg.RecvMsg, msg[0:lastID]) - if que.Encode { - lastMsg.RecvMsg = que.DecodeFunc(lastMsg.RecvMsg) + if q.Encode { + lastMsg.RecvMsg = q.DecodeFunc(lastMsg.RecvMsg) } storeMsg := MsgQueue{ ID: lastMsg.ID, Msg: lastMsg.RecvMsg, Conn: conn, } - que.push2list(storeMsg) - que.UnFinMsg.Delete(conn) + q.push2list(storeMsg) + q.unFinMsg.Delete(conn) if len(msg) == lastID { return nil } msg = msg[lastID:] - return que.parseMessage(msg, conn) + return q.parseMessage(msg, conn) } lastMsg.RecvMsg = bytesMerge(lastMsg.RecvMsg, msg) - que.UnFinMsg.Store(conn, lastMsg) + q.unFinMsg.Store(conn, lastMsg) return nil } } @@ -228,8 +236,8 @@ func (que *StarQueue) parseMessage(msg []byte, conn interface{}) error { } msg = msg[start:] lastMsg := unFinMsg{} - que.UnFinMsg.Store(conn, &lastMsg) - return que.parseMessage(msg, conn) + q.unFinMsg.Store(conn, &lastMsg) + return q.parseMessage(msg, conn) } func checkHeader(msg []byte) bool { @@ -275,19 +283,19 @@ func bytesMerge(src ...[]byte) []byte { } // Restore 获取收到的信息 -func (que *StarQueue) Restore() (MsgQueue, error) { - if que.duration.Seconds() == 0 { - que.duration = 86400 * time.Second +func (q *StarQueue) Restore() (MsgQueue, error) { + if q.duration.Seconds() == 0 { + q.duration = 86400 * time.Second } for { select { - case <-que.ctx.Done(): + case <-q.ctx.Done(): return MsgQueue{}, errors.New("Stoped By External Function Call") - case <-time.After(que.duration): - if que.duration != 0 { - return MsgQueue{}, os.ErrDeadlineExceeded + case <-time.After(q.duration): + if q.duration != 0 { + return MsgQueue{}, ErrDeadlineExceeded } - case data, ok := <-que.MsgPool: + case data, ok := <-q.msgPool: if !ok { return MsgQueue{}, os.ErrClosed } @@ -297,21 +305,21 @@ func (que *StarQueue) Restore() (MsgQueue, error) { } // RestoreOne 获取收到的一个信息 -//兼容性修改 -func (que *StarQueue) RestoreOne() (MsgQueue, error) { - return que.Restore() +// 兼容性修改 +func (q *StarQueue) RestoreOne() (MsgQueue, error) { + return q.Restore() } // Stop 立即停止Restore -func (que *StarQueue) Stop() { - que.cancel() +func (q *StarQueue) Stop() { + q.cancel() } // RestoreDuration Restore最大超时时间 -func (que *StarQueue) RestoreDuration(tm time.Duration) { - que.duration = tm +func (q *StarQueue) RestoreDuration(tm time.Duration) { + q.duration = tm } -func (que *StarQueue) RestoreChan() <-chan MsgQueue { - return que.MsgPool +func (q *StarQueue) RestoreChan() <-chan MsgQueue { + return q.msgPool }