Update CHANGELOG for release v3.8.3-patch.12

.github/workflows/publish-docker-image.yml

@@ -4,80 +4,42 @@ on:
   push:
     branches:
       - release-*
+    # tags:
+    #   - 'v*'
+
   release:
     types: [published]
+
   workflow_dispatch:
     inputs:
       tag:
         description: "Tag version to be used for Docker image"
         required: true
-        default: "v3.8.3"
-
-env:
-  GO_VERSION: "1.22"
-  IMAGE_NAME: "openim-server"
-  # IMAGE_NAME: ${{ github.event.repository.name }}
-  DOCKER_BUILDKIT: 1
+        default: "v3.8.0"
 
 jobs:
-  publish-docker-images:
+  build-and-test:
     runs-on: ubuntu-latest
-    if: ${{ !(github.event_name == 'pull_request' && github.event.pull_request.merged == false) }}
     steps:
-      - name: Checkout main repository
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
           path: main-repo
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.3.0
+      # - name: Set up QEMU
+      #   uses: docker/setup-qemu-action@v3.3.0
 
       - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v3.8.0
+
+      - name: Build Docker image
+        id: build
+        uses: docker/build-push-action@v5
         with:
-          driver-opts: network=host
-
-      - name: Extract metadata for Docker
-        id: meta
-        uses: docker/metadata-action@v5.6.0
-        with:
-          images: |
-            ${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}
-            ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}
-            registry.cn-hangzhou.aliyuncs.com/openimsdk/${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=tag
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern=v{{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha
-
-      - name: Install skopeo
-        run: |
-          sudo apt-get update && sudo apt-get install -y skopeo
-
-      - name: Build multi-arch images as OCI
-        run: |
-          mkdir -p /tmp/oci-image /tmp/docker-cache
-
-          # Build multi-architecture image and save in OCI format        
-          docker buildx build \
-            --platform linux/amd64,linux/arm64 \
-            --output type=oci,dest=/tmp/oci-image/multi-arch.tar \
-            --cache-to type=local,dest=/tmp/docker-cache \
-            --cache-from type=gha \
-            ./main-repo
-
-            # Use skopeo to convert the amd64 image from OCI format to Docker format and load it
-          skopeo copy --override-arch amd64 oci-archive:/tmp/oci-image/multi-arch.tar docker-daemon:${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}:local
-
-          # check image
-          docker image ls | grep openim
+          context: ./main-repo
+          load: true
+          tags: "openim/openim-server:local"
+          cache-from: type=gha,scope=build
+          cache-to: type=gha,mode=max,scope=build
 
       - name: Checkout compose repository
         uses: actions/checkout@v4
@@ -90,11 +52,11 @@ jobs:
         run: |
           IP=$(hostname -I | awk '{print $1}')
           echo "The IP Address is: $IP"
-          echo "ip=$IP" >> $GITHUB_OUTPUT
+          echo "::set-output name=ip::$IP"
 
       - name: Update .env to use the local image
         run: |
-          sed -i 's|OPENIM_SERVER_IMAGE=.*|OPENIM_SERVER_IMAGE=${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}:local|' ${{ github.workspace }}/compose-repo/.env
+          sed -i 's|OPENIM_SERVER_IMAGE=.*|OPENIM_SERVER_IMAGE=openim/openim-server:local|' ${{ github.workspace }}/compose-repo/.env
           sed -i 's|MINIO_EXTERNAL_ADDRESS=.*|MINIO_EXTERNAL_ADDRESS=http://${{ steps.get-ip.outputs.ip }}:10005|' ${{ github.workspace }}/compose-repo/.env
 
       - name: Start services using Docker Compose
@@ -104,34 +66,23 @@ jobs:
 
           docker compose ps
 
-      # - name: Check openim-server health
-      #   run: |
-      #     timeout=300
-      #     interval=30
-      #     elapsed=0
-      #     while [[ $elapsed -le $timeout ]]; do
-      #       if ! docker exec openim-server mage check; then
-      #         echo "openim-server is not ready, waiting..."
-      #         sleep $interval
-      #         elapsed=$(($elapsed + $interval))
-      #       else
-      #         echo "Health check successful"
-      #         exit 0
-      #       fi
-      #     done
-      #     echo "Health check failed after 5 minutes"
-      #     exit 1
-
-      # - name: Check openim-chat health
-      #   if: success()
-      #   run: |
-      #     if ! docker exec openim-chat mage check; then
-      #         echo "openim-chat check failed"
-      #         exit 1
-      #       else
-      #         echo "Health check successful"
-      #         exit 0
-      #       fi
+      - name: Extract metadata for Docker (tags, labels)
+        id: meta
+        uses: docker/metadata-action@v5.6.0
+        with:
+          images: |
+            openim/openim-server
+            ghcr.io/openimsdk/openim-server
+            registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server
+          tags: |
+            type=ref,event=tag
+            type=schedule
+            type=ref,event=branch
+            # type=semver,pattern={{version}}
+            type=semver,pattern=v{{version}}
+            type=semver,pattern=release-{{raw}}
+            type=sha
+            type=raw,value=${{ github.event.inputs.tag }}
 
       - name: Log in to Docker Hub
         uses: docker/login-action@v3.3.0
@@ -153,27 +104,22 @@ jobs:
           username: ${{ secrets.ALIREGISTRY_USERNAME }}
           password: ${{ secrets.ALIREGISTRY_TOKEN }}
 
-      - name: Push multi-architecture images
-        if: success()
-        run: |
-          docker buildx build \
-            --platform linux/amd64,linux/arm64 \
-            $(echo "${{ steps.meta.outputs.tags }}" | sed 's/,/ --tag /g' | sed 's/^/--tag /') \
-            --cache-from type=local,src=/tmp/docker-cache \
-            --push \
-            ./main-repo
+      - name: Push Docker images
+        uses: docker/build-push-action@v5
+        with:
+          context: ./main-repo
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha,scope=build
+          cache-to: type=gha,mode=max,scope=build
 
       - name: Verify multi-platform support
         run: |
-          images=(
-            "${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}"
-            "ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}"
-            "registry.cn-hangzhou.aliyuncs.com/openimsdk/${{ env.IMAGE_NAME }}"
-          )
-
+          images=("openim/openim-server" "ghcr.io/openimsdk/openim-server" "registry.cn-hangzhou.aliyuncs.com/openimsdk/openim-server")
           for image in "${images[@]}"; do
-              for tag in $(echo "${{ steps.meta.outputs.tags }}" | tr ',' '\n' | cut -d':' -f2); do
-                  echo "Verifying multi-arch support for $image:$tag"
+              for tag in $(echo "${{ steps.meta.outputs.tags }}" | tr ',' '\n'); do
                   manifest=$(docker manifest inspect "$image:$tag" || echo "error")
                   if [[ "$manifest" == "error" ]]; then
                       echo "Manifest not found for $image:$tag"
@@ -189,6 +135,5 @@ jobs:
                       echo "Multi-platform support check failed for $image:$tag - missing arm64"
                       exit 1
                   fi
-                  echo "✅ $image:$tag supports both amd64 and arm64 architectures"
               done
           done

.github/workflows/update-version-file-on-release.yml

@@ -96,13 +96,13 @@ jobs:
                   repo,
                   per_page: 100
                 });
-            
+                
                 release = releases.data.find(r => r.draft && r.tag_name === tagName);            
                 if (!release) {
                   throw new Error(`No release found with tag ${tagName}`);
                 }
               }
-            
+              
               await github.rest.repos.updateRelease({
                 owner,
                 repo,
@@ -110,10 +110,10 @@ jobs:
                 draft: false,
                 prerelease: release.prerelease
               });
-            
+              
               const status = release.draft ? "was draft" : "was already published";
               core.info(`Release ${tagName} ensured to be published (${status}).`);
-            
+              
             } catch (error) {
               core.warning(`Could not find or update release for tag ${tagName}: ${error.message}`);
             }

CHANGELOG/CHANGELOG-3.8.md

@@ -1,70 +1,8 @@
-## [v3.8.3-patch.6](https://github.com/openimsdk/open-im-server/releases/tag/v3.8.3-patch.6) 	(2025-07-23)
+## [v3.8.3-patch.12](https://github.com/openimsdk/open-im-server/releases/tag/v3.8.3-patch.12) 	(2025-10-24)
 
 ### Bug Fixes
