ayo/gocommon
8
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

세션 해제 콜백 추가

Browse Source
This commit is contained in:
mountain
2023-12-25 22:06:57 +09:00
parent 08802176cb
commit 46f7d358ed
6 changed files with 110 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
session/common.go
View File

@ -31,6 +31,7 @@ type Provider interface {
type Consumer interface {
Query(string) (Authorization, error)
Touch(string) (Authorization, error)
RegisterOnSessionInvalidated(func(primitive.ObjectID))
}
type storagekey string

18
session/consumer_common.go
View File

@ -4,6 +4,8 @@ import (
"context"
"sync"
"time"
"go.mongodb.org/mongo-driver/bson/primitive"
)
type cache_stage[T any] struct {
@ -24,6 +26,7 @@ type consumer_common[T any] struct {
ctx context.Context
stages [2]*cache_stage[T]
startTime time.Time
onSessionInvalidated []func(primitive.ObjectID)
}
func (c *consumer_common[T]) add_internal(sk storagekey, si T) {
@ -33,18 +36,25 @@ func (c *consumer_common[T]) add_internal(sk storagekey, si T) {
delete(c.stages[1].deleted, sk)
}
func (c *consumer_common[T]) delete_internal(sk storagekey) {
func (c *consumer_common[T]) delete_internal(sk storagekey) (old T) {
if v, ok := c.stages[0].cache[sk]; ok {
old = v
delete(c.stages[0].cache, sk)
c.stages[0].deleted[sk] = true
delete(c.stages[1].cache, sk)
} else if v, ok = c.stages[1].cache[sk]; ok {
old = v
delete(c.stages[1].cache, sk)
}
c.stages[0].deleted[sk] = true
c.stages[1].deleted[sk] = true
return
}
func (c *consumer_common[T]) delete(sk storagekey) {
func (c *consumer_common[T]) delete(sk storagekey) T {
c.lock.Lock()
defer c.lock.Unlock()
c.delete_internal(sk)
return c.delete_internal(sk)
}
func (c *consumer_common[T]) changeStage() {

21
session/impl_mongo.go
View File

@ -182,12 +182,20 @@ func newConsumerWithMongo(ctx context.Context, mongoUrl string, ttl time.Duratio
consumer.add(data.Session.Key, data.DocumentKey.Id, data.Session)
case "update":
if data.Session == nil {
consumer.deleteById(data.DocumentKey.Id)
if old := consumer.deleteById(data.DocumentKey.Id); old != nil {
for _, f := range consumer.onSessionInvalidated {
f(old.Auth.Account)
}
}
} else {
consumer.add(data.Session.Key, data.DocumentKey.Id, data.Session)
}
case "delete":
consumer.deleteById(data.DocumentKey.Id)
if old := consumer.deleteById(data.DocumentKey.Id); old != nil {
for _, f := range consumer.onSessionInvalidated {
f(old.Auth.Account)
}
}
}
} else {
logger.Error("watchAuthCollection stream.Decode failed :", err)
@ -338,12 +346,17 @@ func (c *consumer_mongo) add(sk storagekey, id primitive.ObjectID, si *sessionMo
c.ids[id] = sk
}
func (c *consumer_mongo) deleteById(id primitive.ObjectID) {
func (c *consumer_mongo) deleteById(id primitive.ObjectID) (old *sessionMongo) {
c.lock.Lock()
defer c.lock.Unlock()
if sk, ok := c.ids[id]; ok {
c.consumer_common.delete_internal(sk)
old = c.consumer_common.delete_internal(sk)
delete(c.ids, id)
}
return
}
func (c *consumer_mongo) RegisterOnSessionInvalidated(cb func(primitive.ObjectID)) {
c.onSessionInvalidated = append(c.onSessionInvalidated, cb)
}

11
session/impl_redis.go
View File

@ -161,7 +161,12 @@ func newConsumerWithRedis(ctx context.Context, redisUrl string, ttl time.Duratio
switch msg.Channel {
case deleteChannel:
sk := storagekey(msg.Payload)
consumer.delete(sk)
old := consumer.delete(sk)
if old != nil {
for _, f := range consumer.onSessionInvalidated {
f(old.Account)
}
}
}
}
}
@ -286,3 +291,7 @@ func (c *consumer_redis) Touch(pk string) (Authorization, error) {
return Authorization{}, nil
}
func (c *consumer_redis) RegisterOnSessionInvalidated(cb func(primitive.ObjectID)) {
c.onSessionInvalidated = append(c.onSessionInvalidated, cb)
}

11
wshandler/wshandler.go
View File

@ -86,9 +86,7 @@ type send_msg_queue_elem struct {
msg []byte
}
type WebsocketHandler struct {
WebsocketApiBroker
type websocketHandlerBase struct {
redisMsgChanName string
redisCmdChanName string
redisSync *redis.Client
@ -101,6 +99,11 @@ type WebsocketHandler struct {
sessionConsumer session.Consumer
}
type WebsocketHandler struct {
WebsocketApiBroker
websocketHandlerBase
}
type wsConfig struct {
gocommon.StorageAddr `json:"storage"`
}
@ -152,6 +155,7 @@ func NewWebsocketHandler(consumer session.Consumer, redisUrl string) (*Websocket
}()
return &WebsocketHandler{
websocketHandlerBase: websocketHandlerBase{
redisMsgChanName: fmt.Sprintf("_wsh_msg_%d", redisSync.Options().DB),
redisCmdChanName: fmt.Sprintf("_wsh_cmd_%d", redisSync.Options().DB),
redisSync: redisSync,
@ -160,6 +164,7 @@ func NewWebsocketHandler(consumer session.Consumer, redisUrl string) (*Websocket
localDeliveryChan: make(chan any, 100),
sendMsgChan: sendchan,
sessionConsumer: consumer,
},
}, nil
}

47
wshandler/wshandler_peer.go
View File

@ -22,10 +22,22 @@ type WebsocketPeerHandler interface {
RegisterHandlers(serveMux *http.ServeMux, prefix string) error
}
type connEstChannelValue struct {
accid primitive.ObjectID
conn *websocket.Conn
}
type connDisChannelValue struct {
accid primitive.ObjectID
closed bool
}
type websocketPeerHandler[T PeerInterface] struct {
methods map[string]peerApiFuncType[T]
createPeer func(primitive.ObjectID) T
sessionConsumer session.Consumer
connEstChannel chan connEstChannelValue
connDisChannel chan connDisChannelValue
}
type PeerInterface interface {
@ -140,14 +152,28 @@ func NewWebsocketPeerHandler[T PeerInterface](consumer session.Consumer, creator
methods[k] = v
}
return &websocketPeerHandler[T]{
wsh := &websocketPeerHandler[T]{
sessionConsumer: consumer,
methods: methods,
createPeer: creator,
connEstChannel: make(chan connEstChannelValue),
connDisChannel: make(chan connDisChannelValue),
}
consumer.RegisterOnSessionInvalidated(wsh.onSessionInvalidated)
return wsh
}
func (ws *websocketPeerHandler[T]) onSessionInvalidated(accid primitive.ObjectID) {
ws.connDisChannel <- connDisChannelValue{
accid: accid,
closed: false,
}
}
func (ws *websocketPeerHandler[T]) RegisterHandlers(serveMux *http.ServeMux, prefix string) error {
go ws.sessionMonitoring()
if *noAuthFlag {
serveMux.HandleFunc(prefix, ws.upgrade_nosession)
} else {
@ -157,14 +183,33 @@ func (ws *websocketPeerHandler[T]) RegisterHandlers(serveMux *http.ServeMux, pre
return nil
}
func (ws *websocketPeerHandler[T]) sessionMonitoring() {
all := make(map[primitive.ObjectID]*websocket.Conn)
for {
select {
case estVal := <-ws.connEstChannel:
all[estVal.accid] = estVal.conn
case disVal := <-ws.connDisChannel:
if disVal.closed {
delete(all, disVal.accid)
} else if c := all[disVal.accid]; c != nil {
c.Close()
delete(all, disVal.accid)
}
}
}
}
func (ws *websocketPeerHandler[T]) upgrade_core(conn *websocket.Conn, accid primitive.ObjectID, nonce uint32) {
go func(c *websocket.Conn, accid primitive.ObjectID) {
peer := ws.createPeer(accid)
var closeReason string
peer.ClientConnected(conn)
ws.connEstChannel <- connEstChannelValue{accid: accid, conn: conn}
defer func() {
ws.connDisChannel <- connDisChannelValue{accid: accid, closed: true}
peer.ClientDisconnected(closeReason)
}()