refactor: remove fetch messages instead of search message clear cache. (#835)

Signed-off-by: Gordon <[email protected]>

Author: FGadvancer

internal/conversation_msg/api.go

@@ -20,7 +20,6 @@ import (
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/content_type"
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/db/model_struct"
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/sdk_params_callback"
-	sdk "github.com/openimsdk/openim-sdk-core/v3/pkg/sdk_params_callback"
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/sdkerrs"
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/server_api_params"
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/utils"
@@ -1006,56 +1005,3 @@ func (c *Conversation) GetInputStates(ctx context.Context, conversationID string
 func (c *Conversation) ChangeInputStates(ctx context.Context, conversationID string, focus bool) error {
 	return c.typing.ChangeInputStates(ctx, conversationID, focus)
 }
-
-func (c *Conversation) FetchSurroundingMessages(ctx context.Context, req *sdk_params_callback.FetchSurroundingMessagesReq) (*sdk_params_callback.FetchSurroundingMessagesResp, error) {
-	conversationID := utils.GetConversationIDByMsg(req.StartMessage)
-	var message *model_struct.LocalChatLog
-	message, err := c.db.GetMessage(ctx, conversationID, req.StartMessage.ClientMsgID)
-	if err == nil {
-		if message.Status >= constant.MsgStatusHasDeleted {
-			return nil, sdkerrs.ErrMsgHasDeleted
-		}
-	} else {
-		if req.StartMessage.Seq == 0 {
-			return nil, sdkerrs.ErrMsgHasDeleted
-		}
-		var messages []*model_struct.LocalChatLog
-		c.fetchAndMergeMissingMessages(ctx, conversationID, []int64{req.StartMessage.Seq}, false, 1, 0, &messages, &sdk.GetAdvancedHistoryMessageListCallback{})
-		if len(messages) < 1 {
-			return nil, sdkerrs.ErrMsgHasDeleted
-		}
-		message = messages[0]
-	}
-	c.messagePullForwardEndSeqMap.Delete(conversationID, req.ViewType)
-	c.messagePullReverseEndSeqMap.Delete(conversationID, req.ViewType)
-
-	result := make([]*sdk_struct.MsgStruct, 0, req.Before+req.After+1)
-	if req.Before > 0 {
-		req := sdk.GetAdvancedHistoryMessageListParams{
-			ConversationID:   conversationID,
-			Count:            req.Before,
-			StartClientMsgID: req.StartMessage.ClientMsgID,
-			ViewType:         req.ViewType,
-		}
-		val, err := c.getAdvancedHistoryMessageList(ctx, req, false)
-		if err != nil {
-			return nil, err
-		}
-		result = append(result, val.MessageList...)
-	}
-	result = append(result, LocalChatLogToMsgStruct(message))
-	if req.After > 0 {
-		req := sdk.GetAdvancedHistoryMessageListParams{
-			ConversationID:   conversationID,
-			Count:            req.After,
-			StartClientMsgID: req.StartMessage.ClientMsgID,
-			ViewType:         req.ViewType,
-		}
-		val, err := c.getAdvancedHistoryMessageList(ctx, req, true)
-		if err != nil {
-			return nil, err
-		}
-		result = append(result, val.MessageList...)
-	}
-	return &sdk_params_callback.FetchSurroundingMessagesResp{MessageList: result}, nil
-}

internal/conversation_msg/conversation.go

@@ -25,6 +25,7 @@ import (
 	"golang.org/x/sync/errgroup"
 
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/api"
+	"github.com/openimsdk/openim-sdk-core/v3/pkg/cache"
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/constant"
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/db/model_struct"
 	sdk "github.com/openimsdk/openim-sdk-core/v3/pkg/sdk_params_callback"
@@ -328,6 +329,11 @@ func (c *Conversation) searchLocalMessages(ctx context.Context, searchParam *sdk
 	var err error                                                           // Variable to store any errors encountered
 	var conversationID string                                               // Variable to store the current conversation ID
 
+	// Clear the sequence cache for pull-up and pull-down operations in the search view,
+	// to prevent the completion operations from the previous round from affecting the next round
+	c.messagePullForwardEndSeqMap.DeleteByViewType(cache.ViewSearch)
+	c.messagePullReverseEndSeqMap.DeleteByViewType(cache.ViewSearch)
+
 	// Set the end time for the search; if SearchTimePosition is 0, use the current timestamp
 	if searchParam.SearchTimePosition == 0 {
 		endTime = time.Now().Unix()

open_im_sdk/conversation_msg.go

@@ -222,7 +222,3 @@ func ChangeInputStates(callback open_im_sdk_callback.Base, operationID string, c
 func GetInputStates(callback open_im_sdk_callback.Base, operationID string, conversationID string, userID string) {
 	call(callback, operationID, UserForSDK.Conversation().GetInputStates, conversationID, userID)
 }
-
-func FetchSurroundingMessages(callback open_im_sdk_callback.Base, operationID string, req string) {
-	call(callback, operationID, UserForSDK.Conversation().FetchSurroundingMessages, req)
-}

pkg/cache/cache.go

@@ -58,6 +58,16 @@ func (c *Cache[K, V]) DeleteAll() {
 	})
 }
 
+// DeleteCon deletes the value for a key only if the provided condition function returns true.
+func (c *Cache[K, V]) DeleteCon(condition func(key K, value V) bool) {
+	c.m.Range(func(rawKey, rawValue interface{}) bool {
+		if condition(rawKey.(K), rawValue.(V)) {
+			c.m.Delete(rawKey)
+		}
+		return true // Continue iteration
+	})
+}
+
 // RangeAll returns all values in the map.
 func (c *Cache[K, V]) RangeAll() (values []V) {
 	c.m.Range(func(rawKey, rawValue interface{}) bool {

pkg/cache/conversation_seq_cache.go

@@ -1,6 +1,10 @@
 package cache
 
-import "github.com/openimsdk/tools/utils/stringutil"
+import (
+	"strings"
+
+	"github.com/openimsdk/tools/utils/stringutil"
+)
 
 const (
 	ViewHistory = iota
@@ -28,10 +32,18 @@ func (c ConversationSeqContextCache) Store(conversationID string, viewType int,
 	c.Cache.Store(c.getConversationViewTypeKey(conversationID, viewType), thisEndSeq)
 
 }
+
 func (c ConversationSeqContextCache) StoreWithFunc(conversationID string, viewType int, thisEndSeq int64, fn func(key string, value int64) bool) {
 
 	c.Cache.StoreWithFunc(c.getConversationViewTypeKey(conversationID, viewType), thisEndSeq, fn)
 }
+
 func (c ConversationSeqContextCache) getConversationViewTypeKey(conversationID string, viewType int) string {
-	return conversationID + "_" + stringutil.IntToString(viewType)
+	return conversationID + "::viewType::" + stringutil.IntToString(viewType)
+}
+
+func (c ConversationSeqContextCache) DeleteByViewType(viewType int) {
+	c.Cache.DeleteCon(func(key string, value int64) bool {
+		return strings.Contains(key, "::viewType::"+stringutil.IntToString(viewType))
+	})
 }

wasm/cmd/main.go

@@ -121,7 +121,6 @@ func registerFunc() {
 
 	js.Global().Set("changeInputStates", js.FuncOf(wrapperConMsg.ChangeInputStates))
 	js.Global().Set("getInputStates", js.FuncOf(wrapperConMsg.GetInputStates))
-	js.Global().Set("fetchSurroundingMessages", js.FuncOf(wrapperConMsg.FetchSurroundingMessages))
 
 	//register group func
 	wrapperGroup := wasm_wrapper.NewWrapperGroup(globalFuc)

wasm/wasm_wrapper/wasm_conversation_msg.go

@@ -301,8 +301,3 @@ func (w *WrapperConMsg) GetInputStates(_ js.Value, args []js.Value) interface{}
 	callback := event_listener.NewBaseCallback(utils.FirstLower(utils.GetSelfFuncName()), w.commonFunc)
 	return event_listener.NewCaller(open_im_sdk.GetInputStates, callback, &args).AsyncCallWithCallback()
 }
-
-func (w *WrapperConMsg) FetchSurroundingMessages(_ js.Value, args []js.Value) interface{} {
-	callback := event_listener.NewBaseCallback(utils.FirstLower(utils.GetSelfFuncName()), w.commonFunc)
-	return event_listener.NewCaller(open_im_sdk.FetchSurroundingMessages, callback, &args).AsyncCallWithCallback()
-}