Ma/origin
1
0
Fork 0
mirror of https://github.com/duanhf2012/origin.git synced 2026-02-04 06:54:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

调整websocket服务回调

Browse Source
This commit is contained in:
boyce
2019-02-14 16:48:30 +08:00
parent b4c81b4889
commit 6945fc8532
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
network/websocketserver.go
View File

@@ -17,9 +17,10 @@ type IWebsocketServer interface {
} }
type IMessageReceiver interface { type IMessageReceiver interface {
OnConnected(webServer IWebsocketServer, clientid uint64) OnListen(webServer IWebsocketServer)
OnDisconnect(webServer IWebsocketServer, clientid uint64, err error) OnConnected(clientid uint64)
OnRecvMsg(webServer IWebsocketServer, clientid uint64, msgtype int, data []byte) OnDisconnect(clientid uint64, err error)
OnRecvMsg(clientid uint64, msgtype int, data []byte)
} }
type WSClient struct { type WSClient struct {
@@ -56,7 +57,8 @@ func (slf *WebsocketServer) wsHandler(w http.ResponseWriter, r *http.Request) {
slf.maxClientid++ slf.maxClientid++
pclient := &WSClient{slf.maxClientid, conn, make(chan WSMessage, 1024)} pclient := &WSClient{slf.maxClientid, conn, make(chan WSMessage, 1024)}
slf.mapClient[pclient.clientid] = pclient slf.mapClient[pclient.clientid] = pclient
slf.messageReciver.OnConnected(slf, pclient.clientid)
slf.messageReciver.OnConnected(pclient.clientid)
go pclient.startSendMsg() go pclient.startSendMsg()
go slf.OnConnected(pclient) go slf.OnConnected(pclient)
} }
@@ -69,11 +71,11 @@ func (slf *WebsocketServer) OnConnected(pclient *WSClient) {
slf.locker.Lock() slf.locker.Lock()
defer slf.locker.Unlock() defer slf.locker.Unlock()
delete(slf.mapClient, pclient.clientid) delete(slf.mapClient, pclient.clientid)
slf.messageReciver.OnDisconnect(slf, pclient.clientid, err) slf.messageReciver.OnDisconnect(pclient.clientid, err)
return return
} }
slf.messageReciver.OnRecvMsg(slf, pclient.clientid, msgtype, message) slf.messageReciver.OnRecvMsg(pclient.clientid, msgtype, message)
} }
} }
@@ -99,11 +101,13 @@ func (slf *WebsocketServer) startListen() {
MaxHeaderBytes: 1 << 20, MaxHeaderBytes: 1 << 20,
} }
slf.messageReciver.OnListen(slf)
err := slf.httpserver.ListenAndServe() err := slf.httpserver.ListenAndServe()
if err != nil { if err != nil {
fmt.Printf("http.ListenAndServe(%d, nil) error\n", slf.port) fmt.Printf("http.ListenAndServe(%d, nil) error\n", slf.port)
os.Exit(1) os.Exit(1)
} }
} }
func (slf *WSClient) startSendMsg() { func (slf *WSClient) startSendMsg() {