ing
This commit is contained in:
parent
5e46d9e576
commit
6c999b5798
|
@ -4,10 +4,12 @@ import (
|
||||||
"crypto/rsa"
|
"crypto/rsa"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
|
"sync"
|
||||||
|
|
||||||
logging "git.loafle.net/commons/logging-go"
|
logging "git.loafle.net/commons/logging-go"
|
||||||
"git.loafle.net/commons/server-go"
|
"git.loafle.net/commons/server-go"
|
||||||
"git.loafle.net/commons/server-go/socket"
|
"git.loafle.net/commons/server-go/socket"
|
||||||
|
og "git.loafle.net/overflow/gateway"
|
||||||
ogs "git.loafle.net/overflow/gateway/subscribe"
|
ogs "git.loafle.net/overflow/gateway/subscribe"
|
||||||
ogrs "git.loafle.net/overflow/gateway_rpc/servlet"
|
ogrs "git.loafle.net/overflow/gateway_rpc/servlet"
|
||||||
"git.loafle.net/overflow/member_gateway_rpc/subscribe"
|
"git.loafle.net/overflow/member_gateway_rpc/subscribe"
|
||||||
|
@ -49,6 +51,8 @@ type WebappServlet interface {
|
||||||
|
|
||||||
type WebappServlets struct {
|
type WebappServlets struct {
|
||||||
ogrs.RPCServlets
|
ogrs.RPCServlets
|
||||||
|
|
||||||
|
connections sync.Map
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *WebappServlets) Init(serverCtx server.ServerCtx) error {
|
func (s *WebappServlets) Init(serverCtx server.ServerCtx) error {
|
||||||
|
@ -111,53 +115,112 @@ func (s *WebappServlets) Handshake(servletCtx server.ServletCtx, ctx *fasthttp.R
|
||||||
userEmail := claims["sub"].(string)
|
userEmail := claims["sub"].(string)
|
||||||
sessionID := uuid.NewV4().String()
|
sessionID := uuid.NewV4().String()
|
||||||
|
|
||||||
logging.Logger().Debugf("%s, %s", userEmail, sessionID)
|
servletCtx.SetAttribute(og.SessionIDKey, sessionID)
|
||||||
|
servletCtx.SetAttribute(og.SessionClientTypeKey, ogs.MEMBER)
|
||||||
// servletCtx.SetAttribute(oogw.ClientTypeKey, ogs.MEMBER)
|
servletCtx.SetAttribute(og.SessionTargetIDKey, userEmail)
|
||||||
// servletCtx.SetAttribute(oogw.TargetIDKey, userEmail)
|
|
||||||
|
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *WebappServlets) OnConnect(servletCtx server.ServletCtx, conn socket.Conn) {
|
func (s *WebappServlets) OnConnect(servletCtx server.ServletCtx, conn socket.Conn) {
|
||||||
//
|
s.RPCServlets.OnConnect(servletCtx, conn)
|
||||||
|
|
||||||
|
sessionID := servletCtx.GetAttribute(og.SessionIDKey)
|
||||||
|
targetID := servletCtx.GetAttribute(og.SessionTargetIDKey)
|
||||||
|
if nil != sessionID && nil != targetID {
|
||||||
|
s.connections.Store(sessionID.(string), retainConnection(targetID.(string), servletCtx))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *WebappServlets) OnDisconnect(servletCtx server.ServletCtx) {
|
func (s *WebappServlets) OnDisconnect(servletCtx server.ServletCtx) {
|
||||||
//
|
s.RPCServlets.OnDisconnect(servletCtx)
|
||||||
|
|
||||||
|
sessionID := servletCtx.GetAttribute(og.SessionIDKey)
|
||||||
|
if nil != sessionID {
|
||||||
|
s.connections.Delete(sessionID.(string))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *WebappServlets) handleSubscribe(serverCtx server.ServerCtx, subscribeChan <-chan *ogs.Message) {
|
func (s *WebappServlets) handleSubscribe(serverCtx server.ServerCtx, subscribeChan <-chan *ogs.Message) {
|
||||||
// for {
|
for {
|
||||||
// select {
|
select {
|
||||||
// case msg, ok := <-subscribeChan:
|
case msg, ok := <-subscribeChan:
|
||||||
// switch msg.TargetType {
|
switch msg.TargetType {
|
||||||
// case ogs.MEMBER:
|
case ogs.MEMBER:
|
||||||
// for _, uid := range msg.Targets {
|
for _, targetID := range msg.Targets {
|
||||||
// sockets := sh.getMemberSockets(uid)
|
_connections := s.getMemberConnections(targetID)
|
||||||
// if nil == sockets {
|
if nil == _connections || 0 == len(_connections) {
|
||||||
// continue
|
break
|
||||||
// }
|
}
|
||||||
|
|
||||||
// for _, soc := range sockets {
|
for _, _connection := range _connections {
|
||||||
// if err := soc.WriteMessageUseWriter(websocket.TextMessage, message.Message); nil != err {
|
_writeChan := _connection.servletCtx.GetAttribute(og.SessionWriterChanKey)
|
||||||
// logging.Logger().Errorf("OnSubscribe: write error %v", err)
|
if nil != _writeChan {
|
||||||
// }
|
writeChan := _writeChan.(chan<- []byte)
|
||||||
// }
|
writeChan <- msg.Message
|
||||||
// }
|
}
|
||||||
|
}
|
||||||
// case oos.MEMBER_SESSION:
|
}
|
||||||
// for _, sid := range message.Targets {
|
|
||||||
// if soc := sh.GetSocket(sid); nil != soc {
|
case oos.MEMBER_SESSION:
|
||||||
// if err := soc.WriteMessageUseWriter(websocket.TextMessage, message.Message); nil != err {
|
for _, sessionID := range message.Targets {
|
||||||
// logging.Logger().Errorf("OnSubscribe: write error %v", err)
|
_connection, ok := s.connections.Load(sessionID)
|
||||||
// }
|
if !ok {
|
||||||
// }
|
logging.Logger().Debugf("Client[%s] is not exist", sessionID)
|
||||||
// }
|
break
|
||||||
// default:
|
}
|
||||||
// logging.Logger().Warnf("[WEBAPP] SubscriberHandler: Unknown TargetType %s", message.TargetType)
|
_writeChan := _connection.servletCtx.GetAttribute(og.SessionWriterChanKey)
|
||||||
// }
|
if nil != _writeChan {
|
||||||
// }
|
writeChan := _writeChan.(chan<- []byte)
|
||||||
// }
|
writeChan <- msg.Message
|
||||||
|
}
|
||||||
|
}
|
||||||
|
default:
|
||||||
|
logging.Logger().Warnf("Subscriber: Unknown TargetType %s", message.TargetType)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *WebappServlets) getMemberConnections(targetID string) []*connection {
|
||||||
|
var connections []*connection
|
||||||
|
|
||||||
|
s.connections.Range(func(k, v interface{}) bool {
|
||||||
|
_connection := v.(*connection)
|
||||||
|
if _connection.targetID == targetID {
|
||||||
|
connections = append(connections, _connection)
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
|
||||||
|
return connections
|
||||||
|
}
|
||||||
|
|
||||||
|
type connection struct {
|
||||||
|
targetID string
|
||||||
|
servletCtx server.ServletCtx
|
||||||
|
}
|
||||||
|
|
||||||
|
var connectionPool sync.Pool
|
||||||
|
|
||||||
|
func retainConnection(targetID string, servletCtx server.ServletCtx) *connection {
|
||||||
|
v := connectionPool.Get()
|
||||||
|
var _connection *connection
|
||||||
|
if v == nil {
|
||||||
|
_connection = &connection{}
|
||||||
|
} else {
|
||||||
|
_connection = v.(*connection)
|
||||||
|
}
|
||||||
|
|
||||||
|
_connection.targetID = targetID
|
||||||
|
_connection.servletCtx = servletCtx
|
||||||
|
|
||||||
|
return _connection
|
||||||
|
}
|
||||||
|
|
||||||
|
func releaseConnection(_connection *connection) {
|
||||||
|
_connection.targetID = ""
|
||||||
|
_connection.servletCtx = nil
|
||||||
|
|
||||||
|
connectionPool.Put(_connection)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user