Merge a0ccbf18839d567358d2519ceec8d37a06be1932 into 3b710fdfdbcc825dabd29afea637df9f484299ae

* feat: implement stress-test tools.

* revert config file.

* fix: improve tools parms.

* fix modify args.

internal/rpc/msg/revoke.go

@@ -17,6 +17,8 @@ package msg
 import (
 	"context"
 	"encoding/json"
+	"strconv"
+	"strings"
 	"time"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
@@ -49,38 +51,94 @@ func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg.
 	if err != nil {
 		return nil, err
 	}
+	
+	// Get message and add fault tolerance handling
 	_, _, msgs, err := m.MsgDatabase.GetMsgBySeqs(ctx, req.UserID, req.ConversationID, []int64{req.Seq})
 	if err != nil {
-		return nil, err
+		// Log the error but continue execution
-	}
+		log.ZWarn(ctx, "GetMsgBySeqs error when revoking message", err, 
-	if len(msgs) == 0 || msgs[0] == nil {
+				"userID", req.UserID, "conversationID", req.ConversationID, "seq", req.Seq)
-		return nil, errs.ErrRecordNotFound.WrapMsg("msg not found")
+	} else if len(msgs) == 0 || msgs[0] == nil {
-	}
+		// Check if seq is within valid range for the current conversation
-	if msgs[0].ContentType == constant.MsgRevokeNotification {
+		maxSeq, err := m.MsgDatabase.GetMaxSeq(ctx, req.ConversationID)
-		return nil, servererrs.ErrMsgAlreadyRevoke.WrapMsg("msg already revoke")
+		if err != nil {
+			log.ZWarn(ctx, "GetMaxSeq error when revoking message", err, 
+					"conversationID", req.ConversationID)
+		} else if req.Seq > maxSeq {
+			return nil, errs.ErrArgs.WrapMsg("seq exceeds maxSeq")
+		}
+		
+		// Log warning but continue execution
+		log.ZWarn(ctx, "Message not found when revoking, but will proceed", nil,
+				"userID", req.UserID, "conversationID", req.ConversationID, "seq", req.Seq)
 	}
 
-	data, _ := json.Marshal(msgs[0])
+	// If message doesn't exist, create a minimal substitute for revocation notification
+	var msgToRevoke *sdkws.MsgData
+	if len(msgs) == 0 || msgs[0] == nil {
+		// Create a minimal message object with necessary fields
+		msgToRevoke = &sdkws.MsgData{
+			SendID:         req.UserID,  // Use revoker as sender
+			Seq:            req.Seq,
+			SessionType:    getSessionTypeFromConversationID(req.ConversationID), // Helper function to get session type
+			ClientMsgID:    "missing_" + strconv.FormatInt(req.Seq, 10), // Generate a temporary ID
+			SendTime:       time.Now().UnixMilli() - 1000, // Set to a slightly earlier time
+		}
+		
+		// Set GroupID or RecvID based on session type
+		if msgToRevoke.SessionType == constant.ReadGroupChatType {
+			// Extract group ID from conversation ID
+			if strings.HasPrefix(req.ConversationID, "sg_") {
+				msgToRevoke.GroupID = req.ConversationID[3:] // Remove "sg_" prefix
+			}
+		} else {
+			// For single chat, parse receiver ID from conversation ID
+			if strings.HasPrefix(req.ConversationID, "si_") || strings.HasPrefix(req.ConversationID, "sp_") {
+				parts := strings.Split(req.ConversationID[3:], "_")
+				if len(parts) == 2 {
+					// Conversation ID format is typically: si_senderID_receiverID
+					// If current user is the sender, then receiver is the other party
+					if parts[0] == req.UserID {
+						msgToRevoke.RecvID = parts[1]
+					} else {
+						msgToRevoke.RecvID = parts[0]
+					}
+				} else {
+					// Set empty if parsing fails
+					msgToRevoke.RecvID = ""
+				}
+			} else {
+				msgToRevoke.RecvID = ""
+			}
+		}
+	} else {
+		msgToRevoke = msgs[0]
+		if msgToRevoke.ContentType == constant.MsgRevokeNotification {
+			return nil, servererrs.ErrMsgAlreadyRevoke.WrapMsg("msg already revoke")
+		}
+	}
+
+	data, _ := json.Marshal(msgToRevoke)
 	log.ZDebug(ctx, "GetMsgBySeqs", "conversationID", req.ConversationID, "seq", req.Seq, "msg", string(data))
 	var role int32
 	if !authverify.IsAppManagerUid(ctx, m.config.Share.IMAdminUserID) {
-		sessionType := msgs[0].SessionType
+		sessionType := msgToRevoke.SessionType
 		switch sessionType {
 		case constant.SingleChatType:
-			if err := authverify.CheckAccessV3(ctx, msgs[0].SendID, m.config.Share.IMAdminUserID); err != nil {
+			if err := authverify.CheckAccessV3(ctx, msgToRevoke.SendID, m.config.Share.IMAdminUserID); err != nil {
 				return nil, err
 			}
 			role = user.AppMangerLevel
 		case constant.ReadGroupChatType:
-			members, err := m.GroupLocalCache.GetGroupMemberInfoMap(ctx, msgs[0].GroupID, datautil.Distinct([]string{req.UserID, msgs[0].SendID}))
+			members, err := m.GroupLocalCache.GetGroupMemberInfoMap(ctx, msgToRevoke.GroupID, datautil.Distinct([]string{req.UserID, msgToRevoke.SendID}))
 			if err != nil {
 				return nil, err
 			}
-			if req.UserID != msgs[0].SendID {
+			if req.UserID != msgToRevoke.SendID {
 				switch members[req.UserID].RoleLevel {
 				case constant.GroupOwner:
 				case constant.GroupAdmin:
-					if sendMember, ok := members[msgs[0].SendID]; ok {
+					if sendMember, ok := members[msgToRevoke.SendID]; ok {
 						if sendMember.RoleLevel != constant.GroupOrdinaryUsers {
 							return nil, errs.ErrNoPermission.WrapMsg("no permission")
 						}
@@ -114,20 +172,31 @@ func (m *msgServer) RevokeMsg(ctx context.Context, req *msg.RevokeMsgReq) (*msg.
 	}
 	tips := sdkws.RevokeMsgTips{
 		RevokerUserID:  revokerUserID,
-		ClientMsgID:    msgs[0].ClientMsgID,
+		ClientMsgID:    msgToRevoke.ClientMsgID,
 		RevokeTime:     now,
 		Seq:            req.Seq,
-		SesstionType:   msgs[0].SessionType,
+		SesstionType:   msgToRevoke.SessionType,
 		ConversationID: req.ConversationID,
 		IsAdminRevoke:  flag,
 	}
 	var recvID string
-	if msgs[0].SessionType == constant.ReadGroupChatType {
+	if msgToRevoke.SessionType == constant.ReadGroupChatType {
-		recvID = msgs[0].GroupID
+		recvID = msgToRevoke.GroupID
 	} else {
-		recvID = msgs[0].RecvID
+		recvID = msgToRevoke.RecvID
 	}
-	m.notificationSender.NotificationWithSessionType(ctx, req.UserID, recvID, constant.MsgRevokeNotification, msgs[0].SessionType, &tips)
+	m.notificationSender.NotificationWithSessionType(ctx, req.UserID, recvID, constant.MsgRevokeNotification, msgToRevoke.SessionType, &tips)
 	m.webhookAfterRevokeMsg(ctx, &m.config.WebhooksConfig.AfterRevokeMsg, req)
 	return &msg.RevokeMsgResp{}, nil
 }
+
+func getSessionTypeFromConversationID(conversationID string) int32 {
+	// Conversation ID format is typically: "single chat prefix{userID}" or "group chat prefix{groupID}"
+	if strings.HasPrefix(conversationID, "sp_") || strings.HasPrefix(conversationID, "si_") {
+		return constant.SingleChatType
+	} else if strings.HasPrefix(conversationID, "sg_") {
+		return constant.ReadGroupChatType
+	}
+	// Default to single chat type
+	return constant.SingleChatType
+}

tools/stress-test/main.go

@@ -14,6 +14,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/openimsdk/open-im-server/v3/pkg/apistruct"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/protocol/auth"
 	"github.com/openimsdk/protocol/constant"
@@ -232,12 +233,15 @@ func (st *StressTest) SendMsg(ctx context.Context, userID string) error {
 		"content": fmt.Sprintf("index %d. The current time is %s", st.MsgCounter, time.Now().Format("2006-01-02 15:04:05.000")),
 	}
 
-	req := map[string]any{
+	req := &apistruct.SendMsgReq{
-		"sendID":      userID,
+		SendMsg: apistruct.SendMsg{
-		"groupID":     st.DefaultGroupID,
+			SendID:         userID,
-		"contentType": constant.Text,
+			SenderNickname: userID,
-		"sessionType": constant.ReadGroupChatType,
+			GroupID:        st.DefaultGroupID,
-		"content":     contentObj,
+			ContentType:    constant.Text,
+			SessionType:    constant.ReadGroupChatType,
+			Content:        contentObj,
+		},
 	}
 
 	_, err := st.PostRequest(ctx, ApiAddress+SendMsg, &req)
@@ -254,15 +258,18 @@ func (st *StressTest) SendMsg(ctx context.Context, userID string) error {
 func (st *StressTest) CreateGroup(ctx context.Context, userID string) (string, error) {
 	groupID := fmt.Sprintf("StressTestGroup_%d_%s", st.GroupCounter, time.Now().Format("20060102150405"))
 
-	req := map[string]any{
+	groupInfo := &sdkws.GroupInfo{
-		"memberUserIDs": TestTargetUserList,
+		GroupID:   groupID,
-		"ownerUserID":   userID,
+		GroupName: groupID,
-		"groupInfo": map[string]any{
+		GroupType: constant.WorkingGroup,
-			"groupID":   groupID,
-			"groupName": groupID,
-			"groupType": constant.WorkingGroup,
-		},
 	}
+
+	req := group.CreateGroupReq{
+		OwnerUserID:   userID,
+		MemberUserIDs: TestTargetUserList,
+		GroupInfo:     groupInfo,
+	}
+
 	resp := group.CreateGroupResp{}
 
 	response, err := st.PostRequest(ctx, ApiAddress+CreateGroup, &req)