feat: merge js sdk (#2856)

blackteay/open-im-server

Fork 0

mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-05 05:12:45 +08:00

Browse Source

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: implement no gob encoder.

* update unitTest content.

* Update hub_server.go

* feat: GroupApplicationAgreeMemberEnterNotification

* fix: encoder replace to json encoder.

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

* feat: add log

* fix: token parse token value

* fix: GetMsgBySeqs boundary issues

* merge: merge main code into js branch. (#2648)

* feat: update group notification when set to null. (#2590)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* feat: update group notification when set to null.

* update log standard.

* feat: add long time push msg in prometheus (#2584)

* feat: add long time push msg in prometheus

* fix: log print

* fix: go mod

* fix: log msg

* fix: log init

* feat: push msg

* feat: go mod ,remove cgo package

* feat: remove error log

* feat: test dummy push

* feat:redis pool config

* feat: push to kafka log

* feat: supports getting messages based on session ID and seq (#2582)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* feat: implement request batch count limit. (#2591)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* fix: getting messages based on session ID and seq (#2595)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* feat: avoid pulling messages from sessions with a large number of max seq values of 0 (#2602)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* refactor: improve db structure in `storage/controller` (#2604)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* refactor: improve db structure in `storage/controller`

* feat: implement offline push using kafka (#2600)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* feat: implement offline push.

* feat: implement batch Push spilt

* update go mod

* feat: implement kafka producer and consumer.

* update format,

* add PushMQ log.

* feat: update Handler logic.

* update MQ logic.

* update

* fix: update OfflinePushConsumerHandler.

* feat: API supports gzip (#2609)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* Fix err (#2608)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* feat: add rocksTimeout

* feat: wrap logs

* feat: add logs

* feat: listen config

* feat: enable listen TIME_WAIT port

* feat: add logs

* feat: cache batch

* chore: enable fullUserCache

* feat: push rpc num

* feat: push err

* feat: with operationID

* feat: sleep

* feat: change 1s

* feat: change log

* feat: implement Getbatch in rpcCache.

* feat: print getOnline cost

* feat: change log

* feat: change kafka and push config

* feat: del interface

* feat: fix err

* feat: change config

* feat: go mod

* feat: change config

* feat: add sleep in push

* feat: warn logs

* feat: logs

* feat: change port

* feat: start config

* feat: remove port reuse

* feat: prometheus config

* feat: add long time send msg to grafana

* feat: init

* feat: implement offline push.

* feat: batch get user online

* feat: implement batch Push spilt

* update go mod

* Revert "feat: change port"

This reverts commit 06d5e944

* feat: change port

* feat: change config

* feat: implement kafka producer and consumer.

* update format,

* add PushMQ log.

* feat: get all online users and init push

* feat: lock in online cache

* feat: config

* fix: init online status

* fix: add logs

* fix: userIDs

* fix: add logs

* feat: update Handler logic.

* update MQ logic.

* update

* fix: method name

* fix: update OfflinePushConsumerHandler.

* fix: prommetrics

* fix: add logs

* fix: ctx

* fix: log

* fix: config

* feat: change port

* fix: atomic online cache status

---------

Co-authored-by: Monet Lee <monet_lee@163.com>

* feature: add GetConversationsHasReadAndMaxSeq interface to the WebSocket API. (#2611)

* fix: lru lock (#2613)

* fix: lru lock

* fix: nil pointer error on close (#2618)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* feat: create group can push notification (#2617)

* fix: blockage caused by listen error (#2620)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* fix: go.mod (#2621)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* feat: improve searchMsg implement. (#2614)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* remove unused script.

* feat: improve searchMsg implement.

* update mongo config.

* Fix lock (#2622)

* fix:log

* fix: lock

* fix: update setGroupInfoEX field name. (#2625)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* fix: update setGroupInfoEX field name.

* fix: update setGroupInfoEX field name (#2626)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* fix: update setGroupInfoEX field name.

* fix: update setGroupInfoEX field name

* feat: msg gateway add log (#2631)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

* feat: add log

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* fix: update setGroupInfoEx func name and field. (#2634)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* fix: update setGroupInfoEx func name and field.

* refactor: update groupinfoEx field.

* refactor: update database name in mongodb.yml

* add groupName Condition

* fix: fix setConversations req fill. (#2645)

* refactor: refactor workflows contents.

* add tool workflows.

* update field.

* fix: remove chat error.

* Fix err.

* fix error.

* remove cn comment.

* update workflows files.

* update infra config.

* move workflows.

* feat: update bot.

* fix: solve uncorrect outdated msg get.

* update get docIDs logic.

* update

* update skip logic.

* fix

* update.

* fix: delay deleteObject func.

* remove unused content.

* update log type.

* feat: implement request batch count limit.

* update

* fix: fix setConversations req fill.

* fix: GetMsgBySeqs boundary issues (#2647)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

* feat: add log

* fix: token parse token value

* fix: GetMsgBySeqs boundary issues

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* fix: the attribute version is obsolete, remove it (#2644)

* refactor: update Userregister request field. (#2650)

---------

Co-authored-by: Monet Lee <monet_lee@163.com>
Co-authored-by: icey-yu <119291641+icey-yu@users.noreply.github.com>
Co-authored-by: chao <48119764+withchao@users.noreply.github.com>
Co-authored-by: withchao <withchao@users.noreply.github.com>
Co-authored-by: 蔡相跃 <caixiangyue007@gmail.com>

* update go mod

* fix: sn_ not sort

* fix: jssdk add

* fix: jssdk support

* fix: the message I sent is not set to read seq in mongodb

* fix: cannot modify group member avatars

* merge: update code from main to v3.8-js-sdk-only. (#2720)

* fix: fix update groupName invalid. (#2673)

* refactor: change platform to platformID (#2670)

* feat: don`t return nil data (#2675)

Co-authored-by: Monet Lee <monet_lee@163.com>

* refactor: update fields type in userStatus and check registered. (#2676)

* fix: usertoken auth. (#2677)

* refactor: update fields type in userStatus and check registered.

* fix: usertoken auth.

* update contents.

* update content.

* update

* fix

* update pb file.

* feat: add friend agree after callback (#2680)

* fix: sn not sort (#2682)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

* feat: add log

* fix: token parse token value

* fix: GetMsgBySeqs boundary issues

* fix: sn_ not sort

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* refactor: add GetAdminToken interface. (#2684)

* refactor: add GetAdminToken interface.

* update config.

* fix: admin token (#2686)

* fix: update workflows logic. (#2688)

* refactor: add GetAdminToken interface.

* update config.

* update workflows logic.

* fix: admin token (#2687)

* update the front image (#2692)

* update the front image

* update version

* feat: improve publish docker image workflows (#2697)

* refactor: add GetAdminToken interface.

* update config.

* update workflows logic.

* feat: improve publish docker image workflows

* update condition logic.

* fix: update load file logic. (#2700)

* refactor: add GetAdminToken interface.

* update config.

* update workflows logic.

* feat: improve publish docker image workflows

* update condition logic.

* fix: update load file logic.

* feat: Msg filter (#2703)

* feat: msg filter

* feat: provide the interface required by js sdk (#2712)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

* feat: add log

* fix: token parse token value

* fix: GetMsgBySeqs boundary issues

* fix: sn_ not sort

* fix: jssdk add

* fix: jssdk support

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* Line webhook (#2716)

* feat: online and offline webhook

* feat: remove zk

* fix: the message I sent is not set to read seq in mongodb (#2718)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

* feat: add log

* fix: token parse token value

* fix: GetMsgBySeqs boundary issues

* fix: sn_ not sort

* fix: jssdk add

* fix: jssdk support

* fix: the message I sent is not set to read seq in mongodb

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* fix: cannot modify group member avatars (#2719)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

* feat: add log

* fix: token parse token value

* fix: GetMsgBySeqs boundary issues

* fix: sn_ not sort

* fix: jssdk add

* fix: jssdk support

* fix: the message I sent is not set to read seq in mongodb

* fix: cannot modify group member avatars

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

---------

* fix: MemberEnterNotification

* fix: MsgData status

* merge

* merge: update code from main to v3.8-js-sdk-only. (#2818)

* feat: implement merge milestone PR to target-branch. (#2796)

* build: improve workflows logic. (#2801)

* fix: improve time condition check mehtod. (#2804)

* fix: improve time condition check mehtod.

* fix

* fix: webhook before online push (#2805)

* fix: set own read seq in MongoDB when sender send a message. (#2808)

* fix: solve err Notification when setGroupInfo. (#2806)

* fix: solve err Notification when setGroupInfo.

* build: update checkout version.

* fix: update notification contents.

* Introducing OpenIM Guru on Gurubase.io (#2788)

* feat: support app update service (#2811)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

* feat: add log

* fix: token parse token value

* fix: GetMsgBySeqs boundary issues

* fix: sn_ not sort

* fix: jssdk add

* fix: jssdk support

* fix: the message I sent is not set to read seq in mongodb

* fix: cannot modify group member avatars

* fix: MemberEnterNotification

* fix: MsgData status

* feat: add ApplicationVersion

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* feat: ApplicationVersion move chat (#2813)

* fix: GroupApplicationAcceptedNotification

* fix: NotificationUserInfoUpdate

* cicd: robot automated Change

* fix: component

* fix: getConversationInfo

* feat: cron task

* fix: minio config url recognition error

* update gomake version

* fix: seq conversion bug

* fix: redis pipe exec

* fix: ImportFriends

* fix: A large number of logs keysAndValues length is not even

* feat: mark read aggregate write

* feat: online status supports redis cluster

* merge

* read seq is written to mongo

* fix: invitation to join group notification

* fix: friend op_user_id

* feat: optimizing asynchronous context

* feat: optimizing memamq size

* feat: add GetSeqMessage

* feat: GroupApplicationAgreeMemberEnterNotification

* feat: go.mod

* feat: join group notification and get seq

* feat: avoid pulling messages from sessions with a large number of max seq values of 0

* feat: API supports gzip

* go.mod

* fix: nil pointer error on close

* fix: listen error

* update go.mod

* feat: add log

* fix: token parse token value

* fix: GetMsgBySeqs boundary issues

* fix: sn_ not sort

* fix: jssdk add

* fix: jssdk support

* fix: the message I sent is not set to read seq in mongodb

* fix: cannot modify group member avatars

* fix: MemberEnterNotification

* fix: MsgData status

* feat: add ApplicationVersion

* feat: ApplicationVersion move chat

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>

* fix: improve condition check. (#2815)

---------

Co-authored-by: Monet Lee <monet_lee@163.com>
Co-authored-by: icey-yu <119291641+icey-yu@users.noreply.github.com>
Co-authored-by: Kürşat Aktaş <kursat.ce@gmail.com>
Co-authored-by: chao <48119764+withchao@users.noreply.github.com>
Co-authored-by: withchao <withchao@users.noreply.github.com>

* feat: support text ping pong

* feat: gob json encoder

---------

Co-authored-by: withchao <withchao@users.noreply.github.com>
Co-authored-by: Monet Lee <monet_lee@163.com>
Co-authored-by: OpenIM-Gordon <46924906+FGadvancer@users.noreply.github.com>
Co-authored-by: icey-yu <119291641+icey-yu@users.noreply.github.com>
Co-authored-by: 蔡相跃 <caixiangyue007@gmail.com>
Co-authored-by: skiffer-git <72860476+skiffer-git@users.noreply.github.com>
Co-authored-by: Kürşat Aktaş <kursat.ce@gmail.com>

This commit is contained in:

chao

2024-11-14 14:35:18 +08:00

committed by

GitHub

parent 68698961f1

commit 12790e141d

No known key found for this signature in database

GPG Key ID: B5690EEEBB952194

10 changed files with 120 additions and 53 deletions

									
										2

config/openim-msggateway.yml
									
											View File
											
				@ -22,5 +22,3 @@ longConnSvr:

				  websocketMaxMsgLen: 4096

				  # WebSocket connection handshake timeout in seconds

				  websocketTimeout: 10

									
										26

config/openim-push.yml
									
											View File
											
				@ -17,25 +17,25 @@ maxConcurrentWorkers: 3

				enable: geTui

				geTui:

				  pushUrl: https://restapi.getui.com/v2/$appId

				  masterSecret: 

				  appKey: 

				  intent: 

				  channelID: 

				  channelName: 

				  masterSecret:

				  appKey:

				  intent:

				  channelID:

				  channelName:

				fcm:

				  # Prioritize using file paths. If the file path is empty, use URL

				  filePath:   # File path is concatenated with the parameters passed in through - c(`mage` default pass in `config/`) and filePath. 

				  filePath:   # File path is concatenated with the parameters passed in through - c(`mage` default pass in `config/`) and filePath.

				  authURL:   #  Must start with https or http.

				jpns:

				  appKey: 

				  masterSecret: 

				  pushURL: 

				  pushIntent: 

				  appKey:

				  masterSecret:

				  pushURL:

				  pushIntent:

				# iOS system push sound and badge count

				iosPush:

				      pushSound: xxx

				      badgeCount: true

				      production: false

				  pushSound: xxx

				  badgeCount: true

				  production: false

				fullUserCache: true

									
										45

internal/msggateway/client.go
									
											View File
											
				@ -16,6 +16,7 @@ package msggateway

				import (

					"context"

					"encoding/json"

					"fmt"

					"runtime/debug"

					"sync"

				@ -69,6 +70,8 @@ type Client struct {

					IsCompress     bool   `json:"isCompress"`

					UserID         string `json:"userID"`

					IsBackground   bool   `json:"isBackground"`

					SDKType        string `json:"sdkType"`

					Encoder        Encoder

					ctx            *UserConnContext

					longConnServer LongConnServer

					closed         atomic.Bool

				@ -94,11 +97,17 @@ func (c *Client) ResetClient(ctx *UserConnContext, conn LongConn, longConnServer

					c.closed.Store(false)

					c.closedErr = nil

					c.token = ctx.GetToken()

					c.SDKType = ctx.GetSDKType()

					c.hbCtx, c.hbCancel = context.WithCancel(c.ctx)

					c.subLock = new(sync.Mutex)

					if c.subUserIDs != nil {

						clear(c.subUserIDs)

					}

					if c.SDKType == GoSDK {

						c.Encoder = NewGobEncoder()

					} else {

						c.Encoder = NewJsonEncoder()

					}

					c.subUserIDs = make(map[string]struct{})

				}

				@ -159,9 +168,12 @@ func (c *Client) readMessage() {

								return

							}

						case MessageText:

							c.closedErr = ErrNotSupportMessageProtocol

							return

							_ = c.conn.SetReadDeadline(pongWait)

							parseDataErr := c.handlerTextMessage(message)

							if parseDataErr != nil {

								c.closedErr = parseDataErr

								return

							}

						case PingMessage:

							err := c.writePongMsg("")

							log.ZError(c.ctx, "writePongMsg", err)

				@ -188,7 +200,7 @@ func (c *Client) handleMessage(message []byte) error {

					var binaryReq = getReq()

					defer freeReq(binaryReq)

					err := c.longConnServer.Decode(message, binaryReq)

					err := c.Encoder.Decode(message, binaryReq)

					if err != nil {

						return err

					}

				@ -335,7 +347,7 @@ func (c *Client) writeBinaryMsg(resp Resp) error {

						return nil

					}

					encodedBuf, err := c.longConnServer.Encode(resp)

					encodedBuf, err := c.Encoder.Encode(resp)

					if err != nil {

						return err

					}

				@ -419,3 +431,26 @@ func (c *Client) writePongMsg(appData string) error {

					return errs.Wrap(err)

				}

				func (c *Client) handlerTextMessage(b []byte) error {

					var msg TextMessage

					if err := json.Unmarshal(b, &msg); err != nil {

						return err

					}

					switch msg.Type {

					case TextPong:

						return nil

					case TextPing:

						msg.Type = TextPong

						msgData, err := json.Marshal(msg)

						if err != nil {

							return err

						}

						if err := c.conn.SetWriteDeadline(writeWait); err != nil {

							return err

						}

						return c.conn.WriteMessage(MessageText, msgData)

					default:

						return fmt.Errorf("not support message type %s", msg.Type)

					}

				}

									
										6

internal/msggateway/constant.go
									
											View File
											
				@ -27,6 +27,12 @@ const (

					GzipCompressionProtocol = "gzip"

					BackgroundStatus        = "isBackground"

					SendResponse            = "isMsgResp"

					SDKType                 = "sdkType"

				)

				const (

					GoSDK = "go"

					JsSDK = "js"

				)

				const (

									
										14

internal/msggateway/context.go
									
											View File
											
				@ -153,6 +153,14 @@ func (c *UserConnContext) GetCompression() bool {

					return false

				}

				func (c *UserConnContext) GetSDKType() string {

					sdkType := c.Req.URL.Query().Get(SDKType)

					if sdkType == "" {

						sdkType = GoSDK

					}

					return sdkType

				}

				func (c *UserConnContext) ShouldSendResp() bool {

					errResp, exists := c.Query(SendResponse)

					if exists {

				@ -193,7 +201,11 @@ func (c *UserConnContext) ParseEssentialArgs() error {

					_, err := strconv.Atoi(platformIDStr)

					if err != nil {

						return servererrs.ErrConnArgsErr.WrapMsg("platformID is not int")

					}

					switch sdkType, _ := c.Query(SDKType); sdkType {

					case "", GoSDK, JsSDK:

					default:

						return servererrs.ErrConnArgsErr.WrapMsg("sdkType is not go or js")

					}

					return nil

				}

									
										33

internal/msggateway/encoder.go
									
											View File
											
				@ -17,6 +17,7 @@ package msggateway

				import (

					"bytes"

					"encoding/gob"

					"encoding/json"

					"github.com/openimsdk/tools/errs"

				)

				@ -28,12 +29,12 @@ type Encoder interface {

				type GobEncoder struct{}

				func NewGobEncoder() *GobEncoder {

					return &GobEncoder{}

				func NewGobEncoder() Encoder {

					return GobEncoder{}

				}

				func (g *GobEncoder) Encode(data any) ([]byte, error) {

					buff := bytes.Buffer{}

				func (g GobEncoder) Encode(data any) ([]byte, error) {

					var buff bytes.Buffer

					enc := gob.NewEncoder(&buff)

					if err := enc.Encode(data); err != nil {

						return nil, errs.WrapMsg(err, "GobEncoder.Encode failed", "action", "encode")

				@ -41,7 +42,7 @@ func (g *GobEncoder) Encode(data any) ([]byte, error) {

					return buff.Bytes(), nil

				}

				func (g *GobEncoder) Decode(encodeData []byte, decodeData any) error {

				func (g GobEncoder) Decode(encodeData []byte, decodeData any) error {

					buff := bytes.NewBuffer(encodeData)

					dec := gob.NewDecoder(buff)

					if err := dec.Decode(decodeData); err != nil {

				@ -49,3 +50,25 @@ func (g *GobEncoder) Decode(encodeData []byte, decodeData any) error {

					}

					return nil

				}

				type JsonEncoder struct{}

				func NewJsonEncoder() Encoder {

					return JsonEncoder{}

				}

				func (g JsonEncoder) Encode(data any) ([]byte, error) {

					b, err := json.Marshal(data)

					if err != nil {

						return nil, errs.New("JsonEncoder.Encode failed", "action", "encode")

					}

					return b, nil

				}

				func (g JsonEncoder) Decode(encodeData []byte, decodeData any) error {

					err := json.Unmarshal(encodeData, decodeData)

					if err != nil {

						return errs.New("JsonEncoder.Decode failed", "action", "decode")

					}

					return nil

				}

									
										16

internal/msggateway/hub_server.go
									
											View File
											
				@ -83,17 +83,11 @@ func NewServer(rpcPort int, longConnServer LongConnServer, conf *Config, ready f

					return s

				}

				func (s *Server) OnlinePushMsg(

					context context.Context,

					req *msggateway.OnlinePushMsgReq,

				) (*msggateway.OnlinePushMsgResp, error) {

				func (s *Server) OnlinePushMsg(context context.Context, req *msggateway.OnlinePushMsgReq) (*msggateway.OnlinePushMsgResp, error) {

					panic("implement me")

				}

				func (s *Server) GetUsersOnlineStatus(

					ctx context.Context,

					req *msggateway.GetUsersOnlineStatusReq,

				) (*msggateway.GetUsersOnlineStatusResp, error) {

				func (s *Server) GetUsersOnlineStatus(ctx context.Context, req *msggateway.GetUsersOnlineStatusReq) (*msggateway.GetUsersOnlineStatusResp, error) {

					if !authverify.IsAppManagerUid(ctx, s.config.Share.IMAdminUserID) {

						return nil, errs.ErrNoPermission.WrapMsg("only app manager")

					}

				@ -155,6 +149,7 @@ func (s *Server) pushToUser(ctx context.Context, userID string, msgData *sdkws.M

							(client.IsBackground && client.PlatformID != constant.IOSPlatformID) {

							err := client.PushMessage(ctx, msgData)

							if err != nil {

								log.ZWarn(ctx, "online push msg failed", err, "userID", userID, "platformID", client.PlatformID)

								userPlatform.ResultCode = int64(servererrs.ErrPushMsgErr.Code())

							} else {

								if _, ok := s.pushTerminal[client.PlatformID]; ok {

				@ -220,10 +215,7 @@ func (s *Server) SuperGroupOnlineBatchPushOneMsg(ctx context.Context, req *msgga

					}

				}

				func (s *Server) KickUserOffline(

					ctx context.Context,

					req *msggateway.KickUserOfflineReq,

				) (*msggateway.KickUserOfflineResp, error) {

				func (s *Server) KickUserOffline(ctx context.Context, req *msggateway.KickUserOfflineReq) (*msggateway.KickUserOfflineResp, error) {

					for _, v := range req.KickUserIDList {

						clients, _, ok := s.LongConnServer.GetUserPlatformCons(v, int(req.PlatformID))

						if !ok {

									
										11

internal/msggateway/message_handler.go
									
											View File
											
				@ -16,6 +16,7 @@ package msggateway

				import (

					"context"

					"encoding/json"

					"sync"

					"github.com/go-playground/validator/v10"

				@ -31,6 +32,16 @@ import (

					"github.com/openimsdk/tools/utils/jsonutil"

				)

				const (

					TextPing = "ping"

					TextPong = "pong"

				)

				type TextMessage struct {

					Type string          `json:"type"`

					Body json.RawMessage `json:"body"`

				}

				type Req struct {

					ReqIdentifier int32  `json:"reqIdentifier" validate:"required"`

					Token         string `json:"token"`

									
										13

internal/msggateway/ws_server.go
									
											View File
											
				@ -37,7 +37,6 @@ type LongConnServer interface {

					SetKickHandlerInfo(i *kickHandler)

					SubUserOnlineStatus(ctx context.Context, client *Client, data *Req) ([]byte, error)

					Compressor

					Encoder

					MessageHandler

				}

				@ -61,7 +60,7 @@ type WsServer struct {

					authClient        *rpcclient.Auth

					disCov            discovery.SvcDiscoveryRegistry

					Compressor

					Encoder

					//Encoder

					MessageHandler

					webhookClient *webhook.Client

				}

				@ -135,7 +134,6 @@ func NewWsServer(msgGatewayConfig *Config, opts ...Option) *WsServer {

						clients:         newUserMap(),

						subscription:    newSubscription(),

						Compressor:      NewGzipCompressor(),

						Encoder:         NewGobEncoder(),

						webhookClient:   webhook.NewWebhookClient(msgGatewayConfig.WebhooksConfig.URL),

					}

				}

				@ -278,14 +276,7 @@ func (ws *WsServer) registerClient(client *Client) {

					wg.Wait()

					log.ZDebug(

						client.ctx,

						"user online",

						"online user Num",

						ws.onlineUserNum.Load(),

						"online user conn Num",

						ws.onlineUserConnNum.Load(),

					)

					log.ZDebug(client.ctx, "user online", "online user Num", ws.onlineUserNum.Load(), "online user conn Num", ws.onlineUserConnNum.Load())

				}

				func getRemoteAdders(client []*Client) string {

									
										7

pkg/common/storage/controller/auth.go
									
											View File
											
				@ -2,15 +2,14 @@ package controller

				import (

					"context"

					"github.com/openimsdk/open-im-server/v3/pkg/common/config"

					"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache/cachekey"

					"github.com/openimsdk/tools/log"

					"github.com/golang-jwt/jwt/v4"

					"github.com/openimsdk/open-im-server/v3/pkg/authverify"

					"github.com/openimsdk/open-im-server/v3/pkg/common/config"

					"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache"

					"github.com/openimsdk/open-im-server/v3/pkg/common/storage/cache/cachekey"

					"github.com/openimsdk/protocol/constant"

					"github.com/openimsdk/tools/errs"

					"github.com/openimsdk/tools/log"

					"github.com/openimsdk/tools/tokenverify"

				)

feat: merge js sdk (#2856)

2 config/openim-msggateway.yml Unescape Escape View File

26 config/openim-push.yml Unescape Escape View File

45 internal/msggateway/client.go Unescape Escape View File

6 internal/msggateway/constant.go Unescape Escape View File

14 internal/msggateway/context.go Unescape Escape View File

33 internal/msggateway/encoder.go Unescape Escape View File

16 internal/msggateway/hub_server.go Unescape Escape View File

11 internal/msggateway/message_handler.go Unescape Escape View File

13 internal/msggateway/ws_server.go Unescape Escape View File

7 pkg/common/storage/controller/auth.go Unescape Escape View File

2

config/openim-msggateway.yml

View File

26

config/openim-push.yml

View File

45

internal/msggateway/client.go

View File

6

internal/msggateway/constant.go

View File

14

internal/msggateway/context.go

View File

33

internal/msggateway/encoder.go

View File

16

internal/msggateway/hub_server.go

View File

11

internal/msggateway/message_handler.go

View File

13

internal/msggateway/ws_server.go

View File

7

pkg/common/storage/controller/auth.go

View File