fix: align group management APIs

2026-09-13 16:03:55 +08:00
parent f1279ac607
commit a9afc6ff6a
34 changed files with 1381 additions and 639 deletions
@@ -0,0 +1,126 @@
+package main
+
+import (
+	"encoding/json"
+	"testing"
+	"time"
+
+	"github.com/tinode/chat/server/store"
+	"github.com/tinode/chat/server/store/types"
+)
+
+func TestRealtimeEnvelopeDeliversToUserSessions(t *testing.T) {
+	oldStore := globals.sessionStore
+	defer func() { globals.sessionStore = oldStore }()
+
+	tenantID := types.TenantID(1)
+	uid := types.Uid(1001)
+	globals.sessionStore = realtimeTestSessionStore(
+		realtimeTestSession("sid-1", tenantID, uid, ""),
+		realtimeTestSession("sid-2", tenantID, uid, ""),
+		realtimeTestSession("sid-other", tenantID, types.Uid(1002), ""),
+	)
+	msg := &ServerComMessage{
+		Data: &MsgServerData{Topic: uid.UserId(), From: types.Uid(1002).UserId(), SeqId: 12, Timestamp: time.Now()},
+	}
+	raw, err := json.Marshal(msg)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	deliverRealtimeFanoutEnvelope(&store.RealtimeFanoutEnvelope{
+		TenantID:   tenantID,
+		Kind:       realtimeKindMessage,
+		TargetType: realtimeTargetUser,
+		Target:     uid.UserId(),
+		Message:    raw,
+	})
+
+	for _, sid := range []string{"sid-1", "sid-2"} {
+		sess := globals.sessionStore.Get(sid)
+		select {
+		case got := <-sess.send:
+			if got.(*ServerComMessage).TenantID != tenantID {
+				t.Fatalf("tenant not restored for %s", sid)
+			}
+		default:
+			t.Fatalf("expected delivery to %s", sid)
+		}
+	}
+	if len(globals.sessionStore.Get("sid-other").send) != 0 {
+		t.Fatal("unexpected delivery to other user")
+	}
+}
+
+func TestRealtimeP2PTopicFallbackRewritesVisibleTopic(t *testing.T) {
+	oldStore := globals.sessionStore
+	oldHub := globals.hub
+	defer func() {
+		globals.sessionStore = oldStore
+		globals.hub = oldHub
+	}()
+
+	tenantID := types.TenantID(1)
+	uid1 := types.Uid(1001)
+	uid2 := types.Uid(1002)
+	topic := uid1.P2PName(uid2)
+	if topic == "" {
+		t.Fatal("failed to create p2p topic")
+	}
+	globals.hub = nil
+	globals.sessionStore = realtimeTestSessionStore(
+		realtimeTestSession("sid-u1", tenantID, uid1, uid2.UserId()),
+		realtimeTestSession("sid-u2", tenantID, uid2, uid1.UserId()),
+	)
+	msg := &ServerComMessage{
+		Data: &MsgServerData{Topic: topic, From: uid1.UserId(), SeqId: 13, Timestamp: time.Now()},
+	}
+	raw, err := json.Marshal(msg)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	deliverRealtimeFanoutEnvelope(&store.RealtimeFanoutEnvelope{
+		TenantID:   tenantID,
+		Kind:       realtimeKindMessage,
+		TargetType: realtimeTargetTopic,
+		Target:     topic,
+		Message:    raw,
+	})
+
+	expectTopic := map[string]string{"sid-u1": uid2.UserId(), "sid-u2": uid1.UserId()}
+	for sid, visibleTopic := range expectTopic {
+		sess := globals.sessionStore.Get(sid)
+		select {
+		case got := <-sess.send:
+			data := got.(*ServerComMessage).Data
+			if data.Topic != visibleTopic {
+				t.Fatalf("%s got topic %q, want %q", sid, data.Topic, visibleTopic)
+			}
+		default:
+			t.Fatalf("expected p2p delivery to %s", sid)
+		}
+	}
+}
+
+func realtimeTestSessionStore(sessions ...*Session) *SessionStore {
+	ss := NewSessionStore(time.Minute)
+	for _, sess := range sessions {
+		ss.sessCache[sess.sid] = sess
+	}
+	return ss
+}
+
+func realtimeTestSession(sid string, tenantID types.TenantID, uid types.Uid, sub string) *Session {
+	sess := &Session{
+		sid:      sid,
+		tenantID: tenantID,
+		uid:      uid,
+		send:     make(chan any, 4),
+		subs:     make(map[string]*Subscription),
+	}
+	if sub != "" {
+		sess.subs[sub] = &Subscription{}
+	}
+	return sess
+}