optimize the freeze caused by too many friends and group applications && fix: GetConversationIDBySessionType returns a string with escape characters. (#853)

FGadvancer · withchao · web-flow · commit 792938a47c81 · 2025-02-07T16:23:36.000+08:00
* fix: refine exception message handling to prevent duplicate messages in clients with poor network conditions. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: primary key conflicts caused by empty messages occupying seq due to sequence gaps. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: server downtime and abnormal message handling may lead to message duplication, and the history retrieval interface might miss messages when the timestamps are the same. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: server downtime and abnormal message handling may lead to message duplication, and the history retrieval interface might miss messages when the timestamps are the same. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * fix: add random prefix to remove duplicate messages. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * style: update start message id. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * optimize the freeze caused by too many friends and group applications (#852) * feat: code adjustment * feat: Cmd2Value carry caller * feat: Cmd2Value carry caller * feat: Cmd2Value carry caller * feat: Cmd2Value carry caller * fix: SearchLocalMessages no such table * fix: optimize the freeze caused by too many friends and group applications * fix: GetConversationIDBySessionType returns a string with escape characters. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> --------- Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> Co-authored-by: chao <48119764+withchao@users.noreply.github.com>
diff --git a/internal/conversation_msg/conversation.go b/internal/conversation_msg/conversation.go
@@ -67,6 +67,7 @@ func (c *Conversation) getAdvancedHistoryMessageList(ctx context.Context, req sd
 			return nil, err
 		}
 		startTime = m.SendTime
+		startClientMsgID = req.StartClientMsgID
 		err = c.handleEndSeq(ctx, req, isReverse, m)
 		if err != nil {
 			return nil, err
diff --git a/internal/group/full_sync.go b/internal/group/full_sync.go
@@ -29,6 +29,10 @@ func (g *Group) SyncAllJoinedGroupsAndMembers(ctx context.Context) error {
 }
 
 func (g *Group) SyncAllSelfGroupApplication(ctx context.Context) error {
+	if !g.groupRequestSyncerLock.TryLock() {
+		return nil
+	}
+	defer g.groupRequestSyncerLock.Unlock()
 	list, err := g.GetServerSelfGroupApplication(ctx)
 	if err != nil {
 		return err
@@ -45,6 +49,10 @@ func (g *Group) SyncAllSelfGroupApplication(ctx context.Context) error {
 }
 
 func (g *Group) SyncAllSelfGroupApplicationWithoutNotice(ctx context.Context) error {
+	if !g.groupRequestSyncerLock.TryLock() {
+		return nil
+	}
+	defer g.groupRequestSyncerLock.Unlock()
 	list, err := g.GetServerSelfGroupApplication(ctx)
 	if err != nil {
 		return err
@@ -64,6 +72,10 @@ func (g *Group) SyncSelfGroupApplications(ctx context.Context, groupIDs ...strin
 }
 
 func (g *Group) SyncAllAdminGroupApplication(ctx context.Context) error {
+	if !g.groupAdminRequestSyncerLock.TryLock() {
+		return nil
+	}
+	defer g.groupAdminRequestSyncerLock.Unlock()
 	requests, err := g.GetServerAdminGroupApplicationList(ctx)
 	if err != nil {
 		return err
@@ -76,6 +88,10 @@ func (g *Group) SyncAllAdminGroupApplication(ctx context.Context) error {
 }
 
 func (g *Group) SyncAllAdminGroupApplicationWithoutNotice(ctx context.Context) error {
+	if !g.groupAdminRequestSyncerLock.TryLock() {
+		return nil
+	}
+	defer g.groupAdminRequestSyncerLock.Unlock()
 	requests, err := g.GetServerAdminGroupApplicationList(ctx)
 	if err != nil {
 		return err
diff --git a/internal/group/group.go b/internal/group/group.go
@@ -69,6 +69,9 @@ type Group struct {
 	listenerForService open_im_sdk_callback.OnListenerForService
 
 	groupMemberCache *cache.Cache[string, *model_struct.LocalGroupMember]
+
+	groupRequestSyncerLock      sync.Mutex
+	groupAdminRequestSyncerLock sync.Mutex
 }
 
 func (g *Group) initSyncer() {
diff --git a/internal/relation/relation.go b/internal/relation/relation.go
@@ -42,6 +42,9 @@ type Relation struct {
 	conversationCh     chan common.Cmd2Value
 	listenerForService open_im_sdk_callback.OnListenerForService
 	relationSyncMutex  sync.Mutex
+
+	requestRecvSyncerLock sync.Mutex
+	requestSendSyncerLock sync.Mutex
 }
 
 func (r *Relation) initSyncer() {
diff --git a/internal/relation/sync.go b/internal/relation/sync.go
@@ -13,6 +13,17 @@ import (
 )
 
 func (r *Relation) SyncBothFriendRequest(ctx context.Context, fromUserID, toUserID string) error {
+	if toUserID == r.loginUserID {
+		if !r.requestRecvSyncerLock.TryLock() {
+			return nil
+		}
+		defer r.requestRecvSyncerLock.Unlock()
+	} else {
+		if !r.requestSendSyncerLock.TryLock() {
+			return nil
+		}
+		defer r.requestSendSyncerLock.Unlock()
+	}
 	req := &relation.GetDesignatedFriendsApplyReq{FromUserID: fromUserID, ToUserID: toUserID}
 	friendRequests, err := r.getDesignatedFriendsApply(ctx, req)
 	if err != nil {
@@ -32,6 +43,10 @@ func (r *Relation) SyncBothFriendRequest(ctx context.Context, fromUserID, toUser
 
 // SyncAllSelfFriendApplication send
 func (r *Relation) SyncAllSelfFriendApplication(ctx context.Context) error {
+	if !r.requestSendSyncerLock.TryLock() {
+		return nil
+	}
+	defer r.requestSendSyncerLock.Unlock()
 	req := &relation.GetPaginationFriendsApplyFromReq{UserID: r.loginUserID, Pagination: &sdkws.RequestPagination{}}
 	requests, err := r.getSelfFriendApplicationList(ctx, req)
 	if err != nil {
@@ -45,6 +60,10 @@ func (r *Relation) SyncAllSelfFriendApplication(ctx context.Context) error {
 }
 
 func (r *Relation) SyncAllSelfFriendApplicationWithoutNotice(ctx context.Context) error {
+	if !r.requestSendSyncerLock.TryLock() {
+		return nil
+	}
+	defer r.requestSendSyncerLock.Unlock()
 	req := &relation.GetPaginationFriendsApplyFromReq{UserID: r.loginUserID, Pagination: &sdkws.RequestPagination{}}
 	requests, err := r.getSelfFriendApplicationList(ctx, req)
 	if err != nil {
@@ -59,6 +78,10 @@ func (r *Relation) SyncAllSelfFriendApplicationWithoutNotice(ctx context.Context
 
 // SyncAllFriendApplication recv
 func (r *Relation) SyncAllFriendApplication(ctx context.Context) error {
+	if !r.requestRecvSyncerLock.TryLock() {
+		return nil
+	}
+	defer r.requestRecvSyncerLock.Unlock()
 	req := &relation.GetPaginationFriendsApplyToReq{UserID: r.loginUserID, Pagination: &sdkws.RequestPagination{}}
 	requests, err := r.getFriendApplicationList(ctx, req)
 	if err != nil {
@@ -71,6 +94,10 @@ func (r *Relation) SyncAllFriendApplication(ctx context.Context) error {
 	return r.requestRecvSyncer.Sync(ctx, datautil.Batch(ServerFriendRequestToLocalFriendRequest, requests), localData, nil)
 }
 func (r *Relation) SyncAllFriendApplicationWithoutNotice(ctx context.Context) error {
+	if !r.requestRecvSyncerLock.TryLock() {
+		return nil
+	}
+	defer r.requestRecvSyncerLock.Unlock()
 	req := &relation.GetPaginationFriendsApplyToReq{UserID: r.loginUserID, Pagination: &sdkws.RequestPagination{}}
 	requests, err := r.getFriendApplicationList(ctx, req)
 	if err != nil {
diff --git a/open_im_sdk/conversation_msg.go b/open_im_sdk/conversation_msg.go
@@ -15,6 +15,8 @@
 package open_im_sdk
 
 import (
+	"context"
+
 	"github.com/openimsdk/openim-sdk-core/v3/open_im_sdk_callback"
 )
 
@@ -126,7 +128,7 @@ func CreateForwardMessage(operationID string, m string) string {
 	return syncCall(operationID, UserForSDK.Conversation().CreateForwardMessage, m)
 }
 func GetConversationIDBySessionType(operationID string, sourceID string, sessionType int) string {
-	return syncCall(operationID, UserForSDK.Conversation().GetConversationIDBySessionType, sourceID, sessionType)
+	return UserForSDK.Conversation().GetConversationIDBySessionType(context.Background(), sourceID, sessionType)
 }
 func SendMessage(callback open_im_sdk_callback.SendMsgCallBack, operationID, message, recvID, groupID, offlinePushInfo string, isOnlineOnly bool) {
 	messageCall(callback, operationID, UserForSDK.Conversation().SendMessage, message, recvID, groupID, offlinePushInfo, isOnlineOnly)

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ func (c *Conversation) getAdvancedHistoryMessageList(ctx context.Context, req sd`
`67`	`67`	`return nil, err`
`68`	`68`	`}`
`69`	`69`	`startTime = m.SendTime`
	`70`	`+ startClientMsgID = req.StartClientMsgID`
`70`	`71`	`err = c.handleEndSeq(ctx, req, isReverse, m)`
`71`	`72`	`if err != nil {`
`72`	`73`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,9 @@ type Group struct {`
`69`	`69`	`listenerForService open_im_sdk_callback.OnListenerForService`
`70`	`70`
`71`	`71`	`groupMemberCache cache.Cache[string, model_struct.LocalGroupMember]`
	`72`	`+`
	`73`	`+ groupRequestSyncerLock sync.Mutex`
	`74`	`+ groupAdminRequestSyncerLock sync.Mutex`
`72`	`75`	`}`
`73`	`76`
`74`	`77`	`func (g *Group) initSyncer() {`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,9 @@ type Relation struct {`
`42`	`42`	`conversationCh chan common.Cmd2Value`
`43`	`43`	`listenerForService open_im_sdk_callback.OnListenerForService`
`44`	`44`	`relationSyncMutex sync.Mutex`
	`45`	`+`
	`46`	`+ requestRecvSyncerLock sync.Mutex`
	`47`	`+ requestSendSyncerLock sync.Mutex`
`45`	`48`	`}`
`46`	`49`
`47`	`50`	`func (r *Relation) initSyncer() {`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`package open_im_sdk`
`16`	`16`
`17`	`17`	`import (`
	`18`	`+ "context"`
	`19`	`+`
`18`	`20`	`"github.com/openimsdk/openim-sdk-core/v3/open_im_sdk_callback"`
`19`	`21`	`)`
`20`	`22`
`@@ -126,7 +128,7 @@ func CreateForwardMessage(operationID string, m string) string {`
`126`	`128`	`return syncCall(operationID, UserForSDK.Conversation().CreateForwardMessage, m)`
`127`	`129`	`}`
`128`	`130`	`func GetConversationIDBySessionType(operationID string, sourceID string, sessionType int) string {`
`129`		`- return syncCall(operationID, UserForSDK.Conversation().GetConversationIDBySessionType, sourceID, sessionType)`
	`131`	`+ return UserForSDK.Conversation().GetConversationIDBySessionType(context.Background(), sourceID, sessionType)`
`130`	`132`	`}`
`131`	`133`	`func SendMessage(callback open_im_sdk_callback.SendMsgCallBack, operationID, message, recvID, groupID, offlinePushInfo string, isOnlineOnly bool) {`
`132`	`134`	`messageCall(callback, operationID, UserForSDK.Conversation().SendMessage, message, recvID, groupID, offlinePushInfo, isOnlineOnly)`