모듈 업데이트

This reverts commit e18a5eafe0.

.gitignore

@@ -1,3 +1,5 @@
 .vscode/
 __debug_bin.exe
 *.log
+config.json
+tavern.exe

config.json

@@ -1 +1,49 @@
-{}
+{
+    "region_storage": {
+        "default": {
+            "mongo": "mongodb://192.168.8.94:27017/?replicaSet=repl01&retrywrites=false",
+            "redis": {
+                "cache": "redis://192.168.8.94:6380/0",
+                "session": "redis://192.168.8.94:6380/1",
+                "tx": "redis://192.168.8.94:6380/2",
+                "tavern": "redis://192.168.8.94:6380/3",
+                "wshandler": "redis://192.168.8.94:6380/4"
+            }
+        }
+    },
+    "session_storage": "redis://192.168.8.94:6380/3",
+    "session_ttl": 3600,
+        
+    "maingate_session_storage": "redis://192.168.8.94:6380/1",
+    "maingate_session_ttl" : 3600,
+    "maingate_api_token": "63d08aa34f0162622c11284b",
+    
+    "tavern_redis_url": "redis://192.168.8.94:6380/4",
+    "tavern_service_url": "http://localhost/tavern",
+    "tavern_group_types": {
+        "party": {
+            "max_member": 3,
+            "invite_ttl": 30
+        },
+        "chat" : {
+            "default_capacity" : 1000,
+            "channels" : {
+                "bazzar-1" : {
+                    "name" : "FText(bazzar-1)"
+                },
+                "bazzar-2" : {
+                    "name" : "FText(bazzar-2)"
+                },
+                "bazzar-3" : {
+                    "name" : "FText(bazzar-3)"
+                },
+                "bazzar-4" : {
+                    "name" : "FText(bazzar-4)"
+                },
+                "bazzar-5" : {
+                    "name" : "FText(bazzar-5)"
+                }
+            }
+        }
+    }
+}

config_template.json

