feat: jssdk GetConversations, GetActiveConversation

go.mod

@@ -3,7 +3,7 @@ module github.com/openimsdk/open-im-server/v3
 go 1.21.2
 
 require (
-	firebase.google.com/go/v4 v4.13.0
+	firebase.google.com/go/v4 v4.14.1
 	github.com/dtm-labs/rockscache v0.1.1
 	github.com/gin-gonic/gin v1.9.1
 	github.com/go-playground/validator/v10 v10.20.0
@@ -12,7 +12,7 @@ require (
 	github.com/gorilla/websocket v1.5.1
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/openimsdk/protocol v0.0.72-alpha.29
+	github.com/openimsdk/protocol v0.0.72-alpha.30
 	github.com/openimsdk/tools v0.0.50-alpha.12
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0
@@ -27,7 +27,6 @@ require (
 require github.com/google/uuid v1.6.0
 
 require (
-	firebase.google.com/go/v4 v4.14.1
 	github.com/IBM/sarama v1.43.0
 	github.com/fatih/color v1.14.1
 	github.com/gin-contrib/gzip v1.0.1
@@ -180,9 +179,8 @@ require (
 	golang.org/x/sys v0.25.0 // indirect
 	golang.org/x/text v0.18.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/appengine/v2 v2.0.2 // indirect
-	google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe // indirect
+	google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
 	gorm.io/gorm v1.25.8 // indirect
@@ -200,6 +198,4 @@ require (
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )
 
-replace (
+//replace github.com/openimsdk/protocol => /Users/chao/Desktop/withchao/protocol
-	github.com/openimsdk/protocol => /Users/chao/Desktop/withchao/protocol
-)

go.sum

@@ -319,8 +319,8 @@ github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
 github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/openimsdk/gomake v0.0.14-alpha.5 h1:VY9c5x515lTfmdhhPjMvR3BBRrRquAUCFsz7t7vbv7Y=
 github.com/openimsdk/gomake v0.0.14-alpha.5/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
-github.com/openimsdk/protocol v0.0.72-alpha.29 h1:z6Bm57IW/HNxTAJmqYjhVaLRUJLVIK0EH7G7HBzbwdc=
+github.com/openimsdk/protocol v0.0.72-alpha.30 h1:LBIqDzD55cSQy3wX8fgSa3blz8+Cv54ae96/qUMINwM=
-github.com/openimsdk/protocol v0.0.72-alpha.29/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
+github.com/openimsdk/protocol v0.0.72-alpha.30/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
 github.com/openimsdk/tools v0.0.50-alpha.12 h1:rV3BxgqN+F79vZvdoQ+97Eob8ScsRVEM8D+Wrcl23uo=
 github.com/openimsdk/tools v0.0.50-alpha.12/go.mod h1:h1cYmfyaVtgFbKmb1Cfsl8XwUOMTt8ubVUQrdGtsUh4=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
@@ -558,8 +558,6 @@ google.golang.org/api v0.170.0 h1:zMaruDePM88zxZBG+NG8+reALO2rfLhe/JShitLyT48=
 google.golang.org/api v0.170.0/go.mod h1:/xql9M2btF85xac/VAm4PsLMTLVGUOpq4BE9R8jyNy8=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
-google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
 google.golang.org/appengine/v2 v2.0.2 h1:MSqyWy2shDLwG7chbwBJ5uMyw6SNqJzhJHNDwYB0Akk=
 google.golang.org/appengine/v2 v2.0.2/go.mod h1:PkgRUWz4o1XOvbqtWTkBtCitEJ5Tp4HoVEdMMYQR/8E=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=

internal/api/jssdk.go

@@ -6,6 +6,8 @@ import (
 	"github.com/openimsdk/protocol/conversation"
 	"github.com/openimsdk/protocol/msg"
 	"github.com/openimsdk/protocol/sdkws"
+	"github.com/openimsdk/tools/a2r"
+	"github.com/openimsdk/tools/apiresp"
 	"github.com/openimsdk/tools/mcontext"
 	"github.com/openimsdk/tools/utils/datautil"
 	"google.golang.org/grpc"
@@ -14,21 +16,27 @@ import (
 
 const limitGetActiveConversation = 100
 
+func NewJSSdkApi(msg msg.MsgClient, conv conversation.ConversationClient) *JSSdk {
+	return &JSSdk{
+		msg:  msg,
+		conv: conv,
+	}
+}
+
 type JSSdk struct {
 	msg  msg.MsgClient
 	conv conversation.ConversationClient
 }
 
-func field[A, B, C any](ctx context.Context, fn func(ctx context.Context, req *A, opts ...grpc.CallOption) (*B, error), req *A, get func(*B) C) (C, error) {
+func (x *JSSdk) GetActiveConversation(c *gin.Context) {
-	resp, err := fn(ctx, req)
+	call(c, x.getActiveConversation)
-	if err != nil {
-		var c C
-		return c, err
-	}
-	return get(resp), nil
 }
 
-func (x *JSSdk) GetActiveConversation(ctx *gin.Context) ([]ConversationMsg, error) {
+func (x *JSSdk) GetConversations(c *gin.Context) {
+	call(c, x.getConversations)
+}
+
+func (x *JSSdk) getActiveConversation(ctx *gin.Context) ([]ConversationMsg, error) {
 	opUserID := mcontext.GetOpUserID(ctx)
 	conversationIDs, err := field(ctx, x.conv.GetConversationIDs,
 		&conversation.GetConversationIDsReq{UserID: opUserID}, (*conversation.GetConversationIDsResp).GetConversationIDs)
@@ -50,22 +58,29 @@ func (x *JSSdk) GetActiveConversation(ctx *gin.Context) ([]ConversationMsg, erro
 		Conversation: activeConversation,
 	}
 	if len(activeConversation) > 1 {
-		// todo get pinned conversation ids
+		pinnedConversationIDs, err := field(ctx, x.conv.GetPinnedConversationIDs,
+			&conversation.GetPinnedConversationIDsReq{UserID: opUserID}, (*conversation.GetPinnedConversationIDsResp).GetConversationIDs)
+		if err != nil {
+			return nil, err
+		}
+		sortConversations.PinnedConversationIDs = datautil.SliceSet(pinnedConversationIDs)
 	}
 	sort.Sort(&sortConversations)
 	sortList := sortConversations.Top(limitGetActiveConversation)
 	conversations, err := field(ctx, x.conv.GetConversations,
-		&conversation.GetConversationsReq{ConversationIDs: datautil.Slice(sortList, func(c *msg.ActiveConversation) string {
+		&conversation.GetConversationsReq{
+			OwnerUserID: opUserID,
+			ConversationIDs: datautil.Slice(sortList, func(c *msg.ActiveConversation) string {
 				return c.ConversationID
 			})}, (*conversation.GetConversationsResp).GetConversations)
 	if err != nil {
 		return nil, err
 	}
-	readSeq, err := field(ctx, x.msg.GetHasReadSeqs,
+	//readSeq, err := field(ctx, x.msg.GetHasReadSeqs,
-		&msg.GetHasReadSeqsReq{UserID: opUserID, ConversationIDs: conversationIDs}, (*msg.SeqsInfoResp).GetMaxSeqs)
+	//	&msg.GetHasReadSeqsReq{UserID: opUserID, ConversationIDs: conversationIDs}, (*msg.SeqsInfoResp).GetMaxSeqs)
-	if err != nil {
+	//if err != nil {
-		return nil, err
+	//	return nil, err
-	}
+	//}
 	msgs, err := field(ctx, x.msg.GetSeqMessage,
 		&msg.GetSeqMessageReq{
 			UserID: opUserID,
@@ -88,20 +103,67 @@ func (x *JSSdk) GetActiveConversation(ctx *gin.Context) ([]ConversationMsg, erro
 		if !ok {
 			continue
 		}
-		msgList, ok := msgs[c.ConversationID]
-		if ok {
-			continue
-		}
 		var lastMsg *sdkws.MsgData
-		if len(msgList.Msgs) > 0 {
+		if msgList, ok := msgs[c.ConversationID]; ok && len(msgList.Msgs) > 0 {
 			lastMsg = msgList.Msgs[0]
 		}
 		resp = append(resp, ConversationMsg{
 			Conversation: conv,
 			LastMsg:      lastMsg,
-			MaxSeq:       c.MaxSeq,
+			//MaxSeq:       c.MaxSeq,
-			MaxSeqTime:   c.LastTime,
+			//MaxSeqTime:   c.LastTime,
-			ReadSeq:      readSeq[c.ConversationID],
+			//ReadSeq:      readSeq[c.ConversationID],
+		})
+	}
+	return resp, nil
+}
+
+func (x *JSSdk) getConversations(ctx *gin.Context) ([]ConversationMsg, error) {
+	req, err := a2r.ParseRequest[conversation.GetConversationsReq](ctx)
+	if err != nil {
+		return nil, err
+	}
+	req.OwnerUserID = mcontext.GetOpUserID(ctx)
+	conversations, err := field(ctx, x.conv.GetConversations, req, (*conversation.GetConversationsResp).GetConversations)
+	if err != nil {
+		return nil, err
+	}
+	if len(conversations) == 0 {
+		return nil, nil
+	}
+	maxSeqs, err := field(ctx, x.msg.GetMaxSeqs,
+		&msg.GetMaxSeqsReq{ConversationIDs: datautil.Slice(conversations, func(c *conversation.Conversation) string {
+			return c.ConversationID
+		})}, (*msg.SeqsInfoResp).GetMaxSeqs)
+	if err != nil {
+		return nil, err
+	}
+	conversationSeqs := make([]*msg.ConversationSeqs, 0, len(conversations))
+	for _, c := range conversations {
+		if seq := maxSeqs[c.ConversationID]; seq > 0 {
+			conversationSeqs = append(conversationSeqs, &msg.ConversationSeqs{
+				ConversationID: c.ConversationID,
+				Seqs:           []int64{seq},
+			})
+		}
+	}
+	var msgs map[string]*sdkws.PullMsgs
+	if len(conversationSeqs) > 0 {
+		msgs, err = field(ctx, x.msg.GetSeqMessage,
+			&msg.GetSeqMessageReq{UserID: req.OwnerUserID, Conversations: conversationSeqs}, (*msg.GetSeqMessageResp).GetMsgs)
+		if err != nil {
+			return nil, err
+		}
+	}
+	resp := make([]ConversationMsg, 0, len(conversations))
+	for _, c := range conversations {
+		var lastMsg *sdkws.MsgData
+		if msgList, ok := msgs[c.ConversationID]; ok && len(msgList.Msgs) > 0 {
+			lastMsg = msgList.Msgs[0]
+		}
+		resp = append(resp, ConversationMsg{
+			Conversation: c,
+			LastMsg:      lastMsg,
 		})
 	}
 	return resp, nil
@@ -110,9 +172,9 @@ func (x *JSSdk) GetActiveConversation(ctx *gin.Context) ([]ConversationMsg, erro
 type ConversationMsg struct {
 	Conversation *conversation.Conversation `json:"conversation"`
 	LastMsg      *sdkws.MsgData             `json:"lastMsg"`
-	ReadSeq      int64                      `json:"readSeq"`
+	//ReadSeq      int64                      `json:"readSeq"`
-	MaxSeq       int64                      `json:"maxSeq"`
+	//MaxSeq       int64                      `json:"maxSeq"`
-	MaxSeqTime   int64                      `json:"maxSeqTime"`
+	//MaxSeqTime   int64                      `json:"maxSeqTime"`
 }
 
 type sortActiveConversations struct {
@@ -144,3 +206,21 @@ func (s sortActiveConversations) Less(i, j int) bool {
 func (s sortActiveConversations) Swap(i, j int) {
 	s.Conversation[i], s.Conversation[j] = s.Conversation[j], s.Conversation[i]
 }
+
+func field[A, B, C any](ctx context.Context, fn func(ctx context.Context, req *A, opts ...grpc.CallOption) (*B, error), req *A, get func(*B) C) (C, error) {
+	resp, err := fn(ctx, req)
+	if err != nil {
+		var c C
+		return c, err
+	}
+	return get(resp), nil
+}
+
+func call[R any](c *gin.Context, fn func(ctx *gin.Context) (R, error)) {
+	resp, err := fn(c)
+	if err != nil {
+		apiresp.GinError(c, err)
+		return
+	}
+	apiresp.GinSuccess(c, resp)
+}

internal/api/router.go

@@ -75,6 +75,7 @@ func newGinRouter(disCov discovery.SvcDiscoveryRegistry, config *Config) *gin.En
 	r.Use(prommetricsGin(), gin.Recovery(), mw.CorsHandler(), mw.GinParseOperationID(), GinParseToken(authRpc))
 	u := NewUserApi(*userRpc)
 	m := NewMessageApi(messageRpc, userRpc, config.Share.IMAdminUserID)
+	j := NewJSSdkApi(messageRpc.Client, conversationRpc.Client)
 	userRouterGroup := r.Group("/user")
 	{
 		userRouterGroup.POST("/user_register", u.UserRegister)
@@ -243,6 +244,11 @@ func newGinRouter(disCov discovery.SvcDiscoveryRegistry, config *Config) *gin.En
 		statisticsGroup.POST("/group/create", g.GroupCreateCount)
 		statisticsGroup.POST("/group/active", m.GetActiveGroup)
 	}
+
+	jssdk := r.Group("/jssdk")
+	jssdk.POST("/get_conversation", j.GetConversations)
+	jssdk.POST("/get_active_conversation", j.GetActiveConversation)
+
 	return r
 }
 

internal/rpc/group/group.go

@@ -66,6 +66,11 @@ type groupServer struct {
 	webhookClient         *webhook.Client
 }
 
+func (s *groupServer) GetSpecifiedUserGroupRequestInfo(ctx context.Context, req *pbgroup.GetSpecifiedUserGroupRequestInfoReq) (*pbgroup.GetSpecifiedUserGroupRequestInfoResp, error) {
+	//TODO implement me
+	panic("implement me")
+}
+
 type Config struct {
 	RpcConfig          config.Group
 	RedisConfig        config.Redis