admin/bl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

```

Browse Source 
feat(middleware): 添加WebSocket服务端处理器

添加了WebSocket服务端处理器，支持WebSocket连接的升级和处理，
包括授权验证功能的实现

fix(fight): 修复NPC战斗逻辑中的问题

移除了NPC回合结束时的调试输出，优化了NPC技能选择逻辑，
确保只选择可使用的技能，并添加了NPC动作执行
This commit is contained in:
昔念
2026-01-07 02:30:21 +08:00
parent f5eb445aa0
commit 3c5b9a4ce8
7 changed files with 183 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
modules/base/middleware/middleware.go
View File

@@ -84,4 +84,43 @@ func init() {
go socket.ReadLoop()
})
g.Server().BindHandler("/server/*", func(r *ghttp.Request) {
tt := new(ServerHandler)
upgrader := gws.NewUpgrader(tt, &gws.ServerOption{
Authorize: func(rt *http.Request, session gws.SessionStorage) bool {
//r.s\\\
// r.Get("t")
// admin := cool.GetAdmin(rt.Context())
// if admin.UserId != 10001 {
// return false
// }
// var name = r.URL.Query().Get("name")
// if name == "" {
// return false
// }
// t, _ := service.NewBaseSysUserService().Person(admin.UserID)
//Loger.Debug(context.TODO(), t.Mimi)
// session.Store("name", t.Mimi)
//session.Store("key", r.Header.Get("Sec-WebSocket-Key"))
return true
},
})
socket, err := upgrader.Upgrade(r.Response.Writer, r.Request)
if err != nil {
fmt.Println(err)
return
}
// ants.Submit(func() {
// socket.ReadLoop()
// })
// ants.Submit(func() { socket.ReadLoop() })
go socket.ReadLoop()
})
}

97
modules/base/middleware/server.go Normal file
View File

@@ -0,0 +1,97 @@
package middleware
import (
"context"
"encoding/json"
"net"
"time"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/glog"
"github.com/gogf/gf/v2/util/gconv"
"github.com/lxzan/gws"
)
type ServerHandler struct {
gws.BuiltinEventHandler
port int
target net.Conn
}
func (c *ServerHandler) OnOpen(socket *gws.Conn) {
// target, err := net.Dial("tcp", "127.0.0.1:"+gconv.String(c.port))
// if err != nil {
// glog.Debug(context.Background(), "连接失败")
// }
// c.target = target
// //errChan := make(chan error, 2)
// if c.target == nil {
// return
// }
// go func(conn net.Conn, socket *gws.Conn) {
// reader := bufio.NewReader(conn)
// LOOP:
// for {
// // select {
// // default:
// packlen, err := reader.Peek(4)
// if err != nil {
// socket.WriteClose(1000, nil)
// break LOOP
// }
// length := int32(binary.BigEndian.Uint32(packlen))
// data := make([]byte, length)
// io.ReadFull(reader, data)
// //pack_Ver := data[4] //因为包体已经解析，所以这里直接取0
// // var pack = make([]byte, length)
// socket.WriteMessage(gws.OpcodeBinary, data)
// //t.event.RecvServerHandler(pack)
// // client.OnReceiveBase(client, pack, length)
// }
// }(c.target, socket)
// //err = <-errChan
// if err != io.EOF {
// log.Println("proxy error:", err)
// }
}
func (c *ServerHandler) OnPing(socket *gws.Conn, payload []byte) {
_ = socket.SetDeadline(time.Now().Add(2 * PingInterval))
_ = socket.WritePong(nil)
}
func (c *ServerHandler) OnPong(socket *gws.Conn, payload []byte) {}
func (c *ServerHandler) OnMessage(socket *gws.Conn, gwsmessage *gws.Message) {
//socket.WriteMessage(gwsmessage.Opcode, gwsmessage.Bytes())
for i := 0; i < 4; i++ {
jsondata := g.Map{"type": 1, "message": "hel " + gconv.String(i)}
json, _ := json.Marshal(jsondata)
socket.WriteMessage(gwsmessage.Opcode, json)
}
jsondata := g.Map{"type": 0, "message": "hel"}
json, _ := json.Marshal(jsondata)
socket.WriteMessage(gwsmessage.Opcode, json)
//fmt.Println(gwsmessage.Bytes())
}
func (c *ServerHandler) OnClose(socket *gws.Conn, err error) {
glog.Debug(context.Background(), "断开连接")
if c.target != nil {
c.target.Close()
}
}

73
modules/base/middleware/websocket.go
View File

@@ -1,16 +1,11 @@
package middleware
import (
"bufio"
"context"
"encoding/binary"
"io"
"log"
"net"
"time"
"github.com/gogf/gf/v2/os/glog"
"github.com/gogf/gf/v2/util/gconv"
"github.com/lxzan/gws"
)
@@ -23,49 +18,49 @@ type Handler struct {
}
func (c *Handler) OnOpen(socket *gws.Conn) {
target, err := net.Dial("tcp", "127.0.0.1:"+gconv.String(c.port))
// target, err := net.Dial("tcp", "127.0.0.1:"+gconv.String(c.port))
if err != nil {
glog.Debug(context.Background(), "连接失败")
}
c.target = target
//errChan := make(chan error, 2)
if c.target == nil {
return
}
go func(conn net.Conn, socket *gws.Conn) {
reader := bufio.NewReader(conn)
LOOP:
for {
// if err != nil {
// glog.Debug(context.Background(), "连接失败")
// }
// c.target = target
// //errChan := make(chan error, 2)
// if c.target == nil {
// return
// }
// go func(conn net.Conn, socket *gws.Conn) {
// reader := bufio.NewReader(conn)
// LOOP:
// for {
// select {
// default:
packlen, err := reader.Peek(4)
// // select {
// // default:
// packlen, err := reader.Peek(4)
if err != nil {
socket.WriteClose(1000, nil)
break LOOP
}
// if err != nil {
// socket.WriteClose(1000, nil)
// break LOOP
// }
length := int32(binary.BigEndian.Uint32(packlen))
// length := int32(binary.BigEndian.Uint32(packlen))
data := make([]byte, length)
io.ReadFull(reader, data)
// data := make([]byte, length)
// io.ReadFull(reader, data)
//pack_Ver := data[4] //因为包体已经解析，所以这里直接取0
// var pack = make([]byte, length)
// //pack_Ver := data[4] //因为包体已经解析，所以这里直接取0
// // var pack = make([]byte, length)
socket.WriteMessage(gws.OpcodeBinary, data)
//t.event.RecvHandler(pack)
// client.OnReceiveBase(client, pack, length)
// socket.WriteMessage(gws.OpcodeBinary, data)
// //t.event.RecvHandler(pack)
// // client.OnReceiveBase(client, pack, length)
}
}(c.target, socket)
//err = <-errChan
if err != io.EOF {
log.Println("proxy error:", err)
// }
// }(c.target, socket)
// //err = <-errChan
// if err != io.EOF {
// log.Println("proxy error:", err)
}
// }
}
func (c *Handler) OnPing(socket *gws.Conn, payload []byte) {