连接接收数据包事件名称修改

This commit is contained in:
kercylan98 2023-04-19 18:12:55 +08:00
parent 481ccc182a
commit b0117a11ad
2 changed files with 12 additions and 12 deletions

View File

@ -5,15 +5,15 @@ import (
"minotaur/utils/log"
)
type ReceivePacketEventHandle func(conn *Conn, packet []byte)
type ConnectionReceivePacketEventHandle func(conn *Conn, packet []byte)
type ConnectionOpenedEventHandle func(conn *Conn)
type ConnectionClosedEventHandle func(conn *Conn)
type event struct {
*Server
receivePacketEventHandles []ReceivePacketEventHandle
connectionOpenedEventHandles []ConnectionOpenedEventHandle
connectionClosedEventHandles []ConnectionClosedEventHandle
connectionReceivePacketEventHandles []ConnectionReceivePacketEventHandle
connectionOpenedEventHandles []ConnectionOpenedEventHandle
connectionClosedEventHandles []ConnectionClosedEventHandle
}
// RegConnectionClosedEvent 在连接关闭后将立刻执行被注册的事件处理函数
@ -44,22 +44,22 @@ func (slf *event) OnConnectionOpenedEvent(conn *Conn) {
}
}
// RegReceivePacketEvent 在接收到数据包时将立刻执行被注册的事件处理函数
func (slf *event) RegReceivePacketEvent(handle ReceivePacketEventHandle) {
// RegConnectionReceivePacketEvent 在接收到数据包时将立刻执行被注册的事件处理函数
func (slf *event) RegConnectionReceivePacketEvent(handle ConnectionReceivePacketEventHandle) {
if slf.network == NetworkHttp {
panic(ErrNetworkIncompatibleHttp)
}
slf.receivePacketEventHandles = append(slf.receivePacketEventHandles, handle)
slf.connectionReceivePacketEventHandles = append(slf.connectionReceivePacketEventHandles, handle)
}
func (slf *event) OnReceivePacketEvent(conn *Conn, packet []byte) {
for _, handle := range slf.receivePacketEventHandles {
func (slf *event) OnConnectionReceivePacketEvent(conn *Conn, packet []byte) {
for _, handle := range slf.connectionReceivePacketEventHandles {
handle(conn, packet)
}
}
func (slf *event) check() {
if len(slf.receivePacketEventHandles) == 0 {
log.Warn("Server", zap.String("ReceivePacketEvent", "Invalid server, no packets processed"))
if len(slf.connectionReceivePacketEventHandles) == 0 {
log.Warn("Server", zap.String("ConnectionReceivePacketEvent", "Invalid server, no packets processed"))
}
}

View File

@ -186,7 +186,7 @@ func (slf *Server) dispatchMessage(msg *message) {
switch msg.t {
case MessageTypePacket:
conn, packet := msg.t.deconstructPacket(msg.attrs...)
slf.OnReceivePacketEvent(conn, packet)
slf.OnConnectionReceivePacketEvent(conn, packet)
case MessageTypeError:
err, action := msg.t.deconstructError(msg.attrs...)
switch action {