wshandler도 session.Consumer로 교체
This commit is contained in:
@ -19,6 +19,7 @@ import (
|
||||
"repositories.action2quare.com/ayo/gocommon"
|
||||
"repositories.action2quare.com/ayo/gocommon/flagx"
|
||||
"repositories.action2quare.com/ayo/gocommon/logger"
|
||||
"repositories.action2quare.com/ayo/gocommon/session"
|
||||
|
||||
"github.com/go-redis/redis/v8"
|
||||
"github.com/gorilla/websocket"
|
||||
@ -94,7 +95,6 @@ const (
|
||||
)
|
||||
|
||||
type Sender struct {
|
||||
Region string
|
||||
Accid primitive.ObjectID
|
||||
Alias string
|
||||
disconnectedCallbacks map[string]func()
|
||||
@ -118,8 +118,8 @@ func (s *Sender) PopDisconnectedCallback(name string) func() {
|
||||
|
||||
type EventReceiver interface {
|
||||
OnClientMessageReceived(sender *Sender, messageType WebSocketMessageType, body io.Reader)
|
||||
OnRoomCreated(region, name string)
|
||||
OnRoomDestroyed(region, name string)
|
||||
OnRoomCreated(name string)
|
||||
OnRoomDestroyed(name string)
|
||||
}
|
||||
|
||||
type send_msg_queue_elem struct {
|
||||
@ -128,7 +128,7 @@ type send_msg_queue_elem struct {
|
||||
msg []byte
|
||||
}
|
||||
|
||||
type subhandler struct {
|
||||
type WebsocketHandler struct {
|
||||
redisMsgChanName string
|
||||
redisCmdChanName string
|
||||
redisSync *redis.Client
|
||||
@ -138,17 +138,12 @@ type subhandler struct {
|
||||
sendMsgChan chan send_msg_queue_elem
|
||||
callReceiver EventReceiver
|
||||
connWaitGroup sync.WaitGroup
|
||||
region string
|
||||
receiverChain []EventReceiver
|
||||
}
|
||||
|
||||
// WebsocketHandler :
|
||||
type WebsocketHandler struct {
|
||||
subhandlers map[string]*subhandler
|
||||
sessionConsumer session.Consumer
|
||||
}
|
||||
|
||||
type wsConfig struct {
|
||||
gocommon.RegionStorageConfig
|
||||
gocommon.StorageAddr
|
||||
Maingate string `json:"maingate_service_url"`
|
||||
}
|
||||
|
||||
@ -165,62 +160,51 @@ func init() {
|
||||
gob.Register([]any{})
|
||||
}
|
||||
|
||||
func NewWebsocketHandler() (*WebsocketHandler, error) {
|
||||
subhandlers := make(map[string]*subhandler)
|
||||
for region, cfg := range config.RegionStorage {
|
||||
redisSync, err := gocommon.NewRedisClient(cfg.Redis["wshandler"])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
sendchan := make(chan send_msg_queue_elem, 1000)
|
||||
go func() {
|
||||
sender := func(elem *send_msg_queue_elem) {
|
||||
defer func() {
|
||||
r := recover()
|
||||
if r != nil {
|
||||
logger.Println(r)
|
||||
}
|
||||
}()
|
||||
elem.to.WriteMessage(elem.mt, elem.msg)
|
||||
}
|
||||
|
||||
for elem := range sendchan {
|
||||
sender(&elem)
|
||||
}
|
||||
}()
|
||||
|
||||
sh := &subhandler{
|
||||
redisMsgChanName: fmt.Sprintf("_wsh_msg_%s_%d", region, redisSync.Options().DB),
|
||||
redisCmdChanName: fmt.Sprintf("_wsh_cmd_%s_%d", region, redisSync.Options().DB),
|
||||
redisSync: redisSync,
|
||||
connInOutChan: make(chan *wsconn),
|
||||
deliveryChan: make(chan any, 1000),
|
||||
localDeliveryChan: make(chan any, 100),
|
||||
sendMsgChan: sendchan,
|
||||
region: region,
|
||||
}
|
||||
|
||||
subhandlers[region] = sh
|
||||
func NewWebsocketHandler(consumer session.Consumer) (*WebsocketHandler, error) {
|
||||
redisSync, err := gocommon.NewRedisClient(config.Redis["wshandler"])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
sendchan := make(chan send_msg_queue_elem, 1000)
|
||||
go func() {
|
||||
sender := func(elem *send_msg_queue_elem) {
|
||||
defer func() {
|
||||
r := recover()
|
||||
if r != nil {
|
||||
logger.Println(r)
|
||||
}
|
||||
}()
|
||||
elem.to.WriteMessage(elem.mt, elem.msg)
|
||||
}
|
||||
|
||||
for elem := range sendchan {
|
||||
sender(&elem)
|
||||
}
|
||||
}()
|
||||
|
||||
return &WebsocketHandler{
|
||||
subhandlers: subhandlers,
|
||||
redisMsgChanName: fmt.Sprintf("_wsh_msg_%d", redisSync.Options().DB),
|
||||
redisCmdChanName: fmt.Sprintf("_wsh_cmd_%d", redisSync.Options().DB),
|
||||
redisSync: redisSync,
|
||||
connInOutChan: make(chan *wsconn),
|
||||
deliveryChan: make(chan any, 1000),
|
||||
localDeliveryChan: make(chan any, 100),
|
||||
sendMsgChan: sendchan,
|
||||
sessionConsumer: consumer,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (ws *WebsocketHandler) RegisterReceiver(region string, receiver EventReceiver) {
|
||||
if sh := ws.subhandlers[region]; sh != nil {
|
||||
sh.receiverChain = append(sh.receiverChain, receiver)
|
||||
}
|
||||
func (ws *WebsocketHandler) RegisterReceiver(receiver EventReceiver) {
|
||||
ws.receiverChain = append(ws.receiverChain, receiver)
|
||||
}
|
||||
|
||||
type nilReceiver struct{}
|
||||
|
||||
func (r *nilReceiver) OnClientMessageReceived(sender *Sender, messageType WebSocketMessageType, body io.Reader) {
|
||||
}
|
||||
func (r *nilReceiver) OnRoomCreated(region, name string) {}
|
||||
func (r *nilReceiver) OnRoomDestroyed(region, name string) {}
|
||||
func (r *nilReceiver) OnRoomCreated(name string) {}
|
||||
func (r *nilReceiver) OnRoomDestroyed(name string) {}
|
||||
|
||||
type chainReceiver struct {
|
||||
chain []EventReceiver
|
||||
@ -232,100 +216,77 @@ func (r *chainReceiver) OnClientMessageReceived(sender *Sender, messageType WebS
|
||||
}
|
||||
}
|
||||
|
||||
func (r *chainReceiver) OnRoomCreated(region, name string) {
|
||||
func (r *chainReceiver) OnRoomCreated(name string) {
|
||||
for _, cr := range r.chain {
|
||||
cr.OnRoomCreated(region, name)
|
||||
cr.OnRoomCreated(name)
|
||||
}
|
||||
}
|
||||
|
||||
func (r *chainReceiver) OnRoomDestroyed(region, name string) {
|
||||
func (r *chainReceiver) OnRoomDestroyed(name string) {
|
||||
for _, cr := range r.chain {
|
||||
cr.OnRoomDestroyed(region, name)
|
||||
cr.OnRoomDestroyed(name)
|
||||
}
|
||||
}
|
||||
|
||||
func (ws *WebsocketHandler) Start(ctx context.Context) {
|
||||
for _, sh := range ws.subhandlers {
|
||||
chain := sh.receiverChain
|
||||
if len(chain) == 0 {
|
||||
sh.callReceiver = &nilReceiver{}
|
||||
} else if len(chain) == 1 {
|
||||
sh.callReceiver = chain[0]
|
||||
} else {
|
||||
sh.callReceiver = &chainReceiver{chain: sh.receiverChain}
|
||||
}
|
||||
|
||||
sh.connWaitGroup.Add(1)
|
||||
go sh.mainLoop(ctx)
|
||||
chain := ws.receiverChain
|
||||
if len(chain) == 0 {
|
||||
ws.callReceiver = &nilReceiver{}
|
||||
} else if len(chain) == 1 {
|
||||
ws.callReceiver = chain[0]
|
||||
} else {
|
||||
ws.callReceiver = &chainReceiver{chain: ws.receiverChain}
|
||||
}
|
||||
|
||||
ws.connWaitGroup.Add(1)
|
||||
go ws.mainLoop(ctx)
|
||||
}
|
||||
|
||||
func (ws *WebsocketHandler) Cleanup() {
|
||||
for _, sh := range ws.subhandlers {
|
||||
sh.connWaitGroup.Wait()
|
||||
}
|
||||
ws.connWaitGroup.Wait()
|
||||
}
|
||||
|
||||
func (ws *WebsocketHandler) RegisterHandlers(serveMux *http.ServeMux, prefix string) error {
|
||||
for region, sh := range ws.subhandlers {
|
||||
if region == "default" {
|
||||
region = ""
|
||||
}
|
||||
url := gocommon.MakeHttpHandlerPattern(prefix, region, "ws")
|
||||
if *noAuthFlag {
|
||||
serveMux.HandleFunc(url, sh.upgrade_nosession)
|
||||
} else {
|
||||
serveMux.HandleFunc(url, sh.upgrade)
|
||||
}
|
||||
url := gocommon.MakeHttpHandlerPattern(prefix, "ws")
|
||||
if *noAuthFlag {
|
||||
serveMux.HandleFunc(url, ws.upgrade_nosession)
|
||||
} else {
|
||||
serveMux.HandleFunc(url, ws.upgrade)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ws *WebsocketHandler) GetState(region string, accid primitive.ObjectID) string {
|
||||
if sh := ws.subhandlers[region]; sh != nil {
|
||||
state, _ := sh.redisSync.Get(context.Background(), accid.Hex()).Result()
|
||||
return state
|
||||
}
|
||||
return ""
|
||||
func (ws *WebsocketHandler) GetState(accid primitive.ObjectID) string {
|
||||
state, _ := ws.redisSync.Get(context.Background(), accid.Hex()).Result()
|
||||
return state
|
||||
}
|
||||
|
||||
func (ws *WebsocketHandler) SetState(region string, accid primitive.ObjectID, state string) {
|
||||
if sh := ws.subhandlers[region]; sh != nil {
|
||||
sh.redisSync.SetArgs(context.Background(), accid.Hex(), state, redis.SetArgs{Mode: "XX"}).Result()
|
||||
func (ws *WebsocketHandler) SetState(accid primitive.ObjectID, state string) {
|
||||
ws.redisSync.SetArgs(context.Background(), accid.Hex(), state, redis.SetArgs{Mode: "XX"}).Result()
|
||||
}
|
||||
|
||||
func (ws *WebsocketHandler) SendUpstreamMessage(msg *UpstreamMessage) {
|
||||
ws.localDeliveryChan <- msg
|
||||
}
|
||||
|
||||
func (ws *WebsocketHandler) EnterRoom(room string, accid primitive.ObjectID) {
|
||||
ws.localDeliveryChan <- &commandMessage{
|
||||
Cmd: commandType_EnterRoom,
|
||||
Args: []any{room, accid},
|
||||
}
|
||||
}
|
||||
|
||||
func (ws *WebsocketHandler) SendUpstreamMessage(region string, msg *UpstreamMessage) {
|
||||
sh := ws.subhandlers[region]
|
||||
if sh != nil {
|
||||
sh.localDeliveryChan <- msg
|
||||
func (ws *WebsocketHandler) LeaveRoom(room string, accid primitive.ObjectID) {
|
||||
ws.localDeliveryChan <- &commandMessage{
|
||||
Cmd: commandType_LeaveRoom,
|
||||
Args: []any{room, accid},
|
||||
}
|
||||
}
|
||||
|
||||
func (ws *WebsocketHandler) EnterRoom(region string, room string, accid primitive.ObjectID) {
|
||||
sh := ws.subhandlers[region]
|
||||
if sh != nil {
|
||||
sh.localDeliveryChan <- &commandMessage{
|
||||
Cmd: commandType_EnterRoom,
|
||||
Args: []any{room, accid},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (ws *WebsocketHandler) LeaveRoom(region string, room string, accid primitive.ObjectID) {
|
||||
sh := ws.subhandlers[region]
|
||||
if sh != nil {
|
||||
sh.localDeliveryChan <- &commandMessage{
|
||||
Cmd: commandType_LeaveRoom,
|
||||
Args: []any{room, accid},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (sh *subhandler) mainLoop(ctx context.Context) {
|
||||
func (ws *WebsocketHandler) mainLoop(ctx context.Context) {
|
||||
defer func() {
|
||||
sh.connWaitGroup.Done()
|
||||
ws.connWaitGroup.Done()
|
||||
s := recover()
|
||||
if s != nil {
|
||||
logger.Error(s)
|
||||
@ -337,7 +298,7 @@ func (sh *subhandler) mainLoop(ctx context.Context) {
|
||||
var pubsub *redis.PubSub
|
||||
for {
|
||||
if pubsub == nil {
|
||||
pubsub = sh.redisSync.Subscribe(ctx, sh.redisMsgChanName, sh.redisCmdChanName)
|
||||
pubsub = ws.redisSync.Subscribe(ctx, ws.redisMsgChanName, ws.redisCmdChanName)
|
||||
}
|
||||
|
||||
raw, err := pubsub.ReceiveMessage(ctx)
|
||||
@ -345,17 +306,17 @@ func (sh *subhandler) mainLoop(ctx context.Context) {
|
||||
buffer := bytes.NewBuffer([]byte(raw.Payload))
|
||||
dec := gob.NewDecoder(buffer)
|
||||
|
||||
if raw.Channel == sh.redisMsgChanName {
|
||||
if raw.Channel == ws.redisMsgChanName {
|
||||
var msg UpstreamMessage
|
||||
if err := dec.Decode(&msg); err == nil {
|
||||
sh.deliveryChan <- &msg
|
||||
ws.deliveryChan <- &msg
|
||||
} else {
|
||||
logger.Println("decode UpstreamMessage failed :", err)
|
||||
}
|
||||
} else if raw.Channel == sh.redisCmdChanName {
|
||||
} else if raw.Channel == ws.redisCmdChanName {
|
||||
var cmd commandMessage
|
||||
if err := dec.Decode(&cmd); err == nil {
|
||||
sh.deliveryChan <- &cmd
|
||||
ws.deliveryChan <- &cmd
|
||||
} else {
|
||||
logger.Println("decode UpstreamMessage failed :", err)
|
||||
}
|
||||
@ -378,10 +339,10 @@ func (sh *subhandler) mainLoop(ctx context.Context) {
|
||||
findRoom := func(name string, create bool) *room {
|
||||
room := rooms[name]
|
||||
if room == nil && create {
|
||||
room = makeRoom(name, roomDestroyChan, sh.sendMsgChan)
|
||||
room = makeRoom(name, roomDestroyChan, ws.sendMsgChan)
|
||||
rooms[name] = room
|
||||
room.start(ctx)
|
||||
go sh.callReceiver.OnRoomCreated(sh.region, name)
|
||||
go ws.callReceiver.OnRoomCreated(name)
|
||||
}
|
||||
return room
|
||||
}
|
||||
@ -393,7 +354,7 @@ func (sh *subhandler) mainLoop(ctx context.Context) {
|
||||
roomnames = append(roomnames, room.name)
|
||||
}
|
||||
bt, _ := json.Marshal(roomnames)
|
||||
sh.callReceiver.OnClientMessageReceived(conn.sender, Disconnected, bytes.NewBuffer(bt))
|
||||
ws.callReceiver.OnClientMessageReceived(conn.sender, Disconnected, bytes.NewBuffer(bt))
|
||||
conn.Close()
|
||||
}
|
||||
}()
|
||||
@ -431,7 +392,7 @@ func (sh *subhandler) mainLoop(ctx context.Context) {
|
||||
Body: usermsg.Body,
|
||||
Tag: usermsg.Tag,
|
||||
})
|
||||
sh.sendMsgChan <- send_msg_queue_elem{
|
||||
ws.sendMsgChan <- send_msg_queue_elem{
|
||||
to: conn,
|
||||
mt: websocket.TextMessage,
|
||||
msg: ds,
|
||||
@ -489,9 +450,9 @@ func (sh *subhandler) mainLoop(ctx context.Context) {
|
||||
|
||||
case destroyedRoom := <-roomDestroyChan:
|
||||
delete(rooms, destroyedRoom)
|
||||
go sh.callReceiver.OnRoomDestroyed(sh.region, destroyedRoom)
|
||||
go ws.callReceiver.OnRoomDestroyed(destroyedRoom)
|
||||
|
||||
case usermsg := <-sh.localDeliveryChan:
|
||||
case usermsg := <-ws.localDeliveryChan:
|
||||
// 로컬에 connection이 있는지 먼저 확인해 보기 위한 채널
|
||||
// 없으면 publish한다.
|
||||
switch usermsg := usermsg.(type) {
|
||||
@ -501,7 +462,7 @@ func (sh *subhandler) mainLoop(ctx context.Context) {
|
||||
enc := gob.NewEncoder(buffer)
|
||||
var err error
|
||||
if err = enc.Encode(usermsg); err == nil {
|
||||
_, err = sh.redisSync.Publish(context.Background(), sh.redisMsgChanName, buffer.Bytes()).Result()
|
||||
_, err = ws.redisSync.Publish(context.Background(), ws.redisMsgChanName, buffer.Bytes()).Result()
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
@ -520,7 +481,7 @@ func (sh *subhandler) mainLoop(ctx context.Context) {
|
||||
var err error
|
||||
enc := gob.NewEncoder(buffer)
|
||||
if err = enc.Encode(usermsg); err == nil {
|
||||
_, err = sh.redisSync.Publish(context.Background(), sh.redisCmdChanName, buffer.Bytes()).Result()
|
||||
_, err = ws.redisSync.Publish(context.Background(), ws.redisCmdChanName, buffer.Bytes()).Result()
|
||||
}
|
||||
if err != nil {
|
||||
logger.Println("gob.Encode or Publish failed :", err)
|
||||
@ -528,7 +489,7 @@ func (sh *subhandler) mainLoop(ctx context.Context) {
|
||||
}
|
||||
}
|
||||
|
||||
case usermsg := <-sh.deliveryChan:
|
||||
case usermsg := <-ws.deliveryChan:
|
||||
switch usermsg := usermsg.(type) {
|
||||
case *UpstreamMessage:
|
||||
target := usermsg.Target
|
||||
@ -553,7 +514,7 @@ func (sh *subhandler) mainLoop(ctx context.Context) {
|
||||
logger.Println("usermsg is unknown type")
|
||||
}
|
||||
|
||||
case c := <-sh.connInOutChan:
|
||||
case c := <-ws.connInOutChan:
|
||||
if c.Conn == nil {
|
||||
delete(entireConns, c.sender.Accid.Hex())
|
||||
var roomnames []string
|
||||
@ -564,29 +525,28 @@ func (sh *subhandler) mainLoop(ctx context.Context) {
|
||||
c.joinedRooms = nil
|
||||
|
||||
bt, _ := json.Marshal(roomnames)
|
||||
go sh.callReceiver.OnClientMessageReceived(c.sender, Disconnected, bytes.NewBuffer(bt))
|
||||
go ws.callReceiver.OnClientMessageReceived(c.sender, Disconnected, bytes.NewBuffer(bt))
|
||||
} else {
|
||||
entireConns[c.sender.Accid.Hex()] = c
|
||||
go sh.callReceiver.OnClientMessageReceived(c.sender, Connected, nil)
|
||||
go ws.callReceiver.OnClientMessageReceived(c.sender, Connected, nil)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func upgrade_core(sh *subhandler, conn *websocket.Conn, accid primitive.ObjectID, alias string) {
|
||||
func upgrade_core(ws *WebsocketHandler, conn *websocket.Conn, accid primitive.ObjectID, alias string) {
|
||||
newconn := &wsconn{
|
||||
Conn: conn,
|
||||
sender: &Sender{
|
||||
Region: sh.region,
|
||||
Alias: alias,
|
||||
Accid: accid,
|
||||
Alias: alias,
|
||||
Accid: accid,
|
||||
},
|
||||
}
|
||||
sh.connInOutChan <- newconn
|
||||
ws.connInOutChan <- newconn
|
||||
|
||||
sh.connWaitGroup.Add(1)
|
||||
ws.connWaitGroup.Add(1)
|
||||
go func(c *wsconn, accid primitive.ObjectID, deliveryChan chan<- any) {
|
||||
sh.redisSync.Set(context.Background(), accid.Hex(), "online", 0)
|
||||
ws.redisSync.Set(context.Background(), accid.Hex(), "online", 0)
|
||||
for {
|
||||
messageType, r, err := c.NextReader()
|
||||
if err != nil {
|
||||
@ -600,9 +560,9 @@ func upgrade_core(sh *subhandler, conn *websocket.Conn, accid primitive.ObjectID
|
||||
|
||||
if messageType == websocket.TextMessage {
|
||||
// 유저가 직접 보낸 메시지
|
||||
sh.callReceiver.OnClientMessageReceived(c.sender, TextMessage, r)
|
||||
ws.callReceiver.OnClientMessageReceived(c.sender, TextMessage, r)
|
||||
} else if messageType == websocket.BinaryMessage {
|
||||
sh.callReceiver.OnClientMessageReceived(c.sender, BinaryMessage, r)
|
||||
ws.callReceiver.OnClientMessageReceived(c.sender, BinaryMessage, r)
|
||||
}
|
||||
}
|
||||
if c.sender.disconnectedCallbacks != nil {
|
||||
@ -611,15 +571,15 @@ func upgrade_core(sh *subhandler, conn *websocket.Conn, accid primitive.ObjectID
|
||||
}
|
||||
}
|
||||
|
||||
sh.redisSync.Del(context.Background(), accid.Hex())
|
||||
sh.connWaitGroup.Done()
|
||||
ws.redisSync.Del(context.Background(), accid.Hex())
|
||||
ws.connWaitGroup.Done()
|
||||
|
||||
c.Conn = nil
|
||||
sh.connInOutChan <- c
|
||||
}(newconn, accid, sh.deliveryChan)
|
||||
ws.connInOutChan <- c
|
||||
}(newconn, accid, ws.deliveryChan)
|
||||
}
|
||||
|
||||
func (sh *subhandler) upgrade_nosession(w http.ResponseWriter, r *http.Request) {
|
||||
func (ws *WebsocketHandler) upgrade_nosession(w http.ResponseWriter, r *http.Request) {
|
||||
// 클라이언트 접속
|
||||
defer func() {
|
||||
s := recover()
|
||||
@ -665,10 +625,10 @@ func (sh *subhandler) upgrade_nosession(w http.ResponseWriter, r *http.Request)
|
||||
alias = accid.Hex()
|
||||
}
|
||||
|
||||
upgrade_core(sh, conn, accid, alias)
|
||||
upgrade_core(ws, conn, accid, alias)
|
||||
}
|
||||
|
||||
func (sh *subhandler) upgrade(w http.ResponseWriter, r *http.Request) {
|
||||
func (ws *WebsocketHandler) upgrade(w http.ResponseWriter, r *http.Request) {
|
||||
// 클라이언트 접속
|
||||
defer func() {
|
||||
s := recover()
|
||||
@ -680,27 +640,12 @@ func (sh *subhandler) upgrade(w http.ResponseWriter, r *http.Request) {
|
||||
}()
|
||||
|
||||
sk := r.Header.Get("AS-X-SESSION")
|
||||
auth := r.Header.Get("Authorization")
|
||||
|
||||
req, _ := http.NewRequest("GET", fmt.Sprintf("%s/query?sk=%s", config.Maingate, sk), nil)
|
||||
req.Header.Add("Authorization", auth)
|
||||
|
||||
client := http.Client{}
|
||||
resp, err := client.Do(req)
|
||||
authinfo, err := ws.sessionConsumer.Query(sk)
|
||||
if err != nil {
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
logger.Error("authorize query failed :", err)
|
||||
return
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
var authinfo gocommon.Authinfo
|
||||
dec := json.NewDecoder(resp.Body)
|
||||
if err = dec.Decode(&authinfo); err != nil {
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
logger.Error("authorize query failed :", err)
|
||||
return
|
||||
}
|
||||
|
||||
var upgrader = websocket.Upgrader{} // use default options
|
||||
conn, err := upgrader.Upgrade(w, r, nil)
|
||||
@ -714,8 +659,8 @@ func (sh *subhandler) upgrade(w http.ResponseWriter, r *http.Request) {
|
||||
vt, _ := base64.StdEncoding.DecodeString(v)
|
||||
alias = string(vt)
|
||||
} else {
|
||||
alias = authinfo.Accid.Hex()
|
||||
alias = authinfo.Account.Hex()
|
||||
}
|
||||
|
||||
upgrade_core(sh, conn, authinfo.Accid, alias)
|
||||
upgrade_core(ws, conn, authinfo.Account, alias)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user