@@ -1,65 +1,46 @@
 {
-    "region_storage" : {
+    "region_storage": {
-        "default" : {
+        "default": {
-            "mongo" : "mongodb://192.168.8.94:27017/?replicaSet=repl01&retrywrites=false",
+            "mongo": "mongodb://192.168.8.94:27017/?replicaSet=repl01&retrywrites=false",
-            "redis" : {
+            "redis": {
-                "url" : "redis://192.168.8.94:6379",
+                "cache": "redis://192.168.8.94:6380/0",
-                "offset" : {
+                "session": "redis://192.168.8.94:6380/1",
-                    "cache" : 0,
+                "tx": "redis://192.168.8.94:6380/2",
-                    "session" : 1,
+                "tavern": "redis://192.168.8.94:6380/3",
-                    "ranking" : 2
+                "wshandler": "redis://192.168.8.94:6380/4"
-                }
-            }
-        },
-        "dev" : {
-            "mongo" : "mongodb://192.168.8.94:27017/?replicaSet=repl01&retrywrites=false",
-            "redis" : {
-                "url" : "redis://192.168.8.94:6379",
-                "offset" : {
-                    "cache" : 0,
-                    "session" : 1,
-                    "ranking" : 2
-                }
             }
         }
     },
-    "maingate_mongodb_url" : "mongodb://192.168.8.94:27017/?replicaSet=repl01&retrywrites=false",
+    "session_storage": "redis://192.168.8.94:6380/5",
-    "maingate_service_url" : "http://localhost/maingate",
+    "session_ttl": 3600,
-    "maingate_api_token" : "63d08aa34f0162622c11284b",
         
-    "tavern_service_url" : "http://localhost/tavern",
+    "maingate_api_token": "63d08aa34f0162622c11284b",
-    "tavern_group_types" : {
+    
-        "subjugate" : {
+    "tavern_redis_url": "redis://192.168.8.94:6380/7",
-            "text_search_field" : ["name"],
+    "tavern_service_url": "http://localhost/tavern",
-            "unique_index" : ["name,_id", "_id,members", "name,hidden"],
+    "tavern_group_types": {
-            "search_index" : ["rules"],
+        "party": {
-            "member_index" : ["_gid,candidate,luts","_gid,luts","_gid,expiring"],
+            "max_member": 3,
-            "invite_ttl" : 30,
+            "invite_ttl": 30
-            "candidate_ttl" : 3600,
-            "invitee_exlusive" : true,
-            "invitee_is_member" : true,
-            "max_member" : 4
         },
-        "lobby" : {
+        "chat" : {
-            "max_member" : 3,
+            "default_capacity" : 1000,
-            "invitee_exlusive" : true,
+            "channels" : {
-            "invitee_is_member" : true,
+                "bazzar-1" : {
-            "transient" : true,
+                    "name" : "FText(bazzar-1)"
-            "invite_ttl" : 30
+                },
-        }
+                "bazzar-2" : {
-    },
+                    "name" : "FText(bazzar-2)"
-
+                },
-    "ws_sync_pipeline" : "redis://192.168.8.94:6379/3",
+                "bazzar-3" : {
-        
+                    "name" : "FText(bazzar-3)"
-    "services" : {
+                },
-        "kingdom" : {
+                "bazzar-4" : {
-            "개발중" : {
+                    "name" : "FText(bazzar-4)"
-                "url" :"http://localhost/warehouse/dev",
+                },
-                "development" : true
+                "bazzar-5" : {
-            },
+                    "name" : "FText(bazzar-5)"
-            "개인서버" : {
+                }
-                "url" : "http://localhost/warehouse/private",
-                "development" : false
             }
         }
     }

core/group.go

@@ -1,49 +1,3 @@
 package core
 
-import (
+type configDocument map[string]any
-	"net/url"
-
-	"repositories.action2quare.com/ayo/gocommon/wshandler"
-
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-type groupConfig struct {
-	UniqueIndex      []string `json:"unique_index"`
-	SearchIndex      []string `json:"search_index"`
-	MemberIndex      []string `json:"member_index"`
-	TextSearchFields []string `json:"text_search_field"`
-	InviteExpire     int32    `json:"invite_ttl"`    // 그룹이 개인에게 보낸 초대장 만료 기한
-	CandidateExpire  int32    `json:"candidate_ttl"` // 개인이 그룹에게 보낸 신청서 만료 기한
-	InviteeExlusive  bool     `json:"invitee_exlusive"`
-	InviteeIsMember  bool     `json:"invitee_is_member"`
-	MaxMember        int      `json:"max_member"`
-	Transient        bool     `json:"transient"`
-
-	Name string
-}
-
-type group interface {
-	Create(form url.Values, doc bson.M) (primitive.ObjectID, error)
-	Candidate(groupID primitive.ObjectID, memberID primitive.ObjectID, doc bson.M) error
-	Join(groupID primitive.ObjectID, memberID primitive.ObjectID, ticketID primitive.ObjectID, doc bson.M) (newTicketID primitive.ObjectID, err error)
-	FindTicketID(groupID primitive.ObjectID, memberID primitive.ObjectID) primitive.ObjectID
-	Invite(groupID primitive.ObjectID, memberID primitive.ObjectID, inviterDoc bson.M, inviteeDoc bson.M) (string, error)
-	UpdateGroupMember(groupID primitive.ObjectID, memberID primitive.ObjectID, ticketID primitive.ObjectID, doc bson.M) error
-	CancelInvitation(groupID primitive.ObjectID, ticketID primitive.ObjectID) error
-	AcceptInvitation(groupID primitive.ObjectID, mid primitive.ObjectID, ticketID primitive.ObjectID, member bson.M) (primitive.ObjectID, error)
-	DenyInvitation(groupID primitive.ObjectID, mid primitive.ObjectID, ticketID primitive.ObjectID) error
-	QueryInvitations(memberID primitive.ObjectID, after primitive.Timestamp) ([]bson.M, error)
-	Exist(groupID primitive.ObjectID, filter bson.M) (bool, error)
-	FindAll(filter bson.M, projection string, after primitive.Timestamp) ([]bson.M, error)
-	FindOne(groupID primitive.ObjectID, projection string) (bson.M, error)
-	QueryMembers(groupID primitive.ObjectID, requesterID primitive.ObjectID, projection string, after primitive.Timestamp) (map[string]bson.M, error)
-	QueryMember(groupID primitive.ObjectID, memberID primitive.ObjectID, ticketID primitive.ObjectID, projection string) (bson.M, error)
-	Leave(groupID primitive.ObjectID, memberID primitive.ObjectID, ticketID primitive.ObjectID) error
-	DropPausedMember(groupID primitive.ObjectID, memberID primitive.ObjectID) error
-	PauseMember(groupID primitive.ObjectID, memberID primitive.ObjectID, conn *wshandler.Richconn) error
-	UpdateMemberDocument(groupID primitive.ObjectID, memberID primitive.ObjectID, doc bson.M) error
-	Dismiss(groupID primitive.ObjectID) error
-	UpdateGroupDocument(groupID primitive.ObjectID, body []byte) error
-}

core/group_chat.go

@@ -0,0 +1,348 @@
+package core
+
+import (
+	"encoding/gob"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/go-redis/redis/v8"
+	"github.com/gorilla/websocket"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+	"repositories.action2quare.com/ayo/gocommon"
+	"repositories.action2quare.com/ayo/gocommon/logger"
+	"repositories.action2quare.com/ayo/gocommon/wshandler"
+)
+
+type channelID = string
+type channelConfig struct {
+	Capacity  int64            `json:"capacity"`
+	Size      int64            `json:"size"`
+	Key       string           `json:"key"`
+	Members   map[string]int32 `json:"members"`
+	emptyJson string
+	inoutChan chan string
+}
+
+type chatConfig struct {
+	DefaultCapacity int64                     `json:"default_capacity"`
+	Channels        map[string]*channelConfig `json:"channels"`
+}
+
+type groupChat struct {
+	chatConfig
+	rh                  *gocommon.RedisonHandler
+	enterRoom           func(channelID, accountID)
+	leaveRoom           func(channelID, accountID)
+	sendUpstreamMessage func(msg *wshandler.UpstreamMessage)
+}
+
+func init() {
+	gob.Register(map[string]string{})
+}
+
+func (gc *groupChat) Initialize(tv *Tavern, cfg configDocument) error {
+	rem, _ := json.Marshal(cfg)
+	if err := json.Unmarshal(rem, &gc.chatConfig); err != nil {
+		return err
+	}
+
+	gc.enterRoom = func(chanid channelID, accid accountID) {
+		tv.wsh.EnterRoom(string(chanid), accid)
+	}
+	gc.leaveRoom = func(chanid channelID, accid accountID) {
+		tv.wsh.LeaveRoom(string(chanid), accid)
+	}
+	gc.sendUpstreamMessage = func(msg *wshandler.UpstreamMessage) {
+		tv.wsh.SendUpstreamMessage(msg)
+	}
+
+	gc.rh = tv.redison
+
+	for name, cfg := range gc.chatConfig.Channels {
+		if cfg.Capacity == 0 {
+			cfg.Capacity = gc.chatConfig.DefaultCapacity
+		}
+		cfg.Key = name
+		cfg.Size = 0
+
+		jm, _ := json.Marshal(cfg)
+		cfg.emptyJson = fmt.Sprintf("[%s]", string(jm))
+		cfg.Members = make(map[string]int32)
+		_, err := gc.rh.JSONSet(name, "$", cfg)
+		if *devflag && err != nil {
+			gc.rh.JSONDel(name, "$")
+			_, err = gc.rh.JSONSet(name, "$", cfg)
+		}
+
+		if err != nil {
+			return err
+		}
+
+		inoutchan := make(chan string, 10)
+		cfg.inoutChan = inoutchan
+
+		go func(chanid string) {
+			var cur []string
+			tick := time.After(3 * time.Second)
+			for {
+				select {
+				case <-tick:
+					tick = time.After(3 * time.Second)
+					if len(cur) > 0 {
+						gc.sendUpstreamMessage(&wshandler.UpstreamMessage{
+							Target: "#" + chanid,
+							Body:   map[string]any{"inout": cur},
+							Tag:    []string{"ChattingChannelProperties"},
+						})
+						cur = nil
+					}
+
+				case m := <-inoutchan:
+					cur = append(cur, m)
+				}
+			}
+		}(name)
+	}
+
+	return nil
+}
+
+func (gc *groupChat) ClientConnected(conn *websocket.Conn, callby *wshandler.Sender) {
+}
+
+func (gc *groupChat) ClientDisconnected(msg string, callby *wshandler.Sender) {
+	if msg == wshandler.ForceShutdownCloseMessage {
+		gc.rh.Del(gc.rh.Context(), "gc-"+callby.Accid.Hex()).Result()
+		return
+	}
+
+	chans, _ := gc.rh.HGetAll(gc.rh.Context(), "gc-"+callby.Accid.Hex()).Result()
+	gc.rh.Del(gc.rh.Context(), "gc-"+callby.Accid.Hex()).Result()
+
+	for typename, chanid := range chans {
+		gc.leaveRoom(chanid, callby.Accid)
+		if typename == "public" {
+			cnt, err := gc.rh.JSONDel(chanid, "$.members."+callby.Alias)
+			if cnt > 0 {
+				if cfg, ok := gc.chatConfig.Channels[chanid]; ok {
+					cfg.inoutChan <- "-" + callby.Alias
+				}
+			} else if err != nil {
+				logger.Println("groupchat ClientDisconnected JSONDel err :", err, callby.Alias)
+			} else {
+				logger.Println("groupchat ClientDisconnected JSONDel cnt 0 :", callby.Alias)
+			}
+		} else {
+			logger.Println("groupchat ClientDisconnected leave private channel :", chanid, callby.Alias)
+			gc.sendUpstreamMessage(&wshandler.UpstreamMessage{
+				Target: "#" + chanid,
+				Body:   map[string]any{"sender": callby.Alias},
+				Tag:    []string{typename + ".LeavePrivateChannel"},
+			})
+		}
+	}
+}
+
+func (gc *groupChat) EnterPublicChannel(ctx wshandler.ApiCallContext) {
+	gc.LeavePublicChannel(ctx)
+
+	chanid := ctx.Arguments[0].(string)
+	cfg, ok := gc.chatConfig.Channels[chanid]
+	if !ok {
+		return
+	}
+
+	atomicsize, _ := gc.rh.JSONObjLen(chanid, "$.members")
+	if len(atomicsize) == 0 {
+		return
+	}
+
+	if atomicsize[0] >= cfg.Capacity {
+		logger.Println("chatting channel is full :", chanid, atomicsize[0], cfg.Capacity)
+		return
+	}
+
+	cnt, _ := gc.rh.HSet(gc.rh.Context(), "gc-"+ctx.CallBy.Accid.Hex(), "public", chanid).Result()
+	if cnt == 0 {
+		logger.Println("HSet cnt 0 :", chanid, ctx.CallBy.Alias)
+		return
+	}
+
+	ok, err := gc.rh.JSONSet(chanid, "$.members."+ctx.CallBy.Alias, 1)
+	if err != nil {
+		gc.rh.HDel(gc.rh.Context(), "gc-"+ctx.CallBy.Accid.Hex(), "public").Result()
+		logger.Println("JSONSet $.members failed :", err, chanid, ctx.CallBy.Alias)
+		return
+	}
+
+	if !ok {
+		gc.rh.HDel(gc.rh.Context(), "gc-"+ctx.CallBy.Accid.Hex(), "public").Result()
+		logger.Println("JSONSet $.members not ok :", chanid, ctx.CallBy.Alias)
+		return
+	}
+
+	gc.enterRoom(chanid, ctx.CallBy.Accid)
+	cfg.inoutChan <- "+" + ctx.CallBy.Alias
+
+	members, _ := gc.rh.JSONGetDocuments(chanid, "$.members")
+	var toarr []string
+	if len(members) > 0 {
+		toarr = make([]string, 0, len(members[0]))
+		for k := range members[0] {
+			toarr = append(toarr, k)
+		}
+	} else {
+		toarr = []string{}
+	}
+
+	gc.sendUpstreamMessage(&wshandler.UpstreamMessage{
+		Target: ctx.CallBy.Accid.Hex(),
+		Body:   map[string]any{"members": toarr},
+		Tag:    []string{"ChattingChannelProperties"},
+	})
+}
+
+func (gc *groupChat) LeavePublicChannel(ctx wshandler.ApiCallContext) {
+	oldchan, _ := gc.rh.HGet(gc.rh.Context(), "gc-"+ctx.CallBy.Accid.Hex(), "public").Result()
+	if len(oldchan) > 0 {
+		gc.rh.HDel(gc.rh.Context(), "gc-"+ctx.CallBy.Accid.Hex(), "public")
+
+		cnt, err := gc.rh.JSONDel(oldchan, "$.members."+ctx.CallBy.Alias)
+		if cnt > 0 {
+			gc.leaveRoom(oldchan, ctx.CallBy.Accid)
+			if cfg, ok := gc.chatConfig.Channels[oldchan]; ok {
+				cfg.inoutChan <- "-" + ctx.CallBy.Alias
+			}
+		} else if err != nil {
+			logger.Println("groupchat LeavePublicChannel JSONDel err :", err, oldchan, ctx.CallBy.Alias)
+		} else {
+			logger.Println("groupchat LeavePublicChannel JSONDel cnt 0 :", oldchan, ctx.CallBy.Alias)
+		}
+	}
+}
+
+func (gc *groupChat) TextMessage(ctx wshandler.ApiCallContext) {
+	chanid := ctx.Arguments[0].(string)
+	msg := ctx.Arguments[1].(string)
+	gc.sendUpstreamMessage(&wshandler.UpstreamMessage{
+		Target: "#" + chanid,
+		Body:   map[string]any{"sender": ctx.CallBy.Alias, "msg": msg},
+		Tag:    []string{"TextMessage"},
+	})
+}
+
+func (gc *groupChat) EnterPrivateChannel(ctx wshandler.ApiCallContext) {
+	typename := ctx.Arguments[0].(string)
+	channel := ctx.Arguments[1].(string)
+	var reason string
+	if len(ctx.Arguments) > 2 {
+		reason = ctx.Arguments[2].(string)
+	}
+
+	if len(reason) > 0 {
+		// 수락
+		ok, err := gc.rh.HSetNX(gc.rh.Context(), "gc-"+ctx.CallBy.Accid.Hex(), typename, channel).Result()
+		if err != nil || !ok {
+			// 이미 다른 private channel 참여 중
+			logger.Println("EnterPrivateChannel failed. HSetNX return err :", err, ctx.CallBy.Accid.Hex(), typename, channel)
+			return
+		}
+		gc.enterRoom(channel, ctx.CallBy.Accid)
+	}
+
+	gc.sendUpstreamMessage(&wshandler.UpstreamMessage{
+		Target: "#" + channel,
+		Body: map[string]any{
+			"sender": ctx.CallBy.Alias,
+			"msg":    reason,
+		},
+		Tag: []string{typename + ".EnterPrivateChannel"},
+	})
+}
+
+func (gc *groupChat) LeavePrivateChannel(ctx wshandler.ApiCallContext) {
+	typename := ctx.Arguments[0].(string)
+	chanid := ctx.Arguments[1].(string)
+	cnt, _ := gc.rh.HDel(gc.rh.Context(), "gc-"+ctx.CallBy.Accid.Hex(), typename).Result()
+	if cnt > 0 {
+		gc.leaveRoom(chanid, ctx.CallBy.Accid)
+		gc.sendUpstreamMessage(&wshandler.UpstreamMessage{
+			Target: "#" + chanid,
+			Body:   map[string]any{"sender": ctx.CallBy.Alias},
+			Tag:    []string{typename + ".LeavePrivateChannel"},
+		})
+	}
+}
+
+func (gc *groupChat) FetchChattingChannels(w http.ResponseWriter, r *http.Request) {
+	var prefix string
+	if err := gocommon.MakeDecoder(r).Decode(&prefix); err != nil {
+		logger.Println("FetchChattingChannels failed. ReadJsonDocumentFromBody returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	if len(prefix) == 0 {
+		logger.Println("FetchChattingChannel failed. prefix is missing")
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	var rows []string
+	for name, cfg := range gc.chatConfig.Channels {
+		if len(prefix) > 0 {
+			if !strings.HasPrefix(name, prefix) {
+				continue
+			}
+		}
+
+		onechan, err := gc.rh.JSONGet(name, "$")
+		if err != nil && err != redis.Nil {
+			logger.Println("FetchChattingChannel failed. HGetAll return err :", err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		if err == redis.Nil || onechan == nil {
+			rows = append(rows, cfg.emptyJson)
+		} else {
+			// json array로 나온다
+			rows = append(rows, strings.Trim(onechan.(string), "[]"))
+		}
+	}
+
+	gocommon.MakeEncoder(w, r).Encode(rows)
+}
+
+func (gc *groupChat) QueryPlayerChattingChannel(w http.ResponseWriter, r *http.Request) {
+	var accid primitive.ObjectID
+	if err := gocommon.MakeDecoder(r).Decode(&accid); err != nil {
+		logger.Println("QueryPlayerChattingChannel failed. ReadJsonDocumentFromBody returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	sub, err := gc.rh.HGetAll(gc.rh.Context(), "gc-"+accid.Hex()).Result()
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	if sub == nil {
+		sub = make(map[string]string)
+	}
+	gocommon.MakeEncoder(w, r).Encode(sub)
+}
+
+func (gc *groupChat) SendMessageOnChannel(w http.ResponseWriter, r *http.Request) {
+	var msg wshandler.UpstreamMessage
+	if err := gocommon.MakeDecoder(r).Decode(&msg); err != nil {
+		logger.Println("SendMessageOnChannel failed. ReadJsonDocumentFromBody return err :", err)
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	gc.sendUpstreamMessage(&msg)
+}

core/group_instant.go

@@ -0,0 +1,243 @@
+package core
+
+import (
+	"errors"
+	"net/http"
+
+	"repositories.action2quare.com/ayo/gocommon"
+	"repositories.action2quare.com/ayo/gocommon/logger"
+	"repositories.action2quare.com/ayo/gocommon/wshandler"
+
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+)
+
+type instantDoc struct {
+	Members map[string]primitive.M `json:"_members"`
+	Count   int64                  `json:"_count"`
+	Body    primitive.M            `json:"_body"`
+	Gid     primitive.ObjectID     `json:"_gid"`
+
+	rh    *gocommon.RedisonHandler
+	idstr string
+}
+
+func (gd *instantDoc) strid() string {
+	if len(gd.idstr) == 0 {
+		gd.idstr = gd.Gid.Hex()
+	}
+	return gd.idstr
+}
+
+func (gd *instantDoc) tid(in accountID) string {
+	return makeTid(gd.Gid, in)
+}
+
+var errGroupAlreadyDestroyed = errors.New("instant group is already destroyed")
+
+func (gd *instantDoc) removeMember(mid accountID) error {
+	counts, _ := gd.rh.JSONNumIncrBy(gd.strid(), "$._count", -1)
+	if len(counts) == 0 {
+		// 이미 지워진 인스턴트그룹
+		return errGroupAlreadyDestroyed
+	}
+
+	if _, err := gd.rh.JSONDel(gd.strid(), "$._members."+gd.tid(mid)); err != nil {
+		return err
+	}
+
+	gd.Count = counts[0]
+	return nil
+}
+
+type groupInstant struct {
+	sendUpstreamMessage func(*wshandler.UpstreamMessage)
+	enterRoom           func(groupID, accountID)
+	leaveRoom           func(groupID, accountID)
+	rh                  *gocommon.RedisonHandler
+}
+
+func (gi *groupInstant) Initialize(tv *Tavern) error {
+	gi.rh = tv.redison
+	gi.sendUpstreamMessage = func(msg *wshandler.UpstreamMessage) {
+		tv.wsh.SendUpstreamMessage(msg)
+	}
+	gi.enterRoom = func(gid groupID, accid accountID) {
+		tv.wsh.EnterRoom(gid.Hex(), accid)
+	}
+	gi.leaveRoom = func(gid groupID, accid accountID) {
+		tv.wsh.LeaveRoom(gid.Hex(), accid)
+	}
+
+	return nil
+}
+
+func (gi *groupInstant) UpdateInstantDocument(w http.ResponseWriter, r *http.Request) {
+	var data struct {
+		Gid    primitive.ObjectID
+		Doc    primitive.M
+		Result string
+	}
+	if err := gocommon.MakeDecoder(r).Decode(&data); err != nil {
+		logger.Println("UpdateInstantDocument failed. Decode returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	gd := partyDoc{
+		id: data.Gid,
+		rh: gi.rh,
+	}
+	if err := gi.rh.JSONMSetRel(gd.strid(), "$.", data.Doc); err != nil {
+		logger.Println("UpdateInstantDocument failed. JSONMSetRel returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	// 업데이트 알림
+	gi.sendUpstreamMessage(&wshandler.UpstreamMessage{
+		Target: "#" + gd.strid(),
+		Body:   data.Doc,
+		Tag:    []string{"GroupDocFragment"},
+	})
+
+	if data.Result == "after" {
+		fulldoc := gd.loadFull()
+		if fulldoc != nil {
+			tids := fulldoc["_members"].(map[string]any)
+			mids := make(map[string]any)
+			for k, v := range tids {
+				mid := midFromTid(data.Gid, k)
+				mids[mid.Hex()] = v
+			}
+			fulldoc["_members"] = mids
+		}
+		gocommon.MakeEncoder(w, r).Encode(fulldoc)
+	}
+}
+
+func (gi *groupInstant) Build(w http.ResponseWriter, r *http.Request) {
+	var data struct {
+		Members []struct {
+			Mid       primitive.ObjectID
+			Character primitive.M
+		}
+		Body primitive.M
+	}
+	if err := gocommon.MakeDecoder(r).Decode(&data); err != nil {
+		logger.Println("JoinParty failed. DecodeGob returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	// data.Members가 다 살아있는지 부터 확인
+	var result struct {
+		Gid     primitive.ObjectID // 실패하면 없음
+		Success []primitive.ObjectID
+	}
+	for _, m := range data.Members {
+		count, err := gi.rh.Exists(gi.rh.Context(), m.Mid.Hex()).Result()
+		if err != nil {
+			logger.Println("instant.Build failed. Exists returns err :", err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		if count != 0 {
+			result.Success = append(result.Success, m.Mid)
+		}
+	}
+
+	if len(result.Success) < len(data.Members) {
+		// 이탈자가 있군
+		// 여기서 중단
+		gocommon.MakeEncoder(w, r).Encode(result)
+		return
+	}
+
+	newid := primitive.NewObjectID()
+	members := make(map[string]primitive.M)
+	for _, m := range data.Members {
+		tid := makeTid(newid, m.Mid)
+		members[tid] = m.Character
+	}
+
+	gd := &instantDoc{
+		Members: members,
+		Body:    data.Body,
+		Count:   int64(len(members)),
+
+		rh:  gi.rh,
+		Gid: newid,
+	}
+
+	_, err := gi.rh.JSONSet(gd.strid(), "$", gd, gocommon.RedisonSetOptionNX)
+	if err != nil {
+		logger.Println("instant.Build failed. JSONSet returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	result.Gid = newid
+	for _, char := range members {
+		delete(char, "_id")
+	}
+
+	// 멤버에 그룹 전체를 알림
+	for _, m := range data.Members {
+		midstr := m.Mid.Hex()
+		gi.rh.JSONSet(midstr, "$.instant", bson.M{"id": gd.strid()})
+		gi.enterRoom(newid, m.Mid)
+		gi.sendUpstreamMessage(&wshandler.UpstreamMessage{
+			Target: midstr,
+			Body:   gd,
+			Tag:    []string{"GroupDocFull"},
+		})
+	}
+
+	gocommon.MakeEncoder(w, r).Encode(result)
+}
+
+func (gi *groupInstant) makeClientClean(accid primitive.ObjectID) {
+	gids, _ := gi.rh.JSONGetString(accid.Hex(), "$.instant.id")
+
+	if len(gids) > 0 && len(gids[0]) > 0 {
+		gidstr := gids[0]
+		gid, _ := primitive.ObjectIDFromHex(gidstr)
+
+		gi.rh.JSONDel(accid.Hex(), "$.instant.id")
+		gi.leaveRoom(gid, accid)
+
+		// gid에는 제거 메시지 보냄
+		gd := instantDoc{
+			Gid: gid,
+			rh:  gi.rh,
+		}
+
+		gi.sendUpstreamMessage(&wshandler.UpstreamMessage{
+			Target: "#" + gd.strid(),
+			Body: bson.M{
+				gd.tid(accid): bson.M{},
+			},
+			Tag: []string{"MemberDocFull"},
+		})
+
+		gd.removeMember(accid)
+		if gd.Count == 0 {
+			gd.rh.Del(gd.rh.Context(), gd.strid()).Result()
+		}
+	}
+}
+
+func (gi *groupInstant) MakeClientClean(w http.ResponseWriter, r *http.Request) {
+	var accid primitive.ObjectID
+	if err := gocommon.MakeDecoder(r).Decode(&accid); err != nil {
+		logger.Println("MakeClientClean failed. decode returns err :", err)
+		return
+	}
+	gi.makeClientClean(accid)
+}
+
+func (gi *groupInstant) ClientDisconnected(msg string, callby *wshandler.Sender) {
+	gi.makeClientClean(callby.Accid)
+}

core/group_party.go

@@ -0,0 +1,979 @@
+package core
+
+import (
+	"context"
+	"encoding/gob"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/go-redis/redis/v8"
+	"repositories.action2quare.com/ayo/gocommon"
+	"repositories.action2quare.com/ayo/gocommon/logger"
+	"repositories.action2quare.com/ayo/gocommon/wshandler"
+
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+)
+
+type accountID = primitive.ObjectID
+type groupID = primitive.ObjectID
+
+func makeTid(gid groupID, in accountID) string {
+	var out primitive.ObjectID
+	for i := range in {
+		out[12-i-1] = gid[i] ^ in[12-i-1]
+	}
+	return out.Hex()
+}
+
+func midFromTid(gid groupID, in string) accountID {
+	h, _ := primitive.ObjectIDFromHex(in)
+
+	var out accountID
+	for i := range h {
+		out[12-i-1] = gid[i] ^ h[12-i-1]
+	}
+	return out
+}
+
+type Invitation struct {
+	GroupID     groupID `json:"_gid"`
+	TicketID    string  `json:"_tid"`
+	Inviter     bson.M  `json:"_inviter"` // memberDoc.Body
+	ExpireAtUTC int64   `json:"_expire_at_utc"`
+}
+
+// 플레이어한테 공유하는 멤버 정보
+type memberDoc struct {
+	Body         bson.M `json:"_body"`
+	Invite       bool   `json:"_invite"`
+	InviteExpire int64  `json:"_invite_exp"`
+}
+
+type InvitationFail bson.M
+
+type partyDoc struct {
+	Members  map[string]any `json:"_members"`
+	InCharge string         `json:"_incharge"`
+	Gid      string         `json:"_gid"`
+
+	rh *gocommon.RedisonHandler
+	id groupID
+}
+
+func init() {
+	gob.Register(partyDoc{})
+	gob.Register(Invitation{})
+}
+
+func (gd *partyDoc) loadMemberFull(tid string) (bson.M, error) {
+	full, err := gd.rh.JSONGet(gd.strid(), "$._members."+tid)
+	if err != nil {
+		return nil, err
+	}
+
+	bt := []byte(full.(string))
+	bt = bt[1 : len(bt)-1]
+
+	var doc bson.M
+	if err = json.Unmarshal(bt, &doc); err != nil {
+		return nil, err
+	}
+
+	return doc, nil
+}
+
+func (gd *partyDoc) loadFull() (doc bson.M) {
+	// 새 멤버에 그룹 전체를 알림
+	full, err := gd.rh.JSONGet(gd.strid(), "$")
+	if err == nil {
+		bt := []byte(full.(string))
+		bt = bt[1 : len(bt)-1]
+		err = json.Unmarshal(bt, &doc)
+		if err != nil {
+			logger.Println("loadFull err :", err)
+		}
+	} else {
+		logger.Println("loadFull err :", err)
+	}
+	return
+}
+
+func (gd *partyDoc) strid() string {
+	if len(gd.Gid) == 0 {
+		gd.Gid = gd.id.Hex()
+	}
+	return gd.Gid
+}
+
+func (gd *partyDoc) tid(in accountID) string {
+	return makeTid(gd.id, in)
+}
+
+func (gd *partyDoc) mid(tid string) accountID {
+	tidobj, _ := primitive.ObjectIDFromHex(tid)
+	var out primitive.ObjectID
+	for i := range tidobj {
+		out[12-i-1] = gd.id[i] ^ tidobj[12-i-1]
+	}
+	return out
+}
+
+func (gd *partyDoc) addInvite(mid accountID, body bson.M, ttl time.Duration, max int) (*memberDoc, error) {
+	targetmid := mid
+	targetbody := body
+
+	// 초대 가능한 빈 자리가 있나
+	tids, err := gd.rh.JSONObjKeys(gd.strid(), "$._members")
+	if err != nil {
+		return nil, err
+	}
+
+	now := time.Now().UTC()
+	createNewDoc := func() *memberDoc {
+		return &memberDoc{
+			Body:         targetbody,
+			Invite:       true,
+			InviteExpire: now.Add(ttl).Unix(),
+		}
+	}
+
+	newtid := gd.tid(targetmid)
+	if len(tids) < max {
+		// 빈자리를 찾았다.
+		newdoc := createNewDoc()
+		_, err := gd.rh.JSONSet(gd.strid(), "$._members."+newtid, newdoc)
+		return newdoc, err
+	}
+
+	expires, err := gd.rh.JSONGetInt64(gd.strid(), "$._members.._invite_exp")
+	if err != nil {
+		return nil, err
+	}
+
+	var delpaths []string
+	for i, expire := range expires {
+		if expire < now.Unix() {
+			// 만료된 초대가 있네? 지우자
+			delpaths = append(delpaths, "$._members."+tids[i])
+		}
+	}
+
+	if len(delpaths) == 0 {
+		// 빈자리가 없다
+		return nil, nil
+	}
+
+	if err := gd.rh.JSONMDel(gd.strid(), delpaths); err != nil {
+		return nil, err
+	}
+
+	newdoc := createNewDoc()
+	_, err = gd.rh.JSONSet(gd.strid(), "$._members."+newtid, newdoc)
+	return newdoc, err
+}
+
+func (gd *partyDoc) addMember(mid accountID, character bson.M, option string) (bson.M, error) {
+	tid := gd.tid(mid)
+	prefix := "$._members." + tid
+
+	if option == gocommon.RedisonSetOptionNX {
+		if _, err := gd.rh.JSONSet(gd.strid(), prefix, bson.M{"_body": character}, gocommon.RedisonSetOptionNX); err != nil {
+			return nil, err
+		}
+	} else {
+		if _, err := gd.rh.JSONSet(gd.strid(), prefix+"._body", character, gocommon.RedisonSetOptionXX); err != nil {
+			return nil, err
+		}
+
+		if err := gd.rh.JSONMDel(gd.strid(), []string{prefix + "._invite", prefix + "._invite_exp"}); err != nil {
+			return nil, err
+		}
+	}
+	gd.rh.Persist(gd.rh.Context(), gd.strid()).Result()
+
+	return gd.loadMemberFull(tid)
+}
+
+func (gd *partyDoc) getIncharge() string {
+	if len(gd.InCharge) == 0 {
+		incharge, err := gd.rh.JSONGet(gd.strid(), "$._incharge")
+		if err == nil && incharge != nil {
+			gd.InCharge = strings.Trim(incharge.(string), "[]\"")
+		}
+	}
+
+	return gd.InCharge
+}
+
+func (gd *partyDoc) removeMemberByTid(tid string) error {
+	_, err := gd.rh.JSONDel(gd.strid(), "$._members."+tid)
+	if err != nil {
+		return err
+	}
+
+	counts, err := gd.rh.JSONObjLen(gd.strid(), "$._members")
+	if err != nil {
+		return err
+	}
+
+	if len(counts) > 0 && counts[0] == 0 {
+		_, err = gd.rh.Del(gd.rh.Context(), gd.strid()).Result()
+	}
+
+	return err
+}
+
+func (gd *partyDoc) removeMember(mid accountID) error {
+	return gd.removeMemberByTid(gd.tid(mid))
+}
+
+func (gd *partyDoc) getMembers() (map[string]any, error) {
+	res, err := gd.rh.JSONGet(gd.strid(), "$._members")
+	if err != nil {
+		return nil, err
+	}
+
+	var temp []map[string]any
+	err = json.Unmarshal([]byte(res.(string)), &temp)
+	if err != nil {
+		return nil, err
+	}
+
+	out := make(map[string]any)
+	for k, v := range temp[0] {
+		body := v.(map[string]any)["_body"]
+		out[gd.mid(k).Hex()] = body
+	}
+
+	return out, nil
+}
+
+type partyConfig struct {
+	InviteExpire int32 `json:"invite_ttl"` // 그룹이 개인에게 보낸 초대장 만료 기한
+	MaxMember    int   `json:"max_member"`
+
+	Name string
+}
+
+type groupParty struct {
+	partyConfig
+	sendUpstreamMessage func(*wshandler.UpstreamMessage)
+	enterRoom           func(groupID, accountID)
+	leaveRoom           func(groupID, accountID)
+	rh                  *gocommon.RedisonHandler
+}
+
+func (gp *groupParty) Initialize(tv *Tavern, cfg configDocument) error {
+	rem, _ := json.Marshal(cfg)
+	err := json.Unmarshal(rem, &gp.partyConfig)
+	if err != nil {
+		return err
+	}
+
+	gp.rh = tv.redison
+	gp.sendUpstreamMessage = func(msg *wshandler.UpstreamMessage) {
+		tv.wsh.SendUpstreamMessage(msg)
+	}
+	gp.enterRoom = func(gid groupID, accid accountID) {
+		tv.wsh.EnterRoom(gid.Hex(), accid)
+	}
+	gp.leaveRoom = func(gid groupID, accid accountID) {
+		gp.rh.JSONDel(accid.Hex(), "$.party.state")
+		tv.wsh.LeaveRoom(gid.Hex(), accid)
+	}
+
+	return nil
+}
+
+// JoinParty : 그룹에 참가
+// - type : 그룹 타입
+// - 그룹 타입에 맞는 키(주로 _id)
+// - member_id : 참가 멤버의 아이디
+// - body : 멤버의 속성 bson document
+func (gp *groupParty) JoinParty(w http.ResponseWriter, r *http.Request) {
+	var data struct {
+		Gid       primitive.ObjectID
+		Mid       primitive.ObjectID
+		Character bson.M
+		Option    string
+	}
+	if err := gocommon.MakeDecoder(r).Decode(&data); err != nil {
+		logger.Println("JoinParty failed. DecodeGob returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	// Option : ["NX" | "XX" | ""]
+
+	character := data.Character
+	gid := data.Gid
+	mid := data.Mid
+	option := strings.ToUpper(data.Option)
+
+	if gid.IsZero() || mid.IsZero() {
+		logger.Println("JoinParty failed. mid should be exist")
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	gd, err := gp.find(gid)
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	if gd == nil {
+		// 그룹이 없다. 없을 수도 있지
+		gocommon.MakeEncoder(w, r).Encode("")
+		return
+	}
+
+	// 내 정보 업데이트할 때에도 사용됨
+	if option == "XX" {
+		// 이미 멤버여야 재입장 가능
+		path := "$._members." + gd.tid(mid) + "._body"
+		if _, err := gd.rh.JSONSet(gd.strid(), path, character, gocommon.RedisonSetOptionXX); err != nil {
+			// 멤버가 아니네? 그새 파티장이 쫓아냈을 수도 있다.
+			gocommon.MakeEncoder(w, r).Encode("")
+			return
+		}
+	}
+
+	gp.rh.JSONSet(mid.Hex(), "$.party", bson.M{"id": gid.Hex()})
+	memdoc, err := gd.addMember(mid, character, option)
+	if err != nil {
+		logger.Println("JoinParty failed :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	// 기존 유저에게 새 유저 알림
+	gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+		Target: "#" + gid.Hex(),
+		Body: map[string]any{
+			gd.tid(mid): memdoc,
+		},
+		Tag: []string{"MemberDocFull"},
+	})
+
+	gp.enterRoom(gid, mid)
+
+	gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+		Target: mid.Hex(),
+		Body:   gd.loadFull(),
+		Tag:    []string{"GroupDocFull"},
+	})
+
+	gocommon.MakeEncoder(w, r).Encode(gd.strid())
+}
+
+func (gp *groupParty) ForceClearPartyMember(w http.ResponseWriter, r *http.Request) {
+	var doc struct {
+		Gid primitive.ObjectID
+		Mid primitive.ObjectID
+	}
+
+	if err := gocommon.MakeDecoder(r).Decode(&doc); err != nil {
+		logger.Println("ConditionalClearPartyMember failed. DecodeGob returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	gd := partyDoc{
+		id: doc.Gid,
+		rh: gp.rh,
+	}
+
+	gd.removeMember(doc.Mid)
+}
+
+func (gp *groupParty) ConditionalClearPartyMember(w http.ResponseWriter, r *http.Request) {
+	var doc struct {
+		Gid string
+		Mid string
+	}
+
+	// accid가 접속해 있지 않으면 파티에서 나간 걸로 간주하고
+	// accid가 접속해 있으면 아무것도 하지 않는다.
+	if err := gocommon.MakeDecoder(r).Decode(&doc); err != nil {
+		logger.Println("ConditionalClearPartyMember failed. DecodeGob returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	pids, err := gp.rh.JSONGetString(doc.Mid, "$.party.id")
+	if err != nil {
+		logger.Println("ConditionalClearPartyMember failed. gp.rh.JSONGetString returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	removeMember := func() {
+		gid, _ := primitive.ObjectIDFromHex(doc.Gid)
+		mid, _ := primitive.ObjectIDFromHex(doc.Mid)
+		gd := partyDoc{
+			id: gid,
+			rh: gp.rh,
+		}
+		if gd.getIncharge() == gd.tid(mid) {
+			// 방장이 나갔다.
+			gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+				Target: "#" + doc.Gid,
+				Body:   bson.M{"gid": gid},
+				Tag:    []string{"GroupDocFull", gid.Hex()},
+			})
+			gd.rh.Del(gd.rh.Context(), gd.strid()).Result()
+		} else {
+			gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+				Target: "#" + doc.Gid,
+				Body: bson.M{
+					gd.tid(mid): bson.M{},
+				},
+				Tag: []string{"MemberDocFull"},
+			})
+			gd.removeMember(mid)
+		}
+	}
+
+	if len(pids) == 0 {
+		// 없다.
+		// doc.Gid에서 제거
+		removeMember()
+	} else if pids[0] != doc.Gid {
+		// 다른 파티? 기존 파티에서 제거
+		removeMember()
+	}
+}
+
+// InviteToParty : 초대
+// - type : 초대 타입 (required)
+// - from : 초대하는 자 (required)
+// - to : 초대받는 자 (required)
+// - timeout : 초대 유지시간(optional. 없으면 config 기본 값)
+// - (body) : 검색시 노출되는 document
+func (gp *groupParty) InviteToParty(w http.ResponseWriter, r *http.Request) {
+	var doc struct {
+		Gid             primitive.ObjectID
+		Mid             primitive.ObjectID
+		Target          primitive.ObjectID
+		Inviter         bson.M
+		Invitee         bson.M
+		InitialPartyDoc bson.M
+	}
+
+	if err := gocommon.MakeDecoder(r).Decode(&doc); err != nil {
+		logger.Println("InviteToParty failed. DecodeGob returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	targetid := doc.Target
+	gid := doc.Gid
+	mid := doc.Mid
+
+	// targetid에 초대한 mid가 들어있다.
+	success, err := gp.rh.SetNX(context.Background(), "inv."+targetid.Hex(), mid.Hex(), time.Duration(gp.InviteExpire)*time.Second).Result()
+	if err != nil {
+		logger.Println("InviteToParty failed. gp.rh.SetNX() return err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	if !success {
+		// 이미 초대 중이다.
+		// inviter한테 알려줘야 한다.
+		gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+			Target: mid.Hex(),
+			Body:   doc.Invitee,
+			Tag:    []string{"InvitationFail"},
+		})
+		return
+	}
+
+	gd, err := gp.find(gid)
+	if err != nil {
+		logger.Println("InviteToParty failed. gp.find() return err :", err)
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	if gd == nil {
+		gid = primitive.NewObjectID()
+		gd, err = gp.createGroup(gid, mid, doc.Inviter, doc.InitialPartyDoc)
+		if err != nil {
+			logger.Println("InviteToParty failed. gp.createGroup() return err :", err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		// 내가 wshandler room에 입장
+		gp.enterRoom(gid, mid)
+		gp.rh.JSONSet(mid.Hex(), "$.party", bson.M{"id": gid.Hex()})
+
+		gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+			Target: mid.Hex(),
+			Body:   gd,
+			Tag:    []string{"GroupDocFull"},
+		})
+	}
+
+	newdoc, err := gd.addInvite(targetid, doc.Invitee, time.Duration(gp.InviteExpire+1)*time.Second, gp.MaxMember)
+	if err != nil {
+		logger.Println("InviteToParty failed. gp.addInvite() return err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	// invitee에게 알림
+	gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+		Target: targetid.Hex(),
+		Body: Invitation{
+			GroupID:     gid,
+			TicketID:    gd.tid(targetid),
+			Inviter:     doc.Inviter,
+			ExpireAtUTC: newdoc.InviteExpire,
+		},
+		Tag: []string{"Invitation"},
+	})
+
+	// 그룹에게 알림
+	gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+		Target: "#" + gid.Hex(),
+		Body: bson.M{
+			gd.tid(targetid): bson.M{
+				"nickname": doc.Invitee["nickname"],
+				"_invite":  true,
+			},
+		},
+		Tag: []string{"MemberDocFull"},
+	})
+}
+
+func (gp *groupParty) UpdatePartyMemberDocument(w http.ResponseWriter, r *http.Request) {
+	var doc struct {
+		Gid      string
+		Tid      string
+		Fragment bson.M
+	}
+	if err := gocommon.MakeDecoder(r).Decode(&doc); err != nil {
+		logger.Println("UpdatePartyMemberDocument failed. DecodeGob returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	gidobj, _ := primitive.ObjectIDFromHex(doc.Gid)
+	mid := midFromTid(gidobj, doc.Tid)
+
+	gp.updateMemberDocument(gidobj, mid, doc.Fragment)
+}
+
+func (gp *groupParty) AcceptPartyInvitation(w http.ResponseWriter, r *http.Request) {
+	var doc struct {
+		Gid       primitive.ObjectID
+		Mid       primitive.ObjectID
+		Tid       string
+		Character bson.M
+	}
+	if err := gocommon.MakeDecoder(r).Decode(&doc); err != nil {
+		logger.Println("AcceptPartyInvitation failed. DecodeGob returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	gid := doc.Gid
+	mid := doc.Mid
+	member := doc.Character
+
+	cnt, err := gp.rh.Del(context.Background(), "inv."+mid.Hex()).Result()
+	if err != nil {
+		logger.Println("AcceptPartyInvitation failed. gp.rh.Del returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	if cnt == 0 {
+		// 만료됨
+		w.WriteHeader(http.StatusGatewayTimeout)
+		return
+	}
+
+	pids, err := gp.rh.JSONGetString(mid.Hex(), "$.party.id")
+	if err != nil {
+		logger.Println("AcceptPartyInvitation failed. gp.rh.JSONGetString returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	if len(pids) > 0 && len(pids[0]) > 0 {
+		// 기존에 이미 파티에 들어가 있다.
+		// 기존 파티에서는 탈퇴
+		oldgid, _ := primitive.ObjectIDFromHex(pids[0])
+		oldgd := &partyDoc{
+			id: oldgid,
+			rh: gp.rh,
+		}
+
+		// gid에는 제거 메시지 보냄
+		gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+			Target: "#" + oldgd.strid(),
+			Body: bson.M{
+				oldgd.tid(mid): bson.M{},
+			},
+			Tag: []string{"MemberDocFull"},
+		})
+
+		gp.leaveRoom(oldgid, mid)
+	}
+
+	gd := &partyDoc{
+		id: gid,
+		rh: gp.rh,
+	}
+
+	memberDoc, err := gd.addMember(mid, member, "XX")
+	if err == nil {
+		// 기존 멤버에게 새 멤버를 알림
+		gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+			Target: "#" + gid.Hex(),
+			Body: map[string]any{
+				gd.tid(mid): memberDoc,
+			},
+			Tag: []string{"MemberDocFull"},
+		})
+
+		gp.enterRoom(gid, mid)
+
+		// 현재 내 파티를 기록
+		gp.rh.JSONSet(mid.Hex(), "$.party", bson.M{"id": gid.Hex()})
+
+		// 새 멤버에 그룹 전체를 알림
+		gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+			Target: mid.Hex(),
+			Body:   gd.loadFull(),
+			Tag:    []string{"GroupDocFull"},
+		})
+	} else {
+		logger.Println("AcceptPartyInvitation failed. group.AcceptPartyInvitation returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+	}
+}
+
+func (gp *groupParty) QueryPartyMemberState(w http.ResponseWriter, r *http.Request) {
+	var mid primitive.ObjectID
+	if err := gocommon.MakeDecoder(r).Decode(&mid); err != nil {
+		logger.Println("DenyPartyInvitation failed. DecodeGob returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	if cnt, _ := gp.rh.Exists(gp.rh.Context(), mid.Hex()).Result(); cnt == 0 {
+		return
+	}
+
+	states, _ := gp.rh.JSONGetString(mid.Hex(), "$.party.state")
+	if len(states) > 0 && len(states[0]) > 0 {
+		gocommon.MakeEncoder(w, r).Encode(states[0])
+	} else {
+		gocommon.MakeEncoder(w, r).Encode("connected")
+	}
+}
+
+func (gp *groupParty) updateMemberDocument(gid groupID, mid accountID, doc bson.M) error {
+	gd := &partyDoc{
+		id: gid,
+		rh: gp.rh,
+	}
+	prefixPath := fmt.Sprintf("$._members.%s._body.", gd.tid(mid))
+
+	err := gp.rh.JSONMSetRel(gd.strid(), prefixPath, doc)
+	if err != nil {
+		return err
+	}
+
+	if newstate, ok := doc["_state"]; ok {
+		gp.rh.JSONSet(mid.Hex(), "$.party.state", newstate)
+	}
+
+	gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+		Target: "#" + gid.Hex(),
+		Body: map[string]any{
+			gd.tid(mid): doc,
+		},
+		Tag: []string{"MemberDocFragment"},
+	})
+	return nil
+}
+
+func (gp *groupParty) updatePartyDocument(gid groupID, frag bson.M) error {
+	gd := partyDoc{
+		id: gid,
+		rh: gp.rh,
+	}
+	if err := gp.rh.JSONMSetRel(gd.strid(), "$.", frag); err != nil {
+		return err
+	}
+	// 업데이트 알림
+	gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+		Target: "#" + gid.Hex(),
+		Body:   frag,
+		Tag:    []string{"GroupDocFragment"},
+	})
+	return nil
+}
+
+func (gp *groupParty) UpdatePartyDocument(w http.ResponseWriter, r *http.Request) {
+	var data struct {
+		Gid primitive.ObjectID
+		Doc bson.M
+	}
+
+	if err := gocommon.MakeDecoder(r).Decode(&data); err != nil {
+		logger.Println("UpdatePartyDocument failed. DecodeGob returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	gid := data.Gid
+	frag := data.Doc
+
+	if err := gp.updatePartyDocument(gid, frag); err != nil {
+		logger.Println("UpdatePartyDocument failed. group.UpdatePartyDocument returns err :", err)
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+}
+
+func (gp *groupParty) QueryPartyMembers(w http.ResponseWriter, r *http.Request) {
+	var gid primitive.ObjectID
+	if err := gocommon.MakeDecoder(r).Decode(&gid); err != nil {
+		logger.Println("QueryPartyMembers failed. DecodeGob returns err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	gd := partyDoc{
+		id: gid,
+		rh: gp.rh,
+	}
+
+	members, err := gd.getMembers()
+	if err != nil {
+		logger.Println("QueryPartyMembers failed. group.QueryPartyMembers returns err :", err)
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	if err := gocommon.MakeEncoder(w, r).Encode(members); err != nil {
+		logger.Println("QueryPartyMembers failed. writeBsonDoc return err :", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+}
+
+func (gp *groupParty) createGroup(newid groupID, charge accountID, chargeDoc bson.M, initialGroupDoc bson.M) (*partyDoc, error) {
+	tid := makeTid(newid, charge)
+
+	gd := &partyDoc{
+		Members: map[string]any{
+			tid: &memberDoc{
+				Body:         chargeDoc,
+				Invite:       false,
+				InviteExpire: 0,
+			},
+		},
+		InCharge: tid,
+		Gid:      newid.Hex(),
+
+		rh: gp.rh,
+		id: newid,
+	}
+
+	var err error
+	if initialGroupDoc != nil {
+		initialGroupDoc["_members"] = gd.Members
+		initialGroupDoc["_incharge"] = gd.InCharge
+		initialGroupDoc["_gid"] = gd.Gid
+
+		_, err = gp.rh.JSONSet(gd.strid(), "$", initialGroupDoc, gocommon.RedisonSetOptionNX)
+	} else {
+		_, err = gp.rh.JSONSet(gd.strid(), "$", gd, gocommon.RedisonSetOptionNX)
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	return gd, nil
+}
+
+func (gp *groupParty) find(id groupID) (*partyDoc, error) {
+	if id.IsZero() {
+		return nil, nil
+	}
+
+	_, err := gp.rh.JSONObjLen(id.Hex(), "$")
+	if err == redis.Nil {
+		return nil, nil
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	return &partyDoc{
+		rh: gp.rh,
+		id: id,
+	}, nil
+}
+
+func (gp *groupParty) ClientDisconnected(msg string, callby *wshandler.Sender) {
+	gids, _ := gp.rh.JSONGetString(callby.Accid.Hex(), "$.party.id")
+
+	if len(gids) > 0 && len(gids[0]) > 0 {
+		// mid한테는 빈 GroupDocFull을 보낸다. 그러면 지워짐
+		gidstr := gids[0]
+		gid, _ := primitive.ObjectIDFromHex(gidstr)
+
+		// 나를 먼저 룸에서 빼야 나한테 메시지가 안감
+		gp.leaveRoom(gid, callby.Accid)
+
+		if msg != "pending" {
+			gd := &partyDoc{
+				rh: gp.rh,
+				id: gid,
+			}
+
+			if gd.getIncharge() == gd.tid(callby.Accid) {
+				// 방장이 나감. 방 폭파
+				gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+					Target: "#" + gidstr,
+					Body:   bson.M{"gid": gid},
+					Tag:    []string{"GroupDocFull", gidstr},
+				})
+				gd.rh.Del(gd.rh.Context(), gd.strid()).Result()
+			} else {
+				// gid에는 제거 메시지 보냄
+				gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+					Target: "#" + gidstr,
+					Body: bson.M{
+						makeTid(gid, callby.Accid): bson.M{},
+					},
+					Tag: []string{"MemberDocFull"},
+				})
+				gd.removeMember(callby.Accid)
+			}
+		}
+	}
+}
+
+func (gp *groupParty) UpdatePartyMemberDocumentDirect(ctx wshandler.ApiCallContext) {
+	gidobj, _ := primitive.ObjectIDFromHex(ctx.Arguments[0].(string))
+	doc := ctx.Arguments[1].(map[string]any)
+
+	gp.updateMemberDocument(gidobj, ctx.CallBy.Accid, doc)
+}
+
+func (gp *groupParty) UpdatePartyDocumentDirect(ctx wshandler.ApiCallContext) {
+	gidobj, _ := primitive.ObjectIDFromHex(ctx.Arguments[0].(string))
+	doc := ctx.Arguments[1].(map[string]any)
+
+	gp.updatePartyDocument(gidobj, doc)
+}
+
+func (gp *groupParty) LeaveParty(ctx wshandler.ApiCallContext) {
+	gids, _ := gp.rh.JSONGetString(ctx.CallBy.Accid.Hex(), "$.party.id")
+
+	if len(gids) == 0 || len(gids[0]) == 0 {
+		return
+	}
+	// mid한테는 빈 GroupDocFull을 보낸다. 그러면 지워짐
+	gidstr := gids[0]
+	gid, _ := primitive.ObjectIDFromHex(gidstr)
+	mid := ctx.CallBy.Accid
+	tid := ctx.Arguments[0].(string)
+
+	gd := partyDoc{
+		id: gid,
+		rh: gp.rh,
+	}
+
+	var err error
+	if len(tid) > 0 {
+		if tid != gd.tid(mid) {
+			// mid가 incharge여야 한다. 그래야 tid를 쫓아낼 수 있음
+			incharge, err := gp.rh.JSONGet(gd.strid(), "$._incharge")
+			if err != nil {
+				logger.Println("LeaveParty failed. gp.rh.JSONGet returns err :", err)
+				return
+			}
+			if !strings.Contains(incharge.(string), gd.tid(mid)) {
+				// incharge가 아니네?
+				logger.Println("LeaveParty failed. mid is not incharge")
+				return
+			}
+			mid = midFromTid(gd.id, tid)
+		}
+		err = gd.removeMemberByTid(tid)
+	} else {
+		err = gd.removeMember(mid)
+		// 내가 나갔다
+		gp.rh.JSONDel(mid.Hex(), "$.party.id")
+	}
+
+	if err != nil {
+		logger.Println("LeaveParty failed. gd.removeMember returns err :", err)
+		return
+	}
+
+	if gd.getIncharge() == gd.tid(mid) {
+		// 방장이 나감. 방 폭파
+		gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+			Target: "#" + gidstr,
+			Body:   bson.M{"gid": gid},
+			Tag:    []string{"GroupDocFull", gidstr},
+		})
+		gd.rh.Del(gd.rh.Context(), gd.strid()).Result()
+	} else {
+		// mid한테는 빈 GroupDocFull을 보낸다. 그러면 지워짐
+		gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+			Target: mid.Hex(),
+			Body:   bson.M{"gid": gid},
+			Tag:    []string{"GroupDocFull", gid.Hex()},
+		})
+
+		// gid에는 제거 메시지 보냄
+		gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+			Target: "#" + gd.strid(),
+			Body: bson.M{
+				tid: bson.M{},
+			},
+			Tag: []string{"MemberDocFull"},
+		})
+		gd.removeMember(mid)
+	}
+
+	gp.leaveRoom(gid, mid)
+}
+
+func (gp *groupParty) DenyPartyInvitation(ctx wshandler.ApiCallContext) {
+	gid, _ := primitive.ObjectIDFromHex(ctx.Arguments[0].(string))
+	mid := ctx.CallBy.Accid
+
+	gp.rh.Del(context.Background(), "inv."+mid.Hex()).Result()
+	gd := partyDoc{
+		id: gid,
+		rh: gp.rh,
+	}
+	gd.removeMember(mid)
+
+	gp.sendUpstreamMessage(&wshandler.UpstreamMessage{
+		Target: "#" + gd.strid(),
+		Body: bson.M{
+			gd.tid(mid): bson.M{},
+		},
+		Tag: []string{"MemberDocFull"},
+	})
+}

core/richconn.go

@@ -1,73 +0,0 @@
-package core
-
-import (
-	"context"
-
-	"repositories.action2quare.com/ayo/gocommon/logger"
-	"repositories.action2quare.com/ayo/gocommon/wshandler"
-
-	"github.com/go-redis/redis/v8"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-type richConnOuter struct {
-	wsh *wshandler.WebsocketHandler
-	rc  *wshandler.Richconn
-}
-
-func (sub richConnOuter) JoinTag(region string, tag primitive.ObjectID, tid primitive.ObjectID, hint string) error {
-	sub.wsh.JoinTag(region, tag, tid, sub.rc, hint)
-
-	wsh := sub.wsh
-	sub.rc.RegistOnCloseFunc(tag.Hex(), func() {
-		wsh.LeaveTag(region, tag, tid)
-	})
-	return nil
-}
-
-func (sub richConnOuter) LeaveTag(region string, tag primitive.ObjectID, tid primitive.ObjectID, hint string) error {
-	sub.SetStateInTag(region, tag, tid, "", hint)
-	return sub.wsh.LeaveTag(region, tag, tid)
-}
-
-func (sub richConnOuter) SetStateInTag(region string, tag primitive.ObjectID, tid primitive.ObjectID, state string, hint string) error {
-	return sub.wsh.SetStateInTag(region, tag, tid, state, hint)
-}
-
-func (sub richConnOuter) TurnGroupOnline(key string, gid primitive.ObjectID, score float64) error {
-	gidhex := gid.Hex()
-	_, err := sub.wsh.RedisSync.ZAdd(context.Background(), key, &redis.Z{Score: score, Member: gidhex}).Result()
-	if err != nil {
-		logger.Error("TurnGroupOnline failed. redis.ZAdd return err :", err)
-		return err
-	}
-
-	sub.rc.RegistOnCloseFunc(key, func() {
-		sub.wsh.RedisSync.ZRem(context.Background(), key, gidhex)
-	})
-
-	return nil
-}
-
-func (sub richConnOuter) TurnGroupOffline(key string, gid primitive.ObjectID) error {
-	f := sub.rc.UnregistOnCloseFunc(key)
-	if f != nil {
-		f()
-	} else {
-		sub.wsh.RedisSync.ZRem(context.Background(), key, gid.Hex())
-	}
-	return nil
-}
-
-func (sub richConnOuter) SendMessage(doc []byte) error {
-	return sub.rc.WriteBytes(doc)
-}
-
-func (sub richConnOuter) SendMessageToTag(region string, tag primitive.ObjectID, msg []byte) error {
-	sub.wsh.BroadcastRaw(region, tag, msg)
-	return nil
-}
-
-func (sub richConnOuter) CloseOnPurpose() error {
-	return sub.rc.Close()
-}

core/rpc/connrpc.go

@@ -1,195 +0,0 @@
-package rpc
-
-import (
-	"bytes"
-	"encoding/gob"
-	"fmt"
-	"reflect"
-
-	"repositories.action2quare.com/ayo/gocommon/logger"
-	"repositories.action2quare.com/ayo/gocommon/wshandler"
-
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-var Everybody = primitive.ObjectID([12]byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11})
-
-func init() {
-	gob.Register(bson.M{})
-	gob.Register(primitive.ObjectID{})
-	gob.Register(primitive.Timestamp{})
-}
-
-type RpcCaller struct {
-	publish func(bt []byte) error
-}
-
-func NewRpcCaller(f func(bt []byte) error) RpcCaller {
-	return RpcCaller{
-		publish: f,
-	}
-}
-
-type rpcCallContext struct {
-	alias   primitive.ObjectID
-	publish func(bt []byte) error
-}
-
-func (c *RpcCaller) One(alias primitive.ObjectID) rpcCallContext {
-	return rpcCallContext{
-		alias:   alias,
-		publish: c.publish,
-	}
-}
-
-func (c *RpcCaller) Everybody() rpcCallContext {
-	return rpcCallContext{
-		alias:   Everybody,
-		publish: c.publish,
-	}
-}
-
-func IsCallerCalleeMethodMatch[Callee any]() error {
-	var caller rpcCallContext
-	var callee Callee
-
-	callerType := reflect.TypeOf(caller)
-	calleeType := reflect.TypeOf(callee)
-	for i := 0; i < callerType.NumMethod(); i++ {
-		callerMethod := callerType.Method(i)
-		calleeMethod, ok := calleeType.MethodByName(callerMethod.Name)
-		if !ok {
-			return fmt.Errorf("method '%s' of '%s' is missing", callerMethod.Name, calleeType.Name())
-		}
-
-		if calleeMethod.Func.Type().NumIn() != callerMethod.Func.Type().NumIn() {
-			return fmt.Errorf("method '%s' argument num is not match", callerMethod.Name)
-		}
-
-		if calleeMethod.Func.Type().NumOut() != callerMethod.Func.Type().NumOut() {
-			return fmt.Errorf("method '%s' out num is not match", callerMethod.Name)
-		}
-
-		for i := 1; i < calleeMethod.Func.Type().NumIn(); i++ {
-			if calleeMethod.Func.Type().In(i) != callerMethod.Func.Type().In(i) {
-				return fmt.Errorf("method '%s' argument is not match. %s-%s", callerMethod.Name, calleeMethod.Func.Type().In(i).Name(), callerMethod.Func.Type().In(i).Name())
-			}
-		}
-
-	}
-
-	return nil
-}
-
-type fnsig struct {
-	FunctionName string `bson:"fn"`
-	Args         []any  `bson:"args"`
-}
-
-func Encode[T any](prefix T, fn string, args ...any) ([]byte, error) {
-	m := append([]any{
-		prefix,
-		fn,
-	}, args...)
-
-	buff := new(bytes.Buffer)
-	encoder := gob.NewEncoder(buff)
-	err := encoder.Encode(m)
-	if err != nil {
-		logger.Error("rpcCallContext.send err :", err)
-		return nil, err
-	}
-
-	return buff.Bytes(), nil
-}
-
-func Decode[T any](src []byte) (*T, string, []any, error) {
-	var m []any
-	decoder := gob.NewDecoder(bytes.NewReader(src))
-	if err := decoder.Decode(&m); err != nil {
-		logger.Error("RpcCallee.Call err :", err)
-		return nil, "", nil, err
-	}
-
-	prfix := m[0].(T)
-	fn := m[1].(string)
-
-	return &prfix, fn, m[2:], nil
-}
-
-func decode(src []byte) (string, []any, error) {
-	var sig fnsig
-	decoder := gob.NewDecoder(bytes.NewReader(src))
-	if err := decoder.Decode(&sig); err != nil {
-		logger.Error("RpcCallee.Call err :", err)
-		return "", nil, err
-	}
-
-	return sig.FunctionName, sig.Args, nil
-}
-
-func (c *rpcCallContext) send(fn string, args ...any) error {
-	bt, err := Encode(c.alias, fn, args...)
-	if err != nil {
-		return err
-	}
-	return c.publish(bt)
-}
-
-type RpcCallee[T any] struct {
-	methods map[string]reflect.Method
-	create  func(*wshandler.Richconn) *T
-}
-
-func NewRpcCallee[T any](createReceiverFunc func(*wshandler.Richconn) *T) RpcCallee[T] {
-	out := RpcCallee[T]{
-		methods: make(map[string]reflect.Method),
-		create:  createReceiverFunc,
-	}
-
-	var tmp *T
-
-	tp := reflect.TypeOf(tmp)
-	for i := 0; i < tp.NumMethod(); i++ {
-		method := tp.Method(i)
-		out.methods[method.Name] = method
-	}
-	return out
-}
-
-func (r RpcCallee[T]) Call(rc *wshandler.Richconn, src []byte) error {
-	defer func() {
-		s := recover()
-		if s != nil {
-			logger.Error(s)
-		}
-	}()
-
-	fn, params, err := decode(src)
-	if err != nil {
-		logger.Error("RpcCallee.Call err :", err)
-		return err
-	}
-
-	method, ok := r.methods[fn]
-	if !ok {
-		err := fmt.Errorf("method '%s' is missing", fn)
-		logger.Error("RpcCallee.Call err :", err)
-		return err
-	}
-
-	receiver := r.create(rc)
-	args := []reflect.Value{
-		reflect.ValueOf(receiver),
-	}
-	for _, arg := range params {
-		args = append(args, reflect.ValueOf(arg))
-	}
-
-	rets := method.Func.Call(args)
-	if len(rets) > 0 && rets[len(rets)-1].Interface() != nil {
-		return rets[len(rets)-1].Interface().(error)
-	}
-	return nil
-}

core/rpc/proxy.go

@@ -1,33 +0,0 @@
-package rpc
-
-import (
-	"go.mongodb.org/mongo-driver/bson/primitive"
-)
-
-func (c rpcCallContext) JoinTag(region string, tag primitive.ObjectID, tid primitive.ObjectID, hint string) error {
-	return c.send("JoinTag", region, tag, tid, hint)
-}
-
-func (c rpcCallContext) LeaveTag(region string, tag primitive.ObjectID, tid primitive.ObjectID, hint string) error {
-	return c.send("LeaveTag", region, tag, tid, hint)
-}
-
-func (c rpcCallContext) TurnGroupOnline(key string, gid primitive.ObjectID, score float64) error {
-	return c.send("TurnGroupOnline", key, gid, score)
-}
-
-func (c rpcCallContext) TurnGroupOffline(key string, gid primitive.ObjectID) error {
-	return c.send("TurnGroupOffline", key, gid)
-}
-func (c rpcCallContext) SetStateInTag(region string, tag primitive.ObjectID, tid primitive.ObjectID, state string, hint string) error {
-	return c.send("SetStateInTag", region, tag, tid, state, hint)
-}
-func (c rpcCallContext) SendMessage(doc []byte) error {
-	return c.send("SendMessage", doc)
-}
-func (c rpcCallContext) SendMessageToTag(region string, gid primitive.ObjectID, msg []byte) error {
-	return c.send("SendMessageToTag", region, gid, msg)
-}
-func (c rpcCallContext) CloseOnPurpose() error {
-	return c.send("CloseOnPurpose")
-}

core/tavern.go

@@ -6,123 +6,41 @@ import (
 	"io"
 	"net"
 	"net/http"
-	"reflect"
 	"strings"
-
+	"time"
-	common "repositories.action2quare.com/ayo/gocommon"
-	"repositories.action2quare.com/ayo/gocommon/logger"
-	"repositories.action2quare.com/ayo/gocommon/wshandler"
-	"repositories.action2quare.com/ayo/tavern/core/rpc"
 
 	"github.com/go-redis/redis/v8"
+	"github.com/gorilla/websocket"
+	"repositories.action2quare.com/ayo/gocommon"
+	"repositories.action2quare.com/ayo/gocommon/flagx"
+	"repositories.action2quare.com/ayo/gocommon/logger"
+	"repositories.action2quare.com/ayo/gocommon/metric"
+	"repositories.action2quare.com/ayo/gocommon/session"
+	"repositories.action2quare.com/ayo/gocommon/wshandler"
+
 	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/bsonrw"
-	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
-const (
+var devflag = flagx.Bool("dev", false, "")
-	defaultMaxMemory = 32 << 10 // 32 KB
-)
-
-func writeBsonArr(w io.Writer, src []bson.M) error {
-	return writeBsonDoc(w, bson.M{
-		"r": src,
-	})
-}
-
-func onlineGroupQueryKey(prefix string) string {
-	return prefix + "_olg"
-}
-
-func writeBsonDoc[T any](w io.Writer, src T) error {
-	rw, err := bsonrw.NewBSONValueWriter(w)
-	if err != nil {
-		return err
-	}
-
-	enc, err := bson.NewEncoder(rw)
-	if err != nil {
-		return err
-	}
-
-	return enc.Encode(src)
-}
-
-func readBsonDoc(r io.Reader, src any) error {
-	body, err := io.ReadAll(r)
-	if err != nil {
-		return err
-	}
-
-	if len(body) == 0 {
-		return nil
-	}
-
-	decoder, err := bson.NewDecoder(bsonrw.NewBSONDocumentReader(body))
-	if err != nil {
-		return err
-	}
-
-	err = decoder.Decode(src)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-type rpcCallDomain[T any] struct {
-	rpcCallChanName string
-	caller          rpc.RpcCaller
-	callee          rpc.RpcCallee[T]
-	methods         map[string]reflect.Method
-}
-
-func createRpcCallDomain[CalleeType any](syncConn *redis.Client, creator func(*wshandler.Richconn) *CalleeType) rpcCallDomain[CalleeType] {
-	var tmp *CalleeType
-	methods := make(map[string]reflect.Method)
-	tp := reflect.TypeOf(tmp)
-	for i := 0; i < tp.NumMethod(); i++ {
-		method := tp.Method(i)
-		methods[method.Name] = method
-	}
-
-	rpcChanName := "conn_rpc_channel_" + tp.Name()
-	publishFunc := func(bt []byte) error {
-		_, err := syncConn.Publish(context.Background(), rpcChanName, bt).Result()
-		return err
-	}
-
-	return rpcCallDomain[CalleeType]{
-		rpcCallChanName: rpcChanName,
-		caller:          rpc.NewRpcCaller(publishFunc),
-		callee:          rpc.NewRpcCallee(creator),
-		methods:         methods,
-	}
-}
 
 type TavernConfig struct {
-	common.RegionStorageConfig `json:",inline"`
+	session.SessionConfig `json:",inline"`
-
+	Group                 map[string]configDocument `json:"tavern_group_types"`
-	GroupTypes       map[string]*groupConfig `json:"tavern_group_types"`
+	MaingateApiToken      string                    `json:"maingate_api_token"`
-	MaingateApiToken string                  `json:"maingate_api_token"`
+	RedisURL              string                    `json:"tavern_redis_url"`
-	macAddr          string
+	EosClientId           string                    `json:"eos_client_id"`
+	EosClientSecret       string                    `json:"eos_client_secret"`
+	EosDeploymentId       string                    `json:"eos_deployment_id"`
+	macAddr               string
 }
 
 var config TavernConfig
 
 type Tavern struct {
-	subTaverns []*subTavern
+	wsh           *wshandler.WebsocketHandler
-	wsh        *wshandler.WebsocketHandler
+	mongoClient   gocommon.MongoClient
-}
+	redison       *gocommon.RedisonHandler
-
+	httpApiBorker gocommon.HttpApiBroker
-type subTavern struct {
-	mongoClient common.MongoClient
-	wsh         *wshandler.WebsocketHandler
-	region      string
-	groups      map[string]group
-	methods     map[string]reflect.Method
-	wshRpc      rpcCallDomain[richConnOuter]
 }
 
 func getMacAddr() (string, error) {
@@ -142,130 +60,126 @@ func getMacAddr() (string, error) {
 }
 
 // New :
-func New(context context.Context, wsh *wshandler.WebsocketHandler, inconfig *TavernConfig) (*Tavern, error) {
+func New(context context.Context, wsh *wshandler.WebsocketHandler) (*Tavern, error) {
-	if inconfig == nil {
+	if err := gocommon.LoadConfig(&config); err != nil {
-		var loaded TavernConfig
+		return nil, logger.ErrorWithCallStack(err)
-		if err := common.LoadConfig(&loaded); err != nil {
-			return nil, err
-		}
-		inconfig = &loaded
 	}
 
-	config = *inconfig
 	macaddr, err := getMacAddr()
 	if err != nil {
-		return nil, err
+		return nil, logger.ErrorWithCallStack(err)
 	}
 	config.macAddr = macaddr
-	tv := Tavern{
+	tv := &Tavern{
 		wsh: wsh,
 	}
 
 	if err = tv.prepare(context); err != nil {
 		logger.Println("tavern prepare() failed :", err)
-		return nil, err
+		return nil, logger.ErrorWithCallStack(err)
 	}
 
-	return &tv, nil
+	return tv, nil
 }
 
-func (tv *Tavern) Destructor() {
+var ccu = metric.MetricWriterNil
-	tv.wsh.Destructor()
-	for _, st := range tv.subTaverns {
-		st.mongoClient.Close()
-	}
-}
 
-type groupPipelineDocument struct {
+func (tv *Tavern) Cleanup() {
-	OperationType string         `bson:"operationType"`
+	ccu.Set(0)
-	FullDocument  map[string]any `bson:"fullDocument"`
+	tv.mongoClient.Close()
-	DocumentKey   struct {
-		Id primitive.ObjectID `bson:"_id"`
-	} `bson:"documentKey"`
-	UpdateDescription struct {
-		UpdatedFields   bson.M `bson:"updatedFields"`
-		RemovedFileds   bson.A `bson:"removedFields"`
-		TruncatedArrays bson.A `bson:"truncatedArrays"`
-	} `bson:"updateDescription"`
 }
 
 func (tv *Tavern) prepare(ctx context.Context) error {
-	for region, url := range config.RegionStorage {
+	redisClient, err := gocommon.NewRedisClient(config.RedisURL)
-		var dbconn common.MongoClient
+	if err != nil {
-		var err error
+		return logger.ErrorWithCallStack(err)
-		var groupinstance group
-
-		if err := rpc.IsCallerCalleeMethodMatch[richConnOuter](); err != nil {
-			return err
-		}
-
-		var tmp *subTavern
-		methods := make(map[string]reflect.Method)
-		tp := reflect.TypeOf(tmp)
-		for i := 0; i < tp.NumMethod(); i++ {
-			method := tp.Method(i)
-			methods[method.Name] = method
-		}
-
-		sub := &subTavern{
-			wsh:         tv.wsh,
-			mongoClient: dbconn,
-			region:      region,
-			methods:     methods,
-		}
-
-		sub.wshRpc = createRpcCallDomain(tv.wsh.RedisSync, func(rc *wshandler.Richconn) *richConnOuter {
-			return &richConnOuter{wsh: sub.wsh, rc: rc}
-		})
-
-		groups := make(map[string]group)
-		for typename, cfg := range config.GroupTypes {
-			cfg.Name = typename
-			if cfg.Transient {
-				groupinstance, err = cfg.prepareInMemory(ctx, region, typename, tv.wsh)
-			} else {
-				if !dbconn.Connected() {
-					dbconn, err = common.NewMongoClient(ctx, url.Mongo, region)
-					if err != nil {
-						return err
-					}
-				}
-				groupinstance, err = cfg.preparePersistent(ctx, region, dbconn, tv.wsh)
-			}
-			if err != nil {
-				return err
-			}
-			groups[typename] = groupinstance
-		}
-		sub.groups = groups
-
-		tv.subTaverns = append(tv.subTaverns, sub)
 	}
 
+	tv.redison = gocommon.NewRedisonHandler(redisClient.Context(), redisClient)
+	tv.wsh.AddHandler(wshandler.MakeWebsocketApiHandler(tv, "tv"))
+
+	if cfg, ok := config.Group["chat"]; ok {
+		chat := new(groupChat)
+		if err := chat.Initialize(tv, cfg); err != nil {
+			return logger.ErrorWithCallStack(err)
+		}
+		tv.httpApiBorker.AddHandler(gocommon.MakeHttpApiHandler(chat, "chat"))
+		tv.wsh.AddHandler(wshandler.MakeWebsocketApiHandler(chat, "chat"))
+	}
+
+	if cfg, ok := config.Group["party"]; ok {
+		party := new(groupParty)
+		if err := party.Initialize(tv, cfg); err != nil {
+			return logger.ErrorWithCallStack(err)
+		}
+		tv.httpApiBorker.AddHandler(gocommon.MakeHttpApiHandler(party, "party"))
+		tv.wsh.AddHandler(wshandler.MakeWebsocketApiHandler(party, "party"))
+	}
+
+	instant := new(groupInstant)
+	if err := instant.Initialize(tv); err != nil {
+		return logger.ErrorWithCallStack(err)
+	}
+	tv.httpApiBorker.AddHandler(gocommon.MakeHttpApiHandler(instant, "instant"))
+	tv.wsh.AddHandler(wshandler.MakeWebsocketApiHandler(instant, "instant"))
+
+	ccu = metric.NewMetric(metric.MetricGuage, "concurrent_user", "concurrent user count", map[string]string{"game": "lobby"})
 	return nil
 }
 
 func (tv *Tavern) RegisterHandlers(ctx context.Context, serveMux *http.ServeMux, prefix string) error {
-	// request는 항상 서비스 서버를 거쳐서 들어온다. [client] <--tls--> [service server] <--http--> tavern
+	// tv.wsh.RegisterReceiver(tv)
-	// 클라이언트는 tavern으로부터 메시지를 수신할 뿐, 송신하지 못한다.
+	pattern := gocommon.MakeHttpHandlerPattern(prefix, "api")
-	// 단, 요청은 https 서비스 서버를 통해 들어오고 클라이언트는 ws으로 수신만 한다는 원칙이 유지되어야 한다.(채팅 메시지는 예외?)
+	serveMux.HandleFunc(pattern, tv.api)
-	for _, sub := range tv.subTaverns {
-		var pattern string
-		if sub.region == "default" {
-			pattern = common.MakeHttpHandlerPattern(prefix, "api")
-		} else {
-			pattern = common.MakeHttpHandlerPattern(prefix, sub.region, "api")
-		}
-		serveMux.HandleFunc(pattern, sub.api)
-
-		deliveryChan := tv.wsh.DeliveryChannel(sub.region)
-		go sub.deliveryMessageHandler(deliveryChan)
-	}
 
 	return nil
 }
 
-func (sub *subTavern) api(w http.ResponseWriter, r *http.Request) {
+func (tv *Tavern) EnterChannel(ctx wshandler.ApiCallContext) {
+	tv.wsh.EnterRoom(ctx.Arguments[0].(string), ctx.CallBy.Accid)
+}
+
+func (tv *Tavern) LeaveChannel(ctx wshandler.ApiCallContext) {
+	tv.wsh.LeaveRoom(ctx.Arguments[0].(string), ctx.CallBy.Accid)
+}
+
+func (tv *Tavern) ClientConnected(conn *websocket.Conn, callby *wshandler.Sender) {
+	ccu.Add(1)
+	tv.redison.Del(tv.redison.Context(), callby.Accid.Hex())
+	_, err := tv.redison.JSONSet(callby.Accid.Hex(), "$", bson.M{"_ts": time.Now().UTC().Unix()})
+	if err != nil {
+		logger.Println("OnClientMessageReceived HSet error :", err)
+	}
+}
+
+func (tv *Tavern) ClientDisconnected(msg string, callby *wshandler.Sender) {
+	ccu.Add(-1)
+	tv.redison.Del(tv.redison.Context(), callby.Accid.Hex()).Result()
+}
+
+func (tv *Tavern) OnRoomCreated(name string) {
+	cnt, err := tv.redison.IncrBy(tv.redison.Context(), "_ref_"+name, 1).Result()
+	if err != nil && !errors.Is(err, redis.Nil) {
+		logger.Println("OnRoomCreated JSONSet failed :", err)
+		return
+	}
+
+	if cnt == 1 {
+		tv.redison.JSONSet(name, "$", map[string]any{}, gocommon.RedisonSetOptionNX)
+	}
+}
+
+func (tv *Tavern) OnRoomDestroyed(name string) {
+	cnt, err := tv.redison.IncrBy(tv.redison.Context(), "_ref_"+name, -1).Result()
+	if err != nil {
+		logger.Println("OnRoomDestroyed JSONNumIncrBy failed :", err)
+	} else if cnt == 0 {
+		tv.redison.Del(tv.redison.Context(), "_ref_"+name)
+		tv.redison.JSONDel(name, "$")
+	}
+}
+
+func (tv *Tavern) api(w http.ResponseWriter, r *http.Request) {
 	defer func() {
 		s := recover()
 		if s != nil {
@@ -284,29 +198,5 @@ func (sub *subTavern) api(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	operation := r.URL.Query().Get("operation")
+	tv.httpApiBorker.Call(w, r)
-	if len(operation) == 0 {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	method, ok := sub.methods[operation]
-	if !ok {
-		// 없는 operation
-		logger.Println("fail to call api. operation is not valid :", operation)
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	if r.PostForm == nil {
-		r.ParseMultipartForm(defaultMaxMemory)
-	}
-
-	args := []reflect.Value{
-		reflect.ValueOf(sub),
-		reflect.ValueOf(w),
-		reflect.ValueOf(r),
-	}
-
-	method.Func.Call(args)
 }

core/tavern_test.go

@@ -0,0 +1,113 @@
+// warroom project main.go
+package core
+
+import (
+	"context"
+	"encoding/binary"
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/go-redis/redis/v8"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+	"repositories.action2quare.com/ayo/gocommon"
+	"repositories.action2quare.com/ayo/gocommon/logger"
+)
+
+func TestPubSub(t *testing.T) {
+	opt0, _ := redis.ParseURL("redis://192.168.8.94:6380/0")
+	opt1, _ := redis.ParseURL("redis://192.168.8.94:6380/1")
+
+	rc0 := redis.NewClient(opt0)
+	rc1 := redis.NewClient(opt1)
+
+	go func() {
+		time.Sleep(time.Second)
+		rc1.Publish(context.Background(), "__testchan", "real???")
+		fmt.Println("published")
+	}()
+
+	pubsub := rc0.Subscribe(context.Background(), "__testchan")
+	msg, err := pubsub.ReceiveMessage(context.Background())
+	fmt.Println(msg.Payload, err)
+}
+func makeHash(chanName string, index uint32) string {
+	for len(chanName) < 12 {
+		chanName += chanName
+	}
+	left := chanName[:6]
+	right := chanName[len(chanName)-6:]
+	base := []byte(left + right)
+	for i := 0; i < 12; i++ {
+		base[i] += base[12-i-1]
+	}
+
+	bs := make([]byte, 4)
+	binary.LittleEndian.PutUint32(bs, index)
+	for i, c := range bs {
+		base[i] ^= c
+	}
+	var gid primitive.ObjectID
+	copy(gid[:], base)
+
+	return gid.Hex()
+}
+
+func TestNameHash(t *testing.T) {
+	for i := 0; i < 10; i++ {
+		makeHash("Urud", uint32(i))
+		fmt.Printf("Urud:%d - %s\n", i, makeHash("Urud", uint32(i)))
+		makeHash("Sheldon", uint32(i))
+		fmt.Printf("Sheldon:%d - %s\n", i, makeHash("Sheldon", uint32(i)))
+	}
+}
+
+func TestReJSON(t *testing.T) {
+	rc := redis.NewClient(&redis.Options{Addr: "192.168.8.94:6380"})
+	rh := gocommon.NewRedisonHandler(context.Background(), rc)
+
+	success, err := rc.HSetNX(context.Background(), "setnxtest", "cap", 100).Result()
+	fmt.Println(success, err)
+	success, err = rc.HSetNX(context.Background(), "setnxtest", "cap", 100).Result()
+	fmt.Println(success, err)
+
+	testDoc := map[string]any{
+		"members": map[string]any{
+			"mid2": map[string]any{
+				"key": "val",
+				"exp": 20202020,
+			},
+			"mid1": map[string]any{
+				"key": "val",
+				"exp": 10101010,
+			},
+		},
+	}
+
+	gd := partyDoc{
+		id: primitive.NewObjectID(),
+	}
+
+	midin := primitive.NewObjectID()
+	tid := gd.tid(midin)
+	midout := gd.mid(tid)
+	logger.Println(midin, tid, midout)
+
+	logger.Println(rh.JSONSet("jsontest", "$", testDoc))
+	logger.Println(rh.JSONGet("jsontest", "$"))
+	logger.Println(rh.JSONResp("jsontest", "$.members"))
+	logger.Println(rh.JSONGetString("jsontest", "$.members..key"))
+	logger.Println(rh.JSONGetInt64("jsontest", "$.members..exp"))
+	logger.Println(rh.JSONObjKeys("jsontest", "$.members"))
+
+	err = rh.JSONMSet("jsontest", map[string]any{
+		"$.members.mid1.key": "newval",
+		"$.members.mid2.key": "newval",
+	})
+	logger.Println(err)
+
+	logger.Println(rh.JSONGet("jsontest", "$"))
+	logger.Println(rh.JSONMDel("jsontest", []string{"$.members.mid1", "$.members.mid2"}))
+	logger.Println(rh.JSONGet("jsontest", "$"))
+	logger.Println(rh.JSONObjLen("jsontest", "$.members"))
+}

go.mod

@@ -1,27 +1,30 @@
 module repositories.action2quare.com/ayo/tavern
 
-go 1.19
+go 1.22.1
 
 require (
 	github.com/go-redis/redis/v8 v8.11.5
-	github.com/gorilla/websocket v1.5.0
 	go.mongodb.org/mongo-driver v1.11.7
-	repositories.action2quare.com/ayo/gocommon v0.0.0-20230621052811-06ef97f11d22
+	repositories.action2quare.com/ayo/gocommon v0.0.0-20250805124812-38a3da271a8e
 )
 
 require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/klauspost/compress v1.16.6 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
 	github.com/montanaflynn/stats v0.7.1 // indirect
 	github.com/pires/go-proxyproto v0.7.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/rogpeppe/go-internal v1.10.0 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
-	golang.org/x/crypto v0.10.0 // indirect
+	golang.org/x/crypto v0.18.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
+	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/text v0.10.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 )

go.sum

@@ -1,40 +1,52 @@
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk=
 github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
 github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
+github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
 github.com/pires/go-proxyproto v0.7.0 h1:IukmRewDQFWC7kfnb66CSomk2q/seBuilHBYFwyq0Hs=
 github.com/pires/go-proxyproto v0.7.0/go.mod h1:Vz/1JPY/OACxWGQNIRY2BeyDmpoaWmEP40O9LbuiFR4=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -58,20 +70,21 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
+golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
-golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
+golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -79,7 +92,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -87,20 +101,23 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-repositories.action2quare.com/ayo/gocommon v0.0.0-20230621052811-06ef97f11d22 h1:DImSGNxZrc+Q4WlS1OKMsLAScEfDYLX4XMJdjAaVnXc=
+repositories.action2quare.com/ayo/gocommon v0.0.0-20250805124037-fb3f0385067a h1:NkFjJVZTNO6HsivUEikISfqF4O5zHk0VRdKOEOVTOG4=
-repositories.action2quare.com/ayo/gocommon v0.0.0-20230621052811-06ef97f11d22/go.mod h1:ng62uGMGXyQSeuxePG5gJAMtip4Rnspu5Tu7hgvaXns=
+repositories.action2quare.com/ayo/gocommon v0.0.0-20250805124037-fb3f0385067a/go.mod h1:q64I6gqlD61qwi9FfuPkwqy6Z6uzSHdcEjoHAJC27gQ=
+repositories.action2quare.com/ayo/gocommon v0.0.0-20250805124812-38a3da271a8e h1:jxfkCjnDBPg4zw5oqecEdxjclpiBysBtNvI2ENqeG4E=
+repositories.action2quare.com/ayo/gocommon v0.0.0-20250805124812-38a3da271a8e/go.mod h1:q64I6gqlD61qwi9FfuPkwqy6Z6uzSHdcEjoHAJC27gQ=

main.go

@@ -9,8 +9,9 @@ import (
 	"repositories.action2quare.com/ayo/gocommon/wshandler"
 	"repositories.action2quare.com/ayo/tavern/core"
 
-	common "repositories.action2quare.com/ayo/gocommon"
+	"repositories.action2quare.com/ayo/gocommon"
 	"repositories.action2quare.com/ayo/gocommon/logger"
+	"repositories.action2quare.com/ayo/gocommon/session"
 )
 
 var prefix = flagx.String("prefix", "", "")
@@ -20,27 +21,36 @@ func main() {
 
 	ctx, cancel := context.WithCancel(context.Background())
 	var config core.TavernConfig
-	if err := common.LoadConfig(&config); err != nil {
+	if err := gocommon.LoadConfig(&config); err != nil {
 		panic(err)
 	}
 
-	authcache, err := common.NewAuthCollectionGlobal(ctx, config.MaingateApiToken)
+	consumer, err := session.NewConsumerWithConfig(ctx, config.SessionConfig)
 	if err != nil {
 		panic(err)
 	}
 
-	wsh := wshandler.NewWebsocketHandler(authcache)
+	wsh, err := wshandler.NewWebsocketHandler(consumer, config.RedisURL)
-	if tv, err := core.New(ctx, wsh, &config); err != nil {
+	if err != nil {
+		panic(err)
+	}
+
+	if tv, err := core.New(ctx, wsh); err != nil {
 		panic(err)
 	} else {
 		serveMux := http.NewServeMux()
-		wsh.RegisterHandlers(ctx, serveMux, *prefix)
+		wsh.RegisterHandlers(serveMux, *prefix)
 		tv.RegisterHandlers(ctx, serveMux, *prefix)
-		server := common.NewHTTPServer(serveMux)
+
+		server := gocommon.NewHTTPServer(serveMux)
 		logger.Println("tavern is started")
-		server.Start()
+		wsh.Start(ctx)
+
+		if err := server.Start(); err != nil {
+			logger.Println(err)
+		}
 		cancel()
-		tv.Destructor()
+		wsh.Cleanup()
-		wsh.Destructor()
+		tv.Cleanup()
 	}
 }