From ce8c120b964f987601f786a84e71d2a6845b41a7 Mon Sep 17 00:00:00 2001 From: Gordon <46924906+FGadvancer@users.noreply.github.com> Date: Thu, 9 Nov 2023 12:17:19 +0800 Subject: [PATCH] fix: pull message unread count remove. (#404) * refactor: change login mgr export path. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * refactor: change login mgr export path. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> * refactor: remove old logs. Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> --------- Signed-off-by: Gordon <46924906+FGadvancer@users.noreply.github.com> --- internal/conversation_msg/create_message.go | 17 ++++++++----- internal/interaction/msg_sync.go | 12 --------- open_im_sdk/listener.go | 9 ------- open_im_sdk/util.go | 3 ++- pkg/common/check.go | 28 +++------------------ pkg/db/group_member_model.go | 5 +--- pkg/db/super_group_chat_log_model.go | 2 -- wasm/cmd/main.go | 3 +-- wasm/event_listener/caller.go | 25 ++++++++++-------- wasm/exec/executor.go | 9 ++++--- wasm/wasm_wrapper/wasm_init_login.go | 3 --- 11 files changed, 39 insertions(+), 77 deletions(-) diff --git a/internal/conversation_msg/create_message.go b/internal/conversation_msg/create_message.go index 5a3b885d3..db06d2fd9 100644 --- a/internal/conversation_msg/create_message.go +++ b/internal/conversation_msg/create_message.go @@ -17,8 +17,9 @@ package conversation_msg import ( "context" "errors" + "github.com/OpenIMSDK/tools/log" "github.com/openimsdk/openim-sdk-core/v3/pkg/constant" - "github.com/openimsdk/openim-sdk-core/v3/pkg/log" + "github.com/openimsdk/openim-sdk-core/v3/pkg/sdkerrs" "github.com/openimsdk/openim-sdk-core/v3/pkg/utils" "github.com/openimsdk/openim-sdk-core/v3/sdk_struct" @@ -161,14 +162,17 @@ func (c *Conversation) CreateVideoMessageFromFullPath(ctx context.Context, video //log.Error("internal", "open file failed: ", err, videoFullPath) return nil, err } - log.Info("internal", "videoFullPath dstFile", videoFullPath, dstFile, written) + log.ZDebug(ctx, "videoFullPath dstFile", "videoFullPath", videoFullPath, + "dstFile", dstFile, "written", written) + dstFile = utils.FileTmpPath(snapshotFullPath, c.DataDir) //a->b sWritten, err := utils.CopyFile(snapshotFullPath, dstFile) if err != nil { //log.Error("internal", "open file failed: ", err, snapshotFullPath) return nil, err } - log.Info("internal", "snapshotFullPath dstFile", snapshotFullPath, dstFile, sWritten) + log.ZDebug(ctx, "snapshotFullPath dstFile", "snapshotFullPath", snapshotFullPath, + "dstFile", dstFile, "sWritten", sWritten) s := sdk_struct.MsgStruct{} err = c.initBasicInfo(ctx, &s, constant.UserMsgType, constant.Video) @@ -194,7 +198,7 @@ func (c *Conversation) CreateVideoMessageFromFullPath(ctx context.Context, video if snapshotFullPath != "" { imageInfo, err := getImageInfo(s.VideoElem.SnapshotPath) if err != nil { - log.Error("internal", "get Image Attributes error", err.Error()) + log.ZError(ctx, "getImageInfo err:", err, "snapshotFullPath", snapshotFullPath) return nil, err } s.VideoElem.SnapshotHeight = imageInfo.Height @@ -398,7 +402,7 @@ func (c *Conversation) CreateVideoMessage(ctx context.Context, videoPath string, } fi, err := os.Stat(s.VideoElem.VideoPath) if err != nil { - log.Error("internal", "get video file error", err.Error()) + log.ZDebug(ctx, "get video file error", "videoPath", videoPath, "snapshotPath", snapshotPath) return nil, err } s.VideoElem.VideoSize = fi.Size() @@ -473,7 +477,8 @@ func (c *Conversation) CreateFaceMessage(ctx context.Context, index int, data st func (c *Conversation) CreateForwardMessage(ctx context.Context, s *sdk_struct.MsgStruct) (*sdk_struct.MsgStruct, error) { if s.Status != constant.MsgStatusSendSuccess { - log.Error("internal", "only send success message can be Forward") + log.ZError(ctx, "only send success message can be Forward", + errors.New("only send success message can be Forward")) return nil, errors.New("only send success message can be Forward") } err := c.initBasicInfo(ctx, s, constant.UserMsgType, s.ContentType) diff --git a/internal/interaction/msg_sync.go b/internal/interaction/msg_sync.go index a1ed91444..068bee312 100644 --- a/internal/interaction/msg_sync.go +++ b/internal/interaction/msg_sync.go @@ -180,18 +180,6 @@ func (m *MsgSyncer) compareSeqsAndBatchSync(ctx context.Context, maxSeqToSync ma _ = m.syncAndTriggerMsgs(m.ctx, needSyncSeqMap, pullNums) } -func (m *MsgSyncer) compareSeqsAndSync(maxSeqToSync map[string]int64) { - for conversationID, maxSeq := range maxSeqToSync { - if syncedMaxSeq, ok := m.syncedMaxSeqs[conversationID]; ok { - if maxSeq > syncedMaxSeq { - _ = m.syncAndTriggerMsgs(m.ctx, map[string][2]int64{conversationID: {syncedMaxSeq, maxSeq}}, defaultPullNums) - } - } else { - _ = m.syncAndTriggerMsgs(m.ctx, map[string][2]int64{conversationID: {syncedMaxSeq, maxSeq}}, defaultPullNums) - } - } -} - func (m *MsgSyncer) doPushMsg(ctx context.Context, push *sdkws.PushMessages) { log.ZDebug(ctx, "push msgs", "push", push, "syncedMaxSeqs", m.syncedMaxSeqs) m.pushTriggerAndSync(ctx, push.Msgs, m.triggerConversation) diff --git a/open_im_sdk/listener.go b/open_im_sdk/listener.go index 4f4682868..1be663b9e 100644 --- a/open_im_sdk/listener.go +++ b/open_im_sdk/listener.go @@ -16,12 +16,10 @@ package open_im_sdk import ( "github.com/openimsdk/openim-sdk-core/v3/open_im_sdk_callback" - "github.com/openimsdk/openim-sdk-core/v3/pkg/log" ) func SetGroupListener(callback open_im_sdk_callback.OnGroupListener) { if callback == nil || UserForSDK == nil { - log.Error("callback or UserForSDK is nil") return } UserForSDK.SetGroupListener(callback) @@ -29,21 +27,18 @@ func SetGroupListener(callback open_im_sdk_callback.OnGroupListener) { func SetConversationListener(listener open_im_sdk_callback.OnConversationListener) { if listener == nil || UserForSDK == nil { - log.Error("callback or UserForSDK is nil") return } UserForSDK.SetConversationListener(listener) } func SetAdvancedMsgListener(listener open_im_sdk_callback.OnAdvancedMsgListener) { if listener == nil || UserForSDK == nil { - log.Error("callback or UserForSDK is nil") return } UserForSDK.SetAdvancedMsgListener(listener) } func SetBatchMsgListener(listener open_im_sdk_callback.OnBatchMsgListener) { if listener == nil || UserForSDK == nil { - log.Error("callback or UserForSDK is nil") return } UserForSDK.SetBatchMsgListener(listener) @@ -51,7 +46,6 @@ func SetBatchMsgListener(listener open_im_sdk_callback.OnBatchMsgListener) { func SetUserListener(listener open_im_sdk_callback.OnUserListener) { if listener == nil || UserForSDK == nil { - log.Error("callback or UserForSDK is nil") return } UserForSDK.SetUserListener(listener) @@ -59,7 +53,6 @@ func SetUserListener(listener open_im_sdk_callback.OnUserListener) { func SetFriendListener(listener open_im_sdk_callback.OnFriendshipListener) { if listener == nil || UserForSDK == nil { - log.Error("callback or UserForSDK is nil") return } UserForSDK.SetFriendListener(listener) @@ -67,7 +60,6 @@ func SetFriendListener(listener open_im_sdk_callback.OnFriendshipListener) { func SetCustomBusinessListener(listener open_im_sdk_callback.OnCustomBusinessListener) { if listener == nil || UserForSDK == nil { - log.Error("callback or UserForSDK is nil") return } UserForSDK.SetBusinessListener(listener) @@ -75,7 +67,6 @@ func SetCustomBusinessListener(listener open_im_sdk_callback.OnCustomBusinessLis func SetMessageKvInfoListener(listener open_im_sdk_callback.OnMessageKvInfoListener) { if listener == nil || UserForSDK == nil { - log.Error("callback or UserForSDK is nil") return } UserForSDK.SetMessageKvInfoListener(listener) diff --git a/open_im_sdk/util.go b/open_im_sdk/util.go index 44b4ef218..9dffa518e 100644 --- a/open_im_sdk/util.go +++ b/open_im_sdk/util.go @@ -259,7 +259,8 @@ func syncCall(operationID string, fn any, args ...any) string { v := reflect.New(tag) if args[i].(string) != "" { if err := json.Unmarshal([]byte(args[i].(string)), v.Interface()); err != nil { - log.ZWarn(ctx, "json.Unmarshal error", err, "function name", funcName, "arg", args[i], "v", v.Interface()) + log.ZWarn(ctx, "json.Unmarshal error", err, "function name", funcName, + "arg", args[i], "v", v.Interface()) //callback.OnError(constant.ErrArgs.ErrCode, err.Error()) return "" } diff --git a/pkg/common/check.go b/pkg/common/check.go index 563186bce..406ed7efb 100644 --- a/pkg/common/check.go +++ b/pkg/common/check.go @@ -19,7 +19,6 @@ import ( "errors" "github.com/mitchellh/mapstructure" "github.com/openimsdk/openim-sdk-core/v3/open_im_sdk_callback" - "github.com/openimsdk/openim-sdk-core/v3/pkg/log" "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" @@ -35,7 +34,7 @@ import ( func CheckAnyErrCallback(callback open_im_sdk_callback.Base, errCode int32, err error, operationID string) { if err != nil { errInfo := "operationID[" + operationID + "], " + "info[" + err.Error() + "]" - log.NewError(operationID, "checkErr ", errInfo) + //log.NewError(operationID, "checkErr ", errInfo) callback.OnError(errCode, errInfo) runtime.Goexit() } @@ -60,25 +59,6 @@ func CheckArgsErrCallback(callback open_im_sdk_callback.Base, err error, operati CheckAnyErrCallback(callback, sdkerrs.ArgsError, err, operationID) } -func CheckErrAndRespCallback(callback open_im_sdk_callback.Base, err error, resp []byte, output interface{}, operationID string) { - log.Debug(operationID, utils.GetSelfFuncName(), "args: ", string(resp)) - if err = CheckErrAndResp(err, resp, output, nil); err != nil { - log.Error(operationID, "CheckErrAndResp failed ", err.Error(), "input: ", string(resp)) - callback.OnError(sdkerrs.SdkInternalError, err.Error()) - runtime.Goexit() - } -} - -func CheckErrAndRespCallbackPenetrate(callback open_im_sdk_callback.Base, err error, resp []byte, output interface{}, operationID string) { - log.Debug(operationID, utils.GetSelfFuncName(), "args: ", string(resp)) - var penetrateErrCode int32 - if err = CheckErrAndResp(err, resp, output, &penetrateErrCode); err != nil { - log.Error(operationID, "CheckErrAndResp failed ", err.Error(), "input: ", string(resp), penetrateErrCode) - callback.OnError(penetrateErrCode, utils.Unwrap(err).Error()) - runtime.Goexit() - } -} - // //funcation CheckErrAndResp2(err error, resp []byte, output interface{}) error { // if err != nil { @@ -164,7 +144,7 @@ one: err = json.Unmarshal(resp, &c2) if err != nil { - log.Error("json.Unmarshal failed ", string(resp), "err: ", err.Error()) + //log.Error("json.Unmarshal failed ", string(resp), "err: ", err.Error()) return utils.Wrap(err, "") } if c2.ErrCode != 0 { @@ -187,7 +167,7 @@ func JsonUnmarshalAndArgsValidate(s string, args interface{}, callback open_im_s err := json.Unmarshal([]byte(s), args) if err != nil { if callback != nil { - log.NewError(operationID, "Unmarshal failed ", err.Error(), s) + //log.NewError(operationID, "Unmarshal failed ", err.Error(), s) callback.OnError(sdkerrs.ArgsError, err.Error()) runtime.Goexit() } else { @@ -210,7 +190,7 @@ func JsonUnmarshalCallback(s string, args interface{}, callback open_im_sdk_call err := json.Unmarshal([]byte(s), args) if err != nil { if callback != nil { - log.NewError(operationID, "Unmarshal failed ", err.Error(), s) + //log.NewError(operationID, "Unmarshal failed ", err.Error(), s) callback.OnError(sdkerrs.ArgsError, err.Error()) runtime.Goexit() } else { diff --git a/pkg/db/group_member_model.go b/pkg/db/group_member_model.go index 2555f4287..1d9bffc1e 100644 --- a/pkg/db/group_member_model.go +++ b/pkg/db/group_member_model.go @@ -23,7 +23,6 @@ import ( "fmt" "github.com/openimsdk/openim-sdk-core/v3/pkg/constant" "github.com/openimsdk/openim-sdk-core/v3/pkg/db/model_struct" - "github.com/openimsdk/openim-sdk-core/v3/pkg/log" "github.com/openimsdk/openim-sdk-core/v3/pkg/utils" ) @@ -276,12 +275,10 @@ func (d *DataBase) SearchGroupMembersDB(ctx context.Context, keyword string, gro if groupID != "" { condition = "( " + condition + " ) " condition += " and group_id IN ? " - log.Debug("", "subCondition SearchGroupMembers ", condition) err = d.conn.WithContext(ctx).Where(condition, []string{groupID}).Order("role_level DESC,join_time ASC").Offset(offset).Limit(count).Find(&groupMemberList).Error } else { - log.Debug("", "subCondition SearchGroupMembers ", condition) err = d.conn.WithContext(ctx).Where(condition).Order("role_level DESC,join_time ASC").Offset(offset).Limit(count).Find(&groupMemberList).Error - log.Debug("", "subCondition SearchGroupMembers ", condition, len(groupMemberList)) + } for _, v := range groupMemberList { diff --git a/pkg/db/super_group_chat_log_model.go b/pkg/db/super_group_chat_log_model.go index 667a8ac0b..ac80e294e 100644 --- a/pkg/db/super_group_chat_log_model.go +++ b/pkg/db/super_group_chat_log_model.go @@ -23,7 +23,6 @@ import ( "fmt" "github.com/openimsdk/openim-sdk-core/v3/pkg/constant" "github.com/openimsdk/openim-sdk-core/v3/pkg/db/model_struct" - "github.com/openimsdk/openim-sdk-core/v3/pkg/log" "github.com/openimsdk/openim-sdk-core/v3/pkg/utils" "github.com/openimsdk/openim-sdk-core/v3/sdk_struct" @@ -141,7 +140,6 @@ func (d *DataBase) SuperGroupSearchMessageByContentTypeAndKeyword(ctx context.Co } condition = fmt.Sprintf("send_time between %d and %d AND status <=%d And content_type IN ? ", startTime, endTime, constant.MsgStatusSendFailed) condition += subCondition - log.Info("key owrd", condition) err = utils.Wrap(d.conn.WithContext(ctx).Table(utils.GetConversationTableName(groupID)).Where(condition, contentType).Order("send_time DESC").Find(&messageList).Error, "SearchMessage failed") for _, v := range messageList { v1 := v diff --git a/wasm/cmd/main.go b/wasm/cmd/main.go index 28b47a5f3..45414e612 100644 --- a/wasm/cmd/main.go +++ b/wasm/cmd/main.go @@ -19,7 +19,6 @@ package main import ( "fmt" - "github.com/openimsdk/openim-sdk-core/v3/pkg/log" "github.com/openimsdk/openim-sdk-core/v3/wasm/wasm_wrapper" "runtime" "runtime/debug" @@ -30,7 +29,7 @@ import ( func main() { defer func() { if r := recover(); r != nil { - log.Error("MAIN", "panic info is:", r, string(debug.Stack())) + fmt.Println("MAIN", "panic info is:", r, debug.Stack()) } }() fmt.Println("runtime env", runtime.GOARCH, runtime.GOOS) diff --git a/wasm/event_listener/caller.go b/wasm/event_listener/caller.go index 8615fc19e..31c001de2 100644 --- a/wasm/event_listener/caller.go +++ b/wasm/event_listener/caller.go @@ -19,8 +19,9 @@ package event_listener import ( "bytes" + "context" "errors" - "github.com/openimsdk/openim-sdk-core/v3/pkg/log" + "github.com/OpenIMSDK/tools/log" "github.com/openimsdk/openim-sdk-core/v3/pkg/utils" "github.com/openimsdk/openim-sdk-core/v3/wasm/exec" "reflect" @@ -63,6 +64,7 @@ func (r *ReflectCall) asyncCallWithCallback() { r.ErrHandle(rc) } }() + ctx := context.Background() var funcName reflect.Value var typeFuncName reflect.Type var hasCallback bool @@ -79,7 +81,7 @@ func (r *ReflectCall) asyncCallWithCallback() { r.callback.SetOperationID(r.arguments[0].String()) values = append(values, reflect.ValueOf(r.callback)) } else { - log.Error("AsyncCallWithCallback", "not set callback") + log.ZDebug(ctx, "AsyncCallWithCallback not set callback") panic(ErrNotSetCallback) } funcFieldsNum := typeFuncName.NumIn() @@ -99,11 +101,11 @@ func (r *ReflectCall) asyncCallWithCallback() { if !strings.HasPrefix(convertValue, " (main go context) "+funcName+" with response ", args[0].String()) + log.ZDebug(ctx, "js then function", "=> (main go context) "+funcName+" "+ + "with response ", args[0].String()) thenChannel <- args return nil }) @@ -93,7 +96,7 @@ func Exec(args ...interface{}) (output interface{}, err error) { } } }() - log.Debug("js catch function", "=> (main go context) "+funcName+" with respone ", args[0].String()) + log.ZDebug(ctx, "js catch function", "=> (main go context) "+funcName+" with respone ", args[0].String()) catchChannel <- args return nil }) diff --git a/wasm/wasm_wrapper/wasm_init_login.go b/wasm/wasm_wrapper/wasm_init_login.go index c9b63b885..9e2ee3a1d 100644 --- a/wasm/wasm_wrapper/wasm_init_login.go +++ b/wasm/wasm_wrapper/wasm_init_login.go @@ -20,7 +20,6 @@ package wasm_wrapper import ( "errors" "github.com/openimsdk/openim-sdk-core/v3/open_im_sdk" - "github.com/openimsdk/openim-sdk-core/v3/pkg/log" "github.com/openimsdk/openim-sdk-core/v3/pkg/utils" "github.com/openimsdk/openim-sdk-core/v3/wasm/event_listener" "syscall/js" @@ -96,8 +95,6 @@ func NewWrapperCommon() *WrapperCommon { return &WrapperCommon{} } func (w *WrapperCommon) CommonEventFunc(_ js.Value, args []js.Value) interface{} { - log.NewDebug("CommonEventFunc", "js com here") - if len(args) >= 1 { w.commonFunc = &args[len(args)-1] return js.ValueOf(true)