실패 로그 재전송 로직 수정

server.go

@@ -352,13 +352,8 @@ func ConvertInterface(from interface{}, toType reflect.Type) reflect.Value {
 		return convslice
 
 	case reflect.Bool:
-		if fromstr, ok := from.(string); ok {
+		val, _ := strconv.ParseBool(from.(string))
-			val, _ := strconv.ParseBool(fromstr)
+		return reflect.ValueOf(val)
-			return reflect.ValueOf(val)
-		} else if frombool, ok := from.(bool); ok {
-			return reflect.ValueOf(frombool)
-		}
-		return reflect.ValueOf(false)
 
 	case reflect.String:
 		if toType == reflect.TypeOf(primitive.ObjectID{}) {

session/common.go

@@ -14,7 +14,8 @@ import (
 )
 
 type Authorization struct {
-	Account primitive.ObjectID `bson:"a" json:"a"`
+	Account     primitive.ObjectID `bson:"a" json:"a"`
+	invalidated string
 
 	// by authorization provider
 	Platform    string `bson:"p" json:"p"`
@@ -29,12 +30,13 @@ func (auth *Authorization) ToStrings() []string {
 		"p", auth.Platform,
 		"u", auth.Uid,
 		"al", auth.Alias,
+		"inv", auth.invalidated,
 		"ct", strconv.FormatInt(auth.CreatedTime, 10),
 	}
 }
 
 func (auth *Authorization) Valid() bool {
-	return !auth.Account.IsZero()
+	return len(auth.invalidated) == 0 && !auth.Account.IsZero()
 }
 
 func MakeAuthrizationFromStringMap(src map[string]string) Authorization {
@@ -45,29 +47,24 @@ func MakeAuthrizationFromStringMap(src map[string]string) Authorization {
 		Platform:    src["p"],
 		Uid:         src["u"],
 		Alias:       src["al"],
+		invalidated: src["inv"],
 		CreatedTime: ct,
 	}
 }
 
 type Provider interface {
 	New(*Authorization) (string, error)
-	RevokeAll(primitive.ObjectID, bool) ([]string, error)
+	RevokeAll(primitive.ObjectID) error
 	Query(string) (Authorization, error)
 	Touch(string) (bool, error)
 }
 
-type InvalidatedSession struct {
-	Account     primitive.ObjectID
-	SessionKeys []string
-	Infinite    bool
-}
-
 type Consumer interface {
 	Query(string) Authorization
 	Touch(string) (Authorization, error)
 	IsRevoked(primitive.ObjectID) bool
 	Revoke(string)
-	RegisterOnSessionInvalidated(func(InvalidatedSession))
+	RegisterOnSessionInvalidated(func(primitive.ObjectID))
 }
 
 type storagekey string
@@ -123,6 +120,10 @@ var errInvalidScheme = errors.New("storageAddr is not valid scheme")
 var errSessionStorageMissing = errors.New("session_storageis missing")
 
 func NewConsumer(ctx context.Context, storageAddr string, ttl time.Duration) (Consumer, error) {
+	if strings.HasPrefix(storageAddr, "mongodb") {
+		return newConsumerWithMongo(ctx, storageAddr, ttl)
+	}
+
 	if strings.HasPrefix(storageAddr, "redis") {
 		return newConsumerWithRedis(ctx, storageAddr, ttl)
 	}
@@ -142,6 +143,10 @@ func NewConsumerWithConfig(ctx context.Context, cfg SessionConfig) (Consumer, er
 }
 
 func NewProvider(ctx context.Context, storageAddr string, ttl time.Duration) (Provider, error) {
+	if strings.HasPrefix(storageAddr, "mongodb") {
+		return newProviderWithMongo(ctx, storageAddr, ttl)
+	}
+
 	if strings.HasPrefix(storageAddr, "redis") {
 		return newProviderWithRedis(ctx, storageAddr, ttl)
 	}

session/consumer_common.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"sync"
 	"time"
+
+	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
 type cache_stage[T any] struct {
@@ -24,7 +26,7 @@ type consumer_common[T any] struct {
 	ctx                  context.Context
 	stages               [2]*cache_stage[T]
 	startTime            time.Time
-	onSessionInvalidated []func(InvalidatedSession)
+	onSessionInvalidated []func(primitive.ObjectID)
 }
 
 func (c *consumer_common[T]) add_internal(sk storagekey, si T) {

session/impl_mongo.go

@@ -0,0 +1,383 @@
+package session
+
+import (
+	"context"
+	"time"
+
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+	"repositories.action2quare.com/ayo/gocommon"
+	"repositories.action2quare.com/ayo/gocommon/logger"
+)
+
+const (
+	session_collection_name = gocommon.CollectionName("session")
+)
+
+type provider_mongo struct {
+	mongoClient gocommon.MongoClient
+}
+
+type sessionMongo struct {
+	Id   primitive.ObjectID `bson:"_id,omitempty"`
+	Auth *Authorization     `bson:"auth"`
+	Key  storagekey         `bson:"key"`
+	Ts   primitive.DateTime `bson:"_ts"`
+}
+
+func newProviderWithMongo(ctx context.Context, mongoUrl string, ttl time.Duration) (Provider, error) {
+	mc, err := gocommon.NewMongoClient(ctx, mongoUrl)
+	if err != nil {
+		return nil, err
+	}
+
+	if err = mc.MakeUniqueIndices(session_collection_name, map[string]bson.D{
+		"key": {{Key: "key", Value: 1}},
+	}); err != nil {
+		return nil, err
+	}
+
+	if err := mc.MakeExpireIndex(session_collection_name, int32(ttl.Seconds())); err != nil {
+		return nil, err
+	}
+
+	return &provider_mongo{
+		mongoClient: mc,
+	}, nil
+}
+
+func (p *provider_mongo) New(input *Authorization) (string, error) {
+	sk := make_storagekey(input.Account)
+
+	_, _, err := p.mongoClient.Update(session_collection_name, bson.M{
+		"_id": input.Account,
+	}, bson.M{
+		"$set": sessionMongo{
+			Auth: input,
+			Key:  sk,
+			Ts:   primitive.NewDateTimeFromTime(time.Now().UTC()),
+		},
+	}, options.Update().SetUpsert(true))
+
+	return string(storagekey_to_publickey(sk)), err
+}
+
+func (p *provider_mongo) RevokeAll(acc primitive.ObjectID) error {
+	_, err := p.mongoClient.Delete(session_collection_name, bson.M{
+		"_id": acc,
+	})
+	return err
+}
+
+func (p *provider_mongo) Query(pk string) (Authorization, error) {
+	sk := publickey_to_storagekey(publickey(pk))
+	var auth Authorization
+	err := p.mongoClient.FindOneAs(session_collection_name, bson.M{
+		"key": sk,
+	}, &auth)
+
+	return auth, err
+}
+
+func (p *provider_mongo) Touch(pk string) (bool, error) {
+	sk := publickey_to_storagekey(publickey(pk))
+	worked, _, err := p.mongoClient.Update(session_collection_name, bson.M{
+		"key": sk,
+	}, bson.M{
+		"$currentDate": bson.M{
+			"_ts": bson.M{"$type": "date"},
+		},
+	}, options.Update().SetUpsert(false))
+
+	if err != nil {
+		logger.Println("provider Touch :", err)
+		return false, err
+	}
+
+	return worked, nil
+}
+
+type consumer_mongo struct {
+	consumer_common[*sessionMongo]
+	ids         map[primitive.ObjectID]storagekey
+	mongoClient gocommon.MongoClient
+	ttl         time.Duration
+}
+
+type sessionPipelineDocument struct {
+	OperationType string `bson:"operationType"`
+	DocumentKey   struct {
+		Id primitive.ObjectID `bson:"_id"`
+	} `bson:"documentKey"`
+	Session *sessionMongo `bson:"fullDocument"`
+}
+
+func newConsumerWithMongo(ctx context.Context, mongoUrl string, ttl time.Duration) (Consumer, error) {
+	mc, err := gocommon.NewMongoClient(ctx, mongoUrl)
+	if err != nil {
+		return nil, err
+	}
+
+	consumer := &consumer_mongo{
+		consumer_common: consumer_common[*sessionMongo]{
+			ttl:       ttl,
+			ctx:       ctx,
+			stages:    [2]*cache_stage[*sessionMongo]{make_cache_stage[*sessionMongo](), make_cache_stage[*sessionMongo]()},
+			startTime: time.Now(),
+		},
+		ids:         make(map[primitive.ObjectID]storagekey),
+		ttl:         ttl,
+		mongoClient: mc,
+	}
+
+	go func() {
+		matchStage := bson.D{
+			{
+				Key: "$match", Value: bson.D{
+					{Key: "operationType", Value: bson.D{
+						{Key: "$in", Value: bson.A{
+							"delete",
+							"insert",
+							"update",
+						}},
+					}},
+				},
+			}}
+		projectStage := bson.D{
+			{
+				Key: "$project", Value: bson.D{
+					{Key: "documentKey", Value: 1},
+					{Key: "operationType", Value: 1},
+					{Key: "fullDocument", Value: 1},
+				},
+			},
+		}
+
+		var stream *mongo.ChangeStream
+		nextswitch := time.Now().Add(ttl)
+		for {
+			if stream == nil {
+				stream, err = mc.Watch(session_collection_name, mongo.Pipeline{matchStage, projectStage})
+				if err != nil {
+					logger.Error("watchAuthCollection watch failed :", err)
+					time.Sleep(time.Minute)
+					continue
+				}
+			}
+
+			changed := stream.TryNext(ctx)
+			if ctx.Err() != nil {
+				logger.Error("watchAuthCollection stream.TryNext failed. process should be restarted! :", ctx.Err().Error())
+				break
+			}
+
+			if changed {
+				var data sessionPipelineDocument
+				if err := stream.Decode(&data); err == nil {
+					ot := data.OperationType
+					switch ot {
+					case "insert":
+						consumer.add(data.Session.Key, data.DocumentKey.Id, data.Session)
+					case "update":
+						if data.Session == nil {
+							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":
+						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)
+				}
+			} else if stream.Err() != nil || stream.ID() == 0 {
+				select {
+				case <-ctx.Done():
+					logger.Println("watchAuthCollection is done")
+					stream.Close(ctx)
+					return
+
+				case <-time.After(time.Second):
+					logger.Error("watchAuthCollection stream error :", stream.Err())
+					stream.Close(ctx)
+					stream = nil
+				}
+			} else {
+				time.Sleep(time.Second)
+			}
+
+			now := time.Now()
+			for now.After(nextswitch) {
+				consumer.changeStage()
+				nextswitch = nextswitch.Add(ttl)
+			}
+		}
+	}()
+
+	return consumer, nil
+}
+
+func (c *consumer_mongo) query_internal(sk storagekey) (*sessionMongo, bool, error) {
+	if _, deleted := c.stages[0].deleted[sk]; deleted {
+		return nil, false, nil
+	}
+
+	if _, deleted := c.stages[1].deleted[sk]; deleted {
+		return nil, false, nil
+	}
+
+	found, ok := c.stages[0].cache[sk]
+	if !ok {
+		found, ok = c.stages[1].cache[sk]
+	}
+
+	if ok {
+		return found, false, nil
+	}
+
+	var si sessionMongo
+	err := c.mongoClient.FindOneAs(session_collection_name, bson.M{
+		"key": sk,
+	}, &si)
+
+	if err != nil {
+		logger.Println("consumer Query :", err)
+		return nil, false, err
+	}
+
+	if len(si.Key) > 0 {
+		siptr := &si
+		c.add_internal(sk, siptr)
+		return siptr, true, nil
+	}
+	return nil, false, nil
+}
+
+func (c *consumer_mongo) Query(pk string) Authorization {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+
+	sk := publickey_to_storagekey(publickey(pk))
+	si, _, err := c.query_internal(sk)
+	if err != nil {
+		return Authorization{}
+	}
+
+	if si == nil {
+		return Authorization{}
+	}
+
+	if time.Now().After(si.Ts.Time().Add(c.ttl)) {
+		return Authorization{}
+	}
+
+	return *si.Auth
+}
+
+func (c *consumer_mongo) Touch(pk string) (Authorization, error) {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+
+	sk := publickey_to_storagekey(publickey(pk))
+	worked, _, err := c.mongoClient.Update(session_collection_name, bson.M{
+		"key": sk,
+	}, bson.M{
+		"$currentDate": bson.M{
+			"_ts": bson.M{"$type": "date"},
+		},
+	}, options.Update().SetUpsert(false))
+
+	if err != nil {
+		logger.Println("consumer Touch :", err)
+		return Authorization{}, err
+	}
+
+	if !worked {
+		// 이미 만료되서 사라짐
+		return Authorization{}, nil
+	}
+
+	si, added, err := c.query_internal(sk)
+	if err != nil {
+		return Authorization{}, err
+	}
+
+	if si == nil {
+		return Authorization{}, nil
+	}
+
+	if !added {
+		var doc sessionMongo
+		err := c.mongoClient.FindOneAs(session_collection_name, bson.M{
+			"key": sk,
+		}, &doc)
+
+		if err != nil {
+			logger.Println("consumer Query :", err)
+			return Authorization{}, err
+		}
+
+		if len(si.Key) > 0 {
+			c.add_internal(sk, &doc)
+			c.ids[doc.Id] = sk
+
+			return *doc.Auth, nil
+		}
+	}
+
+	return *si.Auth, nil
+}
+
+func (c *consumer_mongo) Revoke(pk string) {
+	sk := publickey_to_storagekey(publickey(pk))
+	_, err := c.mongoClient.Delete(session_collection_name, bson.M{
+		"key": sk,
+	})
+
+	if err == nil {
+		for id, v := range c.ids {
+			if v == sk {
+				delete(c.ids, id)
+				break
+			}
+		}
+	}
+}
+
+func (c *consumer_mongo) IsRevoked(id primitive.ObjectID) bool {
+	_, ok := c.ids[id]
+	return !ok
+}
+
+func (c *consumer_mongo) add(sk storagekey, id primitive.ObjectID, si *sessionMongo) {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+
+	c.consumer_common.add_internal(sk, si)
+	c.ids[id] = sk
+}
+
+func (c *consumer_mongo) deleteById(id primitive.ObjectID) (old *sessionMongo) {
+	c.lock.Lock()
+	defer c.lock.Unlock()
+
+	if sk, ok := c.ids[id]; ok {
+		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)
+}

session/impl_redis.go

@@ -2,10 +2,8 @@ package session
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
-	"slices"
 	"time"
 
 	"github.com/go-redis/redis/v8"
@@ -45,18 +43,31 @@ func newProviderWithRedis(ctx context.Context, redisUrl string, ttl time.Duratio
 }
 
 func (p *provider_redis) New(input *Authorization) (string, error) {
-	sks, err := p.RevokeAll(input.Account, false)
+	newsk := make_storagekey(input.Account)
+	prefix := input.Account.Hex()
+	sks, err := p.redisClient.Keys(p.ctx, prefix+"*").Result()
 	if err != nil {
+		logger.Println("session provider delete :", sks, err)
 		return "", err
 	}
 
-	var newsk storagekey
+	p.redisClient.Del(p.ctx, sks...)
+	for _, sk := range sks {
+		p.redisClient.Publish(p.ctx, p.deleteChannel, sk).Result()
+	}
+
 	for {
-		newsk = make_storagekey(input.Account)
+		duplicated := false
-		duplicated := slices.Contains(sks, string(newsk))
+		for _, sk := range sks {
+			if sk == string(newsk) {
+				duplicated = true
+				break
+			}
+		}
 		if !duplicated {
 			break
 		}
+		newsk = make_storagekey(input.Account)
 	}
 
 	_, err = p.redisClient.HSet(p.ctx, string(newsk), input.ToStrings()).Result()
@@ -71,28 +82,20 @@ func (p *provider_redis) New(input *Authorization) (string, error) {
 	return string(pk), err
 }
 
-func (p *provider_redis) RevokeAll(account primitive.ObjectID, infinite bool) ([]string, error) {
+func (p *provider_redis) RevokeAll(account primitive.ObjectID) error {
 	prefix := account.Hex()
 	sks, err := p.redisClient.Keys(p.ctx, prefix+"*").Result()
 	if err != nil {
 		logger.Println("session provider delete :", sks, err)
-		return nil, err
+		return err
 	}
 
-	if len(sks) > 0 {
+	for _, sk := range sks {
-		p.redisClient.Del(p.ctx, sks...)
+		p.redisClient.HSet(p.ctx, sk, "inv", "true")
-
+		p.redisClient.Publish(p.ctx, p.deleteChannel, sk).Result()
-		invsess := InvalidatedSession{
-			SessionKeys: sks,
-			Account:     account,
-			Infinite:    infinite,
-		}
-		data, _ := json.Marshal(invsess)
-
-		p.redisClient.Publish(p.ctx, p.deleteChannel, string(data)).Result()
 	}
 
-	return sks, nil
+	return nil
 }
 
 func (p *provider_redis) Query(pk string) (Authorization, error) {
@@ -178,18 +181,12 @@ func newConsumerWithRedis(ctx context.Context, redisUrl string, ttl time.Duratio
 
 				switch msg.Channel {
 				case deleteChannel:
-					var invsess InvalidatedSession
+					sk := storagekey(msg.Payload)
-					if err := json.Unmarshal([]byte(msg.Payload), &invsess); err != nil {
+					old := consumer.delete(sk)
-						logger.Println("redis consumer deleteChannel unmarshal failed :", err)
+					if old != nil {
-						break
+						for _, f := range consumer.onSessionInvalidated {
-					}
+							f(old.Account)
-
+						}
-					for _, sk := range invsess.SessionKeys {
-						consumer.delete(storagekey(sk))
-					}
-
-					for _, f := range consumer.onSessionInvalidated {
-						f(invsess)
 					}
 				}
 			}
@@ -369,6 +366,6 @@ func (c *consumer_redis) IsRevoked(accid primitive.ObjectID) bool {
 	return false
 }
 
-func (c *consumer_redis) RegisterOnSessionInvalidated(cb func(InvalidatedSession)) {
+func (c *consumer_redis) RegisterOnSessionInvalidated(cb func(primitive.ObjectID)) {
 	c.onSessionInvalidated = append(c.onSessionInvalidated, cb)
 }

session/session_test.go

@@ -75,7 +75,7 @@ func TestExpTable(t *testing.T) {
 	time.Sleep(2 * time.Second)
 
 	time.Sleep(2 * time.Second)
-	pv.RevokeAll(au1.Account, false)
+	pv.RevokeAll(au1.Account)
 
 	cs.Touch(sk1)
 	time.Sleep(2 * time.Second)

wshandler/wshandler.go

@@ -334,8 +334,8 @@ func (ws *WebsocketHandler) LeaveRoom(room string, accid primitive.ObjectID) {
 	}
 }
 
-func (ws *WebsocketHandler) onSessionInvalidated(invsess session.InvalidatedSession) {
+func (ws *WebsocketHandler) onSessionInvalidated(accid primitive.ObjectID) {
-	ws.forceCloseChan <- invsess.Account
+	ws.forceCloseChan <- accid
 }
 
 func (ws *WebsocketHandler) mainLoop(ctx context.Context) {

wshandler/wshandler_peer.go

@@ -176,9 +176,9 @@ func (ws *websocketPeerHandler[T]) RegisterHandlers(serveMux gocommon.ServerMuxI
 	return nil
 }
 
-func (ws *websocketPeerHandler[T]) onSessionInvalidated(invsess session.InvalidatedSession) {
+func (ws *websocketPeerHandler[T]) onSessionInvalidated(accid primitive.ObjectID) {
 	ws.peerDtorChannel <- peerDtorChannelValue{
-		accid: invsess.Account,
+		accid: accid,
 	}
 }