-* fix: Add friend DB in notification sender [#3438](https://github.com/openimsdk/open-im-server/pull/3438)
-* fix: remove update version file workflows have new line in 3.8.3-patch branch. [#3452](https://github.com/openimsdk/open-im-server/pull/3452)
-* fix: s3 aws init [#3454](https://github.com/openimsdk/open-im-server/pull/3454)
-* fix: use safe submodule init in workflows in v3.8.3-patch. [#3469](https://github.com/openimsdk/open-im-server/pull/3469)
+* fix: full id version [#3589](https://github.com/openimsdk/open-im-server/pull/3589)
+* fix: incorrect redis fields. [#3602](https://github.com/openimsdk/open-im-server/pull/3602)
 
-**Full Changelog**: [v3.8.3-patch.5...v3.8.3-patch.6](https://github.com/openimsdk/open-im-server/compare/v3.8.3-patch.5...v3.8.3-patch.6)
+**Full Changelog**: [v3.8.3-patch.11...v3.8.3-patch.12](https://github.com/openimsdk/open-im-server/compare/v3.8.3-patch.11...v3.8.3-patch.12)
 
-## [v3.8.3-patch.5](https://github.com/openimsdk/open-im-server/releases/tag/v3.8.3-patch.5) 	(2025-06-10)
-
-### New Features
-* feat: optimize friend and group applications [#3396](https://github.com/openimsdk/open-im-server/pull/3396)
-
-### Bug Fixes
-* fix: solve unocrrect invite notification [Created [#3219](https://github.com/openimsdk/open-im-server/pull/3219)
-
-### Builds
-* build: update gomake version in dockerfile.[Patch branch] [#3416](https://github.com/openimsdk/open-im-server/pull/3416)
-
-**Full Changelog**: [v3.8.3...v3.8.3-patch.5](https://github.com/openimsdk/open-im-server/compare/v3.8.3...v3.8.3-patch.5)
-
-## [v3.8.3-patch.4](https://github.com/openimsdk/open-im-server/releases/tag/v3.8.3-patch.4) 	(2025-03-13)
-
-### Bug Fixes
-* fix: solve unocrrect invite notificationfrom #3213
-
-**Full Changelog**: [v3.8.3-patch.3...v3.8.3-patch.4](https://github.com/openimsdk/open-im-server/compare/v3.8.3-patch.3...v3.8.3-patch.4)
-
-## [v3.8.3-patch.3](https://github.com/openimsdk/open-im-server/releases/tag/v3.8.3-patch.3) 	(2025-03-07)
-
-### New Features
-* feat: optimizing BatchGetIncrementalGroupMember #3180
-
-### Bug Fixes
-* fix: solve uncorrect notification when set group info #3172
-* fix: the sorting is wrong after canceling the administrator in group settings #3185
-* fix: solve uncorrect GroupMember enter group notification type. #3188
-
-### Refactors
-* refactor: change sendNotification to sendMessage to avoid ambiguity regarding message sending behavior. #3173
-
-**Full Changelog**: [v3.8.3-patch.2...v3.8.3-patch.3](https://github.com/openimsdk/open-im-server/compare/v3.8.3-patch.2...v3.8.3-patch.3)
-
-## [v3.8.3-patch.2](https://github.com/openimsdk/open-im-server/releases/tag/v3.8.3-patch.2) 	(2025-02-28)
-
-### Bug Fixes
-* fix: Offline push does not have a badge && Android offline push (#3146) [#3174](https://github.com/openimsdk/open-im-server/pull/3174)
-
-**Full Changelog**: [v3.8.3-patch.1...v3.8.3-patch.2](https://github.com/openimsdk/open-im-server/compare/v3.8.3-patch.1...v3.8.3-patch.2)
-
-## [v3.8.3-patch.1](https://github.com/openimsdk/open-im-server/releases/tag/v3.8.3-patch.1) 	(2025-02-25)
-
-### New Features
-* feat: add backup volume && optimize log print [Created [#3121](https://github.com/openimsdk/open-im-server/pull/3121)
-
-### Bug Fixes
-* fix: seq conversion failed without exiting [Created [#3120](https://github.com/openimsdk/open-im-server/pull/3120)
-* fix: check error in BatchSetTokenMapByUidPid [Created [#3123](https://github.com/openimsdk/open-im-server/pull/3123)
-* fix: DeleteDoc crash [Created [#3124](https://github.com/openimsdk/open-im-server/pull/3124)
-* fix: the abnormal message has no sending time, causing the SDK to be abnormal [Created [#3126](https://github.com/openimsdk/open-im-server/pull/3126)
-* fix: crash caused [#3127](https://github.com/openimsdk/open-im-server/pull/3127)
-* fix: the user sets the conversation timer cleanup timestamp unit incorrectly [Created [#3128](https://github.com/openimsdk/open-im-server/pull/3128)
-* fix: seq conversion not reading env in docker environment [Created [#3131](https://github.com/openimsdk/open-im-server/pull/3131)
-
-### Builds
-* build: improve workflows contents. [Created [#3125](https://github.com/openimsdk/open-im-server/pull/3125)
-
-**Full Changelog**: [v3.8.3-e-v1.1.5...v3.8.3-patch.1-e-v1.1.5](https://github.com/openimsdk/open-im-server-enterprise/compare/v3.8.3-e-v1.1.5...v3.8.3-patch.1-e-v1.1.5)

config/openim-api.yml

@@ -17,13 +17,3 @@ prometheus:
   ports:
   # This address can be accessed via a browser
   grafanaURL:
-
-ratelimiter:
-  # Whether to enable rate limiting
-  enable: false
-  # WindowSize defines time duration per window
-  window: 20s
-  # BucketNum defines bucket number for each window
-  bucket: 500
-  # CPU threshold; valid range 0–1000 (1000 = 100%)
-  cpuThreshold: 850

config/openim-msggateway.yml

@@ -26,20 +26,3 @@ longConnSvr:
   websocketMaxMsgLen: 4096
   # WebSocket connection handshake timeout in seconds
   websocketTimeout: 10
-
-ratelimiter:
-  # Whether to enable rate limiting
-  enable: false
-  # WindowSize defines time duration per window
-  window: 20s
-  # BucketNum defines bucket number for each window
-  bucket: 500
-  # CPU threshold; valid range 0–1000 (1000 = 100%)
-  cpuThreshold: 850
-
-circuitBreaker:
-  enable: false
-  window: 5s            # Time window size (seconds)
-  bucket: 100            # Number of buckets
-  success: 0.6          # Success rate threshold (0.6 means 60%)
-  request: 500 # Request threshold; circuit breaker evaluation occurs when reached

config/openim-msgtransfer.yml

@@ -6,20 +6,3 @@ prometheus:
   # List of ports that Prometheus listens on; each port corresponds to an instance of monitoring. Ensure these are managed accordingly
   # It will only take effect when autoSetPorts is set to false.
   ports:
-
-ratelimiter:
-  # Whether to enable rate limiting
-  enable: false
-  # WindowSize defines time duration per window
-  window: 20s
-  # BucketNum defines bucket number for each window
-  bucket: 500
-  # CPU threshold; valid range 0–1000 (1000 = 100%)
-  cpuThreshold: 850
-
-circuitBreaker:
-  enable: false
-  window: 5s            # Time window size (seconds)
-  bucket: 100            # Number of buckets
-  success: 0.6          # Success rate threshold (0.6 means 60%)
-  request: 500 # Request threshold; circuit breaker evaluation occurs when reached

config/openim-push.yml

@@ -10,26 +10,10 @@ rpc:
   # It will only take effect when autoSetPorts is set to false.
   ports:
 
-ratelimiter:
-  # Whether to enable rate limiting
-  enable: false
-  # WindowSize defines time duration per window
-  window: 20s
-  # BucketNum defines bucket number for each window
-  bucket: 500
-  # CPU threshold; valid range 0–1000 (1000 = 100%)
-  cpuThreshold: 850
-
-circuitBreaker:
-  enable: false
-  window: 5s            # Time window size (seconds)
-  bucket: 100            # Number of buckets
-  success: 0.6          # Success rate threshold (0.6 means 60%)
-  request: 500 # Request threshold; circuit breaker evaluation occurs when reached
 
 prometheus:
   # Enable or disable Prometheus monitoring
-  enable: false
+  enable: true
   # List of ports that Prometheus listens on; these must match the number of rpc.ports to ensure correct monitoring setup
   # It will only take effect when autoSetPorts is set to false.
   ports:

config/openim-rpc-auth.yml

@@ -20,20 +20,3 @@ prometheus:
 tokenPolicy:
   # Token validity period, in days
   expire: 90
-
-ratelimiter:
-  # Whether to enable rate limiting
-  enable: false
-  # WindowSize defines time duration per window
-  window: 20s
-  # BucketNum defines bucket number for each window
-  bucket: 500
-  # CPU threshold; valid range 0–1000 (1000 = 100%)
-  cpuThreshold: 850
-
-circuitBreaker:
-  enable: false
-  window: 5s            # Time window size (seconds)
-  bucket: 100            # Number of buckets
-  success: 0.6          # Success rate threshold (0.6 means 60%)
-  request: 500 # Request threshold; circuit breaker evaluation occurs when reached

config/openim-rpc-conversation.yml

@@ -16,20 +16,3 @@ prometheus:
   # List of ports that Prometheus listens on; these must match the number of rpc.ports to ensure correct monitoring setup
   # It will only take effect when autoSetPorts is set to false.
   ports:
-
-ratelimiter:
-  # Whether to enable rate limiting
-  enable: false
-  # WindowSize defines time duration per window
-  window: 20s
-  # BucketNum defines bucket number for each window
-  bucket: 500
-  # CPU threshold; valid range 0–1000 (1000 = 100%)
-  cpuThreshold: 850
-
-circuitBreaker:
-  enable: false
-  window: 5s            # Time window size (seconds)
-  bucket: 100            # Number of buckets
-  success: 0.6          # Success rate threshold (0.6 means 60%)
-  request: 500 # Request threshold; circuit breaker evaluation occurs when reached

config/openim-rpc-friend.yml

@@ -16,20 +16,3 @@ prometheus:
   # List of ports that Prometheus listens on; these must match the number of rpc.ports to ensure correct monitoring setup
   # It will only take effect when autoSetPorts is set to false.
   ports:
-
-ratelimiter:
-  # Whether to enable rate limiting
-  enable: false
-  # WindowSize defines time duration per window
-  window: 20s
-  # BucketNum defines bucket number for each window
-  bucket: 500
-  # CPU threshold; valid range 0–1000 (1000 = 100%)
-  cpuThreshold: 850
-
-circuitBreaker:
-  enable: false
-  window: 5s            # Time window size (seconds)
-  bucket: 100            # Number of buckets
-  success: 0.6          # Success rate threshold (0.6 means 60%)
-  request: 500 # Request threshold; circuit breaker evaluation occurs when reached

config/openim-rpc-group.yml

@@ -19,20 +19,3 @@ prometheus:
 
 
 enableHistoryForNewMembers: true
-
-ratelimiter:
-  # Whether to enable rate limiting
-  enable: false
-  # WindowSize defines time duration per window
-  window: 20s
-  # BucketNum defines bucket number for each window
-  bucket: 500
-  # CPU threshold; valid range 0–1000 (1000 = 100%)
-  cpuThreshold: 850
-
-circuitBreaker:
-  enable: false
-  window: 5s            # Time window size (seconds)
-  bucket: 100            # Number of buckets
-  success: 0.6          # Success rate threshold (0.6 means 60%)
-  request: 500 # Request threshold; circuit breaker evaluation occurs when reached

config/openim-rpc-msg.yml

@@ -1,6 +1,6 @@
 rpc:
   # The IP address where this RPC service registers itself; if left blank, it defaults to the internal network IP
-  registerIP:
+  registerIP: 
   # IP address that the RPC service listens on; setting to 0.0.0.0 listens on both internal and external IPs. If left blank, it automatically uses the internal network IP
   listenIP: 0.0.0.0
   # autoSetPorts indicates whether to automatically set the ports
@@ -20,20 +20,3 @@ prometheus:
 
 # Does sending messages require friend verification
 friendVerify: false
-
-ratelimiter:
-  # Whether to enable rate limiting
-  enable: false
-  # WindowSize defines time duration per window
-  window: 20s
-  # BucketNum defines bucket number for each window
-  bucket: 500
-  # CPU threshold; valid range 0–1000 (1000 = 100%)
-  cpuThreshold: 850
-
-circuitBreaker:
-  enable: false
-  window: 5s            # Time window size (seconds)
-  bucket: 100            # Number of buckets
-  success: 0.6          # Success rate threshold (0.6 means 60%)
-  request: 500 # Request threshold; circuit breaker evaluation occurs when reached

config/openim-rpc-third.yml

@@ -17,22 +17,6 @@ prometheus:
   # It will only take effect when autoSetPorts is set to false.
   ports:
 
-ratelimiter:
-  # Whether to enable rate limiting
-  enable: false
-  # WindowSize defines time duration per window
-  window: 20s
-  # BucketNum defines bucket number for each window
-  bucket: 500
-  # CPU threshold; valid range 0–1000 (1000 = 100%)
-  cpuThreshold: 850
-
-circuitBreaker:
-  enable: false
-  window: 5s            # Time window size (seconds)
-  bucket: 100            # Number of buckets
-  success: 0.6          # Success rate threshold (0.6 means 60%)
-  request: 500 # Request threshold; circuit breaker evaluation occurs when reached
 
 object:
   # Use MinIO as object storage, or set to "cos", "oss", "kodo", "aws", while also configuring the corresponding settings

config/openim-rpc-user.yml

@@ -16,20 +16,3 @@ prometheus:
   # Prometheus listening ports, must be consistent with the number of rpc.ports
   # It will only take effect when autoSetPorts is set to false.
   ports:
-
-ratelimiter:
-  # Whether to enable rate limiting
-  enable: false
-  # WindowSize defines time duration per window
-  window: 20s
-  # BucketNum defines bucket number for each window
-  bucket: 500
-  # CPU threshold; valid range 0–1000 (1000 = 100%)
-  cpuThreshold: 850
-
-circuitBreaker:
-  enable: false
-  window: 5s            # Time window size (seconds)
-  bucket: 100            # Number of buckets
-  success: 0.6          # Success rate threshold (0.6 means 60%)
-  request: 500 # Request threshold; circuit breaker evaluation occurs when reached

config/webhooks.yml

@@ -41,9 +41,6 @@ afterSendGroupMsg:
   attentionIds: []
   # See beforeSendSingleMsg comment.
   deniedTypes: []
-afterMsgSaveDB:
-  enable: false
-  timeout: 5
 afterUserOnline:
   enable: false
   timeout: 5

go.mod

@@ -1,6 +1,6 @@
 module github.com/openimsdk/open-im-server/v3
 
-go 1.25.0
+go 1.22.7
 
 require (
 	firebase.google.com/go/v4 v4.14.1
@@ -12,11 +12,11 @@ require (
 	github.com/gorilla/websocket v1.5.1
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
 	github.com/mitchellh/mapstructure v1.5.0
-	github.com/openimsdk/protocol v0.0.73-alpha.19
-	github.com/openimsdk/tools v0.0.50-alpha.113
+	github.com/openimsdk/protocol v0.0.73-alpha.14
+	github.com/openimsdk/tools v0.0.50-alpha.103
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.18.0
-	github.com/stretchr/testify v1.11.1
+	github.com/stretchr/testify v1.10.0
 	go.mongodb.org/mongo-driver v1.14.0
 	google.golang.org/api v0.170.0
 	google.golang.org/grpc v1.71.0
@@ -27,7 +27,6 @@ require (
 require github.com/google/uuid v1.6.0
 
 require (
-	github.com/IBM/sarama v1.43.0
 	github.com/fatih/color v1.14.1
 	github.com/gin-contrib/gzip v1.0.1
 	github.com/go-redis/redis v6.15.9+incompatible
@@ -35,7 +34,7 @@ require (
 	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/kelindar/bitmap v1.5.2
 	github.com/likexian/gokit v0.25.13
-	github.com/openimsdk/gomake v0.0.17
+	github.com/openimsdk/gomake v0.0.15-alpha.11
 	github.com/redis/go-redis/v9 v9.4.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/shirou/gopsutil v3.21.11+incompatible
@@ -55,6 +54,7 @@ require (
 	cloud.google.com/go/iam v1.1.7 // indirect
 	cloud.google.com/go/longrunning v0.5.5 // indirect
 	cloud.google.com/go/storage v1.40.0 // indirect
+	github.com/IBM/sarama v1.43.0 // indirect
 	github.com/MicahParks/keyfunc v1.9.0 // indirect
 	github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible // indirect
 	github.com/aws/aws-sdk-go-v2 v1.32.5 // indirect
@@ -76,7 +76,6 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sts v1.33.1 // indirect
 	github.com/aws/smithy-go v1.22.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bmatcuk/doublestar/v4 v4.10.0 // indirect
 	github.com/bytedance/sonic v1.11.6 // indirect
 	github.com/bytedance/sonic/loader v0.1.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -91,7 +90,6 @@ require (
 	github.com/eapache/go-resiliency v1.6.0 // indirect
 	github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
 	github.com/eapache/queue v1.1.0 // indirect
-	github.com/ebitengine/purego v0.10.0 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
@@ -100,7 +98,7 @@ require (
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-ole/go-ole v1.3.0 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.4 // indirect
@@ -110,7 +108,7 @@ require (
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
-	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/s2a-go v0.1.7 // indirect
@@ -137,7 +135,6 @@ require (
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/lestrrat-go/strftime v1.0.6 // indirect
 	github.com/lithammer/shortuuid v3.0.0+incompatible // indirect
-	github.com/lufia/plan9stats v0.0.0-20260216142805-b3301c5f2a88 // indirect
 	github.com/magefile/mage v1.15.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -154,7 +151,6 @@ require (
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/pierrec/lz4/v4 v4.1.21 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/prometheus/client_model v0.5.0 // indirect
 	github.com/prometheus/common v0.45.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
@@ -164,9 +160,6 @@ require (
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sercand/kuberesolver/v6 v6.0.1 // indirect
-	github.com/shirou/gopsutil/v3 v3.24.5 // indirect
-	github.com/shirou/gopsutil/v4 v4.26.2 // indirect
-	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
@@ -174,8 +167,8 @@ require (
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/tencentyun/cos-go-sdk-v5 v0.7.47 // indirect
-	github.com/tklauser/go-sysconf v0.3.16 // indirect
-	github.com/tklauser/numcpus v0.11.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.13 // indirect
+	github.com/tklauser/numcpus v0.7.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
@@ -199,7 +192,7 @@ require (
 	golang.org/x/image v0.15.0 // indirect
 	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/oauth2 v0.25.0 // indirect
-	golang.org/x/sys v0.42.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/term v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/time v0.5.0 // indirect

go.sum

@@ -61,8 +61,6 @@ github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLj
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bmatcuk/doublestar/v4 v4.10.0 h1:zU9WiOla1YA122oLM6i4EXvGW62DvKZVxIe6TYWexEs=
-github.com/bmatcuk/doublestar/v4 v4.10.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
@@ -105,8 +103,6 @@ github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4A
 github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0=
 github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc=
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/ebitengine/purego v0.10.0 h1:QIw4xfpWT6GWTzaW5XEKy3HXoqrJGx1ijYHzTF0/ISU=
-github.com/ebitengine/purego v0.10.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g=
 github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -138,9 +134,8 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
-github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
 github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
 github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
@@ -207,8 +202,8 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
@@ -308,8 +303,6 @@ github.com/likexian/gokit v0.25.13 h1:p2Uw3+6fGG53CwdU2Dz0T6bOycdb2+bAFAa3ymwWVk
 github.com/likexian/gokit v0.25.13/go.mod h1:qQhEWFBEfqLCO3/vOEo2EDKd+EycekVtUK4tex+l2H4=
 github.com/lithammer/shortuuid v3.0.0+incompatible h1:NcD0xWW/MZYXEHa6ITy6kaXN5nwm/V115vj2YXfhS0w=
 github.com/lithammer/shortuuid v3.0.0+incompatible/go.mod h1:FR74pbAuElzOUuenUHTK2Tciko1/vKuIKS9dSkDrA4w=
-github.com/lufia/plan9stats v0.0.0-20260216142805-b3301c5f2a88 h1:PTw+yKnXcOFCR6+8hHTyWBeQ/P4Nb7dd4/0ohEcWQuM=
-github.com/lufia/plan9stats v0.0.0-20260216142805-b3301c5f2a88/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=
 github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=
 github.com/magefile/mage v1.15.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
@@ -352,12 +345,12 @@ github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA
 github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
 github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
 github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
-github.com/openimsdk/gomake v0.0.17 h1:q8haP48VOH45WhJRiLj1YSBJyUFJqD8CTedH65i1YH8=
-github.com/openimsdk/gomake v0.0.17/go.mod h1:nnjS8yCtrPJAt1knMbyPiUwCH2gpyBzj/EZAONfUOXg=
-github.com/openimsdk/protocol v0.0.73-alpha.19 h1:CvXoDF2U73UcMhLnrtMFks2Aw+bXiDgH8AITEt783/s=
-github.com/openimsdk/protocol v0.0.73-alpha.19/go.mod h1:WF7EuE55vQvpyUAzDXcqg+B+446xQyEba0X35lTINmw=
-github.com/openimsdk/tools v0.0.50-alpha.113 h1:rhLWaSJuhjgJFNVzmpChLCG7dPXS0+bte+CPI0008Us=
-github.com/openimsdk/tools v0.0.50-alpha.113/go.mod h1:x9i/e+WJFW4tocy6RNJQ9NofQiP3KJ1Y576/06TqOG4=
+github.com/openimsdk/gomake v0.0.15-alpha.11 h1:PQudYDRESYeYlUYrrLLJhYIlUPO5x7FAx+o5El9U/Bw=
+github.com/openimsdk/gomake v0.0.15-alpha.11/go.mod h1:PndCozNc2IsQIciyn9mvEblYWZwJmAI+06z94EY+csI=
+github.com/openimsdk/protocol v0.0.73-alpha.14 h1:lv9wNiPRm6G7q74TfpMobKrSfeTaBlZ+Ps3O6UFPmaE=
+github.com/openimsdk/protocol v0.0.73-alpha.14/go.mod h1:WF7EuE55vQvpyUAzDXcqg+B+446xQyEba0X35lTINmw=
+github.com/openimsdk/tools v0.0.50-alpha.103 h1:jYvI86cWiVu8a8iw1panw+pwIiStuUHF76h3fxA6ESI=
+github.com/openimsdk/tools v0.0.50-alpha.103/go.mod h1:qCExFBqXpQBMzZck3XGIFwivBayAn2KNqB3WAd++IJw=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
@@ -368,8 +361,6 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
-github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
 github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
 github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
@@ -406,14 +397,6 @@ github.com/sercand/kuberesolver/v6 v6.0.1 h1:XZUTA0gy/lgDYp/UhEwv7Js24F1j8NJ833Q
 github.com/sercand/kuberesolver/v6 v6.0.1/go.mod h1:C0tsTuRMONSY+Xf7pv7RMW1/JlewY1+wS8SZE+1lf1s=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
-github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=
-github.com/shirou/gopsutil/v4 v4.26.2 h1:X8i6sicvUFih4BmYIGT1m2wwgw2VG9YgrDTi7cIRGUI=
-github.com/shirou/gopsutil/v4 v4.26.2/go.mod h1:LZ6ewCSkBqUpvSOf+LsTGnRinC6iaNUNMGBtDkJBaLQ=
-github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
-github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
-github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
-github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
 github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
 github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
 github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
@@ -440,18 +423,18 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.563/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/kms v1.0.563/go.mod h1:uom4Nvi9W+Qkom0exYiJ9VWJjXwyxtPYTkKkaLMlfE0=
 github.com/tencentyun/cos-go-sdk-v5 v0.7.47 h1:uoS4Sob16qEYoapkqJq1D1Vnsy9ira9BfNUMtoFYTI4=
 github.com/tencentyun/cos-go-sdk-v5 v0.7.47/go.mod h1:DH9US8nB+AJXqwu/AMOrCFN1COv3dpytXuJWHgdg7kE=
-github.com/tklauser/go-sysconf v0.3.16 h1:frioLaCQSsF5Cy1jgRBrzr6t502KIIwQ0MArYICU0nA=
-github.com/tklauser/go-sysconf v0.3.16/go.mod h1:/qNL9xxDhc7tx3HSRsLWNnuzbVfh3e7gh/BmM179nYI=
-github.com/tklauser/numcpus v0.11.0 h1:nSTwhKH5e1dMNsCdVBukSZrURJRoHbSEQjdEbY+9RXw=
-github.com/tklauser/numcpus v0.11.0/go.mod h1:z+LwcLq54uWZTX0u/bGobaV34u6V7KNlTZejzM6/3MQ=
+github.com/tklauser/go-sysconf v0.3.13 h1:GBUpcahXSpR2xN01jhkNAbTLRk2Yzgggk8IM08lq3r4=
+github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0=
+github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr4=
+github.com/tklauser/numcpus v0.7.0/go.mod h1:bb6dMVcj8A42tSE7i32fsIUCbQNllK5iDguyOZRUzAY=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
@@ -565,7 +548,6 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -574,8 +556,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
-golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

internal/api/conversation.go

@@ -76,7 +76,3 @@ func (o *ConversationApi) GetPinnedConversationIDs(c *gin.Context) {
 func (o *ConversationApi) UpdateConversationsByUser(c *gin.Context) {
 	a2r.Call(c, conversation.ConversationClient.UpdateConversationsByUser, o.Client)
 }
-
-func (o *ConversationApi) DeleteConversations(c *gin.Context) {
-	a2r.Call(c, conversation.ConversationClient.DeleteConversations, o.Client)
-}

internal/api/ratelimit.go

@@ -1,83 +0,0 @@
-package api
-
-import (
-	"fmt"
-	"math"
-	"net/http"
-	"strconv"
-	"time"
-
-	"github.com/gin-gonic/gin"
-
-	"github.com/openimsdk/tools/apiresp"
-	"github.com/openimsdk/tools/errs"
-	"github.com/openimsdk/tools/log"
-	"github.com/openimsdk/tools/stability/ratelimit"
-	"github.com/openimsdk/tools/stability/ratelimit/bbr"
-)
-
-type RateLimiter struct {
-	Enable       bool          `yaml:"enable"`
-	Window       time.Duration `yaml:"window"`       // time duration per window
-	Bucket       int           `yaml:"bucket"`       // bucket number for each window
-	CPUThreshold int64         `yaml:"cpuThreshold"` // CPU threshold; valid range 0–1000 (1000 = 100%)
-}
-
-func RateLimitMiddleware(config *RateLimiter) gin.HandlerFunc {
-	if !config.Enable {
-		return func(c *gin.Context) {
-			c.Next()
-		}
-	}
-
-	limiter := bbr.NewBBRLimiter(
-		bbr.WithWindow(config.Window),
-		bbr.WithBucket(config.Bucket),
-		bbr.WithCPUThreshold(config.CPUThreshold),
-	)
-
-	return func(c *gin.Context) {
-		status := limiter.Stat()
-
-		c.Header("X-BBR-CPU", strconv.FormatInt(status.CPU, 10))
-		c.Header("X-BBR-MinRT", strconv.FormatInt(status.MinRt, 10))
-		c.Header("X-BBR-MaxPass", strconv.FormatInt(status.MaxPass, 10))
-		c.Header("X-BBR-MaxInFlight", strconv.FormatInt(status.MaxInFlight, 10))
-		c.Header("X-BBR-InFlight", strconv.FormatInt(status.InFlight, 10))
-
-		done, err := limiter.Allow()
-		if err != nil {
-
-			c.Header("X-RateLimit-Policy", "BBR")
-			c.Header("Retry-After", calculateBBRRetryAfter(status))
-			c.Header("X-RateLimit-Limit", strconv.FormatInt(status.MaxInFlight, 10))
-			c.Header("X-RateLimit-Remaining", "0") // There is no concept of remaining quota in BBR.
-
-			fmt.Println("rate limited:", err, "path:", c.Request.URL.Path)
-			log.ZWarn(c, "rate limited", err, "path", c.Request.URL.Path)
-			c.AbortWithStatus(http.StatusTooManyRequests)
-			apiresp.GinError(c, errs.NewCodeError(http.StatusTooManyRequests, "too many requests, please try again later"))
-			return
-		}
-
-		c.Next()
-		done(ratelimit.DoneInfo{})
-	}
-}
-
-func calculateBBRRetryAfter(status bbr.Stat) string {
-	loadRatio := float64(status.CPU) / float64(status.CPU)
-
-	if loadRatio < 0.8 {
-		return "1"
-	}
-	if loadRatio < 0.95 {
-		return "2"
-	}
-
-	backoff := 1 + int64(math.Pow(loadRatio-0.95, 2)*50)
-	if backoff > 5 {
-		backoff = 5
-	}
-	return strconv.FormatInt(backoff, 10)
-}

internal/api/router.go

@@ -97,18 +97,6 @@ func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, cf
 	case BestSpeed:
 		r.Use(gzip.Gzip(gzip.BestSpeed))
 	}
-
-	// Use rate limiter middleware
-	if cfg.API.RateLimiter.Enable {
-		rl := &RateLimiter{
-			Enable:       cfg.API.RateLimiter.Enable,
-			Window:       cfg.API.RateLimiter.Window,
-			Bucket:       cfg.API.RateLimiter.Bucket,
-			CPUThreshold: cfg.API.RateLimiter.CPUThreshold,
-		}
-		r.Use(RateLimitMiddleware(rl))
-	}
-
 	if config.Standalone() {
 		r.Use(func(c *gin.Context) {
 			c.Set(authverify.CtxAdminUserIDsKey, cfg.Share.IMAdminUser.UserIDs)
@@ -289,8 +277,6 @@ func newGinRouter(ctx context.Context, client discovery.SvcDiscoveryRegistry, cf
 		conversationGroup.POST("/get_owner_conversation", c.GetOwnerConversation)
 		conversationGroup.POST("/get_not_notify_conversation_ids", c.GetNotNotifyConversationIDs)
 		conversationGroup.POST("/get_pinned_conversation_ids", c.GetPinnedConversationIDs)
-		conversationGroup.POST("/delete_conversations", c.DeleteConversations)
-		conversationGroup.POST("/update_conversations_by_user", c.UpdateConversationsByUser)
 	}
 
 	{

internal/msggateway/client.go

@@ -16,6 +16,7 @@ package msggateway
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"sync"
 	"sync/atomic"
@@ -30,6 +31,7 @@ import (
 	"github.com/openimsdk/tools/errs"
 	"github.com/openimsdk/tools/log"
 	"github.com/openimsdk/tools/mcontext"
+	"github.com/openimsdk/tools/utils/stringutil"
 )
 
 var (
@@ -62,13 +64,12 @@ type PingPongHandler func(string) error
 
 type Client struct {
 	w              *sync.Mutex
-	conn           ClientConn
+	conn           LongConn
 	PlatformID     int    `json:"platformID"`
 	IsCompress     bool   `json:"isCompress"`
 	UserID         string `json:"userID"`
 	IsBackground   bool   `json:"isBackground"`
 	SDKType        string `json:"sdkType"`
-	SDKVersion     string `json:"sdkVersion"`
 	Encoder        Encoder
 	ctx            *UserConnContext
 	longConnServer LongConnServer
@@ -82,10 +83,10 @@ type Client struct {
 }
 
 // ResetClient updates the client's state with new connection and context information.
-func (c *Client) ResetClient(ctx *UserConnContext, conn ClientConn, longConnServer LongConnServer) {
+func (c *Client) ResetClient(ctx *UserConnContext, conn LongConn, longConnServer LongConnServer) {
 	c.w = new(sync.Mutex)
 	c.conn = conn
-	c.PlatformID = ctx.GetPlatformID()
+	c.PlatformID = stringutil.StringToInt(ctx.GetPlatformID())
 	c.IsCompress = ctx.GetCompression()
 	c.IsBackground = ctx.GetBackground()
 	c.UserID = ctx.GetUserID()
@@ -96,7 +97,6 @@ func (c *Client) ResetClient(ctx *UserConnContext, conn ClientConn, longConnServ
 	c.closedErr = nil
 	c.token = ctx.GetToken()
 	c.SDKType = ctx.GetSDKType()
-	c.SDKVersion = ctx.GetSDKVersion()
 	c.hbCtx, c.hbCancel = context.WithCancel(c.ctx)
 	c.subLock = new(sync.Mutex)
 	if c.subUserIDs != nil {
@@ -110,6 +110,22 @@ func (c *Client) ResetClient(ctx *UserConnContext, conn ClientConn, longConnServ
 	c.subUserIDs = make(map[string]struct{})
 }
 
+func (c *Client) pingHandler(appData string) error {
+	if err := c.conn.SetReadDeadline(pongWait); err != nil {
+		return err
+	}
+
+	log.ZDebug(c.ctx, "ping Handler Success.", "appData", appData)
+	return c.writePongMsg(appData)
+}
+
+func (c *Client) pongHandler(_ string) error {
+	if err := c.conn.SetReadDeadline(pongWait); err != nil {
+		return err
+	}
+	return nil
+}
+
 // readMessage continuously reads messages from the connection.
 func (c *Client) readMessage() {
 	defer func() {
@@ -120,25 +136,52 @@ func (c *Client) readMessage() {
 		c.close()
 	}()
 
+	c.conn.SetReadLimit(maxMessageSize)
+	_ = c.conn.SetReadDeadline(pongWait)
+	c.conn.SetPongHandler(c.pongHandler)
+	c.conn.SetPingHandler(c.pingHandler)
+	c.activeHeartbeat(c.hbCtx)
+
 	for {
 		log.ZDebug(c.ctx, "readMessage")
-		message, returnErr := c.conn.ReadMessage()
+		messageType, message, returnErr := c.conn.ReadMessage()
 		if returnErr != nil {
-			log.ZWarn(c.ctx, "readMessage", returnErr)
+			log.ZWarn(c.ctx, "readMessage", returnErr, "messageType", messageType)
 			c.closedErr = returnErr
 			return
 		}
 
+		log.ZDebug(c.ctx, "readMessage", "messageType", messageType)
 		if c.closed.Load() {
 			// The scenario where the connection has just been closed, but the coroutine has not exited
 			c.closedErr = ErrConnClosed
 			return
 		}
 
-		parseDataErr := c.handleMessage(message)
-		if parseDataErr != nil {
-			c.closedErr = parseDataErr
+		switch messageType {
+		case MessageBinary:
+			_ = c.conn.SetReadDeadline(pongWait)
+			parseDataErr := c.handleMessage(message)
+			if parseDataErr != nil {
+				c.closedErr = parseDataErr
+				return
+			}
+		case MessageText:
+			_ = 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)
+
+		case CloseMessage:
+			c.closedErr = ErrClientClosed
 			return
+
+		default:
 		}
 	}
 }
@@ -313,13 +356,109 @@ func (c *Client) writeBinaryMsg(resp Resp) error {
 	c.w.Lock()
 	defer c.w.Unlock()
 
+	err = c.conn.SetWriteDeadline(writeWait)
+	if err != nil {
+		return err
+	}
+
 	if c.IsCompress {
 		resultBuf, compressErr := c.longConnServer.CompressWithPool(encodedBuf)
 		if compressErr != nil {
 			return compressErr
 		}
-		return c.conn.WriteMessage(resultBuf)
+		return c.conn.WriteMessage(MessageBinary, resultBuf)
 	}
 
-	return c.conn.WriteMessage(encodedBuf)
+	return c.conn.WriteMessage(MessageBinary, encodedBuf)
+}
+
+// Actively initiate Heartbeat when platform in Web.
+func (c *Client) activeHeartbeat(ctx context.Context) {
+	if c.PlatformID == constant.WebPlatformID {
+		go func() {
+			defer func() {
+				if r := recover(); r != nil {
+					log.ZPanic(ctx, "activeHeartbeat Panic", errs.ErrPanic(r))
+				}
+			}()
+			log.ZDebug(ctx, "server initiative send heartbeat start.")
+			ticker := time.NewTicker(pingPeriod)
+			defer ticker.Stop()
+
+			for {
+				select {
+				case <-ticker.C:
+					if err := c.writePingMsg(); err != nil {
+						log.ZWarn(c.ctx, "send Ping Message error.", err)
+						return
+					}
+				case <-c.hbCtx.Done():
+					return
+				}
+			}
+		}()
+	}
+}
+func (c *Client) writePingMsg() error {
+	if c.closed.Load() {
+		return nil
+	}
+
+	c.w.Lock()
+	defer c.w.Unlock()
+
+	err := c.conn.SetWriteDeadline(writeWait)
+	if err != nil {
+		return err
+	}
+
+	return c.conn.WriteMessage(PingMessage, nil)
+}
+
+func (c *Client) writePongMsg(appData string) error {
+	log.ZDebug(c.ctx, "write Pong Msg in Server", "appData", appData)
+	if c.closed.Load() {
+		log.ZWarn(c.ctx, "is closed in server", nil, "appdata", appData, "closed err", c.closedErr)
+		return nil
+	}
+
+	c.w.Lock()
+	defer c.w.Unlock()
+
+	err := c.conn.SetWriteDeadline(writeWait)
+	if err != nil {
+		log.ZWarn(c.ctx, "SetWriteDeadline in Server have error", errs.Wrap(err), "writeWait", writeWait, "appData", appData)
+		return errs.Wrap(err)
+	}
+	err = c.conn.WriteMessage(PongMessage, []byte(appData))
+	if err != nil {
+		log.ZWarn(c.ctx, "Write Message have error", errs.Wrap(err), "Pong msg", PongMessage)
+	}
+
+	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
+		}
+		c.w.Lock()
+		defer c.w.Unlock()
+		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)
+	}
 }

internal/msggateway/client_conn.go

@@ -1,229 +0,0 @@
-package msggateway
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"sync/atomic"
-	"time"
-
-	"github.com/gorilla/websocket"
-
-	"github.com/openimsdk/tools/log"
-)
-
-var ErrWriteFull = fmt.Errorf("websocket write buffer full,close connection")
-
-type ClientConn interface {
-	ReadMessage() ([]byte, error)
-	WriteMessage(message []byte) error
-	Close() error
-}
-
-type websocketMessage struct {
-	MessageType int
-	Data        []byte
-}
-
-func NewWebSocketClientConn(conn *websocket.Conn, readLimit int64, readTimeout time.Duration, pingInterval time.Duration) ClientConn {
-	c := &websocketClientConn{
-		readTimeout: readTimeout,
-		conn:        conn,
-		writer:      make(chan *websocketMessage, 256),
-		done:        make(chan struct{}),
-	}
-	if readLimit > 0 {
-		c.conn.SetReadLimit(readLimit)
-	}
-	c.conn.SetPingHandler(c.pingHandler)
-	c.conn.SetPongHandler(c.pongHandler)
-
-	go c.loopSend()
-	if pingInterval > 0 {
-		go c.doPing(pingInterval)
-	}
-	return c
-}
-
-type websocketClientConn struct {
-	readTimeout time.Duration
-	conn        *websocket.Conn
-	writer      chan *websocketMessage
-	done        chan struct{}
-	err         atomic.Pointer[error]
-}
-
-func (c *websocketClientConn) ReadMessage() ([]byte, error) {
-	buf, err := c.readMessage()
-	if err != nil {
-		return nil, c.closeBy(fmt.Errorf("read message %w", err))
-	}
-	return buf, nil
-}
-
-func (c *websocketClientConn) WriteMessage(message []byte) error {
-	return c.writeMessage(websocket.BinaryMessage, message)
-}
-
-func (c *websocketClientConn) Close() error {
-	return c.closeBy(fmt.Errorf("websocket connection closed"))
-}
-
-func (c *websocketClientConn) closeBy(err error) error {
-	if !c.err.CompareAndSwap(nil, &err) {
-		return *c.err.Load()
-	}
-	close(c.done)
-	log.ZWarn(context.Background(), "websocket connection closed", err, "remoteAddr", c.conn.RemoteAddr(),
-		"chan length", len(c.writer))
-	return err
-}
-
-func (c *websocketClientConn) writeMessage(messageType int, data []byte) error {
-	if errPtr := c.err.Load(); errPtr != nil {
-		return *errPtr
-	}
-	select {
-	case c.writer <- &websocketMessage{MessageType: messageType, Data: data}:
-		return nil
-	default:
-		return c.closeBy(ErrWriteFull)
-	}
-}
-
-func (c *websocketClientConn) loopSend() {
-	defer func() {
-		_ = c.conn.Close()
-	}()
-	var err error
-	for {
-		select {
-		case <-c.done:
-			for {
-				select {
-				case msg := <-c.writer:
-					switch msg.MessageType {
-					case websocket.TextMessage, websocket.BinaryMessage:
-						err = c.conn.WriteMessage(msg.MessageType, msg.Data)
-					default:
-						err = c.conn.WriteControl(msg.MessageType, msg.Data, time.Time{})
-					}
-					if err != nil {
-						_ = c.closeBy(err)
-						return
-					}
-				default:
-					return
-				}
-			}
-		case msg := <-c.writer:
-			switch msg.MessageType {
-			case websocket.TextMessage, websocket.BinaryMessage:
-				err = c.conn.WriteMessage(msg.MessageType, msg.Data)
-			default:
-				err = c.conn.WriteControl(msg.MessageType, msg.Data, time.Time{})
-			}
-			if err != nil {
-				_ = c.closeBy(err)
-				return
-			}
-		}
-	}
-}
-
-func (c *websocketClientConn) setReadDeadline() error {
-	deadline := time.Now().Add(c.readTimeout)
-	return c.conn.SetReadDeadline(deadline)
-}
-
-func (c *websocketClientConn) readMessage() ([]byte, error) {
-	for {
-		if err := c.setReadDeadline(); err != nil {
-			return nil, err
-		}
-		messageType, buf, err := c.conn.ReadMessage()
-		if err != nil {
-			return nil, err
-		}
-		switch messageType {
-		case websocket.BinaryMessage:
-			return buf, nil
-		case websocket.TextMessage:
-			if err := c.onReadTextMessage(buf); err != nil {
-				return nil, err
-			}
-		case websocket.PingMessage:
-			if err := c.pingHandler(string(buf)); err != nil {
-				return nil, err
-			}
-		case websocket.PongMessage:
-			if err := c.pongHandler(string(buf)); err != nil {
-				return nil, err
-			}
-		case websocket.CloseMessage:
-			if len(buf) == 0 {
-				return nil, errors.New("websocket connection closed by peer")
-			}
-			return nil, fmt.Errorf("websocket connection closed by peer, data %s", string(buf))
-		default:
-			return nil, fmt.Errorf("unknown websocket message type %d", messageType)
-		}
-	}
-}
-
-func (c *websocketClientConn) onReadTextMessage(buf []byte) error {
-	var msg struct {
-		Type string          `json:"type"`
-		Body json.RawMessage `json:"body"`
-	}
-	if err := json.Unmarshal(buf, &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
-		}
-		return c.writeMessage(websocket.TextMessage, msgData)
-	default:
-		return fmt.Errorf("not support text message type %s", msg.Type)
-	}
-}
-
-func (c *websocketClientConn) pingHandler(appData string) error {
-	log.ZDebug(context.Background(), "ping handler recv ping", "remoteAddr", c.conn.RemoteAddr(), "appData", appData)
-	if err := c.setReadDeadline(); err != nil {
-		return err
-	}
-	err := c.conn.WriteControl(websocket.PongMessage, []byte(appData), time.Now().Add(time.Second*1))
-	if err != nil {
-		log.ZWarn(context.Background(), "ping handler write pong error", err, "remoteAddr", c.conn.RemoteAddr(), "appData", appData)
-	}
-	log.ZDebug(context.Background(), "ping handler write pong success", "remoteAddr", c.conn.RemoteAddr(), "appData", appData)
-	return nil
-}
-
-func (c *websocketClientConn) pongHandler(string) error {
-	return nil
-}
-
-func (c *websocketClientConn) doPing(d time.Duration) {
-	ticker := time.NewTicker(d)
-	defer ticker.Stop()
-	for {
-		select {
-		case <-c.done:
-			return
-		case <-ticker.C:
-			if err := c.writeMessage(websocket.PingMessage, nil); err != nil {
-				_ = c.closeBy(fmt.Errorf("send ping %w", err))
-				return
-			}
-		}
-	}
-}

internal/msggateway/constant.go

@@ -28,7 +28,6 @@ const (
 	BackgroundStatus        = "isBackground"
 	SendResponse            = "isMsgResp"
 	SDKType                 = "sdkType"
-	SDKVersion              = "sdkVersion"
 )
 
 const (

internal/msggateway/context.go

@@ -15,32 +15,18 @@
 package msggateway
 
 import (
-	"encoding/base64"
-	"encoding/json"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/servererrs"
 	"net/http"
 	"net/url"
 	"strconv"
 	"time"
 
-	"github.com/openimsdk/open-im-server/v3/pkg/common/servererrs"
-
 	"github.com/openimsdk/protocol/constant"
 	"github.com/openimsdk/tools/utils/encrypt"
+	"github.com/openimsdk/tools/utils/stringutil"
 	"github.com/openimsdk/tools/utils/timeutil"
 )
 
-type UserConnContextInfo struct {
-	Token        string `json:"token"`
-	UserID       string `json:"userID"`
-	PlatformID   int    `json:"platformID"`
-	OperationID  string `json:"operationID"`
-	Compression  string `json:"compression"`
-	SDKType      string `json:"sdkType"`
-	SendResponse bool   `json:"sendResponse"`
-	Background   bool   `json:"background"`
-	SDKVersion   string `json:"sdkVersion"`
-}
-
 type UserConnContext struct {
 	RespWriter http.ResponseWriter
 	Req        *http.Request
@@ -48,7 +34,6 @@ type UserConnContext struct {
 	Method     string
 	RemoteAddr string
 	ConnID     string
-	info       *UserConnContextInfo
 }
 
 func (c *UserConnContext) Deadline() (deadline time.Time, ok bool) {
@@ -72,11 +57,9 @@ func (c *UserConnContext) Value(key any) any {
 	case constant.ConnID:
 		return c.GetConnID()
 	case constant.OpUserPlatform:
-		return c.GetPlatformID()
+		return constant.PlatformIDToName(stringutil.StringToInt(c.GetPlatformID()))
 	case constant.RemoteAddr:
 		return c.RemoteAddr
-	case SDKVersion:
-		return c.info.SDKVersion
 	default:
 		return ""
 	}
@@ -99,92 +82,30 @@ func newContext(respWriter http.ResponseWriter, req *http.Request) *UserConnCont
 
 func newTempContext() *UserConnContext {
 	return &UserConnContext{
-		Req:  &http.Request{URL: &url.URL{}},
-		info: &UserConnContextInfo{},
+		Req: &http.Request{URL: &url.URL{}},
 	}
 }
 
-func (c *UserConnContext) ParseEssentialArgs() error {
-	query := c.Req.URL.Query()
-	if data := query.Get("v"); data != "" {
-		return c.parseByJson(data)
-	} else {
-		return c.parseByQuery(query, c.Req.Header)
-	}
-}
-
-func (c *UserConnContext) parseByQuery(query url.Values, header http.Header) error {
-	info := UserConnContextInfo{
-		Token:       query.Get(Token),
-		UserID:      query.Get(WsUserID),
-		OperationID: query.Get(OperationID),
-		Compression: query.Get(Compression),
-		SDKType:     query.Get(SDKType),
-		SDKVersion:  query.Get(SDKVersion),
-	}
-	platformID, err := strconv.Atoi(query.Get(PlatformID))
-	if err != nil {
-		return servererrs.ErrConnArgsErr.WrapMsg("platformID is not int")
-	}
-	info.PlatformID = platformID
-	if val := query.Get(SendResponse); val != "" {
-		ok, err := strconv.ParseBool(val)
-		if err != nil {
-			return servererrs.ErrConnArgsErr.WrapMsg("isMsgResp is not bool")
-		}
-		info.SendResponse = ok
-	}
-	if info.Compression == "" {
-		info.Compression = header.Get(Compression)
-	}
-	background, err := strconv.ParseBool(query.Get(BackgroundStatus))
-	if err != nil {
-		return err
-	}
-	info.Background = background
-	return c.checkInfo(&info)
-}
-
-func (c *UserConnContext) parseByJson(data string) error {
-	reqInfo, err := base64.RawURLEncoding.DecodeString(data)
-	if err != nil {
-		return servererrs.ErrConnArgsErr.WrapMsg("data is not base64")
-	}
-	var info UserConnContextInfo
-	if err := json.Unmarshal(reqInfo, &info); err != nil {
-		return servererrs.ErrConnArgsErr.WrapMsg("data is not json", "info", err.Error())
-	}
-	return c.checkInfo(&info)
-}
-
-func (c *UserConnContext) checkInfo(info *UserConnContextInfo) error {
-	if info.OperationID == "" {
-		return servererrs.ErrConnArgsErr.WrapMsg("operationID is empty")
-	}
-	if info.Token == "" {
-		return servererrs.ErrConnArgsErr.WrapMsg("token is empty")
-	}
-	if info.UserID == "" {
-		return servererrs.ErrConnArgsErr.WrapMsg("sendID is empty")
-	}
-	if _, ok := constant.PlatformID2Name[info.PlatformID]; !ok {
-		return servererrs.ErrConnArgsErr.WrapMsg("platformID is invalid")
-	}
-	switch info.SDKType {
-	case "":
-		info.SDKType = GoSDK
-	case GoSDK, JsSDK:
-	default:
-		return servererrs.ErrConnArgsErr.WrapMsg("sdkType is invalid")
-	}
-	c.info = info
-	return nil
-}
-
 func (c *UserConnContext) GetRemoteAddr() string {
 	return c.RemoteAddr
 }
 
+func (c *UserConnContext) Query(key string) (string, bool) {
+	var value string
+	if value = c.Req.URL.Query().Get(key); value == "" {
+		return value, false
+	}
+	return value, true
+}
+
+func (c *UserConnContext) GetHeader(key string) (string, bool) {
+	var value string
+	if value = c.Req.Header.Get(key); value == "" {
+		return value, false
+	}
+	return value, true
+}
+
 func (c *UserConnContext) SetHeader(key, value string) {
 	c.RespWriter.Header().Set(key, value)
 }
@@ -198,76 +119,93 @@ func (c *UserConnContext) GetConnID() string {
 }
 
 func (c *UserConnContext) GetUserID() string {
-	if c == nil || c.info == nil {
-		return ""
-	}
-	return c.info.UserID
+	return c.Req.URL.Query().Get(WsUserID)
 }
 
-func (c *UserConnContext) GetPlatformID() int {
-	if c == nil || c.info == nil {
-		return 0
-	}
-	return c.info.PlatformID
+func (c *UserConnContext) GetPlatformID() string {
+	return c.Req.URL.Query().Get(PlatformID)
 }
 
 func (c *UserConnContext) GetOperationID() string {
-	if c == nil || c.info == nil {
-		return ""
-	}
-	return c.info.OperationID
+	return c.Req.URL.Query().Get(OperationID)
 }
 
 func (c *UserConnContext) SetOperationID(operationID string) {
-	if c.info == nil {
-		c.info = &UserConnContextInfo{}
-	}
-	c.info.OperationID = operationID
+	values := c.Req.URL.Query()
+	values.Set(OperationID, operationID)
+	c.Req.URL.RawQuery = values.Encode()
 }
 
 func (c *UserConnContext) GetToken() string {
-	if c == nil || c.info == nil {
-		return ""
-	}
-	return c.info.Token
+	return c.Req.URL.Query().Get(Token)
 }
 
 func (c *UserConnContext) GetCompression() bool {
-	return c != nil && c.info != nil && c.info.Compression == GzipCompressionProtocol
+	compression, exists := c.Query(Compression)
+	if exists && compression == GzipCompressionProtocol {
+		return true
+	} else {
+		compression, exists := c.GetHeader(Compression)
+		if exists && compression == GzipCompressionProtocol {
+			return true
+		}
+	}
+	return false
 }
 
 func (c *UserConnContext) GetSDKType() string {
-	if c == nil || c.info == nil {
-		return GoSDK
+	sdkType := c.Req.URL.Query().Get(SDKType)
+	if sdkType == "" {
+		sdkType = GoSDK
 	}
-	switch c.info.SDKType {
-	case "", GoSDK:
-		return GoSDK
-	case JsSDK:
-		return JsSDK
-	default:
-		return ""
-	}
-}
-
-func (c *UserConnContext) GetSDKVersion() string {
-	if c == nil || c.info == nil {
-		return ""
-	}
-	return c.info.SDKVersion
+	return sdkType
 }
 
 func (c *UserConnContext) ShouldSendResp() bool {
-	return c != nil && c.info != nil && c.info.SendResponse
+	errResp, exists := c.Query(SendResponse)
+	if exists {
+		b, err := strconv.ParseBool(errResp)
+		if err != nil {
+			return false
+		} else {
+			return b
+		}
+	}
+	return false
 }
 
 func (c *UserConnContext) SetToken(token string) {
-	if c.info == nil {
-		c.info = &UserConnContextInfo{}
-	}
-	c.info.Token = token
+	c.Req.URL.RawQuery = Token + "=" + token
 }
 
 func (c *UserConnContext) GetBackground() bool {
-	return c != nil && c.info != nil && c.info.Background
+	b, err := strconv.ParseBool(c.Req.URL.Query().Get(BackgroundStatus))
+	if err != nil {
+		return false
+	}
+	return b
+}
+func (c *UserConnContext) ParseEssentialArgs() error {
+	_, exists := c.Query(Token)
+	if !exists {
+		return servererrs.ErrConnArgsErr.WrapMsg("token is empty")
+	}
+	_, exists = c.Query(WsUserID)
+	if !exists {
+		return servererrs.ErrConnArgsErr.WrapMsg("sendID is empty")
+	}
+	platformIDStr, exists := c.Query(PlatformID)
+	if !exists {
+		return servererrs.ErrConnArgsErr.WrapMsg("platformID is empty")
+	}
+	_, 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
 }

internal/msggateway/hub_server.go

@@ -152,16 +152,19 @@ func (s *Server) pushToUser(ctx context.Context, userID string, msgData *sdkws.M
 		userPlatform := &msggateway.SingleMsgToUserPlatform{
 			RecvPlatFormID: int32(client.PlatformID),
 		}
-		if client.IsBackground && client.PlatformID == constant.IOSPlatformID {
+		if !client.IsBackground ||
+			(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 {
+					result.OnlinePush = true
+				}
+			}
+		} else {
 			userPlatform.ResultCode = int64(servererrs.ErrIOSBackgroundPushErr.Code())
-			result.Resp = append(result.Resp, userPlatform)
-			continue
-		}
-		if err := client.PushMessage(ctx, msgData); 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 {
-			result.OnlinePush = true
 		}
 		result.Resp = append(result.Resp, userPlatform)
 	}

internal/msggateway/long_conn.go

@@ -0,0 +1,179 @@
+// Copyright © 2023 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package msggateway
+
+import (
+	"encoding/json"
+	"net/http"
+	"time"
+
+	"github.com/openimsdk/tools/apiresp"
+
+	"github.com/gorilla/websocket"
+	"github.com/openimsdk/tools/errs"
+)
+
+type LongConn interface {
+	// Close this connection
+	Close() error
+	// WriteMessage Write message to connection,messageType means data type,can be set binary(2) and text(1).
+	WriteMessage(messageType int, message []byte) error
+	// ReadMessage Read message from connection.
+	ReadMessage() (int, []byte, error)
+	// SetReadDeadline sets the read deadline on the underlying network connection,
+	// after a read has timed out, will return an error.
+	SetReadDeadline(timeout time.Duration) error
+	// SetWriteDeadline sets to write deadline when send message,when read has timed out,will return error.
+	SetWriteDeadline(timeout time.Duration) error
+	// Dial Try to dial a connection,url must set auth args,header can control compress data
+	Dial(urlStr string, requestHeader http.Header) (*http.Response, error)
+	// IsNil Whether the connection of the current long connection is nil
+	IsNil() bool
+	// SetConnNil Set the connection of the current long connection to nil
+	SetConnNil()
+	// SetReadLimit sets the maximum size for a message read from the peer.bytes
+	SetReadLimit(limit int64)
+	SetPongHandler(handler PingPongHandler)
+	SetPingHandler(handler PingPongHandler)
+	// GenerateLongConn Check the connection of the current and when it was sent are the same
+	GenerateLongConn(w http.ResponseWriter, r *http.Request) error
+}
+type GWebSocket struct {
+	protocolType     int
+	conn             *websocket.Conn
+	handshakeTimeout time.Duration
+	writeBufferSize  int
+}
+
+func newGWebSocket(protocolType int, handshakeTimeout time.Duration, wbs int) *GWebSocket {
+	return &GWebSocket{protocolType: protocolType, handshakeTimeout: handshakeTimeout, writeBufferSize: wbs}
+}
+
+func (d *GWebSocket) Close() error {
+	return d.conn.Close()
+}
+
+func (d *GWebSocket) GenerateLongConn(w http.ResponseWriter, r *http.Request) error {
+	upgrader := &websocket.Upgrader{
+		HandshakeTimeout: d.handshakeTimeout,
+		CheckOrigin:      func(r *http.Request) bool { return true },
+	}
+	if d.writeBufferSize > 0 { // default is 4kb.
+		upgrader.WriteBufferSize = d.writeBufferSize
+	}
+
+	conn, err := upgrader.Upgrade(w, r, nil)
+	if err != nil {
+		// The upgrader.Upgrade method usually returns enough error messages to diagnose problems that may occur during the upgrade
+		return errs.WrapMsg(err, "GenerateLongConn: WebSocket upgrade failed")
+	}
+	d.conn = conn
+	return nil
+}
+
+func (d *GWebSocket) WriteMessage(messageType int, message []byte) error {
+	// d.setSendConn(d.conn)
+	return d.conn.WriteMessage(messageType, message)
+}
+
+// func (d *GWebSocket) setSendConn(sendConn *websocket.Conn) {
+//	d.sendConn = sendConn
+//}
+
+func (d *GWebSocket) ReadMessage() (int, []byte, error) {
+	return d.conn.ReadMessage()
+}
+
+func (d *GWebSocket) SetReadDeadline(timeout time.Duration) error {
+	return d.conn.SetReadDeadline(time.Now().Add(timeout))
+}
+
+func (d *GWebSocket) SetWriteDeadline(timeout time.Duration) error {
+	if timeout <= 0 {
+		return errs.New("timeout must be greater than 0")
+	}
+
+	// TODO SetWriteDeadline Future add error handling
+	if err := d.conn.SetWriteDeadline(time.Now().Add(timeout)); err != nil {
+		return errs.WrapMsg(err, "GWebSocket.SetWriteDeadline failed")
+	}
+	return nil
+}
+
+func (d *GWebSocket) Dial(urlStr string, requestHeader http.Header) (*http.Response, error) {
+	conn, httpResp, err := websocket.DefaultDialer.Dial(urlStr, requestHeader)
+	if err != nil {
+		return httpResp, errs.WrapMsg(err, "GWebSocket.Dial failed", "url", urlStr)
+	}
+	d.conn = conn
+	return httpResp, nil
+}
+
+func (d *GWebSocket) IsNil() bool {
+	return d.conn == nil
+	//
+	// if d.conn != nil {
+	// 	return false
+	// }
+	// return true
+}
+
+func (d *GWebSocket) SetConnNil() {
+	d.conn = nil
+}
+
+func (d *GWebSocket) SetReadLimit(limit int64) {
+	d.conn.SetReadLimit(limit)
+}
+
+func (d *GWebSocket) SetPongHandler(handler PingPongHandler) {
+	d.conn.SetPongHandler(handler)
+}
+
+func (d *GWebSocket) SetPingHandler(handler PingPongHandler) {
+	d.conn.SetPingHandler(handler)
+}
+
+func (d *GWebSocket) RespondWithError(err error, w http.ResponseWriter, r *http.Request) error {
+	if err := d.GenerateLongConn(w, r); err != nil {
+		return err
+	}
+	data, err := json.Marshal(apiresp.ParseError(err))
+	if err != nil {
+		_ = d.Close()
+		return errs.WrapMsg(err, "json marshal failed")
+	}
+
+	if err := d.WriteMessage(MessageText, data); err != nil {
+		_ = d.Close()
+		return errs.WrapMsg(err, "WriteMessage failed")
+	}
+	_ = d.Close()
+	return nil
+}
+
+func (d *GWebSocket) RespondWithSuccess() error {
+	data, err := json.Marshal(apiresp.ParseError(nil))
+	if err != nil {
+		_ = d.Close()
+		return errs.WrapMsg(err, "json marshal failed")
+	}
+
+	if err := d.WriteMessage(MessageText, data); err != nil {
+		_ = d.Close()
+		return errs.WrapMsg(err, "WriteMessage failed")
+	}
+	return nil
+}

internal/msggateway/ws_server.go

@@ -2,16 +2,13 @@ package msggateway
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"sync"
 	"sync/atomic"
 	"time"
 
-	"github.com/gorilla/websocket"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcli"
-	"github.com/openimsdk/tools/apiresp"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/webhook"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpccache"
@@ -25,11 +22,10 @@ import (
 	"github.com/openimsdk/protocol/msggateway"
 	"github.com/openimsdk/tools/discovery"
 	"github.com/openimsdk/tools/log"
+	"github.com/openimsdk/tools/utils/stringutil"
 	"golang.org/x/sync/errgroup"
 )
 
-var wsSuccessResponse, _ = json.Marshal(&apiresp.ApiResponse{})
-
 type LongConnServer interface {
 	Run(ctx context.Context) error
 	wsHandler(w http.ResponseWriter, r *http.Request)
@@ -46,7 +42,6 @@ type LongConnServer interface {
 }
 
 type WsServer struct {
-	websocket         *websocket.Upgrader
 	msgGatewayConfig  *Config
 	port              int
 	wsMaxConnNum      int64
@@ -69,8 +64,6 @@ type WsServer struct {
 	webhookClient *webhook.Client
 	userClient    *rpcli.UserClient
 	authClient    *rpcli.AuthClient
-
-	ready atomic.Bool
 }
 
 type kickHandler struct {
@@ -100,8 +93,6 @@ func (ws *WsServer) SetDiscoveryRegistry(ctx context.Context, disCov discovery.C
 	ws.authClient = rpcli.NewAuthClient(authConn)
 	ws.MessageHandler = NewGrpcHandler(ws.validate, rpcli.NewMsgClient(msgConn), rpcli.NewPushMsgServiceClient(pushConn))
 	ws.disCov = disCov
-
-	ws.ready.Store(true)
 	return nil
 }
 
@@ -140,13 +131,9 @@ func NewWsServer(msgGatewayConfig *Config, opts ...Option) *WsServer {
 		o(&config)
 	}
 	//userRpcClient := rpcclient.NewUserRpcClient(client, config.Discovery.RpcService.User, config.Share.IMAdminUser)
-	upgrader := &websocket.Upgrader{
-		HandshakeTimeout: config.handshakeTimeout,
-		CheckOrigin:      func(r *http.Request) bool { return true },
-	}
+
 	v := validator.New()
 	return &WsServer{
-		websocket:        upgrader,
 		msgGatewayConfig: msgGatewayConfig,
 		port:             config.port,
 		wsMaxConnNum:     config.maxConnNum,
@@ -267,9 +254,6 @@ func (ws *WsServer) registerClient(client *Client) {
 		oldClients []*Client
 	)
 	oldClients, userOK, clientOK = ws.clients.Get(client.UserID, client.PlatformID)
-
-	log.ZInfo(client.ctx, "registerClient", "userID", client.UserID, "platformID", client.PlatformID)
-
 	if !userOK {
 		ws.clients.Set(client.UserID, client)
 		log.ZDebug(client.ctx, "user not exist", "userID", client.UserID, "platformID", client.PlatformID)
@@ -455,7 +439,7 @@ func (ws *WsServer) unregisterClient(client *Client) {
 // validateRespWithRequest checks if the response matches the expected userID and platformID.
 func (ws *WsServer) validateRespWithRequest(ctx *UserConnContext, resp *pbAuth.ParseTokenResp) error {
 	userID := ctx.GetUserID()
-	platformID := int32(ctx.GetPlatformID())
+	platformID := stringutil.StringToInt32(ctx.GetPlatformID())
 	if resp.UserID != userID {
 		return servererrs.ErrTokenInvalid.WrapMsg(fmt.Sprintf("token uid %s != userID %s", resp.UserID, userID))
 	}
@@ -465,29 +449,6 @@ func (ws *WsServer) validateRespWithRequest(ctx *UserConnContext, resp *pbAuth.P
 	return nil
 }
 
-func (ws *WsServer) handlerError(ctx *UserConnContext, w http.ResponseWriter, r *http.Request, err error) {
-	if !ctx.ShouldSendResp() {
-		httpError(ctx, err)
-		return
-	}
-	// the browser cannot get the response of upgrade failure
-	data, err := json.Marshal(apiresp.ParseError(err))
-	if err != nil {
-		log.ZError(ctx, "json marshal failed", err)
-		return
-	}
-	conn, upgradeErr := ws.websocket.Upgrade(w, r, nil)
-	if upgradeErr != nil {
-		log.ZWarn(ctx, "websocket upgrade failed", upgradeErr, "respErr", err, "resp", string(data))
-		return
-	}
-	defer conn.Close()
-	if err := conn.WriteMessage(websocket.TextMessage, data); err != nil {
-		log.ZWarn(ctx, "WriteMessage failed", err, "respErr", err, "resp", string(data))
-		return
-	}
-}
-
 func (ws *WsServer) wsHandler(w http.ResponseWriter, r *http.Request) {
 	// Create a new connection context
 	connContext := newContext(w, r)
@@ -495,7 +456,7 @@ func (ws *WsServer) wsHandler(w http.ResponseWriter, r *http.Request) {
 	// Check if the current number of online user connections exceeds the maximum limit
 	if ws.onlineUserConnNum.Load() >= ws.wsMaxConnNum {
 		// If it exceeds the maximum connection number, return an error via HTTP and stop processing
-		ws.handlerError(connContext, w, r, servererrs.ErrConnOverMaxNumLimit.WrapMsg("over max conn num limit"))
+		httpError(connContext, servererrs.ErrConnOverMaxNumLimit.WrapMsg("over max conn num limit"))
 		return
 	}
 
@@ -503,14 +464,26 @@ func (ws *WsServer) wsHandler(w http.ResponseWriter, r *http.Request) {
 	err := connContext.ParseEssentialArgs()
 	if err != nil {
 		// If there's an error during parsing, return an error via HTTP and stop processing
-		ws.handlerError(connContext, w, r, err)
+
+		httpError(connContext, err)
 		return
 	}
 
 	// Call the authentication client to parse the Token obtained from the context
 	resp, err := ws.authClient.ParseToken(connContext, connContext.GetToken())
 	if err != nil {
-		ws.handlerError(connContext, w, r, err)
+		// If there's an error parsing the Token, decide whether to send the error message via WebSocket based on the context flag
+		shouldSendError := connContext.ShouldSendResp()
+		if shouldSendError {
+			// Create a WebSocket connection object and attempt to send the error message via WebSocket
+			wsLongConn := newGWebSocket(WebSocket, ws.handshakeTimeout, ws.writeBufferSize)
+			if err := wsLongConn.RespondWithError(err, w, r); err == nil {
+				// If the error message is successfully sent via WebSocket, stop processing
+				return
+			}
+		}
+		// If sending via WebSocket is not required or fails, return the error via HTTP and stop processing
+		httpError(connContext, err)
 		return
 	}
 
@@ -518,30 +491,32 @@ func (ws *WsServer) wsHandler(w http.ResponseWriter, r *http.Request) {
 	err = ws.validateRespWithRequest(connContext, resp)
 	if err != nil {
 		// If validation fails, return an error via HTTP and stop processing
-		ws.handlerError(connContext, w, r, err)
+		httpError(connContext, err)
 		return
 	}
-	conn, err := ws.websocket.Upgrade(w, r, nil)
-	if err != nil {
-		log.ZWarn(connContext, "websocket upgrade failed", err)
-		return
-	}
-	if connContext.ShouldSendResp() {
-		if err := conn.WriteMessage(websocket.TextMessage, wsSuccessResponse); err != nil {
-			log.ZWarn(connContext, "WriteMessage first response", err)
-			return
-		}
-	}
 
 	log.ZDebug(connContext, "new conn", "token", connContext.GetToken())
-
-	var pingInterval time.Duration
-	if connContext.GetPlatformID() == constant.WebPlatformID {
-		pingInterval = pingPeriod
+	// Create a WebSocket long connection object
+	wsLongConn := newGWebSocket(WebSocket, ws.handshakeTimeout, ws.writeBufferSize)
+	if err := wsLongConn.GenerateLongConn(w, r); err != nil {
+		//If the creation of the long connection fails, the error is handled internally during the handshake process.
+		log.ZWarn(connContext, "long connection fails", err)
+		return
+	} else {
+		// Check if a normal response should be sent via WebSocket
+		shouldSendSuccessResp := connContext.ShouldSendResp()
+		if shouldSendSuccessResp {
+			// Attempt to send a success message through WebSocket
+			if err := wsLongConn.RespondWithSuccess(); err != nil {
+				// If the success message is successfully sent, end further processing
+				return
+			}
+		}
 	}
 
-	client := new(Client)
-	client.ResetClient(connContext, NewWebSocketClientConn(conn, maxMessageSize, pongWait, pingInterval), ws)
+	// Retrieve a client object from the client pool, reset its state, and associate it with the current WebSocket long connection
+	client := ws.clientPool.Get().(*Client)
+	client.ResetClient(connContext, wsLongConn, ws)
 
 	// Register the client with the server and start message processing
 	ws.registerChan <- client

internal/msgtransfer/callback.go

@@ -51,24 +51,37 @@ func GetContent(msg *sdkws.MsgData) string {
 	}
 }
 
-func (mc *OnlineHistoryMongoConsumerHandler) webhookAfterMsgSaveDB(ctx context.Context, after *config.AfterConfig, msg *sdkws.MsgData) {
+func (mc *OnlineHistoryMongoConsumerHandler) webhookAfterSendSingleMsg(ctx context.Context, after *config.AfterConfig, msg *sdkws.MsgData) {
+	if msg.ContentType == constant.Typing {
+		return
+	}
+
 	if !filterAfterMsg(msg, after) {
 		return
 	}
 
-	cbReq := &cbapi.CallbackAfterMsgSaveDBReq{
-		CommonCallbackReq: toCommonCallback(ctx, msg, cbapi.CallbackAfterMsgSaveDBCommand),
+	cbReq := &cbapi.CallbackAfterSendSingleMsgReq{
+		CommonCallbackReq: toCommonCallback(ctx, msg, cbapi.CallbackAfterSendSingleMsgCommand),
+		RecvID:            msg.RecvID,
+	}
+	mc.webhookClient.AsyncPostWithQuery(ctx, cbReq.GetCallbackCommand(), cbReq, &cbapi.CallbackAfterSendSingleMsgResp{}, after, buildKeyMsgDataQuery(msg))
+}
+
+func (mc *OnlineHistoryMongoConsumerHandler) webhookAfterSendGroupMsg(ctx context.Context, after *config.AfterConfig, msg *sdkws.MsgData) {
+	if msg.ContentType == constant.Typing {
+		return
 	}
 
-	switch msg.SessionType {
-	case constant.SingleChatType, constant.NotificationChatType:
-		cbReq.RecvID = msg.RecvID
-	case constant.ReadGroupChatType:
-		cbReq.GroupID = msg.GroupID
-	default:
+	if !filterAfterMsg(msg, after) {
+		return
 	}
 
-	mc.webhookClient.AsyncPostWithQuery(ctx, cbReq.GetCallbackCommand(), cbReq, &cbapi.CallbackAfterMsgSaveDBResp{}, after, buildKeyMsgDataQuery(msg))
+	cbReq := &cbapi.CallbackAfterSendGroupMsgReq{
+		CommonCallbackReq: toCommonCallback(ctx, msg, cbapi.CallbackAfterSendGroupMsgCommand),
+		GroupID:           msg.GroupID,
+	}
+
+	mc.webhookClient.AsyncPostWithQuery(ctx, cbReq.GetCallbackCommand(), cbReq, &cbapi.CallbackAfterSendGroupMsgResp{}, after, buildKeyMsgDataQuery(msg))
 }
 
 func buildKeyMsgDataQuery(msg *sdkws.MsgData) map[string]string {

internal/msgtransfer/online_history_msg_handler.go

@@ -18,7 +18,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-
 	"github.com/openimsdk/tools/mq"
 
 	"sync"

internal/msgtransfer/online_msg_to_mongo_handler.go

@@ -15,6 +15,7 @@
 package msgtransfer
 
 import (
+	"github.com/openimsdk/protocol/constant"
 	"github.com/openimsdk/tools/mq"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/prommetrics"
@@ -56,7 +57,7 @@ func (mc *OnlineHistoryMongoConsumerHandler) HandleChatWs2Mongo(val mq.Message)
 	log.ZDebug(ctx, "mongo consumer recv msg", "msgs", msgFromMQ.String())
 	err = mc.msgTransferDatabase.BatchInsertChat2DB(ctx, msgFromMQ.ConversationID, msgFromMQ.MsgData, msgFromMQ.LastSeq)
 	if err != nil {
-		log.ZError(ctx, "batch data insert to mongo err", err, "msg", msgFromMQ.MsgData, "conversationID", msgFromMQ.ConversationID)
+		log.ZError(ctx, "single data insert to mongo err", err, "msg", msgFromMQ.MsgData, "conversationID", msgFromMQ.ConversationID)
 		prommetrics.MsgInsertMongoFailedCounter.Inc()
 	} else {
 		prommetrics.MsgInsertMongoSuccessCounter.Inc()
@@ -64,7 +65,12 @@ func (mc *OnlineHistoryMongoConsumerHandler) HandleChatWs2Mongo(val mq.Message)
 	}
 
 	for _, msgData := range msgFromMQ.MsgData {
-		mc.webhookAfterMsgSaveDB(ctx, &mc.config.WebhooksConfig.AfterMsgSaveDB, msgData)
+		switch msgData.SessionType {
+		case constant.SingleChatType:
+			mc.webhookAfterSendSingleMsg(ctx, &mc.config.WebhooksConfig.AfterSendSingleMsg, msgData)
+		case constant.ReadGroupChatType:
+			mc.webhookAfterSendGroupMsg(ctx, &mc.config.WebhooksConfig.AfterSendGroupMsg, msgData)
+		}
 	}
 
 	//var seqs []int64

internal/rpc/conversation/conversation.go

@@ -37,7 +37,6 @@ import (
 	"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
 	"github.com/openimsdk/protocol/constant"
 	pbconversation "github.com/openimsdk/protocol/conversation"
-	"github.com/openimsdk/protocol/msg"
 	"github.com/openimsdk/protocol/sdkws"
 	"github.com/openimsdk/tools/discovery"
 	"github.com/openimsdk/tools/errs"
@@ -513,6 +512,14 @@ func (c *conversationServer) GetUserConversationIDsHash(ctx context.Context, req
 	return &pbconversation.GetUserConversationIDsHashResp{Hash: hash}, nil
 }
 
+func (c *conversationServer) GetConversationsByConversationID(ctx context.Context, req *pbconversation.GetConversationsByConversationIDReq) (*pbconversation.GetConversationsByConversationIDResp, error) {
+	conversations, err := c.conversationDatabase.GetConversationsByConversationID(ctx, req.ConversationIDs)
+	if err != nil {
+		return nil, err
+	}
+	return &pbconversation.GetConversationsByConversationIDResp{Conversations: convert.ConversationsDB2Pb(conversations)}, nil
+}
+
 func (c *conversationServer) GetConversationOfflinePushUserIDs(ctx context.Context, req *pbconversation.GetConversationOfflinePushUserIDsReq) (*pbconversation.GetConversationOfflinePushUserIDsResp, error) {
 	if req.ConversationID == "" {
 		return nil, errs.ErrArgs.WrapMsg("conversationID is empty")
@@ -709,6 +716,56 @@ func (c *conversationServer) GetOwnerConversation(ctx context.Context, req *pbco
 	}, nil
 }
 
+func (c *conversationServer) GetConversationsNeedClearMsg(ctx context.Context, _ *pbconversation.GetConversationsNeedClearMsgReq) (*pbconversation.GetConversationsNeedClearMsgResp, error) {
+	num, err := c.conversationDatabase.GetAllConversationIDsNumber(ctx)
+	if err != nil {
+		log.ZError(ctx, "GetAllConversationIDsNumber failed", err)
+		return nil, err
+	}
+	const batchNum = 100
+
+	if num == 0 {
+		return nil, errs.New("Need Destruct Msg is nil").Wrap()
+	}
+
+	maxPage := (num + batchNum - 1) / batchNum
+
+	temp := make([]*dbModel.Conversation, 0, maxPage*batchNum)
+
+	for pageNumber := 0; pageNumber < int(maxPage); pageNumber++ {
+		pagination := &sdkws.RequestPagination{
+			PageNumber: int32(pageNumber),
+			ShowNumber: batchNum,
+		}
+
+		conversationIDs, err := c.conversationDatabase.PageConversationIDs(ctx, pagination)
+		if err != nil {
+			log.ZError(ctx, "PageConversationIDs failed", err, "pageNumber", pageNumber)
+			continue
+		}
+
+		// log.ZDebug(ctx, "PageConversationIDs success", "pageNumber", pageNumber, "conversationIDsNum", len(conversationIDs), "conversationIDs", conversationIDs)
+		if len(conversationIDs) == 0 {
+			continue
+		}
+
+		conversations, err := c.conversationDatabase.GetConversationsByConversationID(ctx, conversationIDs)
+		if err != nil {
+			log.ZError(ctx, "GetConversationsByConversationID failed", err, "conversationIDs", conversationIDs)
+			continue
+		}
+
+		for _, conversation := range conversations {
+			if conversation.IsMsgDestruct && conversation.MsgDestructTime != 0 && ((time.Now().UnixMilli() > (conversation.MsgDestructTime + conversation.LatestMsgDestructTime.UnixMilli() + 8*60*60)) || // 8*60*60 is UTC+8
+				conversation.LatestMsgDestructTime.IsZero()) {
+				temp = append(temp, conversation)
+			}
+		}
+	}
+
+	return &pbconversation.GetConversationsNeedClearMsgResp{Conversations: convert.ConversationsDB2Pb(temp)}, nil
+}
+
 func (c *conversationServer) GetNotNotifyConversationIDs(ctx context.Context, req *pbconversation.GetNotNotifyConversationIDsReq) (*pbconversation.GetNotNotifyConversationIDsResp, error) {
 	if err := authverify.CheckAccess(ctx, req.UserID); err != nil {
 		return nil, err
@@ -738,7 +795,7 @@ func (c *conversationServer) ClearUserConversationMsg(ctx context.Context, req *
 	}
 	latestMsgDestructTime := time.UnixMilli(req.Timestamp)
 	for i, conversation := range conversations {
-		if !conversation.IsMsgDestruct || conversation.MsgDestructTime == 0 {
+		if conversation.IsMsgDestruct == false || conversation.MsgDestructTime == 0 {
 			continue
 		}
 		seq, err := c.msgClient.GetLastMessageSeqByTime(ctx, conversation.ConversationID, req.Timestamp-(conversation.MsgDestructTime*1000))
@@ -778,53 +835,3 @@ func (c *conversationServer) setConversationMinSeqAndLatestMsgDestructTime(ctx c
 	c.conversationNotificationSender.ConversationChangeNotification(ctx, ownerUserID, []string{conversationID})
 	return nil
 }
-
-func (c *conversationServer) DeleteConversations(ctx context.Context, req *pbconversation.DeleteConversationsReq) (resp *pbconversation.DeleteConversationsResp, err error) {
-	if err := authverify.CheckAccess(ctx, req.OwnerUserID); err != nil {
-		return nil, err
-	}
-	if req.NeedDeleteTime == 0 && len(req.ConversationIDs) == 0 {
-		return nil, errs.ErrArgs.WrapMsg("need_delete_time or conversationIDs need be set")
-	}
-
-	if req.NeedDeleteTime != 0 && len(req.ConversationIDs) != 0 {
-		return nil, errs.ErrArgs.WrapMsg("need_delete_time and conversationIDs cannot both be set")
-	}
-
-	var needDeleteConversationIDs []string
-
-	if len(req.ConversationIDs) == 0 {
-		deleteTimeThreshold := time.Now().AddDate(0, 0, -int(req.NeedDeleteTime)).UnixMilli()
-		conversationIDs, err := c.conversationDatabase.GetConversationIDs(ctx, req.OwnerUserID)
-		if err != nil {
-			return nil, err
-		}
-		latestMsgs, err := c.msgClient.GetLastMessage(ctx, &msg.GetLastMessageReq{
-			UserID:          req.OwnerUserID,
-			ConversationIDs: conversationIDs,
-		})
-		if err != nil {
-			return nil, err
-		}
-
-		for conversationID, msg := range latestMsgs.Msgs {
-			if msg.SendTime < deleteTimeThreshold {
-				needDeleteConversationIDs = append(needDeleteConversationIDs, conversationID)
-			}
-		}
-
-		if len(needDeleteConversationIDs) == 0 {
-			return &pbconversation.DeleteConversationsResp{}, nil
-		}
-	} else {
-		needDeleteConversationIDs = req.ConversationIDs
-	}
-
-	if err := c.conversationDatabase.DeleteUsersConversations(ctx, req.OwnerUserID, needDeleteConversationIDs); err != nil {
-		return nil, err
-	}
-
-	// c.conversationNotificationSender.ConversationDeleteNotification(ctx, req.OwnerUserID, needDeleteConversationIDs)
-
-	return &pbconversation.DeleteConversationsResp{}, nil
-}

internal/rpc/conversation/notification.go

@@ -73,12 +73,3 @@ func (c *ConversationNotificationSender) ConversationUnreadChangeNotification(
 
 	c.Notification(ctx, userID, userID, constant.ConversationUnreadNotification, tips)
 }
-
-func (c *ConversationNotificationSender) ConversationDeleteNotification(ctx context.Context, userID string, conversationIDs []string) {
-	tips := &sdkws.ConversationDeleteTips{
-		UserID:          userID,
-		ConversationIDs: conversationIDs,
-	}
-
-	c.Notification(ctx, userID, userID, constant.ConversationDeleteNotification, tips)
-}

internal/rpc/conversation/sync.go

@@ -27,7 +27,7 @@ func (c *conversationServer) GetFullOwnerConversationIDs(ctx context.Context, re
 		conversationIDs = nil
 	}
 	return &conversation.GetFullOwnerConversationIDsResp{
-		Version:         uint64(vl.Version),
+		Version:         idHash,
 		VersionID:       vl.ID.Hex(),
 		Equal:           req.IdHash == idHash,
 		ConversationIDs: conversationIDs,

internal/rpc/group/group.go

@@ -472,9 +472,6 @@ func (g *groupServer) InviteUserToGroup(ctx context.Context, req *pbgroup.Invite
 			g.notification.GroupApplicationAgreeMemberEnterNotification(ctx, req.GroupID, req.SendMessage, opUserID, userIDs...)
 		}
 	}
-	if err := g.setMemberJoinSeq(ctx, req.GroupID, req.InvitedUserIDs); err != nil {
-		return nil, err
-	}
 	return &pbgroup.InviteUserToGroupResp{}, nil
 }
 
@@ -605,6 +602,10 @@ func (g *groupServer) KickGroupMember(ctx context.Context, req *pbgroup.KickGrou
 			}
 		}
 	}
+	num, err := g.db.FindGroupMemberNum(ctx, req.GroupID)
+	if err != nil {
+		return nil, err
+	}
 	ownerUserIDs, err := g.db.GetGroupRoleLevelMemberIDs(ctx, req.GroupID, constant.GroupOwner)
 	if err != nil {
 		return nil, err
@@ -616,10 +617,6 @@ func (g *groupServer) KickGroupMember(ctx context.Context, req *pbgroup.KickGrou
 	if err := g.db.DeleteGroupMember(ctx, group.GroupID, req.KickedUserIDs); err != nil {
 		return nil, err
 	}
-	num, err := g.db.FindGroupMemberNum(ctx, req.GroupID)
-	if err != nil {
-		return nil, err
-	}
 	tips := &sdkws.MemberKickedTips{
 		Group: &sdkws.GroupInfo{
 			GroupID:                group.GroupID,
@@ -629,7 +626,7 @@ func (g *groupServer) KickGroupMember(ctx context.Context, req *pbgroup.KickGrou
 			FaceURL:                group.FaceURL,
 			OwnerUserID:            ownerUserID,
 			CreateTime:             group.CreateTime.UnixMilli(),
-			MemberCount:            num,
+			MemberCount:            num - uint32(len(req.KickedUserIDs)),
 			Ex:                     group.Ex,
 			Status:                 group.Status,
 			CreatorUserID:          group.CreatorUserID,
@@ -908,9 +905,6 @@ func (g *groupServer) GroupApplicationResponse(ctx context.Context, req *pbgroup
 					return nil, err
 				}
 			}
-			if err := g.setMemberJoinSeq(ctx, req.GroupID, []string{req.FromUserID}); err != nil {
-				return nil, err
-			}
 		}
 	case constant.GroupResponseRefuse:
 		g.notification.GroupApplicationRejectedNotification(ctx, req)
@@ -973,9 +967,6 @@ func (g *groupServer) JoinGroup(ctx context.Context, req *pbgroup.JoinGroupReq)
 		if err = g.notification.MemberEnterNotification(ctx, req.GroupID, req.InviterUserID); err != nil {
 			return nil, err
 		}
-		if err := g.setMemberJoinSeq(ctx, req.GroupID, []string{req.InviterUserID}); err != nil {
-			return nil, err
-		}
 		g.webhookAfterJoinGroup(ctx, &g.config.WebhooksConfig.AfterJoinGroup, req)
 
 		return &pbgroup.JoinGroupResp{}, nil
@@ -1037,11 +1028,6 @@ func (g *groupServer) deleteMemberAndSetConversationSeq(ctx context.Context, gro
 	return g.conversationClient.SetConversationMaxSeq(ctx, conversationID, userIDs, maxSeq)
 }
 
-func (g *groupServer) setMemberJoinSeq(ctx context.Context, groupID string, userIDs []string) error {
-	conversationID := msgprocessor.GetConversationIDBySessionType(constant.ReadGroupChatType, groupID)
-	return g.conversationClient.SetConversationMaxSeq(ctx, conversationID, userIDs, 0)
-}
-
 func (g *groupServer) SetGroupInfo(ctx context.Context, req *pbgroup.SetGroupInfoReq) (*pbgroup.SetGroupInfoResp, error) {
 	var opMember *model.GroupMember
 	if !authverify.IsAdmin(ctx) {

internal/rpc/group/sync.go

@@ -34,7 +34,7 @@ func (g *groupServer) GetFullGroupMemberUserIDs(ctx context.Context, req *pbgrou
 		userIDs = nil
 	}
 	return &pbgroup.GetFullGroupMemberUserIDsResp{
-		Version:   uint64(vl.Version),
+		Version:   idHash,
 		VersionID: vl.ID.Hex(),
 		Equal:     req.IdHash == idHash,
 		UserIDs:   userIDs,
@@ -58,7 +58,7 @@ func (g *groupServer) GetFullJoinGroupIDs(ctx context.Context, req *pbgroup.GetF
 		groupIDs = nil
 	}
 	return &pbgroup.GetFullJoinGroupIDsResp{
-		Version:   uint64(vl.Version),
+		Version:   idHash,
 		VersionID: vl.ID.Hex(),
 		Equal:     req.IdHash == idHash,
 		GroupIDs:  groupIDs,

internal/rpc/msg/callback.go

@@ -16,10 +16,8 @@ package msg
 
 import (
 	"context"
-	"encoding/base64"
 	"encoding/json"
 
-	"github.com/openimsdk/open-im-server/v3/pkg/apistruct"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/webhook"
 	"github.com/openimsdk/tools/errs"
 
@@ -30,7 +28,6 @@ import (
 	"github.com/openimsdk/protocol/sdkws"
 	"github.com/openimsdk/tools/mcontext"
 	"github.com/openimsdk/tools/utils/datautil"
-	"github.com/openimsdk/tools/utils/stringutil"
 	"google.golang.org/protobuf/proto"
 )
 
@@ -90,19 +87,19 @@ func (m *msgServer) webhookBeforeSendSingleMsg(ctx context.Context, before *conf
 }
 
 // Move to msgtransfer
-func (m *msgServer) webhookAfterSendSingleMsg(ctx context.Context, after *config.AfterConfig, msg *pbchat.SendMsgReq) {
-	if msg.MsgData.ContentType == constant.Typing {
-		return
-	}
-	if !filterAfterMsg(msg, after) {
-		return
-	}
-	cbReq := &cbapi.CallbackAfterSendSingleMsgReq{
-		CommonCallbackReq: toCommonCallback(ctx, msg, cbapi.CallbackAfterSendSingleMsgCommand),
-		RecvID:            msg.MsgData.RecvID,
-	}
-	m.webhookClient.AsyncPostWithQuery(ctx, cbReq.GetCallbackCommand(), cbReq, &cbapi.CallbackAfterSendSingleMsgResp{}, after, buildKeyMsgDataQuery(msg.MsgData))
-}
+// func (m *msgServer) webhookAfterSendSingleMsg(ctx context.Context, after *config.AfterConfig, msg *pbchat.SendMsgReq) {
+// 	if msg.MsgData.ContentType == constant.Typing {
+// 		return
+// 	}
+// 	if !filterAfterMsg(msg, after) {
+// 		return
+// 	}
+// 	cbReq := &cbapi.CallbackAfterSendSingleMsgReq{
+// 		CommonCallbackReq: toCommonCallback(ctx, msg, cbapi.CallbackAfterSendSingleMsgCommand),
+// 		RecvID:            msg.MsgData.RecvID,
+// 	}
+// 	m.webhookClient.AsyncPostWithQuery(ctx, cbReq.GetCallbackCommand(), cbReq, &cbapi.CallbackAfterSendSingleMsgResp{}, after, buildKeyMsgDataQuery(msg.MsgData))
+// }
 
 func (m *msgServer) webhookBeforeSendGroupMsg(ctx context.Context, before *config.BeforeConfig, msg *pbchat.SendMsgReq) error {
 	return webhook.WithCondition(ctx, before, func(ctx context.Context) error {
@@ -124,20 +121,21 @@ func (m *msgServer) webhookBeforeSendGroupMsg(ctx context.Context, before *confi
 	})
 }
 
-func (m *msgServer) webhookAfterSendGroupMsg(ctx context.Context, after *config.AfterConfig, msg *pbchat.SendMsgReq) {
-	if msg.MsgData.ContentType == constant.Typing {
-		return
-	}
-	if !filterAfterMsg(msg, after) {
-		return
-	}
-	cbReq := &cbapi.CallbackAfterSendGroupMsgReq{
-		CommonCallbackReq: toCommonCallback(ctx, msg, cbapi.CallbackAfterSendGroupMsgCommand),
-		GroupID:           msg.MsgData.GroupID,
-	}
+// Move to msgtransfer
+// func (m *msgServer) webhookAfterSendGroupMsg(ctx context.Context, after *config.AfterConfig, msg *pbchat.SendMsgReq) {
+// 	if msg.MsgData.ContentType == constant.Typing {
+// 		return
+// 	}
+// 	if !filterAfterMsg(msg, after) {
+// 		return
+// 	}
+// 	cbReq := &cbapi.CallbackAfterSendGroupMsgReq{
+// 		CommonCallbackReq: toCommonCallback(ctx, msg, cbapi.CallbackAfterSendGroupMsgCommand),
+// 		GroupID:           msg.MsgData.GroupID,
+// 	}
 
-	m.webhookClient.AsyncPostWithQuery(ctx, cbReq.GetCallbackCommand(), cbReq, &cbapi.CallbackAfterSendGroupMsgResp{}, after, buildKeyMsgDataQuery(msg.MsgData))
-}
+// 	m.webhookClient.AsyncPostWithQuery(ctx, cbReq.GetCallbackCommand(), cbReq, &cbapi.CallbackAfterSendGroupMsgResp{}, after, buildKeyMsgDataQuery(msg.MsgData))
+// }
 
 func (m *msgServer) webhookBeforeMsgModify(ctx context.Context, before *config.BeforeConfig, msg *pbchat.SendMsgReq, beforeMsgData **sdkws.MsgData) error {
 	return webhook.WithCondition(ctx, before, func(ctx context.Context) error {
@@ -206,14 +204,14 @@ func (m *msgServer) webhookAfterRevokeMsg(ctx context.Context, after *config.Aft
 	m.webhookClient.AsyncPost(ctx, callbackReq.GetCallbackCommand(), callbackReq, &cbapi.CallbackAfterRevokeMsgResp{}, after)
 }
 
-func buildKeyMsgDataQuery(msg *sdkws.MsgData) map[string]string {
-	keyMsgData := apistruct.KeyMsgData{
-		SendID:  msg.SendID,
-		RecvID:  msg.RecvID,
-		GroupID: msg.GroupID,
-	}
+// func buildKeyMsgDataQuery(msg *sdkws.MsgData) map[string]string {
+// 	keyMsgData := apistruct.KeyMsgData{
+// 		SendID:  msg.SendID,
+// 		RecvID:  msg.RecvID,
+// 		GroupID: msg.GroupID,
+// 	}
 
-	return map[string]string{
-		webhook.Key: base64.StdEncoding.EncodeToString(stringutil.StructToJsonBytes(keyMsgData)),
-	}
-}
+// 	return map[string]string{
+// 		webhook.Key: base64.StdEncoding.EncodeToString(stringutil.StructToJsonBytes(keyMsgData)),
+// 	}
+// }

internal/rpc/msg/delete.go

@@ -19,6 +19,7 @@ import (
 
 	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
 	"github.com/openimsdk/protocol/constant"
+	"github.com/openimsdk/protocol/conversation"
 	"github.com/openimsdk/protocol/msg"
 	"github.com/openimsdk/protocol/sdkws"
 	"github.com/openimsdk/tools/log"
@@ -73,7 +74,7 @@ func (m *msgServer) DeleteMsgs(ctx context.Context, req *msg.DeleteMsgsReq) (*ms
 		if err := m.MsgDatabase.DeleteMsgsPhysicalBySeqs(ctx, req.ConversationID, req.Seqs); err != nil {
 			return nil, err
 		}
-		conv, err := m.conversationClient.GetConversation(ctx, req.ConversationID, req.UserID)
+		conv, err := m.conversationClient.GetConversationsByConversationID(ctx, req.ConversationID)
 		if err != nil {
 			return nil, err
 		}
@@ -115,12 +116,14 @@ func (m *msgServer) DeleteMsgPhysical(ctx context.Context, req *msg.DeleteMsgPhy
 }
 
 func (m *msgServer) clearConversation(ctx context.Context, conversationIDs []string, userID string, deleteSyncOpt *msg.DeleteSyncOpt) error {
-	conversations, err := m.conversationClient.GetConversations(ctx, conversationIDs, userID)
+	conversations, err := m.conversationClient.GetConversationsByConversationIDs(ctx, conversationIDs)
 	if err != nil {
 		return err
 	}
+	var existConversations []*conversation.Conversation
 	var existConversationIDs []string
 	for _, conversation := range conversations {
+		existConversations = append(existConversations, conversation)
 		existConversationIDs = append(existConversationIDs, conversation.ConversationID)
 	}
 	log.ZDebug(ctx, "ClearConversationsMsg", "existConversationIDs", existConversationIDs)
@@ -149,7 +152,7 @@ func (m *msgServer) clearConversation(ctx context.Context, conversationIDs []str
 		if err := m.MsgDatabase.SetMinSeqs(ctx, m.getMinSeqs(maxSeqs)); err != nil {
 			return err
 		}
-		for _, conversation := range conversations {
+		for _, conversation := range existConversations {
 			tips := &sdkws.ClearConversationTips{UserID: userID, ConversationIDs: []string{conversation.ConversationID}}
 			m.notificationSender.NotificationWithSessionType(ctx, userID, m.conversationAndGetRecvID(conversation, userID), constant.ClearConversationNotification, conversation.ConversationType, tips)
 		}

internal/rpc/msg/send.go

@@ -86,7 +86,7 @@ func (m *msgServer) sendMsgGroupChat(ctx context.Context, req *pbmsg.SendMsgReq,
 		go m.setConversationAtInfo(ctx, req.MsgData)
 	}
 
-	m.webhookAfterSendGroupMsg(ctx, &m.config.WebhooksConfig.AfterSendGroupMsg, req)
+	// m.webhookAfterSendGroupMsg(ctx, &m.config.WebhooksConfig.AfterSendGroupMsg, req)
 
 	prommetrics.GroupChatMsgProcessSuccessCounter.Inc()
 	resp = &pbmsg.SendMsgResp{}
@@ -194,7 +194,7 @@ func (m *msgServer) sendMsgSingleChat(ctx context.Context, req *pbmsg.SendMsgReq
 			return nil, err
 		}
 
-		m.webhookAfterSendSingleMsg(ctx, &m.config.WebhooksConfig.AfterSendSingleMsg, req)
+		// m.webhookAfterSendSingleMsg(ctx, &m.config.WebhooksConfig.AfterSendSingleMsg, req)
 		prommetrics.SingleChatMsgProcessSuccessCounter.Inc()
 		return &pbmsg.SendMsgResp{
 			ServerMsgID: req.MsgData.ServerMsgID,

internal/rpc/relation/sync.go

@@ -56,7 +56,7 @@ func (s *friendServer) GetFullFriendUserIDs(ctx context.Context, req *relation.G
 		userIDs = nil
 	}
 	return &relation.GetFullFriendUserIDsResp{
-		Version:   uint64(vl.Version),
+		Version:   idHash,
 		VersionID: vl.ID.Hex(),
 		Equal:     req.IdHash == idHash,
 		UserIDs:   userIDs,

magefile.go

@@ -5,12 +5,9 @@ package main
 
 import (
 	"flag"
-	"fmt"
 	"os"
 
 	"github.com/openimsdk/gomake/mageutil"
-	"github.com/openimsdk/open-im-server/v3/version"
-	"github.com/openimsdk/tools/utils/datautil"
 )
 
 var Default = Build
@@ -28,6 +25,7 @@ var (
 	customToolsDir  = "tools"   // tools source code directory, default is "tools"
 )
 
+
 // Build support specifical binary build.
 //
 // Example: `mage build openim-api openim-rpc-user seq`
@@ -37,7 +35,8 @@ func Build() {
 	if len(bin) != 0 {
 		bin = bin[1:]
 	}
-	mageutil.WithSpinner("Building binaries...", func() { mageutil.Build(bin, nil, nil) })
+
+	mageutil.Build(bin, nil)
 }
 
 func BuildWithCustomConfig() {
@@ -54,9 +53,7 @@ func BuildWithCustomConfig() {
 		ToolsDir:  &customToolsDir,
 	}
 
-	mageutil.WithSpinner("Building binaries with custom config...", func() {
-		mageutil.Build(bin, config, nil)
-	})
+	mageutil.Build(bin, config)
 }
 
 func Start() {
@@ -73,9 +70,7 @@ func Start() {
 		bin = bin[1:]
 	}
 
-	mageutil.WithSpinner("Starting...", func() {
-		mageutil.StartToolsAndServices(bin, nil)
-	})
+	mageutil.StartToolsAndServices(bin, nil)
 }
 
 func StartWithCustomConfig() {
@@ -98,42 +93,13 @@ func StartWithCustomConfig() {
 		ConfigDir: &customConfigDir,
 	}
 
-	mageutil.WithSpinner("Starting with custom config...", func() {
-		mageutil.StartToolsAndServices(bin, config)
-	})
+	mageutil.StartToolsAndServices(bin, config)
 }
 
 func Stop() {
-	mageutil.WithSpinner("Stopping...", mageutil.StopAndCheckBinaries)
+	mageutil.StopAndCheckBinaries()
 }
 
 func Check() {
-	mageutil.WithSpinner("Checking binaries...", mageutil.CheckAndReportBinariesStatus)
-}
-
-func Export() {
-	mappingPaths, err := mageutil.GetDefaultExportMappingPaths([]string{
-		"cmd",
-		"internal",
-		"pkg",
-		"test",
-		"tools",
-		"**/*.go",
-		"go.mod",
-		"go.work",
-	})
-	if err != nil {
-		mageutil.PrintRed("GetDefaultExportMappingPaths failed " + err.Error())
-		os.Exit(1)
-	}
-
-	mageutil.WithSpinner("Exporting...", func() {
-		mageutil.ExportMageLauncherArchived(mappingPaths, &mageutil.ExportOptions{
-			ProjectName: datautil.ToPtr(fmt.Sprintf("open-im-server_%s", version.Version)),
-			BuildOpt: &mageutil.BuildOptions{
-				Release:  datautil.ToPtr(true),
-				Compress: datautil.ToPtr(true),
-			},
-		})
-	})
+	mageutil.CheckAndReportBinariesStatus()
 }

pkg/callbackstruct/constant.go

@@ -66,5 +66,4 @@ const (
 	CallbackAfterCreateSingleChatConversationsCommand  = "callbackAfterCreateSingleChatConversationsCommand"
 	CallbackBeforeCreateGroupChatConversationsCommand  = "callbackBeforeCreateGroupChatConversationsCommand"
 	CallbackAfterCreateGroupChatConversationsCommand   = "callbackAfterCreateGroupChatConversationsCommand"
-	CallbackAfterMsgSaveDBCommand                      = "callbackAfterMsgSaveDBCommand"
 )

pkg/callbackstruct/conversation.go

@@ -2,42 +2,42 @@ package callbackstruct
 
 type CallbackBeforeCreateSingleChatConversationsReq struct {
 	CallbackCommand  `json:"callbackCommand"`
-	OwnerUserID      string `json:"ownerUserId"`
-	ConversationID   string `json:"conversationId"`
-	ConversationType int32  `json:"conversationType"`
-	UserID           string `json:"userId"`
-	RecvMsgOpt       int32  `json:"recvMsgOpt"`
-	IsPinned         bool   `json:"isPinned"`
-	IsPrivateChat    bool   `json:"isPrivateChat"`
-	BurnDuration     int32  `json:"burnDuration"`
-	GroupAtType      int32  `json:"groupAtType"`
-	AttachedInfo     string `json:"attachedInfo"`
+	OwnerUserID      string `json:"owner_user_id"`
+	ConversationID   string `json:"conversation_id"`
+	ConversationType int32  `json:"conversation_type"`
+	UserID           string `json:"user_id"`
+	RecvMsgOpt       int32  `json:"recv_msg_opt"`
+	IsPinned         bool   `json:"is_pinned"`
+	IsPrivateChat    bool   `json:"is_private_chat"`
+	BurnDuration     int32  `json:"burn_duration"`
+	GroupAtType      int32  `json:"group_at_type"`
+	AttachedInfo     string `json:"attached_info"`
 	Ex               string `json:"ex"`
 }
 
 type CallbackBeforeCreateSingleChatConversationsResp struct {
 	CommonCallbackResp
-	RecvMsgOpt    *int32  `json:"recvMsgOpt"`
-	IsPinned      *bool   `json:"isPinned"`
-	IsPrivateChat *bool   `json:"isPrivateChat"`
-	BurnDuration  *int32  `json:"burnDuration"`
-	GroupAtType   *int32  `json:"groupAtType"`
-	AttachedInfo  *string `json:"attachedInfo"`
+	RecvMsgOpt    *int32  `json:"recv_msg_opt"`
+	IsPinned      *bool   `json:"is_pinned"`
+	IsPrivateChat *bool   `json:"is_private_chat"`
+	BurnDuration  *int32  `json:"burn_duration"`
+	GroupAtType   *int32  `json:"group_at_type"`
+	AttachedInfo  *string `json:"attached_info"`
 	Ex            *string `json:"ex"`
 }
 
 type CallbackAfterCreateSingleChatConversationsReq struct {
 	CallbackCommand  `json:"callbackCommand"`
-	OwnerUserID      string `json:"ownerUserId"`
-	ConversationID   string `json:"conversationId"`
-	ConversationType int32  `json:"conversationType"`
-	UserID           string `json:"userId"`
-	RecvMsgOpt       int32  `json:"recvMsgOpt"`
-	IsPinned         bool   `json:"isPinned"`
-	IsPrivateChat    bool   `json:"isPrivateChat"`
-	BurnDuration     int32  `json:"burnDuration"`
-	GroupAtType      int32  `json:"groupAtType"`
-	AttachedInfo     string `json:"attachedInfo"`
+	OwnerUserID      string `json:"owner_user_id"`
+	ConversationID   string `json:"conversation_id"`
+	ConversationType int32  `json:"conversation_type"`
+	UserID           string `json:"user_id"`
+	RecvMsgOpt       int32  `json:"recv_msg_opt"`
+	IsPinned         bool   `json:"is_pinned"`
+	IsPrivateChat    bool   `json:"is_private_chat"`
+	BurnDuration     int32  `json:"burn_duration"`
+	GroupAtType      int32  `json:"group_at_type"`
+	AttachedInfo     string `json:"attached_info"`
 	Ex               string `json:"ex"`
 }
 
@@ -47,42 +47,42 @@ type CallbackAfterCreateSingleChatConversationsResp struct {
 
 type CallbackBeforeCreateGroupChatConversationsReq struct {
 	CallbackCommand  `json:"callbackCommand"`
-	OwnerUserID      string `json:"ownerUserId"`
-	ConversationID   string `json:"conversationId"`
-	ConversationType int32  `json:"conversationType"`
-	GroupID          string `json:"groupId"`
-	RecvMsgOpt       int32  `json:"recvMsgOpt"`
-	IsPinned         bool   `json:"isPinned"`
-	IsPrivateChat    bool   `json:"isPrivateChat"`
-	BurnDuration     int32  `json:"burnDuration"`
-	GroupAtType      int32  `json:"groupAtType"`
-	AttachedInfo     string `json:"attachedInfo"`
+	OwnerUserID      string `json:"owner_user_id"`
+	ConversationID   string `json:"conversation_id"`
+	ConversationType int32  `json:"conversation_type"`
+	GroupID          string `json:"group_id"`
+	RecvMsgOpt       int32  `json:"recv_msg_opt"`
+	IsPinned         bool   `json:"is_pinned"`
+	IsPrivateChat    bool   `json:"is_private_chat"`
+	BurnDuration     int32  `json:"burn_duration"`
+	GroupAtType      int32  `json:"group_at_type"`
+	AttachedInfo     string `json:"attached_info"`
 	Ex               string `json:"ex"`
 }
 
 type CallbackBeforeCreateGroupChatConversationsResp struct {
 	CommonCallbackResp
-	RecvMsgOpt    *int32  `json:"recvMsgOpt"`
-	IsPinned      *bool   `json:"isPinned"`
-	IsPrivateChat *bool   `json:"isPrivateChat"`
-	BurnDuration  *int32  `json:"burnDuration"`
-	GroupAtType   *int32  `json:"groupAtType"`
-	AttachedInfo  *string `json:"attachedInfo"`
+	RecvMsgOpt    *int32  `json:"recv_msg_opt"`
+	IsPinned      *bool   `json:"is_pinned"`
+	IsPrivateChat *bool   `json:"is_private_chat"`
+	BurnDuration  *int32  `json:"burn_duration"`
+	GroupAtType   *int32  `json:"group_at_type"`
+	AttachedInfo  *string `json:"attached_info"`
 	Ex            *string `json:"ex"`
 }
 
 type CallbackAfterCreateGroupChatConversationsReq struct {
 	CallbackCommand  `json:"callbackCommand"`
-	OwnerUserID      string `json:"ownerUserId"`
-	ConversationID   string `json:"conversationId"`
-	ConversationType int32  `json:"conversationType"`
-	GroupID          string `json:"groupId"`
-	RecvMsgOpt       int32  `json:"recvMsgOpt"`
-	IsPinned         bool   `json:"isPinned"`
-	IsPrivateChat    bool   `json:"isPrivateChat"`
-	BurnDuration     int32  `json:"burnDuration"`
-	GroupAtType      int32  `json:"groupAtType"`
-	AttachedInfo     string `json:"attachedInfo"`
+	OwnerUserID      string `json:"owner_user_id"`
+	ConversationID   string `json:"conversation_id"`
+	ConversationType int32  `json:"conversation_type"`
+	GroupID          string `json:"group_id"`
+	RecvMsgOpt       int32  `json:"recv_msg_opt"`
+	IsPinned         bool   `json:"is_pinned"`
+	IsPrivateChat    bool   `json:"is_private_chat"`
+	BurnDuration     int32  `json:"burn_duration"`
+	GroupAtType      int32  `json:"group_at_type"`
+	AttachedInfo     string `json:"attached_info"`
 	Ex               string `json:"ex"`
 }
 

pkg/callbackstruct/message.go

@@ -103,13 +103,3 @@ type CallbackSingleMsgReadReq struct {
 type CallbackSingleMsgReadResp struct {
 	CommonCallbackResp
 }
-
-type CallbackAfterMsgSaveDBReq struct {
-	CommonCallbackReq
-	RecvID  string `json:"recvID"`
-	GroupID string `json:"groupID"`
-}
-
-type CallbackAfterMsgSaveDBResp struct {
-	CommonCallbackResp
-}

pkg/common/cmd/api.go

@@ -81,9 +81,6 @@ func (a *ApiCmd) runE() error {
 	}
 	return startrpc.Start(
 		a.ctx, &a.apiConfig.Discovery,
-		nil,
-		nil,
-		// &a.apiConfig.API.RateLimiter,
 		&prometheus,
 		a.apiConfig.API.Api.ListenIP, "",
 		a.apiConfig.API.Prometheus.AutoSetPorts,

pkg/common/cmd/auth.go

@@ -57,7 +57,7 @@ func (a *AuthRpcCmd) Exec() error {
 }
 
 func (a *AuthRpcCmd) runE() error {
-	return startrpc.Start(a.ctx, &a.authConfig.Discovery, &a.authConfig.RpcConfig.CircuitBreaker, &a.authConfig.RpcConfig.RateLimiter, &a.authConfig.RpcConfig.Prometheus, a.authConfig.RpcConfig.RPC.ListenIP,
+	return startrpc.Start(a.ctx, &a.authConfig.Discovery, &a.authConfig.RpcConfig.Prometheus, a.authConfig.RpcConfig.RPC.ListenIP,
 		a.authConfig.RpcConfig.RPC.RegisterIP, a.authConfig.RpcConfig.RPC.AutoSetPorts, a.authConfig.RpcConfig.RPC.Ports,
 		a.Index(), a.authConfig.Discovery.RpcService.Auth, nil, a.authConfig,
 		[]string{

pkg/common/cmd/conversation.go

@@ -58,7 +58,7 @@ func (a *ConversationRpcCmd) Exec() error {
 }
 
 func (a *ConversationRpcCmd) runE() error {
-	return startrpc.Start(a.ctx, &a.conversationConfig.Discovery, &a.conversationConfig.RpcConfig.CircuitBreaker, &a.conversationConfig.RpcConfig.RateLimiter, &a.conversationConfig.RpcConfig.Prometheus, a.conversationConfig.RpcConfig.RPC.ListenIP,
+	return startrpc.Start(a.ctx, &a.conversationConfig.Discovery, &a.conversationConfig.RpcConfig.Prometheus, a.conversationConfig.RpcConfig.RPC.ListenIP,
 		a.conversationConfig.RpcConfig.RPC.RegisterIP, a.conversationConfig.RpcConfig.RPC.AutoSetPorts, a.conversationConfig.RpcConfig.RPC.Ports,
 		a.Index(), a.conversationConfig.Discovery.RpcService.Conversation, &a.conversationConfig.NotificationConfig, a.conversationConfig,
 		[]string{

pkg/common/cmd/cron_task.go

@@ -56,8 +56,6 @@ func (a *CronTaskCmd) runE() error {
 	var prometheus config.Prometheus
 	return startrpc.Start(
 		a.ctx, &a.cronTaskConfig.Discovery,
-		nil,
-		nil,
 		&prometheus,
 		"", "",
 		true,

pkg/common/cmd/friend.go

@@ -58,7 +58,7 @@ func (a *FriendRpcCmd) Exec() error {
 }
 
 func (a *FriendRpcCmd) runE() error {
-	return startrpc.Start(a.ctx, &a.relationConfig.Discovery, &a.relationConfig.RpcConfig.CircuitBreaker, &a.relationConfig.RpcConfig.RateLimiter, &a.relationConfig.RpcConfig.Prometheus, a.relationConfig.RpcConfig.RPC.ListenIP,
+	return startrpc.Start(a.ctx, &a.relationConfig.Discovery, &a.relationConfig.RpcConfig.Prometheus, a.relationConfig.RpcConfig.RPC.ListenIP,
 		a.relationConfig.RpcConfig.RPC.RegisterIP, a.relationConfig.RpcConfig.RPC.AutoSetPorts, a.relationConfig.RpcConfig.RPC.Ports,
 		a.Index(), a.relationConfig.Discovery.RpcService.Friend, &a.relationConfig.NotificationConfig, a.relationConfig,
 		[]string{

pkg/common/cmd/group.go

@@ -59,7 +59,7 @@ func (a *GroupRpcCmd) Exec() error {
 }
 
 func (a *GroupRpcCmd) runE() error {
-	return startrpc.Start(a.ctx, &a.groupConfig.Discovery, &a.groupConfig.RpcConfig.CircuitBreaker, &a.groupConfig.RpcConfig.RateLimiter, &a.groupConfig.RpcConfig.Prometheus, a.groupConfig.RpcConfig.RPC.ListenIP,
+	return startrpc.Start(a.ctx, &a.groupConfig.Discovery, &a.groupConfig.RpcConfig.Prometheus, a.groupConfig.RpcConfig.RPC.ListenIP,
 		a.groupConfig.RpcConfig.RPC.RegisterIP, a.groupConfig.RpcConfig.RPC.AutoSetPorts, a.groupConfig.RpcConfig.RPC.Ports,
 		a.Index(), a.groupConfig.Discovery.RpcService.Group, &a.groupConfig.NotificationConfig, a.groupConfig,
 		[]string{

pkg/common/cmd/msg.go

@@ -59,7 +59,7 @@ func (a *MsgRpcCmd) Exec() error {
 }
 
 func (a *MsgRpcCmd) runE() error {
-	return startrpc.Start(a.ctx, &a.msgConfig.Discovery, &a.msgConfig.RpcConfig.CircuitBreaker, &a.msgConfig.RpcConfig.RateLimiter, &a.msgConfig.RpcConfig.Prometheus, a.msgConfig.RpcConfig.RPC.ListenIP,
+	return startrpc.Start(a.ctx, &a.msgConfig.Discovery, &a.msgConfig.RpcConfig.Prometheus, a.msgConfig.RpcConfig.RPC.ListenIP,
 		a.msgConfig.RpcConfig.RPC.RegisterIP, a.msgConfig.RpcConfig.RPC.AutoSetPorts, a.msgConfig.RpcConfig.RPC.Ports,
 		a.Index(), a.msgConfig.Discovery.RpcService.Msg, &a.msgConfig.NotificationConfig, a.msgConfig,
 		[]string{

pkg/common/cmd/msg_gateway.go

@@ -61,8 +61,6 @@ func (m *MsgGatewayCmd) runE() error {
 	var prometheus config.Prometheus
 	return startrpc.Start(
 		m.ctx, &m.msgGatewayConfig.Discovery,
-		&m.msgGatewayConfig.MsgGateway.CircuitBreaker,
-		&m.msgGatewayConfig.MsgGateway.RateLimiter,
 		&prometheus,
 		rpc.ListenIP, rpc.RegisterIP,
 		rpc.AutoSetPorts,

pkg/common/cmd/msg_transfer.go

@@ -62,8 +62,6 @@ func (m *MsgTransferCmd) runE() error {
 	var prometheus config.Prometheus
 	return startrpc.Start(
 		m.ctx, &m.msgTransferConfig.Discovery,
-		&m.msgTransferConfig.MsgTransfer.CircuitBreaker,
-		&m.msgTransferConfig.MsgTransfer.RateLimiter,
 		&prometheus,
 		"", "",
 		true,

pkg/common/cmd/push.go

@@ -60,7 +60,7 @@ func (a *PushRpcCmd) Exec() error {
 }
 
 func (a *PushRpcCmd) runE() error {
-	return startrpc.Start(a.ctx, &a.pushConfig.Discovery, &a.pushConfig.RpcConfig.CircuitBreaker, &a.pushConfig.RpcConfig.RateLimiter, &a.pushConfig.RpcConfig.Prometheus, a.pushConfig.RpcConfig.RPC.ListenIP,
+	return startrpc.Start(a.ctx, &a.pushConfig.Discovery, &a.pushConfig.RpcConfig.Prometheus, a.pushConfig.RpcConfig.RPC.ListenIP,
 		a.pushConfig.RpcConfig.RPC.RegisterIP, a.pushConfig.RpcConfig.RPC.AutoSetPorts, a.pushConfig.RpcConfig.RPC.Ports,
 		a.Index(), a.pushConfig.Discovery.RpcService.Push, &a.pushConfig.NotificationConfig, a.pushConfig,
 		[]string{

pkg/common/cmd/third.go

@@ -58,7 +58,7 @@ func (a *ThirdRpcCmd) Exec() error {
 }
 
 func (a *ThirdRpcCmd) runE() error {
-	return startrpc.Start(a.ctx, &a.thirdConfig.Discovery, &a.thirdConfig.RpcConfig.CircuitBreaker, &a.thirdConfig.RpcConfig.RateLimiter, &a.thirdConfig.RpcConfig.Prometheus, a.thirdConfig.RpcConfig.RPC.ListenIP,
+	return startrpc.Start(a.ctx, &a.thirdConfig.Discovery, &a.thirdConfig.RpcConfig.Prometheus, a.thirdConfig.RpcConfig.RPC.ListenIP,
 		a.thirdConfig.RpcConfig.RPC.RegisterIP, a.thirdConfig.RpcConfig.RPC.AutoSetPorts, a.thirdConfig.RpcConfig.RPC.Ports,
 		a.Index(), a.thirdConfig.Discovery.RpcService.Third, &a.thirdConfig.NotificationConfig, a.thirdConfig,
 		[]string{

pkg/common/cmd/user.go

@@ -59,7 +59,7 @@ func (a *UserRpcCmd) Exec() error {
 }
 
 func (a *UserRpcCmd) runE() error {
-	return startrpc.Start(a.ctx, &a.userConfig.Discovery, &a.userConfig.RpcConfig.CircuitBreaker, &a.userConfig.RpcConfig.RateLimiter, &a.userConfig.RpcConfig.Prometheus, a.userConfig.RpcConfig.RPC.ListenIP,
+	return startrpc.Start(a.ctx, &a.userConfig.Discovery, &a.userConfig.RpcConfig.Prometheus, a.userConfig.RpcConfig.RPC.ListenIP,
 		a.userConfig.RpcConfig.RPC.RegisterIP, a.userConfig.RpcConfig.RPC.AutoSetPorts, a.userConfig.RpcConfig.RPC.Ports,
 		a.Index(), a.userConfig.Discovery.RpcService.User, &a.userConfig.NotificationConfig, a.userConfig,
 		[]string{

pkg/common/config/config.go

@@ -143,23 +143,6 @@ type API struct {
 		Ports        []int  `yaml:"ports"`
 		GrafanaURL   string `yaml:"grafanaURL"`
 	} `yaml:"prometheus"`
-
-	RateLimiter RateLimiter `yaml:"rateLimiter"`
-}
-
-type RateLimiter struct {
-	Enable       bool          `yaml:"enable"`
-	Window       time.Duration `yaml:"window"`
-	Bucket       int           `yaml:"bucket"`
-	CPUThreshold int64         `yaml:"cpuThreshold"`
-}
-
-type CircuitBreaker struct {
-	Enable  bool          `yaml:"enable"`
-	Window  time.Duration `yaml:"window"`
-	Bucket  int           `yaml:"bucket"`
-	Success float64       `yaml:"success"`
-	Request int64         `yaml:"request"`
 }
 
 type CronTask struct {
@@ -234,8 +217,6 @@ type MsgGateway struct {
 		WebsocketMaxMsgLen  int   `yaml:"websocketMaxMsgLen"`
 		WebsocketTimeout    int   `yaml:"websocketTimeout"`
 	} `yaml:"longConnSvr"`
-	RateLimiter    RateLimiter    `yaml:"rateLimiter"`
-	CircuitBreaker CircuitBreaker `yaml:"circuitBreaker"`
 }
 
 type MsgTransfer struct {
@@ -244,8 +225,6 @@ type MsgTransfer struct {
 		AutoSetPorts bool  `yaml:"autoSetPorts"`
 		Ports        []int `yaml:"ports"`
 	} `yaml:"prometheus"`
-	RateLimiter    RateLimiter    `yaml:"rateLimiter"`
-	CircuitBreaker CircuitBreaker `yaml:"circuitBreaker"`
 }
 
 type Push struct {
@@ -276,9 +255,7 @@ type Push struct {
 		BadgeCount bool   `yaml:"badgeCount"`
 		Production bool   `yaml:"production"`
 	} `yaml:"iosPush"`
-	FullUserCache  bool           `yaml:"fullUserCache"`
-	RateLimiter    RateLimiter    `yaml:"rateLimiter"`
-	CircuitBreaker CircuitBreaker `yaml:"circuitBreaker"`
+	FullUserCache bool `yaml:"fullUserCache"`
 }
 
 type Auth struct {
@@ -287,38 +264,28 @@ type Auth struct {
 	TokenPolicy struct {
 		Expire int64 `yaml:"expire"`
 	} `yaml:"tokenPolicy"`
-	RateLimiter    RateLimiter    `yaml:"rateLimiter"`
-	CircuitBreaker CircuitBreaker `yaml:"circuitBreaker"`
 }
 
 type Conversation struct {
-	RPC            RPC            `yaml:"rpc"`
-	Prometheus     Prometheus     `yaml:"prometheus"`
-	RateLimiter    RateLimiter    `yaml:"rateLimiter"`
-	CircuitBreaker CircuitBreaker `yaml:"circuitBreaker"`
+	RPC        RPC        `yaml:"rpc"`
+	Prometheus Prometheus `yaml:"prometheus"`
 }
 
 type Friend struct {
-	RPC            RPC            `yaml:"rpc"`
-	Prometheus     Prometheus     `yaml:"prometheus"`
-	RateLimiter    RateLimiter    `yaml:"rateLimiter"`
-	CircuitBreaker CircuitBreaker `yaml:"circuitBreaker"`
+	RPC        RPC        `yaml:"rpc"`
+	Prometheus Prometheus `yaml:"prometheus"`
 }
 
 type Group struct {
-	RPC                        RPC            `yaml:"rpc"`
-	Prometheus                 Prometheus     `yaml:"prometheus"`
-	EnableHistoryForNewMembers bool           `yaml:"enableHistoryForNewMembers"`
-	RateLimiter                RateLimiter    `yaml:"rateLimiter"`
-	CircuitBreaker             CircuitBreaker `yaml:"circuitBreaker"`
+	RPC                        RPC        `yaml:"rpc"`
+	Prometheus                 Prometheus `yaml:"prometheus"`
+	EnableHistoryForNewMembers bool       `yaml:"enableHistoryForNewMembers"`
 }
 
 type Msg struct {
-	RPC            RPC            `yaml:"rpc"`
-	Prometheus     Prometheus     `yaml:"prometheus"`
-	FriendVerify   bool           `yaml:"friendVerify"`
-	RateLimiter    RateLimiter    `yaml:"rateLimiter"`
-	CircuitBreaker CircuitBreaker `yaml:"circuitBreaker"`
+	RPC          RPC        `yaml:"rpc"`
+	Prometheus   Prometheus `yaml:"prometheus"`
+	FriendVerify bool       `yaml:"friendVerify"`
 }
 
 type Third struct {
@@ -331,8 +298,6 @@ type Third struct {
 		Kodo   Kodo   `yaml:"kodo"`
 		Aws    Aws    `yaml:"aws"`
 	} `yaml:"object"`
-	RateLimiter    RateLimiter    `yaml:"rateLimiter"`
-	CircuitBreaker CircuitBreaker `yaml:"circuitBreaker"`
 }
 type Cos struct {
 	BucketURL    string `yaml:"bucketURL"`
@@ -371,10 +336,8 @@ type Aws struct {
 }
 
 type User struct {
-	RPC            RPC            `yaml:"rpc"`
-	Prometheus     Prometheus     `yaml:"prometheus"`
-	RateLimiter    RateLimiter    `yaml:"rateLimiter"`
-	CircuitBreaker CircuitBreaker `yaml:"circuitBreaker"`
+	RPC        RPC        `yaml:"rpc"`
+	Prometheus Prometheus `yaml:"prometheus"`
 }
 
 type RPC struct {
@@ -473,7 +436,6 @@ type Webhooks struct {
 	BeforeSendGroupMsg                  BeforeConfig `yaml:"beforeSendGroupMsg"`
 	BeforeMsgModify                     BeforeConfig `yaml:"beforeMsgModify"`
 	AfterSendGroupMsg                   AfterConfig  `yaml:"afterSendGroupMsg"`
-	AfterMsgSaveDB                      AfterConfig  `yaml:"afterMsgSaveDB"`
 	AfterUserOnline                     AfterConfig  `yaml:"afterUserOnline"`
 	AfterUserOffline                    AfterConfig  `yaml:"afterUserOffline"`
 	AfterUserKickOff                    AfterConfig  `yaml:"afterUserKickOff"`

pkg/common/servererrs/code.go

@@ -70,7 +70,6 @@ const (
 	BlockedByPeer            = 1302 // Blocked by the peer
 	NotPeersFriend           = 1303 // Not the peer's friend
 	RelationshipAlreadyError = 1304 // Already in a friend relationship
-	FriendRequestHandled     = 1305 // Friend request has already been handled
 
 	// Message error codes.
 	MessageHasReadDisable = 1401

pkg/common/servererrs/predefine.go

@@ -51,11 +51,10 @@ var (
 
 	ErrMessageHasReadDisable = errs.NewCodeError(MessageHasReadDisable, "MessageHasReadDisable")
 
-	ErrCanNotAddYourself    = errs.NewCodeError(CanNotAddYourselfError, "CanNotAddYourselfError")
-	ErrBlockedByPeer        = errs.NewCodeError(BlockedByPeer, "BlockedByPeer")
-	ErrNotPeersFriend       = errs.NewCodeError(NotPeersFriend, "NotPeersFriend")
-	ErrRelationshipAlready  = errs.NewCodeError(RelationshipAlreadyError, "RelationshipAlreadyError")
-	ErrFriendRequestHandled = errs.NewCodeError(FriendRequestHandled, "FriendRequestHandled")
+	ErrCanNotAddYourself   = errs.NewCodeError(CanNotAddYourselfError, "CanNotAddYourselfError")
+	ErrBlockedByPeer       = errs.NewCodeError(BlockedByPeer, "BlockedByPeer")
+	ErrNotPeersFriend      = errs.NewCodeError(NotPeersFriend, "NotPeersFriend")
+	ErrRelationshipAlready = errs.NewCodeError(RelationshipAlreadyError, "RelationshipAlreadyError")
 
 	ErrMutedInGroup     = errs.NewCodeError(MutedInGroup, "MutedInGroup")
 	ErrMutedGroup       = errs.NewCodeError(MutedGroup, "MutedGroup")

pkg/common/startrpc/circuitbreaker.go

@@ -1,107 +0,0 @@
-package startrpc
-
-import (
-	"context"
-	"time"
-
-	"github.com/openimsdk/tools/log"
-	"github.com/openimsdk/tools/stability/circuitbreaker"
-	"github.com/openimsdk/tools/stability/circuitbreaker/sre"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-)
-
-type CircuitBreaker struct {
-	Enable  bool          `yaml:"enable"`
-	Success float64       `yaml:"success"` // success rate threshold (0.0-1.0)
-	Request int64         `yaml:"request"` // request threshold
-	Bucket  int           `yaml:"bucket"`  // number of buckets
-	Window  time.Duration `yaml:"window"`  // time window for statistics
-}
-
-func NewCircuitBreaker(config *CircuitBreaker) circuitbreaker.CircuitBreaker {
-	if !config.Enable {
-		return nil
-	}
-
-	return sre.NewSREBraker(
-		sre.WithWindow(config.Window),
-		sre.WithBucket(config.Bucket),
-		sre.WithSuccess(config.Success),
-		sre.WithRequest(config.Request),
-	)
-}
-
-func UnaryCircuitBreakerInterceptor(breaker circuitbreaker.CircuitBreaker) grpc.ServerOption {
-	if breaker == nil {
-		return grpc.ChainUnaryInterceptor(func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp any, err error) {
-			return handler(ctx, req)
-		})
-	}
-
-	return grpc.ChainUnaryInterceptor(func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp any, err error) {
-		if err := breaker.Allow(); err != nil {
-			log.ZWarn(ctx, "rpc circuit breaker open", err, "method", info.FullMethod)
-			return nil, status.Error(codes.Unavailable, "service unavailable due to circuit breaker")
-		}
-
-		resp, err = handler(ctx, req)
-
-		if err != nil {
-			if st, ok := status.FromError(err); ok {
-				switch st.Code() {
-				case codes.OK:
-					breaker.MarkSuccess()
-				case codes.InvalidArgument, codes.NotFound, codes.AlreadyExists, codes.PermissionDenied:
-					breaker.MarkSuccess()
-				default:
-					breaker.MarkFailed()
-				}
-			} else {
-				breaker.MarkFailed()
-			}
-		} else {
-			breaker.MarkSuccess()
-		}
-
-		return resp, err
-
-	})
-}
-
-func StreamCircuitBreakerInterceptor(breaker circuitbreaker.CircuitBreaker) grpc.ServerOption {
-	if breaker == nil {
-		return grpc.ChainStreamInterceptor(func(srv any, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
-			return handler(srv, ss)
-		})
-	}
-
-	return grpc.ChainStreamInterceptor(func(srv any, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
-		if err := breaker.Allow(); err != nil {
-			log.ZWarn(ss.Context(), "rpc circuit breaker open", err, "method", info.FullMethod)
-			return status.Error(codes.Unavailable, "service unavailable due to circuit breaker")
-		}
-
-		err := handler(srv, ss)
-
-		if err != nil {
-			if st, ok := status.FromError(err); ok {
-				switch st.Code() {
-				case codes.OK:
-					breaker.MarkSuccess()
-				case codes.InvalidArgument, codes.NotFound, codes.AlreadyExists, codes.PermissionDenied:
-					breaker.MarkSuccess()
-				default:
-					breaker.MarkFailed()
-				}
-			} else {
-				breaker.MarkFailed()
-			}
-		} else {
-			breaker.MarkSuccess()
-		}
-
-		return err
-	})
-}

pkg/common/startrpc/ratelimit.go

@@ -1,70 +0,0 @@
-package startrpc
-
-import (
-	"context"
-	"time"
-
-	"github.com/openimsdk/tools/log"
-	"github.com/openimsdk/tools/stability/ratelimit"
-	"github.com/openimsdk/tools/stability/ratelimit/bbr"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-)
-
-type RateLimiter struct {
-	Enable       bool
-	Window       time.Duration
-	Bucket       int
-	CPUThreshold int64
-}
-
-func NewRateLimiter(config *RateLimiter) ratelimit.Limiter {
-	if !config.Enable {
-		return nil
-	}
-
-	return bbr.NewBBRLimiter(
-		bbr.WithWindow(config.Window),
-		bbr.WithBucket(config.Bucket),
-		bbr.WithCPUThreshold(config.CPUThreshold),
-	)
-}
-
-func UnaryRateLimitInterceptor(limiter ratelimit.Limiter) grpc.ServerOption {
-	if limiter == nil {
-		return grpc.ChainUnaryInterceptor(func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp any, err error) {
-			return handler(ctx, req)
-		})
-	}
-
-	return grpc.ChainUnaryInterceptor(func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (resp any, err error) {
-		done, err := limiter.Allow()
-		if err != nil {
-			log.ZWarn(ctx, "rpc rate limited", err, "method", info.FullMethod)
-			return nil, status.Errorf(codes.ResourceExhausted, "rpc request rate limit exceeded: %v, please try again later", err)
-		}
-
-		defer done(ratelimit.DoneInfo{})
-		return handler(ctx, req)
-	})
-}
-
-func StreamRateLimitInterceptor(limiter ratelimit.Limiter) grpc.ServerOption {
-	if limiter == nil {
-		return grpc.ChainStreamInterceptor(func(srv any, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
-			return handler(srv, ss)
-		})
-	}
-
-	return grpc.ChainStreamInterceptor(func(srv any, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error {
-		done, err := limiter.Allow()
-		if err != nil {
-			log.ZWarn(ss.Context(), "rpc rate limited", err, "method", info.FullMethod)
-			return status.Errorf(codes.ResourceExhausted, "rpc request rate limit exceeded: %v, please try again later", err)
-		}
-		defer done(ratelimit.DoneInfo{})
-
-		return handler(srv, ss)
-	})
-}

pkg/common/startrpc/start.go

@@ -47,7 +47,7 @@ func init() {
 	prommetrics.RegistryAll()
 }
 
-func Start[T any](ctx context.Context, disc *conf.Discovery, circuitBreakerConfig *conf.CircuitBreaker, rateLimiterConfig *conf.RateLimiter, prometheusConfig *conf.Prometheus, listenIP,
+func Start[T any](ctx context.Context, disc *conf.Discovery, prometheusConfig *conf.Prometheus, listenIP,
 	registerIP string, autoSetPorts bool, rpcPorts []int, index int, rpcRegisterName string, notification *conf.Notification, config T,
 	watchConfigNames []string, watchServiceNames []string,
 	rpcFn func(ctx context.Context, config T, client discovery.SvcDiscoveryRegistry, server grpc.ServiceRegistrar) error,
@@ -84,45 +84,6 @@ func Start[T any](ctx context.Context, disc *conf.Discovery, circuitBreakerConfi
 		}
 	}
 
-	if circuitBreakerConfig != nil && circuitBreakerConfig.Enable {
-		cb := &CircuitBreaker{
-			Enable:  circuitBreakerConfig.Enable,
-			Success: circuitBreakerConfig.Success,
-			Request: circuitBreakerConfig.Request,
-			Bucket:  circuitBreakerConfig.Bucket,
-			Window:  circuitBreakerConfig.Window,
-		}
-
-		breaker := NewCircuitBreaker(cb)
-
-		options = append(options,
-			UnaryCircuitBreakerInterceptor(breaker),
-			StreamCircuitBreakerInterceptor(breaker),
-		)
-
-		log.ZInfo(ctx, "RPC circuit breaker enabled",
-			"service", rpcRegisterName,
-			"window", circuitBreakerConfig.Window,
-			"bucket", circuitBreakerConfig.Bucket,
-			"success", circuitBreakerConfig.Success,
-			"requestThreshold", circuitBreakerConfig.Request)
-	}
-
-	if rateLimiterConfig != nil && rateLimiterConfig.Enable {
-		limiter := NewRateLimiter((*RateLimiter)(rateLimiterConfig))
-
-		options = append(options,
-			UnaryRateLimitInterceptor(limiter),
-			StreamRateLimitInterceptor(limiter),
-		)
-
-		log.ZInfo(ctx, "RPC rate limiter enabled",
-			"service", rpcRegisterName,
-			"window", rateLimiterConfig.Window,
-			"bucket", rateLimiterConfig.Bucket,
-			"cpuThreshold", rateLimiterConfig.CPUThreshold)
-	}
-
 	registerIP, err := network.GetRpcRegisterIP(registerIP)
 	if err != nil {
 		return err
@@ -162,7 +123,7 @@ func Start[T any](ctx context.Context, disc *conf.Discovery, circuitBreakerConfi
 
 	go func() {
 		sigs := make(chan os.Signal, 1)
-		signal.Notify(sigs, syscall.SIGTERM, syscall.SIGINT)
+		signal.Notify(sigs, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL)
 		select {
 		case <-ctx.Done():
 			return

pkg/common/storage/cache/conversation.go

@@ -16,7 +16,6 @@ package cache
 
 import (
 	"context"
-
 	relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
 )
 
@@ -58,7 +57,7 @@ type ConversationCache interface {
 	GetConversationNotReceiveMessageUserIDs(ctx context.Context, conversationID string) ([]string, error)
 	DelConversationNotReceiveMessageUserIDs(conversationIDs ...string) ConversationCache
 	DelConversationNotNotifyMessageUserIDs(userIDs ...string) ConversationCache
-	DelUserPinnedConversations(userIDs ...string) ConversationCache
+	DelConversationPinnedMessageUserIDs(userIDs ...string) ConversationCache
 	DelConversationVersionUserIDs(userIDs ...string) ConversationCache
 
 	FindMaxConversationUserVersion(ctx context.Context, userID string) (*relationtb.VersionLog, error)

pkg/common/storage/cache/redis/conversation.go

@@ -253,7 +253,7 @@ func (c *ConversationRedisCache) DelConversationNotNotifyMessageUserIDs(userIDs
 	return cache
 }
 
-func (c *ConversationRedisCache) DelUserPinnedConversations(userIDs ...string) cache.ConversationCache {
+func (c *ConversationRedisCache) DelConversationPinnedMessageUserIDs(userIDs ...string) cache.ConversationCache {
 	cache := c.CloneConversationCache()
 	for _, userID := range userIDs {
 		cache.AddKeys(c.getPinnedConversationIDsKey(userID))

pkg/common/storage/cache/redis/token.go

@@ -220,6 +220,7 @@ func (c *tokenCache) DeleteAndSetTemporary(ctx context.Context, userID string, p
 	if err := c.rdb.HDel(ctx, key, fields...).Err(); err != nil {
 		return errs.Wrap(err)
 	}
+
 	if c.localCache != nil {
 		c.removeLocalTokenCache(ctx, key)
 	}

pkg/common/storage/controller/conversation.go

@@ -61,6 +61,8 @@ type ConversationDatabase interface {
 	GetAllConversationIDsNumber(ctx context.Context) (int64, error)
 	// PageConversationIDs paginates through conversation IDs based on the specified pagination settings.
 	PageConversationIDs(ctx context.Context, pagination pagination.Pagination) (conversationIDs []string, err error)
+	// GetConversationsByConversationID retrieves conversations by their IDs.
+	GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*relationtb.Conversation, error)
 	// GetConversationIDsNeedDestruct fetches conversations that need to be destructed based on specific criteria.
 	GetConversationIDsNeedDestruct(ctx context.Context) ([]*relationtb.Conversation, error)
 	// GetConversationNotReceiveMessageUserIDs gets user IDs for users in a conversation who have not received messages.
@@ -76,8 +78,6 @@ type ConversationDatabase interface {
 	GetPinnedConversationIDs(ctx context.Context, userID string) ([]string, error)
 	// FindRandConversation finds random conversations based on the specified timestamp and limit.
 	FindRandConversation(ctx context.Context, ts int64, limit int) ([]*relationtb.Conversation, error)
-
-	DeleteUsersConversations(ctx context.Context, userID string, conversationIDs []string) (err error)
 }
 
 func NewConversationDatabase(conversation database.Conversation, cache cache.ConversationCache, tx tx.Tx) ConversationDatabase {
@@ -120,7 +120,7 @@ func (c *conversationDatabase) SetUsersConversationFieldTx(ctx context.Context,
 				cache = cache.DelConversationNotNotifyMessageUserIDs(userIDs...)
 			}
 			if _, ok := fieldMap["is_pinned"]; ok {
-				cache = cache.DelUserPinnedConversations(userIDs...)
+				cache = cache.DelConversationPinnedMessageUserIDs(userIDs...)
 			}
 			cache = cache.DelConversationVersionUserIDs(haveUserIDs...)
 		}
@@ -172,7 +172,7 @@ func (c *conversationDatabase) UpdateUsersConversationField(ctx context.Context,
 		cache = cache.DelConversationNotNotifyMessageUserIDs(userIDs...)
 	}
 	if _, ok := args["is_pinned"]; ok {
-		cache = cache.DelUserPinnedConversations(userIDs...)
+		cache = cache.DelConversationPinnedMessageUserIDs(userIDs...)
 	}
 	return cache.ChainExecDel(ctx)
 }
@@ -203,7 +203,7 @@ func (c *conversationDatabase) CreateConversation(ctx context.Context, conversat
 		DelUserConversationIDsHash(userIDs...).
 		DelConversationVersionUserIDs(userIDs...).
 		DelConversationNotNotifyMessageUserIDs(notNotifyUserIDs...).
-		DelUserPinnedConversations(pinnedUserIDs...).
+		DelConversationPinnedMessageUserIDs(pinnedUserIDs...).
 		ChainExecDel(ctx)
 }
 
@@ -259,7 +259,7 @@ func (c *conversationDatabase) SetUserConversations(ctx context.Context, ownerUs
 		cache := c.cache.CloneConversationCache()
 		cache = cache.DelConversationVersionUserIDs(ownerUserID).
 			DelConversationNotNotifyMessageUserIDs(ownerUserID).
-			DelUserPinnedConversations(ownerUserID)
+			DelConversationPinnedMessageUserIDs(ownerUserID)
 
 		groupIDs := datautil.Distinct(datautil.Filter(conversations, func(e *relationtb.Conversation) (string, bool) {
 			return e.GroupID, e.GroupID != ""
@@ -373,6 +373,10 @@ func (c *conversationDatabase) PageConversationIDs(ctx context.Context, paginati
 	return c.conversationDB.PageConversationIDs(ctx, pagination)
 }
 
+func (c *conversationDatabase) GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*relationtb.Conversation, error) {
+	return c.conversationDB.GetConversationsByConversationID(ctx, conversationIDs)
+}
+
 func (c *conversationDatabase) GetConversationIDsNeedDestruct(ctx context.Context) ([]*relationtb.Conversation, error) {
 	return c.conversationDB.GetConversationIDsNeedDestruct(ctx)
 }
@@ -425,21 +429,3 @@ func (c *conversationDatabase) GetPinnedConversationIDs(ctx context.Context, use
 func (c *conversationDatabase) FindRandConversation(ctx context.Context, ts int64, limit int) ([]*relationtb.Conversation, error) {
 	return c.conversationDB.FindRandConversation(ctx, ts, limit)
 }
-
-func (c *conversationDatabase) DeleteUsersConversations(ctx context.Context, userID string, conversationIDs []string) (err error) {
-	return c.tx.Transaction(ctx, func(ctx context.Context) error {
-		err = c.conversationDB.DeleteUsersConversations(ctx, userID, conversationIDs)
-		if err != nil {
-			return err
-		}
-		cache := c.cache.CloneConversationCache()
-		cache = cache.DelConversations(userID, conversationIDs...).
-			DelConversationVersionUserIDs(userID).
-			DelConversationIDs(userID).
-			DelUserConversationIDsHash(userID).
-			DelConversationNotNotifyMessageUserIDs(userID).
-			DelUserPinnedConversations(userID)
-
-		return cache.ChainExecDel(ctx)
-	})
-}

pkg/common/storage/controller/friend.go

@@ -16,9 +16,9 @@ package controller
 
 import (
 	"context"
+	"fmt"
 	"time"
 
-	"github.com/openimsdk/open-im-server/v3/pkg/common/servererrs"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/database"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/database/mgo"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/storage/model"
@@ -109,13 +109,15 @@ func (f *friendDatabase) CheckIn(ctx context.Context, userID1, userID2 string) (
 	// Retrieve friend IDs of userID1 from the cache
 	userID1FriendIDs, err := f.cache.GetFriendIDs(ctx, userID1)
 	if err != nil {
-		return false, false, err
+		err = fmt.Errorf("error retrieving friend IDs for user %s: %w", userID1, err)
+		return
 	}
 
 	// Retrieve friend IDs of userID2 from the cache
 	userID2FriendIDs, err := f.cache.GetFriendIDs(ctx, userID2)
 	if err != nil {
-		return false, false, err
+		err = fmt.Errorf("error retrieving friend IDs for user %s: %w", userID2, err)
+		return
 	}
 
 	// Check if userID2 is in userID1's friend list and vice versa
@@ -212,12 +214,12 @@ func (f *friendDatabase) RefuseFriendRequest(ctx context.Context, friendRequest
 	// Attempt to retrieve the friend request from the database.
 	fr, err := f.friendRequest.Take(ctx, friendRequest.FromUserID, friendRequest.ToUserID)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to retrieve friend request from %s to %s: %w", friendRequest.FromUserID, friendRequest.ToUserID, err)
 	}
 
 	// Check if the friend request has already been handled.
 	if fr.HandleResult != 0 {
-		return servererrs.ErrFriendRequestHandled.WrapMsg("friend request has already been processed", "from", friendRequest.FromUserID, "to", friendRequest.ToUserID)
+		return fmt.Errorf("friend request from %s to %s has already been processed", friendRequest.FromUserID, friendRequest.ToUserID)
 	}
 
 	// Log the action of refusing the friend request for debugging and auditing purposes.
@@ -230,7 +232,7 @@ func (f *friendDatabase) RefuseFriendRequest(ctx context.Context, friendRequest
 	friendRequest.HandleResult = constant.FriendResponseRefuse
 	friendRequest.HandleTime = time.Now()
 	if err := f.friendRequest.Update(ctx, friendRequest); err != nil {
-		return err
+		return fmt.Errorf("failed to update friend request from %s to %s as refused: %w", friendRequest.FromUserID, friendRequest.ToUserID, err)
 	}
 
 	return nil
@@ -348,9 +350,9 @@ func (f *friendDatabase) PageFriendRequestToMe(ctx context.Context, userID strin
 func (f *friendDatabase) FindFriendsWithError(ctx context.Context, ownerUserID string, friendUserIDs []string) (friends []*model.Friend, err error) {
 	friends, err = f.friend.FindFriends(ctx, ownerUserID, friendUserIDs)
 	if err != nil {
-		return nil, err
+		return
 	}
-	return friends, nil
+	return
 }
 
 func (f *friendDatabase) FindFriendUserIDs(ctx context.Context, ownerUserID string) (friendUserIDs []string, err error) {

pkg/common/storage/database/conversation.go

@@ -39,9 +39,9 @@ type Conversation interface {
 	GetAllConversationIDs(ctx context.Context) ([]string, error)
 	GetAllConversationIDsNumber(ctx context.Context) (int64, error)
 	PageConversationIDs(ctx context.Context, pagination pagination.Pagination) (conversationIDs []string, err error)
+	GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*model.Conversation, error)
 	GetConversationIDsNeedDestruct(ctx context.Context) ([]*model.Conversation, error)
 	GetConversationNotReceiveMessageUserIDs(ctx context.Context, conversationID string) ([]string, error)
 	FindConversationUserVersion(ctx context.Context, userID string, version uint, limit int) (*model.VersionLog, error)
 	FindRandConversation(ctx context.Context, ts int64, limit int) ([]*model.Conversation, error)
-	DeleteUsersConversations(ctx context.Context, userID string, conversationIDs []string) (err error)
 }

pkg/common/storage/database/mgo/conversation.go

@@ -47,12 +47,6 @@ func NewConversationMongo(db *mongo.Database) (*ConversationMgo, error) {
 			},
 			Options: options.Index(),
 		},
-		{
-			Keys: bson.D{
-				{Key: "conversation_id", Value: 1},
-			},
-			Options: options.Index().SetUnique(true),
-		},
 	})
 	if err != nil {
 		return nil, errs.Wrap(err)
@@ -238,6 +232,10 @@ func (c *ConversationMgo) PageConversationIDs(ctx context.Context, pagination pa
 	return mongoutil.FindPageOnly[string](ctx, c.coll, bson.M{}, pagination, options.Find().SetProjection(bson.M{"conversation_id": 1}))
 }
 
+func (c *ConversationMgo) GetConversationsByConversationID(ctx context.Context, conversationIDs []string) ([]*model.Conversation, error) {
+	return mongoutil.Find[*model.Conversation](ctx, c.coll, bson.M{"conversation_id": bson.M{"$in": conversationIDs}})
+}
+
 func (c *ConversationMgo) GetConversationIDsNeedDestruct(ctx context.Context) ([]*model.Conversation, error) {
 	// "is_msg_destruct = 1 && msg_destruct_time != 0 && (UNIX_TIMESTAMP(NOW()) > (msg_destruct_time + UNIX_TIMESTAMP(latest_msg_destruct_time)) || latest_msg_destruct_time is NULL)"
 	return mongoutil.Find[*model.Conversation](ctx, c.coll, bson.M{
@@ -310,20 +308,3 @@ func (c *ConversationMgo) FindRandConversation(ctx context.Context, ts int64, li
 	}
 	return mongoutil.Aggregate[*model.Conversation](ctx, c.coll, pipeline)
 }
-
-func (c *ConversationMgo) DeleteUsersConversations(ctx context.Context, userID string, conversationIDs []string) (err error) {
-	if len(conversationIDs) == 0 {
-		return nil
-	}
-	return mongoutil.IncrVersion(func() error {
-		err := mongoutil.DeleteMany(ctx, c.coll, bson.M{"owner_user_id": userID, "conversation_id": bson.M{"$in": conversationIDs}})
-		return err
-	}, func() error {
-		for _, conversationID := range conversationIDs {
-			if err := c.version.IncrVersion(ctx, userID, []string{conversationID}, model.VersionStateDelete); err != nil {
-				return err
-			}
-		}
-		return nil
-	})
-}

pkg/common/storage/database/mgo/seq_conversation.go

@@ -57,8 +57,8 @@ func (s *seqConversationMongo) Malloc(ctx context.Context, conversationID string
 	}
 	filter := map[string]any{"conversation_id": conversationID}
 	update := map[string]any{
-		"$inc":         map[string]any{"max_seq": size},
-		"$setOnInsert": map[string]any{"min_seq": int64(0)},
+		"$inc": map[string]any{"max_seq": size},
+		"$set": map[string]any{"min_seq": int64(0)},
 	}
 	opt := options.FindOneAndUpdate().SetUpsert(true).SetReturnDocument(options.After).SetProjection(map[string]any{"_id": 0, "max_seq": 1})
 	lastSeq, err := mongoutil.FindOneAndUpdate[int64](ctx, s.coll, filter, update, opt)

pkg/common/storage/kafka/config.go

@@ -1,33 +0,0 @@
-// Copyright © 2024 OpenIM open source community. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package kafka
-
-type TLSConfig struct {
-	EnableTLS          bool   `yaml:"enableTLS"`
-	CACrt              string `yaml:"caCrt"`
-	ClientCrt          string `yaml:"clientCrt"`
-	ClientKey          string `yaml:"clientKey"`
-	ClientKeyPwd       string `yaml:"clientKeyPwd"`
-	InsecureSkipVerify bool   `yaml:"insecureSkipVerify"`
-}
-
-type Config struct {
-	Username     string    `yaml:"username"`
-	Password     string    `yaml:"password"`
-	ProducerAck  string    `yaml:"producerAck"`
-	CompressType string    `yaml:"compressType"`
-	Addr         []string  `yaml:"addr"`
-	TLS          TLSConfig `yaml:"tls"`
-}

pkg/common/storage/kafka/consumer_group.go

@@ -1,68 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package kafka
-
-import (
-	"context"
-	"errors"
-
-	"github.com/IBM/sarama"
-	"github.com/openimsdk/tools/log"
-)
-
-type MConsumerGroup struct {
-	sarama.ConsumerGroup
-	groupID string
-	topics  []string
-}
-
-func NewMConsumerGroup(conf *Config, groupID string, topics []string, autoCommitEnable bool) (*MConsumerGroup, error) {
-	config, err := BuildConsumerGroupConfig(conf, sarama.OffsetNewest, autoCommitEnable)
-	if err != nil {
-		return nil, err
-	}
-	group, err := NewConsumerGroup(config, conf.Addr, groupID)
-	if err != nil {
-		return nil, err
-	}
-	return &MConsumerGroup{
-		ConsumerGroup: group,
-		groupID:       groupID,
-		topics:        topics,
-	}, nil
-}
-
-func (mc *MConsumerGroup) GetContextFromMsg(cMsg *sarama.ConsumerMessage) context.Context {
-	return GetContextWithMQHeader(cMsg.Headers)
-}
-
-func (mc *MConsumerGroup) RegisterHandleAndConsumer(ctx context.Context, handler sarama.ConsumerGroupHandler) {
-	for {
-		err := mc.ConsumerGroup.Consume(ctx, mc.topics, handler)
-		if errors.Is(err, sarama.ErrClosedConsumerGroup) {
-			return
-		}
-		if errors.Is(err, context.Canceled) {
-			return
-		}
-		if err != nil {
-			log.ZWarn(ctx, "consume err", err, "topic", mc.topics, "groupID", mc.groupID)
-		}
-	}
-}
-
-func (mc *MConsumerGroup) Close() error {
-	return mc.ConsumerGroup.Close()
-}

pkg/common/storage/kafka/producer.go

@@ -1,82 +0,0 @@
-// Copyright © 2023 OpenIM. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package kafka
-
-import (
-	"context"
-	"github.com/IBM/sarama"
-	"github.com/openimsdk/tools/errs"
-	"google.golang.org/protobuf/proto"
-)
-
-// Producer represents a Kafka producer.
-type Producer struct {
-	addr     []string
-	topic    string
-	config   *sarama.Config
-	producer sarama.SyncProducer
-}
-
-func NewKafkaProducer(config *sarama.Config, addr []string, topic string) (*Producer, error) {
-	producer, err := NewProducer(config, addr)
-	if err != nil {
-		return nil, err
-	}
-	return &Producer{
-		addr:     addr,
-		topic:    topic,
-		config:   config,
-		producer: producer,
-	}, nil
-}
-
-// SendMessage sends a message to the Kafka topic configured in the Producer.
-func (p *Producer) SendMessage(ctx context.Context, key string, msg proto.Message) (int32, int64, error) {
-	// Marshal the protobuf message
-	bMsg, err := proto.Marshal(msg)
-	if err != nil {
-		return 0, 0, errs.WrapMsg(err, "kafka proto Marshal err")
-	}
-	if len(bMsg) == 0 {
-		return 0, 0, errs.WrapMsg(errEmptyMsg, "kafka proto Marshal err")
-	}
-
-	// Prepare Kafka message
-	kMsg := &sarama.ProducerMessage{
-		Topic: p.topic,
-		Key:   sarama.StringEncoder(key),
-		Value: sarama.ByteEncoder(bMsg),
-	}
-
-	// Validate message key and value
-	if kMsg.Key.Length() == 0 || kMsg.Value.Length() == 0 {
-		return 0, 0, errs.Wrap(errEmptyMsg)
-	}
-
-	// Attach context metadata as headers
-	header, err := GetMQHeaderWithContext(ctx)
-	if err != nil {
-		return 0, 0, err
-	}
-	kMsg.Headers = header
-
-	// Send the message
-	partition, offset, err := p.producer.SendMessage(kMsg)
-	if err != nil {
-		return 0, 0, errs.WrapMsg(err, "p.producer.SendMessage error")
-	}
-
-	return partition, offset, nil
-}

pkg/common/storage/kafka/sarama.go

@@ -1,85 +0,0 @@
-package kafka
-
-import (
-	"bytes"
-	"strings"
-
-	"github.com/IBM/sarama"
-	"github.com/openimsdk/tools/errs"
-)
-
-func BuildConsumerGroupConfig(conf *Config, initial int64, autoCommitEnable bool) (*sarama.Config, error) {
-	kfk := sarama.NewConfig()
-	kfk.Version = sarama.V2_0_0_0
-	kfk.Consumer.Offsets.Initial = initial
-	kfk.Consumer.Offsets.AutoCommit.Enable = autoCommitEnable
-	kfk.Consumer.Return.Errors = false
-	if conf.Username != "" || conf.Password != "" {
-		kfk.Net.SASL.Enable = true
-		kfk.Net.SASL.User = conf.Username
-		kfk.Net.SASL.Password = conf.Password
-	}
-	if conf.TLS.EnableTLS {
-		tls, err := newTLSConfig(conf.TLS.ClientCrt, conf.TLS.ClientKey, conf.TLS.CACrt, []byte(conf.TLS.ClientKeyPwd), conf.TLS.InsecureSkipVerify)
-		if err != nil {
-			return nil, err
-		}
-		kfk.Net.TLS.Config = tls
-		kfk.Net.TLS.Enable = true
-	}
-	return kfk, nil
-}
-
-func NewConsumerGroup(conf *sarama.Config, addr []string, groupID string) (sarama.ConsumerGroup, error) {
-	cg, err := sarama.NewConsumerGroup(addr, groupID, conf)
-	if err != nil {
-		return nil, errs.WrapMsg(err, "NewConsumerGroup failed", "addr", addr, "groupID", groupID, "conf", *conf)
-	}
-	return cg, nil
-}
-
-func BuildProducerConfig(conf Config) (*sarama.Config, error) {
-	kfk := sarama.NewConfig()
-	kfk.Producer.Return.Successes = true
-	kfk.Producer.Return.Errors = true
-	kfk.Producer.Partitioner = sarama.NewHashPartitioner
-	if conf.Username != "" || conf.Password != "" {
-		kfk.Net.SASL.Enable = true
-		kfk.Net.SASL.User = conf.Username
-		kfk.Net.SASL.Password = conf.Password
-	}
-	switch strings.ToLower(conf.ProducerAck) {
-	case "no_response":
-		kfk.Producer.RequiredAcks = sarama.NoResponse
-	case "wait_for_local":
-		kfk.Producer.RequiredAcks = sarama.WaitForLocal
-	case "wait_for_all":
-		kfk.Producer.RequiredAcks = sarama.WaitForAll
-	default:
-		kfk.Producer.RequiredAcks = sarama.WaitForAll
-	}
-	if conf.CompressType == "" {
-		kfk.Producer.Compression = sarama.CompressionNone
-	} else {
-		if err := kfk.Producer.Compression.UnmarshalText(bytes.ToLower([]byte(conf.CompressType))); err != nil {
-			return nil, errs.WrapMsg(err, "UnmarshalText failed", "compressType", conf.CompressType)
-		}
-	}
-	if conf.TLS.EnableTLS {
-		tls, err := newTLSConfig(conf.TLS.ClientCrt, conf.TLS.ClientKey, conf.TLS.CACrt, []byte(conf.TLS.ClientKeyPwd), conf.TLS.InsecureSkipVerify)
-		if err != nil {
-			return nil, err
-		}
-		kfk.Net.TLS.Config = tls
-		kfk.Net.TLS.Enable = true
-	}
-	return kfk, nil
-}
-
-func NewProducer(conf *sarama.Config, addr []string) (sarama.SyncProducer, error) {
-	producer, err := sarama.NewSyncProducer(addr, conf)
-	if err != nil {
-		return nil, errs.WrapMsg(err, "NewSyncProducer failed", "addr", addr, "conf", *conf)
-	}
-	return producer, nil
-}

pkg/common/storage/kafka/tls.go

@@ -1,83 +0,0 @@
-// Copyright © 2024 OpenIM open source community. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package kafka
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/pem"
-	"os"
-
-	"github.com/openimsdk/tools/errs"
-)
-
-// decryptPEM decrypts a PEM block using a password.
-func decryptPEM(data []byte, passphrase []byte) ([]byte, error) {
-	if len(passphrase) == 0 {
-		return data, nil
-	}
-	b, _ := pem.Decode(data)
-	d, err := x509.DecryptPEMBlock(b, passphrase)
-	if err != nil {
-		return nil, errs.WrapMsg(err, "DecryptPEMBlock failed")
-	}
-	return pem.EncodeToMemory(&pem.Block{
-		Type:  b.Type,
-		Bytes: d,
-	}), nil
-}
-
-func readEncryptablePEMBlock(path string, pwd []byte) ([]byte, error) {
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return nil, errs.WrapMsg(err, "ReadFile failed", "path", path)
-	}
-	return decryptPEM(data, pwd)
-}
-
-// newTLSConfig setup the TLS config from general config file.
-func newTLSConfig(clientCertFile, clientKeyFile, caCertFile string, keyPwd []byte, insecureSkipVerify bool) (*tls.Config, error) {
-	var tlsConfig tls.Config
-	if clientCertFile != "" && clientKeyFile != "" {
-		certPEMBlock, err := os.ReadFile(clientCertFile)
-		if err != nil {
-			return nil, errs.WrapMsg(err, "ReadFile failed", "clientCertFile", clientCertFile)
-		}
-		keyPEMBlock, err := readEncryptablePEMBlock(clientKeyFile, keyPwd)
-		if err != nil {
-			return nil, err
-		}
-
-		cert, err := tls.X509KeyPair(certPEMBlock, keyPEMBlock)
-		if err != nil {
-			return nil, errs.WrapMsg(err, "X509KeyPair failed")
-		}
-		tlsConfig.Certificates = []tls.Certificate{cert}
-	}
-
-	if caCertFile != "" {
-		caCert, err := os.ReadFile(caCertFile)
-		if err != nil {
-			return nil, errs.WrapMsg(err, "ReadFile failed", "caCertFile", caCertFile)
-		}
-		caCertPool := x509.NewCertPool()
-		if ok := caCertPool.AppendCertsFromPEM(caCert); !ok {
-			return nil, errs.New("AppendCertsFromPEM failed")
-		}
-		tlsConfig.RootCAs = caCertPool
-	}
-	tlsConfig.InsecureSkipVerify = insecureSkipVerify
-	return &tlsConfig, nil
-}

pkg/common/storage/kafka/util.go

@@ -1,34 +0,0 @@
-package kafka
-
-import (
-	"context"
-	"errors"
-	"github.com/IBM/sarama"
-	"github.com/openimsdk/protocol/constant"
-	"github.com/openimsdk/tools/mcontext"
-)
-
-var errEmptyMsg = errors.New("kafka binary msg is empty")
-
-// GetMQHeaderWithContext extracts message queue headers from the context.
-func GetMQHeaderWithContext(ctx context.Context) ([]sarama.RecordHeader, error) {
-	operationID, opUserID, platform, connID, err := mcontext.GetCtxInfos(ctx)
-	if err != nil {
-		return nil, err
-	}
-	return []sarama.RecordHeader{
-		{Key: []byte(constant.OperationID), Value: []byte(operationID)},
-		{Key: []byte(constant.OpUserID), Value: []byte(opUserID)},
-		{Key: []byte(constant.OpUserPlatform), Value: []byte(platform)},
-		{Key: []byte(constant.ConnID), Value: []byte(connID)},
-	}, nil
-}
-
-// GetContextWithMQHeader creates a context from message queue headers.
-func GetContextWithMQHeader(header []*sarama.RecordHeader) context.Context {
-	var values []string
-	for _, recordHeader := range header {
-		values = append(values, string(recordHeader.Value))
-	}
-	return mcontext.WithMustInfoCtx(values) // Attach extracted values to context
-}

pkg/common/storage/kafka/verify.go

@@ -1,79 +0,0 @@
-// Copyright © 2024 OpenIM open source community. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package kafka
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/IBM/sarama"
-	"github.com/openimsdk/tools/errs"
-)
-
-func CheckTopics(ctx context.Context, conf *Config, topics []string) error {
-	kfk, err := BuildConsumerGroupConfig(conf, sarama.OffsetNewest, false)
-	if err != nil {
-		return err
-	}
-	cli, err := sarama.NewClient(conf.Addr, kfk)
-	if err != nil {
-		return errs.WrapMsg(err, "NewClient failed", "config: ", fmt.Sprintf("%+v", conf))
-	}
-	defer cli.Close()
-
-	existingTopics, err := cli.Topics()
-	if err != nil {
-		return errs.WrapMsg(err, "Failed to list topics")
-	}
-
-	existingTopicsMap := make(map[string]bool)
-	for _, t := range existingTopics {
-		existingTopicsMap[t] = true
-	}
-
-	for _, topic := range topics {
-		if !existingTopicsMap[topic] {
-			return errs.New("topic not exist", "topic", topic).Wrap()
-		}
-	}
-	return nil
-}
-
-func CheckHealth(ctx context.Context, conf *Config) error {
-	kfk, err := BuildConsumerGroupConfig(conf, sarama.OffsetNewest, false)
-	if err != nil {
-		return err
-	}
-	cli, err := sarama.NewClient(conf.Addr, kfk)
-	if err != nil {
-		return errs.WrapMsg(err, "NewClient failed", "config: ", fmt.Sprintf("%+v", conf))
-	}
-	defer cli.Close()
-
-	// Get broker list
-	brokers := cli.Brokers()
-	if len(brokers) == 0 {
-		return errs.New("no brokers found").Wrap()
-	}
-
-	// Check if all brokers are reachable
-	for _, broker := range brokers {
-		if err := broker.Open(kfk); err != nil {
-			return errs.WrapMsg(err, "failed to open broker", "broker", broker.Addr())
-		}
-	}
-
-	return nil
-}

pkg/localcache/cache.go

@@ -47,15 +47,15 @@ func New[V any](opts ...Option) Cache[V] {
 	if opt.localSlotNum > 0 && opt.localSlotSize > 0 {
 		createSimpleLRU := func() lru.LRU[string, V] {
 			if opt.expirationEvict {
-				return lru.NewExpirationLRU[string, V](opt.localSlotSize, opt.localSuccessTTL, opt.localFailedTTL, opt.target, c.onEvict)
+				return lru.NewExpirationLRU(opt.localSlotSize, opt.localSuccessTTL, opt.localFailedTTL, opt.target, c.onEvict)
 			} else {
-				return lru.NewLazyLRU[string, V](opt.localSlotSize, opt.localSuccessTTL, opt.localFailedTTL, opt.target, c.onEvict)
+				return lru.NewLazyLRU(opt.localSlotSize, opt.localSuccessTTL, opt.localFailedTTL, opt.target, c.onEvict)
 			}
 		}
 		if opt.localSlotNum == 1 {
 			c.local = createSimpleLRU()
 		} else {
-			c.local = lru.NewSlotLRU[string, V](opt.localSlotNum, LRUStringHash, createSimpleLRU)
+			c.local = lru.NewSlotLRU(opt.localSlotNum, LRUStringHash, createSimpleLRU)
 		}
 		if opt.linkSlotNum > 0 {
 			c.link = link.New(opt.linkSlotNum)
@@ -71,19 +71,14 @@ type cache[V any] struct {
 }
 
 func (c *cache[V]) onEvict(key string, value V) {
-	if c.link != nil {
-		// Do not delete other keys while the underlying LRU still holds its lock;
-		// defer linked deletions to avoid re-entering the same slot and deadlocking.
-		if lks := c.link.Del(key); len(lks) > 0 {
-			go c.delLinked(key, lks)
-		}
-	}
-}
+	_ = value
 
-func (c *cache[V]) delLinked(src string, keys map[string]struct{}) {
-	for k := range keys {
-		if src != k {
-			c.local.Del(k)
+	if c.link != nil {
+		lks := c.link.Del(key)
+		for k := range lks {
+			if key != k { // prevent deadlock
+				c.local.Del(k)
+			}
 		}
 	}
 }
@@ -110,7 +105,7 @@ func (c *cache[V]) Get(ctx context.Context, key string, fetch func(ctx context.C
 func (c *cache[V]) GetLink(ctx context.Context, key string, fetch func(ctx context.Context) (V, error), link ...string) (V, error) {
 	if c.local != nil {
 		return c.local.Get(key, func() (V, error) {
-			if len(link) > 0 && c.link != nil {
+			if len(link) > 0 {
 				c.link.Link(key, link...)
 			}
 			return fetch(ctx)

pkg/localcache/cache_test.go

@@ -22,8 +22,6 @@ import (
 	"sync/atomic"
 	"testing"
 	"time"
-
-	"github.com/openimsdk/open-im-server/v3/pkg/localcache/lru"
 )
 
 func TestName(t *testing.T) {
@@ -93,68 +91,3 @@ func TestName(t *testing.T) {
 	t.Log("del", del.Load())
 	// 137.35s
 }
-
-// Test deadlock scenario when eviction callback deletes a linked key that hashes to the same slot.
-func TestCacheEvictDeadlock(t *testing.T) {
-	ctx := context.Background()
-	c := New[string](WithLocalSlotNum(1), WithLocalSlotSize(1), WithLazy())
-
-	if _, err := c.GetLink(ctx, "k1", func(ctx context.Context) (string, error) {
-		return "v1", nil
-	}, "k2"); err != nil {
-		t.Fatalf("seed cache failed: %v", err)
-	}
-
-	done := make(chan struct{})
-	go func() {
-		defer close(done)
-		_, _ = c.GetLink(ctx, "k2", func(ctx context.Context) (string, error) {
-			return "v2", nil
-		}, "k1")
-	}()
-
-	select {
-	case <-done:
-		// expected to finish quickly; current implementation deadlocks here.
-	case <-time.After(time.Second):
-		t.Fatal("GetLink deadlocked during eviction of linked key")
-	}
-}
-
-func TestExpirationLRUGetBatch(t *testing.T) {
-	l := lru.NewExpirationLRU[string, string](2, time.Minute, time.Second*5, EmptyTarget{}, nil)
-
-	keys := []string{"a", "b"}
-	values, err := l.GetBatch(keys, func(keys []string) (map[string]string, error) {
-		res := make(map[string]string)
-		for _, k := range keys {
-			res[k] = k + "_v"
-		}
-		return res, nil
-	})
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if len(values) != len(keys) {
-		t.Fatalf("expected %d values, got %d", len(keys), len(values))
-	}
-	for _, k := range keys {
-		if v, ok := values[k]; !ok || v != k+"_v" {
-			t.Fatalf("unexpected value for %s: %q, ok=%v", k, v, ok)
-		}
-	}
-
-	// second batch should hit cache
-	values, err = l.GetBatch(keys, func(keys []string) (map[string]string, error) {
-		t.Fatalf("should not fetch on cache hit")
-		return nil, nil
-	})
-	if err != nil {
-		t.Fatalf("unexpected error on cache hit: %v", err)
-	}
-	for _, k := range keys {
-		if v, ok := values[k]; !ok || v != k+"_v" {
-			t.Fatalf("unexpected cached value for %s: %q, ok=%v", k, v, ok)
-		}
-	}
-}

pkg/localcache/init.go

@@ -33,6 +33,10 @@ func InitLocalCache(localCache *config.LocalCache) {
 			Local config.CacheConfig
 			Keys  []string
 		}{
+			{
+				Local: localCache.Auth,
+				Keys:  []string{cachekey.UidPidToken},
+			},
 			{
 				Local: localCache.User,
 				Keys:  []string{cachekey.UserInfoKey, cachekey.UserGlobalRecvMsgOptKey},

pkg/localcache/lru/lru_expiration.go

@@ -52,53 +52,8 @@ type ExpirationLRU[K comparable, V any] struct {
 }
 
 func (x *ExpirationLRU[K, V]) GetBatch(keys []K, fetch func(keys []K) (map[K]V, error)) (map[K]V, error) {
-	var (
-		err     error
-		results = make(map[K]V)
-		misses  = make([]K, 0, len(keys))
-	)
-
-	for _, key := range keys {
-		x.lock.Lock()
-		v, ok := x.core.Get(key)
-		x.lock.Unlock()
-		if ok {
-			x.target.IncrGetHit()
-			v.lock.RLock()
-			results[key] = v.value
-			if v.err != nil && err == nil {
-				err = v.err
-			}
-			v.lock.RUnlock()
-			continue
-		}
-		misses = append(misses, key)
-	}
-
-	if len(misses) == 0 {
-		return results, err
-	}
-
-	fetchValues, fetchErr := fetch(misses)
-	if fetchErr != nil && err == nil {
-		err = fetchErr
-	}
-
-	for key, val := range fetchValues {
-		results[key] = val
-		if fetchErr != nil {
-			x.target.IncrGetFailed()
-			continue
-		}
-		x.target.IncrGetSuccess()
-		item := &expirationLruItem[V]{value: val}
-		x.lock.Lock()
-		x.core.Add(key, item)
-		x.lock.Unlock()
-	}
-
-	// any keys not returned from fetch remain absent (no cache write)
-	return results, err
+	//TODO implement me
+	panic("implement me")
 }
 
 func (x *ExpirationLRU[K, V]) Get(key K, fetch func() (V, error)) (V, error) {

pkg/localcache/lru/lru_slot.go

@@ -35,7 +35,7 @@ type slotLRU[K comparable, V any] struct {
 func (x *slotLRU[K, V]) GetBatch(keys []K, fetch func(keys []K) (map[K]V, error)) (map[K]V, error) {
 	var (
 		slotKeys = make(map[uint64][]K)
-		vs       = make(map[K]V)
+		kVs       = make(map[K]V)
 	)
 
 	for _, k := range keys {
@@ -49,10 +49,10 @@ func (x *slotLRU[K, V]) GetBatch(keys []K, fetch func(keys []K) (map[K]V, error)
 			return nil, err
 		}
 		for key, value := range batches {
-			vs[key] = value
+			kVs[key] = value
 		}
 	}
-	return vs, nil
+	return kVs, nil
 }
 
 func (x *slotLRU[K, V]) getIndex(k K) uint64 {

pkg/msgprocessor/conversation.go

@@ -109,7 +109,7 @@ func GetConversationIDBySessionType(sessionType int, ids ...string) string {
 	case constant.ReadGroupChatType:
 		return "sg_" + ids[0] // super group chat
 	case constant.NotificationChatType:
-		return "sn_" + strings.Join(ids, "_") // server notification chat
+		return "sn_" + ids[0] // server notification chat
 	}
 	return ""
 }

pkg/rpcli/conversation.go

@@ -2,7 +2,6 @@ package rpcli
 
 import (
 	"context"
-
 	"github.com/openimsdk/protocol/conversation"
 	"google.golang.org/grpc"
 )
@@ -31,6 +30,18 @@ func (x *ConversationClient) SetConversations(ctx context.Context, ownerUserIDs
 	return ignoreResp(x.ConversationClient.SetConversations(ctx, req))
 }
 
+func (x *ConversationClient) GetConversationsByConversationIDs(ctx context.Context, conversationIDs []string) ([]*conversation.Conversation, error) {
+	if len(conversationIDs) == 0 {
+		return nil, nil
+	}
+	req := &conversation.GetConversationsByConversationIDReq{ConversationIDs: conversationIDs}
+	return extractField(ctx, x.ConversationClient.GetConversationsByConversationID, req, (*conversation.GetConversationsByConversationIDResp).GetConversations)
+}
+
+func (x *ConversationClient) GetConversationsByConversationID(ctx context.Context, conversationID string) (*conversation.Conversation, error) {
+	return firstValue(x.GetConversationsByConversationIDs(ctx, []string{conversationID}))
+}
+
 func (x *ConversationClient) SetConversationMinSeq(ctx context.Context, conversationID string, ownerUserIDs []string, minSeq int64) error {
 	if len(ownerUserIDs) == 0 {
 		return nil

tools/seq/internal/seq.go

@@ -72,7 +72,7 @@ func Main(conf string, del time.Duration) error {
 	if err != nil {
 		return err
 	}
-
+	
 	mongodbConfig, err := readConfig[config.Mongo](conf, config.MongodbConfigFileName)
 	if err != nil {
 		return err

tools/stress-test-v2/main.go

@@ -1,735 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"os/signal"
-	"sync"
-	"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"
-	"github.com/openimsdk/protocol/group"
-	"github.com/openimsdk/protocol/sdkws"
-	pbuser "github.com/openimsdk/protocol/user"
-	"github.com/openimsdk/tools/log"
-	"github.com/openimsdk/tools/system/program"
-)
-
-// 1. Create 100K New Users
-// 2. Create 100 100K Groups
-// 3. Create 1000 999 Groups
-// 4. Send message to 100K Groups every second
-// 5. Send message to 999 Groups every minute
-
-var (
-	//  Use default userIDs List for testing, need to be created.
-	TestTargetUserList = []string{
-		// "<need-update-it>",
-	}
-	// DefaultGroupID = "<need-update-it>" // Use default group ID for testing, need to be created.
-)
-
-var (
-	ApiAddress string
-
-	// API method
-	GetAdminToken      = "/auth/get_admin_token"
-	UserCheck          = "/user/account_check"
-	CreateUser         = "/user/user_register"
-	ImportFriend       = "/friend/import_friend"
-	InviteToGroup      = "/group/invite_user_to_group"
-	GetGroupMemberInfo = "/group/get_group_members_info"
-	SendMsg            = "/msg/send_msg"
-	CreateGroup        = "/group/create_group"
-	GetUserToken       = "/auth/user_token"
-)
-
-const (
-	MaxUser            = 100000
-	Max100KGroup       = 100
-	Max999Group        = 1000
-	MaxInviteUserLimit = 999
-
-	CreateUserTicker         = 1 * time.Second
-	CreateGroupTicker        = 1 * time.Second
-	Create100KGroupTicker    = 1 * time.Second
-	Create999GroupTicker     = 1 * time.Second
-	SendMsgTo100KGroupTicker = 1 * time.Second
-	SendMsgTo999GroupTicker  = 1 * time.Minute
-)
-
-type BaseResp struct {
-	ErrCode int             `json:"errCode"`
-	ErrMsg  string          `json:"errMsg"`
-	Data    json.RawMessage `json:"data"`
-}
-
-type StressTest struct {
-	Conf                   *conf
-	AdminUserID            string
-	AdminToken             string
-	DefaultGroupID         string
-	DefaultUserID          string
-	UserCounter            int
-	CreateUserCounter      int
-	Create100kGroupCounter int
-	Create999GroupCounter  int
-	MsgCounter             int
-	CreatedUsers           []string
-	CreatedGroups          []string
-	Mutex                  sync.Mutex
-	Ctx                    context.Context
-	Cancel                 context.CancelFunc
-	HttpClient             *http.Client
-	Wg                     sync.WaitGroup
-	Once                   sync.Once
-}
-
-type conf struct {
-	Share config.Share
-	Api   config.API
-}
-
-func initConfig(configDir string) (*config.Share, *config.API, error) {
-	var (
-		share     = &config.Share{}
-		apiConfig = &config.API{}
-	)
-
-	err := config.Load(configDir, config.ShareFileName, config.EnvPrefixMap[config.ShareFileName], share)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	err = config.Load(configDir, config.OpenIMAPICfgFileName, config.EnvPrefixMap[config.OpenIMAPICfgFileName], apiConfig)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return share, apiConfig, nil
-}
-
-// Post Request
-func (st *StressTest) PostRequest(ctx context.Context, url string, reqbody any) ([]byte, error) {
-	// Marshal body
-	jsonBody, err := json.Marshal(reqbody)
-	if err != nil {
-		log.ZError(ctx, "Failed to marshal request body", err, "url", url, "reqbody", reqbody)
-		return nil, err
-	}
-
-	req, err := http.NewRequest(http.MethodPost, url, bytes.NewReader(jsonBody))
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("operationID", st.AdminUserID)
-	if st.AdminToken != "" {
-		req.Header.Set("token", st.AdminToken)
-	}
-
-	// log.ZInfo(ctx, "Header info is ", "Content-Type", "application/json", "operationID", st.AdminUserID, "token", st.AdminToken)
-
-	resp, err := st.HttpClient.Do(req)
-	if err != nil {
-		log.ZError(ctx, "Failed to send request", err, "url", url, "reqbody", reqbody)
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	respBody, err := io.ReadAll(resp.Body)
-	if err != nil {
-		log.ZError(ctx, "Failed to read response body", err, "url", url)
-		return nil, err
-	}
-
-	var baseResp BaseResp
-	if err := json.Unmarshal(respBody, &baseResp); err != nil {
-		log.ZError(ctx, "Failed to unmarshal response body", err, "url", url, "respBody", string(respBody))
-		return nil, err
-	}
-
-	if baseResp.ErrCode != 0 {
-		err = fmt.Errorf(baseResp.ErrMsg)
-		log.ZError(ctx, "Failed to send request", err, "url", url, "reqbody", reqbody, "resp", baseResp)
-		return nil, err
-	}
-
-	return baseResp.Data, nil
-}
-
-func (st *StressTest) GetAdminToken(ctx context.Context) (string, error) {
-	req := auth.GetAdminTokenReq{
-		Secret: st.Conf.Share.Secret,
-		UserID: st.AdminUserID,
-	}
-
-	resp, err := st.PostRequest(ctx, ApiAddress+GetAdminToken, &req)
-	if err != nil {
-		return "", err
-	}
-
-	data := &auth.GetAdminTokenResp{}
-	if err := json.Unmarshal(resp, &data); err != nil {
-		return "", err
-	}
-
-	return data.Token, nil
-}
-
-func (st *StressTest) CheckUser(ctx context.Context, userIDs []string) ([]string, error) {
-	req := pbuser.AccountCheckReq{
-		CheckUserIDs: userIDs,
-	}
-
-	resp, err := st.PostRequest(ctx, ApiAddress+UserCheck, &req)
-	if err != nil {
-		return nil, err
-	}
-
-	data := &pbuser.AccountCheckResp{}
-	if err := json.Unmarshal(resp, &data); err != nil {
-		return nil, err
-	}
-
-	unRegisteredUserIDs := make([]string, 0)
-
-	for _, res := range data.Results {
-		if res.AccountStatus == constant.UnRegistered {
-			unRegisteredUserIDs = append(unRegisteredUserIDs, res.UserID)
-		}
-	}
-
-	return unRegisteredUserIDs, nil
-}
-
-func (st *StressTest) CreateUser(ctx context.Context, userID string) (string, error) {
-	user := &sdkws.UserInfo{
-		UserID:   userID,
-		Nickname: userID,
-	}
-
-	req := pbuser.UserRegisterReq{
-		Users: []*sdkws.UserInfo{user},
-	}
-
-	_, err := st.PostRequest(ctx, ApiAddress+CreateUser, &req)
-	if err != nil {
-		return "", err
-	}
-
-	st.UserCounter++
-	return userID, nil
-}
-
-func (st *StressTest) CreateUserBatch(ctx context.Context, userIDs []string) error {
-	// The method can import a large number of users at once.
-	var userList []*sdkws.UserInfo
-
-	defer st.Once.Do(
-		func() {
-			st.DefaultUserID = userIDs[0]
-			fmt.Println("Default Send User Created ID:", st.DefaultUserID)
-		})
-
-	needUserIDs, err := st.CheckUser(ctx, userIDs)
-	if err != nil {
-		return err
-	}
-
-	for _, userID := range needUserIDs {
-		user := &sdkws.UserInfo{
-			UserID:   userID,
-			Nickname: userID,
-		}
-		userList = append(userList, user)
-	}
-
-	req := pbuser.UserRegisterReq{
-		Users: userList,
-	}
-
-	_, err = st.PostRequest(ctx, ApiAddress+CreateUser, &req)
-	if err != nil {
-		return err
-	}
-
-	st.UserCounter += len(userList)
-	return nil
-}
-
-func (st *StressTest) GetGroupMembersInfo(ctx context.Context, groupID string, userIDs []string) ([]string, error) {
-	needInviteUserIDs := make([]string, 0)
-
-	const maxBatchSize = 500
-	if len(userIDs) > maxBatchSize {
-		for i := 0; i < len(userIDs); i += maxBatchSize {
-			end := min(i+maxBatchSize, len(userIDs))
-			batchUserIDs := userIDs[i:end]
-
-			// log.ZInfo(ctx, "Processing group members batch", "groupID", groupID, "batch", i/maxBatchSize+1,
-			// 	"batchUserCount", len(batchUserIDs))
-
-			// Process a single batch
-			batchReq := group.GetGroupMembersInfoReq{
-				GroupID: groupID,
-				UserIDs: batchUserIDs,
-			}
-
-			resp, err := st.PostRequest(ctx, ApiAddress+GetGroupMemberInfo, &batchReq)
-			if err != nil {
-				log.ZError(ctx, "Batch query failed", err, "batch", i/maxBatchSize+1)
-				continue
-			}
-
-			data := &group.GetGroupMembersInfoResp{}
-			if err := json.Unmarshal(resp, &data); err != nil {
-				log.ZError(ctx, "Failed to parse batch response", err, "batch", i/maxBatchSize+1)
-				continue
-			}
-
-			// Process the batch results
-			existingMembers := make(map[string]bool)
-			for _, member := range data.Members {
-				existingMembers[member.UserID] = true
-			}
-
-			for _, userID := range batchUserIDs {
-				if !existingMembers[userID] {
-					needInviteUserIDs = append(needInviteUserIDs, userID)
-				}
-			}
-		}
-
-		return needInviteUserIDs, nil
-	}
-
-	req := group.GetGroupMembersInfoReq{
-		GroupID: groupID,
-		UserIDs: userIDs,
-	}
-
-	resp, err := st.PostRequest(ctx, ApiAddress+GetGroupMemberInfo, &req)
-	if err != nil {
-		return nil, err
-	}
-
-	data := &group.GetGroupMembersInfoResp{}
-	if err := json.Unmarshal(resp, &data); err != nil {
-		return nil, err
-	}
-
-	existingMembers := make(map[string]bool)
-	for _, member := range data.Members {
-		existingMembers[member.UserID] = true
-	}
-
-	for _, userID := range userIDs {
-		if !existingMembers[userID] {
-			needInviteUserIDs = append(needInviteUserIDs, userID)
-		}
-	}
-
-	return needInviteUserIDs, nil
-}
-
-func (st *StressTest) InviteToGroup(ctx context.Context, groupID string, userIDs []string) error {
-	req := group.InviteUserToGroupReq{
-		GroupID:        groupID,
-		InvitedUserIDs: userIDs,
-	}
-	_, err := st.PostRequest(ctx, ApiAddress+InviteToGroup, &req)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (st *StressTest) SendMsg(ctx context.Context, userID string, groupID string) error {
-	contentObj := map[string]any{
-		// "content": fmt.Sprintf("index %d. The current time is %s", st.MsgCounter, time.Now().Format("2006-01-02 15:04:05.000")),
-		"content": fmt.Sprintf("The current time is %s", time.Now().Format("2006-01-02 15:04:05.000")),
-	}
-
-	req := &apistruct.SendMsgReq{
-		SendMsg: apistruct.SendMsg{
-			SendID:         userID,
-			SenderNickname: userID,
-			GroupID:        groupID,
-			ContentType:    constant.Text,
-			SessionType:    constant.ReadGroupChatType,
-			Content:        contentObj,
-		},
-	}
-
-	_, err := st.PostRequest(ctx, ApiAddress+SendMsg, &req)
-	if err != nil {
-		log.ZError(ctx, "Failed to send message", err, "userID", userID, "req", &req)
-		return err
-	}
-
-	st.MsgCounter++
-
-	return nil
-}
-
-// Max userIDs number is 1000
-func (st *StressTest) CreateGroup(ctx context.Context, groupID string, userID string, userIDsList []string) (string, error) {
-	groupInfo := &sdkws.GroupInfo{
-		GroupID:   groupID,
-		GroupName: groupID,
-		GroupType: constant.WorkingGroup,
-	}
-
-	req := group.CreateGroupReq{
-		OwnerUserID:   userID,
-		MemberUserIDs: userIDsList,
-		GroupInfo:     groupInfo,
-	}
-
-	resp := group.CreateGroupResp{}
-
-	response, err := st.PostRequest(ctx, ApiAddress+CreateGroup, &req)
-	if err != nil {
-		return "", err
-	}
-
-	if err := json.Unmarshal(response, &resp); err != nil {
-		return "", err
-	}
-
-	// st.GroupCounter++
-
-	return resp.GroupInfo.GroupID, nil
-}
-
-func main() {
-	var configPath string
-	// defaultConfigDir := filepath.Join("..", "..", "..", "..", "..", "config")
-	// flag.StringVar(&configPath, "c", defaultConfigDir, "config path")
-	flag.StringVar(&configPath, "c", "", "config path")
-	flag.Parse()
-
-	if configPath == "" {
-		_, _ = fmt.Fprintln(os.Stderr, "config path is empty")
-		os.Exit(1)
-		return
-	}
-
-	fmt.Printf(" Config Path: %s\n", configPath)
-
-	share, apiConfig, err := initConfig(configPath)
-	if err != nil {
-		program.ExitWithError(err)
-		return
-	}
-
-	ApiAddress = fmt.Sprintf("http://%s:%s", "127.0.0.1", fmt.Sprint(apiConfig.Api.Ports[0]))
-
-	ctx, cancel := context.WithCancel(context.Background())
-	// ch := make(chan struct{})
-
-	st := &StressTest{
-		Conf: &conf{
-			Share: *share,
-			Api:   *apiConfig,
-		},
-		AdminUserID: share.IMAdminUser.UserIDs[0],
-		Ctx:         ctx,
-		Cancel:      cancel,
-		HttpClient: &http.Client{
-			Timeout: 50 * time.Second,
-		},
-	}
-
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
-	go func() {
-		<-c
-		fmt.Println("\nReceived stop signal, stopping...")
-
-		go func() {
-			// time.Sleep(5 * time.Second)
-			fmt.Println("Force exit")
-			os.Exit(0)
-		}()
-
-		st.Cancel()
-	}()
-
-	token, err := st.GetAdminToken(st.Ctx)
-	if err != nil {
-		log.ZError(ctx, "Get Admin Token failed.", err, "AdminUserID", st.AdminUserID)
-	}
-
-	st.AdminToken = token
-	fmt.Println("Admin Token:", st.AdminToken)
-	fmt.Println("ApiAddress:", ApiAddress)
-	for i := 0; i < MaxUser; i++ {
-		userID := fmt.Sprintf("v2_StressTest_User_%d", i)
-		st.CreatedUsers = append(st.CreatedUsers, userID)
-		st.CreateUserCounter++
-	}
-
-	// err = st.CreateUserBatch(st.Ctx, st.CreatedUsers)
-	// if err != nil {
-	// 	log.ZError(ctx, "Create user failed.", err)
-	// }
-
-	const batchSize = 1000
-	totalUsers := len(st.CreatedUsers)
-	successCount := 0
-
-	if st.DefaultUserID == "" && len(st.CreatedUsers) > 0 {
-		st.DefaultUserID = st.CreatedUsers[0]
-	}
-
-	for i := 0; i < totalUsers; i += batchSize {
-		end := min(i+batchSize, totalUsers)
-
-		userBatch := st.CreatedUsers[i:end]
-		log.ZInfo(st.Ctx, "Creating user batch", "batch", i/batchSize+1, "count", len(userBatch))
-
-		err = st.CreateUserBatch(st.Ctx, userBatch)
-		if err != nil {
-			log.ZError(st.Ctx, "Batch user creation failed", err, "batch", i/batchSize+1)
-		} else {
-			successCount += len(userBatch)
-			log.ZInfo(st.Ctx, "Batch user creation succeeded", "batch", i/batchSize+1,
-				"progress", fmt.Sprintf("%d/%d", successCount, totalUsers))
-		}
-	}
-
-	// Execute create 100k group
-	st.Wg.Add(1)
-	go func() {
-		defer st.Wg.Done()
-
-		create100kGroupTicker := time.NewTicker(Create100KGroupTicker)
-		defer create100kGroupTicker.Stop()
-
-		for i := 0; i < Max100KGroup; i++ {
-			select {
-			case <-st.Ctx.Done():
-				log.ZInfo(st.Ctx, "Stop Create 100K Group")
-				return
-
-			case <-create100kGroupTicker.C:
-				// Create 100K groups
-				st.Wg.Add(1)
-				go func(idx int) {
-					defer st.Wg.Done()
-					defer func() {
-						st.Create100kGroupCounter++
-					}()
-
-					groupID := fmt.Sprintf("v2_StressTest_Group_100K_%d", idx)
-
-					if _, err = st.CreateGroup(st.Ctx, groupID, st.DefaultUserID, TestTargetUserList); err != nil {
-						log.ZError(st.Ctx, "Create group failed.", err)
-						// continue
-					}
-
-					for i := 0; i < MaxUser/MaxInviteUserLimit; i++ {
-						InviteUserIDs := make([]string, 0)
-						// ensure TargetUserList is in group
-						InviteUserIDs = append(InviteUserIDs, TestTargetUserList...)
-
-						startIdx := max(i*MaxInviteUserLimit, 1)
-						endIdx := min((i+1)*MaxInviteUserLimit, MaxUser)
-
-						for j := startIdx; j < endIdx; j++ {
-							userCreatedID := fmt.Sprintf("v2_StressTest_User_%d", j)
-							InviteUserIDs = append(InviteUserIDs, userCreatedID)
-						}
-
-						if len(InviteUserIDs) == 0 {
-							log.ZWarn(st.Ctx, "InviteUserIDs is empty", nil, "groupID", groupID)
-							continue
-						}
-
-						InviteUserIDs, err := st.GetGroupMembersInfo(ctx, groupID, InviteUserIDs)
-						if err != nil {
-							log.ZError(st.Ctx, "GetGroupMembersInfo failed.", err, "groupID", groupID)
-							continue
-						}
-
-						if len(InviteUserIDs) == 0 {
-							log.ZWarn(st.Ctx, "InviteUserIDs is empty", nil, "groupID", groupID)
-							continue
-						}
-
-						// Invite To Group
-						if err = st.InviteToGroup(st.Ctx, groupID, InviteUserIDs); err != nil {
-							log.ZError(st.Ctx, "Invite To Group failed.", err, "UserID", InviteUserIDs)
-							continue
-							// os.Exit(1)
-							// return
-						}
-					}
-				}(i)
-			}
-		}
-	}()
-
-	// create 999 groups
-	st.Wg.Add(1)
-	go func() {
-		defer st.Wg.Done()
-
-		create999GroupTicker := time.NewTicker(Create999GroupTicker)
-		defer create999GroupTicker.Stop()
-
-		for i := 0; i < Max999Group; i++ {
-			select {
-			case <-st.Ctx.Done():
-				log.ZInfo(st.Ctx, "Stop Create 999 Group")
-				return
-
-			case <-create999GroupTicker.C:
-				// Create 999 groups
-				st.Wg.Add(1)
-				go func(idx int) {
-					defer st.Wg.Done()
-					defer func() {
-						st.Create999GroupCounter++
-					}()
-
-					groupID := fmt.Sprintf("v2_StressTest_Group_1K_%d", idx)
-
-					if _, err = st.CreateGroup(st.Ctx, groupID, st.DefaultUserID, TestTargetUserList); err != nil {
-						log.ZError(st.Ctx, "Create group failed.", err)
-						// continue
-					}
-					for i := 0; i < MaxUser/MaxInviteUserLimit; i++ {
-						InviteUserIDs := make([]string, 0)
-						// ensure TargetUserList is in group
-						InviteUserIDs = append(InviteUserIDs, TestTargetUserList...)
-
-						startIdx := max(i*MaxInviteUserLimit, 1)
-						endIdx := min((i+1)*MaxInviteUserLimit, MaxUser)
-
-						for j := startIdx; j < endIdx; j++ {
-							userCreatedID := fmt.Sprintf("v2_StressTest_User_%d", j)
-							InviteUserIDs = append(InviteUserIDs, userCreatedID)
-						}
-
-						if len(InviteUserIDs) == 0 {
-							log.ZWarn(st.Ctx, "InviteUserIDs is empty", nil, "groupID", groupID)
-							continue
-						}
-
-						InviteUserIDs, err := st.GetGroupMembersInfo(ctx, groupID, InviteUserIDs)
-						if err != nil {
-							log.ZError(st.Ctx, "GetGroupMembersInfo failed.", err, "groupID", groupID)
-							continue
-						}
-
-						if len(InviteUserIDs) == 0 {
-							log.ZWarn(st.Ctx, "InviteUserIDs is empty", nil, "groupID", groupID)
-							continue
-						}
-
-						// Invite To Group
-						if err = st.InviteToGroup(st.Ctx, groupID, InviteUserIDs); err != nil {
-							log.ZError(st.Ctx, "Invite To Group failed.", err, "UserID", InviteUserIDs)
-							continue
-							// os.Exit(1)
-							// return
-						}
-					}
-				}(i)
-			}
-		}
-	}()
-
-	// Send message to 100K groups
-	st.Wg.Wait()
-	fmt.Println("All groups created successfully, starting to send messages...")
-	log.ZInfo(ctx, "All groups created successfully, starting to send messages...")
-
-	var groups100K []string
-	var groups999 []string
-
-	for i := 0; i < Max100KGroup; i++ {
-		groupID := fmt.Sprintf("v2_StressTest_Group_100K_%d", i)
-		groups100K = append(groups100K, groupID)
-	}
-
-	for i := 0; i < Max999Group; i++ {
-		groupID := fmt.Sprintf("v2_StressTest_Group_1K_%d", i)
-		groups999 = append(groups999, groupID)
-	}
-
-	send100kGroupLimiter := make(chan struct{}, 20)
-	send999GroupLimiter := make(chan struct{}, 100)
-
-	// execute Send message to 100K groups
-	go func() {
-		ticker := time.NewTicker(SendMsgTo100KGroupTicker)
-		defer ticker.Stop()
-
-		for {
-			select {
-			case <-st.Ctx.Done():
-				log.ZInfo(st.Ctx, "Stop Send Message to 100K Group")
-				return
-
-			case <-ticker.C:
-				// Send message to 100K groups
-				for _, groupID := range groups100K {
-					send100kGroupLimiter <- struct{}{}
-					go func(groupID string) {
-						defer func() { <-send100kGroupLimiter }()
-						if err := st.SendMsg(st.Ctx, st.DefaultUserID, groupID); err != nil {
-							log.ZError(st.Ctx, "Send message to 100K group failed.", err)
-						}
-					}(groupID)
-				}
-				// log.ZInfo(st.Ctx, "Send message to 100K groups successfully.")
-			}
-		}
-	}()
-
-	// execute Send message to 999 groups
-	go func() {
-		ticker := time.NewTicker(SendMsgTo999GroupTicker)
-		defer ticker.Stop()
-
-		for {
-			select {
-			case <-st.Ctx.Done():
-				log.ZInfo(st.Ctx, "Stop Send Message to 999 Group")
-				return
-
-			case <-ticker.C:
-				// Send message to 999 groups
-				for _, groupID := range groups999 {
-					send999GroupLimiter <- struct{}{}
-					go func(groupID string) {
-						defer func() { <-send999GroupLimiter }()
-
-						if err := st.SendMsg(st.Ctx, st.DefaultUserID, groupID); err != nil {
-							log.ZError(st.Ctx, "Send message to 999 group failed.", err)
-						}
-					}(groupID)
-				}
-				// log.ZInfo(st.Ctx, "Send message to 999 groups successfully.")
-			}
-		}
-	}()
-
-	<-st.Ctx.Done()
-	fmt.Println("Received signal to exit, shutting down...")
-}