clean code

groupJoinReqEvent添加字段 invitor_id

.github/ISSUE_TEMPLATE/bug--.md

@@ -1,46 +0,0 @@
----
-name: Bug汇报
-about: 遇到了bug? 你可以在这里开始汇报（仅限软件本体问题）
-title: ''
-labels: bug?
-assignees: ''
-
----
-
-<!--
-
-！请不要删除此处内容！
-
-在您发布此Issue前, 请您花一点时间查看下面几条指引🔽
-
-1: ❗ | 确定没有相同问题的ISSUE已被提出. (教程: https://github.com/Mrs4s/go-cqhttp/issues/633)
-2: 🌎| 请准确填写环境信息.
-3: ❔ | 打开DEBUG模式复现，并提供出现问题前后至少 10 秒的完整日志内容。请自行删除日志内存在的个人信息及敏感内容。
-4: ⚠ | 如果涉及内存泄漏/CPU占用异常请打开DEBUG模式并下载pprof性能分析.
-
-注: 如果您不知道如何有效、精准地表述，我们建议您先阅读《提问的智慧》
-(链接: https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/main/README-zh_CN.md)
-
-请确保您已经仔细阅读此教程，并勾选下方的确认框。(将 [ ] 修改为 [x])
---------
-- [ ] 我已经仔细阅读上述教程和"提问前需知 [图+文]": https://github.com/Mrs4s/go-cqhttp/issues/633
-- [ ] 我已知晓并同意，如果我不遵循以下格式提交 Issue，或者我使用的并非最新版本，或者我没有提供足够的环境信息，则我的 Issue 可能会被无条件自动关闭和锁定。
-- [ ] 我已知晓并同意，我仅需要把选项前的 [ ] 替换为 [x]。如果我删除、修改这些复选框的其他部分，或是在 x 之前或之后留了空格，则我的 Issue 可能会被无条件自动关闭和锁定。
-- [ ] 我已知晓并同意，此处仅用于汇报程序中存在的问题。若这个 Issue 是关于其他非程序本身问题或是新功能需求，则我的 Issue 可能会被无条件自动关闭和锁定。（这些问题应当在 Discussion 板块提出。）
---------
--->
-
-**环境信息**
-<!-- 请根据实际使用环境修改以下信息。请勿删除或留空。 -->
-go-cqhttp版本: 
-运行环境: 
-连接方式: 
-使用协议: 
-
-**在最新的release版本中能否复现**
-
-**bug内容**
-<!-- 请在这里详细描述bug的内容 -->
-
-**复现方法**
-<!-- 请在这里分步骤的描述如何复现这个bug -->

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -0,0 +1,157 @@
+name: 回报错误
+description: 在使用 go-cqhttp 的过程中遇到了错误
+title: '[Bug]: '
+labels: [ "bug?" ]
+
+body:
+  # User's README and agreement
+  - type: markdown
+    attributes:
+      value: |
+        ## 感谢您愿意填写错误回报！
+        ## 以下是一些注意事项，请务必阅读让我们能够更容易处理
+
+        ### ❗ | 确定没有相同问题的ISSUE已被提出. (教程: https://forums.go-cqhttp.org/t/topic/141)
+        ### 🌎| 请准确填写环境信息
+        ### ❔ | 打开DEBUG模式复现，并提供出现问题前后至少 10 秒的完整日志内容。请自行删除日志内存在的个人信息及敏感内容。
+        ### ⚠ | 如果涉及内存泄漏/CPU占用异常请打开DEBUG模式并下载pprof性能分析.
+
+        ## 如果您不知道如何有效、精准地表述，我们建议您先阅读《提问的智慧》
+        链接: [《提问的智慧》](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/main/README-zh_CN.md)
+        ---
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: 请确保您已阅读以上注意事项，并勾选下方的确认框。
+      options:
+        - label: "我已经仔细阅读上述教程和 [\"提问前需知\"](https://forums.go-cqhttp.org/t/topic/141)"
+          required: true
+        - label: "我已经使用 [dev分支版本](https://github.com/Mrs4s/go-cqhttp/actions/workflows/ci.yml) 测试过，问题依旧存在。"
+          required: true
+        - label: "我已经在 [Issue Tracker](https://github.com/Mrs4s/go-cqhttp/issues) 中找过我要提出的问题，没有找到相同问题的ISSUE。"
+          required: true
+        - label: 我已知晓并同意，此处仅用于汇报程序中存在的问题。若这个 Issue 是关于其他非程序本身问题，则我的 Issue 可能会被无条件自动关闭或/并锁定。（这些问题应当在 Discussion 板块提出。）
+          required: true
+
+  # User's data
+  - type: markdown
+    attributes:
+      value: |
+        ## 环境信息
+        请根据实际使用环境修改以下信息。
+
+  # Env | go-cqhttp Version
+  - type: input
+    id: env-gocq-ver
+    attributes:
+      label: go-cqhttp 版本
+    validations:
+      required: true
+
+  # Env | VM Version
+  - type: dropdown
+    id: env-vm-ver
+    attributes:
+      label: 运行环境
+      description: 选择运行 go-cqhttp 的系统版本
+      options:
+        - Windows (64)
+        - Windows (32/x84)
+        - MacOS
+        - Linux
+        - Ubuntu
+        - CentOS
+        - ArchLinux
+        - UNIX (Android)
+        - 其它（请在下方说明）
+    validations:
+      required: true
+
+  # Env | VM Arch
+  - type: dropdown
+    id: env-vm-arch
+    attributes:
+      label: 运行架构
+      description: (可选) 选择运行 go-cqhttp 的系统架构
+      options:
+        - AMD64
+        - x86
+        - ARM [32] (别名：AArch32 / ARMv7）
+        - ARM [64] (别名：AArch64 / ARMv8）
+        - 其它
+
+  # Env | Connection type
+  - type: dropdown
+    id: env-conn-type
+    attributes:
+      label: 连接方式
+      description: 选择对接机器人的连接方式
+      options:
+        - HTTP
+        - WebSocket (正向)
+        - WebSocket (反向)
+        - LambdaServer
+    validations:
+      required: true
+
+  # Env | Protocol
+  - type: dropdown
+    id: env-protocol
+    attributes:
+      label: 使用协议
+      description: 选择使用的协议
+      options:
+        - 0 | iPad
+        - 1 | Android Phone
+        - 2 | Android Watch
+        - 3 | MacOS
+        - 4 | 企点
+    validations:
+      required: true
+
+  # Input | Reproduce
+  - type: textarea
+    id: reproduce-steps
+    attributes:
+      label: 重现步骤
+      description: |
+        我们需要执行哪些操作才能让 bug 出现？
+        简洁清晰的重现步骤能够帮助我们更迅速地定位问题所在。
+    validations:
+      required: true
+
+  # Input | Expected result
+  - type: textarea
+    id: expected
+    attributes:
+      label: 期望的结果是什么？
+    validations:
+      required: true
+
+  # Input | Actual result
+  - type: textarea
+    id: actual
+    attributes:
+      label: 实际的结果是什么？
+    validations:
+      required: true
+
+  # Optional | Reproduce code
+  - type: textarea
+    id: reproduce-code
+    attributes:
+      label: 简单的复现代码/链接（可选）
+      render: golang
+
+  # Optional | Logging
+  - type: textarea
+    id: logging
+    attributes:
+      label: 日志记录（可选）
+      render: golang
+
+  # Optional | Extra description
+  - type: textarea
+    id: extra-desc
+    attributes:
+      label: 补充说明（可选）

.github/workflows/build_docker_image.yml

@@ -0,0 +1,76 @@
+name: Build And Push Docker Image
+
+on:
+  push:
+    branches:
+      - 'master'
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      packages: write
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set time zone
+        uses: szenius/set-timezone@v1.0
+        with:
+          timezoneLinux: "Asia/Shanghai"
+          timezoneMacos: "Asia/Shanghai"
+          timezoneWindows: "China Standard Time"
+
+      # # 如果有 dockerhub 账户，可以在github的secrets中配置下面两个，然后取消下面注释的这几行，并在meta步骤的images增加一行 ${{ github.repository }}
+      # - name: Login to DockerHub
+      #   uses: docker/login-action@v1
+      #   with:
+      #     username: ${{ secrets.DOCKERHUB_USERNAME }}
+      #     password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to GHCR
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            ghcr.io/${{ github.repository }}
+          # generate Docker tags based on the following events/attributes
+          #   nightly, master, pr-2, 1.2.3, 1.2, 1
+          tags: |
+            type=schedule,pattern=nightly
+            type=edge
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/ci.yml

@@ -5,8 +5,8 @@ on: [push, pull_request,workflow_dispatch]
 env:
   BINARY_PREFIX: "go-cqhttp_"
   BINARY_SUFFIX: ""
+  COMMIT_ID: "${{ github.sha }}"
   PR_PROMPT: "::warning:: Build artifact will not be uploaded due to the workflow is trigged by pull request."
-  LD_FLAGS: "-w -s"
 
 jobs:
   build:
@@ -28,7 +28,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.17
+          go-version: 1.19
       - name: Cache downloaded module
         uses: actions/cache@v2
         with:
@@ -46,6 +46,7 @@ jobs:
           if $IS_PR ; then echo $PR_PROMPT; fi
           export BINARY_NAME="$BINARY_PREFIX$GOOS_$GOARCH$BINARY_SUFFIX"
           export CGO_ENABLED=0
+          export LD_FLAGS="-w -s -X github.com/Mrs4s/go-cqhttp/internal/base.Version=${COMMIT_ID::7}"
           go build -o "output/$BINARY_NAME" -trimpath -ldflags "$LD_FLAGS" .
       - name: Upload artifact
         uses: actions/upload-artifact@v2

.github/workflows/golint.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.17
+          go-version: 1.19
 
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
@@ -37,4 +37,5 @@ jobs:
         if: ${{ github.event.pull_request }}
         uses: reviewdog/action-suggester@v1
         with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
           tool_name: golangci-lint

.github/workflows/issuebot.yml

@@ -1,12 +0,0 @@
-name: Issuebot
-
-on:
-  issues:
-    types: [opened, edited]
-
-jobs:
-  new_issue:
-    name: Run Issuebot on new Issue
-    runs-on: ubuntu-latest
-    steps:
-      - uses: wfjsw/actions-gocqhttp-issue-prefilter@master

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.19'
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2

.gitignore

@@ -7,3 +7,11 @@ session.token
 device.json
 data/
 logs/
+internal/btree/*.lock
+internal/btree/*.db
+
+# binary builds
+go-cqhttp
+
+# macos
+.DS_Store

.golangci.yml

@@ -22,35 +22,24 @@ linters:
   fast: false
   enable:
     - bodyclose
-    - deadcode
-    - depguard
-    - dogsled
-    - dupl
+    - durationcheck
+    - gofmt
+    - goimports
     - errcheck
     - exportloopref
     - exhaustive
-    #- funlen
-    #- goconst
+    - bidichk
     - gocritic
-    #- gocyclo
-    - gofmt
-    - goimports
-    - goprintffuncname
-    #- gosec
     - gosimple
     - govet
     - ineffassign
-    #- misspell
-    - nolintlint
-    - rowserrcheck
+    #- nolintlint
     - staticcheck
-    - structcheck
     - stylecheck
-    - typecheck
     - unconvert
+    - usestdlibvars
     - unparam
     - unused
-    - varcheck
     - whitespace
     - prealloc
     - predeclared
@@ -58,20 +47,6 @@ linters:
     - revive
     - forbidigo
     - makezero
-    #- interfacer
-
-  # don't enable:
-  # - scopelint
-  # - gochecknoglobals
-  # - gocognit
-  # - godot
-  # - godox
-  # - goerr113
-  # - interfacer
-  # - maligned
-  # - nestif
-  # - testpackage
-  # - wsl
 
 run:
   # default concurrency is a available CPU number.
@@ -80,6 +55,7 @@ run:
   issues-exit-code: 1
   skip-dirs:
     - db
+    - cmd/api-generator
   tests: true
 
 # output configuration options

.goreleaser.yml

@@ -3,6 +3,9 @@ env:
 before:
   hooks:
     - go mod tidy
+release:
+  draft: true
+  discussion_category_name: General
 builds:
   - id: nowin
     env:
@@ -12,17 +15,17 @@ builds:
       - linux
       - darwin
     goarch:
-      - 386
+      - '386'
       - amd64
       - arm
       - arm64
     goarm:
-      - 7
+      - '7'
     ignore:
       - goos: darwin
         goarch: arm
       - goos: darwin
-        goarch: 386
+        goarch: '386'
     mod_timestamp: "{{ .CommitTimestamp }}"
     flags:
       - -trimpath
@@ -35,17 +38,17 @@ builds:
     goos:
       - windows
     goarch:
-      - 386
+      - '386'
       - amd64
       - arm
       - arm64
     goarm:
-      - 7
+      - '7'
     mod_timestamp: "{{ .CommitTimestamp }}"
     flags:
       - -trimpath
     ldflags:
-      - -s -w -X github.com/Mrs4s/go-cqhttp/coolq.Version=v{{.Version}}
+      - -s -w -X github.com/Mrs4s/go-cqhttp/internal/base.Version=v{{.Version}}
 
 checksum:
   name_template: "{{ .ProjectName }}_checksums.txt"

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.17-alpine AS builder
+FROM golang:1.19-alpine AS builder
 
 RUN go env -w GO111MODULE=auto \
   && go env -w CGO_ENABLED=0 \
@@ -14,11 +14,31 @@ RUN set -ex \
 
 FROM alpine:latest
 
-RUN apk add --no-cache ffmpeg
+COPY docker-entrypoint.sh /docker-entrypoint.sh
 
-COPY --from=builder /build/cqhttp /usr/bin/cqhttp
-RUN chmod +x /usr/bin/cqhttp
+RUN chmod +x /docker-entrypoint.sh && \
+    apk add --no-cache --update \
+      ffmpeg \
+      coreutils \
+      shadow \
+      su-exec && \
+    rm -rf /var/cache/apk/* && \
+    mkdir -p /app && \
+    mkdir -p /data && \
+    mkdir -p /config && \
+    useradd -d /config -s /bin/sh abc && \
+    chown -R abc /config && \
+    chown -R abc /data
+
+ENV TZ="Asia/Shanghai"
+ENV UID=99
+ENV GID=100
+ENV UMASK=002
+
+COPY --from=builder /build/cqhttp /app/
 
 WORKDIR /data
 
-ENTRYPOINT [ "/usr/bin/cqhttp" ]
+VOLUME [ "/data" ]
+
+ENTRYPOINT [ "/docker-entrypoint.sh" ]

README.md

@@ -44,7 +44,7 @@ _✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://git
 
 
 ## 兼容性
-go-cqhttp 兼容 [OneBot-v11](https://github.com/howmanybots/onebot/tree/master/v11/specs) 绝大多数内容，并在其基础上做了一些扩展，详情请看 go-cqhttp 的文档。
+go-cqhttp 兼容 [OneBot-v11](https://github.com/botuniverse/onebot-11) 绝大多数内容，并在其基础上做了一些扩展，详情请看 go-cqhttp 的文档。
 
 ### 接口
 
@@ -86,18 +86,18 @@ go-cqhttp 兼容 [OneBot-v11](https://github.com/howmanybots/onebot/tree/master/
 | [CQ:xml]     | [XML 消息]                  |
 | [CQ:json]    | [JSON 消息]                 |
 
-[qq 表情]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#qq-%E8%A1%A8%E6%83%85
-[语音]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E8%AF%AD%E9%9F%B3
-[短视频]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E7%9F%AD%E8%A7%86%E9%A2%91
-[@某人]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E6%9F%90%E4%BA%BA
-[链接分享]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E9%93%BE%E6%8E%A5%E5%88%86%E4%BA%AB
-[音乐分享]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E9%9F%B3%E4%B9%90%E5%88%86%E4%BA%AB-
-[音乐自定义分享]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E9%9F%B3%E4%B9%90%E8%87%AA%E5%AE%9A%E4%B9%89%E5%88%86%E4%BA%AB-
-[回复]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E5%9B%9E%E5%A4%8D
-[合并转发]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91-
-[合并转发节点]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E8%8A%82%E7%82%B9-
-[xml 消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#xml-%E6%B6%88%E6%81%AF
-[json 消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/message/segment.md#json-%E6%B6%88%E6%81%AF
+[qq 表情]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#qq-%E8%A1%A8%E6%83%85
+[语音]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E8%AF%AD%E9%9F%B3
+[短视频]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E7%9F%AD%E8%A7%86%E9%A2%91
+[@某人]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E6%9F%90%E4%BA%BA
+[链接分享]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E9%93%BE%E6%8E%A5%E5%88%86%E4%BA%AB
+[音乐分享]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E9%9F%B3%E4%B9%90%E5%88%86%E4%BA%AB-
+[音乐自定义分享]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E9%9F%B3%E4%B9%90%E8%87%AA%E5%AE%9A%E4%B9%89%E5%88%86%E4%BA%AB-
+[回复]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E5%9B%9E%E5%A4%8D
+[合并转发]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91-
+[合并转发节点]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E8%8A%82%E7%82%B9-
+[xml 消息]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#xml-%E6%B6%88%E6%81%AF
+[json 消息]: https://github.com/botuniverse/onebot-11/blob/master/message/segment.md#json-%E6%B6%88%E6%81%AF
 
 #### 拓展 CQ 码及与 OneBot 标准有略微差异的 CQ 码
 
@@ -106,7 +106,6 @@ go-cqhttp 兼容 [OneBot-v11](https://github.com/howmanybots/onebot/tree/master/
 | [CQ:image]     | [图片]                            |
 | [CQ:redbag]    | [红包]                            |
 | [CQ:poke]      | [戳一戳]                          |
-| [CQ:gift]      | [礼物]                            |
 | [CQ:node]      | [合并转发消息节点]                |
 | [CQ:cardimage] | [一种 xml 的图片消息（装逼大图）] |
 | [CQ:tts]       | [文本转语音]                      |
@@ -114,7 +113,6 @@ go-cqhttp 兼容 [OneBot-v11](https://github.com/howmanybots/onebot/tree/master/
 [图片]: https://docs.go-cqhttp.org/cqcode/#%E5%9B%BE%E7%89%87
 [红包]: https://docs.go-cqhttp.org/cqcode/#%E7%BA%A2%E5%8C%85
 [戳一戳]: https://docs.go-cqhttp.org/cqcode/#%E6%88%B3%E4%B8%80%E6%88%B3
-[礼物]: https://docs.go-cqhttp.org/cqcode/#%E7%A4%BC%E7%89%A9
 [合并转发消息节点]: https://docs.go-cqhttp.org/cqcode/#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E6%B6%88%E6%81%AF%E8%8A%82%E7%82%B9
 [一种 xml 的图片消息（装逼大图）]: https://docs.go-cqhttp.org/cqcode/#cardimage
 [文本转语音]: https://docs.go-cqhttp.org/cqcode/#%E6%96%87%E6%9C%AC%E8%BD%AC%E8%AF%AD%E9%9F%B3
@@ -156,33 +154,33 @@ go-cqhttp 兼容 [OneBot-v11](https://github.com/howmanybots/onebot/tree/master/
 | /set_restart             | [重启 go-cqhttp]       |
 | /.handle_quick_operation | [对事件执行快速操作]   |
 
-[发送私聊消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_private_msg-%E5%8F%91%E9%80%81%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF
-[发送群消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_group_msg-%E5%8F%91%E9%80%81%E7%BE%A4%E6%B6%88%E6%81%AF
-[发送消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#send_msg-%E5%8F%91%E9%80%81%E6%B6%88%E6%81%AF
-[撤回信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#delete_msg-%E6%92%A4%E5%9B%9E%E6%B6%88%E6%81%AF
-[群组踢人]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_kick-%E7%BE%A4%E7%BB%84%E8%B8%A2%E4%BA%BA
-[群组单人禁言]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_ban-%E7%BE%A4%E7%BB%84%E5%8D%95%E4%BA%BA%E7%A6%81%E8%A8%80
-[群组全员禁言]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_whole_ban-%E7%BE%A4%E7%BB%84%E5%85%A8%E5%91%98%E7%A6%81%E8%A8%80
-[群组设置管理员]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_admin-%E7%BE%A4%E7%BB%84%E8%AE%BE%E7%BD%AE%E7%AE%A1%E7%90%86%E5%91%98
-[设置群名片（群备注）]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_card-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D%E7%89%87%E7%BE%A4%E5%A4%87%E6%B3%A8
-[设置群名]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_name-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D
-[退出群组]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_leave-%E9%80%80%E5%87%BA%E7%BE%A4%E7%BB%84
-[设置群组专属头衔]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_special_title-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E7%BB%84%E4%B8%93%E5%B1%9E%E5%A4%B4%E8%A1%94
-[处理加好友请求]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_friend_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82
-[处理加群请求/邀请]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_group_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7
-[获取登录号信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_login_info-%E8%8E%B7%E5%8F%96%E7%99%BB%E5%BD%95%E5%8F%B7%E4%BF%A1%E6%81%AF
-[获取陌生人信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_stranger_info-%E8%8E%B7%E5%8F%96%E9%99%8C%E7%94%9F%E4%BA%BA%E4%BF%A1%E6%81%AF
-[获取好友列表]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_friend_list-%E8%8E%B7%E5%8F%96%E5%A5%BD%E5%8F%8B%E5%88%97%E8%A1%A8
-[获取群信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E4%BF%A1%E6%81%AF
-[获取群列表]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%88%97%E8%A1%A8
-[获取群成员信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E4%BF%A1%E6%81%AF
-[获取群成员列表]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_member_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E5%88%97%E8%A1%A8
-[获取群荣誉信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_group_honor_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E8%8D%A3%E8%AA%89%E4%BF%A1%E6%81%AF
-[检查是否可以发送图片]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_image-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E5%9B%BE%E7%89%87
-[检查是否可以发送语音]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#can_send_record-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E8%AF%AD%E9%9F%B3
-[获取版本信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#get_version_info-%E8%8E%B7%E5%8F%96%E7%89%88%E6%9C%AC%E4%BF%A1%E6%81%AF
-[重启 go-cqhttp]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/public.md#set_restart-%E9%87%8D%E5%90%AF-onebot-%E5%AE%9E%E7%8E%B0
-[对事件执行快速操作]: https://github.com/howmanybots/onebot/blob/master/v11/specs/api/hidden.md#handle_quick_operation-%E5%AF%B9%E4%BA%8B%E4%BB%B6%E6%89%A7%E8%A1%8C%E5%BF%AB%E9%80%9F%E6%93%8D%E4%BD%9C
+[发送私聊消息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#send_private_msg-%E5%8F%91%E9%80%81%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF
+[发送群消息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#send_group_msg-%E5%8F%91%E9%80%81%E7%BE%A4%E6%B6%88%E6%81%AF
+[发送消息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#send_msg-%E5%8F%91%E9%80%81%E6%B6%88%E6%81%AF
+[撤回信息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#delete_msg-%E6%92%A4%E5%9B%9E%E6%B6%88%E6%81%AF
+[群组踢人]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_kick-%E7%BE%A4%E7%BB%84%E8%B8%A2%E4%BA%BA
+[群组单人禁言]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_ban-%E7%BE%A4%E7%BB%84%E5%8D%95%E4%BA%BA%E7%A6%81%E8%A8%80
+[群组全员禁言]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_whole_ban-%E7%BE%A4%E7%BB%84%E5%85%A8%E5%91%98%E7%A6%81%E8%A8%80
+[群组设置管理员]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_admin-%E7%BE%A4%E7%BB%84%E8%AE%BE%E7%BD%AE%E7%AE%A1%E7%90%86%E5%91%98
+[设置群名片（群备注）]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_card-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D%E7%89%87%E7%BE%A4%E5%A4%87%E6%B3%A8
+[设置群名]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_name-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%90%8D
+[退出群组]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_leave-%E9%80%80%E5%87%BA%E7%BE%A4%E7%BB%84
+[设置群组专属头衔]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_special_title-%E8%AE%BE%E7%BD%AE%E7%BE%A4%E7%BB%84%E4%B8%93%E5%B1%9E%E5%A4%B4%E8%A1%94
+[处理加好友请求]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_friend_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82
+[处理加群请求/邀请]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_group_add_request-%E5%A4%84%E7%90%86%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7
+[获取登录号信息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_login_info-%E8%8E%B7%E5%8F%96%E7%99%BB%E5%BD%95%E5%8F%B7%E4%BF%A1%E6%81%AF
+[获取陌生人信息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_stranger_info-%E8%8E%B7%E5%8F%96%E9%99%8C%E7%94%9F%E4%BA%BA%E4%BF%A1%E6%81%AF
+[获取好友列表]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_friend_list-%E8%8E%B7%E5%8F%96%E5%A5%BD%E5%8F%8B%E5%88%97%E8%A1%A8
+[获取群信息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_group_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E4%BF%A1%E6%81%AF
+[获取群列表]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_group_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%88%97%E8%A1%A8
+[获取群成员信息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_group_member_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E4%BF%A1%E6%81%AF
+[获取群成员列表]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_group_member_list-%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%88%90%E5%91%98%E5%88%97%E8%A1%A8
+[获取群荣誉信息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_group_honor_info-%E8%8E%B7%E5%8F%96%E7%BE%A4%E8%8D%A3%E8%AA%89%E4%BF%A1%E6%81%AF
+[检查是否可以发送图片]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#can_send_image-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E5%9B%BE%E7%89%87
+[检查是否可以发送语音]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#can_send_record-%E6%A3%80%E6%9F%A5%E6%98%AF%E5%90%A6%E5%8F%AF%E4%BB%A5%E5%8F%91%E9%80%81%E8%AF%AD%E9%9F%B3
+[获取版本信息]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#get_version_info-%E8%8E%B7%E5%8F%96%E7%89%88%E6%9C%AC%E4%BF%A1%E6%81%AF
+[重启 go-cqhttp]: https://github.com/botuniverse/onebot-11/blob/master/api/public.md#set_restart-%E9%87%8D%E5%90%AF-onebot-%E5%AE%9E%E7%8E%B0
+[对事件执行快速操作]: https://github.com/botuniverse/onebot-11/blob/master/api/hidden.md#handle_quick_operation-%E5%AF%B9%E4%BA%8B%E4%BB%B6%E6%89%A7%E8%A1%8C%E5%BF%AB%E9%80%9F%E6%93%8D%E4%BD%9C
 
 #### 拓展 API 及与 OneBot 标准有略微差异的 API
 
@@ -241,21 +239,21 @@ go-cqhttp 兼容 [OneBot-v11](https://github.com/howmanybots/onebot/tree/master/
 | 请求事件 | [加好友请求]     |
 | 请求事件 | [加群请求/邀请]  |
 
-[私聊信息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/message.md#%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF
-[群消息]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/message.md#%E7%BE%A4%E6%B6%88%E6%81%AF
-[群文件上传]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%96%87%E4%BB%B6%E4%B8%8A%E4%BC%A0
-[群管理员变动]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%AE%A1%E7%90%86%E5%91%98%E5%8F%98%E5%8A%A8
-[群成员减少]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%87%8F%E5%B0%91
-[群成员增加]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%A2%9E%E5%8A%A0
-[群禁言]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%A6%81%E8%A8%80
-[好友添加]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E5%A5%BD%E5%8F%8B%E6%B7%BB%E5%8A%A0
-[群消息撤回]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%B6%88%E6%81%AF%E6%92%A4%E5%9B%9E
-[好友消息撤回]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E5%A5%BD%E5%8F%8B%E6%B6%88%E6%81%AF%E6%92%A4%E5%9B%9E
-[群内戳一戳]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E5%86%85%E6%88%B3%E4%B8%80%E6%88%B3
-[群红包运气王]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E7%BA%A2%E5%8C%85%E8%BF%90%E6%B0%94%E7%8E%8B
-[群成员荣誉变更]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E8%8D%A3%E8%AA%89%E5%8F%98%E6%9B%B4
-[加好友请求]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/request.md#%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82
-[加群请求/邀请]: https://github.com/howmanybots/onebot/blob/master/v11/specs/event/request.md#%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7
+[私聊信息]: https://github.com/botuniverse/onebot-11/blob/master/event/message.md#%E7%A7%81%E8%81%8A%E6%B6%88%E6%81%AF
+[群消息]: https://github.com/botuniverse/onebot-11/blob/master/event/message.md#%E7%BE%A4%E6%B6%88%E6%81%AF
+[群文件上传]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E6%96%87%E4%BB%B6%E4%B8%8A%E4%BC%A0
+[群管理员变动]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E7%AE%A1%E7%90%86%E5%91%98%E5%8F%98%E5%8A%A8
+[群成员减少]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%87%8F%E5%B0%91
+[群成员增加]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%A2%9E%E5%8A%A0
+[群禁言]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E7%A6%81%E8%A8%80
+[好友添加]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E5%A5%BD%E5%8F%8B%E6%B7%BB%E5%8A%A0
+[群消息撤回]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E6%B6%88%E6%81%AF%E6%92%A4%E5%9B%9E
+[好友消息撤回]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E5%A5%BD%E5%8F%8B%E6%B6%88%E6%81%AF%E6%92%A4%E5%9B%9E
+[群内戳一戳]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E5%86%85%E6%88%B3%E4%B8%80%E6%88%B3
+[群红包运气王]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E7%BA%A2%E5%8C%85%E8%BF%90%E6%B0%94%E7%8E%8B
+[群成员荣誉变更]: https://github.com/botuniverse/onebot-11/blob/master/event/notice.md#%E7%BE%A4%E6%88%90%E5%91%98%E8%8D%A3%E8%AA%89%E5%8F%98%E6%9B%B4
+[加好友请求]: https://github.com/botuniverse/onebot-11/blob/master/event/request.md#%E5%8A%A0%E5%A5%BD%E5%8F%8B%E8%AF%B7%E6%B1%82
+[加群请求/邀请]: https://github.com/botuniverse/onebot-11/blob/master/event/request.md#%E5%8A%A0%E7%BE%A4%E8%AF%B7%E6%B1%82%E9%82%80%E8%AF%B7
 
 #### 拓展 Event
 

cmd/api-generator/main.go

@@ -0,0 +1,271 @@
+package main
+
+import (
+	"bytes"
+	"flag"
+	"fmt"
+	"go/ast"
+	"go/format"
+	"go/parser"
+	"go/token"
+	"io"
+	"os"
+	"sort"
+	"strconv"
+	"strings"
+)
+
+type Param struct {
+	Name    string
+	Type    string
+	Default string
+}
+
+type Router struct {
+	Func   string
+	Path   []string
+	Params []Param
+}
+
+type generator struct {
+	out io.Writer
+}
+
+func (g *generator) WriteString(s string) {
+	io.WriteString(g.out, s)
+}
+
+func (g *generator) generate(routers []Router) {
+	g.WriteString("// Code generated by cmd/api-generator. DO NOT EDIT.\n\n")
+	g.WriteString("package api\n\nimport (\n\n")
+	g.WriteString("\"github.com/Mrs4s/go-cqhttp/coolq\"\n")
+	g.WriteString("\"github.com/Mrs4s/go-cqhttp/global\"\n")
+	g.WriteString(")\n\n")
+	g.WriteString(`func (c *Caller) call(action string, p Getter) global.MSG {
+	switch action {
+	default:
+		return coolq.Failed(404, "API_NOT_FOUND", "API不存在")` + "\n")
+	for _, router := range routers {
+		g.router(router)
+	}
+	io.WriteString(g.out, `	}}`)
+}
+
+func (g *generator) router(router Router) {
+	g.WriteString(`case `)
+	for i, p := range router.Path {
+		if i != 0 {
+			g.WriteString(`, `)
+		}
+		g.WriteString(strconv.Quote(p))
+	}
+	g.WriteString(":\n")
+
+	for i, p := range router.Params {
+		if p.Default == "" {
+			v := "p.Get(" + strconv.Quote(p.Name) + ")"
+			fmt.Fprintf(g.out, "p%d := %s\n", i, conv(v, p.Type))
+		} else {
+			fmt.Fprintf(g.out, "p%d := %s\n", i, p.Default)
+			fmt.Fprintf(g.out, "if pt := p.Get(%s); pt.Exists() {\n", strconv.Quote(p.Name))
+			fmt.Fprintf(g.out, "p%d = %s\n}\n", i, conv("pt", p.Type))
+		}
+	}
+
+	g.WriteString("\t\treturn c.bot." + router.Func + "(")
+	for i := range router.Params {
+		if i != 0 {
+			g.WriteString(", ")
+		}
+		fmt.Fprintf(g.out, "p%d", i)
+	}
+	g.WriteString(")\n")
+}
+
+func conv(v, t string) string {
+	switch t {
+	default:
+		panic("unknown type: " + t)
+	case "gjson.Result":
+		return v
+	case "int64":
+		return v + ".Int()"
+	case "bool":
+		return v + ".Bool()"
+	case "string":
+		return v + ".String()"
+	case "int32", "int":
+		return t + "(" + v + ".Int())"
+	case "uint64":
+		return v + ".Uint()"
+	case "uint32":
+		return "uint32(" + v + ".Uint())"
+	}
+}
+
+func main() {
+	var routers []Router
+	src := flag.String("path", "", "source file")
+	flag.Parse()
+	fset := token.NewFileSet()
+	file, err := parser.ParseFile(fset, *src, nil, parser.ParseComments)
+	if err != nil {
+		panic(err)
+	}
+
+	for _, decl := range file.Decls {
+		switch decl := decl.(type) {
+		case *ast.FuncDecl:
+			if !decl.Name.IsExported() || decl.Recv == nil {
+				continue
+			}
+			if st, ok := decl.Recv.List[0].Type.(*ast.StarExpr); !ok || st.X.(*ast.Ident).Name != "CQBot" {
+				continue
+			}
+			router := Router{Func: decl.Name.Name}
+
+			// compute params
+			for _, p := range decl.Type.Params.List {
+				var typ string
+				switch t := p.Type.(type) {
+				case *ast.Ident:
+					typ = t.Name
+				case *ast.SelectorExpr:
+					typ = t.X.(*ast.Ident).Name + "." + t.Sel.Name
+				}
+				for _, name := range p.Names {
+					router.Params = append(router.Params, Param{Name: snakecase(name.Name), Type: typ})
+				}
+			}
+
+			for _, comment := range decl.Doc.List {
+				annotation, args := match(comment.Text)
+				switch annotation {
+				case "route":
+					for _, route := range strings.Split(args, ",") {
+						router.Path = append(router.Path, unquote(route))
+					}
+				case "default":
+					for name, value := range parseMap(args, "=") {
+						for i, p := range router.Params {
+							if p.Name == name {
+								router.Params[i].Default = convDefault(value, p.Type)
+							}
+						}
+					}
+				case "rename":
+					for name, value := range parseMap(args, "->") {
+						for i, p := range router.Params {
+							if p.Name == name {
+								router.Params[i].Name = value
+							}
+						}
+					}
+				}
+				sort.Slice(router.Path, func(i, j int) bool {
+					return router.Path[i] < router.Path[j]
+				})
+			}
+			if router.Path != nil {
+				routers = append(routers, router)
+			} else {
+				println(decl.Name.Name)
+			}
+		}
+	}
+
+	sort.Slice(routers, func(i, j int) bool {
+		return routers[i].Path[0] < routers[j].Path[0]
+	})
+
+	out := new(bytes.Buffer)
+	g := &generator{out: out}
+	g.generate(routers)
+	source, err := format.Source(out.Bytes())
+	if err != nil {
+		panic(err)
+	}
+	err = os.WriteFile("api.go", source, 0o644)
+	if err != nil {
+		panic(err)
+	}
+}
+
+func unquote(s string) string {
+	switch s[0] {
+	case '"':
+		s, _ = strconv.Unquote(s)
+	case '`':
+		s = strings.Trim(s, "`")
+	}
+	return s
+}
+
+func parseMap(input string, sep string) map[string]string {
+	out := make(map[string]string)
+	for _, arg := range strings.Split(input, ",") {
+		k, v, ok := cut(arg, sep)
+		if !ok {
+			out[k] = "true"
+		}
+		k = strings.TrimSpace(k)
+		v = unquote(strings.TrimSpace(v))
+		out[k] = v
+	}
+	return out
+}
+
+func match(text string) (string, string) {
+	text = strings.TrimPrefix(text, "//")
+	text = strings.TrimSpace(text)
+	if !strings.HasPrefix(text, "@") || !strings.HasSuffix(text, ")") {
+		return "", ""
+	}
+	text = strings.Trim(text, "@)")
+	cmd, args, ok := cut(text, "(")
+	if !ok {
+		return "", ""
+	}
+	return cmd, unquote(args)
+}
+
+func cut(s, sep string) (before, after string, found bool) {
+	if i := strings.Index(s, sep); i >= 0 {
+		return s[:i], s[i+len(sep):], true
+	}
+	return s, "", false
+}
+
+// some abbreviations need translation before transforming ro snake case
+var replacer = strings.NewReplacer("ID", "Id")
+
+func snakecase(s string) string {
+	s = replacer.Replace(s)
+	t := make([]byte, 0, 32)
+	for i := 0; i < len(s); i++ {
+		c := s[i]
+		if ('a' <= c && c <= 'z') || ('0' <= c && c <= '9') {
+			t = append(t, c)
+		} else {
+			t = append(t, '_')
+			t = append(t, c^0x20)
+		}
+	}
+	return string(t)
+}
+
+func convDefault(s string, t string) string {
+	switch t {
+	case "bool":
+		if s == "true" {
+			return s
+		}
+	case "uint32":
+		if s != "0" {
+			return t + "(" + s + ")"
+		}
+	default:
+		panic("unhandled default value type:" + t)
+	}
+	return ""
+}

cmd/gocq/login.go

@@ -1,19 +1,24 @@
-package main
+package gocq
 
 import (
 	"bufio"
 	"bytes"
+	"fmt"
+	"image"
+	"image/png"
 	"os"
 	"strings"
 	"time"
 
-	qrcodeTerminal "github.com/Baozisoftware/qrcode-terminal-go"
 	"github.com/Mrs4s/MiraiGo/client"
+	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/mattn/go-colorable"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
-	"github.com/tuotoo/qrcode"
+	"gopkg.ilharper.com/x/isatty"
 
 	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/internal/download"
 )
 
 var console = bufio.NewReader(os.Stdin)
@@ -40,6 +45,14 @@ func readLineTimeout(t time.Duration, de string) (str string) {
 	return
 }
 
+func readIfTTY(de string) (str string) {
+	if isatty.Isatty(os.Stdin.Fd()) {
+		return readLine()
+	}
+	log.Warnf("未检测到输入终端，自动选择%s.", de)
+	return de
+}
+
 var cli *client.QQClient
 
 // ErrSMSRequestError SMS请求出错
@@ -53,12 +66,36 @@ func commonLogin() error {
 	return loginResponseProcessor(res)
 }
 
-func qrcodeLogin() error {
-	rsp, err := cli.FetchQRCode()
+func printQRCode(imgData []byte) {
+	const (
+		black = "\033[48;5;0m  \033[0m"
+		white = "\033[48;5;7m  \033[0m"
+	)
+	img, err := png.Decode(bytes.NewReader(imgData))
 	if err != nil {
-		return err
+		log.Panic(err)
 	}
-	fi, err := qrcode.Decode(bytes.NewReader(rsp.ImageData))
+	data := img.(*image.Gray).Pix
+	bound := img.Bounds().Max.X
+	buf := make([]byte, 0, (bound*4+1)*(bound))
+	i := 0
+	for y := 0; y < bound; y++ {
+		i = y * bound
+		for x := 0; x < bound; x++ {
+			if data[i] != 255 {
+				buf = append(buf, white...)
+			} else {
+				buf = append(buf, black...)
+			}
+			i++
+		}
+		buf = append(buf, '\n')
+	}
+	_, _ = colorable.NewColorableStdout().Write(buf)
+}
+
+func qrcodeLogin() error {
+	rsp, err := cli.FetchQRCodeCustomSize(1, 2, 1)
 	if err != nil {
 		return err
 	}
@@ -70,7 +107,7 @@ func qrcodeLogin() error {
 		log.Infof("请使用手机QQ扫描二维码 (qrcode.png) : ")
 	}
 	time.Sleep(time.Second)
-	qrcodeTerminal.New().Get(fi.Content).Print()
+	printQRCode(rsp.ImageData)
 	s, err := cli.QueryQRCodeStatus(rsp.Sig)
 	if err != nil {
 		return err
@@ -117,7 +154,19 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 		var text string
 		switch res.Error {
 		case client.SliderNeededError:
-			log.Warnf("登录需要滑条验证码, 请使用手机QQ扫描二维码以继续登录.")
+			log.Warnf("登录需要滑条验证码, 请选择验证方式: ")
+			log.Warnf("1. 使用浏览器抓取滑条并登录")
+			log.Warnf("2. 使用手机QQ扫码验证 (需要手Q和gocq在同一网络下).")
+			log.Warn("请输入(1 - 2)：")
+			text = readIfTTY("1")
+			if strings.Contains(text, "1") {
+				ticket := getTicket(res.VerifyUrl)
+				if ticket == "" {
+					os.Exit(0)
+				}
+				res, err = cli.SubmitTicket(ticket)
+				continue
+			}
 			cli.Disconnect()
 			cli.Release()
 			cli = client.NewClientEmpty()
@@ -145,8 +194,8 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 			log.Warnf("账号已开启设备锁，请选择验证方式:")
 			log.Warnf("1. 向手机 %v 发送短信验证码", res.SMSPhone)
 			log.Warnf("2. 使用手机QQ扫码验证.")
-			log.Warn("请输入(1 - 2) (将在10秒后自动选择2)：")
-			text = readLineTimeout(time.Second*10, "2")
+			log.Warn("请输入(1 - 2)：")
+			text = readIfTTY("2")
 			if strings.Contains(text, "1") {
 				if !cli.RequestSMS() {
 					log.Warnf("发送验证码失败，可能是请求过于频繁.")
@@ -167,8 +216,7 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 			msg := res.ErrorMessage
 			if strings.Contains(msg, "版本") {
 				msg = "密码错误或账号被冻结"
-			}
-			if strings.Contains(msg, "冻结") {
+			} else if strings.Contains(msg, "冻结") {
 				log.Fatalf("账号被冻结")
 			}
 			log.Warnf("登录失败: %v", msg)
@@ -178,3 +226,39 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 		}
 	}
 }
+
+func getTicket(u string) (str string) {
+	id := utils.RandomString(8)
+	log.Warnf("请前往该地址验证 -> %v <- 或输入手动抓取的 ticket：（Enter 提交）", strings.ReplaceAll(u, "https://ssl.captcha.qq.com/template/wireless_mqq_captcha.html?", fmt.Sprintf("https://captcha.go-cqhttp.org/captcha?id=%v&", id)))
+	manual := make(chan string, 1)
+	go func() {
+		manual <- readLine()
+	}()
+	ticker := time.NewTicker(time.Second)
+	defer ticker.Stop()
+	for count := 120; count > 0; count-- {
+		select {
+		case <-ticker.C:
+			str = fetchCaptcha(id)
+			if str != "" {
+				return
+			}
+		case str = <-manual:
+			return
+		}
+	}
+	log.Warnf("验证超时")
+	return ""
+}
+
+func fetchCaptcha(id string) string {
+	g, err := download.Request{URL: "https://captcha.go-cqhttp.org/captcha/ticket?id=" + id}.JSON()
+	if err != nil {
+		log.Warnf("获取 Ticket 时出现错误: %v", err)
+		return ""
+	}
+	if g.Get("ticket").Exists() {
+		return g.Get("ticket").String()
+	}
+	return ""
+}

cmd/gocq/main.go

@@ -0,0 +1,420 @@
+// Package gocq 程序的主体部分
+package gocq
+
+import (
+	"crypto/aes"
+	"crypto/md5"
+	"crypto/sha1"
+	"encoding/hex"
+	"fmt"
+	"os"
+	"path"
+	"sync"
+	"time"
+
+	"github.com/Mrs4s/MiraiGo/binary"
+	"github.com/Mrs4s/MiraiGo/client"
+	para "github.com/fumiama/go-hide-param"
+	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
+	log "github.com/sirupsen/logrus"
+	"golang.org/x/crypto/pbkdf2"
+	"golang.org/x/term"
+
+	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/db"
+	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/global/terminal"
+	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/internal/cache"
+	"github.com/Mrs4s/go-cqhttp/internal/selfdiagnosis"
+	"github.com/Mrs4s/go-cqhttp/internal/selfupdate"
+	"github.com/Mrs4s/go-cqhttp/modules/servers"
+	"github.com/Mrs4s/go-cqhttp/server"
+)
+
+// 允许通过配置文件设置的状态列表
+var allowStatus = [...]client.UserOnlineStatus{
+	client.StatusOnline, client.StatusAway, client.StatusInvisible, client.StatusBusy,
+	client.StatusListening, client.StatusConstellation, client.StatusWeather, client.StatusMeetSpring,
+	client.StatusTimi, client.StatusEatChicken, client.StatusLoving, client.StatusWangWang, client.StatusCookedRice,
+	client.StatusStudy, client.StatusStayUp, client.StatusPlayBall, client.StatusSignal, client.StatusStudyOnline,
+	client.StatusGaming, client.StatusVacationing, client.StatusWatchingTV, client.StatusFitness,
+}
+
+// Main 启动主程序
+func Main() {
+	base.Parse()
+	if !base.FastStart && terminal.RunningByDoubleClick() {
+		err := terminal.NoMoreDoubleClick()
+		if err != nil {
+			log.Errorf("遇到错误: %v", err)
+			time.Sleep(time.Second * 5)
+		}
+		return
+	}
+	switch {
+	case base.LittleH:
+		base.Help()
+	case base.LittleD:
+		server.Daemon()
+	}
+	if base.LittleWD != "" {
+		err := os.Chdir(base.LittleWD)
+		if err != nil {
+			log.Fatalf("重置工作目录时出现错误: %v", err)
+		}
+	}
+	base.Init()
+
+	rotateOptions := []rotatelogs.Option{
+		rotatelogs.WithRotationTime(time.Hour * 24),
+	}
+	rotateOptions = append(rotateOptions, rotatelogs.WithMaxAge(base.LogAging))
+	if base.LogForceNew {
+		rotateOptions = append(rotateOptions, rotatelogs.ForceNewFile())
+	}
+	w, err := rotatelogs.New(path.Join("logs", "%Y-%m-%d.log"), rotateOptions...)
+	if err != nil {
+		log.Errorf("rotatelogs init err: %v", err)
+		panic(err)
+	}
+
+	consoleFormatter := global.LogFormat{EnableColor: base.LogColorful}
+	fileFormatter := global.LogFormat{EnableColor: false}
+	log.AddHook(global.NewLocalHook(w, consoleFormatter, fileFormatter, global.GetLogLevel(base.LogLevel)...))
+
+	mkCacheDir := func(path string, _type string) {
+		if !global.PathExists(path) {
+			if err := os.MkdirAll(path, 0o755); err != nil {
+				log.Fatalf("创建%s缓存文件夹失败: %v", _type, err)
+			}
+		}
+	}
+	mkCacheDir(global.ImagePath, "图片")
+	mkCacheDir(global.VoicePath, "语音")
+	mkCacheDir(global.VideoPath, "视频")
+	mkCacheDir(global.CachePath, "发送图片")
+	mkCacheDir(path.Join(global.ImagePath, "guild-images"), "频道图片缓存")
+	cache.Init()
+
+	db.Init()
+	if err := db.Open(); err != nil {
+		log.Fatalf("打开数据库失败: %v", err)
+	}
+
+	var byteKey []byte
+	arg := os.Args
+	if len(arg) > 1 {
+		for i := range arg {
+			switch arg[i] {
+			case "update":
+				if len(arg) > i+1 {
+					selfupdate.SelfUpdate(arg[i+1])
+				} else {
+					selfupdate.SelfUpdate("")
+				}
+			case "key":
+				p := i + 1
+				if len(arg) > p {
+					byteKey = []byte(arg[p])
+					para.Hide(p)
+				}
+			}
+		}
+	}
+
+	if (base.Account.Uin == 0 || (base.Account.Password == "" && !base.Account.Encrypt)) && !global.PathExists("session.token") {
+		log.Warn("账号密码未配置, 将使用二维码登录.")
+		if !base.FastStart {
+			log.Warn("将在 5秒 后继续.")
+			time.Sleep(time.Second * 5)
+		}
+	}
+
+	log.Info("当前版本:", base.Version)
+	if base.Debug {
+		log.SetLevel(log.DebugLevel)
+		log.Warnf("已开启Debug模式.")
+	}
+	if !global.PathExists("device.json") {
+		log.Warn("虚拟设备信息不存在, 将自动生成随机设备.")
+		client.GenRandomDevice()
+		_ = os.WriteFile("device.json", client.SystemDeviceInfo.ToJson(), 0o644)
+		log.Info("已生成设备信息并保存到 device.json 文件.")
+	} else {
+		log.Info("将使用 device.json 内的设备信息运行Bot.")
+		if err := client.SystemDeviceInfo.ReadJson([]byte(global.ReadAllText("device.json"))); err != nil {
+			log.Fatalf("加载设备信息失败: %v", err)
+		}
+	}
+
+	if base.Account.Encrypt {
+		if !global.PathExists("password.encrypt") {
+			if base.Account.Password == "" {
+				log.Error("无法进行加密，请在配置文件中的添加密码后重新启动.")
+				readLine()
+				os.Exit(0)
+			}
+			log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
+			byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
+			base.PasswordHash = md5.Sum([]byte(base.Account.Password))
+			_ = os.WriteFile("password.encrypt", []byte(PasswordHashEncrypt(base.PasswordHash[:], byteKey)), 0o644)
+			log.Info("密码已加密，为了您的账号安全，请删除配置文件中的密码后重新启动.")
+			readLine()
+			os.Exit(0)
+		} else {
+			if base.Account.Password != "" {
+				log.Error("密码已加密，为了您的账号安全，请删除配置文件中的密码后重新启动.")
+				readLine()
+				os.Exit(0)
+			}
+
+			if len(byteKey) == 0 {
+				log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
+				cancel := make(chan struct{}, 1)
+				state, _ := term.GetState(int(os.Stdin.Fd()))
+				go func() {
+					select {
+					case <-cancel:
+						return
+					case <-time.After(time.Second * 45):
+						log.Infof("解密key输入超时")
+						time.Sleep(3 * time.Second)
+						_ = term.Restore(int(os.Stdin.Fd()), state)
+						os.Exit(0)
+					}
+				}()
+				byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
+				cancel <- struct{}{}
+			} else {
+				log.Infof("密码加密已启用, 使用运行时传递的参数进行解密，按 Ctrl+C 取消.")
+			}
+
+			encrypt, _ := os.ReadFile("password.encrypt")
+			ph, err := PasswordHashDecrypt(string(encrypt), byteKey)
+			if err != nil {
+				log.Fatalf("加密存储的密码损坏，请尝试重新配置密码")
+			}
+			copy(base.PasswordHash[:], ph)
+		}
+	} else if len(base.Account.Password) > 0 {
+		base.PasswordHash = md5.Sum([]byte(base.Account.Password))
+	}
+	if !base.FastStart {
+		log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
+		time.Sleep(time.Second * 5)
+	}
+	log.Info("开始尝试登录并同步消息...")
+	log.Infof("使用协议: %s", client.SystemDeviceInfo.Protocol)
+	cli = newClient()
+	isQRCodeLogin := (base.Account.Uin == 0 || len(base.Account.Password) == 0) && !base.Account.Encrypt
+	isTokenLogin := false
+	saveToken := func() {
+		base.AccountToken = cli.GenToken()
+		_ = os.WriteFile("session.token", base.AccountToken, 0o644)
+	}
+	if global.PathExists("session.token") {
+		token, err := os.ReadFile("session.token")
+		if err == nil {
+			if base.Account.Uin != 0 {
+				r := binary.NewReader(token)
+				cu := r.ReadInt64()
+				if cu != base.Account.Uin {
+					log.Warnf("警告: 配置文件内的QQ号 (%v) 与缓存内的QQ号 (%v) 不相同", base.Account.Uin, cu)
+					log.Warnf("1. 使用会话缓存继续.")
+					log.Warnf("2. 删除会话缓存并重启.")
+					log.Warnf("请选择:")
+					text := readIfTTY("1")
+					if text == "2" {
+						_ = os.Remove("session.token")
+						log.Infof("缓存已删除.")
+						os.Exit(0)
+					}
+				}
+			}
+			if err = cli.TokenLogin(token); err != nil {
+				_ = os.Remove("session.token")
+				log.Warnf("恢复会话失败: %v , 尝试使用正常流程登录.", err)
+				time.Sleep(time.Second)
+				cli.Disconnect()
+				cli.Release()
+				cli = newClient()
+			} else {
+				isTokenLogin = true
+			}
+		}
+	}
+	if base.Account.Uin != 0 && base.PasswordHash != [16]byte{} {
+		cli.Uin = base.Account.Uin
+		cli.PasswordMd5 = base.PasswordHash
+	}
+	if !isTokenLogin {
+		if !isQRCodeLogin {
+			if err := commonLogin(); err != nil {
+				log.Fatalf("登录时发生致命错误: %v", err)
+			}
+		} else {
+			if err := qrcodeLogin(); err != nil {
+				log.Fatalf("登录时发生致命错误: %v", err)
+			}
+		}
+	}
+	var times uint = 1 // 重试次数
+	var reLoginLock sync.Mutex
+	cli.DisconnectedEvent.Subscribe(func(q *client.QQClient, e *client.ClientDisconnectedEvent) {
+		reLoginLock.Lock()
+		defer reLoginLock.Unlock()
+		times = 1
+		if cli.Online.Load() {
+			return
+		}
+		log.Warnf("Bot已离线: %v", e.Message)
+		time.Sleep(time.Second * time.Duration(base.Reconnect.Delay))
+		for {
+			if base.Reconnect.Disabled {
+				log.Warnf("未启用自动重连, 将退出.")
+				os.Exit(1)
+			}
+			if times > base.Reconnect.MaxTimes && base.Reconnect.MaxTimes != 0 {
+				log.Fatalf("Bot重连次数超过限制, 停止")
+			}
+			times++
+			if base.Reconnect.Interval > 0 {
+				log.Warnf("将在 %v 秒后尝试重连. 重连次数：%v/%v", base.Reconnect.Interval, times, base.Reconnect.MaxTimes)
+				time.Sleep(time.Second * time.Duration(base.Reconnect.Interval))
+			} else {
+				time.Sleep(time.Second)
+			}
+			if cli.Online.Load() {
+				log.Infof("登录已完成")
+				break
+			}
+			log.Warnf("尝试重连...")
+			err := cli.TokenLogin(base.AccountToken)
+			if err == nil {
+				saveToken()
+				return
+			}
+			log.Warnf("快速重连失败: %v", err)
+			if isQRCodeLogin {
+				log.Fatalf("快速重连失败, 扫码登录无法恢复会话.")
+			}
+			log.Warnf("快速重连失败, 尝试普通登录. 这可能是因为其他端强行T下线导致的.")
+			time.Sleep(time.Second)
+			if err := commonLogin(); err != nil {
+				log.Errorf("登录时发生致命错误: %v", err)
+			} else {
+				saveToken()
+				break
+			}
+		}
+	})
+	saveToken()
+	cli.AllowSlider = true
+	log.Infof("登录成功 欢迎使用: %v", cli.Nickname)
+	log.Info("开始加载好友列表...")
+	global.Check(cli.ReloadFriendList(), true)
+	log.Infof("共加载 %v 个好友.", len(cli.FriendList))
+	log.Infof("开始加载群列表...")
+	global.Check(cli.ReloadGroupList(), true)
+	log.Infof("共加载 %v 个群.", len(cli.GroupList))
+	if uint(base.Account.Status) >= uint(len(allowStatus)) {
+		base.Account.Status = 0
+	}
+	cli.SetOnlineStatus(allowStatus[base.Account.Status])
+
+	servers.Run(coolq.NewQQBot(cli))
+	log.Info("资源初始化完成, 开始处理信息.")
+	log.Info("アトリは、高性能ですから!")
+
+	go func() {
+		selfupdate.CheckUpdate()
+		selfdiagnosis.NetworkDiagnosis(cli)
+	}()
+
+	<-global.SetupMainSignalHandler()
+}
+
+// PasswordHashEncrypt 使用key加密给定passwordHash
+func PasswordHashEncrypt(passwordHash []byte, key []byte) string {
+	if len(passwordHash) != 16 {
+		panic("密码加密参数错误")
+	}
+
+	key = pbkdf2.Key(key, key, 114514, 32, sha1.New)
+
+	cipher, _ := aes.NewCipher(key)
+	result := make([]byte, 16)
+	cipher.Encrypt(result, passwordHash)
+
+	return hex.EncodeToString(result)
+}
+
+// PasswordHashDecrypt 使用key解密给定passwordHash
+func PasswordHashDecrypt(encryptedPasswordHash string, key []byte) ([]byte, error) {
+	ciphertext, err := hex.DecodeString(encryptedPasswordHash)
+	if err != nil {
+		return nil, err
+	}
+
+	key = pbkdf2.Key(key, key, 114514, 32, sha1.New)
+
+	cipher, _ := aes.NewCipher(key)
+	result := make([]byte, 16)
+	cipher.Decrypt(result, ciphertext)
+
+	return result, nil
+}
+
+func newClient() *client.QQClient {
+	c := client.NewClientEmpty()
+	c.UseFragmentMessage = base.ForceFragmented
+	c.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
+		if !base.UseSSOAddress {
+			log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
+			return false
+		}
+		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
+		return true
+	})
+	if global.PathExists("address.txt") {
+		log.Infof("检测到 address.txt 文件. 将覆盖目标IP.")
+		addr := global.ReadAddrFile("address.txt")
+		if len(addr) > 0 {
+			c.SetCustomServer(addr)
+		}
+		log.Infof("读取到 %v 个自定义地址.", len(addr))
+	}
+	c.SetLogger(protocolLogger{})
+	return c
+}
+
+type protocolLogger struct{}
+
+const fromProtocol = "Protocol -> "
+
+func (p protocolLogger) Info(format string, arg ...any) {
+	log.Infof(fromProtocol+format, arg...)
+}
+
+func (p protocolLogger) Warning(format string, arg ...any) {
+	log.Warnf(fromProtocol+format, arg...)
+}
+
+func (p protocolLogger) Debug(format string, arg ...any) {
+	log.Debugf(fromProtocol+format, arg...)
+}
+
+func (p protocolLogger) Error(format string, arg ...any) {
+	log.Errorf(fromProtocol+format, arg...)
+}
+
+func (p protocolLogger) Dump(data []byte, format string, arg ...any) {
+	if !global.PathExists(global.DumpsPath) {
+		_ = os.MkdirAll(global.DumpsPath, 0o755)
+	}
+	dumpFile := path.Join(global.DumpsPath, fmt.Sprintf("%v.dump", time.Now().Unix()))
+	message := fmt.Sprintf(format, arg...)
+	log.Errorf("出现错误 %v. 详细信息已转储至文件 %v 请连同日志提交给开发者处理", message, dumpFile)
+	_ = os.WriteFile(dumpFile, data, 0o644)
+}

coolq/bot.go

@@ -5,25 +5,25 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"io"
 	"os"
-	"path"
 	"runtime/debug"
+	"strings"
 	"sync"
 	"time"
 
-	"github.com/Mrs4s/go-cqhttp/db"
-
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/RomiChan/syncx"
 	"github.com/pkg/errors"
+	"github.com/segmentio/asm/base64"
 	log "github.com/sirupsen/logrus"
 
+	"github.com/Mrs4s/go-cqhttp/db"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/go-cqhttp/internal/base"
-	"github.com/Mrs4s/go-cqhttp/modules/config"
+	"github.com/Mrs4s/go-cqhttp/internal/mime"
 )
 
 // CQBot CQBot结构体,存储Bot实例相关配置
@@ -33,16 +33,15 @@ type CQBot struct {
 	lock   sync.RWMutex
 	events []func(*Event)
 
-	db               db.IDatabase
-	friendReqCache   sync.Map
-	tempSessionCache sync.Map
+	friendReqCache   syncx.Map[string, *client.NewFriendRequest]
+	tempSessionCache syncx.Map[int64, *client.TempSessionInfo]
+	nextTokenCache   *utils.Cache[*guildMemberPageToken]
 }
 
 // Event 事件
 type Event struct {
-	RawMsg global.MSG
-
 	once   sync.Once
+	Raw    *event
 	buffer *bytes.Buffer
 }
 
@@ -50,7 +49,7 @@ func (e *Event) marshal() {
 	if e.buffer == nil {
 		e.buffer = global.NewBuffer()
 	}
-	_ = json.NewEncoder(e.buffer).Encode(e.RawMsg)
+	_ = json.NewEncoder(e.buffer).Encode(e.Raw)
 }
 
 // JSONBytes return byes of json by lazy marshalling.
@@ -69,58 +68,41 @@ func (e *Event) JSONString() string {
 // NewQQBot 初始化一个QQBot实例
 func NewQQBot(cli *client.QQClient) *CQBot {
 	bot := &CQBot{
-		Client: cli,
+		Client:         cli,
+		nextTokenCache: utils.NewCache[*guildMemberPageToken](time.Second * 10),
 	}
-	levelNode, levelDB := base.Database["leveldb"]
-	mongoNode, mongoDB := base.Database["mongodb"]
-	multiDB := db.NewMultiDatabase()
-	if levelDB {
-		lconf := new(config.LevelDBConfig)
-		_ = levelNode.Decode(lconf)
-		if lconf.Enable {
-			multiDB.UseDB(db.UseLevelDB())
-		}
-	}
-	if mongoDB {
-		lconf := new(config.MongoDBConfig)
-		_ = mongoNode.Decode(lconf)
-		if lconf.Database == "" {
-			lconf.Database = "gocq-database"
-		}
-		if lconf.Enable {
-			multiDB.UseDB(db.UseMongoDB(lconf.URI, lconf.Database))
-		}
-	}
-	if err := multiDB.Open(); err != nil {
-		log.Fatalf("打开数据库失败: %v", err)
-	}
-	bot.db = multiDB
-	bot.Client.OnPrivateMessage(bot.privateMessageEvent)
-	bot.Client.OnGroupMessage(bot.groupMessageEvent)
+	bot.Client.PrivateMessageEvent.Subscribe(bot.privateMessageEvent)
+	bot.Client.GroupMessageEvent.Subscribe(bot.groupMessageEvent)
 	if base.ReportSelfMessage {
-		bot.Client.OnSelfPrivateMessage(bot.privateMessageEvent)
-		bot.Client.OnSelfGroupMessage(bot.groupMessageEvent)
+		bot.Client.SelfPrivateMessageEvent.Subscribe(bot.privateMessageEvent)
+		bot.Client.SelfGroupMessageEvent.Subscribe(bot.groupMessageEvent)
 	}
-	bot.Client.OnTempMessage(bot.tempMessageEvent)
-	bot.Client.OnGroupMuted(bot.groupMutedEvent)
-	bot.Client.OnGroupMessageRecalled(bot.groupRecallEvent)
-	bot.Client.OnGroupNotify(bot.groupNotifyEvent)
-	bot.Client.OnFriendNotify(bot.friendNotifyEvent)
-	bot.Client.OnMemberSpecialTitleUpdated(bot.memberTitleUpdatedEvent)
-	bot.Client.OnFriendMessageRecalled(bot.friendRecallEvent)
-	bot.Client.OnReceivedOfflineFile(bot.offlineFileEvent)
-	bot.Client.OnJoinGroup(bot.joinGroupEvent)
-	bot.Client.OnLeaveGroup(bot.leaveGroupEvent)
-	bot.Client.OnGroupMemberJoined(bot.memberJoinEvent)
-	bot.Client.OnGroupMemberLeaved(bot.memberLeaveEvent)
-	bot.Client.OnGroupMemberPermissionChanged(bot.memberPermissionChangedEvent)
-	bot.Client.OnGroupMemberCardUpdated(bot.memberCardUpdatedEvent)
-	bot.Client.OnNewFriendRequest(bot.friendRequestEvent)
-	bot.Client.OnNewFriendAdded(bot.friendAddedEvent)
-	bot.Client.OnGroupInvited(bot.groupInvitedEvent)
-	bot.Client.OnUserWantJoinGroup(bot.groupJoinReqEvent)
-	bot.Client.OnOtherClientStatusChanged(bot.otherClientStatusChangedEvent)
-	bot.Client.OnGroupDigest(bot.groupEssenceMsg)
+	bot.Client.TempMessageEvent.Subscribe(bot.tempMessageEvent)
+	bot.Client.GuildService.OnGuildChannelMessage(bot.guildChannelMessageEvent)
+	bot.Client.GuildService.OnGuildMessageReactionsUpdated(bot.guildMessageReactionsUpdatedEvent)
+	bot.Client.GuildService.OnGuildMessageRecalled(bot.guildChannelMessageRecalledEvent)
+	bot.Client.GuildService.OnGuildChannelUpdated(bot.guildChannelUpdatedEvent)
+	bot.Client.GuildService.OnGuildChannelCreated(bot.guildChannelCreatedEvent)
+	bot.Client.GuildService.OnGuildChannelDestroyed(bot.guildChannelDestroyedEvent)
+	bot.Client.GroupMuteEvent.Subscribe(bot.groupMutedEvent)
+	bot.Client.GroupMessageRecalledEvent.Subscribe(bot.groupRecallEvent)
+	bot.Client.GroupNotifyEvent.Subscribe(bot.groupNotifyEvent)
+	bot.Client.FriendNotifyEvent.Subscribe(bot.friendNotifyEvent)
+	bot.Client.MemberSpecialTitleUpdatedEvent.Subscribe(bot.memberTitleUpdatedEvent)
+	bot.Client.FriendMessageRecalledEvent.Subscribe(bot.friendRecallEvent)
+	bot.Client.OfflineFileEvent.Subscribe(bot.offlineFileEvent)
+	bot.Client.GroupJoinEvent.Subscribe(bot.joinGroupEvent)
+	bot.Client.GroupLeaveEvent.Subscribe(bot.leaveGroupEvent)
+	bot.Client.GroupMemberJoinEvent.Subscribe(bot.memberJoinEvent)
+	bot.Client.GroupMemberLeaveEvent.Subscribe(bot.memberLeaveEvent)
+	bot.Client.GroupMemberPermissionChangedEvent.Subscribe(bot.memberPermissionChangedEvent)
+	bot.Client.MemberCardUpdatedEvent.Subscribe(bot.memberCardUpdatedEvent)
+	bot.Client.NewFriendRequestEvent.Subscribe(bot.friendRequestEvent)
+	bot.Client.NewFriendEvent.Subscribe(bot.friendAddedEvent)
+	bot.Client.GroupInvitedEvent.Subscribe(bot.groupInvitedEvent)
+	bot.Client.UserWantJoinGroupEvent.Subscribe(bot.groupJoinReqEvent)
+	bot.Client.OtherClientStatusChangedEvent.Subscribe(bot.otherClientStatusChangedEvent)
+	bot.Client.GroupDigestEvent.Subscribe(bot.groupEssenceMsg)
 	go func() {
 		if base.HeartbeatInterval == 0 {
 			log.Warn("警告: 心跳功能已关闭，若非预期，请检查配置文件。")
@@ -129,13 +111,9 @@ func NewQQBot(cli *client.QQClient) *CQBot {
 		t := time.NewTicker(base.HeartbeatInterval)
 		for {
 			<-t.C
-			bot.dispatchEventMessage(global.MSG{
-				"time":            time.Now().Unix(),
-				"self_id":         bot.Client.Uin,
-				"post_type":       "meta_event",
-				"meta_event_type": "heartbeat",
-				"status":          bot.CQGetStatus()["data"],
-				"interval":        base.HeartbeatInterval.Milliseconds(),
+			bot.dispatchEvent("meta_event/heartbeat", global.MSG{
+				"status":   bot.CQGetStatus()["data"],
+				"interval": base.HeartbeatInterval.Milliseconds(),
 			})
 		}
 	}()
@@ -149,8 +127,24 @@ func (bot *CQBot) OnEventPush(f func(e *Event)) {
 	bot.lock.Unlock()
 }
 
-// UploadLocalImageAsGroup 上传本地图片至群聊
-func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElement) (i *message.GroupImageElement, err error) {
+type worker struct {
+	wg sync.WaitGroup
+}
+
+func (w *worker) do(f func()) {
+	w.wg.Add(1)
+	go func() {
+		defer w.wg.Done()
+		f()
+	}()
+}
+
+func (w *worker) wait() {
+	w.wg.Wait()
+}
+
+// uploadLocalImage 上传本地图片
+func (bot *CQBot) uploadLocalImage(target message.Source, img *LocalImageElement) (message.IMessageElement, error) {
 	if img.File != "" {
 		f, err := os.Open(img.File)
 		if err != nil {
@@ -159,81 +153,125 @@ func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElemen
 		defer func() { _ = f.Close() }()
 		img.Stream = f
 	}
-	if lawful, mime := base.IsLawfulImage(img.Stream); !lawful {
-		return nil, errors.New("image type error: " + mime)
+	if mt, ok := mime.CheckImage(img.Stream); !ok {
+		return nil, errors.New("image type error: " + mt)
 	}
-	i, err = bot.Client.UploadGroupImage(groupCode, img.Stream)
-	if i != nil {
+	i, err := bot.Client.UploadImage(target, img.Stream, 4)
+	if err != nil {
+		return nil, err
+	}
+	switch i := i.(type) {
+	case *message.GroupImageElement:
 		i.Flash = img.Flash
 		i.EffectID = img.EffectID
+	case *message.FriendImageElement:
+		i.Flash = img.Flash
 	}
-	return
+	return i, err
 }
 
-// UploadLocalVideo 上传本地短视频至群聊
-func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message.ShortVideoElement, error) {
+// uploadLocalVideo 上传本地短视频至群聊
+func (bot *CQBot) uploadLocalVideo(target message.Source, v *LocalVideoElement) (*message.ShortVideoElement, error) {
 	video, err := os.Open(v.File)
 	if err != nil {
 		return nil, err
 	}
-	defer video.Close()
-	hash, _ := utils.ComputeMd5AndLength(io.MultiReader(video, v.thumb))
-	cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash)+".cache")
-	_, _ = video.Seek(0, io.SeekStart)
-	_, _ = v.thumb.Seek(0, io.SeekStart)
-	return bot.Client.UploadGroupShortVideo(target, video, v.thumb, cacheFile)
+	defer func() { _ = video.Close() }()
+	return bot.Client.UploadShortVideo(target, video, v.thumb, 4)
 }
 
-// UploadLocalImageAsPrivate 上传本地图片至私聊
-func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement) (i *message.FriendImageElement, err error) {
-	if img.File != "" {
-		f, err := os.Open(img.File)
-		if err != nil {
-			return nil, errors.Wrap(err, "open image error")
+func removeLocalElement(elements []message.IMessageElement) []message.IMessageElement {
+	var j int
+	for i, e := range elements {
+		switch e.(type) {
+		case *LocalImageElement, *LocalVideoElement:
+		case *message.VoiceElement: // 未上传的语音消息， 也删除
+		case nil:
+		default:
+			if j < i {
+				elements[j] = e
+			}
+			j++
 		}
-		defer func() { _ = f.Close() }()
-		img.Stream = f
 	}
-	if lawful, mime := base.IsLawfulImage(img.Stream); !lawful {
-		return nil, errors.New("image type error: " + mime)
+	return elements[:j]
+}
+
+const uploadFailedTemplate = "警告: %s %d %s上传失败: %v"
+
+func (bot *CQBot) uploadMedia(target message.Source, elements []message.IMessageElement) []message.IMessageElement {
+	var w worker
+	var source string
+	switch target.SourceType { // nolint:exhaustive
+	case message.SourceGroup:
+		source = "群"
+	case message.SourcePrivate:
+		source = "私聊"
+	case message.SourceGuildChannel:
+		source = "频道"
 	}
-	i, err = bot.Client.UploadPrivateImage(userID, img.Stream)
-	if i != nil {
-		i.Flash = img.Flash
+
+	for i, m := range elements {
+		p := &elements[i]
+		switch e := m.(type) {
+		case *LocalImageElement:
+			w.do(func() {
+				m, err := bot.uploadLocalImage(target, e)
+				if err != nil {
+					log.Warnf(uploadFailedTemplate, source, target.PrimaryID, "图片", err)
+				} else {
+					*p = m
+				}
+			})
+		case *message.VoiceElement:
+			w.do(func() {
+				m, err := bot.Client.UploadVoice(target, bytes.NewReader(e.Data))
+				if err != nil {
+					log.Warnf(uploadFailedTemplate, source, target.PrimaryID, "语音", err)
+				} else {
+					*p = m
+				}
+			})
+		case *LocalVideoElement:
+			w.do(func() {
+				m, err := bot.uploadLocalVideo(target, e)
+				if err != nil {
+					log.Warnf(uploadFailedTemplate, source, target.PrimaryID, "视频", err)
+				} else {
+					*p = m
+				}
+			})
+		}
 	}
-	return
+	w.wait()
+	return removeLocalElement(elements)
 }
 
 // SendGroupMessage 发送群消息
-func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int32 {
+func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) (int32, error) {
 	newElem := make([]message.IMessageElement, 0, len(m.Elements))
 	group := bot.Client.FindGroup(groupID)
+	source := message.Source{
+		SourceType: message.SourceGroup,
+		PrimaryID:  groupID,
+	}
+	m.Elements = bot.uploadMedia(source, m.Elements)
 	for _, e := range m.Elements {
 		switch i := e.(type) {
-		case *LocalImageElement, *message.VoiceElement, *LocalVideoElement:
-			i, err := bot.uploadMedia(i, groupID, true)
-			if err != nil {
-				log.Warnf("警告: 群 %d 消息%s上传失败: %v", groupID, e.Type().String(), err)
-				continue
-			}
-			e = i
 		case *PokeElement:
 			if group != nil {
 				if mem := group.FindMember(i.Target); mem != nil {
 					mem.Poke()
 				}
 			}
-			return 0
-		case *GiftElement:
-			bot.Client.SendGroupGift(uint64(groupID), uint64(i.Target), i.GiftID)
-			return 0
+			return 0, nil
 		case *message.MusicShareElement:
 			ret, err := bot.Client.SendGroupMusicShare(groupID, i)
 			if err != nil {
 				log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupID, err)
-				return -1
+				return -1, errors.Wrap(err, "send group music share error")
 			}
-			return bot.InsertGroupMessage(ret)
+			return bot.InsertGroupMessage(ret), nil
 		case *message.AtElement:
 			if i.Target == 0 && group.SelfPermission() == client.Member {
 				e = message.NewText("@全体成员")
@@ -243,30 +281,28 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int
 	}
 	if len(newElem) == 0 {
 		log.Warnf("群消息发送失败: 消息为空.")
-		return -1
+		return -1, errors.New("empty message")
 	}
 	m.Elements = newElem
-	bot.checkMedia(newElem)
-	ret := bot.Client.SendGroupMessage(groupID, m, base.ForceFragmented)
+	bot.checkMedia(newElem, groupID)
+	ret := bot.Client.SendGroupMessage(groupID, m)
 	if ret == nil || ret.Id == -1 {
 		log.Warnf("群消息发送失败: 账号可能被风控.")
-		return -1
+		return -1, errors.New("send group message failed: blocked by server")
 	}
-	return bot.InsertGroupMessage(ret)
+	return bot.InsertGroupMessage(ret), nil
 }
 
 // SendPrivateMessage 发送私聊消息
 func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.SendingMessage) int32 {
 	newElem := make([]message.IMessageElement, 0, len(m.Elements))
+	source := message.Source{
+		SourceType: message.SourcePrivate,
+		PrimaryID:  target,
+	}
+	m.Elements = bot.uploadMedia(source, m.Elements)
 	for _, e := range m.Elements {
 		switch i := e.(type) {
-		case *LocalImageElement, *message.VoiceElement, *LocalVideoElement:
-			i, err := bot.uploadMedia(i, target, false)
-			if err != nil {
-				log.Warnf("警告: 私聊 %d 消息%s上传失败: %v", target, e.Type().String(), err)
-				continue
-			}
-			e = i
 		case *PokeElement:
 			bot.Client.SendFriendPoke(i.Target)
 			return 0
@@ -281,7 +317,7 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 		return -1
 	}
 	m.Elements = newElem
-	bot.checkMedia(newElem)
+	bot.checkMedia(newElem, bot.Client.Uin)
 
 	// 单向好友是否存在
 	unidirectionalFriendExists := func() bool {
@@ -307,6 +343,10 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 			id = bot.InsertPrivateMessage(msg)
 		}
 	case ok || groupID != 0: // 临时会话
+		if !base.AllowTempSession {
+			log.Warnf("发送临时会话消息失败: 已关闭临时会话信息发送功能")
+			return -1
+		}
 		switch {
 		case groupID != 0 && bot.Client.FindGroup(groupID) == nil:
 			log.Errorf("错误: 找不到群(%v)", groupID)
@@ -317,17 +357,19 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 		default:
 			if session == nil && groupID != 0 {
 				msg := bot.Client.SendGroupTempMessage(groupID, target, m)
+				//lint:ignore SA9003 there is a todo
 				if msg != nil { // nolint
 					// todo(Mrs4s)
 					// id = bot.InsertTempMessage(target, msg)
 				}
 				break
 			}
-			msg, err := session.(*client.TempSessionInfo).SendMessage(m)
+			msg, err := session.SendMessage(m)
 			if err != nil {
 				log.Errorf("发送临时会话消息失败: %v", err)
 				break
 			}
+			//lint:ignore SA9003 there is a todo
 			if msg != nil { // nolint
 				// todo(Mrs4s)
 				// id = bot.InsertTempMessage(target, msg)
@@ -348,6 +390,42 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 	return id
 }
 
+// SendGuildChannelMessage 发送频道消息
+func (bot *CQBot) SendGuildChannelMessage(guildID, channelID uint64, m *message.SendingMessage) string {
+	newElem := make([]message.IMessageElement, 0, len(m.Elements))
+	source := message.Source{
+		SourceType:  message.SourceGuildChannel,
+		PrimaryID:   int64(guildID),
+		SecondaryID: int64(channelID),
+	}
+	m.Elements = bot.uploadMedia(source, m.Elements)
+	for _, e := range m.Elements {
+		switch i := e.(type) {
+		case *message.MusicShareElement:
+			bot.Client.SendGuildMusicShare(guildID, channelID, i)
+			return "-1" // todo: fix this
+
+		case *message.VoiceElement, *PokeElement:
+			log.Warnf("警告: 频道暂不支持发送 %v 消息", i.Type().String())
+			continue
+		}
+		newElem = append(newElem, e)
+	}
+	if len(newElem) == 0 {
+		log.Warnf("频道消息发送失败: 消息为空.")
+		return ""
+	}
+	m.Elements = newElem
+	bot.checkMedia(newElem, bot.Client.Uin)
+	ret, err := bot.Client.GuildService.SendGuildChannelMessage(guildID, channelID, m)
+	if err != nil {
+		log.Warnf("频道消息发送失败: %v", err)
+		return ""
+	}
+	// todo: insert db
+	return fmt.Sprintf("%v-%v", ret.Id, ret.InternalId)
+}
+
 // InsertGroupMessage 群聊消息入数据库
 func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
 	t := &message.SendingMessage{Elements: m.Elements}
@@ -384,7 +462,7 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
 			QuotedContent: ToMessageContent(reply.Elements),
 		}
 	}
-	if err := bot.db.InsertGroupMessage(msg); err != nil {
+	if err := db.InsertGroupMessage(msg); err != nil {
 		log.Warnf("记录聊天数据时出现错误: %v", err)
 		return -1
 	}
@@ -424,10 +502,10 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
 		msg.QuotedInfo = &db.QuotedInfo{
 			PrevID:        encodeMessageID(reply.Sender, reply.ReplySeq),
 			PrevGlobalID:  db.ToGlobalID(reply.Sender, reply.ReplySeq),
-			QuotedContent: ToMessageContent(m.Elements),
+			QuotedContent: ToMessageContent(reply.Elements),
 		}
 	}
-	if err := bot.db.InsertPrivateMessage(msg); err != nil {
+	if err := db.InsertPrivateMessage(msg); err != nil {
 		log.Warnf("记录聊天数据时出现错误: %v", err)
 		return -1
 	}
@@ -464,25 +542,63 @@ func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32
 }
 */
 
-// Release 释放Bot实例
-func (bot *CQBot) Release() {
-
+// InsertGuildChannelMessage 频道消息入数据库
+func (bot *CQBot) InsertGuildChannelMessage(m *message.GuildChannelMessage) string {
+	id := encodeGuildMessageID(m.GuildId, m.ChannelId, m.Id, message.SourceGuildChannel)
+	msg := &db.StoredGuildChannelMessage{
+		ID: id,
+		Attribute: &db.StoredGuildMessageAttribute{
+			MessageSeq:   m.Id,
+			InternalID:   m.InternalId,
+			SenderTinyID: m.Sender.TinyId,
+			SenderName:   m.Sender.Nickname,
+			Timestamp:    m.Time,
+		},
+		GuildID:   m.GuildId,
+		ChannelID: m.ChannelId,
+		Content:   ToMessageContent(m.Elements),
+	}
+	if err := db.InsertGuildChannelMessage(msg); err != nil {
+		log.Warnf("记录聊天数据时出现错误: %v", err)
+		return ""
+	}
+	return msg.ID
 }
 
-func (bot *CQBot) dispatchEventMessage(m global.MSG) {
+func (bot *CQBot) event(typ string, others global.MSG) *event {
+	ev := new(event)
+	post, detail, ok := strings.Cut(typ, "/")
+	ev.PostType = post
+	ev.DetailType = detail
+	if ok {
+		detail, sub, _ := strings.Cut(detail, "/")
+		ev.DetailType = detail
+		ev.SubType = sub
+	}
+	ev.Time = time.Now().Unix()
+	ev.SelfID = bot.Client.Uin
+	ev.Others = others
+	return ev
+}
+
+func (bot *CQBot) dispatchEvent(typ string, others global.MSG) {
+	bot.dispatch(bot.event(typ, others))
+}
+
+func (bot *CQBot) dispatch(ev *event) {
 	bot.lock.RLock()
 	defer bot.lock.RUnlock()
 
-	event := &Event{RawMsg: m}
+	event := &Event{Raw: ev}
 	wg := sync.WaitGroup{}
 	wg.Add(len(bot.events))
 	for _, f := range bot.events {
 		go func(fn func(*Event)) {
 			defer func() {
-				wg.Done()
 				if pan := recover(); pan != nil {
-					log.Warnf("处理事件 %v 时出现错误: %v \n%s", m, pan, debug.Stack())
+					log.Warnf("处理事件 %v 时出现错误: %v \n%s", event.JSONString(), pan, debug.Stack())
 				}
+				wg.Done()
 			}()
 
 			start := time.Now()
@@ -494,77 +610,9 @@ func (bot *CQBot) dispatchEventMessage(m global.MSG) {
 		}(f)
 	}
 	wg.Wait()
-	global.PutBuffer(event.buffer)
-}
-
-func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) global.MSG {
-	cqm := ToStringMessage(m.Elements, m.GroupCode, true)
-	gm := global.MSG{
-		"anonymous":    nil,
-		"font":         0,
-		"group_id":     m.GroupCode,
-		"message":      ToFormattedMessage(m.Elements, m.GroupCode, false),
-		"message_type": "group",
-		"message_seq":  m.Id,
-		"post_type": func() string {
-			if m.Sender.Uin == bot.Client.Uin {
-				return "message_sent"
-			}
-			return "message"
-		}(),
-		"raw_message": cqm,
-		"self_id":     bot.Client.Uin,
-		"sender": global.MSG{
-			"age":     0,
-			"area":    "",
-			"level":   "",
-			"sex":     "unknown",
-			"user_id": m.Sender.Uin,
-		},
-		"sub_type": "normal",
-		"time":     m.Time,
-		"user_id":  m.Sender.Uin,
+	if event.buffer != nil {
+		global.PutBuffer(event.buffer)
 	}
-	if m.Sender.IsAnonymous() {
-		gm["anonymous"] = global.MSG{
-			"flag": m.Sender.AnonymousInfo.AnonymousId + "|" + m.Sender.AnonymousInfo.AnonymousNick,
-			"id":   m.Sender.Uin,
-			"name": m.Sender.AnonymousInfo.AnonymousNick,
-		}
-		gm["sender"].(global.MSG)["nickname"] = "匿名消息"
-		gm["sub_type"] = "anonymous"
-	} else {
-		group := bot.Client.FindGroup(m.GroupCode)
-		mem := group.FindMember(m.Sender.Uin)
-		if mem == nil {
-			log.Warnf("获取 %v 成员信息失败，尝试刷新成员列表", m.Sender.Uin)
-			t, err := bot.Client.GetGroupMembers(group)
-			if err != nil {
-				log.Warnf("刷新群 %v 成员列表失败: %v", group.Uin, err)
-				return nil
-			}
-			group.Members = t
-			mem = group.FindMember(m.Sender.Uin)
-			if mem == nil {
-				return nil
-			}
-		}
-		ms := gm["sender"].(global.MSG)
-		switch mem.Permission {
-		case client.Owner:
-			ms["role"] = "owner"
-		case client.Administrator:
-			ms["role"] = "admin"
-		case client.Member:
-			ms["role"] = "member"
-		default:
-			ms["role"] = "member"
-		}
-		ms["nickname"] = mem.Nickname
-		ms["card"] = mem.CardName
-		ms["title"] = mem.SpecialTitle
-	}
-	return gm
 }
 
 func formatGroupName(group *client.GroupInfo) string {
@@ -578,24 +626,6 @@ func formatMemberName(mem *client.GroupMemberInfo) string {
 	return fmt.Sprintf("%s(%d)", mem.DisplayName(), mem.Uin)
 }
 
-func (bot *CQBot) uploadMedia(raw message.IMessageElement, target int64, group bool) (message.IMessageElement, error) {
-	switch m := raw.(type) {
-	case *LocalImageElement:
-		if group {
-			return bot.UploadLocalImageAsGroup(target, m)
-		}
-		return bot.UploadLocalImageAsPrivate(target, m)
-	case *message.VoiceElement:
-		if group {
-			return bot.Client.UploadGroupPtt(target, bytes.NewReader(m.Data))
-		}
-		return bot.Client.UploadPrivatePtt(target, bytes.NewReader(m.Data))
-	case *LocalVideoElement:
-		return bot.UploadLocalVideo(target, m)
-	}
-	return nil, errors.New("unsupported message element type")
-}
-
 // encodeMessageID 临时先这样, 暂时用不上
 func encodeMessageID(target int64, seq int32) string {
 	return hex.EncodeToString(binary.NewWriterF(func(w *binary.Writer) {
@@ -603,3 +633,30 @@ func encodeMessageID(target int64, seq int32) string {
 		w.WriteUInt32(uint32(seq))
 	}))
 }
+
+// encodeGuildMessageID 将频道信息编码为字符串
+// 当信息来源为 Channel 时 primaryID 为 guildID , subID 为 channelID
+// 当信息来源为 Direct 时 primaryID 为 guildID , subID 为 tinyID
+func encodeGuildMessageID(primaryID, subID, seq uint64, source message.SourceType) string {
+	return base64.StdEncoding.EncodeToString(binary.NewWriterF(func(w *binary.Writer) {
+		w.WriteByte(byte(source))
+		w.WriteUInt64(primaryID)
+		w.WriteUInt64(subID)
+		w.WriteUInt64(seq)
+	}))
+}
+
+func decodeGuildMessageID(id string) (source message.Source, seq uint64) {
+	b, _ := base64.StdEncoding.DecodeString(id)
+	if len(b) < 25 {
+		return
+	}
+	r := binary.NewReader(b)
+	source = message.Source{
+		SourceType:  message.SourceType(r.ReadByte()),
+		PrimaryID:   r.ReadInt64(),
+		SecondaryID: r.ReadInt64(),
+	}
+	seq = uint64(r.ReadInt64())
+	return
+}

coolq/converter.go

@@ -0,0 +1,223 @@
+package coolq
+
+import (
+	"strconv"
+	"strings"
+
+	"github.com/Mrs4s/MiraiGo/topic"
+
+	"github.com/Mrs4s/MiraiGo/client"
+	"github.com/Mrs4s/MiraiGo/message"
+	log "github.com/sirupsen/logrus"
+
+	"github.com/Mrs4s/go-cqhttp/global"
+)
+
+func convertGroupMemberInfo(groupID int64, m *client.GroupMemberInfo) global.MSG {
+	sex := "unknown"
+	if m.Gender == 1 { // unknown = 0xff
+		sex = "female"
+	} else if m.Gender == 0 {
+		sex = "male"
+	}
+	role := "member"
+	switch m.Permission { // nolint:exhaustive
+	case client.Owner:
+		role = "owner"
+	case client.Administrator:
+		role = "admin"
+	}
+	return global.MSG{
+		"group_id":          groupID,
+		"user_id":           m.Uin,
+		"nickname":          m.Nickname,
+		"card":              m.CardName,
+		"sex":               sex,
+		"age":               0,
+		"area":              "",
+		"join_time":         m.JoinTime,
+		"last_sent_time":    m.LastSpeakTime,
+		"shut_up_timestamp": m.ShutUpTimestamp,
+		"level":             strconv.FormatInt(int64(m.Level), 10),
+		"role":              role,
+		"unfriendly":        false,
+		"title":             m.SpecialTitle,
+		"title_expire_time": 0,
+		"card_changeable":   false,
+	}
+}
+
+func convertGuildMemberInfo(m []*client.GuildMemberInfo) (r []global.MSG) {
+	for _, mem := range m {
+		r = append(r, global.MSG{
+			"tiny_id":   fU64(mem.TinyId),
+			"title":     mem.Title,
+			"nickname":  mem.Nickname,
+			"role_id":   fU64(mem.Role),
+			"role_name": mem.RoleName,
+		})
+	}
+	return
+}
+
+func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) *event {
+	source := message.Source{
+		SourceType: message.SourceGroup,
+		PrimaryID:  m.GroupCode,
+	}
+	cqm := toStringMessage(m.Elements, source)
+	typ := "message/group/normal"
+	if m.Sender.Uin == bot.Client.Uin {
+		typ = "message_sent/group/normal"
+	}
+	gm := global.MSG{
+		"anonymous":   nil,
+		"font":        0,
+		"group_id":    m.GroupCode,
+		"message":     ToFormattedMessage(m.Elements, source),
+		"message_seq": m.Id,
+		"raw_message": cqm,
+		"sender": global.MSG{
+			"age":     0,
+			"area":    "",
+			"level":   "",
+			"sex":     "unknown",
+			"user_id": m.Sender.Uin,
+		},
+		"user_id": m.Sender.Uin,
+	}
+	if m.Sender.IsAnonymous() {
+		gm["anonymous"] = global.MSG{
+			"flag": m.Sender.AnonymousInfo.AnonymousId + "|" + m.Sender.AnonymousInfo.AnonymousNick,
+			"id":   m.Sender.Uin,
+			"name": m.Sender.AnonymousInfo.AnonymousNick,
+		}
+		gm["sender"].(global.MSG)["nickname"] = "匿名消息"
+		gm["sub_type"] = "anonymous"
+	} else {
+		group := bot.Client.FindGroup(m.GroupCode)
+		mem := group.FindMember(m.Sender.Uin)
+		if mem == nil {
+			log.Warnf("获取 %v 成员信息失败，尝试刷新成员列表", m.Sender.Uin)
+			t, err := bot.Client.GetGroupMembers(group)
+			if err != nil {
+				log.Warnf("刷新群 %v 成员列表失败: %v", group.Uin, err)
+				return nil
+			}
+			group.Members = t
+			mem = group.FindMember(m.Sender.Uin)
+			if mem == nil {
+				return nil
+			}
+		}
+		ms := gm["sender"].(global.MSG)
+		role := "member"
+		switch mem.Permission { // nolint:exhaustive
+		case client.Owner:
+			role = "owner"
+		case client.Administrator:
+			role = "admin"
+		}
+		ms["role"] = role
+		ms["nickname"] = mem.Nickname
+		ms["card"] = mem.CardName
+		ms["title"] = mem.SpecialTitle
+	}
+	ev := bot.event(typ, gm)
+	ev.Time = int64(m.Time)
+	return ev
+}
+
+func convertChannelInfo(c *client.ChannelInfo) global.MSG {
+	slowModes := make([]global.MSG, 0, len(c.Meta.SlowModes))
+	for _, mode := range c.Meta.SlowModes {
+		slowModes = append(slowModes, global.MSG{
+			"slow_mode_key":    mode.SlowModeKey,
+			"slow_mode_text":   mode.SlowModeText,
+			"speak_frequency":  mode.SpeakFrequency,
+			"slow_mode_circle": mode.SlowModeCircle,
+		})
+	}
+	return global.MSG{
+		"channel_id":        fU64(c.ChannelId),
+		"channel_type":      c.ChannelType,
+		"channel_name":      c.ChannelName,
+		"owner_guild_id":    fU64(c.Meta.GuildId),
+		"creator_tiny_id":   fU64(c.Meta.CreatorTinyId),
+		"create_time":       c.Meta.CreateTime,
+		"current_slow_mode": c.Meta.CurrentSlowMode,
+		"talk_permission":   c.Meta.TalkPermission,
+		"visible_type":      c.Meta.VisibleType,
+		"slow_modes":        slowModes,
+	}
+}
+
+func convertChannelFeedInfo(f *topic.Feed) global.MSG {
+	m := global.MSG{
+		"id":          f.Id,
+		"title":       f.Title,
+		"sub_title":   f.SubTitle,
+		"create_time": f.CreateTime,
+		"guild_id":    fU64(f.GuildId),
+		"channel_id":  fU64(f.ChannelId),
+		"poster_info": global.MSG{
+			"tiny_id":  f.Poster.TinyIdStr,
+			"nickname": f.Poster.Nickname,
+			"icon_url": f.Poster.IconUrl,
+		},
+		"contents": FeedContentsToArrayMessage(f.Contents),
+	}
+	images := make([]global.MSG, 0, len(f.Images))
+	videos := make([]global.MSG, 0, len(f.Videos))
+	for _, image := range f.Images {
+		images = append(images, global.MSG{
+			"file_id":    image.FileId,
+			"pattern_id": image.PatternId,
+			"url":        image.Url,
+			"width":      image.Width,
+			"height":     image.Height,
+		})
+	}
+	for _, video := range f.Videos {
+		videos = append(videos, global.MSG{
+			"file_id":    video.FileId,
+			"pattern_id": video.PatternId,
+			"url":        video.Url,
+			"width":      video.Width,
+			"height":     video.Height,
+		})
+	}
+	m["resource"] = global.MSG{
+		"images": images,
+		"videos": videos,
+	}
+	return m
+}
+
+func convertReactions(reactions []*message.GuildMessageEmojiReaction) (r []global.MSG) {
+	r = make([]global.MSG, len(reactions))
+	for i, re := range reactions {
+		r[i] = global.MSG{
+			"emoji_id":    re.EmojiId,
+			"emoji_index": re.Face.Index,
+			"emoji_type":  re.EmojiType,
+			"emoji_name":  re.Face.Name,
+			"count":       re.Count,
+			"clicked":     re.Clicked,
+		}
+	}
+	return
+}
+
+func toStringMessage(m []message.IMessageElement, source message.Source) string {
+	elems := toElements(m, source)
+	var sb strings.Builder
+	for _, elem := range elems {
+		elem.WriteCQCodeTo(&sb)
+	}
+	return sb.String()
+}
+
+func fU64(v uint64) string {
+	return strconv.FormatUint(v, 10)
+}

coolq/cqcode/element.go

@@ -0,0 +1,67 @@
+package cqcode
+
+import (
+	"bytes"
+	"strings"
+
+	"github.com/Mrs4s/MiraiGo/binary"
+	"github.com/Mrs4s/go-cqhttp/global"
+)
+
+// Element single message
+type Element struct {
+	Type string
+	Data []Pair
+}
+
+// Pair key value pair
+type Pair struct {
+	K string
+	V string
+}
+
+// CQCode convert element to cqcode
+func (e *Element) CQCode() string {
+	buf := strings.Builder{}
+	e.WriteCQCodeTo(&buf)
+	return buf.String()
+}
+
+// WriteCQCodeTo write element's cqcode into sb
+func (e *Element) WriteCQCodeTo(sb *strings.Builder) {
+	if e.Type == "text" {
+		sb.WriteString(EscapeText(e.Data[0].V)) // must be {"text": value}
+		return
+	}
+	sb.WriteString("[CQ:")
+	sb.WriteString(e.Type)
+	for _, data := range e.Data {
+		sb.WriteByte(',')
+		sb.WriteString(data.K)
+		sb.WriteByte('=')
+		sb.WriteString(EscapeValue(data.V))
+	}
+	sb.WriteByte(']')
+}
+
+// MarshalJSON see encoding/json.Marshaler
+func (e *Element) MarshalJSON() ([]byte, error) {
+	return binary.NewWriterF(func(w *binary.Writer) {
+		buf := (*bytes.Buffer)(w)
+		// fmt.Fprintf(buf, `{"type":"%s","data":{`, e.Type)
+		buf.WriteString(`{"type":"`)
+		buf.WriteString(e.Type)
+		buf.WriteString(`","data":{`)
+		for i, data := range e.Data {
+			if i != 0 {
+				buf.WriteByte(',')
+			}
+			// fmt.Fprintf(buf, `"%s":%q`, data.K, data.V)
+			buf.WriteByte('"')
+			buf.WriteString(data.K)
+			buf.WriteString(`":`)
+			buf.WriteString(global.Quote(data.V))
+		}
+		buf.WriteString(`}}`)
+	}), nil
+}

coolq/cqcode/escape.go

@@ -0,0 +1,79 @@
+// Package cqcode provides CQCode util functions.
+package cqcode
+
+import "strings"
+
+// EscapeText 将字符串raw中部分字符转义
+//
+//   - & -> &
+//   - [ -> [
+//   - ] -> ]
+func EscapeText(s string) string {
+	count := strings.Count(s, "&")
+	count += strings.Count(s, "[")
+	count += strings.Count(s, "]")
+	if count == 0 {
+		return s
+	}
+
+	// Apply replacements to buffer.
+	var b strings.Builder
+	b.Grow(len(s) + count*4)
+	start := 0
+	for i := 0; i < count; i++ {
+		j := start
+		for index, r := range s[start:] {
+			if r == '&' || r == '[' || r == ']' {
+				j += index
+				break
+			}
+		}
+		b.WriteString(s[start:j])
+		switch s[j] {
+		case '&':
+			b.WriteString("&amp;")
+		case '[':
+			b.WriteString("&#91;")
+		case ']':
+			b.WriteString("&#93;")
+		}
+		start = j + 1
+	}
+	b.WriteString(s[start:])
+	return b.String()
+}
+
+// EscapeValue 将字符串value中部分字符转义
+//
+//   - , -> &#44;
+//   - & -> &amp;
+//   - [ -> &#91;
+//   - ] -> &#93;
+func EscapeValue(value string) string {
+	ret := EscapeText(value)
+	return strings.ReplaceAll(ret, ",", "&#44;")
+}
+
+// UnescapeText 将字符串content中部分字符反转义
+//
+//   - &amp; -> &
+//   - &#91; -> [
+//   - &#93; -> ]
+func UnescapeText(content string) string {
+	ret := content
+	ret = strings.ReplaceAll(ret, "&#91;", "[")
+	ret = strings.ReplaceAll(ret, "&#93;", "]")
+	ret = strings.ReplaceAll(ret, "&amp;", "&")
+	return ret
+}
+
+// UnescapeValue 将字符串content中部分字符反转义
+//
+//   - &#44; -> ,
+//   - &amp; -> &
+//   - &#91; -> [
+//   - &#93; -> ]
+func UnescapeValue(content string) string {
+	ret := strings.ReplaceAll(content, "&#44;", ",")
+	return UnescapeText(ret)
+}

coolq/cqcode_test.go

@@ -5,15 +5,18 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Mrs4s/MiraiGo/utils"
 	"github.com/stretchr/testify/assert"
 	"github.com/tidwall/gjson"
+
+	"github.com/Mrs4s/go-cqhttp/coolq/cqcode"
 )
 
 var bot = CQBot{}
 
 func TestCQBot_ConvertStringMessage(t *testing.T) {
-	for _, v := range bot.ConvertStringMessage(`[CQ:face,id=115,text=111][CQ:face,id=217]] [CQ:text,text=123] [`, false) {
+	for _, v := range bot.ConvertStringMessage(`[CQ:face,id=115,text=111][CQ:face,id=217]] [CQ:text,text=123] [`, message.SourcePrivate) {
 		fmt.Println(v)
 	}
 }
@@ -25,14 +28,14 @@ var (
 
 func BenchmarkCQBot_ConvertStringMessage(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		bot.ConvertStringMessage(bench, false)
+		bot.ConvertStringMessage(bench, message.SourcePrivate)
 	}
 	b.SetBytes(int64(len(bench)))
 }
 
 func BenchmarkCQBot_ConvertObjectMessage(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		bot.ConvertObjectMessage(benchArray, false)
+		bot.ConvertObjectMessage(benchArray, message.SourcePrivate)
 	}
 }
 
@@ -41,7 +44,7 @@ const bText = `123456789[]&987654321[]&987654321[]&987654321[]&987654321[]&98765
 func BenchmarkCQCodeEscapeText(b *testing.B) {
 	for i := 0; i < b.N; i++ {
 		ret := bText
-		CQCodeEscapeText(ret)
+		cqcode.EscapeText(ret)
 	}
 }
 
@@ -61,6 +64,6 @@ func TestCQCodeEscapeText(t *testing.T) {
 		ret = strings.ReplaceAll(ret, "&", "&amp;")
 		ret = strings.ReplaceAll(ret, "[", "&#91;")
 		ret = strings.ReplaceAll(ret, "]", "&#93;")
-		assert.Equal(t, ret, CQCodeEscapeText(rs))
+		assert.Equal(t, ret, cqcode.EscapeText(rs))
 	}
 }

coolq/event.go

@@ -2,59 +2,96 @@ package coolq
 
 import (
 	"encoding/hex"
-	"os"
+	"encoding/json"
+	"fmt"
 	"path"
 	"strconv"
 	"strings"
-	"time"
-
-	"github.com/Mrs4s/go-cqhttp/db"
-	"github.com/Mrs4s/go-cqhttp/internal/cache"
-
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/internal/base"
 
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
 	log "github.com/sirupsen/logrus"
+
+	"github.com/Mrs4s/go-cqhttp/db"
+	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/internal/cache"
+	"github.com/Mrs4s/go-cqhttp/internal/download"
 )
 
 // ToFormattedMessage 将给定[]message.IMessageElement转换为通过coolq.SetMessageFormat所定义的消息上报格式
-func ToFormattedMessage(e []message.IMessageElement, groupID int64, isRaw ...bool) (r interface{}) {
+func ToFormattedMessage(e []message.IMessageElement, source message.Source) (r interface{}) {
 	if base.PostFormat == "string" {
-		r = ToStringMessage(e, groupID, isRaw...)
+		r = toStringMessage(e, source)
 	} else if base.PostFormat == "array" {
-		r = ToArrayMessage(e, groupID)
+		r = toElements(e, source)
 	}
 	return
 }
 
-func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMessage) {
-	bot.checkMedia(m.Elements)
-	cqm := ToStringMessage(m.Elements, 0, true)
-	id := m.Id
-	if bot.db != nil {
-		id = bot.InsertPrivateMessage(m)
+type event struct {
+	PostType   string
+	DetailType string
+	SubType    string
+	Time       int64
+	SelfID     int64
+	Others     global.MSG
+}
+
+func (ev *event) MarshalJSON() ([]byte, error) {
+	buf := global.NewBuffer()
+	defer global.PutBuffer(buf)
+
+	detail := ""
+	switch ev.PostType {
+	case "message", "message_sent":
+		detail = "message_type"
+	case "notice":
+		detail = "notice_type"
+	case "request":
+		detail = "request_type"
+	case "meta_event":
+		detail = "meta_event_type"
+	default:
+		panic("unknown post type: " + ev.PostType)
 	}
+	fmt.Fprintf(buf, `{"post_type":"%s","%s":"%s","time":%d,"self_id":%d`, ev.PostType, detail, ev.DetailType, ev.Time, ev.SelfID)
+	if ev.SubType != "" {
+		fmt.Fprintf(buf, `,"sub_type":"%s"`, ev.SubType)
+	}
+	for k, v := range ev.Others {
+		v, err := json.Marshal(v)
+		if err != nil {
+			log.Warnf("marshal message payload error: %v", err)
+			return nil, err
+		}
+		fmt.Fprintf(buf, `,"%s":%s`, k, v)
+	}
+	buf.WriteByte('}')
+	return append([]byte(nil), buf.Bytes()...), nil
+}
+
+func (bot *CQBot) privateMessageEvent(_ *client.QQClient, m *message.PrivateMessage) {
+	bot.checkMedia(m.Elements, m.Sender.Uin)
+	source := message.Source{
+		SourceType: message.SourcePrivate,
+		PrimaryID:  m.Sender.Uin,
+	}
+	cqm := toStringMessage(m.Elements, source)
+	id := bot.InsertPrivateMessage(m)
 	log.Infof("收到好友 %v(%v) 的消息: %v (%v)", m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
+	typ := "message/private/friend"
+	if m.Sender.Uin == bot.Client.Uin {
+		typ = "message_sent/private/friend"
+	}
 	fm := global.MSG{
-		"post_type": func() string {
-			if m.Sender.Uin == bot.Client.Uin {
-				return "message_sent"
-			}
-			return "message"
-		}(),
-		"message_type": "private",
-		"sub_type":     "friend",
-		"message_id":   id,
-		"user_id":      m.Sender.Uin,
-		"target_id":    m.Target,
-		"message":      ToFormattedMessage(m.Elements, 0, false),
-		"raw_message":  cqm,
-		"font":         0,
-		"self_id":      c.Uin,
-		"time":         time.Now().Unix(),
+		"message_id":  id,
+		"user_id":     m.Sender.Uin,
+		"target_id":   m.Target,
+		"message":     ToFormattedMessage(m.Elements, source),
+		"raw_message": cqm,
+		"font":        0,
 		"sender": global.MSG{
 			"user_id":  m.Sender.Uin,
 			"nickname": m.Sender.Nickname,
@@ -62,19 +99,17 @@ func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMess
 			"age":      0,
 		},
 	}
-	bot.dispatchEventMessage(fm)
+	bot.dispatchEvent(typ, fm)
 }
 
 func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage) {
-	bot.checkMedia(m.Elements)
+	bot.checkMedia(m.Elements, m.GroupCode)
 	for _, elem := range m.Elements {
 		if file, ok := elem.(*message.GroupFileElement); ok {
 			log.Infof("群 %v(%v) 内 %v(%v) 上传了文件: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, file.Name)
-			bot.dispatchEventMessage(global.MSG{
-				"post_type":   "notice",
-				"notice_type": "group_upload",
-				"group_id":    m.GroupCode,
-				"user_id":     m.Sender.Uin,
+			bot.dispatchEvent("notice/group_upload", global.MSG{
+				"group_id": m.GroupCode,
+				"user_id":  m.Sender.Uin,
 				"file": global.MSG{
 					"id":    file.Path,
 					"name":  file.Name,
@@ -82,49 +117,47 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 					"busid": file.Busid,
 					"url":   c.GetGroupFileUrl(m.GroupCode, file.Path, file.Busid),
 				},
-				"self_id": c.Uin,
-				"time":    time.Now().Unix(),
 			})
 			return
 		}
 	}
-	cqm := ToStringMessage(m.Elements, m.GroupCode, true)
-	id := m.Id
-	if bot.db != nil {
-		id = bot.InsertGroupMessage(m)
+	source := message.Source{
+		SourceType: message.SourceGroup,
+		PrimaryID:  m.GroupCode,
 	}
+	cqm := toStringMessage(m.Elements, source)
+	id := bot.InsertGroupMessage(m)
 	log.Infof("收到群 %v(%v) 内 %v(%v) 的消息: %v (%v)", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
 	gm := bot.formatGroupMessage(m)
 	if gm == nil {
 		return
 	}
-	gm["message_id"] = id
-	bot.dispatchEventMessage(gm)
+	gm.Others["message_id"] = id
+	bot.dispatch(gm)
 }
 
 func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEvent) {
 	m := e.Message
-	bot.checkMedia(m.Elements)
-	cqm := ToStringMessage(m.Elements, 0, true)
+	bot.checkMedia(m.Elements, m.Sender.Uin)
+	source := message.Source{
+		SourceType: message.SourcePrivate,
+		PrimaryID:  e.Session.Sender,
+	}
+	cqm := toStringMessage(m.Elements, source)
 	bot.tempSessionCache.Store(m.Sender.Uin, e.Session)
 	id := m.Id
-	if bot.db != nil { // nolint
-		// todo(Mrs4s)
-		// id = bot.InsertTempMessage(m.Sender.Uin, m)
-	}
+	// todo(Mrs4s)
+	// if bot.db != nil { // nolint
+	// 		id = bot.InsertTempMessage(m.Sender.Uin, m)
+	// }
 	log.Infof("收到来自群 %v(%v) 内 %v(%v) 的临时会话消息: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm)
 	tm := global.MSG{
-		"post_type":    "message",
-		"message_type": "private",
-		"sub_type":     "group",
-		"temp_source":  e.Session.Source,
-		"message_id":   id,
-		"user_id":      m.Sender.Uin,
-		"message":      ToFormattedMessage(m.Elements, 0, false),
-		"raw_message":  cqm,
-		"font":         0,
-		"self_id":      c.Uin,
-		"time":         time.Now().Unix(),
+		"temp_source": e.Session.Source,
+		"message_id":  id,
+		"user_id":     m.Sender.Uin,
+		"message":     ToFormattedMessage(m.Elements, source),
+		"raw_message": cqm,
+		"font":        0,
 		"sender": global.MSG{
 			"user_id":  m.Sender.Uin,
 			"group_id": m.GroupCode,
@@ -133,7 +166,155 @@ func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEven
 			"age":      0,
 		},
 	}
-	bot.dispatchEventMessage(tm)
+	bot.dispatchEvent("message/private/group", tm)
+}
+
+func (bot *CQBot) guildChannelMessageEvent(c *client.QQClient, m *message.GuildChannelMessage) {
+	bot.checkMedia(m.Elements, int64(m.Sender.TinyId))
+	guild := c.GuildService.FindGuild(m.GuildId)
+	if guild == nil {
+		return
+	}
+	channel := guild.FindChannel(m.ChannelId)
+	source := message.Source{
+		SourceType:  message.SourceGuildChannel,
+		PrimaryID:   int64(m.GuildId),
+		SecondaryID: int64(m.ChannelId),
+	}
+	log.Infof("收到来自频道 %v(%v) 子频道 %v(%v) 内 %v(%v) 的消息: %v", guild.GuildName, guild.GuildId, channel.ChannelName, m.ChannelId, m.Sender.Nickname, m.Sender.TinyId, toStringMessage(m.Elements, source))
+	id := bot.InsertGuildChannelMessage(m)
+	ev := bot.event("message/guild/channel", global.MSG{
+		"guild_id":     fU64(m.GuildId),
+		"channel_id":   fU64(m.ChannelId),
+		"message_id":   id,
+		"user_id":      fU64(m.Sender.TinyId),
+		"message":      ToFormattedMessage(m.Elements, source), // todo: 增加对频道消息 Reply 的支持
+		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
+		"sender": global.MSG{
+			"user_id":  m.Sender.TinyId,
+			"tiny_id":  fU64(m.Sender.TinyId),
+			"nickname": m.Sender.Nickname,
+		},
+	})
+	ev.Time = m.Time
+	bot.dispatch(ev)
+}
+
+func (bot *CQBot) guildMessageReactionsUpdatedEvent(c *client.QQClient, e *client.GuildMessageReactionsUpdatedEvent) {
+	guild := c.GuildService.FindGuild(e.GuildId)
+	if guild == nil {
+		return
+	}
+	msgID := encodeGuildMessageID(e.GuildId, e.ChannelId, e.MessageId, message.SourceGuildChannel)
+	str := fmt.Sprintf("频道 %v(%v) 消息 %v 表情贴片已更新: ", guild.GuildName, guild.GuildId, msgID)
+	currentReactions := make([]global.MSG, len(e.CurrentReactions))
+	for i, r := range e.CurrentReactions {
+		str += fmt.Sprintf("%v*%v ", r.Face.Name, r.Count)
+		currentReactions[i] = global.MSG{
+			"emoji_id":    r.EmojiId,
+			"emoji_index": r.Face.Index,
+			"emoji_type":  r.EmojiType,
+			"emoji_name":  r.Face.Name,
+			"count":       r.Count,
+			"clicked":     r.Clicked,
+		}
+	}
+	if len(e.CurrentReactions) == 0 {
+		str += "无任何表情"
+	}
+	log.Infof(str)
+	bot.dispatchEvent("notice/message_reactions_updated", global.MSG{
+		"guild_id":          fU64(e.GuildId),
+		"channel_id":        fU64(e.ChannelId),
+		"message_id":        msgID,
+		"operator_id":       fU64(e.OperatorId),
+		"current_reactions": currentReactions,
+		"self_tiny_id":      fU64(bot.Client.GuildService.TinyId),
+		"user_id":           e.OperatorId,
+	})
+}
+
+func (bot *CQBot) guildChannelMessageRecalledEvent(c *client.QQClient, e *client.GuildMessageRecalledEvent) {
+	guild := c.GuildService.FindGuild(e.GuildId)
+	if guild == nil {
+		return
+	}
+	channel := guild.FindChannel(e.ChannelId)
+	if channel == nil {
+		return
+	}
+	operator, err := c.GuildService.FetchGuildMemberProfileInfo(e.GuildId, e.OperatorId)
+	if err != nil {
+		log.Errorf("处理频道撤回事件时出现错误: 获取操作者资料时出现错误 %v", err)
+		return
+	}
+	msgID := encodeGuildMessageID(e.GuildId, e.ChannelId, e.MessageId, message.SourceGuildChannel)
+	log.Infof("用户 %v(%v) 撤回了频道 %v(%v) 子频道 %v(%v) 的消息 %v", operator.Nickname, operator.TinyId, guild.GuildName, guild.GuildId, channel.ChannelName, channel.ChannelId, msgID)
+	bot.dispatchEvent("notice/guild_channel_recall", global.MSG{
+		"guild_id":     fU64(e.GuildId),
+		"channel_id":   fU64(e.ChannelId),
+		"operator_id":  fU64(e.OperatorId),
+		"message_id":   msgID,
+		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
+		"user_id":      e.OperatorId,
+	})
+}
+
+func (bot *CQBot) guildChannelUpdatedEvent(c *client.QQClient, e *client.GuildChannelUpdatedEvent) {
+	guild := c.GuildService.FindGuild(e.GuildId)
+	if guild == nil {
+		return
+	}
+	log.Infof("频道 %v(%v) 子频道 %v(%v) 信息已更新", guild.GuildName, guild.GuildId, e.NewChannelInfo.ChannelName, e.NewChannelInfo.ChannelId)
+	bot.dispatchEvent("notice/channel_updated", global.MSG{
+		"guild_id":     fU64(e.GuildId),
+		"channel_id":   fU64(e.ChannelId),
+		"operator_id":  fU64(e.OperatorId),
+		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
+		"user_id":      e.OperatorId,
+		"old_info":     convertChannelInfo(e.OldChannelInfo),
+		"new_info":     convertChannelInfo(e.NewChannelInfo),
+	})
+}
+
+func (bot *CQBot) guildChannelCreatedEvent(c *client.QQClient, e *client.GuildChannelOperationEvent) {
+	guild := c.GuildService.FindGuild(e.GuildId)
+	if guild == nil {
+		return
+	}
+	member, _ := c.GuildService.FetchGuildMemberProfileInfo(e.GuildId, e.OperatorId)
+	if member == nil {
+		member = &client.GuildUserProfile{Nickname: "未知"}
+	}
+	log.Infof("频道 %v(%v) 内用户 %v(%v) 创建了子频道 %v(%v)", guild.GuildName, guild.GuildId, member.Nickname, member.TinyId, e.ChannelInfo.ChannelName, e.ChannelInfo.ChannelId)
+	bot.dispatchEvent("notice/channel_created", global.MSG{
+		"guild_id":     fU64(e.GuildId),
+		"channel_id":   fU64(e.ChannelInfo.ChannelId),
+		"operator_id":  fU64(e.OperatorId),
+		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
+		"user_id":      e.OperatorId,
+		"channel_info": convertChannelInfo(e.ChannelInfo),
+	})
+}
+
+func (bot *CQBot) guildChannelDestroyedEvent(c *client.QQClient, e *client.GuildChannelOperationEvent) {
+	guild := c.GuildService.FindGuild(e.GuildId)
+	if guild == nil {
+		return
+	}
+	member, _ := c.GuildService.FetchGuildMemberProfileInfo(e.GuildId, e.OperatorId)
+	if member == nil {
+		member = &client.GuildUserProfile{Nickname: "未知"}
+	}
+	log.Infof("频道 %v(%v) 内用户 %v(%v) 删除了子频道 %v(%v)", guild.GuildName, guild.GuildId, member.Nickname, member.TinyId, e.ChannelInfo.ChannelName, e.ChannelInfo.ChannelId)
+	bot.dispatchEvent("notice/channel_destroyed", global.MSG{
+		"guild_id":     fU64(e.GuildId),
+		"channel_id":   fU64(e.ChannelInfo.ChannelId),
+		"operator_id":  fU64(e.OperatorId),
+		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
+		"user_id":      e.OperatorId,
+		"channel_info": convertChannelInfo(e.ChannelInfo),
+	})
 }
 
 func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent) {
@@ -155,22 +336,15 @@ func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent)
 				formatGroupName(g), formatMemberName(g.FindMember(e.TargetUin)), formatMemberName(g.FindMember(e.OperatorUin)))
 		}
 	}
-
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":   "notice",
+	typ := "notice/group_ban/ban"
+	if e.Time == 0 {
+		typ = "notice/group_ban/lift_ban"
+	}
+	bot.dispatchEvent(typ, global.MSG{
 		"duration":    e.Time,
 		"group_id":    e.GroupCode,
-		"notice_type": "group_ban",
 		"operator_id": e.OperatorUin,
-		"self_id":     c.Uin,
 		"user_id":     e.TargetUin,
-		"time":        time.Now().Unix(),
-		"sub_type": func() string {
-			if e.Time == 0 {
-				return "lift_ban"
-			}
-			return "ban"
-		}(),
 	})
 }
 
@@ -179,16 +353,15 @@ func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *client.GroupMessageRec
 	gid := db.ToGlobalID(e.GroupCode, e.MessageId)
 	log.Infof("群 %v 内 %v 撤回了 %v 的消息: %v.",
 		formatGroupName(g), formatMemberName(g.FindMember(e.OperatorUin)), formatMemberName(g.FindMember(e.AuthorUin)), gid)
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":   "notice",
+
+	ev := bot.event("notice/group_recall", global.MSG{
 		"group_id":    e.GroupCode,
-		"notice_type": "group_recall",
-		"self_id":     c.Uin,
 		"user_id":     e.AuthorUin,
 		"operator_id": e.OperatorUin,
-		"time":        e.Time,
 		"message_id":  gid,
 	})
+	ev.Time = int64(e.Time)
+	bot.dispatch(ev)
 }
 
 func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
@@ -198,42 +371,27 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 		sender := group.FindMember(notify.Sender)
 		receiver := group.FindMember(notify.Receiver)
 		log.Infof("群 %v 内 %v 戳了戳 %v", formatGroupName(group), formatMemberName(sender), formatMemberName(receiver))
-		bot.dispatchEventMessage(global.MSG{
-			"post_type":   "notice",
-			"group_id":    group.Code,
-			"notice_type": "notify",
-			"sub_type":    "poke",
-			"self_id":     c.Uin,
-			"user_id":     notify.Sender,
-			"sender_id":   notify.Sender,
-			"target_id":   notify.Receiver,
-			"time":        time.Now().Unix(),
+		bot.dispatchEvent("notice/notify/poke", global.MSG{
+			"group_id":  group.Code,
+			"user_id":   notify.Sender,
+			"sender_id": notify.Sender,
+			"target_id": notify.Receiver,
 		})
 	case *client.GroupRedBagLuckyKingNotifyEvent:
 		sender := group.FindMember(notify.Sender)
 		luckyKing := group.FindMember(notify.LuckyKing)
 		log.Infof("群 %v 内 %v 的红包被抢完, %v 是运气王", formatGroupName(group), formatMemberName(sender), formatMemberName(luckyKing))
-		bot.dispatchEventMessage(global.MSG{
-			"post_type":   "notice",
-			"group_id":    group.Code,
-			"notice_type": "notify",
-			"sub_type":    "lucky_king",
-			"self_id":     c.Uin,
-			"user_id":     notify.Sender,
-			"sender_id":   notify.Sender,
-			"target_id":   notify.LuckyKing,
-			"time":        time.Now().Unix(),
+		bot.dispatchEvent("notice/notify/lucky_king", global.MSG{
+			"group_id":  group.Code,
+			"user_id":   notify.Sender,
+			"sender_id": notify.Sender,
+			"target_id": notify.LuckyKing,
 		})
 	case *client.MemberHonorChangedNotifyEvent:
 		log.Info(notify.Content())
-		bot.dispatchEventMessage(global.MSG{
-			"post_type":   "notice",
-			"group_id":    group.Code,
-			"notice_type": "notify",
-			"sub_type":    "honor",
-			"self_id":     c.Uin,
-			"user_id":     notify.Uin,
-			"time":        time.Now().Unix(),
+		bot.dispatchEvent("notice/notify/honor", global.MSG{
+			"group_id": group.Code,
+			"user_id":  notify.Uin,
 			"honor_type": func() string {
 				switch notify.Honor {
 				case client.Talkative:
@@ -262,15 +420,10 @@ func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 		} else {
 			log.Infof("好友 %v 戳了戳你.", friend.Nickname)
 		}
-		bot.dispatchEventMessage(global.MSG{
-			"post_type":   "notice",
-			"notice_type": "notify",
-			"sub_type":    "poke",
-			"self_id":     c.Uin,
-			"user_id":     notify.Sender,
-			"sender_id":   notify.Sender,
-			"target_id":   notify.Receiver,
-			"time":        time.Now().Unix(),
+		bot.dispatchEvent("notice/notify/poke", global.MSG{
+			"user_id":   notify.Sender,
+			"sender_id": notify.Sender,
+			"target_id": notify.Receiver,
 		})
 	}
 }
@@ -279,15 +432,10 @@ func (bot *CQBot) memberTitleUpdatedEvent(c *client.QQClient, e *client.MemberSp
 	group := c.FindGroup(e.GroupCode)
 	mem := group.FindMember(e.Uin)
 	log.Infof("群 %v(%v) 内成员 %v(%v) 获得了新的头衔: %v", group.Name, group.Code, mem.DisplayName(), mem.Uin, e.NewTitle)
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":   "notice",
-		"notice_type": "notify",
-		"sub_type":    "title",
-		"group_id":    group.Code,
-		"self_id":     c.Uin,
-		"user_id":     e.Uin,
-		"time":        time.Now().Unix(),
-		"title":       e.NewTitle,
+	bot.dispatchEvent("notice/notify/title", global.MSG{
+		"group_id": group.Code,
+		"user_id":  e.Uin,
+		"title":    e.NewTitle,
 	})
 }
 
@@ -299,14 +447,12 @@ func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *client.FriendMessageR
 	} else {
 		log.Infof("好友 %v 撤回了消息: %v", e.FriendUin, gid)
 	}
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":   "notice",
-		"notice_type": "friend_recall",
-		"self_id":     c.Uin,
-		"user_id":     e.FriendUin,
-		"time":        e.Time,
-		"message_id":  gid,
+	ev := bot.event("notice/friend_recall", global.MSG{
+		"user_id":    e.FriendUin,
+		"message_id": gid,
 	})
+	ev.Time = e.Time
+	bot.dispatch(ev)
 }
 
 func (bot *CQBot) offlineFileEvent(c *client.QQClient, e *client.OfflineFileEvent) {
@@ -315,23 +461,19 @@ func (bot *CQBot) offlineFileEvent(c *client.QQClient, e *client.OfflineFileEven
 		return
 	}
 	log.Infof("好友 %v(%v) 发送了离线文件 %v", f.Nickname, f.Uin, e.FileName)
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":   "notice",
-		"notice_type": "offline_file",
-		"user_id":     e.Sender,
+	bot.dispatchEvent("notice/offline_file", global.MSG{
+		"user_id": e.Sender,
 		"file": global.MSG{
 			"name": e.FileName,
 			"size": e.FileSize,
 			"url":  e.DownloadUrl,
 		},
-		"self_id": c.Uin,
-		"time":    time.Now().Unix(),
 	})
 }
 
 func (bot *CQBot) joinGroupEvent(c *client.QQClient, group *client.GroupInfo) {
 	log.Infof("Bot进入了群 %v.", formatGroupName(group))
-	bot.dispatchEventMessage(bot.groupIncrease(group.Code, 0, c.Uin))
+	bot.dispatch(bot.groupIncrease(group.Code, 0, c.Uin))
 }
 
 func (bot *CQBot) leaveGroupEvent(c *client.QQClient, e *client.GroupLeaveEvent) {
@@ -340,44 +482,33 @@ func (bot *CQBot) leaveGroupEvent(c *client.QQClient, e *client.GroupLeaveEvent)
 	} else {
 		log.Infof("Bot退出了群 %v.", formatGroupName(e.Group))
 	}
-	bot.dispatchEventMessage(bot.groupDecrease(e.Group.Code, c.Uin, e.Operator))
+	bot.dispatch(bot.groupDecrease(e.Group.Code, c.Uin, e.Operator))
 }
 
 func (bot *CQBot) memberPermissionChangedEvent(c *client.QQClient, e *client.MemberPermissionChangedEvent) {
-	st := func() string {
-		if e.NewPermission == client.Administrator {
-			return "set"
-		}
-		return "unset"
-	}()
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":   "notice",
-		"notice_type": "group_admin",
-		"sub_type":    st,
-		"group_id":    e.Group.Code,
-		"user_id":     e.Member.Uin,
-		"time":        time.Now().Unix(),
-		"self_id":     c.Uin,
+	st := "unset"
+	if e.NewPermission == client.Administrator {
+		st = "set"
+	}
+	bot.dispatchEvent("notice/group_admin/"+st, global.MSG{
+		"group_id": e.Group.Code,
+		"user_id":  e.Member.Uin,
 	})
 }
 
 func (bot *CQBot) memberCardUpdatedEvent(c *client.QQClient, e *client.MemberCardUpdatedEvent) {
 	log.Infof("群 %v 的 %v 更新了名片 %v -> %v", formatGroupName(e.Group), formatMemberName(e.Member), e.OldCard, e.Member.CardName)
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":   "notice",
-		"notice_type": "group_card",
-		"group_id":    e.Group.Code,
-		"user_id":     e.Member.Uin,
-		"card_new":    e.Member.CardName,
-		"card_old":    e.OldCard,
-		"time":        time.Now().Unix(),
-		"self_id":     c.Uin,
+	bot.dispatchEvent("notice/group_card", global.MSG{
+		"group_id": e.Group.Code,
+		"user_id":  e.Member.Uin,
+		"card_new": e.Member.CardName,
+		"card_old": e.OldCard,
 	})
 }
 
 func (bot *CQBot) memberJoinEvent(_ *client.QQClient, e *client.MemberJoinGroupEvent) {
 	log.Infof("新成员 %v 进入了群 %v.", formatMemberName(e.Member), formatGroupName(e.Group))
-	bot.dispatchEventMessage(bot.groupIncrease(e.Group.Code, 0, e.Member.Uin))
+	bot.dispatch(bot.groupIncrease(e.Group.Code, 0, e.Member.Uin))
 }
 
 func (bot *CQBot) memberLeaveEvent(_ *client.QQClient, e *client.MemberLeaveGroupEvent) {
@@ -386,65 +517,49 @@ func (bot *CQBot) memberLeaveEvent(_ *client.QQClient, e *client.MemberLeaveGrou
 	} else {
 		log.Infof("成员 %v 离开了群 %v.", formatMemberName(e.Member), formatGroupName(e.Group))
 	}
-	bot.dispatchEventMessage(bot.groupDecrease(e.Group.Code, e.Member.Uin, e.Operator))
+	bot.dispatch(bot.groupDecrease(e.Group.Code, e.Member.Uin, e.Operator))
 }
 
 func (bot *CQBot) friendRequestEvent(c *client.QQClient, e *client.NewFriendRequest) {
 	log.Infof("收到来自 %v(%v) 的好友请求: %v", e.RequesterNick, e.RequesterUin, e.Message)
 	flag := strconv.FormatInt(e.RequestId, 10)
 	bot.friendReqCache.Store(flag, e)
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":    "request",
-		"request_type": "friend",
-		"user_id":      e.RequesterUin,
-		"comment":      e.Message,
-		"flag":         flag,
-		"time":         time.Now().Unix(),
-		"self_id":      c.Uin,
+	bot.dispatchEvent("request/friend", global.MSG{
+		"user_id": e.RequesterUin,
+		"comment": e.Message,
+		"flag":    flag,
 	})
 }
 
 func (bot *CQBot) friendAddedEvent(c *client.QQClient, e *client.NewFriendEvent) {
 	log.Infof("添加了新好友: %v(%v)", e.Friend.Nickname, e.Friend.Uin)
 	bot.tempSessionCache.Delete(e.Friend.Uin)
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":   "notice",
-		"notice_type": "friend_add",
-		"self_id":     c.Uin,
-		"user_id":     e.Friend.Uin,
-		"time":        time.Now().Unix(),
+	bot.dispatchEvent("notice/friend_add", global.MSG{
+		"user_id": e.Friend.Uin,
 	})
 }
 
 func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRequest) {
 	log.Infof("收到来自群 %v(%v) 内用户 %v(%v) 的加群邀请.", e.GroupName, e.GroupCode, e.InvitorNick, e.InvitorUin)
 	flag := strconv.FormatInt(e.RequestId, 10)
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":    "request",
-		"request_type": "group",
-		"sub_type":     "invite",
-		"group_id":     e.GroupCode,
-		"user_id":      e.InvitorUin,
-		"comment":      "",
-		"flag":         flag,
-		"time":         time.Now().Unix(),
-		"self_id":      c.Uin,
+	bot.dispatchEvent("request/group/invite", global.MSG{
+		"group_id":   e.GroupCode,
+		"user_id":    e.InvitorUin,
+		"invitor_id": 0,
+		"comment":    "",
+		"flag":       flag,
 	})
 }
 
 func (bot *CQBot) groupJoinReqEvent(c *client.QQClient, e *client.UserJoinGroupRequest) {
 	log.Infof("群 %v(%v) 收到来自用户 %v(%v) 的加群请求.", e.GroupName, e.GroupCode, e.RequesterNick, e.RequesterUin)
 	flag := strconv.FormatInt(e.RequestId, 10)
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":    "request",
-		"request_type": "group",
-		"sub_type":     "add",
-		"group_id":     e.GroupCode,
-		"user_id":      e.RequesterUin,
-		"comment":      e.Message,
-		"flag":         flag,
-		"time":         time.Now().Unix(),
-		"self_id":      c.Uin,
+	bot.dispatchEvent("request/group/add", global.MSG{
+		"group_id":   e.GroupCode,
+		"user_id":    e.RequesterUin,
+		"invitor_id": e.ActionUin,
+		"comment":    e.Message,
+		"flag":       flag,
 	})
 }
 
@@ -454,17 +569,13 @@ func (bot *CQBot) otherClientStatusChangedEvent(c *client.QQClient, e *client.Ot
 	} else {
 		log.Infof("Bot 账号在客户端 %v (%v) 登出.", e.Client.DeviceName, e.Client.DeviceKind)
 	}
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":   "notice",
-		"notice_type": "client_status",
-		"online":      e.Online,
+	bot.dispatchEvent("notice/client_status", global.MSG{
+		"online": e.Online,
 		"client": global.MSG{
 			"app_id":      e.Client.AppId,
 			"device_name": e.Client.DeviceName,
 			"device_kind": e.Client.DeviceKind,
 		},
-		"self_id": c.Uin,
-		"time":    time.Now().Unix(),
 	})
 }
 
@@ -491,79 +602,80 @@ func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *client.GroupDigestEvent
 	if e.OperatorUin == bot.Client.Uin {
 		return
 	}
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":   "notice",
+	subtype := "delete"
+	if e.OperationType == 1 {
+		subtype = "add"
+	}
+	bot.dispatchEvent("notice/essence/"+subtype, global.MSG{
 		"group_id":    e.GroupCode,
-		"notice_type": "essence",
-		"sub_type": func() string {
-			if e.OperationType == 1 {
-				return "add"
-			}
-			return "delete"
-		}(),
-		"self_id":     c.Uin,
 		"sender_id":   e.SenderUin,
 		"operator_id": e.OperatorUin,
-		"time":        time.Now().Unix(),
 		"message_id":  gid,
 	})
 }
 
-func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) global.MSG {
-	return global.MSG{
-		"post_type":   "notice",
-		"notice_type": "group_increase",
+func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) *event {
+	return bot.event("notice/group_increase/approve", global.MSG{
 		"group_id":    groupCode,
 		"operator_id": operatorUin,
-		"self_id":     bot.Client.Uin,
-		"sub_type":    "approve",
-		"time":        time.Now().Unix(),
 		"user_id":     userUin,
-	}
+	})
 }
 
-func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.GroupMemberInfo) global.MSG {
-	return global.MSG{
-		"post_type":   "notice",
-		"notice_type": "group_decrease",
+func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.GroupMemberInfo) *event {
+	op := userUin
+	if operator != nil {
+		op = operator.Uin
+	}
+	subtype := "leave"
+	if operator != nil {
+		if userUin == bot.Client.Uin {
+			subtype = "kick_me"
+		} else {
+			subtype = "kick"
+		}
+	}
+	return bot.event("notice/group_decrease/"+subtype, global.MSG{
 		"group_id":    groupCode,
-		"operator_id": func() int64 {
-			if operator != nil {
-				return operator.Uin
-			}
-			return userUin
-		}(),
-		"self_id": bot.Client.Uin,
-		"sub_type": func() string {
-			if operator != nil {
-				if userUin == bot.Client.Uin {
-					return "kick_me"
-				}
-				return "kick"
-			}
-			return "leave"
-		}(),
-		"time":    time.Now().Unix(),
-		"user_id": userUin,
-	}
+		"operator_id": op,
+		"user_id":     userUin,
+	})
 }
 
-func (bot *CQBot) checkMedia(e []message.IMessageElement) {
-	// TODO(wdvxdr): remove these old cache file in v1.0.0
+func (bot *CQBot) checkMedia(e []message.IMessageElement, sourceID int64) {
 	for _, elem := range e {
 		switch i := elem.(type) {
 		case *message.GroupImageElement:
+			if i.Flash && sourceID != 0 {
+				u, err := bot.Client.GetGroupImageDownloadUrl(i.FileId, sourceID, i.Md5)
+				if err != nil {
+					log.Warnf("获取闪照地址时出现错误: %v", err)
+				} else {
+					i.Url = u
+				}
+			}
 			data := binary.NewWriterF(func(w *binary.Writer) {
 				w.Write(i.Md5)
 				w.WriteUInt32(uint32(i.Size))
 				w.WriteString(i.ImageId)
 				w.WriteString(i.Url)
 			})
+			cache.Image.Insert(i.Md5, data)
+
+		case *message.GuildImageElement:
+			data := binary.NewWriterF(func(w *binary.Writer) {
+				w.Write(i.Md5)
+				w.WriteUInt32(uint32(i.Size))
+				w.WriteString(i.DownloadIndex)
+				w.WriteString(i.Url)
+			})
 			filename := hex.EncodeToString(i.Md5) + ".image"
-			if cache.EnableCacheDB {
-				cache.Image.Insert(i.Md5, data)
-			} else if !global.PathExists(path.Join(global.ImagePath, filename)) {
-				_ = os.WriteFile(path.Join(global.ImagePath, filename), data, 0o644)
+			cache.Image.Insert(i.Md5, data)
+			if i.Url != "" && !global.PathExists(path.Join(global.ImagePath, "guild-images", filename)) {
+				r := download.Request{URL: i.Url}
+				if err := r.WriteToFile(path.Join(global.ImagePath, "guild-images", filename)); err != nil {
+					log.Warnf("下载频道图片时出现错误: %v", err)
+				}
 			}
 		case *message.FriendImageElement:
 			data := binary.NewWriterF(func(w *binary.Writer) {
@@ -572,23 +684,18 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 				w.WriteString(i.ImageId)
 				w.WriteString(i.Url)
 			})
-			filename := hex.EncodeToString(i.Md5) + ".image"
-			if cache.EnableCacheDB {
-				cache.Image.Insert(i.Md5, data)
-			} else if !global.PathExists(path.Join(global.ImagePath, filename)) {
-				_ = os.WriteFile(path.Join(global.ImagePath, filename), data, 0o644)
-			}
+			cache.Image.Insert(i.Md5, data)
+
 		case *message.VoiceElement:
 			// todo: don't download original file?
 			i.Name = strings.ReplaceAll(i.Name, "{", "")
 			i.Name = strings.ReplaceAll(i.Name, "}", "")
 			if !global.PathExists(path.Join(global.VoicePath, i.Name)) {
-				b, err := global.GetBytes(i.Url)
+				err := download.Request{URL: i.Url}.WriteToFile(path.Join(global.VoicePath, i.Name))
 				if err != nil {
 					log.Warnf("语音文件 %v 下载失败: %v", i.Name, err)
 					continue
 				}
-				_ = os.WriteFile(path.Join(global.VoicePath, i.Name), b, 0o644)
 			}
 		case *message.ShortVideoElement:
 			data := binary.NewWriterF(func(w *binary.Writer) {
@@ -600,11 +707,7 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 				w.Write(i.Uuid)
 			})
 			filename := hex.EncodeToString(i.Md5) + ".video"
-			if cache.EnableCacheDB {
-				cache.Video.Insert(i.Md5, data)
-			} else if !global.PathExists(path.Join(global.VideoPath, filename)) {
-				_ = os.WriteFile(path.Join(global.VideoPath, filename), data, 0o644)
-			}
+			cache.Video.Insert(i.Md5, data)
 			i.Name = filename
 			i.Url = bot.Client.GetShortVideoUrl(i.Uuid, i.Md5)
 		}

coolq/feed.go

@@ -0,0 +1,53 @@
+package coolq
+
+import (
+	"github.com/Mrs4s/MiraiGo/topic"
+
+	"github.com/Mrs4s/go-cqhttp/global"
+)
+
+// FeedContentsToArrayMessage 将话题频道帖子内容转换为 Array Message
+func FeedContentsToArrayMessage(contents []topic.IFeedRichContentElement) []global.MSG {
+	r := make([]global.MSG, 0, len(contents))
+	for _, e := range contents {
+		var m global.MSG
+		switch elem := e.(type) {
+		case *topic.TextElement:
+			m = global.MSG{
+				"type": "text",
+				"data": global.MSG{"text": elem.Content},
+			}
+		case *topic.AtElement:
+			m = global.MSG{
+				"type": "at",
+				"data": global.MSG{"id": elem.Id, "qq": elem.Id},
+			}
+		case *topic.EmojiElement:
+			m = global.MSG{
+				"type": "face",
+				"data": global.MSG{"id": elem.Id},
+			}
+		case *topic.ChannelQuoteElement:
+			m = global.MSG{
+				"type": "channel_quote",
+				"data": global.MSG{
+					"guild_id":     fU64(elem.GuildId),
+					"channel_id":   fU64(elem.ChannelId),
+					"display_text": elem.DisplayText,
+				},
+			}
+		case *topic.UrlQuoteElement:
+			m = global.MSG{
+				"type": "url_quote",
+				"data": global.MSG{
+					"url":          elem.Url,
+					"display_text": elem.DisplayText,
+				},
+			}
+		}
+		if m != nil {
+			r = append(r, m)
+		}
+	}
+	return r
+}

db/database.go

@@ -8,25 +8,29 @@ import (
 )
 
 type (
-	// IDatabase 数据库操作接口定义
-	IDatabase interface {
+	// Database 数据库操作接口定义
+	Database interface {
 		// Open 初始化数据库
 		Open() error
 
 		// GetMessageByGlobalID 通过 GlobalID 来获取消息
-		GetMessageByGlobalID(int32) (IStoredMessage, error)
+		GetMessageByGlobalID(int32) (StoredMessage, error)
 		// GetGroupMessageByGlobalID 通过 GlobalID 来获取群消息
 		GetGroupMessageByGlobalID(int32) (*StoredGroupMessage, error)
 		// GetPrivateMessageByGlobalID 通过 GlobalID 来获取私聊消息
 		GetPrivateMessageByGlobalID(int32) (*StoredPrivateMessage, error)
+		// GetGuildChannelMessageByID 通过 ID 来获取频道消息
+		GetGuildChannelMessageByID(string) (*StoredGuildChannelMessage, error)
 
 		// InsertGroupMessage 向数据库写入新的群消息
 		InsertGroupMessage(*StoredGroupMessage) error
 		// InsertPrivateMessage 向数据库写入新的私聊消息
 		InsertPrivateMessage(*StoredPrivateMessage) error
+		// InsertGuildChannelMessage 向数据库写入新的频道消息
+		InsertGuildChannelMessage(*StoredGuildChannelMessage) error
 	}
 
-	IStoredMessage interface {
+	StoredMessage interface {
 		GetID() string
 		GetType() string
 		GetGlobalID() int32
@@ -36,42 +40,61 @@ type (
 
 	// StoredGroupMessage 持久化群消息
 	StoredGroupMessage struct {
-		ID          string                  `bson:"_id"`
-		GlobalID    int32                   `bson:"globalId"`
-		Attribute   *StoredMessageAttribute `bson:"attribute"`
-		SubType     string                  `bson:"subType"`
-		QuotedInfo  *QuotedInfo             `bson:"quotedInfo"`
-		GroupCode   int64                   `bson:"groupCode"`
-		AnonymousID string                  `bson:"anonymousId"`
-		Content     []global.MSG            `bson:"content"`
+		ID          string                  `bson:"_id" yaml:"-"`
+		GlobalID    int32                   `bson:"globalId" yaml:"-"`
+		Attribute   *StoredMessageAttribute `bson:"attribute" yaml:"-"`
+		SubType     string                  `bson:"subType" yaml:"-"`
+		QuotedInfo  *QuotedInfo             `bson:"quotedInfo" yaml:"-"`
+		GroupCode   int64                   `bson:"groupCode" yaml:"-"`
+		AnonymousID string                  `bson:"anonymousId" yaml:"-"`
+		Content     []global.MSG            `bson:"content" yaml:"content"`
 	}
 
 	// StoredPrivateMessage 持久化私聊消息
 	StoredPrivateMessage struct {
-		ID         string                  `bson:"_id"`
-		GlobalID   int32                   `bson:"globalId"`
-		Attribute  *StoredMessageAttribute `bson:"attribute"`
-		SubType    string                  `bson:"subType"`
-		QuotedInfo *QuotedInfo             `bson:"quotedInfo"`
-		SessionUin int64                   `bson:"sessionUin"`
-		TargetUin  int64                   `bson:"targetUin"`
-		Content    []global.MSG            `bson:"content"`
+		ID         string                  `bson:"_id" yaml:"-"`
+		GlobalID   int32                   `bson:"globalId" yaml:"-"`
+		Attribute  *StoredMessageAttribute `bson:"attribute" yaml:"-"`
+		SubType    string                  `bson:"subType" yaml:"-"`
+		QuotedInfo *QuotedInfo             `bson:"quotedInfo" yaml:"-"`
+		SessionUin int64                   `bson:"sessionUin" yaml:"-"`
+		TargetUin  int64                   `bson:"targetUin" yaml:"-"`
+		Content    []global.MSG            `bson:"content" yaml:"content"`
+	}
+
+	// StoredGuildChannelMessage 持久化频道消息
+	StoredGuildChannelMessage struct {
+		ID         string                       `bson:"_id" yaml:"-"`
+		Attribute  *StoredGuildMessageAttribute `bson:"attribute" yaml:"-"`
+		GuildID    uint64                       `bson:"guildId" yaml:"-"`
+		ChannelID  uint64                       `bson:"channelId" yaml:"-"`
+		QuotedInfo *QuotedInfo                  `bson:"quotedInfo" yaml:"-"`
+		Content    []global.MSG                 `bson:"content" yaml:"content"`
 	}
 
 	// StoredMessageAttribute 持久化消息属性
 	StoredMessageAttribute struct {
-		MessageSeq int32  `bson:"messageSeq"`
-		InternalID int32  `bson:"internalId"`
-		SenderUin  int64  `bson:"senderUin"`
-		SenderName string `bson:"senderName"`
-		Timestamp  int64  `bson:"timestamp"`
+		MessageSeq int32  `bson:"messageSeq" yaml:"-"`
+		InternalID int32  `bson:"internalId" yaml:"-"`
+		SenderUin  int64  `bson:"senderUin" yaml:"-"`
+		SenderName string `bson:"senderName" yaml:"-"`
+		Timestamp  int64  `bson:"timestamp" yaml:"-"`
+	}
+
+	// StoredGuildMessageAttribute 持久化频道消息属性
+	StoredGuildMessageAttribute struct {
+		MessageSeq   uint64 `bson:"messageSeq" yaml:"-"`
+		InternalID   uint64 `bson:"internalId" yaml:"-"`
+		SenderTinyID uint64 `bson:"senderTinyId" yaml:"-"`
+		SenderName   string `bson:"senderName" yaml:"-"`
+		Timestamp    int64  `bson:"timestamp" yaml:"-"`
 	}
 
 	// QuotedInfo 引用回复
 	QuotedInfo struct {
-		PrevID        string       `bson:"prevId"`
-		PrevGlobalID  int32        `bson:"prevGlobalId"`
-		QuotedContent []global.MSG `bson:"quotedContent"`
+		PrevID        string       `bson:"prevId" yaml:"-"`
+		PrevGlobalID  int32        `bson:"prevGlobalId" yaml:"-"`
+		QuotedContent []global.MSG `bson:"quotedContent" yaml:"quoted_content"`
 	}
 )
 
@@ -80,22 +103,14 @@ func ToGlobalID(code int64, msgID int32) int32 {
 	return int32(crc32.ChecksumIEEE([]byte(fmt.Sprintf("%d-%d", code, msgID))))
 }
 
-func (m *StoredGroupMessage) GetID() string { return m.ID }
-
-func (m *StoredGroupMessage) GetType() string { return "group" }
-
-func (m *StoredGroupMessage) GetGlobalID() int32 { return m.GlobalID }
-
+func (m *StoredGroupMessage) GetID() string                         { return m.ID }
+func (m *StoredGroupMessage) GetType() string                       { return "group" }
+func (m *StoredGroupMessage) GetGlobalID() int32                    { return m.GlobalID }
 func (m *StoredGroupMessage) GetAttribute() *StoredMessageAttribute { return m.Attribute }
+func (m *StoredGroupMessage) GetContent() []global.MSG              { return m.Content }
 
-func (m *StoredGroupMessage) GetContent() []global.MSG { return m.Content }
-
-func (m *StoredPrivateMessage) GetID() string { return m.ID }
-
-func (m *StoredPrivateMessage) GetType() string { return "private" }
-
-func (m *StoredPrivateMessage) GetGlobalID() int32 { return m.GlobalID }
-
+func (m *StoredPrivateMessage) GetID() string                         { return m.ID }
+func (m *StoredPrivateMessage) GetType() string                       { return "private" }
+func (m *StoredPrivateMessage) GetGlobalID() int32                    { return m.GlobalID }
 func (m *StoredPrivateMessage) GetAttribute() *StoredMessageAttribute { return m.Attribute }
-
-func (m *StoredPrivateMessage) GetContent() []global.MSG { return m.Content }
+func (m *StoredPrivateMessage) GetContent() []global.MSG              { return m.Content }

db/leveldb.go

@@ -1,118 +0,0 @@
-package db
-
-import (
-	"bytes"
-	"encoding/gob"
-	"path"
-
-	"github.com/Mrs4s/MiraiGo/binary"
-	"github.com/pkg/errors"
-	"github.com/syndtr/goleveldb/leveldb"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-
-	"github.com/Mrs4s/go-cqhttp/global"
-)
-
-type LevelDBImpl struct {
-	db *leveldb.DB
-}
-
-const (
-	group   byte = 0x0
-	private byte = 0x1
-)
-
-func UseLevelDB() *LevelDBImpl {
-	gob.Register(StoredMessageAttribute{})
-	gob.Register(QuotedInfo{})
-	gob.Register(global.MSG{})
-	gob.Register(StoredGroupMessage{})
-	gob.Register(StoredPrivateMessage{})
-	return &LevelDBImpl{}
-}
-
-func (db *LevelDBImpl) Open() error {
-	p := path.Join("data", "leveldb-v2")
-	d, err := leveldb.OpenFile(p, &opt.Options{
-		WriteBuffer: 128 * opt.KiB,
-	})
-	if err != nil {
-		return errors.Wrap(err, "open level db error")
-	}
-	db.db = d
-	return nil
-}
-
-func (db *LevelDBImpl) GetMessageByGlobalID(id int32) (IStoredMessage, error) {
-	v, err := db.db.Get(binary.ToBytes(id), nil)
-	if err != nil {
-		return nil, errors.Wrap(err, "get value error")
-	}
-	r := binary.NewReader(v)
-	switch r.ReadByte() {
-	case group:
-		g := &StoredGroupMessage{}
-		if err = gob.NewDecoder(bytes.NewReader(r.ReadAvailable())).Decode(g); err != nil {
-			return nil, errors.Wrap(err, "decode message error")
-		}
-		return g, nil
-	case private:
-		p := &StoredPrivateMessage{}
-		if err = gob.NewDecoder(bytes.NewReader(r.ReadAvailable())).Decode(p); err != nil {
-			return nil, errors.Wrap(err, "decode message error")
-		}
-		return p, nil
-	default:
-		return nil, errors.New("unknown message flag")
-	}
-}
-
-func (db *LevelDBImpl) GetGroupMessageByGlobalID(id int32) (*StoredGroupMessage, error) {
-	i, err := db.GetMessageByGlobalID(id)
-	if err != nil {
-		return nil, err
-	}
-	g, ok := i.(*StoredGroupMessage)
-	if !ok {
-		return nil, errors.New("message type error")
-	}
-	return g, nil
-}
-
-func (db *LevelDBImpl) GetPrivateMessageByGlobalID(id int32) (*StoredPrivateMessage, error) {
-	i, err := db.GetMessageByGlobalID(id)
-	if err != nil {
-		return nil, err
-	}
-	p, ok := i.(*StoredPrivateMessage)
-	if !ok {
-		return nil, errors.New("message type error")
-	}
-	return p, nil
-}
-
-func (db *LevelDBImpl) InsertGroupMessage(msg *StoredGroupMessage) error {
-	buf := global.NewBuffer()
-	defer global.PutBuffer(buf)
-	if err := gob.NewEncoder(buf).Encode(msg); err != nil {
-		return errors.Wrap(err, "encode message error")
-	}
-	err := db.db.Put(binary.ToBytes(msg.GlobalID), binary.NewWriterF(func(w *binary.Writer) {
-		w.WriteByte(group)
-		w.Write(buf.Bytes())
-	}), nil)
-	return errors.Wrap(err, "put data error")
-}
-
-func (db *LevelDBImpl) InsertPrivateMessage(msg *StoredPrivateMessage) error {
-	buf := global.NewBuffer()
-	defer global.PutBuffer(buf)
-	if err := gob.NewEncoder(buf).Encode(msg); err != nil {
-		return errors.Wrap(err, "encode message error")
-	}
-	err := db.db.Put(binary.ToBytes(msg.GlobalID), binary.NewWriterF(func(w *binary.Writer) {
-		w.WriteByte(private)
-		w.Write(buf.Bytes())
-	}), nil)
-	return errors.Wrap(err, "put data error")
-}

db/leveldb/const.go

@@ -0,0 +1,25 @@
+package leveldb
+
+const dataVersion = 1
+
+const (
+	group        = 0x0
+	private      = 0x1
+	guildChannel = 0x2
+)
+
+type coder byte
+
+const (
+	coderNil coder = iota
+	coderInt
+	coderUint
+	coderInt32
+	coderUint32
+	coderInt64
+	coderUint64
+	coderString
+	coderMSG      // global.MSG
+	coderArrayMSG // []global.MSG
+	coderStruct   // struct{}
+)

db/leveldb/leveldb.go

@@ -0,0 +1,140 @@
+package leveldb
+
+import (
+	"path"
+
+	"github.com/Mrs4s/MiraiGo/binary"
+	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/pkg/errors"
+	"github.com/syndtr/goleveldb/leveldb"
+	"github.com/syndtr/goleveldb/leveldb/opt"
+	"gopkg.in/yaml.v3"
+
+	"github.com/Mrs4s/go-cqhttp/db"
+)
+
+type database struct {
+	db *leveldb.DB
+}
+
+// config leveldb 相关配置
+type config struct {
+	Enable bool `yaml:"enable"`
+}
+
+func init() {
+	db.Register("leveldb", func(node yaml.Node) db.Database {
+		conf := new(config)
+		_ = node.Decode(conf)
+		if !conf.Enable {
+			return nil
+		}
+		return &database{}
+	})
+}
+
+func (ldb *database) Open() error {
+	p := path.Join("data", "leveldb-v3")
+	d, err := leveldb.OpenFile(p, &opt.Options{
+		WriteBuffer: 32 * opt.KiB,
+	})
+	if err != nil {
+		return errors.Wrap(err, "open leveldb error")
+	}
+	ldb.db = d
+	return nil
+}
+
+func (ldb *database) GetMessageByGlobalID(id int32) (_ db.StoredMessage, err error) {
+	v, err := ldb.db.Get(binary.ToBytes(id), nil)
+	if err != nil || len(v) == 0 {
+		return nil, errors.Wrap(err, "get value error")
+	}
+	defer func() {
+		if r := recover(); r != nil {
+			err = errors.Errorf("%v", r)
+		}
+	}()
+	r, err := newReader(utils.B2S(v))
+	if err != nil {
+		return nil, err
+	}
+	switch r.uvarint() {
+	case group:
+		return r.readStoredGroupMessage(), nil
+	case private:
+		return r.readStoredPrivateMessage(), nil
+	default:
+		return nil, errors.New("unknown message flag")
+	}
+}
+
+func (ldb *database) GetGroupMessageByGlobalID(id int32) (*db.StoredGroupMessage, error) {
+	i, err := ldb.GetMessageByGlobalID(id)
+	if err != nil {
+		return nil, err
+	}
+	g, ok := i.(*db.StoredGroupMessage)
+	if !ok {
+		return nil, errors.New("message type error")
+	}
+	return g, nil
+}
+
+func (ldb *database) GetPrivateMessageByGlobalID(id int32) (*db.StoredPrivateMessage, error) {
+	i, err := ldb.GetMessageByGlobalID(id)
+	if err != nil {
+		return nil, err
+	}
+	p, ok := i.(*db.StoredPrivateMessage)
+	if !ok {
+		return nil, errors.New("message type error")
+	}
+	return p, nil
+}
+
+func (ldb *database) GetGuildChannelMessageByID(id string) (*db.StoredGuildChannelMessage, error) {
+	v, err := ldb.db.Get([]byte(id), nil)
+	if err != nil {
+		return nil, errors.Wrap(err, "get value error")
+	}
+	defer func() {
+		if r := recover(); r != nil {
+			err = errors.Errorf("%v", r)
+		}
+	}()
+	r, err := newReader(utils.B2S(v))
+	if err != nil {
+		return nil, err
+	}
+	switch r.uvarint() {
+	case guildChannel:
+		return r.readStoredGuildChannelMessage(), nil
+	default:
+		return nil, errors.New("unknown message flag")
+	}
+}
+
+func (ldb *database) InsertGroupMessage(msg *db.StoredGroupMessage) error {
+	w := newWriter()
+	w.uvarint(group)
+	w.writeStoredGroupMessage(msg)
+	err := ldb.db.Put(binary.ToBytes(msg.GlobalID), w.bytes(), nil)
+	return errors.Wrap(err, "put data error")
+}
+
+func (ldb *database) InsertPrivateMessage(msg *db.StoredPrivateMessage) error {
+	w := newWriter()
+	w.uvarint(private)
+	w.writeStoredPrivateMessage(msg)
+	err := ldb.db.Put(binary.ToBytes(msg.GlobalID), w.bytes(), nil)
+	return errors.Wrap(err, "put data error")
+}
+
+func (ldb *database) InsertGuildChannelMessage(msg *db.StoredGuildChannelMessage) error {
+	w := newWriter()
+	w.uvarint(guildChannel)
+	w.writeStoredGuildChannelMessage(msg)
+	err := ldb.db.Put(utils.S2B(msg.ID), w.bytes(), nil)
+	return errors.Wrap(err, "put data error")
+}

db/leveldb/reader.go

@@ -0,0 +1,131 @@
+package leveldb
+
+import (
+	"encoding/binary"
+	"io"
+	"strconv"
+	"strings"
+
+	"github.com/pkg/errors"
+
+	"github.com/Mrs4s/go-cqhttp/global"
+)
+
+type intReader struct {
+	data string
+	*strings.Reader
+}
+
+func newIntReader(s string) intReader {
+	return intReader{
+		data:   s,
+		Reader: strings.NewReader(s),
+	}
+}
+
+func (r *intReader) varint() int64 {
+	i, _ := binary.ReadVarint(r)
+	return i
+}
+
+func (r *intReader) uvarint() uint64 {
+	i, _ := binary.ReadUvarint(r)
+	return i
+}
+
+// reader implements the index read.
+// data format is the same as the writer's
+type reader struct {
+	data        intReader
+	strings     intReader
+	stringIndex map[uint64]string
+}
+
+func (r *reader) coder() coder    { o, _ := r.data.ReadByte(); return coder(o) }
+func (r *reader) varint() int64   { return r.data.varint() }
+func (r *reader) uvarint() uint64 { return r.data.uvarint() }
+func (r *reader) int32() int32    { return int32(r.varint()) }
+func (r *reader) int64() int64    { return r.varint() }
+func (r *reader) uint64() uint64  { return r.uvarint() }
+
+// func (r *reader) uint32() uint32 { return uint32(r.uvarint()) }
+// func (r *reader) int() int        { return int(r.varint()) }
+// func (r *reader) uint() uint      { return uint(r.uvarint()) }
+
+func (r *reader) string() string {
+	off := r.data.uvarint()
+	if s, ok := r.stringIndex[off]; ok {
+		return s
+	}
+	_, _ = r.strings.Seek(int64(off), io.SeekStart)
+	l := int64(r.strings.uvarint())
+	whence, _ := r.strings.Seek(0, io.SeekCurrent)
+	s := r.strings.data[whence : whence+l]
+	r.stringIndex[off] = s
+	return s
+}
+
+func (r *reader) msg() global.MSG {
+	length := r.uvarint()
+	msg := make(global.MSG, length)
+	for i := uint64(0); i < length; i++ {
+		s := r.string()
+		msg[s] = r.obj()
+	}
+	return msg
+}
+
+func (r *reader) arrayMsg() []global.MSG {
+	length := r.uvarint()
+	msgs := make([]global.MSG, length)
+	for i := range msgs {
+		msgs[i] = r.msg()
+	}
+	return msgs
+}
+
+func (r *reader) obj() interface{} {
+	switch coder := r.coder(); coder {
+	case coderNil:
+		return nil
+	case coderInt:
+		return int(r.varint())
+	case coderUint:
+		return uint(r.uvarint())
+	case coderInt32:
+		return int32(r.varint())
+	case coderUint32:
+		return uint32(r.uvarint())
+	case coderInt64:
+		return r.varint()
+	case coderUint64:
+		return r.uvarint()
+	case coderString:
+		return r.string()
+	case coderMSG:
+		return r.msg()
+	case coderArrayMSG:
+		return r.arrayMsg()
+	default:
+		panic("db/leveldb: invalid coder " + strconv.Itoa(int(coder)))
+	}
+}
+
+func newReader(data string) (*reader, error) {
+	in := newIntReader(data)
+	v := in.uvarint()
+	if v != dataVersion {
+		return nil, errors.Errorf("db/leveldb: invalid data version %d", v)
+	}
+	sl := int64(in.uvarint())
+	dl := int64(in.uvarint())
+	whence, _ := in.Seek(0, io.SeekCurrent)
+	sData := data[whence : whence+sl]
+	dData := data[whence+sl : whence+sl+dl]
+	r := reader{
+		data:        newIntReader(dData),
+		strings:     newIntReader(sData),
+		stringIndex: make(map[uint64]string),
+	}
+	return &r, nil
+}

db/leveldb/structs.go

@@ -0,0 +1,175 @@
+package leveldb
+
+import "github.com/Mrs4s/go-cqhttp/db"
+
+func (w *writer) writeStoredGroupMessage(x *db.StoredGroupMessage) {
+	if x == nil {
+		w.nil()
+		return
+	}
+	w.coder(coderStruct)
+	w.string(x.ID)
+	w.int32(x.GlobalID)
+	w.writeStoredMessageAttribute(x.Attribute)
+	w.string(x.SubType)
+	w.writeQuotedInfo(x.QuotedInfo)
+	w.int64(x.GroupCode)
+	w.string(x.AnonymousID)
+	w.arrayMsg(x.Content)
+}
+
+func (r *reader) readStoredGroupMessage() *db.StoredGroupMessage {
+	coder := r.coder()
+	if coder == coderNil {
+		return nil
+	}
+	x := &db.StoredGroupMessage{}
+	x.ID = r.string()
+	x.GlobalID = r.int32()
+	x.Attribute = r.readStoredMessageAttribute()
+	x.SubType = r.string()
+	x.QuotedInfo = r.readQuotedInfo()
+	x.GroupCode = r.int64()
+	x.AnonymousID = r.string()
+	x.Content = r.arrayMsg()
+	return x
+}
+
+func (w *writer) writeStoredPrivateMessage(x *db.StoredPrivateMessage) {
+	if x == nil {
+		w.nil()
+		return
+	}
+	w.coder(coderStruct)
+	w.string(x.ID)
+	w.int32(x.GlobalID)
+	w.writeStoredMessageAttribute(x.Attribute)
+	w.string(x.SubType)
+	w.writeQuotedInfo(x.QuotedInfo)
+	w.int64(x.SessionUin)
+	w.int64(x.TargetUin)
+	w.arrayMsg(x.Content)
+}
+
+func (r *reader) readStoredPrivateMessage() *db.StoredPrivateMessage {
+	coder := r.coder()
+	if coder == coderNil {
+		return nil
+	}
+	x := &db.StoredPrivateMessage{}
+	x.ID = r.string()
+	x.GlobalID = r.int32()
+	x.Attribute = r.readStoredMessageAttribute()
+	x.SubType = r.string()
+	x.QuotedInfo = r.readQuotedInfo()
+	x.SessionUin = r.int64()
+	x.TargetUin = r.int64()
+	x.Content = r.arrayMsg()
+	return x
+}
+
+func (w *writer) writeStoredGuildChannelMessage(x *db.StoredGuildChannelMessage) {
+	if x == nil {
+		w.nil()
+		return
+	}
+	w.coder(coderStruct)
+	w.string(x.ID)
+	w.writeStoredGuildMessageAttribute(x.Attribute)
+	w.uint64(x.GuildID)
+	w.uint64(x.ChannelID)
+	w.writeQuotedInfo(x.QuotedInfo)
+	w.arrayMsg(x.Content)
+}
+
+func (r *reader) readStoredGuildChannelMessage() *db.StoredGuildChannelMessage {
+	coder := r.coder()
+	if coder == coderNil {
+		return nil
+	}
+	x := &db.StoredGuildChannelMessage{}
+	x.ID = r.string()
+	x.Attribute = r.readStoredGuildMessageAttribute()
+	x.GuildID = r.uint64()
+	x.ChannelID = r.uint64()
+	x.QuotedInfo = r.readQuotedInfo()
+	x.Content = r.arrayMsg()
+	return x
+}
+
+func (w *writer) writeStoredMessageAttribute(x *db.StoredMessageAttribute) {
+	if x == nil {
+		w.nil()
+		return
+	}
+	w.coder(coderStruct)
+	w.int32(x.MessageSeq)
+	w.int32(x.InternalID)
+	w.int64(x.SenderUin)
+	w.string(x.SenderName)
+	w.int64(x.Timestamp)
+}
+
+func (r *reader) readStoredMessageAttribute() *db.StoredMessageAttribute {
+	coder := r.coder()
+	if coder == coderNil {
+		return nil
+	}
+	x := &db.StoredMessageAttribute{}
+	x.MessageSeq = r.int32()
+	x.InternalID = r.int32()
+	x.SenderUin = r.int64()
+	x.SenderName = r.string()
+	x.Timestamp = r.int64()
+	return x
+}
+
+func (w *writer) writeStoredGuildMessageAttribute(x *db.StoredGuildMessageAttribute) {
+	if x == nil {
+		w.nil()
+		return
+	}
+	w.coder(coderStruct)
+	w.uint64(x.MessageSeq)
+	w.uint64(x.InternalID)
+	w.uint64(x.SenderTinyID)
+	w.string(x.SenderName)
+	w.int64(x.Timestamp)
+}
+
+func (r *reader) readStoredGuildMessageAttribute() *db.StoredGuildMessageAttribute {
+	coder := r.coder()
+	if coder == coderNil {
+		return nil
+	}
+	x := &db.StoredGuildMessageAttribute{}
+	x.MessageSeq = r.uint64()
+	x.InternalID = r.uint64()
+	x.SenderTinyID = r.uint64()
+	x.SenderName = r.string()
+	x.Timestamp = r.int64()
+	return x
+}
+
+func (w *writer) writeQuotedInfo(x *db.QuotedInfo) {
+	if x == nil {
+		w.nil()
+		return
+	}
+	w.coder(coderStruct)
+	w.string(x.PrevID)
+	w.int32(x.PrevGlobalID)
+	w.arrayMsg(x.QuotedContent)
+}
+
+func (r *reader) readQuotedInfo() *db.QuotedInfo {
+	coder := r.coder()
+	if coder == coderNil {
+		return nil
+	}
+	x := &db.QuotedInfo{}
+	x.PrevID = r.string()
+	x.PrevGlobalID = r.int32()
+	x.QuotedContent = r.arrayMsg()
+	return x
+}

db/leveldb/writer.go

@@ -0,0 +1,143 @@
+package leveldb
+
+import (
+	"bytes"
+
+	"github.com/Mrs4s/go-cqhttp/global"
+)
+
+type intWriter struct {
+	bytes.Buffer
+}
+
+func (w *intWriter) varint(x int64) {
+	w.uvarint(uint64(x)<<1 ^ uint64(x>>63))
+}
+
+func (w *intWriter) uvarint(x uint64) {
+	for x >= 0x80 {
+		w.WriteByte(byte(x) | 0x80)
+		x >>= 7
+	}
+	w.WriteByte(byte(x))
+}
+
+// writer implements the index write.
+//
+// data format(use uvarint to encode integers):
+//
+//   - version
+//   - string data length
+//   - index data length
+//   - string data
+//   - index data
+//
+// for string data part, each string is encoded as:
+//
+//   - string length
+//   - string
+//
+// for index data part, each object value is encoded as:
+//
+//   - coder
+//   - value
+//
+// * coder is the identifier of value's type.
+// * specially for string, it's value is the offset in string data part.
+type writer struct {
+	data        intWriter
+	strings     intWriter
+	stringIndex map[string]uint64
+}
+
+func newWriter() *writer {
+	return &writer{
+		stringIndex: make(map[string]uint64),
+	}
+}
+
+func (w *writer) coder(o coder)    { w.data.WriteByte(byte(o)) }
+func (w *writer) varint(x int64)   { w.data.varint(x) }
+func (w *writer) uvarint(x uint64) { w.data.uvarint(x) }
+func (w *writer) nil()             { w.coder(coderNil) }
+func (w *writer) int(i int)        { w.varint(int64(i)) }
+func (w *writer) uint(i uint)      { w.uvarint(uint64(i)) }
+func (w *writer) int32(i int32)    { w.varint(int64(i)) }
+func (w *writer) uint32(i uint32)  { w.uvarint(uint64(i)) }
+func (w *writer) int64(i int64)    { w.varint(i) }
+func (w *writer) uint64(i uint64)  { w.uvarint(i) }
+
+func (w *writer) string(s string) {
+	off, ok := w.stringIndex[s]
+	if !ok {
+		// not found write to string data part
+		// | string length | string |
+		off = uint64(w.strings.Len())
+		w.strings.uvarint(uint64(len(s)))
+		_, _ = w.strings.WriteString(s)
+		w.stringIndex[s] = off
+	}
+	// write offset to index data part
+	w.uvarint(off)
+}
+
+func (w *writer) msg(m global.MSG) {
+	w.uvarint(uint64(len(m)))
+	for s, obj := range m {
+		w.string(s)
+		w.obj(obj)
+	}
+}
+
+func (w *writer) arrayMsg(a []global.MSG) {
+	w.uvarint(uint64(len(a)))
+	for _, v := range a {
+		w.msg(v)
+	}
+}
+
+func (w *writer) obj(o interface{}) {
+	switch x := o.(type) {
+	case nil:
+		w.nil()
+	case int:
+		w.coder(coderInt)
+		w.int(x)
+	case int32:
+		w.coder(coderInt32)
+		w.int32(x)
+	case int64:
+		w.coder(coderInt64)
+		w.int64(x)
+	case uint:
+		w.coder(coderUint)
+		w.uint(x)
+	case uint32:
+		w.coder(coderUint32)
+		w.uint32(x)
+	case uint64:
+		w.coder(coderUint64)
+		w.uint64(x)
+	case string:
+		w.coder(coderString)
+		w.string(x)
+	case global.MSG:
+		w.coder(coderMSG)
+		w.msg(x)
+	case []global.MSG:
+		w.coder(coderArrayMSG)
+		w.arrayMsg(x)
+	default:
+		panic("unsupported type")
+	}
+}
+
+func (w *writer) bytes() []byte {
+	var out intWriter
+	out.uvarint(dataVersion)
+	out.uvarint(uint64(w.strings.Len()))
+	out.uvarint(uint64(w.data.Len()))
+	_, _ = w.strings.WriteTo(&out)
+	_, _ = w.data.WriteTo(&out)
+	return out.Bytes()
+}

db/mongodb.go

@@ -1,71 +0,0 @@
-package db
-
-import (
-	"context"
-
-	"github.com/pkg/errors"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-)
-
-type MongoDBImpl struct {
-	uri   string
-	db    string
-	mongo *mongo.Database
-}
-
-const (
-	MongoGroupMessageCollection   = "group-messages"
-	MongoPrivateMessageCollection = "private-messages"
-)
-
-func UseMongoDB(uri, db string) *MongoDBImpl {
-	return &MongoDBImpl{uri: uri, db: db}
-}
-
-func (db *MongoDBImpl) Open() error {
-	cli, err := mongo.Connect(context.Background(), options.Client().ApplyURI(db.uri))
-	if err != nil {
-		return errors.Wrap(err, "open mongo connection error")
-	}
-	db.mongo = cli.Database(db.db)
-	return nil
-}
-
-func (db *MongoDBImpl) GetMessageByGlobalID(id int32) (IStoredMessage, error) {
-	if r, err := db.GetGroupMessageByGlobalID(id); err == nil {
-		return r, nil
-	}
-	return db.GetPrivateMessageByGlobalID(id)
-}
-
-func (db *MongoDBImpl) GetGroupMessageByGlobalID(id int32) (*StoredGroupMessage, error) {
-	coll := db.mongo.Collection(MongoGroupMessageCollection)
-	var ret StoredGroupMessage
-	if err := coll.FindOne(context.Background(), bson.D{{"globalId", id}}).Decode(&ret); err != nil {
-		return nil, errors.Wrap(err, "query error")
-	}
-	return &ret, nil
-}
-
-func (db *MongoDBImpl) GetPrivateMessageByGlobalID(id int32) (*StoredPrivateMessage, error) {
-	coll := db.mongo.Collection(MongoPrivateMessageCollection)
-	var ret StoredPrivateMessage
-	if err := coll.FindOne(context.Background(), bson.D{{"globalId", id}}).Decode(&ret); err != nil {
-		return nil, errors.Wrap(err, "query error")
-	}
-	return &ret, nil
-}
-
-func (db *MongoDBImpl) InsertGroupMessage(msg *StoredGroupMessage) error {
-	coll := db.mongo.Collection(MongoGroupMessageCollection)
-	_, err := coll.InsertOne(context.Background(), msg)
-	return errors.Wrap(err, "insert error")
-}
-
-func (db *MongoDBImpl) InsertPrivateMessage(msg *StoredPrivateMessage) error {
-	coll := db.mongo.Collection(MongoPrivateMessageCollection)
-	_, err := coll.InsertOne(context.Background(), msg)
-	return errors.Wrap(err, "insert error")
-}

db/mongodb/mongodb.go

@@ -0,0 +1,107 @@
+package mongodb
+
+import (
+	"context"
+
+	"github.com/pkg/errors"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/mongo/options"
+	"gopkg.in/yaml.v3"
+
+	"github.com/Mrs4s/go-cqhttp/db"
+)
+
+type database struct {
+	uri   string
+	db    string
+	mongo *mongo.Database
+}
+
+// config mongodb 相关配置
+type config struct {
+	Enable   bool   `yaml:"enable"`
+	URI      string `yaml:"uri"`
+	Database string `yaml:"database"`
+}
+
+const (
+	MongoGroupMessageCollection        = "group-messages"
+	MongoPrivateMessageCollection      = "private-messages"
+	MongoGuildChannelMessageCollection = "guild-channel-messages"
+)
+
+func init() {
+	db.Register("database", func(node yaml.Node) db.Database {
+		conf := new(config)
+		_ = node.Decode(conf)
+		if conf.Database == "" {
+			conf.Database = "gocq-database"
+		}
+		if !conf.Enable {
+			return nil
+		}
+		return &database{uri: conf.URI, db: conf.Database}
+	})
+}
+
+func (m *database) Open() error {
+	cli, err := mongo.Connect(context.Background(), options.Client().ApplyURI(m.uri))
+	if err != nil {
+		return errors.Wrap(err, "open mongo connection error")
+	}
+	m.mongo = cli.Database(m.db)
+	return nil
+}
+
+func (m *database) GetMessageByGlobalID(id int32) (db.StoredMessage, error) {
+	if r, err := m.GetGroupMessageByGlobalID(id); err == nil {
+		return r, nil
+	}
+	return m.GetPrivateMessageByGlobalID(id)
+}
+
+func (m *database) GetGroupMessageByGlobalID(id int32) (*db.StoredGroupMessage, error) {
+	coll := m.mongo.Collection(MongoGroupMessageCollection)
+	var ret db.StoredGroupMessage
+	if err := coll.FindOne(context.Background(), bson.D{{"globalId", id}}).Decode(&ret); err != nil {
+		return nil, errors.Wrap(err, "query error")
+	}
+	return &ret, nil
+}
+
+func (m *database) GetPrivateMessageByGlobalID(id int32) (*db.StoredPrivateMessage, error) {
+	coll := m.mongo.Collection(MongoPrivateMessageCollection)
+	var ret db.StoredPrivateMessage
+	if err := coll.FindOne(context.Background(), bson.D{{"globalId", id}}).Decode(&ret); err != nil {
+		return nil, errors.Wrap(err, "query error")
+	}
+	return &ret, nil
+}
+
+func (m *database) GetGuildChannelMessageByID(id string) (*db.StoredGuildChannelMessage, error) {
+	coll := m.mongo.Collection(MongoGuildChannelMessageCollection)
+	var ret db.StoredGuildChannelMessage
+	if err := coll.FindOne(context.Background(), bson.D{{"_id", id}}).Decode(&ret); err != nil {
+		return nil, errors.Wrap(err, "query error")
+	}
+	return &ret, nil
+}
+
+func (m *database) InsertGroupMessage(msg *db.StoredGroupMessage) error {
+	coll := m.mongo.Collection(MongoGroupMessageCollection)
+	_, err := coll.UpdateOne(context.Background(), bson.D{{"_id", msg.ID}}, bson.D{{"$set", msg}}, options.Update().SetUpsert(true))
+	return errors.Wrap(err, "insert error")
+}
+
+func (m *database) InsertPrivateMessage(msg *db.StoredPrivateMessage) error {
+	coll := m.mongo.Collection(MongoPrivateMessageCollection)
+	_, err := coll.UpdateOne(context.Background(), bson.D{{"_id", msg.ID}}, bson.D{{"$set", msg}}, options.Update().SetUpsert(true))
+	return errors.Wrap(err, "insert error")
+}
+
+func (m *database) InsertGuildChannelMessage(msg *db.StoredGuildChannelMessage) error {
+	coll := m.mongo.Collection(MongoGuildChannelMessageCollection)
+	_, err := coll.UpdateOne(context.Background(), bson.D{{"_id", msg.ID}}, bson.D{{"$set", msg}}, options.Update().SetUpsert(true))
+	return errors.Wrap(err, "insert error")
+}

db/multidb.go

@@ -1,56 +1,84 @@
 package db
 
-import "github.com/pkg/errors"
+import (
+	"github.com/pkg/errors"
+	"gopkg.in/yaml.v3"
 
-// MultiDBImpl 多数据库支持
+	"github.com/Mrs4s/go-cqhttp/internal/base"
+)
+
+// backends 多数据库支持， 后端支持
 // 写入会对所有 Backend 进行写入
 // 读取只会读取第一个库
-type MultiDBImpl struct {
-	backends []IDatabase
+var backends []Database
+
+// drivers 多数据库启动
+var drivers = make(map[string]func(node yaml.Node) Database)
+
+// DatabaseDisabledError 没有可用的db
+var DatabaseDisabledError = errors.New("database disabled")
+
+// Register 添加数据库后端
+func Register(name string, init func(yaml.Node) Database) {
+	if _, ok := drivers[name]; ok {
+		panic("database driver conflict: " + name)
+	}
+	drivers[name] = init
 }
 
-func NewMultiDatabase(backends ...IDatabase) *MultiDBImpl {
-	return &MultiDBImpl{
-		backends: backends,
+// Init 加载所有后端配置文件
+func Init() {
+	backends = make([]Database, 0, len(drivers))
+	for name, init := range drivers {
+		if n, ok := base.Database[name]; ok {
+			db := init(n)
+			if db != nil {
+				backends = append(backends, db)
+			}
+		}
 	}
 }
 
-func (db *MultiDBImpl) UseDB(backend IDatabase) {
-	db.backends = append(db.backends, backend)
-}
-
-func (db *MultiDBImpl) Open() error {
-	for _, b := range db.backends {
+func Open() error {
+	for _, b := range backends {
 		if err := b.Open(); err != nil {
 			return errors.Wrap(err, "open backend error")
 		}
 	}
+	base.Database = nil
 	return nil
 }
 
-func (db *MultiDBImpl) GetMessageByGlobalID(id int32) (IStoredMessage, error) {
-	if len(db.backends) == 0 {
-		return nil, errors.New("database disabled")
+func GetMessageByGlobalID(id int32) (StoredMessage, error) {
+	if len(backends) == 0 {
+		return nil, DatabaseDisabledError
 	}
-	return db.backends[0].GetMessageByGlobalID(id)
+	return backends[0].GetMessageByGlobalID(id)
 }
 
-func (db *MultiDBImpl) GetGroupMessageByGlobalID(id int32) (*StoredGroupMessage, error) {
-	if len(db.backends) == 0 {
-		return nil, errors.New("database disabled")
+func GetGroupMessageByGlobalID(id int32) (*StoredGroupMessage, error) {
+	if len(backends) == 0 {
+		return nil, DatabaseDisabledError
 	}
-	return db.backends[0].GetGroupMessageByGlobalID(id)
+	return backends[0].GetGroupMessageByGlobalID(id)
 }
 
-func (db *MultiDBImpl) GetPrivateMessageByGlobalID(id int32) (*StoredPrivateMessage, error) {
-	if len(db.backends) == 0 {
-		return nil, errors.New("database disabled")
+func GetPrivateMessageByGlobalID(id int32) (*StoredPrivateMessage, error) {
+	if len(backends) == 0 {
+		return nil, DatabaseDisabledError
 	}
-	return db.backends[0].GetPrivateMessageByGlobalID(id)
+	return backends[0].GetPrivateMessageByGlobalID(id)
 }
 
-func (db *MultiDBImpl) InsertGroupMessage(m *StoredGroupMessage) error {
-	for _, b := range db.backends {
+func GetGuildChannelMessageByID(id string) (*StoredGuildChannelMessage, error) {
+	if len(backends) == 0 {
+		return nil, DatabaseDisabledError
+	}
+	return backends[0].GetGuildChannelMessageByID(id)
+}
+
+func InsertGroupMessage(m *StoredGroupMessage) error {
+	for _, b := range backends {
 		if err := b.InsertGroupMessage(m); err != nil {
 			return errors.Wrap(err, "insert message to backend error")
 		}
@@ -58,11 +86,20 @@ func (db *MultiDBImpl) InsertGroupMessage(m *StoredGroupMessage) error {
 	return nil
 }
 
-func (db *MultiDBImpl) InsertPrivateMessage(m *StoredPrivateMessage) error {
-	for _, b := range db.backends {
+func InsertPrivateMessage(m *StoredPrivateMessage) error {
+	for _, b := range backends {
 		if err := b.InsertPrivateMessage(m); err != nil {
 			return errors.Wrap(err, "insert message to backend error")
 		}
 	}
 	return nil
 }
+
+func InsertGuildChannelMessage(m *StoredGuildChannelMessage) error {
+	for _, b := range backends {
+		if err := b.InsertGuildChannelMessage(m); err != nil {
+			return errors.Wrap(err, "insert message to backend error")
+		}
+	}
+	return nil
+}

db/sqlite3/model.go

@@ -0,0 +1,84 @@
+package sqlite3
+
+const (
+	Sqlite3GroupMessageTableName          = "grpmsg"
+	Sqlite3MessageAttributeTableName      = "msgattr"
+	Sqlite3GuildMessageAttributeTableName = "gmsgattr"
+	Sqlite3QuotedInfoTableName            = "quoinf"
+	Sqlite3PrivateMessageTableName        = "privmsg"
+	Sqlite3GuildChannelMessageTableName   = "guildmsg"
+	Sqlite3UinInfoTableName               = "uininf"
+	Sqlite3TinyInfoTableName              = "tinyinf"
+)
+
+// StoredMessageAttribute 持久化消息属性
+type StoredMessageAttribute struct {
+	ID         int64 // ID is the crc64 of 字段s below
+	MessageSeq int32
+	InternalID int32
+	SenderUin  int64 // SenderUin is fk to UinInfo
+	Timestamp  int64
+}
+
+// StoredGuildMessageAttribute 持久化频道消息属性
+type StoredGuildMessageAttribute struct {
+	ID           int64 // ID is the crc64 of 字段s below
+	MessageSeq   int64
+	InternalID   int64
+	SenderTinyID int64 // SenderTinyID is fk to TinyInfo
+	Timestamp    int64
+}
+
+// QuotedInfo 引用回复
+type QuotedInfo struct {
+	ID            int64 // ID is the crc64 of 字段s below
+	PrevID        string
+	PrevGlobalID  int32
+	QuotedContent string // QuotedContent is json of original content
+}
+
+// UinInfo QQ 与 昵称
+type UinInfo struct {
+	Uin  int64
+	Name string
+}
+
+// TinyInfo Tiny 与 昵称
+type TinyInfo struct {
+	ID   int64
+	Name string
+}
+
+// StoredGroupMessage 持久化群消息
+type StoredGroupMessage struct {
+	GlobalID     int32
+	ID           string
+	AttributeID  int64
+	SubType      string
+	QuotedInfoID int64
+	GroupCode    int64
+	AnonymousID  string
+	Content      string // Content is json of original content
+}
+
+// StoredPrivateMessage 持久化私聊消息
+type StoredPrivateMessage struct {
+	GlobalID     int32
+	ID           string
+	AttributeID  int64
+	SubType      string
+	QuotedInfoID int64
+	SessionUin   int64
+	TargetUin    int64
+	Content      string // Content is json of original content
+}
+
+// StoredGuildChannelMessage 持久化频道消息
+type StoredGuildChannelMessage struct {
+	ID           string
+	AttributeID  int64
+	GuildID      int64
+	ChannelID    int64
+	QuotedInfoID int64
+	Content      string // Content is json of original content
+}

db/sqlite3/sqlite3.go

@@ -0,0 +1,532 @@
+package sqlite3
+
+import (
+	"encoding/base64"
+	"hash/crc64"
+	"os"
+	"path"
+	"strconv"
+	"sync"
+	"time"
+
+	sql "github.com/FloatTech/sqlite"
+	"github.com/pkg/errors"
+	"gopkg.in/yaml.v3"
+
+	"github.com/Mrs4s/MiraiGo/binary"
+	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/Mrs4s/go-cqhttp/db"
+)
+
+type database struct {
+	sync.RWMutex
+	db  *sql.Sqlite
+	ttl time.Duration
+}
+
+// config mongodb 相关配置
+type config struct {
+	Enable   bool          `yaml:"enable"`
+	CacheTTL time.Duration `yaml:"cachettl"`
+}
+
+func init() {
+	sql.DriverName = "sqlite"
+	db.Register("sqlite3", func(node yaml.Node) db.Database {
+		conf := new(config)
+		_ = node.Decode(conf)
+		if !conf.Enable {
+			return nil
+		}
+		return &database{db: new(sql.Sqlite), ttl: conf.CacheTTL}
+	})
+}
+
+func (s *database) Open() error {
+	s.db.DBPath = path.Join("data", "sqlite3")
+	_ = os.MkdirAll(s.db.DBPath, 0755)
+	s.db.DBPath += "/msg.db"
+	err := s.db.Open(s.ttl)
+	if err != nil {
+		return errors.Wrap(err, "open sqlite3 error")
+	}
+	_, err = s.db.DB.Exec("PRAGMA foreign_keys = ON;")
+	if err != nil {
+		return errors.Wrap(err, "enable foreign_keys error")
+	}
+	err = s.db.Create(Sqlite3UinInfoTableName, &UinInfo{})
+	if err != nil {
+		return errors.Wrap(err, "create sqlite3 table error")
+	}
+	err = s.db.Insert(Sqlite3UinInfoTableName, &UinInfo{Name: "null"})
+	if err != nil {
+		return errors.Wrap(err, "insert into sqlite3 table "+Sqlite3UinInfoTableName+" error")
+	}
+	err = s.db.Create(Sqlite3TinyInfoTableName, &TinyInfo{})
+	if err != nil {
+		return errors.Wrap(err, "create sqlite3 table error")
+	}
+	err = s.db.Insert(Sqlite3TinyInfoTableName, &TinyInfo{Name: "null"})
+	if err != nil {
+		return errors.Wrap(err, "insert into sqlite3 table "+Sqlite3TinyInfoTableName+" error")
+	}
+	err = s.db.Create(Sqlite3MessageAttributeTableName, &StoredMessageAttribute{},
+		"FOREIGN KEY(SenderUin) REFERENCES "+Sqlite3UinInfoTableName+"(Uin)",
+	)
+	if err != nil {
+		return errors.Wrap(err, "create sqlite3 table error")
+	}
+	err = s.db.Insert(Sqlite3MessageAttributeTableName, &StoredMessageAttribute{})
+	if err != nil {
+		return errors.Wrap(err, "insert into sqlite3 table "+Sqlite3MessageAttributeTableName+" error")
+	}
+	err = s.db.Create(Sqlite3GuildMessageAttributeTableName, &StoredGuildMessageAttribute{},
+		"FOREIGN KEY(SenderTinyID) REFERENCES "+Sqlite3TinyInfoTableName+"(ID)",
+	)
+	if err != nil {
+		return errors.Wrap(err, "create sqlite3 table error")
+	}
+	err = s.db.Insert(Sqlite3GuildMessageAttributeTableName, &StoredGuildMessageAttribute{})
+	if err != nil {
+		return errors.Wrap(err, "insert into sqlite3 table "+Sqlite3GuildMessageAttributeTableName+" error")
+	}
+	err = s.db.Create(Sqlite3QuotedInfoTableName, &QuotedInfo{})
+	if err != nil {
+		return errors.Wrap(err, "create sqlite3 table error")
+	}
+	err = s.db.Insert(Sqlite3QuotedInfoTableName, &QuotedInfo{QuotedContent: "null"})
+	if err != nil {
+		return errors.Wrap(err, "insert into sqlite3 table "+Sqlite3QuotedInfoTableName+" error")
+	}
+	err = s.db.Create(Sqlite3GroupMessageTableName, &StoredGroupMessage{},
+		"FOREIGN KEY(AttributeID) REFERENCES "+Sqlite3MessageAttributeTableName+"(ID)",
+		"FOREIGN KEY(QuotedInfoID) REFERENCES "+Sqlite3QuotedInfoTableName+"(ID)",
+	)
+	if err != nil {
+		return errors.Wrap(err, "create sqlite3 table error")
+	}
+	err = s.db.Create(Sqlite3PrivateMessageTableName, &StoredPrivateMessage{},
+		"FOREIGN KEY(AttributeID) REFERENCES "+Sqlite3MessageAttributeTableName+"(ID)",
+		"FOREIGN KEY(QuotedInfoID) REFERENCES "+Sqlite3QuotedInfoTableName+"(ID)",
+	)
+	if err != nil {
+		return errors.Wrap(err, "create sqlite3 table error")
+	}
+	err = s.db.Create(Sqlite3GuildChannelMessageTableName, &StoredGuildChannelMessage{},
+		"FOREIGN KEY(AttributeID) REFERENCES "+Sqlite3MessageAttributeTableName+"(ID)",
+		"FOREIGN KEY(QuotedInfoID) REFERENCES "+Sqlite3QuotedInfoTableName+"(ID)",
+	)
+	if err != nil {
+		return errors.Wrap(err, "create sqlite3 table error")
+	}
+	return nil
+}
+
+func (s *database) GetMessageByGlobalID(id int32) (db.StoredMessage, error) {
+	if r, err := s.GetGroupMessageByGlobalID(id); err == nil {
+		return r, nil
+	}
+	return s.GetPrivateMessageByGlobalID(id)
+}
+
+func (s *database) GetGroupMessageByGlobalID(id int32) (*db.StoredGroupMessage, error) {
+	var ret db.StoredGroupMessage
+	var grpmsg StoredGroupMessage
+	s.RLock()
+	err := s.db.Find(Sqlite3GroupMessageTableName, &grpmsg, "WHERE GlobalID="+strconv.Itoa(int(id)))
+	s.RUnlock()
+	if err != nil {
+		return nil, errors.Wrap(err, "query error")
+	}
+	ret.ID = grpmsg.ID
+	ret.GlobalID = grpmsg.GlobalID
+	ret.SubType = grpmsg.SubType
+	ret.GroupCode = grpmsg.GroupCode
+	ret.AnonymousID = grpmsg.AnonymousID
+	_ = yaml.Unmarshal(utils.S2B(grpmsg.Content), &ret)
+	if grpmsg.AttributeID != 0 {
+		var attr StoredMessageAttribute
+		s.RLock()
+		err = s.db.Find(Sqlite3MessageAttributeTableName, &attr, "WHERE ID="+strconv.FormatInt(grpmsg.AttributeID, 10))
+		s.RUnlock()
+		if err == nil {
+			var uin UinInfo
+			s.RLock()
+			err = s.db.Find(Sqlite3UinInfoTableName, &uin, "WHERE Uin="+strconv.FormatInt(attr.SenderUin, 10))
+			s.RUnlock()
+			if err == nil {
+				ret.Attribute = &db.StoredMessageAttribute{
+					MessageSeq: attr.MessageSeq,
+					InternalID: attr.InternalID,
+					SenderUin:  attr.SenderUin,
+					SenderName: uin.Name,
+					Timestamp:  attr.Timestamp,
+				}
+			}
+		}
+	}
+	if grpmsg.QuotedInfoID != 0 {
+		var quoinf QuotedInfo
+		s.RLock()
+		err = s.db.Find(Sqlite3QuotedInfoTableName, &quoinf, "WHERE ID="+strconv.FormatInt(grpmsg.QuotedInfoID, 10))
+		s.RUnlock()
+		if err == nil {
+			ret.QuotedInfo = &db.QuotedInfo{
+				PrevID:       quoinf.PrevID,
+				PrevGlobalID: quoinf.PrevGlobalID,
+			}
+			_ = yaml.Unmarshal(utils.S2B(quoinf.QuotedContent), &ret.QuotedInfo)
+		}
+	}
+	return &ret, nil
+}
+
+func (s *database) GetPrivateMessageByGlobalID(id int32) (*db.StoredPrivateMessage, error) {
+	var ret db.StoredPrivateMessage
+	var privmsg StoredPrivateMessage
+	s.RLock()
+	err := s.db.Find(Sqlite3PrivateMessageTableName, &privmsg, "WHERE GlobalID="+strconv.Itoa(int(id)))
+	s.RUnlock()
+	if err != nil {
+		return nil, errors.Wrap(err, "query error")
+	}
+	ret.ID = privmsg.ID
+	ret.GlobalID = privmsg.GlobalID
+	ret.SubType = privmsg.SubType
+	ret.SessionUin = privmsg.SessionUin
+	ret.TargetUin = privmsg.TargetUin
+	_ = yaml.Unmarshal(utils.S2B(privmsg.Content), &ret)
+	if privmsg.AttributeID != 0 {
+		var attr StoredMessageAttribute
+		s.RLock()
+		err = s.db.Find(Sqlite3MessageAttributeTableName, &attr, "WHERE ID="+strconv.FormatInt(privmsg.AttributeID, 10))
+		s.RUnlock()
+		if err == nil {
+			var uin UinInfo
+			s.RLock()
+			err = s.db.Find(Sqlite3UinInfoTableName, &uin, "WHERE Uin="+strconv.FormatInt(attr.SenderUin, 10))
+			s.RUnlock()
+			if err == nil {
+				ret.Attribute = &db.StoredMessageAttribute{
+					MessageSeq: attr.MessageSeq,
+					InternalID: attr.InternalID,
+					SenderUin:  attr.SenderUin,
+					SenderName: uin.Name,
+					Timestamp:  attr.Timestamp,
+				}
+			}
+		}
+	}
+	if privmsg.QuotedInfoID != 0 {
+		var quoinf QuotedInfo
+		s.RLock()
+		err = s.db.Find(Sqlite3QuotedInfoTableName, &quoinf, "WHERE ID="+strconv.FormatInt(privmsg.QuotedInfoID, 10))
+		s.RUnlock()
+		if err == nil {
+			ret.QuotedInfo = &db.QuotedInfo{
+				PrevID:       quoinf.PrevID,
+				PrevGlobalID: quoinf.PrevGlobalID,
+			}
+			_ = yaml.Unmarshal(utils.S2B(quoinf.QuotedContent), &ret.QuotedInfo)
+		}
+	}
+	return &ret, nil
+}
+
+func (s *database) GetGuildChannelMessageByID(id string) (*db.StoredGuildChannelMessage, error) {
+	b, err := base64.StdEncoding.DecodeString(id)
+	if err != nil {
+		return nil, errors.Wrap(err, "query invalid id error")
+	}
+	if len(b) < 25 {
+		return nil, errors.New("query invalid id error: content too short")
+	}
+	var ret db.StoredGuildChannelMessage
+	var guildmsg StoredGuildChannelMessage
+	s.RLock()
+	err = s.db.Find(Sqlite3GuildChannelMessageTableName, &guildmsg, "WHERE ID='"+id+"'")
+	s.RUnlock()
+	if err != nil {
+		return nil, errors.Wrap(err, "query error")
+	}
+	ret.ID = guildmsg.ID
+	ret.GuildID = uint64(guildmsg.GuildID)
+	ret.ChannelID = uint64(guildmsg.ChannelID)
+	_ = yaml.Unmarshal(utils.S2B(guildmsg.Content), &ret)
+	if guildmsg.AttributeID != 0 {
+		var attr StoredGuildMessageAttribute
+		s.RLock()
+		err = s.db.Find(Sqlite3GuildMessageAttributeTableName, &attr, "WHERE ID="+strconv.FormatInt(guildmsg.AttributeID, 10))
+		s.RUnlock()
+		if err == nil {
+			var tiny TinyInfo
+			s.RLock()
+			err = s.db.Find(Sqlite3TinyInfoTableName, &tiny, "WHERE ID="+strconv.FormatInt(attr.SenderTinyID, 10))
+			s.RUnlock()
+			if err == nil {
+				ret.Attribute = &db.StoredGuildMessageAttribute{
+					MessageSeq:   uint64(attr.MessageSeq),
+					InternalID:   uint64(attr.InternalID),
+					SenderTinyID: uint64(attr.SenderTinyID),
+					SenderName:   tiny.Name,
+					Timestamp:    attr.Timestamp,
+				}
+			}
+		}
+	}
+	if guildmsg.QuotedInfoID != 0 {
+		var quoinf QuotedInfo
+		s.RLock()
+		err = s.db.Find(Sqlite3QuotedInfoTableName, &quoinf, "WHERE ID="+strconv.FormatInt(guildmsg.QuotedInfoID, 10))
+		s.RUnlock()
+		if err == nil {
+			ret.QuotedInfo = &db.QuotedInfo{
+				PrevID:       quoinf.PrevID,
+				PrevGlobalID: quoinf.PrevGlobalID,
+			}
+			_ = yaml.Unmarshal(utils.S2B(quoinf.QuotedContent), &ret.QuotedInfo)
+		}
+	}
+	return &ret, nil
+}
+
+func (s *database) InsertGroupMessage(msg *db.StoredGroupMessage) error {
+	grpmsg := &StoredGroupMessage{
+		GlobalID:    msg.GlobalID,
+		ID:          msg.ID,
+		SubType:     msg.SubType,
+		GroupCode:   msg.GroupCode,
+		AnonymousID: msg.AnonymousID,
+	}
+	h := crc64.New(crc64.MakeTable(crc64.ISO))
+	if msg.Attribute != nil {
+		h.Write(binary.NewWriterF(func(w *binary.Writer) {
+			w.WriteUInt32(uint32(msg.Attribute.MessageSeq))
+			w.WriteUInt32(uint32(msg.Attribute.InternalID))
+			w.WriteUInt64(uint64(msg.Attribute.SenderUin))
+			w.WriteUInt64(uint64(msg.Attribute.Timestamp))
+		}))
+		h.Write(utils.S2B(msg.Attribute.SenderName))
+		id := int64(h.Sum64())
+		if id == 0 {
+			id++
+		}
+		s.Lock()
+		err := s.db.Insert(Sqlite3UinInfoTableName, &UinInfo{
+			Uin:  msg.Attribute.SenderUin,
+			Name: msg.Attribute.SenderName,
+		})
+		if err == nil {
+			err = s.db.Insert(Sqlite3MessageAttributeTableName, &StoredMessageAttribute{
+				ID:         id,
+				MessageSeq: msg.Attribute.MessageSeq,
+				InternalID: msg.Attribute.InternalID,
+				SenderUin:  msg.Attribute.SenderUin,
+				Timestamp:  msg.Attribute.Timestamp,
+			})
+		}
+		s.Unlock()
+		if err == nil {
+			grpmsg.AttributeID = id
+		}
+		h.Reset()
+	}
+	if msg.QuotedInfo != nil {
+		h.Write(utils.S2B(msg.QuotedInfo.PrevID))
+		h.Write(binary.NewWriterF(func(w *binary.Writer) {
+			w.WriteUInt32(uint32(msg.QuotedInfo.PrevGlobalID))
+		}))
+		content, err := yaml.Marshal(&msg.QuotedInfo)
+		if err != nil {
+			return errors.Wrap(err, "insert marshal QuotedContent error")
+		}
+		h.Write(content)
+		id := int64(h.Sum64())
+		if id == 0 {
+			id++
+		}
+		s.Lock()
+		err = s.db.Insert(Sqlite3QuotedInfoTableName, &QuotedInfo{
+			ID:            id,
+			PrevID:        msg.QuotedInfo.PrevID,
+			PrevGlobalID:  msg.QuotedInfo.PrevGlobalID,
+			QuotedContent: utils.B2S(content),
+		})
+		s.Unlock()
+		if err == nil {
+			grpmsg.QuotedInfoID = id
+		}
+	}
+	content, err := yaml.Marshal(&msg)
+	if err != nil {
+		return errors.Wrap(err, "insert marshal Content error")
+	}
+	grpmsg.Content = utils.B2S(content)
+	s.Lock()
+	err = s.db.Insert(Sqlite3GroupMessageTableName, grpmsg)
+	s.Unlock()
+	if err != nil {
+		return errors.Wrap(err, "insert error")
+	}
+	return nil
+}
+
+func (s *database) InsertPrivateMessage(msg *db.StoredPrivateMessage) error {
+	privmsg := &StoredPrivateMessage{
+		GlobalID:   msg.GlobalID,
+		ID:         msg.ID,
+		SubType:    msg.SubType,
+		SessionUin: msg.SessionUin,
+		TargetUin:  msg.TargetUin,
+	}
+	h := crc64.New(crc64.MakeTable(crc64.ISO))
+	if msg.Attribute != nil {
+		h.Write(binary.NewWriterF(func(w *binary.Writer) {
+			w.WriteUInt32(uint32(msg.Attribute.MessageSeq))
+			w.WriteUInt32(uint32(msg.Attribute.InternalID))
+			w.WriteUInt64(uint64(msg.Attribute.SenderUin))
+			w.WriteUInt64(uint64(msg.Attribute.Timestamp))
+		}))
+		h.Write(utils.S2B(msg.Attribute.SenderName))
+		id := int64(h.Sum64())
+		if id == 0 {
+			id++
+		}
+		s.Lock()
+		err := s.db.Insert(Sqlite3UinInfoTableName, &UinInfo{
+			Uin:  msg.Attribute.SenderUin,
+			Name: msg.Attribute.SenderName,
+		})
+		if err == nil {
+			err = s.db.Insert(Sqlite3MessageAttributeTableName, &StoredMessageAttribute{
+				ID:         id,
+				MessageSeq: msg.Attribute.MessageSeq,
+				InternalID: msg.Attribute.InternalID,
+				SenderUin:  msg.Attribute.SenderUin,
+				Timestamp:  msg.Attribute.Timestamp,
+			})
+		}
+		s.Unlock()
+		if err == nil {
+			privmsg.AttributeID = id
+		}
+		h.Reset()
+	}
+	if msg.QuotedInfo != nil {
+		h.Write(utils.S2B(msg.QuotedInfo.PrevID))
+		h.Write(binary.NewWriterF(func(w *binary.Writer) {
+			w.WriteUInt32(uint32(msg.QuotedInfo.PrevGlobalID))
+		}))
+		content, err := yaml.Marshal(&msg.QuotedInfo)
+		if err != nil {
+			return errors.Wrap(err, "insert marshal QuotedContent error")
+		}
+		h.Write(content)
+		id := int64(h.Sum64())
+		if id == 0 {
+			id++
+		}
+		s.Lock()
+		err = s.db.Insert(Sqlite3QuotedInfoTableName, &QuotedInfo{
+			ID:            id,
+			PrevID:        msg.QuotedInfo.PrevID,
+			PrevGlobalID:  msg.QuotedInfo.PrevGlobalID,
+			QuotedContent: utils.B2S(content),
+		})
+		s.Unlock()
+		if err == nil {
+			privmsg.QuotedInfoID = id
+		}
+	}
+	content, err := yaml.Marshal(&msg)
+	if err != nil {
+		return errors.Wrap(err, "insert marshal Content error")
+	}
+	privmsg.Content = utils.B2S(content)
+	s.Lock()
+	err = s.db.Insert(Sqlite3PrivateMessageTableName, privmsg)
+	s.Unlock()
+	if err != nil {
+		return errors.Wrap(err, "insert error")
+	}
+	return nil
+}
+
+func (s *database) InsertGuildChannelMessage(msg *db.StoredGuildChannelMessage) error {
+	guildmsg := &StoredGuildChannelMessage{
+		ID:        msg.ID,
+		GuildID:   int64(msg.GuildID),
+		ChannelID: int64(msg.ChannelID),
+	}
+	h := crc64.New(crc64.MakeTable(crc64.ISO))
+	if msg.Attribute != nil {
+		h.Write(binary.NewWriterF(func(w *binary.Writer) {
+			w.WriteUInt32(uint32(msg.Attribute.MessageSeq))
+			w.WriteUInt32(uint32(msg.Attribute.InternalID))
+			w.WriteUInt64(uint64(msg.Attribute.SenderTinyID))
+			w.WriteUInt64(uint64(msg.Attribute.Timestamp))
+		}))
+		h.Write(utils.S2B(msg.Attribute.SenderName))
+		id := int64(h.Sum64())
+		if id == 0 {
+			id++
+		}
+		s.Lock()
+		err := s.db.Insert(Sqlite3TinyInfoTableName, &TinyInfo{
+			ID:   int64(msg.Attribute.SenderTinyID),
+			Name: msg.Attribute.SenderName,
+		})
+		if err == nil {
+			err = s.db.Insert(Sqlite3MessageAttributeTableName, &StoredGuildMessageAttribute{
+				ID:           id,
+				MessageSeq:   int64(msg.Attribute.MessageSeq),
+				InternalID:   int64(msg.Attribute.InternalID),
+				SenderTinyID: int64(msg.Attribute.SenderTinyID),
+				Timestamp:    msg.Attribute.Timestamp,
+			})
+		}
+		s.Unlock()
+		if err == nil {
+			guildmsg.AttributeID = id
+		}
+		h.Reset()
+	}
+	if msg.QuotedInfo != nil {
+		h.Write(utils.S2B(msg.QuotedInfo.PrevID))
+		h.Write(binary.NewWriterF(func(w *binary.Writer) {
+			w.WriteUInt32(uint32(msg.QuotedInfo.PrevGlobalID))
+		}))
+		content, err := yaml.Marshal(&msg.QuotedInfo)
+		if err != nil {
+			return errors.Wrap(err, "insert marshal QuotedContent error")
+		}
+		h.Write(content)
+		id := int64(h.Sum64())
+		if id == 0 {
+			id++
+		}
+		s.Lock()
+		err = s.db.Insert(Sqlite3QuotedInfoTableName, &QuotedInfo{
+			ID:            id,
+			PrevID:        msg.QuotedInfo.PrevID,
+			PrevGlobalID:  msg.QuotedInfo.PrevGlobalID,
+			QuotedContent: utils.B2S(content),
+		})
+		s.Unlock()
+		if err == nil {
+			guildmsg.QuotedInfoID = id
+		}
+	}
+	content, err := yaml.Marshal(&msg)
+	if err != nil {
+		return errors.Wrap(err, "insert marshal Content error")
+	}
+	guildmsg.Content = utils.B2S(content)
+	s.Lock()
+	err = s.db.Insert(Sqlite3GuildChannelMessageTableName, guildmsg)
+	s.Unlock()
+	if err != nil {
+		return errors.Wrap(err, "insert error")
+	}
+	return nil
+}

docker-entrypoint.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+USER=abc
+
+echo "---Setup Timezone to ${TZ}---"
+echo "${TZ}" > /etc/timezone
+echo "---Checking if UID: ${UID} matches user---"
+usermod -o -u ${UID} ${USER}
+echo "---Checking if GID: ${GID} matches user---"
+groupmod -o -g ${GID} ${USER} > /dev/null 2>&1 ||:
+usermod -g ${GID} ${USER}
+echo "---Setting umask to ${UMASK}---"
+umask ${UMASK}
+
+echo "---Taking ownership of data...---"
+chown -R ${UID}:${GID} /app /data
+chmod +x /app/cqhttp
+
+echo "Starting..."
+su-exec ${USER} /app/cqhttp

docs/EventFilter.md

@@ -163,9 +163,9 @@
 
 ## 过滤时的事件数据对象
 
-过滤器在go-cqhttp构建好事件数据后运行，各事件的数据字段见[OneBot标准]( https://github.com/howmanybots/onebot/blob/master/v11/specs/event/README.md )。
+过滤器在go-cqhttp构建好事件数据后运行，各事件的数据字段见[OneBot标准]( https://github.com/botuniverse/onebot-11/blob/master/event/README.md )。
 
 这里有几点需要注意：
 
-- `message` 字段在运行过滤器时和上报信息类型相同（见 [消息格式]( https://github.com/howmanybots/onebot/blob/master/v11/specs/message/array.md )）
+- `message` 字段在运行过滤器时和上报信息类型相同（见 [消息格式]( https://github.com/botuniverse/onebot-11/blob/master/message/array.md )）
 - `raw_message` 字段为未经**CQ码**处理的原始消息字符串，这意味着其中可能会出现形如 `[CQ:face,id=123]` 的 CQ 码

docs/config.md

@@ -15,11 +15,10 @@ account: # 账号相关
   uin: 1233456 # QQ账号
   password: '' # 密码为空时使用扫码登录
   encrypt: false  # 是否开启密码加密
-  status: 0      # 在线状态,详情请查看下方的在线状态表
+  status: 0      # 在线状态 请参考 https://docs.go-cqhttp.org/guide/config.html#在线状态
   relogin: # 重连设置
-    # disabled: false
-    delay: 3      # 重连延迟, 单位秒
-    interval: 0   # 重连间隔
+    delay: 3   # 首次重连延迟, 单位秒
+    interval: 3   # 重连间隔
     max-times: 0  # 最大重连次数, 0为无限制
 
   # 是否使用服务器下发的新地址进行重连
@@ -27,11 +26,11 @@ account: # 账号相关
   use-sso-address: true
 
 heartbeat:
-  # disabled: false # 是否开启心跳事件上报
   # 心跳频率, 单位秒
   # -1 为关闭心跳
   interval: 5
 
+message:
   # 上报数据类型
   # 可选: string,array
   post-format: string
@@ -57,6 +56,10 @@ heartbeat:
 output:
   # 日志等级 trace,debug,info,warn,error
   log-level: warn
+  # 日志时效 单位天. 超过这个时间之前的日志将会被自动删除. 设置为 0 表示永久保留.
+  log-aging: 15
+  # 是否在每次启动时强制创建全新的文件储存日志. 为 false 的情况下将会在上次启动时创建的日志文件续写
+  log-force-new: true
   # 是否启用 DEBUG
   debug: false # 开启调试模式
 
@@ -76,13 +79,13 @@ default-middlewares: &default
     frequency: 1  # 令牌回复频率, 单位秒
     bucket: 1     # 令牌桶大小
 
+# 连接服务列表
 servers:
   # HTTP 通信设置
   - http:
       # 服务端监听地址
-      host: 127.0.0.1
-      # 服务端监听端口
-      port: 5700
+      # 如需指定监听ipv4， 可使用 `address: tcp4://0.0.0.0:5700` (ipv6同理)
+      address: 0.0.0.0:5700
       # 反向HTTP超时时间, 单位秒
       # 最小值为5，小于5将会忽略本项设置
       timeout: 5
@@ -98,9 +101,8 @@ servers:
   # 正向WS设置
   - ws:
       # 正向WS服务器监听地址
-      host: 127.0.0.1
-      # 正向WS服务器监听端口
-      port: 6700
+      # 如需指定监听ipv4， 可使用 `address: tcp4://0.0.0.0:6700` (ipv6同理)
+      address: 0.0.0.0:6700
       middlewares:
         <<: *default # 引用默认中间件
 
@@ -156,6 +158,16 @@ database: # 数据库相关设置
 
 > 注5：关于MIME扫描， 详见[MIME](file.md#MIME)
 
+### 环境变量
+
+go-cqhttp 配置文件可以使用占位符来读取**环境变量**的值。
+
+```yaml
+account: # 账号相关
+  uin: ${CQ_UIN} # 读取环境变量 CQ_UIN
+  password: ${CQ_PWD:123456} # 当 CQ_PWD 为空时使用默认值 123456
+```
+
 ## 在线状态
 
 | 状态 | 值 |

docs/cqhttp.md

@@ -12,7 +12,6 @@
 - [回复](#回复)
 - [红包](#红包)
 - [戳一戳](#戳一戳)
-- [礼物](#礼物)
 - [合并转发](#合并转发)
 - [合并转发消息节点](#合并转发消息节点)
 - [XML 消息](#xml-消息)
@@ -43,6 +42,8 @@
 - [设置群名](#设置群名)
 - [获取用户VIP信息](#获取用户vip信息)
 - [发送群公告](#发送群公告)
+- [获取群公告](#获取群公告)
+- [删除群公告](#删除群公告)
 - [设置精华消息](#设置精华消息)
 - [移出精华消息](#移出精华消息)
 - [获取精华消息列表](#获取精华消息列表)
@@ -214,42 +215,6 @@ Type: `poke`
 
 示例: `[CQ:poke,qq=123456]`
 
-### 礼物
-
-> 注意：仅支持免费礼物,发送群礼物消息无法撤回,返回的 `message id`  恒定为 `0`
-
-Type: `gift`
-
-范围: **发送(仅群聊,接收的时候不是CQ码)**
-
-参数:
-
-| 参数名 | 类型  | 说明           |
-| ------ | ----- | -------------- |
-| `qq`   | int64 | 接收礼物的成员 |
-| `id`   | int   | 礼物的类型     |
-
-目前支持的礼物ID:
-
-| id  | 类型       |
-| --- | ---------- |
-| 0   | 甜Wink     |
-| 1   | 快乐肥宅水 |
-| 2   | 幸运手链   |
-| 3   | 卡布奇诺   |
-| 4   | 猫咪手表   |
-| 5   | 绒绒手套   |
-| 6   | 彩虹糖果   |
-| 7   | 坚强       |
-| 8   | 告白话筒   |
-| 9   | 牵你的手   |
-| 10  | 可爱猫咪   |
-| 11  | 神秘面具   |
-| 12  | 我超忙的   |
-| 13  | 爱心口罩   |
-
-示例: `[CQ:gift,qq=123456,id=8]`
-
 ### 合并转发
 
 Type: `forward`
@@ -281,7 +246,8 @@ Type: `node`
 | `seq`     | message | 具体消息       | 用于自定义消息                                                                         |
 
 特殊说明: **需要使用单独的API `/send_group_forward_msg` 发送，并且由于消息段较为复杂，仅支持Array形式入参。 如果引用消息和自定义消息同时出现，实际查看顺序将取消息段顺序.
-另外按 [CQHTTP](https://git.io/JtxtN) 文档说明, `data` 应全为字符串, 但由于需要接收`message` 类型的消息, 所以 *仅限此Type的content字段* 支持Array套娃**
+另外按 [Onebot v11](https://github.com/botuniverse/onebot-11/blob/master/message/array.md) 文档说明, `data` 应全为字符串,
+但由于需要接收`message` 类型的消息, 所以 *仅限此Type的content字段* 支持Array套娃**
 
 示例:
 
@@ -528,6 +494,18 @@ Type: `tts`
 
 示例: `[CQ:tts,text=这是一条测试消息]`
 
+### 猜拳消息
+
+Type: `rps`
+
+参数:
+
+| 参数名     | 类型  | 说明               |
+|---------|-----|------------------|
+| `value` | int | 0：石头, 1：剪刀, 2：布  |
+
+示例: `[CQ:rps,value=0]`
+
 ## API
 
 ### 设置群名
@@ -650,15 +628,16 @@ Type: `tts`
 }
 ````
 
-### 发送合并转发(群)
+### 发送合并转发(群/私聊)
 
-终结点: `/send_group_forward_msg`
+终结点: `/send_group_forward_msg`, `send_private_forward_msg`, `send_forward_msg`
 
 **参数**
 
-| 字段       | 类型           | 说明                         |
-| ---------- | -------------- | ---------------------------- |
-| `group_id` | int64          | 群号                         |
+| 字段         | 类型             | 说明                                                                                                                                                            |
+|------------|----------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `group_id` | int64          | 群号                                                                                                                                                            |
+| `user_id`  | int64          | 私聊QQ号                                                                                                                                                         |
 | `messages` | forward node[] | 自定义转发消息, 具体看 [CQCode](https://github.com/Mrs4s/go-cqhttp/blob/master/docs/cqhttp.md#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E6%B6%88%E6%81%AF%E8%8A%82%E7%82%B9) |
 
 响应数据
@@ -920,6 +899,36 @@ Type: `tts`
 > 在不提供 `folder` 参数的情况下默认上传到根目录
 > 只能上传本地文件, 需要上传 `http` 文件的话请先调用 `download_file` API下载
 
+### 上传私聊文件
+
+终结点: `/upload_private_file`
+
+**参数**
+
+| 字段        | 类型     | 说明     |
+|-----------|--------|--------|
+| `user_id` | int64  | 接收者id  |
+| `file`    | string | 本地文件路径 |
+| `name`    | string | 储存名称   |
+
+> 只能上传本地文件, 需要上传 `http` 文件的话请先调用 `download_file` API下载
+
+### 设置 QQ 个人资料
+
+终结点: `/set_qq_profile`
+
+**参数**
+
+| 字段              | 类型     | 说明   |
+|-----------------|--------|------|
+| `nickname`      | int64  | 昵称   |
+| `company`       | string | 公司   |
+| `email`         | string | 邮箱   |
+| `college`       | string | 大学   |
+| `personal_note` | string | 个人签名 |
+
+> 所有参数字段都为可选。
+
 ### 获取状态
 
 终结点: `/get_status`
@@ -1102,6 +1111,60 @@ JSON数组:
 
 `该 API 没有响应数据`
 
+### 获取群公告
+
+终结点： `/_get_group_notice`
+
+**参数**
+
+| 字段名     | 数据类型 | 默认值 | 说明     |
+| ---------- | -------- | ------ | -------- |
+| `group_id` | int64    |        | 群号     |
+
+**响应数据**
+
+数组信息:
+
+| 字段名            | 数据类型   | 默认值 | 说明    |
+|----------------|--------| ------ |-------|
+| `notice_id`    | string |        | 公告id  |
+| `sender_id`    | string |        | 发布者id |
+| `publish_time` | string |        | 发布时间  |
+| `message`      | GroupNoticeMessage |        | 公告id  |
+
+响应示例
+
+```json
+{
+  "data": [
+    {
+      "notice_id": "8850de2e00000000cc6bbd628a150c00",
+      "sender_id": 1111111,
+      "publish_time": 1656581068,
+      "message": {
+        "text": "这是一条公告",
+        "images": []
+      }
+    }
+  ],
+  "retcode": 0,
+  "status": "ok"
+}
+```
+
+### 删除群公告
+
+终结点： `/_del_group_notice`
+
+**参数**
+
+| 字段名         | 数据类型 | 默认值 | 说明   |
+|-------------| -------- | ------ |------|
+| `group_id`  | int64    |        | 群号   |
+| `notice_id` | string   |        | 公告id |
+
+`该 API 没有响应数据`
+
 ### 获取单向好友列表
 
 终结点: `/get_unidirectional_friend_list`

docs/guild.md

@@ -0,0 +1,412 @@
+# 频道相关API
+
+> 注意: QQ频道功能目前还在测试阶段, go-cqhttp 也在适配的初期阶段, 以下 `API` `Event` 的字段名可能存在错误并均有可能在后续版本修改/添加/删除.
+> 目前仅供开发者测试以及适配使用
+
+QQ频道相关功能的事件以及API
+
+## 命名说明
+
+API以及字段相关命名均为参考QQ官方命名或相似产品命名规则, 由于QQ频道的账号系统独立于QQ本体, 所以各个 `ID` 并不能和QQ通用.也无法通过 `tiny_id` 获取到 `QQ号`
+
+下表为常见字段命名说明
+
+| 命名         | 说明                 |
+| ------------ | -------------------- |
+| `tiny_id`    | 在频道系统中代表用户ID, 与QQ号并不通用 |
+| `guild_id`   | 频道ID               |
+| `channel_id` | 子频道ID             |
+
+> 所有频道相关事件的 `user_id` 均为 `tiny_id`
+
+## 特殊说明
+
+- 由于频道的限制, 目前无法通过图片摘要查询到频道图片消息的详细信息, 所以通过频道消息收到的图片均会下载完整文件到 `images/guild-images`. (群图片转发不受此限制)
+- 由于无法通过 `GlobalID` 放下频道消息的ID, 所以所有频道消息的 `message_id` 均为 `string` 类型
+- `send_msg` API将无法发送频道消息
+- `get_msg` API暂时无法获取频道消息
+- `reply` 等消息类型暂不支持解析
+- `at` 消息的 `target` 依然使用 `qq` 字段, 以保证一致性. 但内容为 `tiny_id`
+- 所有事件的 `self_id` 均为 BOT 的QQ号. `tiny_id` 将放在 `self_tiny_id` 字段
+- 遵循我们一贯的原则, 将不会支持主动加频道/主动拉人/红包相关消息类型
+- 频道相关的API仅能在 `Android Phone` 和 `iPad` 协议上使用.
+- 由于频道相关ID的数据类型均为 `uint64` , 为保证不超过某些语言的安全值范围, 在 `v1.0.0-beta8-fix3` 以后, 所有ID相关数据将转换为 `string` 类型, API调用 `uint64`
+  或 `string` 均可接受.
+- 为保证一致性, 所有频道接口返回的 `用户ID` 均命名为 `tiny_id`, 所有频道相关接口的 `用户ID` 入参均命名为 `user_id`
+
+## API
+
+### 获取频道系统内BOT的资料
+
+终结点: `/get_guild_service_profile`
+
+**响应数据**
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `nickname`    | string | 昵称      |
+| `tiny_id`     | string | 自身的ID   |
+| `avatar_url`  | string | 头像链接   |
+
+### 获取频道列表
+
+终结点: `/get_guild_list`
+
+**响应数据**
+
+正常情况下响应 `GuildInfo` 数组, 未加入任何频道响应 `null`
+
+GuildInfo:
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `guild_id`    | string | 频道ID      |
+| `guild_name`     | string | 频道名称   |
+| `guild_display_id`  | int64 | 频道显示ID, 公测后可能作为搜索ID使用  |
+
+### 通过访客获取频道元数据
+
+终结点: `/get_guild_meta_by_guest`
+
+**参数**
+
+| 字段       | 类型  | 说明 |
+| ---------- | ----- | ---- |
+| `guild_id` | string | 频道ID |
+
+**响应数据**
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `guild_id`    | string | 频道ID      |
+| `guild_name`     | string | 频道名称   |
+| `guild_profile`  | string | 频道简介  |
+| `create_time`  | int64 | 创建时间  |
+| `max_member_count`  | int64 | 频道人数上限  |
+| `max_robot_count`  | int64 | 频道BOT数上限  |
+| `max_admin_count`  | int64 | 频道管理员人数上限  |
+| `member_count`  | int64 | 已加入人数  |
+| `owner_id`  | string | 创建者ID  |
+
+### 获取子频道列表
+
+终结点: `/get_guild_channel_list`
+
+**参数**
+
+| 字段       | 类型  | 说明 |
+| ---------- | ----- | ---- |
+| `guild_id` | string | 频道ID |
+| `no_cache` | bool  | 是否无视缓存 |
+
+**响应数据**
+
+正常情况下响应 `ChannelInfo` 数组, 未找到任何子频道响应 `null`
+
+ChannelInfo:
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `owner_guild_id`    | string | 所属频道ID      |
+| `channel_id`     | string | 子频道ID   |
+| `channel_type`     | int32 | 子频道类型   |
+| `channel_name`  | string | 子频道名称  |
+| `create_time`  | int64 | 创建时间  |
+| `creator_tiny_id`  | string | 创建者ID  |
+| `talk_permission`  | int32 | 发言权限类型  |
+| `visible_type`  | int32 | 可视性类型  |
+| `current_slow_mode`  | int32 | 当前启用的慢速模式Key  |
+| `slow_modes`  | []SlowModeInfo | 频道内可用慢速模式类型列表|
+
+SlowModeInfo:
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `slow_mode_key`    | int32 | 慢速模式Key   |
+| `slow_mode_text`     | string | 慢速模式说明   |
+| `speak_frequency`  | int32 | 周期内发言频率限制  |
+| `slow_mode_circle`  | int32 | 单位周期时间, 单位秒 |
+
+已知子频道类型列表
+
+| 类型          |  说明       |
+| ------------- | ---------- |
+| 1    | 文字频道  |
+| 2     | 语音频道  |
+| 5  |  直播频道  |
+| 7  |  主题频道  |
+
+### 获取频道成员列表
+
+终结点: `/get_guild_member_list`
+
+> 由于频道人数较多(数万), 请尽量不要全量拉取成员列表, 这将会导致严重的性能问题
+>
+> 尽量使用 `get_guild_member_profile` 接口代替全量拉取
+
+**参数**
+
+| 字段       | 类型  | 说明 |
+| ---------- | ----- | ---- |
+| `guild_id` | string | 频道ID |
+| `next_token` | string | 翻页Token |
+
+> `next_token` 为空的情况下, 将返回第一页的数据, 并在返回值附带下一页的 `token`
+
+**响应数据**
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `members`    | []GuildMemberInfo | 成员列表   |
+| `finished`    | bool | 是否最终页   |
+| `next_token`    | string | 翻页Token   |
+
+GuildMemberInfo:
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `tiny_id`    | string | 成员ID   |
+| `title`    | string | 成员头衔   |
+| `nickname`    | string | 成员昵称   |
+| `role_id`    | string | 所在权限组ID   |
+| `role_name`    | string | 所在权限组名称   |
+
+> 默认情况下频道管理员的权限组ID为 `2`, 部分频道可能会另行创建, 需手动判断
+>
+> 此接口仅展现最新的权限组, 获取用户加入的所有权限组请使用 `get_guild_member_profile` 接口
+
+### 单独获取频道成员信息
+
+终结点: `/get_guild_member_profile`
+
+**参数**
+
+| 字段       | 类型  | 说明 |
+| ---------- | ----- | ---- |
+| `guild_id` | string | 频道ID |
+| `user_id` | string | 用户ID |
+
+**响应数据**
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `tiny_id`    | string | 用户ID     |
+| `nickname`    | string | 用户昵称     |
+| `avatar_url`    | string | 头像地址     |
+| `join_time`    | int64 | 加入时间     |
+| `roles`    | []RoleInfo | 加入的所有权限组    |
+
+RoleInfo:
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `role_id`    | string | 权限组ID     |
+| `role_name`   | string | 权限组名称     |
+
+### 发送信息到子频道
+
+终结点: `/send_guild_channel_msg`
+
+**参数**
+
+| 字段       | 类型  | 说明 |
+| ---------- | ----- | ---- |
+| `guild_id` | string | 频道ID |
+| `channel_id` | string | 子频道ID |
+| `message` | Message | 消息, 与原有消息类型相同 |
+
+**响应数据**
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `message_id`    | string | 消息ID     |
+
+### 获取话题频道帖子
+
+终结点: `/get_topic_channel_feeds`
+
+**参数**
+
+| 字段       | 类型  | 说明 |
+| ---------- | ----- | ---- |
+| `guild_id` | string | 频道ID |
+| `channel_id` | string | 子频道ID |
+
+**响应数据**
+
+返回 `FeedInfo` 数组
+
+FeedInfo:
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `id`   | string | 帖子ID     |
+| `channel_id`    | string | 子频道ID     |
+| `guild_id`   | string | 频道ID     |
+| `create_time`   | int64 | 发帖时间     |
+| `title`   | string | 帖子标题     |
+| `sub_title`   | string | 帖子副标题  |
+| `poster_info`   | PosterInfo | 发帖人信息  |
+| `resource`   | ResourceInfo | 媒体资源信息  |
+| `resource.images`   | []FeedMedia | 帖子附带的图片列表 |
+| `resource.videos`   | []FeedMedia | 帖子附带的视频列表 |
+| `contents`   | []FeedContent | 帖子内容 |
+
+PosterInfo:
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `tiny_id`   | string | 发帖人ID     |
+| `nickname`    | string | 发帖人昵称     |
+| `icon_url`   | string | 发帖人头像链接   |
+
+FeedMedia:
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `file_id`   | string | 媒体ID     |
+| `pattern_id`    | string |   控件ID?(不确定)   |
+| `url`   | string | 媒体链接   |
+| `height`   | int32 | 媒体高度  |
+| `width`   | int32 | 媒体宽度  |
+
+FeedContent:
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `type`   | string |  内容类型    |
+| `data`    | Data |   内容数据   |
+
+#### 内容类型列表:
+
+|  类型  | 说明       |
+|  ----- | ---------- |
+| `text` |  文本   |
+| `face` |  表情   |
+| `at` |  At  |
+| `url_quote` |  链接引用   |
+| `channel_quote` |  子频道引用  |
+
+#### 内容类型对应数据列表:
+
+- `text`
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `text`   | string |  文本内容    |
+
+- `face`
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `id`   | string |  表情ID    |
+
+- `at`
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `id`   | string |  目标ID    |
+| `qq`   | string |  目标ID, 为确保和 `array message` 的一致性保留    |
+
+- `url_quote`
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `display_text`   | string |  显示文本    |
+| `url`   | string |  链接    |
+
+- `channel_quote`
+
+| 字段          | 类型  | 说明       |
+| ------------- | ----- | ---------- |
+| `display_text`   | string |  显示文本    |
+| `guild_id`   | string |  频道ID    |
+| `channel_id`   | string |  子频道ID    |
+
+## 事件
+
+### 收到频道消息
+
+**上报数据**
+
+| 字段          | 类型   | 可能的值       | 说明           |
+| ------------- | ------ | -------------- | -------------- |
+| `post_type`   | string | `message`       | 上报类型       |
+| `message_type` | string | `guild` | 消息类型       |
+| `sub_type` | string | `channel` | 消息子类型       |
+| `guild_id`    | string  |                | 频道ID           |
+| `channel_id`    | string  |                | 子频道ID           |
+| `user_id`     | string  |                | 消息发送者ID   |
+| `message_id`     | string  |                | 消息ID  |
+| `sender`     | Sender  |                | 发送者  |
+| `message`     | Message  |                | 消息内容  |
+
+> 注: 此处的 `Sender` 对象为保证一致性, `user_id` 为 `uint64` 类型, 并添加了 `string` 类型的 `tiny_id` 字段
+
+### 频道消息表情贴更新
+
+**上报数据**
+
+| 字段          | 类型   | 可能的值       | 说明           |
+| ------------- | ------ | -------------- | -------------- |
+| `post_type`   | string | `notice`       | 上报类型       |
+| `notice_type` | string | `message_reactions_updated` | 消息类型       |
+| `guild_id`    | string  |                | 频道ID           |
+| `channel_id`    | string  |                | 子频道ID           |
+| `user_id`     | string  |                | 操作者ID  |
+| `message_id`     | string  |                | 消息ID  |
+| `current_reactions`     | []ReactionInfo  |                | 当前消息被贴表情列表  |
+
+ReactionInfo:
+
+| 字段       | 类型  | 说明 |
+| ---------- | ----- | ---- |
+| `emoji_id` | string | 表情ID |
+| `emoji_index` | int32 | 表情对应数值ID |
+| `emoji_type` | int32 | 表情类型 |
+| `emoji_name` | string | 表情名字 |
+| `count` | int32 | 当前表情被贴数量 |
+| `clicked` | bool | BOT是否点击 |
+
+### 子频道信息更新
+
+**上报数据**
+
+| 字段          | 类型   | 可能的值       | 说明           |
+| ------------- | ------ | -------------- | -------------- |
+| `post_type`   | string | `notice`       | 上报类型       |
+| `notice_type` | string | `channel_updated` | 消息类型       |
+| `guild_id`    | string  |                | 频道ID           |
+| `channel_id`    | string  |                | 子频道ID           |
+| `user_id`     | string  |                | 操作者ID  |
+| `operator_id`     | string  |                | 操作者ID  |
+| `old_info`     | ChannelInfo  |        | 更新前的频道信息  |
+| `new_info`     | ChannelInfo  |        | 更新后的频道信息  |
+
+### 子频道创建
+
+**上报数据**
+
+| 字段          | 类型   | 可能的值       | 说明           |
+| ------------- | ------ | -------------- | -------------- |
+| `post_type`   | string | `notice`       | 上报类型       |
+| `notice_type` | string | `channel_created` | 消息类型       |
+| `guild_id`    | string  |                | 频道ID           |
+| `channel_id`    | string  |                | 子频道ID           |
+| `user_id`     | string  |                | 操作者ID  |
+| `operator_id`     | string  |                | 操作者ID  |
+| `channel_info`     | ChannelInfo  |        | 频道信息  |
+
+### 子频道删除
+
+**上报数据**
+
+| 字段          | 类型   | 可能的值       | 说明           |
+| ------------- | ------ | -------------- | -------------- |
+| `post_type`   | string | `notice`       | 上报类型       |
+| `notice_type` | string | `channel_destroyed` | 消息类型       |
+| `guild_id`    | string  |                | 频道ID           |
+| `channel_id`    | string  |                | 子频道ID           |
+| `user_id`     | string  |                | 操作者ID  |
+| `operator_id`     | string  |                | 操作者ID  |
+| `channel_info`     | ChannelInfo  |        | 频道信息  |

global/buffer.go

@@ -2,26 +2,16 @@ package global
 
 import (
 	"bytes"
-	"sync"
-)
 
-var bufferPool = sync.Pool{
-	New: func() interface{} {
-		return new(bytes.Buffer)
-	},
-}
+	"github.com/Mrs4s/MiraiGo/binary" // 和 MiraiGo 共用同一 buffer 池
+)
 
 // NewBuffer 从池中获取新 bytes.Buffer
 func NewBuffer() *bytes.Buffer {
-	return bufferPool.Get().(*bytes.Buffer)
+	return (*bytes.Buffer)(binary.SelectWriter())
 }
 
 // PutBuffer 将 Buffer放入池中
 func PutBuffer(buf *bytes.Buffer) {
-	// See https://golang.org/issue/23199
-	const maxSize = 1 << 16
-	if buf != nil && buf.Cap() < maxSize { // 对于大Buffer直接丢弃
-		buf.Reset()
-		bufferPool.Put(buf)
-	}
+	binary.PutWriter((*binary.Writer)(buf))
 }

global/codec.go

@@ -43,6 +43,6 @@ func EncodeMP4(src string, dst string) error { //        -y 覆盖文件
 
 // ExtractCover 获取给定视频文件的Cover
 func ExtractCover(src string, target string) error {
-	cmd := exec.Command("ffmpeg", "-i", src, "-y", "-r", "1", "-f", "image2", target)
+	cmd := exec.Command("ffmpeg", "-i", src, "-y", "-ss", "0", "-frames:v", "1", target)
 	return errors.Wrap(cmd.Run(), "extract video cover failed")
 }

global/fs.go

@@ -5,42 +5,36 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"errors"
-	"net"
+	"net/netip"
 	"net/url"
 	"os"
 	"path"
 	"runtime"
-	"strconv"
 	"strings"
 
 	"github.com/Mrs4s/MiraiGo/utils"
+	b14 "github.com/fumiama/go-base16384"
+	"github.com/segmentio/asm/base64"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/Mrs4s/go-cqhttp/internal/param"
+	"github.com/Mrs4s/go-cqhttp/internal/download"
 )
 
 const (
 	// ImagePath go-cqhttp使用的图片缓存目录
 	ImagePath = "data/images"
-	// ImagePathOld 兼容旧版go-cqhttp使用的图片缓存目录
-	ImagePathOld = "data/image"
 	// VoicePath go-cqhttp使用的语音缓存目录
 	VoicePath = "data/voices"
-	// VoicePathOld 兼容旧版go-cqhttp使用的语音缓存目录
-	VoicePathOld = "data/record"
 	// VideoPath go-cqhttp使用的视频缓存目录
 	VideoPath = "data/videos"
 	// CachePath go-cqhttp使用的缓存目录
 	CachePath = "data/cache"
-)
-
-var (
-	// ErrSyntax Path语法错误时返回的错误
-	ErrSyntax = errors.New("syntax error")
+	// DumpsPath go-cqhttp使用错误转储目录
+	DumpsPath = "dumps"
 	// HeaderAmr AMR文件头
-	HeaderAmr = []byte("#!AMR")
+	HeaderAmr = "#!AMR"
 	// HeaderSilk Silkv3文件头
-	HeaderSilk = []byte("\x02#!SILK_V3")
+	HeaderSilk = "\x02#!SILK_V3"
 )
 
 // PathExists 判断给定path是否存在
@@ -76,33 +70,35 @@ func Check(err error, deleteSession bool) {
 
 // IsAMRorSILK 判断给定文件是否为Amr或Silk格式
 func IsAMRorSILK(b []byte) bool {
-	return bytes.HasPrefix(b, HeaderAmr) || bytes.HasPrefix(b, HeaderSilk)
+	return bytes.HasPrefix(b, []byte(HeaderAmr)) || bytes.HasPrefix(b, []byte(HeaderSilk))
 }
 
 // FindFile 从给定的File寻找文件，并返回文件byte数组。File是一个合法的URL。p为文件寻找位置。
 // 对于HTTP/HTTPS形式的URL，Cache为"1"或空时表示启用缓存
 func FindFile(file, cache, p string) (data []byte, err error) {
-	data, err = nil, ErrSyntax
+	data, err = nil, os.ErrNotExist
 	switch {
 	case strings.HasPrefix(file, "http"): // https also has prefix http
-		if cache == "" {
-			cache = "1"
-		}
 		hash := md5.Sum([]byte(file))
 		cacheFile := path.Join(CachePath, hex.EncodeToString(hash[:])+".cache")
-		if PathExists(cacheFile) && cache == "1" {
+		if (cache == "" || cache == "1") && PathExists(cacheFile) {
 			return os.ReadFile(cacheFile)
 		}
-		data, err = GetBytes(file)
-		_ = os.WriteFile(cacheFile, data, 0o644)
+		err = download.Request{URL: file}.WriteToFile(cacheFile)
 		if err != nil {
 			return nil, err
 		}
 	case strings.HasPrefix(file, "base64"):
-		data, err = param.Base64DecodeString(strings.TrimPrefix(file, "base64://"))
+		data, err = base64.StdEncoding.DecodeString(strings.TrimPrefix(file, "base64://"))
 		if err != nil {
 			return nil, err
 		}
+	case strings.HasPrefix(file, "base16384"):
+		data, err = b14.UTF82UTF16BE(utils.S2B(strings.TrimPrefix(file, "base16384://")))
+		if err != nil {
+			return nil, err
+		}
+		data = b14.Decode(data)
 	case strings.HasPrefix(file, "file"):
 		var fu *url.URL
 		fu, err = url.Parse(file)
@@ -139,19 +135,18 @@ func DelFile(path string) bool {
 }
 
 // ReadAddrFile 从给定path中读取合法的IP地址与端口,每个IP地址以换行符"\n"作为分隔
-func ReadAddrFile(path string) []*net.TCPAddr {
+func ReadAddrFile(path string) []netip.AddrPort {
 	d, err := os.ReadFile(path)
 	if err != nil {
 		return nil
 	}
 	str := string(d)
 	lines := strings.Split(str, "\n")
-	var ret []*net.TCPAddr
+	var ret []netip.AddrPort
 	for _, l := range lines {
-		ip := strings.Split(strings.TrimSpace(l), ":")
-		if len(ip) == 2 {
-			port, _ := strconv.Atoi(ip[1])
-			ret = append(ret, &net.TCPAddr{IP: net.ParseIP(ip[0]), Port: port})
+		addr, err := netip.ParseAddrPort(l)
+		if err == nil {
+			ret = append(ret, addr)
 		}
 	}
 	return ret

global/log_hook.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/mattn/go-colorable"
 	"github.com/sirupsen/logrus"
 )
 
@@ -80,24 +81,16 @@ func (hook *LocalHook) Fire(entry *logrus.Entry) error {
 }
 
 // SetFormatter 设置日志格式
-func (hook *LocalHook) SetFormatter(formatter logrus.Formatter) {
+func (hook *LocalHook) SetFormatter(consoleFormatter, fileFormatter logrus.Formatter) {
 	hook.lock.Lock()
 	defer hook.lock.Unlock()
 
-	if formatter == nil {
-		// 用默认的
-		formatter = &logrus.TextFormatter{DisableColors: true}
-	} else {
-		switch f := formatter.(type) {
-		case *logrus.TextFormatter:
-			textFormatter := f
-			textFormatter.DisableColors = true
-		default:
-			// todo
-		}
-	}
-	logrus.SetFormatter(formatter)
-	hook.formatter = formatter
+	// 支持处理windows平台的console色彩
+	logrus.SetOutput(colorable.NewColorableStdout())
+	// 用于在console写出
+	logrus.SetFormatter(consoleFormatter)
+	// 用于写入文件
+	hook.formatter = fileFormatter
 }
 
 // SetWriter 设置Writer
@@ -115,11 +108,11 @@ func (hook *LocalHook) SetPath(path string) {
 }
 
 // NewLocalHook 初始化本地日志钩子实现
-func NewLocalHook(args interface{}, formatter logrus.Formatter, levels ...logrus.Level) *LocalHook {
+func NewLocalHook(args interface{}, consoleFormatter, fileFormatter logrus.Formatter, levels ...logrus.Level) *LocalHook {
 	hook := &LocalHook{
 		lock: new(sync.Mutex),
 	}
-	hook.SetFormatter(formatter)
+	hook.SetFormatter(consoleFormatter, fileFormatter)
 	hook.levels = append(hook.levels, levels...)
 
 	switch arg := args.(type) {
@@ -177,12 +170,19 @@ func GetLogLevel(level string) []logrus.Level {
 }
 
 // LogFormat specialize for go-cqhttp
-type LogFormat struct{}
+type LogFormat struct {
+	EnableColor bool
+}
 
 // Format implements logrus.Formatter
 func (f LogFormat) Format(entry *logrus.Entry) ([]byte, error) {
 	buf := NewBuffer()
 	defer PutBuffer(buf)
+
+	if f.EnableColor {
+		buf.WriteString(GetLogLevelColorCode(entry.Level))
+	}
+
 	buf.WriteByte('[')
 	buf.WriteString(entry.Time.Format("2006-01-02 15:04:05"))
 	buf.WriteString("] [")
@@ -190,6 +190,46 @@ func (f LogFormat) Format(entry *logrus.Entry) ([]byte, error) {
 	buf.WriteString("]: ")
 	buf.WriteString(entry.Message)
 	buf.WriteString(" \n")
-	ret := append([]byte(nil), buf.Bytes()...) // copy buffer
+
+	if f.EnableColor {
+		buf.WriteString(colorReset)
+	}
+
+	ret := make([]byte, len(buf.Bytes()))
+	copy(ret, buf.Bytes()) // copy buffer
 	return ret, nil
 }
+
+const (
+	colorCodePanic = "\x1b[1;31m" // color.Style{color.Bold, color.Red}.String()
+	colorCodeFatal = "\x1b[1;31m" // color.Style{color.Bold, color.Red}.String()
+	colorCodeError = "\x1b[31m"   // color.Style{color.Red}.String()
+	colorCodeWarn  = "\x1b[33m"   // color.Style{color.Yellow}.String()
+	colorCodeInfo  = "\x1b[37m"   // color.Style{color.White}.String()
+	colorCodeDebug = "\x1b[32m"   // color.Style{color.Green}.String()
+	colorCodeTrace = "\x1b[36m"   // color.Style{color.Cyan}.String()
+	colorReset     = "\x1b[0m"
+)
+
+// GetLogLevelColorCode 获取日志等级对应色彩code
+func GetLogLevelColorCode(level logrus.Level) string {
+	switch level {
+	case logrus.PanicLevel:
+		return colorCodePanic
+	case logrus.FatalLevel:
+		return colorCodeFatal
+	case logrus.ErrorLevel:
+		return colorCodeError
+	case logrus.WarnLevel:
+		return colorCodeWarn
+	case logrus.InfoLevel:
+		return colorCodeInfo
+	case logrus.DebugLevel:
+		return colorCodeDebug
+	case logrus.TraceLevel:
+		return colorCodeTrace
+
+	default:
+		return colorCodeInfo
+	}
+}

global/net.go

@@ -1,310 +1,27 @@
 package global
 
 import (
-	"bufio"
-	"compress/gzip"
 	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"os"
-	"strconv"
-	"strings"
-	"sync"
-
-	"github.com/pkg/errors"
 
 	"github.com/tidwall/gjson"
 
-	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/internal/download"
 )
 
-var (
-	client = &http.Client{
-		Transport: &http.Transport{
-			Proxy: func(request *http.Request) (u *url.URL, e error) {
-				if base.Proxy == "" {
-					return http.ProxyFromEnvironment(request)
-				}
-				return url.Parse(base.Proxy)
-			},
-			ForceAttemptHTTP2:   true,
-			MaxConnsPerHost:     0,
-			MaxIdleConns:        0,
-			MaxIdleConnsPerHost: 999,
-		},
-	}
-
-	// ErrOverSize 响应主体过大时返回此错误
-	ErrOverSize = errors.New("oversize")
-
-	// UserAgent HTTP请求时使用的UA
-	UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.66"
-)
-
-// GetBytes 对给定URL发送Get请求，返回响应主体
-func GetBytes(url string) ([]byte, error) {
-	reader, err := HTTPGetReadCloser(url)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		_ = reader.Close()
-	}()
-	return ioutil.ReadAll(reader)
-}
-
-// DownloadFile 将给定URL对应的文件下载至给定Path
-func DownloadFile(url, path string, limit int64, headers map[string]string) error {
-	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0o666)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return err
-	}
-
-	for k, v := range headers {
-		req.Header.Set(k, v)
-	}
-
-	if _, ok := headers["User-Agent"]; !ok {
-		req.Header["User-Agent"] = []string{UserAgent}
-	}
-	resp, err := client.Do(req)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-	if limit > 0 && resp.ContentLength > limit {
-		return ErrOverSize
-	}
-	_, err = io.Copy(file, resp.Body)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// DownloadFileMultiThreading 使用threadCount个线程将给定URL对应的文件下载至给定Path
-func DownloadFileMultiThreading(url, path string, limit int64, threadCount int, headers map[string]string) error {
-	if threadCount < 2 {
-		return DownloadFile(url, path, limit, headers)
-	}
-	type BlockMetaData struct {
-		BeginOffset    int64
-		EndOffset      int64
-		DownloadedSize int64
-	}
-	var blocks []*BlockMetaData
-	var contentLength int64
-	errUnsupportedMultiThreading := errors.New("unsupported multi-threading")
-	// 初始化分块或直接下载
-	initOrDownload := func() error {
-		copyStream := func(s io.ReadCloser) error {
-			file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0o666)
-			if err != nil {
-				return err
-			}
-			defer file.Close()
-			if _, err = io.Copy(file, s); err != nil {
-				return err
-			}
-			return errUnsupportedMultiThreading
-		}
-		req, err := http.NewRequest("GET", url, nil)
-		if err != nil {
-			return err
-		}
-
-		for k, v := range headers {
-			req.Header.Set(k, v)
-		}
-		if _, ok := headers["User-Agent"]; !ok {
-			req.Header["User-Agent"] = []string{UserAgent}
-		}
-		req.Header.Set("range", "bytes=0-")
-		resp, err := client.Do(req)
-		if err != nil {
-			return err
-		}
-		defer resp.Body.Close()
-		if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-			return errors.New("response status unsuccessful: " + strconv.FormatInt(int64(resp.StatusCode), 10))
-		}
-		if resp.StatusCode == 200 {
-			if limit > 0 && resp.ContentLength > limit {
-				return ErrOverSize
-			}
-			return copyStream(resp.Body)
-		}
-		if resp.StatusCode == 206 {
-			contentLength = resp.ContentLength
-			if limit > 0 && resp.ContentLength > limit {
-				return ErrOverSize
-			}
-			blockSize := func() int64 {
-				if contentLength > 1024*1024 {
-					return (contentLength / int64(threadCount)) - 10
-				}
-				return contentLength
-			}()
-			if blockSize == contentLength {
-				return copyStream(resp.Body)
-			}
-			var tmp int64
-			for tmp+blockSize < contentLength {
-				blocks = append(blocks, &BlockMetaData{
-					BeginOffset: tmp,
-					EndOffset:   tmp + blockSize - 1,
-				})
-				tmp += blockSize
-			}
-			blocks = append(blocks, &BlockMetaData{
-				BeginOffset: tmp,
-				EndOffset:   contentLength - 1,
-			})
-			return nil
-		}
-		return errors.New("unknown status code")
-	}
-	// 下载分块
-	downloadBlock := func(block *BlockMetaData) error {
-		req, _ := http.NewRequest("GET", url, nil)
-		file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0o666)
-		if err != nil {
-			return err
-		}
-		defer file.Close()
-		_, _ = file.Seek(block.BeginOffset, io.SeekStart)
-		writer := bufio.NewWriter(file)
-		defer writer.Flush()
-
-		for k, v := range headers {
-			req.Header.Set(k, v)
-		}
-
-		if _, ok := headers["User-Agent"]; ok {
-			req.Header["User-Agent"] = []string{UserAgent}
-		}
-		req.Header.Set("range", "bytes="+strconv.FormatInt(block.BeginOffset, 10)+"-"+strconv.FormatInt(block.EndOffset, 10))
-		resp, err := client.Do(req)
-		if err != nil {
-			return err
-		}
-		defer resp.Body.Close()
-		if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-			return errors.New("response status unsuccessful: " + strconv.FormatInt(int64(resp.StatusCode), 10))
-		}
-		buffer := make([]byte, 1024)
-		i, err := resp.Body.Read(buffer)
-		for {
-			if err != nil && err != io.EOF {
-				return err
-			}
-			i64 := int64(len(buffer[:i]))
-			needSize := block.EndOffset + 1 - block.BeginOffset
-			if i64 > needSize {
-				i64 = needSize
-				err = io.EOF
-			}
-			_, e := writer.Write(buffer[:i64])
-			if e != nil {
-				return e
-			}
-			block.BeginOffset += i64
-			block.DownloadedSize += i64
-			if err == io.EOF || block.BeginOffset > block.EndOffset {
-				break
-			}
-			i, err = resp.Body.Read(buffer)
-		}
-		return nil
-	}
-
-	if err := initOrDownload(); err != nil {
-		if err == errUnsupportedMultiThreading {
-			return nil
-		}
-		return err
-	}
-	wg := sync.WaitGroup{}
-	wg.Add(len(blocks))
-	var lastErr error
-	for i := range blocks {
-		go func(b *BlockMetaData) {
-			defer wg.Done()
-			if err := downloadBlock(b); err != nil {
-				lastErr = err
-			}
-		}(blocks[i])
-	}
-	wg.Wait()
-	return lastErr
-}
-
 // QQMusicSongInfo 通过给定id在QQ音乐上查找曲目信息
 func QQMusicSongInfo(id string) (gjson.Result, error) {
-	d, err := GetBytes(`https://u.y.qq.com/cgi-bin/musicu.fcg?format=json&inCharset=utf8&outCharset=utf-8&notice=0&platform=yqq.json&needNewCode=0&data={%22comm%22:{%22ct%22:24,%22cv%22:0},%22songinfo%22:{%22method%22:%22get_song_detail_yqq%22,%22param%22:{%22song_type%22:0,%22song_mid%22:%22%22,%22song_id%22:` + id + `},%22module%22:%22music.pf_song_detail_svr%22}}`)
+	d, err := download.Request{URL: `https://u.y.qq.com/cgi-bin/musicu.fcg?format=json&inCharset=utf8&outCharset=utf-8&notice=0&platform=yqq.json&needNewCode=0&data={%22comm%22:{%22ct%22:24,%22cv%22:0},%22songinfo%22:{%22method%22:%22get_song_detail_yqq%22,%22param%22:{%22song_type%22:0,%22song_mid%22:%22%22,%22song_id%22:` + id + `},%22module%22:%22music.pf_song_detail_svr%22}}`}.JSON()
 	if err != nil {
 		return gjson.Result{}, err
 	}
-	return gjson.ParseBytes(d).Get("songinfo.data"), nil
+	return d.Get("songinfo.data"), nil
 }
 
 // NeteaseMusicSongInfo 通过给定id在wdd音乐上查找曲目信息
 func NeteaseMusicSongInfo(id string) (gjson.Result, error) {
-	d, err := GetBytes(fmt.Sprintf("http://music.163.com/api/song/detail/?id=%s&ids=%%5B%s%%5D", id, id))
+	d, err := download.Request{URL: fmt.Sprintf("http://music.163.com/api/song/detail/?id=%s&ids=%%5B%s%%5D", id, id)}.JSON()
 	if err != nil {
 		return gjson.Result{}, err
 	}
-	return gjson.ParseBytes(d).Get("songs.0"), nil
-}
-
-type gzipCloser struct {
-	f io.Closer
-	r *gzip.Reader
-}
-
-// NewGzipReadCloser 从 io.ReadCloser 创建 gunzip io.ReadCloser
-func NewGzipReadCloser(reader io.ReadCloser) (io.ReadCloser, error) {
-	gzipReader, err := gzip.NewReader(reader)
-	if err != nil {
-		return nil, err
-	}
-	return &gzipCloser{
-		f: reader,
-		r: gzipReader,
-	}, nil
-}
-
-// Read impls io.Reader
-func (g *gzipCloser) Read(p []byte) (n int, err error) {
-	return g.r.Read(p)
-}
-
-// Close impls io.Closer
-func (g *gzipCloser) Close() error {
-	_ = g.f.Close()
-	return g.r.Close()
-}
-
-// HTTPGetReadCloser 从 Http url 获取 io.ReadCloser
-func HTTPGetReadCloser(url string) (io.ReadCloser, error) {
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, err
-	}
-	req.Header["User-Agent"] = []string{UserAgent}
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	if strings.Contains(resp.Header.Get("Content-Encoding"), "gzip") {
-		return NewGzipReadCloser(resp.Body)
-	}
-	return resp.Body, err
+	return d.Get("songs.0"), nil
 }

global/param.go

@@ -8,7 +8,7 @@ import (
 )
 
 // MSG 消息Map
-type MSG map[string]interface{}
+type MSG = map[string]interface{}
 
 // VersionNameCompare 检查版本名是否需要更新, 仅适用于 go-cqhttp 的版本命名规则
 //

global/quote.go

@@ -0,0 +1,146 @@
+package global
+
+import (
+	"strconv"
+	"unicode/utf8"
+)
+
+const (
+	lowerhex = "0123456789abcdef"
+	upperhex = "0123456789ABCDEF"
+)
+
+// Quote returns a double-quoted Go string literal representing s. The
+// returned string uses Go escape sequences (\t, \n, \xFF, \u0100) for
+// control characters and non-printable characters as defined by
+// IsPrint.
+func Quote(s string) string {
+	return quoteWith(s, '"', false, false)
+}
+
+func quoteWith(s string, quote byte, asciiOnly, graphicOnly bool) string {
+	return string(appendQuotedWith(make([]byte, 0, 3*len(s)/2), s, quote, asciiOnly, graphicOnly))
+}
+
+func appendQuotedWith(buf []byte, s string, quote byte, asciiOnly, graphicOnly bool) []byte {
+	// Often called with big strings, so preallocate. If there's quoting,
+	// this is conservative but still helps a lot.
+	if cap(buf)-len(buf) < len(s) {
+		nBuf := make([]byte, len(buf), len(buf)+1+len(s)+1)
+		copy(nBuf, buf)
+		buf = nBuf
+	}
+	buf = append(buf, quote)
+	for width := 0; len(s) > 0; s = s[width:] {
+		r := rune(s[0])
+		width = 1
+		if r >= utf8.RuneSelf {
+			r, width = utf8.DecodeRuneInString(s)
+		}
+		if width == 1 && r == utf8.RuneError {
+			buf = append(buf, `\x`...)
+			buf = append(buf, lowerhex[s[0]>>4])
+			buf = append(buf, lowerhex[s[0]&0xF])
+			continue
+		}
+		buf = appendEscapedRune(buf, r, quote, asciiOnly, graphicOnly)
+	}
+	buf = append(buf, quote)
+	return buf
+}
+func appendEscapedRune(buf []byte, r rune, quote byte, asciiOnly, graphicOnly bool) []byte {
+	var runeTmp [utf8.UTFMax]byte
+	if r == rune(quote) || r == '\\' { // always backslashed
+		buf = append(buf, '\\')
+		buf = append(buf, byte(r))
+		return buf
+	}
+	if asciiOnly {
+		if r < utf8.RuneSelf && strconv.IsPrint(r) {
+			buf = append(buf, byte(r))
+			return buf
+		}
+	} else if strconv.IsPrint(r) || graphicOnly && isInGraphicList(r) {
+		n := utf8.EncodeRune(runeTmp[:], r)
+		buf = append(buf, runeTmp[:n]...)
+		return buf
+	}
+	switch r {
+	case '\a':
+		buf = append(buf, `\a`...)
+	case '\b':
+		buf = append(buf, `\b`...)
+	case '\f':
+		buf = append(buf, `\f`...)
+	case '\n':
+		buf = append(buf, `\n`...)
+	case '\r':
+		buf = append(buf, `\r`...)
+	case '\t':
+		buf = append(buf, `\t`...)
+	case '\v':
+		buf = append(buf, `\v`...)
+	default:
+		switch {
+		case !utf8.ValidRune(r):
+			r = 0xFFFD
+			fallthrough
+		case r < 0x10000:
+			buf = append(buf, `\u`...)
+			for s := 12; s >= 0; s -= 4 {
+				buf = append(buf, lowerhex[r>>uint(s)&0xF])
+			}
+		default:
+			buf = append(buf, `\U`...)
+			for s := 28; s >= 0; s -= 4 {
+				buf = append(buf, lowerhex[r>>uint(s)&0xF])
+			}
+		}
+	}
+	return buf
+}
+
+func isInGraphicList(r rune) bool {
+	// We know r must fit in 16 bits - see makeisprint.go.
+	if r > 0xFFFF {
+		return false
+	}
+	rr := uint16(r)
+	i := bsearch16(isGraphic, rr)
+	return i < len(isGraphic) && rr == isGraphic[i]
+}
+
+// bsearch16 returns the smallest i such that a[i] >= x.
+// If there is no such i, bsearch16 returns len(a).
+func bsearch16(a []uint16, x uint16) int {
+	i, j := 0, len(a)
+	for i < j {
+		h := i + (j-i)>>1
+		if a[h] < x {
+			i = h + 1
+		} else {
+			j = h
+		}
+	}
+	return i
+}
+
+// isGraphic lists the graphic runes not matched by IsPrint.
+var isGraphic = []uint16{
+	0x00a0,
+	0x1680,
+	0x2000,
+	0x2001,
+	0x2002,
+	0x2003,
+	0x2004,
+	0x2005,
+	0x2006,
+	0x2007,
+	0x2008,
+	0x2009,
+	0x200a,
+	0x202f,
+	0x205f,
+	0x3000,
+}

global/terminal/double_click_windows.go

@@ -5,15 +5,17 @@ package terminal
 
 import (
 	"os"
-	"syscall"
+	"path/filepath"
 	"unsafe"
 
+	"golang.org/x/sys/windows"
+
 	"github.com/pkg/errors"
 )
 
 // RunningByDoubleClick 检查是否通过双击直接运行
 func RunningByDoubleClick() bool {
-	kernel32 := syscall.NewLazyDLL("kernel32.dll")
+	kernel32 := windows.NewLazySystemDLL("kernel32.dll")
 	lp := kernel32.NewProc("GetConsoleProcessList")
 	if lp != nil {
 		var ids [2]uint32
@@ -28,7 +30,8 @@ func RunningByDoubleClick() bool {
 
 // NoMoreDoubleClick 提示用户不要双击运行，并生成安全启动脚本
 func NoMoreDoubleClick() error {
-	r := boxW(0, "请勿通过双击直接运行本程序, 这将导致一些非预料的后果.\n请在shell中运行./go-cqhttp.exe\n点击确认将释出安全启动脚本，点击取消则关闭程序", "警告", 0x00000030|0x00000001)
+	toHighDPI()
+	r := boxW(getConsoleWindows(), "请勿通过双击直接运行本程序, 这将导致一些非预料的后果.\n请在shell中运行./go-cqhttp.exe\n点击确认将释出安全启动脚本，点击取消则关闭程序", "警告", 0x00000030|0x00000001)
 	if r == 2 {
 		return nil
 	}
@@ -44,7 +47,10 @@ func NoMoreDoubleClick() error {
 		return errors.Errorf("打开go-cqhttp.bat失败: %v", err)
 	}
 	_ = f.Truncate(0)
-	_, err = f.WriteString("%Created by go-cqhttp. DO NOT EDIT ME!%\nstart cmd /K go-cqhttp.exe")
+
+	ex, _ := os.Executable()
+	exPath := filepath.Base(ex)
+	_, err = f.WriteString("%Created by go-cqhttp. DO NOT EDIT ME!%\nstart cmd /K \"" + exPath + "\"")
 	if err != nil {
 		return errors.Errorf("写入go-cqhttp.bat失败: %v", err)
 	}
@@ -55,9 +61,10 @@ func NoMoreDoubleClick() error {
 
 // BoxW of Win32 API. Check https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-messageboxw for more detail.
 func boxW(hwnd uintptr, caption, title string, flags uint) int {
-	captionPtr, _ := syscall.UTF16PtrFromString(caption)
-	titlePtr, _ := syscall.UTF16PtrFromString(title)
-	ret, _, _ := syscall.NewLazyDLL("user32.dll").NewProc("MessageBoxW").Call(
+	captionPtr, _ := windows.UTF16PtrFromString(caption)
+	titlePtr, _ := windows.UTF16PtrFromString(title)
+	u32 := windows.NewLazySystemDLL("user32.dll")
+	ret, _, _ := u32.NewProc("MessageBoxW").Call(
 		hwnd,
 		uintptr(unsafe.Pointer(captionPtr)),
 		uintptr(unsafe.Pointer(titlePtr)),
@@ -65,3 +72,23 @@ func boxW(hwnd uintptr, caption, title string, flags uint) int {
 
 	return int(ret)
 }
+
+// GetConsoleWindows retrieves the window handle used by the console associated with the calling process.
+func getConsoleWindows() (hWnd uintptr) {
+	hWnd, _, _ = windows.NewLazySystemDLL("kernel32.dll").NewProc("GetConsoleWindow").Call()
+	return
+}
+
+// toHighDPI tries to raise DPI awareness context to DPI_AWARENESS_CONTEXT_UNAWARE_GDISCALED
+func toHighDPI() {
+	systemAware := ^uintptr(2) + 1
+	unawareGDIScaled := ^uintptr(5) + 1
+	u32 := windows.NewLazySystemDLL("user32.dll")
+	proc := u32.NewProc("SetThreadDpiAwarenessContext")
+	if proc.Find() != nil {
+		return
+	}
+	for i := unawareGDIScaled; i <= systemAware; i++ {
+		_, _, _ = u32.NewProc("SetThreadDpiAwarenessContext").Call(i)
+	}
+}

go.mod

@@ -1,62 +1,69 @@
 module github.com/Mrs4s/go-cqhttp
 
-go 1.17
-
-replace github.com/willf/bitset v1.2.0 => github.com/bits-and-blooms/bitset v1.2.0
+go 1.19
 
 require (
-	github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f
-	github.com/Microsoft/go-winio v0.5.0
-	github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82
-	github.com/dustin/go-humanize v1.0.0
+	github.com/FloatTech/sqlite v1.5.7
+	github.com/Microsoft/go-winio v0.6.0
+	github.com/Mrs4s/MiraiGo v0.0.0-20221202060717-4658474c60dd
+	github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e
+	github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc
+	github.com/fumiama/go-base16384 v1.6.1
 	github.com/fumiama/go-hide-param v0.1.4
-	github.com/gabriel-vasile/mimetype v1.3.1
-	github.com/gorilla/websocket v1.4.2
-	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
+	github.com/mattn/go-colorable v0.1.13
 	github.com/pkg/errors v0.9.1
-	github.com/segmentio/asm v1.0.0
-	github.com/sirupsen/logrus v1.8.1
-	github.com/stretchr/testify v1.7.0
-	github.com/syndtr/goleveldb v1.0.0
-	github.com/tidwall/gjson v1.8.1
-	github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2
+	github.com/segmentio/asm v1.2.0
+	github.com/sirupsen/logrus v1.9.0
+	github.com/stretchr/testify v1.8.1
+	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
+	github.com/tidwall/gjson v1.14.4
 	github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60
-	go.mongodb.org/mongo-driver v1.7.2
-	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
-	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
-	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+	go.mongodb.org/mongo-driver v1.11.0
+	golang.org/x/crypto v0.3.0
+	golang.org/x/sys v0.2.0
+	golang.org/x/term v0.2.0
+	golang.org/x/time v0.2.0
+	gopkg.ilharper.com/x/isatty v1.1.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
+	github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b // indirect
+	github.com/RomiChan/protobuf v0.0.0-20220624030127-3310cba9dbc0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-stack/stack v1.8.0 // indirect
-	github.com/golang/snappy v0.0.1 // indirect
-	github.com/google/uuid v1.1.1 // indirect
-	github.com/jonboulle/clockwork v0.2.2 // indirect
-	github.com/klauspost/compress v1.9.5 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.6 // indirect
-	github.com/lestrrat-go/strftime v1.0.5 // indirect
-	github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4 // indirect
-	github.com/mattn/go-colorable v0.1.8 // indirect
-	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/fumiama/imgsz v0.0.2 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/jonboulle/clockwork v0.3.0 // indirect
+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
+	github.com/klauspost/compress v1.13.6 // indirect
+	github.com/lestrrat-go/strftime v1.0.6 // indirect
+	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
+	github.com/pierrec/lz4/v4 v4.1.15 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
-	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
-	github.com/tidwall/match v1.0.3 // indirect
-	github.com/tidwall/pretty v1.1.0 // indirect
-	github.com/willf/bitset v1.2.0 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/scram v1.0.2 // indirect
-	github.com/xdg-go/stringprep v1.0.2 // indirect
+	github.com/xdg-go/scram v1.1.1 // indirect
+	github.com/xdg-go/stringprep v1.0.3 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	golang.org/x/net v0.0.0-20210505024714-0287a6fb4125 // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
-	golang.org/x/text v0.3.6 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
-	modernc.org/libc v1.8.1 // indirect
-	modernc.org/mathutil v1.2.2 // indirect
-	modernc.org/memory v1.0.4 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
+	golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
+	golang.org/x/text v0.4.0 // indirect
+	golang.org/x/tools v0.1.12 // indirect
+	lukechampine.com/uint128 v1.2.0 // indirect
+	modernc.org/cc/v3 v3.40.0 // indirect
+	modernc.org/ccgo/v3 v3.16.13 // indirect
+	modernc.org/libc v1.21.5 // indirect
+	modernc.org/mathutil v1.5.0 // indirect
+	modernc.org/memory v1.4.0 // indirect
+	modernc.org/opt v0.1.3 // indirect
+	modernc.org/sqlite v1.20.0 // indirect
+	modernc.org/strutil v1.1.3 // indirect
+	modernc.org/token v1.0.1 // indirect
 )
+
+replace github.com/remyoudompheng/bigfft => github.com/fumiama/bigfft v0.0.0-20211011143303-6e0bfa3c836b

go.sum

@@ -1,98 +1,59 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f h1:2dk3eOnYllh+wUOuDhOoC2vUVoJF/5z478ryJ+wzEII=
-github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/go.mod h1:4a58ifQTEe2uwwsaqbh3i2un5/CBPg+At/qHpt18Tmk=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXGjwU=
-github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
-github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82 h1:VAav2Z5n41cp2bjskooPXAg9W39qQeEEj3FmYlnS3+E=
-github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82/go.mod h1:EpB6wQ+iaIqLRxVrs6si2J3XGv6wHXMrRXNUnJFaoww=
-github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjLyS07ChA=
-github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/FloatTech/sqlite v1.5.7 h1:Bvo4LSojcZ6dVtbHrkqvt6z4v8e+sj0G5PSUIvdawsk=
+github.com/FloatTech/sqlite v1.5.7/go.mod h1:zFbHzRfB+CJ+VidfjuVbrcin3DAz283F7hF1hIeHzpY=
+github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJGLDNIdRX3BI546D3O7k7vrVueZw=
+github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs=
+github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg=
+github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
+github.com/Mrs4s/MiraiGo v0.0.0-20221202060717-4658474c60dd h1:rzAbPc++5CJ1VZDjq/eORXOWMMGsDN3DMAPMXfI7Fvs=
+github.com/Mrs4s/MiraiGo v0.0.0-20221202060717-4658474c60dd/go.mod h1:lecSP26qedhinCceWn1x02dLDxGotH5nTFlpIMilmVM=
+github.com/RomiChan/protobuf v0.0.0-20220624030127-3310cba9dbc0 h1:GEwcB4dL9vc4veW1fLNt0Fby3wspVflAn5v9/HbUwDM=
+github.com/RomiChan/protobuf v0.0.0-20220624030127-3310cba9dbc0/go.mod h1:2Ie+hdBFQpQFDHfeklgxoFmQRCE7O+KwFpISeXq7OwA=
+github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e h1:wR3MXQ3VbUlPKOOUwLOYgh/QaJThBTYtsl673O3lqSA=
+github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e/go.mod h1:vD7Ra3Q9onRtojoY5sMCLQ7JBgjUsrXDnDKyFxqpf9w=
+github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc h1:AAx50/fb/xS4lvsdQg+bFbGvqSDhyV1MF+p2PLCamZ0=
+github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc/go.mod h1:OMmITAib6POA37xCichWM0aRnoVpSMZO1rB/G01wrr0=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/fumiama/bigfft v0.0.0-20211011143303-6e0bfa3c836b h1:Zt3pFQditAdWTHCOVkiloc9ZauBoWrb37guFV4iIRvE=
+github.com/fumiama/bigfft v0.0.0-20211011143303-6e0bfa3c836b/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/fumiama/go-base16384 v1.6.1 h1:4yb4JgmBJDnQtq3XGXXdLrVwEnRpjhMUt4eAcsNeA30=
+github.com/fumiama/go-base16384 v1.6.1/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
 github.com/fumiama/go-hide-param v0.1.4 h1:y7TRTzZMdCH9GOXnIzU3B+1BSkcmvejVGmGsz4t0DGU=
 github.com/fumiama/go-hide-param v0.1.4/go.mod h1:vJkQlJIEI56nIyp7tCQu1/2QOyKtZpudsnJkGk9U1aY=
-github.com/gabriel-vasile/mimetype v1.3.1 h1:qevA6c2MtE1RorlScnixeG0VA1H4xrXyhyX3oWBynNQ=
-github.com/gabriel-vasile/mimetype v1.3.1/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
-github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
-github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg=
-github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs=
-github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
-github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI=
-github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk=
-github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28=
-github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo=
-github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk=
-github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw=
-github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360=
-github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg=
-github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE=
-github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8=
-github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
-github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
-github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
-github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4=
-github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
-github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
-github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/fumiama/imgsz v0.0.2 h1:fAkC0FnIscdKOXwAxlyw3EUba5NzxZdSxGaq3Uyfxak=
+github.com/fumiama/imgsz v0.0.2/go.mod h1:dR71mI3I2O5u6+PCpd47M9TZptzP+39tRBcbdIkoqM4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
-github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
-github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ=
-github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
-github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
-github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
-github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
-github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
-github.com/klauspost/compress v1.9.5 h1:U+CaK85mrNNb4k8BNOfgJtJ/gr6kswUCFj6miSzVC6M=
-github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/cpuid/v2 v2.0.6 h1:dQ5ueTiftKxp0gyjKSx5+8BtPWkyQbd95m8Gys/RarI=
-github.com/klauspost/cpuid/v2 v2.0.6/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/jonboulle/clockwork v0.3.0 h1:9BSCMi8C+0qdApAp4auwX0RkLGUjs956h0EkuQymUhg=
+github.com/jonboulle/clockwork v0.3.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
+github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
+github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -100,183 +61,166 @@ github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2t
 github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4=
 github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
-github.com/lestrrat-go/strftime v1.0.5 h1:A7H3tT8DhTz8u65w+JRpiBxM4dINQhUXAZnhBa2xeOE=
-github.com/lestrrat-go/strftime v1.0.5/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
-github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
-github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
-github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4 h1:u9jwvcKbQpghIXgNl/EOL8hzhAFXh4ePrEP493W3tNA=
-github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4/go.mod h1:kcRFpEzolcEklV6rD7W95mG49/sbdX/PlFmd7ni3RvA=
-github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
-github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
+github.com/lestrrat-go/strftime v1.0.6 h1:CFGsDEt1pOpFNU+TJB0nhz9jl+K0hZSLE205AhTIGQQ=
+github.com/lestrrat-go/strftime v1.0.6/go.mod h1:f7jQKgV5nnJpYgdEasS+/y7EsTb8ykN2z68n3TtcTaw=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
+github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe h1:iruDEfMl2E6fbMZ9s0scYfZQ84/6SPL6zC8ACM2oIL0=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
+github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
+github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0=
+github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/segmentio/asm v1.0.0 h1:GMF7/2eLkte13LERSOmPI766AJXJDRlsqqiN8T7Mfmk=
-github.com/segmentio/asm v1.0.0/go.mod h1:4EUJGaKsB8ImLUwOGORVsNd9vTRDeh44JGsY4aKp5I4=
-github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0=
-github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod h1:XV66xRDqSt+GTGFMVlhk3ULuV0y9ZmzeVGR4mloJI3M=
-github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
+github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
-github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
-github.com/tidwall/gjson v1.8.1 h1:8j5EE9Hrh3l9Od1OIEDAb7IpezNA20UdRngNAj5N0WU=
-github.com/tidwall/gjson v1.8.1/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
-github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
-github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
+github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
+github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM=
+github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
+github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tidwall/pretty v1.1.0 h1:K3hMW5epkdAVwibsQEfR/7Zj0Qgt4DxtNumTq/VloO8=
-github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2 h1:BWVtt2VBY+lmVDu9MGKqLGKl04B+iRHcrW1Ptyi/8tg=
-github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2/go.mod h1:lPnW9HVS0vJdeYyQtOvIvlXgZPNhUAhwz+z5r8AJk0Y=
+github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60 h1:lRKf10iIOW0VsH5WDF621ihzR+R2wEBZVtNRHuLLCb4=
 github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60/go.mod h1:ecFKZPX81BaB70I6ruUgEwYcDOtuNgJGnjdK+MIl5ko=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
-github.com/xdg-go/scram v1.0.2 h1:akYIkZ28e6A96dkWNJQu3nmCzH3YfwMPQExUYDaRv7w=
-github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
-github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc=
-github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
+github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E=
+github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
+github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs=
+github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
-go.mongodb.org/mongo-driver v1.7.2 h1:pFttQyIiJUHEn50YfZgC9ECjITMT44oiN36uArf/OFg=
-go.mongodb.org/mongo-driver v1.7.2/go.mod h1:Q4oFMbo1+MSNqICAdYMlC/zSTrwCogR4R8NzkI+yfU8=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+go.mongodb.org/mongo-driver v1.11.0 h1:FZKhBSTydeuffHj9CBjXlR8vQLee1cQyTWYPA6/tqiE=
+go.mongodb.org/mongo-driver v1.11.0/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
-golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A=
+golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210505024714-0287a6fb4125 h1:Ugb8sMTWuWRC3+sz5WeN/4kejDx9BvIwnPUiJBjJE+8=
-golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc=
+golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE=
-golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM=
+golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs=
-golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/time v0.2.0 h1:52I/1L54xyEQAYdtcSuxtiT84KGYTBGXwayxmIpNJhE=
+golang.org/x/time v0.2.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+gopkg.ilharper.com/x/isatty v1.1.0 h1:slOK6hP9/y9mJWyCInMwnT432NExfWyYV2SsebdYOCY=
+gopkg.ilharper.com/x/isatty v1.1.0/go.mod h1:ofpv77Td5qQO6R1dmDd3oNt8TZdRo+l5gYAMxopRyS0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-modernc.org/libc v1.8.1 h1:y9oPIhwcaFXxX7kMp6Qb2ZLKzr0mDkikWN3CV5GS63o=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=
+lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
+modernc.org/cc/v3 v3.40.0 h1:P3g79IUS/93SYhtoeaHW+kRCIrYaxJ27MFPv+7kaTOw=
+modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0=
+modernc.org/ccgo/v3 v3.16.13 h1:Mkgdzl46i5F/CNR/Kj80Ri59hC8TKAhZrYSaqvkwzUw=
+modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY=
+modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk=
+modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
 modernc.org/libc v1.8.1/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
+modernc.org/libc v1.21.5 h1:xBkU9fnHV+hvZuPSRszN0AXDG4M7nwPLwTWwkYcvLCI=
+modernc.org/libc v1.21.5/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI=
 modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/mathutil v1.2.2 h1:+yFk8hBprV+4c0U9GjFtL+dV3N8hOJ8JCituQcMShFY=
 modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/memory v1.0.4 h1:utMBrFcpnQDdNsmM6asmyH/FM9TqLPS7XF7otpJmrwM=
+modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
+modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
+modernc.org/memory v1.4.0 h1:crykUfNSnMAXaOJnnxcSzbUGMqkLWjklJKkBK2nwZwk=
+modernc.org/memory v1.4.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
+modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
+modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
+modernc.org/sqlite v1.20.0 h1:80zmD3BGkm8BZ5fUi/4lwJQHiO3GXgIUvZRXpoIfROY=
+modernc.org/sqlite v1.20.0/go.mod h1:EsYz8rfOvLCiYTy5ZFsOYzoCcRMu98YYkwAcCw5YIYw=
+modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY=
+modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
+modernc.org/tcl v1.15.0 h1:oY+JeD11qVVSgVvodMJsu7Edf8tr5E/7tuhF5cNYz34=
+modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg=
+modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
+modernc.org/z v1.7.0 h1:xkDw/KepgEjeizO2sNco+hqYkU12taxQFqPEmgm1GWE=

internal/base/feature.go

@@ -1,8 +1,6 @@
 package base
 
 import (
-	"io"
-
 	"github.com/pkg/errors"
 )
 
@@ -19,19 +17,3 @@ func encodeSilk(_ []byte, _ string) ([]byte, error) {
 func resampleSilk(data []byte) []byte {
 	return data
 }
-
-// Mime scan feature
-var (
-	IsLawfulImage = nocheck // 检查图片MIME
-	IsLawfulAudio = nocheck // 检查音频MIME
-)
-
-func nocheck(_ io.ReadSeeker) (bool, string) {
-	return true, ""
-}
-
-// todo: enable in v1.1.0
-// onebot v12 feature
-const (
-	AcceptOneBotV12HTTPEndPoint = false
-)

internal/base/flag.go

@@ -5,10 +5,6 @@ import (
 	"flag"
 	"fmt"
 	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"strings"
 	"time"
 
 	log "github.com/sirupsen/logrus"
@@ -37,7 +33,9 @@ var (
 	ReportSelfMessage   bool // 是否上报自身消息
 	UseSSOAddress       bool // 是否使用服务器下发的新地址进行重连
 	LogForceNew         bool // 是否在每次启动时强制创建全新的文件储存日志
+	LogColorful         bool // 是否启用日志颜色
 	FastStart           bool // 是否为快速启动
+	AllowTempSession    bool // 是否允许发送临时会话信息
 
 	PostFormat        string                 // 上报格式 string or array
 	Proxy             string                 // 存储 proxy_rewrite,用于设置代理
@@ -55,13 +53,12 @@ var (
 
 // Parse parse flags
 func Parse() {
-	wd, _ := os.Getwd()
-	dc := path.Join(wd, "config.yml")
-	flag.StringVar(&LittleC, "c", dc, "configuration filename")
+	flag.StringVar(&LittleC, "c", "config.yml", "configuration filename")
 	flag.BoolVar(&LittleD, "d", false, "running as a daemon")
 	flag.BoolVar(&LittleH, "h", false, "this Help")
 	flag.StringVar(&LittleWD, "w", "", "cover the working directory")
 	d := flag.Bool("D", false, "debug mode")
+	flag.BoolVar(&FastStart, "faststart", false, "skip waiting 5 seconds")
 	flag.Parse()
 
 	if *d {
@@ -84,6 +81,7 @@ func Init() {
 		SkipMimeScan = conf.Message.SkipMimeScan
 		ReportSelfMessage = conf.Message.ReportSelfMessage
 		UseSSOAddress = conf.Account.UseSSOAddress
+		AllowTempSession = conf.Account.AllowTempSession
 	}
 	{ // others
 		Proxy = conf.Message.ProxyRewrite
@@ -92,6 +90,7 @@ func Init() {
 		Servers = conf.Servers
 		Database = conf.Database
 		LogLevel = conf.Output.LogLevel
+		LogColorful = conf.Output.LogColorful == nil || *conf.Output.LogColorful
 		if conf.Message.PostFormat != "string" && conf.Message.PostFormat != "array" {
 			log.Warnf("post-format 配置错误, 将自动使用 string")
 			PostFormat = "string"
@@ -122,27 +121,3 @@ Options:
 	flag.PrintDefaults()
 	os.Exit(0)
 }
-
-// ResetWorkingDir 重设工作路径
-func ResetWorkingDir() {
-	wd := LittleWD
-	args := make([]string, 0, len(os.Args))
-	for i := 1; i < len(os.Args); i++ {
-		if os.Args[i] == "-w" {
-			i++ // skip value field
-		} else if !strings.HasPrefix(os.Args[i], "-w") {
-			args = append(args, os.Args[i])
-		}
-	}
-	p, _ := filepath.Abs(os.Args[0])
-	proc := exec.Command(p, args...)
-	proc.Stdin = os.Stdin
-	proc.Stdout = os.Stdout
-	proc.Stderr = os.Stderr
-	proc.Dir = wd
-	err := proc.Run()
-	if err != nil {
-		panic(err)
-	}
-	os.Exit(0)
-}

internal/btree/btree.go

@@ -1,524 +0,0 @@
-// Package btree provide a disk-based btree
-package btree
-
-import (
-	"io"
-	"math/rand"
-	"os"
-	"unsafe"
-
-	"github.com/pkg/errors"
-)
-
-const (
-	hashSize        = 16 // md5 hash
-	tableSize       = (1024 - 1) / int(unsafe.Sizeof(item{}))
-	cacheSlots      = 11 // prime
-	superSize       = int(unsafe.Sizeof(super{}))
-	tableStructSize = int(unsafe.Sizeof(table{}))
-)
-
-type item struct {
-	hash   [hashSize]byte
-	offset int64
-	child  int64
-}
-
-type table struct {
-	items [tableSize]item
-	size  int
-}
-
-type cache struct {
-	table  *table
-	offset int64
-}
-
-type super struct {
-	top     int64
-	freeTop int64
-	alloc   int64
-}
-
-// DB ...
-type DB struct {
-	fd      *os.File
-	top     int64
-	freeTop int64
-	alloc   int64
-	cache   [cacheSlots]cache
-
-	inAllocator  bool
-	deleteLarger bool
-	fqueue       [freeQueueLen]chunk
-	fqueueLen    int
-}
-
-func (d *DB) get(offset int64) *table {
-	assert(offset != 0)
-
-	// take from cache
-	slot := &d.cache[offset%cacheSlots]
-	if slot.offset == offset {
-		return slot.table
-	}
-
-	table := new(table)
-
-	d.fd.Seek(offset, io.SeekStart)
-	err := readTable(d.fd, table)
-	if err != nil {
-		panic(errors.Wrap(err, "btree I/O error"))
-	}
-	return table
-}
-
-func (d *DB) put(t *table, offset int64) {
-	assert(offset != 0)
-
-	// overwrite cache
-	slot := &d.cache[offset%cacheSlots]
-	slot.table = t
-	slot.offset = offset
-}
-
-func (d *DB) flush(t *table, offset int64) {
-	assert(offset != 0)
-
-	d.fd.Seek(offset, io.SeekStart)
-	err := writeTable(d.fd, t)
-	if err != nil {
-		panic(errors.Wrap(err, "btree I/O error"))
-	}
-	d.put(t, offset)
-}
-
-func (d *DB) flushSuper() {
-	d.fd.Seek(0, io.SeekStart)
-	super := super{
-		top:     d.top,
-		freeTop: d.freeTop,
-		alloc:   d.alloc,
-	}
-	err := writeSuper(d.fd, &super)
-	if err != nil {
-		panic(errors.Wrap(err, "btree I/O error"))
-	}
-}
-
-// Open opens an existed btree file
-func Open(name string) (*DB, error) {
-	btree := new(DB)
-	fd, err := os.OpenFile(name, os.O_RDWR, 0o644)
-	if err != nil {
-		return nil, errors.Wrap(err, "btree open file failed")
-	}
-	btree.fd = fd
-
-	super := super{}
-	err = readSuper(fd, &super)
-	btree.top = super.top
-	btree.freeTop = super.freeTop
-	btree.alloc = super.alloc
-	return btree, errors.Wrap(err, "btree read meta info failed")
-}
-
-// Create creates a database
-func Create(name string) (*DB, error) {
-	btree := new(DB)
-	fd, err := os.OpenFile(name, os.O_RDWR|os.O_TRUNC|os.O_CREATE, 0o644)
-	if err != nil {
-		return nil, errors.Wrap(err, "btree open file failed")
-	}
-
-	btree.fd = fd
-	btree.alloc = int64(superSize)
-	btree.flushSuper()
-	return btree, nil
-}
-
-// Close closes the database
-func (d *DB) Close() error {
-	_ = d.fd.Sync()
-	err := d.fd.Close()
-	for i := 0; i < cacheSlots; i++ {
-		d.cache[i] = cache{}
-	}
-	return errors.Wrap(err, "btree close failed")
-}
-
-func collapse(bt *DB, offset int64) int64 {
-	table := bt.get(offset)
-	if table.size != 0 {
-		/* unable to collapse */
-		bt.put(table, offset)
-		return offset
-	}
-	ret := table.items[0].child
-	bt.put(table, offset)
-
-	/*
-	 * WARNING: this is dangerous as the chunk is added to allocation tree
-	 * before the references to it are removed!
-	 */
-	bt.freeChunk(offset, int(unsafe.Sizeof(table)))
-	return ret
-}
-
-// split a table. The pivot item is stored to 'hash' and 'offset'.
-// Returns offset to the new table.
-func (d *DB) split(t *table, hash *byte, offset *int64) int64 {
-	copyhash(hash, &t.items[tableSize/2].hash[0])
-	*offset = t.items[tableSize/2].offset
-
-	ntable := new(table)
-	ntable.size = t.size - tableSize/2 - 1
-
-	t.size = tableSize / 2
-
-	copy(ntable.items[:ntable.size+1], t.items[tableSize/2+1:])
-
-	noff := d.allocChunk(tableStructSize)
-	d.flush(ntable, noff)
-
-	// make sure data is written before a reference is added to it
-	_ = d.fd.Sync()
-	return noff
-}
-
-// takeSmallest find and remove the smallest item from the given table. The key of the item
-// is stored to 'hash'. Returns offset to the item
-func (d *DB) takeSmallest(toff int64, sha1 *byte) int64 {
-	table := d.get(toff)
-	assert(table.size > 0)
-
-	var off int64
-	child := table.items[0].child
-	if child == 0 {
-		off = d.remove(table, 0, sha1)
-	} else {
-		/* recursion */
-		off = d.takeSmallest(child, sha1)
-		table.items[0].child = collapse(d, child)
-	}
-	d.flush(table, toff)
-
-	// make sure data is written before a reference is added to it
-	_ = d.fd.Sync()
-	return off
-}
-
-// takeLargest find and remove the largest item from the given table. The key of the item
-// is stored to 'hash'. Returns offset to the item
-func (d *DB) takeLargest(toff int64, hash *byte) int64 {
-	table := d.get(toff)
-	assert(table.size > 0)
-
-	var off int64
-	child := table.items[table.size].child
-	if child == 0 {
-		off = d.remove(table, table.size-1, hash)
-	} else {
-		/* recursion */
-		off = d.takeLargest(child, hash)
-		table.items[table.size].child = collapse(d, child)
-	}
-	d.flush(table, toff)
-
-	// make sure data is written before a reference is added to it
-	_ = d.fd.Sync()
-	return off
-}
-
-// remove an item in position 'i' from the given table. The key of the
-// removed item is stored to 'hash'. Returns offset to the item.
-func (d *DB) remove(t *table, i int, hash *byte) int64 {
-	assert(i < t.size)
-
-	if hash != nil {
-		copyhash(hash, &t.items[i].hash[0])
-	}
-
-	offset := t.items[i].offset
-	lc := t.items[i].child
-	rc := t.items[i+1].child
-
-	if lc != 0 && rc != 0 {
-		/* replace the removed item by taking an item from one of the
-		   child tables */
-		var noff int64
-		if rand.Int()&1 != 0 {
-			noff = d.takeLargest(lc, &t.items[i].hash[0])
-			t.items[i].child = collapse(d, lc)
-		} else {
-			noff = d.takeSmallest(rc, &t.items[i].hash[0])
-			t.items[i+1].child = collapse(d, rc)
-		}
-		t.items[i].child = noff
-	} else {
-		// memmove(&table->items[i], &table->items[i + 1],
-		//	(table->size - i) * sizeof(struct btree_item));
-		copy(t.items[i:], t.items[i+1:])
-		t.size--
-
-		if lc != 0 {
-			t.items[i].child = lc
-		} else {
-			t.items[i].child = rc
-		}
-	}
-	return offset
-}
-
-func (d *DB) insert(toff int64, hash *byte, data []byte, size int) int64 {
-	table := d.get(toff)
-	assert(table.size < tableSize-1)
-
-	left, right := 0, table.size
-	for left < right {
-		mid := (right-left)>>1 + left
-		switch cmp := cmp(hash, &table.items[mid].hash[0]); {
-		case cmp == 0:
-			// already in the table
-			ret := table.items[mid].offset
-			d.put(table, toff)
-			return ret
-		case cmp < 0:
-			right = mid
-		default:
-			left = mid + 1
-		}
-	}
-	i := left
-
-	var off, rc, ret int64
-	lc := table.items[i].child
-	if lc != 0 {
-		/* recursion */
-		ret = d.insert(lc, hash, data, size)
-
-		/* check if we need to split */
-		child := d.get(lc)
-		if child.size < tableSize-1 {
-			/* nothing to do */
-			d.put(table, toff)
-			d.put(child, lc)
-			return ret
-		}
-		/* overwrites SHA-1 */
-		rc = d.split(child, hash, &off)
-		/* flush just in case changes happened */
-		d.flush(child, lc)
-
-		// make sure data is written before a reference is added to it
-		_ = d.fd.Sync()
-	} else {
-		off = d.insertData(data, size)
-		ret = off
-	}
-
-	table.size++
-	// memmove(&table->items[i + 1], &table->items[i],
-	//  (table->size - i) * sizeof(struct btree_item));
-	copy(table.items[i+1:], table.items[i:])
-	copyhash(&table.items[i].hash[0], hash)
-	table.items[i].offset = off
-	table.items[i].child = lc
-	table.items[i+1].child = rc
-
-	d.flush(table, toff)
-	return ret
-}
-
-func (d *DB) insertData(data []byte, size int) int64 {
-	if data == nil {
-		return int64(size)
-	}
-	assert(len(data) == size)
-
-	offset := d.allocChunk(4 + len(data))
-
-	d.fd.Seek(offset, io.SeekStart)
-	err := write32(d.fd, int32(len(data)))
-	if err != nil {
-		panic(errors.Wrap(err, "btree I/O error"))
-	}
-	_, err = d.fd.Write(data)
-	if err != nil {
-		panic(errors.Wrap(err, "btree I/O error"))
-	}
-
-	// make sure data is written before a reference is added to it
-	_ = d.fd.Sync()
-	return offset
-}
-
-// delete remove an item with key 'hash' from the given table. The offset to the
-// removed item is returned.
-// Please note that 'hash' is overwritten when called inside the allocator.
-func (d *DB) delete(offset int64, hash *byte) int64 {
-	if offset == 0 {
-		return 0
-	}
-	table := d.get(offset)
-
-	left, right := 0, table.size
-	for left < right {
-		i := (right-left)>>1 + left
-		switch cmp := cmp(hash, &table.items[i].hash[0]); {
-		case cmp == 0:
-			// found
-			ret := d.remove(table, i, hash)
-			d.flush(table, offset)
-			return ret
-		case cmp < 0:
-			right = i
-		default:
-			left = i + 1
-		}
-	}
-
-	// not found - recursion
-	i := left
-	child := table.items[i].child
-	ret := d.delete(child, hash)
-	if ret != 0 {
-		table.items[i].child = collapse(d, child)
-	}
-
-	if ret == 0 && d.deleteLarger && i < table.size {
-		ret = d.remove(table, i, hash)
-	}
-	if ret != 0 {
-		/* flush just in case changes happened */
-		d.flush(table, offset)
-	} else {
-		d.put(table, offset)
-	}
-	return ret
-}
-
-func (d *DB) insertTopLevel(toff *int64, hash *byte, data []byte, size int) int64 { // nolint:unparam
-	var off, ret, rc int64
-	if *toff != 0 {
-		ret = d.insert(*toff, hash, data, size)
-
-		/* check if we need to split */
-		table := d.get(*toff)
-		if table.size < tableSize-1 {
-			/* nothing to do */
-			d.put(table, *toff)
-			return ret
-		}
-		rc = d.split(table, hash, &off)
-		d.flush(table, *toff)
-	} else {
-		off = d.insertData(data, size)
-		ret = off
-	}
-
-	/* create new top level table */
-	t := new(table)
-	t.size = 1
-	copyhash(&t.items[0].hash[0], hash)
-	t.items[0].offset = off
-	t.items[0].child = *toff
-	t.items[1].child = rc
-
-	ntoff := d.allocChunk(tableStructSize)
-	d.flush(t, ntoff)
-
-	*toff = ntoff
-
-	// make sure data is written before a reference is added to it
-	_ = d.fd.Sync()
-	return ret
-}
-
-func (d *DB) lookup(toff int64, hash *byte) int64 {
-	if toff == 0 {
-		return 0
-	}
-	table := d.get(toff)
-
-	left, right := 0, table.size
-	for left < right {
-		mid := (right-left)>>1 + left
-		switch cmp := cmp(hash, &table.items[mid].hash[0]); {
-		case cmp == 0:
-			// found
-			ret := table.items[mid].offset
-			d.put(table, toff)
-			return ret
-		case cmp < 0:
-			right = mid
-		default:
-			left = mid + 1
-		}
-	}
-
-	i := left
-	child := table.items[i].child
-	d.put(table, toff)
-	return d.lookup(child, hash)
-}
-
-// Insert a new item with key 'hash' with the contents in 'data' to the
-// database file.
-func (d *DB) Insert(chash *byte, data []byte) {
-	/* SHA-1 must be in writable memory */
-	var hash [hashSize]byte
-	copyhash(&hash[0], chash)
-
-	_ = d.insertTopLevel(&d.top, &hash[0], data, len(data))
-	freeQueued(d)
-	d.flushSuper()
-}
-
-// Get look up item with the given key 'hash' in the database file. Length of the
-// item is stored in 'len'. Returns a pointer to the contents of the item.
-// The returned pointer should be released with free() after use.
-func (d *DB) Get(hash *byte) []byte {
-	off := d.lookup(d.top, hash)
-	if off == 0 {
-		return nil
-	}
-
-	d.fd.Seek(off, io.SeekStart)
-	length, err := read32(d.fd)
-	if err != nil {
-		return nil
-	}
-	data := make([]byte, length)
-	n, err := io.ReadFull(d.fd, data)
-	if err != nil {
-		return nil
-	}
-	return data[:n]
-}
-
-// Delete remove item with the given key 'hash' from the database file.
-func (d *DB) Delete(hash *byte) error {
-	var h [hashSize]byte
-	copyhash(&h[0], hash)
-
-	off := d.delete(d.top, &h[0])
-	if off == 0 {
-		return nil // not found key
-	}
-
-	d.top = collapse(d, d.top)
-	freeQueued(d)
-	d.flushSuper()
-
-	d.fd.Seek(off, io.SeekStart)
-	length, err := read32(d.fd) // len: 0
-	if err != nil {
-		return errors.Wrap(err, "btree I/O error")
-	}
-
-	d.freeChunk(off, int(length+4))
-	freeQueued(d)
-	d.flushSuper()
-	return nil
-}

internal/btree/btree_test.go

@@ -1,61 +0,0 @@
-package btree
-
-import (
-	"crypto/sha1"
-	"os"
-	"testing"
-
-	assert2 "github.com/stretchr/testify/assert"
-)
-
-func tempfile(t *testing.T) string {
-	temp, err := os.CreateTemp(".", "temp.*.db")
-	assert2.NoError(t, temp.Close())
-	assert2.NoError(t, err)
-	return temp.Name()
-}
-
-func TestCreate(t *testing.T) {
-	f := tempfile(t)
-	_, err := Create(f)
-	assert2.NoError(t, err)
-	defer os.Remove(f)
-}
-
-func TestBtree(t *testing.T) {
-	f := tempfile(t)
-	defer os.Remove(f)
-	bt, err := Create(f)
-	assert2.NoError(t, err)
-
-	var tests = []string{
-		"hello world",
-		"123",
-		"We are met on a great battle-field of that war.",
-		"Abraham Lincoln, November 19, 1863, Gettysburg, Pennsylvania",
-	}
-	var sha = make([]*byte, len(tests))
-	for i, tt := range tests {
-		var hash = sha1.New()
-		hash.Write([]byte(tt))
-		sha[i] = &hash.Sum(nil)[0]
-		bt.Insert(sha[i], []byte(tt))
-	}
-	assert2.NoError(t, bt.Close())
-
-	bt, err = Open(f)
-	assert2.NoError(t, err)
-	for i, tt := range tests {
-		assert2.Equal(t, []byte(tt), bt.Get(sha[i]))
-	}
-
-	for i := range tests {
-		assert2.NoError(t, bt.Delete(sha[i]))
-	}
-
-	for i := range tests {
-		assert2.Equal(t, []byte(nil), bt.Get(sha[i]))
-	}
-
-	assert2.NoError(t, bt.Close())
-}

internal/btree/chunk.go

@@ -1,122 +0,0 @@
-package btree
-
-import (
-	"math/rand"
-	"unsafe"
-)
-
-type chunk struct {
-	offset int64
-	len    int
-}
-
-const freeQueueLen = 64
-
-func freeQueued(bt *DB) {
-	for i := 0; i < bt.fqueueLen; i++ {
-		chunk := &bt.fqueue[i]
-		bt.freeChunk(chunk.offset, chunk.len)
-	}
-	bt.fqueueLen = 0
-}
-
-func (d *DB) allocChunk(size int) int64 {
-	assert(size > 0)
-
-	size = power2(size)
-
-	var offset int64
-	if d.inAllocator {
-		const i32s = unsafe.Sizeof(int32(0))
-
-		/* create fake size SHA-1 */
-		var sha1 [hashSize]byte
-		p := unsafe.Pointer(&sha1[0])
-		*(*int32)(p) = -1                              // *(uint32_t *) hash = -1;
-		*(*uint32)(unsafe.Add(p, i32s)) = uint32(size) // ((__be32 *) hash)[1] = to_be32(size);
-
-		/* find free chunk with the larger or the same size/SHA-1 */
-		d.inAllocator = true
-		d.deleteLarger = true
-		offset = d.delete(d.freeTop, &sha1[0])
-		d.deleteLarger = false
-		if offset != 0 {
-			assert(*(*int32)(p) == -1)                   // assert(*(uint32_t *) hash == (uint32_t) -1)
-			flen := int(*(*uint32)(unsafe.Add(p, i32s))) // size_t free_len = from_be32(((__be32 *) hash)[1])
-			assert(power2(flen) == flen)
-			assert(flen >= size)
-
-			/* delete buddy information */
-			resethash(&sha1[0])
-			*(*int64)(p) = offset
-			buddyLen := d.delete(d.freeTop, &sha1[0])
-			assert(buddyLen == int64(size))
-
-			d.freeTop = collapse(d, d.freeTop)
-
-			d.inAllocator = false
-
-			/* free extra space at the end of the chunk */
-			for flen > size {
-				flen >>= 1
-				d.freeChunk(offset+int64(flen), flen)
-			}
-		} else {
-			d.inAllocator = false
-		}
-	}
-	if offset == 0 {
-		/* not found, allocate from the end of the file */
-		offset = d.alloc
-		/* TODO: this wastes memory.. */
-		if offset&int64(size-1) != 0 {
-			offset += int64(size) - (offset & (int64(size) - 1))
-		}
-		d.alloc = offset + int64(size)
-	}
-	d.flushSuper()
-
-	// make sure the allocation tree is up-to-date before using the chunk
-	_ = d.fd.Sync()
-	return offset
-}
-
-/* Mark a chunk as unused in the database file */
-func (d *DB) freeChunk(offset int64, size int) {
-	assert(size > 0)
-	assert(offset != 0)
-	size = power2(size)
-	assert(offset&int64(size-1) == 0)
-
-	if d.inAllocator {
-		chunk := &d.fqueue[d.fqueueLen]
-		d.fqueueLen++
-		chunk.offset = offset
-		chunk.len = size
-		return
-	}
-
-	/* create fake offset SHA-1 for buddy allocation */
-	var sha1 [hashSize]byte
-	p := unsafe.Pointer(&sha1[0])
-	d.inAllocator = true
-
-	const i32s = unsafe.Sizeof(int32(0))
-
-	/* add buddy information */
-	resethash(&sha1[0])
-	*(*int32)(p) = -1                                 // *(uint32_t *) hash = -1;
-	*(*uint32)(unsafe.Add(p, i32s)) = uint32(size)    // ((__be32 *) hash)[1] = to_be32(size);
-	*(*uint32)(unsafe.Add(p, i32s*2)) = rand.Uint32() /* to make SHA-1 unique */
-	*(*uint32)(unsafe.Add(p, i32s*3)) = rand.Uint32()
-
-	// insert_toplevel(btree, &btree->free_top, hash, NULL, offset);
-	_ = d.insertTopLevel(&d.freeTop, &sha1[0], nil, int(offset))
-	d.inAllocator = false
-
-	d.flushSuper()
-
-	// make sure the allocation tree is up-to-date before removing
-	// references to the chunk
-	_ = d.fd.Sync()
-}

internal/btree/helper.go

@@ -1,106 +0,0 @@
-package btree
-
-import (
-	"io"
-	"reflect"
-	"unsafe"
-)
-
-func assert(cond bool) {
-	if !cond {
-		panic("assert failed!")
-	}
-}
-
-// power2 returns a value that is greater or equal to 'val' and is power-of-two.
-func power2(val int) int {
-	i := 1
-	for i < val {
-		i <<= 1
-	}
-	return i
-}
-
-// helpers for hash
-
-func cmp(a, b *byte) int64 {
-	pa, pb := unsafe.Pointer(a), unsafe.Pointer(b)
-	if *(*uint64)(pa) != *(*uint64)(pb) {
-		return int64(*(*uint64)(pa) - *(*uint64)(pb))
-	}
-	pa, pb = unsafe.Add(pa, 8), unsafe.Add(pb, 8)
-	return int64(*(*uint64)(pa) - *(*uint64)(pb))
-}
-
-func copyhash(dst *byte, src *byte) {
-	pa, pb := unsafe.Pointer(dst), unsafe.Pointer(src)
-	*(*[hashSize]byte)(pa) = *(*[hashSize]byte)(pb)
-}
-
-func resethash(sha1 *byte) {
-	p := unsafe.Pointer(sha1)
-	*(*[hashSize]byte)(p) = [hashSize]byte{}
-}
-
-// reading table
-
-func read32(r io.Reader) (int32, error) {
-	var b = make([]byte, 4)
-	_, err := r.Read(b)
-	if err != nil {
-		return 0, err
-	}
-	return *(*int32)(unsafe.Pointer(&b[0])), nil
-}
-
-func readTable(r io.Reader, t *table) error {
-	buf := make([]byte, tableStructSize)
-	_, err := r.Read(buf)
-	if err != nil {
-		return err
-	}
-	*t = *(*table)(unsafe.Pointer(&buf[0]))
-	return nil
-}
-
-func readSuper(r io.Reader, s *super) error {
-	buf := make([]byte, superSize)
-	_, err := r.Read(buf)
-	if err != nil {
-		return err
-	}
-	*s = *(*super)(unsafe.Pointer(&buf[0]))
-	return nil
-}
-
-// write table
-
-func write32(w io.Writer, t int32) error {
-	var p []byte
-	ph := (*reflect.SliceHeader)(unsafe.Pointer(&p))
-	ph.Data = uintptr(unsafe.Pointer(&t))
-	ph.Len = 4
-	ph.Cap = 4
-	_, err := w.Write(p)
-	return err
-}
-
-func writeTable(w io.Writer, t *table) error {
-	var p []byte
-	ph := (*reflect.SliceHeader)(unsafe.Pointer(&p))
-	ph.Data = uintptr(unsafe.Pointer(t))
-	ph.Len = tableStructSize
-	ph.Cap = tableStructSize
-	_, err := w.Write(p)
-	return err
-}
-
-func writeSuper(w io.Writer, s *super) error {
-	var p []byte
-	ph := (*reflect.SliceHeader)(unsafe.Pointer(&p))
-	ph.Data = uintptr(unsafe.Pointer(s))
-	ph.Len = superSize
-	ph.Cap = superSize
-	_, err := w.Write(p)
-	return err
-}

internal/cache/cache.go

@@ -2,21 +2,11 @@
 package cache
 
 import (
-	"fmt"
-	"sync"
-
 	log "github.com/sirupsen/logrus"
-
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/internal/base"
-	"github.com/Mrs4s/go-cqhttp/internal/btree"
+	"github.com/syndtr/goleveldb/leveldb"
+	"github.com/syndtr/goleveldb/leveldb/opt"
 )
 
-// todo(wdvxdr): always enable db-cache in v1.0.0
-
-// EnableCacheDB 是否启用 btree db缓存图片等
-var EnableCacheDB bool
-
 // Media Cache DBs
 var (
 	Image Cache
@@ -26,72 +16,36 @@ var (
 
 // Cache wraps the btree.DB for concurrent safe
 type Cache struct {
-	lock sync.RWMutex
-	db   *btree.DB
+	ldb *leveldb.DB
 }
 
 // Insert 添加媒体缓存
 func (c *Cache) Insert(md5, data []byte) {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-
-	var hash [16]byte
-	copy(hash[:], md5)
-	c.db.Insert(&hash[0], data)
+	_ = c.ldb.Put(md5, data, nil)
 }
 
 // Get 获取缓存信息
 func (c *Cache) Get(md5 []byte) []byte {
-	c.lock.RLock()
-	defer c.lock.RUnlock()
-
-	var hash [16]byte
-	copy(hash[:], md5)
-	return c.db.Get(&hash[0])
+	got, _ := c.ldb.Get(md5, nil)
+	return got
 }
 
 // Delete 删除指定缓存
 func (c *Cache) Delete(md5 []byte) {
-	c.lock.Lock()
-	defer c.lock.Unlock()
-
-	var hash [16]byte
-	copy(hash[:], md5)
-	_ = c.db.Delete(&hash[0])
+	_ = c.ldb.Delete(md5, nil)
 }
 
 // Init 初始化 Cache
 func Init() {
-	node, ok := base.Database["cache"]
-	if !ok {
-		return
-	}
-	EnableCacheDB = true
-	var conf map[string]string
-	err := node.Decode(&conf)
-	if err != nil {
-		log.Fatalf("failed to read cache config: %v", err)
-	}
-
-	var open = func(typ string, cache *Cache) {
-		file := conf[typ]
-		if file == "" {
-			file = fmt.Sprintf("data/%s.db", typ)
-		}
-		if global.PathExists(file) {
-			db, err := btree.Open(file)
-			if err != nil {
-				log.Fatalf("open %s cache failed: %v", typ, err)
-			}
-			cache.db = db
-		} else {
-			db, err := btree.Create(file)
-			if err != nil {
-				log.Fatalf("create %s cache failed: %v", typ, err)
-			}
-			cache.db = db
+	open := func(typ, path string, cache *Cache) {
+		ldb, err := leveldb.OpenFile(path, &opt.Options{
+			WriteBuffer: 4 * opt.KiB,
+		})
+		if err != nil {
+			log.Fatalf("open cache %s db failed: %v", typ, err)
 		}
+		cache.ldb = ldb
 	}
-	open("image", &Image)
-	open("video", &Video)
+	open("image", "data/images", &Image)
+	open("video", "data/videos", &Video)
 }

internal/download/download.go

@@ -0,0 +1,300 @@
+// Package download provide download utility functions
+package download
+
+import (
+	"bufio"
+	"compress/gzip"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"os"
+	"strconv"
+	"strings"
+	"sync"
+
+	"github.com/pkg/errors"
+	"github.com/tidwall/gjson"
+
+	"github.com/Mrs4s/go-cqhttp/internal/base"
+)
+
+var client = &http.Client{
+	Transport: &http.Transport{
+		Proxy: func(request *http.Request) (u *url.URL, e error) {
+			if base.Proxy == "" {
+				return http.ProxyFromEnvironment(request)
+			}
+			return url.Parse(base.Proxy)
+		},
+		ForceAttemptHTTP2:   false,
+		MaxConnsPerHost:     0,
+		MaxIdleConns:        0,
+		MaxIdleConnsPerHost: 999,
+	},
+}
+
+// ErrOverSize 响应主体过大时返回此错误
+var ErrOverSize = errors.New("oversize")
+
+// UserAgent HTTP请求时使用的UA
+const UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.66"
+
+// Request is a file download request
+type Request struct {
+	URL    string
+	Header map[string]string
+	Limit  int64
+}
+
+func (r Request) do() (*http.Response, error) {
+	req, err := http.NewRequest(http.MethodGet, r.URL, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	req.Header["User-Agent"] = []string{UserAgent}
+	for k, v := range r.Header {
+		req.Header.Set(k, v)
+	}
+
+	return client.Do(req)
+}
+
+func (r Request) body() (io.ReadCloser, error) {
+	resp, err := r.do()
+	if err != nil {
+		return nil, err
+	}
+
+	limit := r.Limit // check file size limit
+	if limit > 0 && resp.ContentLength > limit {
+		_ = resp.Body.Close()
+		return nil, ErrOverSize
+	}
+
+	if strings.Contains(resp.Header.Get("Content-Encoding"), "gzip") {
+		return gzipReadCloser(resp.Body)
+	}
+	return resp.Body, err
+}
+
+// Bytes 对给定URL发送Get请求，返回响应主体
+func (r Request) Bytes() ([]byte, error) {
+	rd, err := r.body()
+	if err != nil {
+		return nil, err
+	}
+	defer rd.Close()
+	return io.ReadAll(rd)
+}
+
+// JSON 发送GET请求， 并转换响应为JSON
+func (r Request) JSON() (gjson.Result, error) {
+	rd, err := r.body()
+	if err != nil {
+		return gjson.Result{}, err
+	}
+	defer rd.Close()
+
+	var sb strings.Builder
+	_, err = io.Copy(&sb, rd)
+	if err != nil {
+		return gjson.Result{}, err
+	}
+
+	return gjson.Parse(sb.String()), nil
+}
+
+func writeToFile(reader io.ReadCloser, path string) error {
+	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0o644)
+	if err != nil {
+		return err
+	}
+	_, err = file.ReadFrom(reader)
+	return err
+}
+
+// WriteToFile 下载到制定目录
+func (r Request) WriteToFile(path string) error {
+	rd, err := r.body()
+	if err != nil {
+		return err
+	}
+	defer rd.Close()
+	return writeToFile(rd, path)
+}
+
+// WriteToFileMultiThreading 多线程下载到制定目录
+func (r Request) WriteToFileMultiThreading(path string, thread int) error {
+	if thread < 2 {
+		return r.WriteToFile(path)
+	}
+
+	limit := r.Limit
+	type BlockMetaData struct {
+		BeginOffset    int64
+		EndOffset      int64
+		DownloadedSize int64
+	}
+	var blocks []*BlockMetaData
+	var contentLength int64
+	errUnsupportedMultiThreading := errors.New("unsupported multi-threading")
+	// 初始化分块或直接下载
+	initOrDownload := func() error {
+		header := make(map[string]string, len(r.Header))
+		for k, v := range r.Header { // copy headers
+			header[k] = v
+		}
+		header["range"] = "bytes=0-"
+		req := Request{
+			URL:    r.URL,
+			Header: header,
+		}
+		resp, err := req.do()
+		if err != nil {
+			return err
+		}
+		defer resp.Body.Close()
+		if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+			return errors.New("response status unsuccessful: " + strconv.FormatInt(int64(resp.StatusCode), 10))
+		}
+		if resp.StatusCode == http.StatusOK {
+			if limit > 0 && resp.ContentLength > limit {
+				return ErrOverSize
+			}
+			if err = writeToFile(resp.Body, path); err != nil {
+				return err
+			}
+			return errUnsupportedMultiThreading
+		}
+		if resp.StatusCode == http.StatusPartialContent {
+			contentLength = resp.ContentLength
+			if limit > 0 && resp.ContentLength > limit {
+				return ErrOverSize
+			}
+			blockSize := contentLength
+			if contentLength > 1024*1024 {
+				blockSize = (contentLength / int64(thread)) - 10
+			}
+			if blockSize == contentLength {
+				return writeToFile(resp.Body, path)
+			}
+			var tmp int64
+			for tmp+blockSize < contentLength {
+				blocks = append(blocks, &BlockMetaData{
+					BeginOffset: tmp,
+					EndOffset:   tmp + blockSize - 1,
+				})
+				tmp += blockSize
+			}
+			blocks = append(blocks, &BlockMetaData{
+				BeginOffset: tmp,
+				EndOffset:   contentLength - 1,
+			})
+			return nil
+		}
+		return errors.New("unknown status code")
+	}
+	// 下载分块
+	downloadBlock := func(block *BlockMetaData) error {
+		file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0o666)
+		if err != nil {
+			return err
+		}
+		defer file.Close()
+		_, _ = file.Seek(block.BeginOffset, io.SeekStart)
+		writer := bufio.NewWriter(file)
+		defer writer.Flush()
+
+		header := make(map[string]string, len(r.Header))
+		for k, v := range r.Header { // copy headers
+			header[k] = v
+		}
+		header["range"] = fmt.Sprintf("bytes=%d-%d", block.BeginOffset, block.EndOffset)
+		req := Request{
+			URL:    r.URL,
+			Header: header,
+		}
+		resp, err := req.do()
+		if err != nil {
+			return err
+		}
+		defer resp.Body.Close()
+		if resp.StatusCode < 200 || resp.StatusCode >= 300 {
+			return errors.New("response status unsuccessful: " + strconv.FormatInt(int64(resp.StatusCode), 10))
+		}
+		buffer := make([]byte, 1024)
+		i, err := resp.Body.Read(buffer)
+		for {
+			if err != nil && err != io.EOF {
+				return err
+			}
+			i64 := int64(len(buffer[:i]))
+			needSize := block.EndOffset + 1 - block.BeginOffset
+			if i64 > needSize {
+				i64 = needSize
+				err = io.EOF
+			}
+			_, e := writer.Write(buffer[:i64])
+			if e != nil {
+				return e
+			}
+			block.BeginOffset += i64
+			block.DownloadedSize += i64
+			if err == io.EOF || block.BeginOffset > block.EndOffset {
+				break
+			}
+			i, err = resp.Body.Read(buffer)
+		}
+		return nil
+	}
+
+	if err := initOrDownload(); err != nil {
+		if err == errUnsupportedMultiThreading {
+			return nil
+		}
+		return err
+	}
+	wg := sync.WaitGroup{}
+	wg.Add(len(blocks))
+	var lastErr error
+	for i := range blocks {
+		go func(b *BlockMetaData) {
+			defer wg.Done()
+			if err := downloadBlock(b); err != nil {
+				lastErr = err
+			}
+		}(blocks[i])
+	}
+	wg.Wait()
+	return lastErr
+}
+
+type gzipCloser struct {
+	f io.Closer
+	r *gzip.Reader
+}
+
+// gzipReadCloser 从 io.ReadCloser 创建 gunzip io.ReadCloser
+func gzipReadCloser(reader io.ReadCloser) (io.ReadCloser, error) {
+	gzipReader, err := gzip.NewReader(reader)
+	if err != nil {
+		return nil, err
+	}
+	return &gzipCloser{
+		f: reader,
+		r: gzipReader,
+	}, nil
+}
+
+// Read impls io.Reader
+func (g *gzipCloser) Read(p []byte) (n int, err error) {
+	return g.r.Read(p)
+}
+
+// Close impls io.Closer
+func (g *gzipCloser) Close() error {
+	_ = g.f.Close()
+	return g.r.Close()
+}

internal/mime/mime.go

@@ -0,0 +1,51 @@
+// Package mime 提供MIME检查功能
+package mime
+
+import (
+	"io"
+	"net/http"
+	"strings"
+
+	"github.com/Mrs4s/go-cqhttp/internal/base"
+)
+
+const limit = 4 * 1024
+
+func scan(r io.ReadSeeker) string {
+	_, _ = r.Seek(0, io.SeekStart)
+	defer r.Seek(0, io.SeekStart)
+	in := make([]byte, limit)
+	_, _ = r.Read(in)
+	return http.DetectContentType(in)
+}
+
+// CheckImage 判断给定流是否为合法图片
+// 返回 是否合法, 实际Mime
+// 判断后会自动将 Stream Seek 至 0
+func CheckImage(r io.ReadSeeker) (t string, ok bool) {
+	if base.SkipMimeScan {
+		return "", true
+	}
+	if r == nil {
+		return "image/nil-stream", false
+	}
+	t = scan(r)
+	switch t {
+	case "image/bmp", "image/gif", "image/jpeg", "image/png", "image/webp":
+		ok = true
+	}
+	return
+}
+
+// CheckAudio 判断给定流是否为合法音频
+func CheckAudio(r io.ReadSeeker) (string, bool) {
+	if base.SkipMimeScan {
+		return "", true
+	}
+	t := scan(r)
+	// std mime type detection is not full supported for audio
+	if strings.Contains(t, "text") || strings.Contains(t, "image") {
+		return t, false
+	}
+	return t, true
+}

internal/param/param.go

@@ -3,13 +3,10 @@ package param
 
 import (
 	"math"
-	"reflect"
 	"regexp"
 	"strings"
 	"sync"
 
-	"github.com/Mrs4s/MiraiGo/utils"
-	"github.com/segmentio/asm/base64"
 	"github.com/tidwall/gjson"
 )
 
@@ -31,7 +28,7 @@ func EnsureBool(p interface{}, defaultVal bool) bool {
 		if !j.Exists() {
 			return defaultVal
 		}
-		switch j.Type { // nolint
+		switch j.Type { // nolint: exhaustive
 		case gjson.True:
 			return true
 		case gjson.False:
@@ -84,47 +81,3 @@ func SplitURL(s string) []string {
 	result = append(result, s[last:])
 	return result
 }
-
-// Base64DecodeString decode base64 with avx2
-// see https://github.com/segmentio/asm/issues/50
-// avoid incorrect unsafe usage in origin library
-func Base64DecodeString(s string) ([]byte, error) {
-	e := base64.StdEncoding
-	dst := make([]byte, e.DecodedLen(len(s)))
-	n, err := e.Decode(dst, utils.S2B(s))
-	return dst[:n], err
-}
-
-// SetAtDefault 在变量 variable 为默认值 defaultValue 的时候修改为 value
-func SetAtDefault(variable, value, defaultValue interface{}) {
-	v := reflect.ValueOf(variable)
-	v2 := reflect.ValueOf(value)
-	if v.Kind() != reflect.Ptr || v.IsNil() {
-		return
-	}
-	v = v.Elem()
-	if v.Interface() != defaultValue {
-		return
-	}
-	if v.Kind() != v2.Kind() {
-		return
-	}
-	v.Set(v2)
-}
-
-// SetExcludeDefault 在目标值 value 不为默认值 defaultValue 时修改 variable 为 value
-func SetExcludeDefault(variable, value, defaultValue interface{}) {
-	v := reflect.ValueOf(variable)
-	v2 := reflect.ValueOf(value)
-	if v.Kind() != reflect.Ptr || v.IsNil() {
-		return
-	}
-	v = v.Elem()
-	if reflect.Indirect(v2).Interface() != defaultValue {
-		return
-	}
-	if v.Kind() != v2.Kind() {
-		return
-	}
-	v.Set(v2)
-}

internal/selfdiagnosis/diagnoses.go

@@ -0,0 +1,81 @@
+// Package selfdiagnosis 自我诊断相关
+package selfdiagnosis
+
+import (
+	"github.com/Mrs4s/MiraiGo/client"
+	log "github.com/sirupsen/logrus"
+)
+
+// NetworkDiagnosis 诊断网络状态并输出结果
+func NetworkDiagnosis(c *client.QQClient) {
+	log.Infof("开始诊断网络情况")
+	qualityInfo := c.ConnectionQualityTest()
+	log.Debugf("聊天服务器连接延迟: %vms", qualityInfo.ChatServerLatency)
+	log.Debugf("聊天服务器丢包率: %v%%", qualityInfo.ChatServerPacketLoss*10)
+	log.Debugf("长消息服务器连接延迟: %vms", qualityInfo.LongMessageServerLatency)
+	log.Debugf("长消息服务器响应延迟: %vms", qualityInfo.LongMessageServerResponseLatency)
+	log.Debugf("媒体服务器连接延迟: %vms", qualityInfo.SrvServerLatency)
+	log.Debugf("媒体服务器丢包率: %v%%", qualityInfo.SrvServerPacketLoss*10)
+
+	const (
+		chatServerErrorMessage        = "可能出现消息丢失/延迟或频繁掉线等情况, 请检查本地网络状态."
+		longMessageServerErrorMessage = "可能导致无法接收/发送长消息的情况, 请检查本地网络状态."
+		mediaServerErrorMessage       = "可能导致无法上传/下载媒体文件, 无法上传群共享, 无法发送消息等情况, 请检查本地网络状态."
+	)
+
+	if qualityInfo.ChatServerLatency > 1000 {
+		if qualityInfo.ChatServerLatency == 9999 {
+			log.Errorf("错误: 聊天服务器延迟测试失败, %v", chatServerErrorMessage)
+		} else {
+			log.Warnf("警告: 聊天服务器延迟为 %vms，大于 1000ms, %v", qualityInfo.ChatServerLatency, chatServerErrorMessage)
+		}
+	}
+
+	if qualityInfo.ChatServerPacketLoss > 0 {
+		log.Warnf("警告: 本地连接聊天服务器丢包率为 %v%%, %v", qualityInfo.ChatServerPacketLoss*10, chatServerErrorMessage)
+	}
+
+	if qualityInfo.LongMessageServerLatency > 1000 {
+		if qualityInfo.LongMessageServerLatency == 9999 {
+			log.Errorf("错误: 长消息服务器延迟测试失败, %v 如果您使用的腾讯云服务器, 请修改DNS到114.114.114.114", longMessageServerErrorMessage)
+		} else {
+			log.Warnf("警告: 长消息延迟为 %vms, 大于 1000ms, %v", qualityInfo.LongMessageServerLatency, longMessageServerErrorMessage)
+		}
+	}
+
+	if qualityInfo.LongMessageServerResponseLatency > 2000 {
+		if qualityInfo.LongMessageServerResponseLatency == 9999 {
+			log.Errorf("错误: 长消息服务器响应延迟测试失败, %v 如果您使用的腾讯云服务器, 请修改DNS到114.114.114.114", longMessageServerErrorMessage)
+		} else {
+			log.Warnf("警告: 长消息响应延迟为 %vms, 大于 1000ms, %v", qualityInfo.LongMessageServerResponseLatency, longMessageServerErrorMessage)
+		}
+	}
+
+	if qualityInfo.SrvServerLatency > 1000 {
+		if qualityInfo.SrvServerPacketLoss == 9999 {
+			log.Errorf("错误: 媒体服务器延迟测试失败, %v", mediaServerErrorMessage)
+		} else {
+			log.Warnf("警告: 媒体服务器延迟为 %vms，大于 1000ms, %v", qualityInfo.SrvServerLatency, mediaServerErrorMessage)
+		}
+	}
+
+	if qualityInfo.SrvServerPacketLoss > 0 {
+		log.Warnf("警告: 本地连接媒体服务器丢包率为 %v%%, %v", qualityInfo.SrvServerPacketLoss*10, mediaServerErrorMessage)
+	}
+
+	if qualityInfo.ChatServerLatency > 1000 || qualityInfo.ChatServerPacketLoss > 0 || qualityInfo.LongMessageServerLatency > 1000 || qualityInfo.SrvServerLatency > 1000 || qualityInfo.SrvServerPacketLoss > 0 {
+		log.Infof("网络诊断完成. 发现问题, 请检查日志.")
+	} else {
+		log.Infof("网络诊断完成. 未发现问题")
+	}
+}
+
+// DNSDiagnosis 诊断DNS状态并输出结果
+func DNSDiagnosis() {
+	// todo
+}
+
+// EnvironmentDiagnosis 诊断本地环境状态并输出结果
+func EnvironmentDiagnosis() {
+	// todo
+}

internal/selfupdate/update.go

@@ -3,22 +3,22 @@ package selfupdate
 
 import (
 	"bufio"
+	"bytes"
 	"encoding/hex"
 	"fmt"
 	"hash"
 	"io"
+	"math"
 	"os"
 	"path/filepath"
 	"runtime"
 	"strings"
 
-	"github.com/dustin/go-humanize"
-	"github.com/kardianos/osext"
 	"github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
 
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/internal/download"
 )
 
 func readLine() (str string) {
@@ -29,11 +29,11 @@ func readLine() (str string) {
 }
 
 func lastVersion() (string, error) {
-	r, err := global.GetBytes("https://api.github.com/repos/Mrs4s/go-cqhttp/releases/latest")
+	r, err := download.Request{URL: "https://api.github.com/repos/Mrs4s/go-cqhttp/releases/latest"}.JSON()
 	if err != nil {
 		return "", err
 	}
-	return gjson.GetBytes(r, "tag_name").Str, nil
+	return r.Get("tag_name").Str, nil
 }
 
 // CheckUpdate 检查更新
@@ -70,12 +70,12 @@ func binaryName() string {
 
 func checksum(github, version string) []byte {
 	sumURL := fmt.Sprintf("%v/Mrs4s/go-cqhttp/releases/download/%v/go-cqhttp_checksums.txt", github, version)
-	closer, err := global.HTTPGetReadCloser(sumURL)
+	sum, err := download.Request{URL: sumURL}.Bytes()
 	if err != nil {
 		return nil
 	}
 
-	rd := bufio.NewReader(closer)
+	rd := bufio.NewReader(bytes.NewReader(sum))
 	for {
 		str, err := rd.ReadString('\n')
 		if err != nil {
@@ -147,13 +147,33 @@ func (wc *writeSumCounter) Write(p []byte) (int, error) {
 	wc.total += uint64(n)
 	wc.hash.Write(p)
 	fmt.Printf("\r                                    ")
-	fmt.Printf("\rDownloading... %s complete", humanize.Bytes(wc.total))
+	fmt.Printf("\rDownloading... %s complete", humanBytes(wc.total))
 	return n, nil
 }
 
+func logn(n, b float64) float64 {
+	return math.Log(n) / math.Log(b)
+}
+
+func humanBytes(s uint64) string {
+	sizes := []string{"B", "kB", "MB", "GB"} // GB对于go-cqhttp来说已经够用了
+	if s < 10 {
+		return fmt.Sprintf("%d B", s)
+	}
+	e := math.Floor(logn(float64(s), 1000))
+	suffix := sizes[int(e)]
+	val := math.Floor(float64(s)/math.Pow(1000, e)*10+0.5) / 10
+	f := "%.0f %s"
+	if val < 10 {
+		f = "%.1f %s"
+	}
+	return fmt.Sprintf(f, val, suffix)
+}
+
 // FromStream copy form getlantern/go-update
 func fromStream(updateWith io.Reader) (err error, errRecover error) {
-	updatePath, err := osext.Executable()
+	updatePath, err := os.Executable()
+	updatePath = filepath.Clean(updatePath)
 	if err != nil {
 		return
 	}
@@ -169,7 +189,7 @@ func fromStream(updateWith io.Reader) (err error, errRecover error) {
 	}
 	// We won't log this error, because it's always going to happen.
 	defer func() { _ = fp.Close() }()
-	if _, err = io.Copy(fp, bufio.NewReader(updateWith)); err != nil {
+	if _, err = bufio.NewReader(updateWith).WriteTo(fp); err != nil {
 		logrus.Errorf("Unable to copy data: %v\n", err)
 	}
 

internal/selfupdate/update_others.go

@@ -9,7 +9,6 @@ import (
 	"compress/gzip"
 	"crypto/sha256"
 	"errors"
-	"fmt"
 	"io"
 	"net/http"
 )
@@ -43,7 +42,6 @@ func update(url string, sum []byte) error {
 		}
 		if header.Name == "go-cqhttp" {
 			err, _ := fromStream(tr)
-			fmt.Println()
 			if err != nil {
 				return err
 			}

internal/selfupdate/update_windows.go

@@ -5,7 +5,6 @@ import (
 	"bytes"
 	"crypto/sha256"
 	"errors"
-	"fmt"
 	"io"
 	"net/http"
 )
@@ -33,7 +32,6 @@ func update(url string, sum []byte) error {
 		return err
 	}
 	err, _ = fromStream(file)
-	fmt.Println()
 	if err != nil {
 		return err
 	}

main.go

@@ -1,400 +1,17 @@
+// Package main
 package main
 
 import (
-	"crypto/aes"
-	"crypto/md5"
-	"crypto/sha1"
-	"encoding/hex"
-	"os"
-	"path"
-	"sync"
-	"time"
+	"github.com/Mrs4s/go-cqhttp/cmd/gocq"
 
-	"github.com/Mrs4s/MiraiGo/binary"
-	"github.com/Mrs4s/MiraiGo/client"
-	para "github.com/fumiama/go-hide-param"
-	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
-	log "github.com/sirupsen/logrus"
-	"golang.org/x/crypto/pbkdf2"
-	"golang.org/x/term"
-
-	"github.com/Mrs4s/go-cqhttp/coolq"
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/global/terminal"
-	"github.com/Mrs4s/go-cqhttp/internal/base"
-	"github.com/Mrs4s/go-cqhttp/internal/cache"
-	"github.com/Mrs4s/go-cqhttp/internal/selfupdate"
-	"github.com/Mrs4s/go-cqhttp/modules/servers"
-	"github.com/Mrs4s/go-cqhttp/server"
-
-	_ "github.com/Mrs4s/go-cqhttp/modules/mime" // mime检查模块
+	_ "github.com/Mrs4s/go-cqhttp/db/leveldb"   // leveldb 数据库支持
 	_ "github.com/Mrs4s/go-cqhttp/modules/silk" // silk编码模块
+	// 其他模块
+	// _ "github.com/Mrs4s/go-cqhttp/db/sqlite3"   // sqlite3 数据库支持
+	// _ "github.com/Mrs4s/go-cqhttp/db/mongodb"    // mongodb 数据库支持
+	// _ "github.com/Mrs4s/go-cqhttp/modules/pprof" // pprof 性能分析
 )
 
-// 允许通过配置文件设置的状态列表
-var allowStatus = [...]client.UserOnlineStatus{
-	client.StatusOnline, client.StatusAway, client.StatusInvisible, client.StatusBusy,
-	client.StatusListening, client.StatusConstellation, client.StatusWeather, client.StatusMeetSpring,
-	client.StatusTimi, client.StatusEatChicken, client.StatusLoving, client.StatusWangWang, client.StatusCookedRice,
-	client.StatusStudy, client.StatusStayUp, client.StatusPlayBall, client.StatusSignal, client.StatusStudyOnline,
-	client.StatusGaming, client.StatusVacationing, client.StatusWatchingTV, client.StatusFitness,
-}
-
 func main() {
-	base.Parse()
-	switch {
-	case base.LittleH:
-		base.Help()
-	case base.LittleD:
-		server.Daemon()
-	case base.LittleWD != "":
-		base.ResetWorkingDir()
-	}
-	base.Init()
-
-	rotateOptions := []rotatelogs.Option{
-		rotatelogs.WithRotationTime(time.Hour * 24),
-	}
-	rotateOptions = append(rotateOptions, rotatelogs.WithMaxAge(base.LogAging))
-	if base.LogForceNew {
-		rotateOptions = append(rotateOptions, rotatelogs.ForceNewFile())
-	}
-	w, err := rotatelogs.New(path.Join("logs", "%Y-%m-%d.log"), rotateOptions...)
-	if err != nil {
-		log.Errorf("rotatelogs init err: %v", err)
-		panic(err)
-	}
-	log.AddHook(global.NewLocalHook(w, global.LogFormat{}, global.GetLogLevel(base.LogLevel)...))
-
-	mkCacheDir := func(path string, _type string) {
-		if !global.PathExists(path) {
-			if err := os.MkdirAll(path, 0o755); err != nil {
-				log.Fatalf("创建%s缓存文件夹失败: %v", _type, err)
-			}
-		}
-	}
-	mkCacheDir(global.ImagePath, "图片")
-	mkCacheDir(global.VoicePath, "语音")
-	mkCacheDir(global.VideoPath, "视频")
-	mkCacheDir(global.CachePath, "发送图片")
-	cache.Init()
-
-	var byteKey []byte
-	arg := os.Args
-	if len(arg) > 1 {
-		for i := range arg {
-			switch arg[i] {
-			case "update":
-				if len(arg) > i+1 {
-					selfupdate.SelfUpdate(arg[i+1])
-				} else {
-					selfupdate.SelfUpdate("")
-				}
-			case "key":
-				p := i + 1
-				if len(arg) > p {
-					byteKey = []byte(arg[p])
-					para.Hide(p)
-				}
-			case "faststart":
-				base.FastStart = true
-			}
-		}
-	}
-
-	if !base.FastStart && terminal.RunningByDoubleClick() {
-		err := terminal.NoMoreDoubleClick()
-		if err != nil {
-			log.Errorf("遇到错误: %v", err)
-			time.Sleep(time.Second * 5)
-		}
-		return
-	}
-
-	if (base.Account.Uin == 0 || (base.Account.Password == "" && !base.Account.Encrypt)) && !global.PathExists("session.token") {
-		log.Warn("账号密码未配置, 将使用二维码登录.")
-		if !base.FastStart {
-			log.Warn("将在 5秒 后继续.")
-			time.Sleep(time.Second * 5)
-		}
-	}
-
-	log.Info("当前版本:", base.Version)
-	if base.Debug {
-		log.SetLevel(log.DebugLevel)
-		log.SetReportCaller(true)
-		log.Warnf("已开启Debug模式.")
-		log.Debugf("开发交流群: 192548878")
-	}
-	log.Info("用户交流群: 721829413")
-	if !global.PathExists("device.json") {
-		log.Warn("虚拟设备信息不存在, 将自动生成随机设备.")
-		client.GenRandomDevice()
-		_ = os.WriteFile("device.json", client.SystemDeviceInfo.ToJson(), 0o644)
-		log.Info("已生成设备信息并保存到 device.json 文件.")
-	} else {
-		log.Info("将使用 device.json 内的设备信息运行Bot.")
-		if err := client.SystemDeviceInfo.ReadJson([]byte(global.ReadAllText("device.json"))); err != nil {
-			log.Fatalf("加载设备信息失败: %v", err)
-		}
-	}
-
-	if base.Account.Encrypt {
-		if !global.PathExists("password.encrypt") {
-			if base.Account.Password == "" {
-				log.Error("无法进行加密，请在配置文件中的添加密码后重新启动.")
-				readLine()
-				os.Exit(0)
-			}
-			log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
-			byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
-			base.PasswordHash = md5.Sum([]byte(base.Account.Password))
-			_ = os.WriteFile("password.encrypt", []byte(PasswordHashEncrypt(base.PasswordHash[:], byteKey)), 0o644)
-			log.Info("密码已加密，为了您的账号安全，请删除配置文件中的密码后重新启动.")
-			readLine()
-			os.Exit(0)
-		} else {
-			if base.Account.Password != "" {
-				log.Error("密码已加密，为了您的账号安全，请删除配置文件中的密码后重新启动.")
-				readLine()
-				os.Exit(0)
-			}
-
-			if len(byteKey) == 0 {
-				log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
-				cancel := make(chan struct{}, 1)
-				state, _ := term.GetState(int(os.Stdin.Fd()))
-				go func() {
-					select {
-					case <-cancel:
-						return
-					case <-time.After(time.Second * 45):
-						log.Infof("解密key输入超时")
-						time.Sleep(3 * time.Second)
-						_ = term.Restore(int(os.Stdin.Fd()), state)
-						os.Exit(0)
-					}
-				}()
-				byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
-				cancel <- struct{}{}
-			} else {
-				log.Infof("密码加密已启用, 使用运行时传递的参数进行解密，按 Ctrl+C 取消.")
-			}
-
-			encrypt, _ := os.ReadFile("password.encrypt")
-			ph, err := PasswordHashDecrypt(string(encrypt), byteKey)
-			if err != nil {
-				log.Fatalf("加密存储的密码损坏，请尝试重新配置密码")
-			}
-			copy(base.PasswordHash[:], ph)
-		}
-	} else if len(base.Account.Password) > 0 {
-		base.PasswordHash = md5.Sum([]byte(base.Account.Password))
-	}
-	if !base.FastStart {
-		log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
-		time.Sleep(time.Second * 5)
-	}
-	log.Info("开始尝试登录并同步消息...")
-	log.Infof("使用协议: %v", func() string {
-		switch client.SystemDeviceInfo.Protocol {
-		case client.IPad:
-			return "iPad"
-		case client.AndroidPhone:
-			return "Android Phone"
-		case client.AndroidWatch:
-			return "Android Watch"
-		case client.MacOS:
-			return "MacOS"
-		case client.QiDian:
-			return "企点"
-		}
-		return "未知"
-	}())
-	cli = newClient()
-	isQRCodeLogin := (base.Account.Uin == 0 || len(base.Account.Password) == 0) && !base.Account.Encrypt
-	isTokenLogin := false
-	saveToken := func() {
-		base.AccountToken = cli.GenToken()
-		_ = os.WriteFile("session.token", base.AccountToken, 0o644)
-	}
-	if global.PathExists("session.token") {
-		token, err := os.ReadFile("session.token")
-		if err == nil {
-			if base.Account.Uin != 0 {
-				r := binary.NewReader(token)
-				cu := r.ReadInt64()
-				if cu != base.Account.Uin {
-					log.Warnf("警告: 配置文件内的QQ号 (%v) 与缓存内的QQ号 (%v) 不相同", base.Account.Uin, cu)
-					log.Warnf("1. 使用会话缓存继续.")
-					log.Warnf("2. 删除会话缓存并重启.")
-					log.Warnf("请选择: (5秒后自动选1)")
-					text := readLineTimeout(time.Second*5, "1")
-					if text == "2" {
-						_ = os.Remove("session.token")
-						log.Infof("缓存已删除.")
-						os.Exit(0)
-					}
-				}
-			}
-			if err = cli.TokenLogin(token); err != nil {
-				_ = os.Remove("session.token")
-				log.Warnf("恢复会话失败: %v , 尝试使用正常流程登录.", err)
-				time.Sleep(time.Second)
-				cli.Disconnect()
-				cli.Release()
-				cli = newClient()
-			} else {
-				isTokenLogin = true
-			}
-		}
-	}
-	if base.Account.Uin != 0 && base.PasswordHash != [16]byte{} {
-		cli.Uin = base.Account.Uin
-		cli.PasswordMd5 = base.PasswordHash
-	}
-	if !isTokenLogin {
-		if !isQRCodeLogin {
-			if err := commonLogin(); err != nil {
-				log.Fatalf("登录时发生致命错误: %v", err)
-			}
-		} else {
-			if err := qrcodeLogin(); err != nil {
-				log.Fatalf("登录时发生致命错误: %v", err)
-			}
-		}
-	}
-	var times uint = 1 // 重试次数
-	var reLoginLock sync.Mutex
-	cli.OnDisconnected(func(q *client.QQClient, e *client.ClientDisconnectedEvent) {
-		reLoginLock.Lock()
-		defer reLoginLock.Unlock()
-		times = 1
-		if cli.Online {
-			return
-		}
-		log.Warnf("Bot已离线: %v", e.Message)
-		time.Sleep(time.Second * time.Duration(base.Reconnect.Delay))
-		for {
-			if base.Reconnect.Disabled {
-				log.Warnf("未启用自动重连, 将退出.")
-				os.Exit(1)
-			}
-			if times > base.Reconnect.MaxTimes && base.Reconnect.MaxTimes != 0 {
-				log.Fatalf("Bot重连次数超过限制, 停止")
-			}
-			times++
-			if base.Reconnect.Interval > 0 {
-				log.Warnf("将在 %v 秒后尝试重连. 重连次数：%v/%v", base.Reconnect.Interval, times, base.Reconnect.MaxTimes)
-				time.Sleep(time.Second * time.Duration(base.Reconnect.Interval))
-			} else {
-				time.Sleep(time.Second)
-			}
-			if cli.Online {
-				log.Infof("登录已完成")
-				break
-			}
-			log.Warnf("尝试重连...")
-			err := cli.TokenLogin(base.AccountToken)
-			if err == nil {
-				saveToken()
-				return
-			}
-			log.Warnf("快速重连失败: %v", err)
-			if isQRCodeLogin {
-				log.Fatalf("快速重连失败, 扫码登录无法恢复会话.")
-			}
-			log.Warnf("快速重连失败, 尝试普通登录. 这可能是因为其他端强行T下线导致的.")
-			time.Sleep(time.Second)
-			if err := commonLogin(); err != nil {
-				log.Errorf("登录时发生致命错误: %v", err)
-			} else {
-				saveToken()
-				break
-			}
-		}
-	})
-	saveToken()
-	cli.AllowSlider = true
-	log.Infof("登录成功 欢迎使用: %v", cli.Nickname)
-	log.Info("开始加载好友列表...")
-	global.Check(cli.ReloadFriendList(), true)
-	log.Infof("共加载 %v 个好友.", len(cli.FriendList))
-	log.Infof("开始加载群列表...")
-	global.Check(cli.ReloadGroupList(), true)
-	log.Infof("共加载 %v 个群.", len(cli.GroupList))
-	if uint(base.Account.Status) >= uint(len(allowStatus)) {
-		base.Account.Status = 0
-	}
-	cli.SetOnlineStatus(allowStatus[base.Account.Status])
-
-	servers.Run(coolq.NewQQBot(cli))
-	log.Info("资源初始化完成, 开始处理信息.")
-	log.Info("アトリは、高性能ですから!")
-
-	go selfupdate.CheckUpdate()
-
-	<-global.SetupMainSignalHandler()
-}
-
-// PasswordHashEncrypt 使用key加密给定passwordHash
-func PasswordHashEncrypt(passwordHash []byte, key []byte) string {
-	if len(passwordHash) != 16 {
-		panic("密码加密参数错误")
-	}
-
-	key = pbkdf2.Key(key, key, 114514, 32, sha1.New)
-
-	cipher, _ := aes.NewCipher(key)
-	result := make([]byte, 16)
-	cipher.Encrypt(result, passwordHash)
-
-	return hex.EncodeToString(result)
-}
-
-// PasswordHashDecrypt 使用key解密给定passwordHash
-func PasswordHashDecrypt(encryptedPasswordHash string, key []byte) ([]byte, error) {
-	ciphertext, err := hex.DecodeString(encryptedPasswordHash)
-	if err != nil {
-		return nil, err
-	}
-
-	key = pbkdf2.Key(key, key, 114514, 32, sha1.New)
-
-	cipher, _ := aes.NewCipher(key)
-	result := make([]byte, 16)
-	cipher.Decrypt(result, ciphertext)
-
-	return result, nil
-}
-
-func newClient() *client.QQClient {
-	c := client.NewClientEmpty()
-	c.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
-		if !base.UseSSOAddress {
-			log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
-			return false
-		}
-		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
-		return true
-	})
-	if global.PathExists("address.txt") {
-		log.Infof("检测到 address.txt 文件. 将覆盖目标IP.")
-		addr := global.ReadAddrFile("address.txt")
-		if len(addr) > 0 {
-			c.SetCustomServer(addr)
-		}
-		log.Infof("读取到 %v 个自定义地址.", len(addr))
-	}
-	c.OnLog(func(c *client.QQClient, e *client.LogEvent) {
-		switch e.Type {
-		case "INFO":
-			log.Info("Protocol -> " + e.Message)
-		case "ERROR":
-			log.Error("Protocol -> " + e.Message)
-		case "DEBUG":
-			log.Debug("Protocol -> " + e.Message)
-		}
-	})
-	return c
+	gocq.Main()
 }

modules/api/api.go

@@ -0,0 +1,350 @@
+// Code generated by cmd/api-generator. DO NOT EDIT.
+
+package api
+
+import (
+	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/global"
+)
+
+func (c *Caller) call(action string, p Getter) global.MSG {
+	switch action {
+	default:
+		return coolq.Failed(404, "API_NOT_FOUND", "API不存在")
+	case ".get_word_slices":
+		p0 := p.Get("content").String()
+		return c.bot.CQGetWordSlices(p0)
+	case ".handle_quick_operation":
+		p0 := p.Get("context")
+		p1 := p.Get("operation")
+		return c.bot.CQHandleQuickOperation(p0, p1)
+	case ".ocr_image", "ocr_image":
+		p0 := p.Get("image").String()
+		return c.bot.CQOcrImage(p0)
+	case "_del_group_notice":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("notice_id").String()
+		return c.bot.CQDelGroupMemo(p0, p1)
+	case "_get_group_notice":
+		p0 := p.Get("group_id").Int()
+		return c.bot.CQGetGroupMemo(p0)
+	case "_get_model_show":
+		p0 := p.Get("model").String()
+		return c.bot.CQGetModelShow(p0)
+	case "_send_group_notice":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("content").String()
+		p2 := p.Get("image").String()
+		return c.bot.CQSetGroupMemo(p0, p1, p2)
+	case "_set_model_show":
+		p0 := p.Get("model").String()
+		p1 := p.Get("model_show").String()
+		return c.bot.CQSetModelShow(p0, p1)
+	case "can_send_image":
+		return c.bot.CQCanSendImage()
+	case "can_send_record":
+		return c.bot.CQCanSendRecord()
+	case "check_url_safely":
+		p0 := p.Get("url").String()
+		return c.bot.CQCheckURLSafely(p0)
+	case "create_group_file_folder":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("parent_id").String()
+		p2 := p.Get("name").String()
+		return c.bot.CQGroupFileCreateFolder(p0, p1, p2)
+	case "create_guild_role":
+		p0 := p.Get("guild_id").Uint()
+		p1 := p.Get("name").String()
+		p2 := uint32(p.Get("color").Uint())
+		p3 := p.Get("independent").Bool()
+		p4 := p.Get("initial_users")
+		return c.bot.CQCreateGuildRole(p0, p1, p2, p3, p4)
+	case "delete_essence_msg":
+		p0 := int32(p.Get("message_id").Int())
+		return c.bot.CQDeleteEssenceMessage(p0)
+	case "delete_friend":
+		p0 := p.Get("[user_id,id].0").Int()
+		return c.bot.CQDeleteFriend(p0)
+	case "delete_group_file":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("file_id").String()
+		p2 := int32(p.Get("[busid,bus_id].0").Int())
+		return c.bot.CQGroupFileDeleteFile(p0, p1, p2)
+	case "delete_group_folder":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("folder_id").String()
+		return c.bot.CQGroupFileDeleteFolder(p0, p1)
+	case "delete_guild_role":
+		p0 := p.Get("guild_id").Uint()
+		p1 := p.Get("role_id").Uint()
+		return c.bot.CQDeleteGuildRole(p0, p1)
+	case "delete_msg":
+		p0 := int32(p.Get("message_id").Int())
+		return c.bot.CQDeleteMessage(p0)
+	case "delete_unidirectional_friend":
+		p0 := p.Get("user_id").Int()
+		return c.bot.CQDeleteUnidirectionalFriend(p0)
+	case "download_file":
+		p0 := p.Get("url").String()
+		p1 := p.Get("headers")
+		p2 := int(p.Get("thread_count").Int())
+		return c.bot.CQDownloadFile(p0, p1, p2)
+	case "get_essence_msg_list":
+		p0 := p.Get("group_id").Int()
+		return c.bot.CQGetEssenceMessageList(p0)
+	case "get_forward_msg":
+		p0 := p.Get("[message_id,id].0").String()
+		return c.bot.CQGetForwardMessage(p0)
+	case "get_friend_list":
+		return c.bot.CQGetFriendList()
+	case "get_group_at_all_remain":
+		p0 := p.Get("group_id").Int()
+		return c.bot.CQGetAtAllRemain(p0)
+	case "get_group_file_system_info":
+		p0 := p.Get("group_id").Int()
+		return c.bot.CQGetGroupFileSystemInfo(p0)
+	case "get_group_file_url":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("file_id").String()
+		p2 := int32(p.Get("[busid,bus_id].0").Int())
+		return c.bot.CQGetGroupFileURL(p0, p1, p2)
+	case "get_group_files_by_folder":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("folder_id").String()
+		return c.bot.CQGetGroupFilesByFolderID(p0, p1)
+	case "get_group_honor_info":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("type").String()
+		return c.bot.CQGetGroupHonorInfo(p0, p1)
+	case "get_group_info":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("no_cache").Bool()
+		return c.bot.CQGetGroupInfo(p0, p1)
+	case "get_group_list":
+		p0 := p.Get("no_cache").Bool()
+		return c.bot.CQGetGroupList(p0)
+	case "get_group_member_info":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("user_id").Int()
+		p2 := p.Get("no_cache").Bool()
+		return c.bot.CQGetGroupMemberInfo(p0, p1, p2)
+	case "get_group_member_list":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("no_cache").Bool()
+		return c.bot.CQGetGroupMemberList(p0, p1)
+	case "get_group_msg_history":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("message_seq").Int()
+		return c.bot.CQGetGroupMessageHistory(p0, p1)
+	case "get_group_root_files":
+		p0 := p.Get("group_id").Int()
+		return c.bot.CQGetGroupRootFiles(p0)
+	case "get_group_system_msg":
+		return c.bot.CQGetGroupSystemMessages()
+	case "get_guild_channel_list":
+		p0 := p.Get("guild_id").Uint()
+		p1 := p.Get("no_cache").Bool()
+		return c.bot.CQGetGuildChannelList(p0, p1)
+	case "get_guild_list":
+		return c.bot.CQGetGuildList()
+	case "get_guild_member_list":
+		p0 := p.Get("guild_id").Uint()
+		p1 := p.Get("next_token").String()
+		return c.bot.CQGetGuildMembers(p0, p1)
+	case "get_guild_member_profile":
+		p0 := p.Get("guild_id").Uint()
+		p1 := p.Get("user_id").Uint()
+		return c.bot.CQGetGuildMemberProfile(p0, p1)
+	case "get_guild_meta_by_guest":
+		p0 := p.Get("guild_id").Uint()
+		return c.bot.CQGetGuildMetaByGuest(p0)
+	case "get_guild_msg":
+		p0 := p.Get("message_id").String()
+		p1 := p.Get("no_cache").Bool()
+		return c.bot.CQGetGuildMessage(p0, p1)
+	case "get_guild_roles":
+		p0 := p.Get("guild_id").Uint()
+		return c.bot.CQGetGuildRoles(p0)
+	case "get_guild_service_profile":
+		return c.bot.CQGetGuildServiceProfile()
+	case "get_image":
+		p0 := p.Get("file").String()
+		return c.bot.CQGetImage(p0)
+	case "get_login_info":
+		return c.bot.CQGetLoginInfo()
+	case "get_msg":
+		p0 := int32(p.Get("message_id").Int())
+		return c.bot.CQGetMessage(p0)
+	case "get_online_clients":
+		p0 := p.Get("no_cache").Bool()
+		return c.bot.CQGetOnlineClients(p0)
+	case "get_status":
+		return c.bot.CQGetStatus()
+	case "get_stranger_info":
+		p0 := p.Get("user_id").Int()
+		return c.bot.CQGetStrangerInfo(p0)
+	case "get_topic_channel_feeds":
+		p0 := p.Get("guild_id").Uint()
+		p1 := p.Get("channel_id").Uint()
+		return c.bot.CQGetTopicChannelFeeds(p0, p1)
+	case "get_unidirectional_friend_list":
+		return c.bot.CQGetUnidirectionalFriendList()
+	case "get_version_info":
+		return c.bot.CQGetVersionInfo()
+	case "mark_msg_as_read":
+		p0 := int32(p.Get("message_id").Int())
+		return c.bot.CQMarkMessageAsRead(p0)
+	case "qidian_get_account_info":
+		return c.bot.CQGetQiDianAccountInfo()
+	case "reload_event_filter":
+		p0 := p.Get("file").String()
+		return c.bot.CQReloadEventFilter(p0)
+	case "send_forward_msg":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("user_id").Int()
+		p2 := p.Get("messages")
+		p3 := p.Get("message_type").String()
+		return c.bot.CQSendForwardMessage(p0, p1, p2, p3)
+	case "send_group_forward_msg":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("messages")
+		return c.bot.CQSendGroupForwardMessage(p0, p1)
+	case "send_group_msg":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("message")
+		p2 := p.Get("auto_escape").Bool()
+		return c.bot.CQSendGroupMessage(p0, p1, p2)
+	case "send_group_sign":
+		p0 := p.Get("group_id").Int()
+		return c.bot.CQSendGroupSign(p0)
+	case "send_guild_channel_msg":
+		p0 := p.Get("guild_id").Uint()
+		p1 := p.Get("channel_id").Uint()
+		p2 := p.Get("message")
+		p3 := p.Get("auto_escape").Bool()
+		return c.bot.CQSendGuildChannelMessage(p0, p1, p2, p3)
+	case "send_msg":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("user_id").Int()
+		p2 := p.Get("message")
+		p3 := p.Get("message_type").String()
+		p4 := p.Get("auto_escape").Bool()
+		return c.bot.CQSendMessage(p0, p1, p2, p3, p4)
+	case "send_private_forward_msg":
+		p0 := p.Get("user_id").Int()
+		p1 := p.Get("messages")
+		return c.bot.CQSendPrivateForwardMessage(p0, p1)
+	case "send_private_msg":
+		p0 := p.Get("user_id").Int()
+		p1 := p.Get("group_id").Int()
+		p2 := p.Get("message")
+		p3 := p.Get("auto_escape").Bool()
+		return c.bot.CQSendPrivateMessage(p0, p1, p2, p3)
+	case "set_essence_msg":
+		p0 := int32(p.Get("message_id").Int())
+		return c.bot.CQSetEssenceMessage(p0)
+	case "set_friend_add_request":
+		p0 := p.Get("flag").String()
+		p1 := true
+		if pt := p.Get("approve"); pt.Exists() {
+			p1 = pt.Bool()
+		}
+		return c.bot.CQProcessFriendRequest(p0, p1)
+	case "set_group_add_request":
+		p0 := p.Get("flag").String()
+		p1 := p.Get("[sub_type,type].0").String()
+		p2 := p.Get("reason").String()
+		p3 := true
+		if pt := p.Get("approve"); pt.Exists() {
+			p3 = pt.Bool()
+		}
+		return c.bot.CQProcessGroupRequest(p0, p1, p2, p3)
+	case "set_group_admin":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("user_id").Int()
+		p2 := true
+		if pt := p.Get("enable"); pt.Exists() {
+			p2 = pt.Bool()
+		}
+		return c.bot.CQSetGroupAdmin(p0, p1, p2)
+	case "set_group_anonymous_ban":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("[anonymous_flag,anonymous.flag].0").String()
+		p2 := int32(p.Get("duration").Int())
+		return c.bot.CQSetGroupAnonymousBan(p0, p1, p2)
+	case "set_group_ban":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("user_id").Int()
+		p2 := uint32(1800)
+		if pt := p.Get("duration"); pt.Exists() {
+			p2 = uint32(pt.Uint())
+		}
+		return c.bot.CQSetGroupBan(p0, p1, p2)
+	case "set_group_card":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("user_id").Int()
+		p2 := p.Get("card").String()
+		return c.bot.CQSetGroupCard(p0, p1, p2)
+	case "set_group_kick":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("user_id").Int()
+		p2 := p.Get("message").String()
+		p3 := p.Get("reject_add_request").Bool()
+		return c.bot.CQSetGroupKick(p0, p1, p2, p3)
+	case "set_group_leave":
+		p0 := p.Get("group_id").Int()
+		return c.bot.CQSetGroupLeave(p0)
+	case "set_group_name":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("group_name").String()
+		return c.bot.CQSetGroupName(p0, p1)
+	case "set_group_portrait":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("file").String()
+		p2 := p.Get("cache").String()
+		return c.bot.CQSetGroupPortrait(p0, p1, p2)
+	case "set_group_special_title":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("user_id").Int()
+		p2 := p.Get("special_title").String()
+		return c.bot.CQSetGroupSpecialTitle(p0, p1, p2)
+	case "set_group_whole_ban":
+		p0 := p.Get("group_id").Int()
+		p1 := true
+		if pt := p.Get("enable"); pt.Exists() {
+			p1 = pt.Bool()
+		}
+		return c.bot.CQSetGroupWholeBan(p0, p1)
+	case "set_guild_member_role":
+		p0 := p.Get("guild_id").Uint()
+		p1 := p.Get("set").Bool()
+		p2 := p.Get("role_id").Uint()
+		p3 := p.Get("users")
+		return c.bot.CQSetGuildMemberRole(p0, p1, p2, p3)
+	case "set_qq_profile":
+		p0 := p.Get("nickname")
+		p1 := p.Get("company")
+		p2 := p.Get("email")
+		p3 := p.Get("college")
+		p4 := p.Get("personal_note")
+		return c.bot.CQSetQQProfile(p0, p1, p2, p3, p4)
+	case "update_guild_role":
+		p0 := p.Get("guild_id").Uint()
+		p1 := p.Get("role_id").Uint()
+		p2 := p.Get("name").String()
+		p3 := uint32(p.Get("color").Uint())
+		p4 := p.Get("indepedent").Bool()
+		return c.bot.CQModifyRoleInGuild(p0, p1, p2, p3, p4)
+	case "upload_group_file":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("file").String()
+		p2 := p.Get("name").String()
+		p3 := p.Get("folder").String()
+		return c.bot.CQUploadGroupFile(p0, p1, p2, p3)
+	case "upload_private_file":
+		p0 := p.Get("user_id").Int()
+		p1 := p.Get("file").String()
+		p2 := p.Get("name").String()
+		return c.bot.CQUploadPrivateFile(p0, p1, p2)
+	}
+}

modules/api/caller.go

@@ -0,0 +1,48 @@
+// Package api implements the API route for servers.
+package api
+
+import (
+	"github.com/tidwall/gjson"
+
+	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/global"
+)
+
+//go:generate go run github.com/Mrs4s/go-cqhttp/cmd/api-generator -path=./../../coolq/api.go
+
+// Getter 参数获取
+type Getter interface {
+	Get(string) gjson.Result
+}
+
+// Handler 中间件
+type Handler func(action string, p Getter) global.MSG
+
+// Caller api route caller
+type Caller struct {
+	bot      *coolq.CQBot
+	handlers []Handler
+}
+
+// Call specific API
+func (c *Caller) Call(action string, p Getter) global.MSG {
+	for _, fn := range c.handlers {
+		if ret := fn(action, p); ret != nil {
+			return ret
+		}
+	}
+	return c.call(action, p)
+}
+
+// Use add handlers to the API caller
+func (c *Caller) Use(middlewares ...Handler) {
+	c.handlers = append(c.handlers, middlewares...)
+}
+
+// NewCaller create a new API caller
+func NewCaller(bot *coolq.CQBot) *Caller {
+	return &Caller{
+		bot:      bot,
+		handlers: make([]Handler, 0),
+	}
+}

modules/config/config.go

@@ -6,16 +6,15 @@ import (
 	_ "embed" // embed the default config file
 	"fmt"
 	"os"
-	"strconv"
+	"regexp"
 	"strings"
 
-	"github.com/Mrs4s/go-cqhttp/internal/param"
-
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v3"
 )
 
 // defaultConfig 默认配置文件
+//
 //go:embed default_config.yml
 var defaultConfig string
 
@@ -29,12 +28,13 @@ type Reconnect struct {
 
 // Account 账号配置
 type Account struct {
-	Uin           int64      `yaml:"uin"`
-	Password      string     `yaml:"password"`
-	Encrypt       bool       `yaml:"encrypt"`
-	Status        int        `yaml:"status"`
-	ReLogin       *Reconnect `yaml:"relogin"`
-	UseSSOAddress bool       `yaml:"use-sso-address"`
+	Uin              int64      `yaml:"uin"`
+	Password         string     `yaml:"password"`
+	Encrypt          bool       `yaml:"encrypt"`
+	Status           int        `yaml:"status"`
+	ReLogin          *Reconnect `yaml:"relogin"`
+	UseSSOAddress    bool       `yaml:"use-sso-address"`
+	AllowTempSession bool       `yaml:"allow-temp-session"`
 }
 
 // Config 总配置文件
@@ -61,6 +61,7 @@ type Config struct {
 		LogLevel    string `yaml:"log-level"`
 		LogAging    int    `yaml:"log-aging"`
 		LogForceNew bool   `yaml:"log-force-new"`
+		LogColorful *bool  `yaml:"log-colorful"`
 		Debug       bool   `yaml:"debug"`
 	} `yaml:"output"`
 
@@ -68,205 +69,61 @@ type Config struct {
 	Database map[string]yaml.Node   `yaml:"database"`
 }
 
-// MiddleWares 通信中间件
-type MiddleWares struct {
-	AccessToken string `yaml:"access-token"`
-	Filter      string `yaml:"filter"`
-	RateLimit   struct {
-		Enabled   bool    `yaml:"enabled"`
-		Frequency float64 `yaml:"frequency"`
-		Bucket    int     `yaml:"bucket"`
-	} `yaml:"rate-limit"`
-}
-
-// HTTPServer HTTP通信相关配置
-type HTTPServer struct {
-	Disabled    bool   `yaml:"disabled"`
-	Host        string `yaml:"host"`
-	Port        int    `yaml:"port"`
-	Timeout     int32  `yaml:"timeout"`
-	LongPolling struct {
-		Enabled      bool `yaml:"enabled"`
-		MaxQueueSize int  `yaml:"max-queue-size"`
-	} `yaml:"long-polling"`
-	Post []struct {
-		URL    string `yaml:"url"`
-		Secret string `yaml:"secret"`
-	}
-
-	MiddleWares `yaml:"middlewares"`
-}
-
-// PprofServer pprof性能分析服务器相关配置
-type PprofServer struct {
-	Disabled bool   `yaml:"disabled"`
-	Host     string `yaml:"host"`
-	Port     int    `yaml:"port"`
-}
-
-// WebsocketServer 正向WS相关配置
-type WebsocketServer struct {
-	Disabled bool   `yaml:"disabled"`
-	Host     string `yaml:"host"`
-	Port     int    `yaml:"port"`
-
-	MiddleWares `yaml:"middlewares"`
-}
-
-// WebsocketReverse 反向WS相关配置
-type WebsocketReverse struct {
-	Disabled          bool   `yaml:"disabled"`
-	Universal         string `yaml:"universal"`
-	API               string `yaml:"api"`
-	Event             string `yaml:"event"`
-	ReconnectInterval int    `yaml:"reconnect-interval"`
-
-	MiddleWares `yaml:"middlewares"`
-}
-
-// LambdaServer 云函数配置
-type LambdaServer struct {
-	Disabled bool   `yaml:"disabled"`
-	Type     string `yaml:"type"`
-
-	MiddleWares `yaml:"middlewares"`
-}
-
-// LevelDBConfig leveldb 相关配置
-type LevelDBConfig struct {
-	Enable bool `yaml:"enable"`
-}
-
-// MongoDBConfig mongodb 相关配置
-type MongoDBConfig struct {
-	Enable   bool   `yaml:"enable"`
-	URI      string `yaml:"uri"`
-	Database string `yaml:"database"`
+// Server 的简介和初始配置
+type Server struct {
+	Brief   string
+	Default string
 }
 
 // Parse 从默认配置文件路径中获取
 func Parse(path string) *Config {
-	fromEnv := os.Getenv("GCQ_UIN") != ""
-
-	file, err := os.Open(path)
+	file, err := os.ReadFile(path)
 	config := &Config{}
 	if err == nil {
-		defer func() { _ = file.Close() }()
-		if err = yaml.NewDecoder(file).Decode(config); err != nil && !fromEnv {
+		err = yaml.NewDecoder(strings.NewReader(expand(string(file), os.Getenv))).Decode(config)
+		if err != nil {
 			log.Fatal("配置文件不合法!", err)
 		}
-	} else if !fromEnv {
+	} else {
 		generateConfig()
 		os.Exit(0)
 	}
-	if fromEnv {
-		// type convert tools
-		toInt64 := func(str string) int64 {
-			i, _ := strconv.ParseInt(str, 10, 64)
-			return i
-		}
-
-		// load config from environment variable
-		param.SetAtDefault(&config.Account.Uin, toInt64(os.Getenv("GCQ_UIN")), int64(0))
-		param.SetAtDefault(&config.Account.Password, os.Getenv("GCQ_PWD"), "")
-		param.SetAtDefault(&config.Account.Status, int32(toInt64(os.Getenv("GCQ_STATUS"))), int32(0))
-		param.SetAtDefault(&config.Account.ReLogin.Disabled, !param.EnsureBool(os.Getenv("GCQ_RELOGIN_DISABLED"), true), false)
-		param.SetAtDefault(&config.Account.ReLogin.Delay, uint(toInt64(os.Getenv("GCQ_RELOGIN_DELAY"))), uint(0))
-		param.SetAtDefault(&config.Account.ReLogin.MaxTimes, uint(toInt64(os.Getenv("GCQ_RELOGIN_MAX_TIMES"))), uint(0))
-		dbConf := &LevelDBConfig{Enable: param.EnsureBool(os.Getenv("GCQ_LEVELDB"), true)}
-		if config.Database == nil {
-			config.Database = make(map[string]yaml.Node)
-		}
-		config.Database["leveldb"] = func() yaml.Node {
-			n := &yaml.Node{}
-			_ = n.Encode(dbConf)
-			return *n
-		}()
-		accessTokenEnv := os.Getenv("GCQ_ACCESS_TOKEN")
-		if os.Getenv("GCQ_HTTP_PORT") != "" {
-			node := &yaml.Node{}
-			httpConf := &HTTPServer{
-				Host: "0.0.0.0",
-				Port: 5700,
-				MiddleWares: MiddleWares{
-					AccessToken: accessTokenEnv,
-				},
-			}
-			param.SetExcludeDefault(&httpConf.Disabled, param.EnsureBool(os.Getenv("GCQ_HTTP_DISABLE"), false), false)
-			param.SetExcludeDefault(&httpConf.Host, os.Getenv("GCQ_HTTP_HOST"), "")
-			param.SetExcludeDefault(&httpConf.Port, int(toInt64(os.Getenv("GCQ_HTTP_PORT"))), 0)
-			if os.Getenv("GCQ_HTTP_POST_URL") != "" {
-				httpConf.Post = append(httpConf.Post, struct {
-					URL    string `yaml:"url"`
-					Secret string `yaml:"secret"`
-				}{os.Getenv("GCQ_HTTP_POST_URL"), os.Getenv("GCQ_HTTP_POST_SECRET")})
-			}
-			_ = node.Encode(httpConf)
-			config.Servers = append(config.Servers, map[string]yaml.Node{"http": *node})
-		}
-		if os.Getenv("GCQ_WS_PORT") != "" {
-			node := &yaml.Node{}
-			wsServerConf := &WebsocketServer{
-				Host: "0.0.0.0",
-				Port: 6700,
-				MiddleWares: MiddleWares{
-					AccessToken: accessTokenEnv,
-				},
-			}
-			param.SetExcludeDefault(&wsServerConf.Disabled, param.EnsureBool(os.Getenv("GCQ_WS_DISABLE"), false), false)
-			param.SetExcludeDefault(&wsServerConf.Host, os.Getenv("GCQ_WS_HOST"), "")
-			param.SetExcludeDefault(&wsServerConf.Port, int(toInt64(os.Getenv("GCQ_WS_PORT"))), 0)
-			_ = node.Encode(wsServerConf)
-			config.Servers = append(config.Servers, map[string]yaml.Node{"ws": *node})
-		}
-		if os.Getenv("GCQ_RWS_API") != "" || os.Getenv("GCQ_RWS_EVENT") != "" || os.Getenv("GCQ_RWS_UNIVERSAL") != "" {
-			node := &yaml.Node{}
-			rwsConf := &WebsocketReverse{
-				MiddleWares: MiddleWares{
-					AccessToken: accessTokenEnv,
-				},
-			}
-			param.SetExcludeDefault(&rwsConf.Disabled, param.EnsureBool(os.Getenv("GCQ_RWS_DISABLE"), false), false)
-			param.SetExcludeDefault(&rwsConf.API, os.Getenv("GCQ_RWS_API"), "")
-			param.SetExcludeDefault(&rwsConf.Event, os.Getenv("GCQ_RWS_EVENT"), "")
-			param.SetExcludeDefault(&rwsConf.Universal, os.Getenv("GCQ_RWS_UNIVERSAL"), "")
-			_ = node.Encode(rwsConf)
-			config.Servers = append(config.Servers, map[string]yaml.Node{"ws-reverse": *node})
-		}
-	}
 	return config
 }
 
+var serverconfs []*Server
+
+// AddServer 添加该服务的简介和默认配置
+func AddServer(s *Server) {
+	serverconfs = append(serverconfs, s)
+}
+
 // generateConfig 生成配置文件
 func generateConfig() {
 	fmt.Println("未找到配置文件，正在为您生成配置文件中！")
 	sb := strings.Builder{}
 	sb.WriteString(defaultConfig)
-	fmt.Print(`请选择你需要的通信方式:
-> 1: HTTP通信
-> 2: 正向 Websocket 通信
-> 3: 反向 Websocket 通信
-> 4: pprof 性能分析服务器
-> 5: 云函数服务
-请输入你需要的编号，可输入多个，同一编号也可输入多个(如: 233)
-您的选择是:`)
+	hint := "请选择你需要的通信方式:"
+	for i, s := range serverconfs {
+		hint += fmt.Sprintf("\n> %d: %s", i, s.Brief)
+	}
+	hint += `
+请输入你需要的编号(0-9)，可输入多个，同一编号也可输入多个(如: 233)
+您的选择是:`
+	fmt.Print(hint)
 	input := bufio.NewReader(os.Stdin)
 	readString, err := input.ReadString('\n')
 	if err != nil {
 		log.Fatal("输入不合法: ", err)
 	}
+	rmax := len(serverconfs)
+	if rmax > 10 {
+		rmax = 10
+	}
 	for _, r := range readString {
-		switch r {
-		case '1':
-			sb.WriteString(httpDefault)
-		case '2':
-			sb.WriteString(wsDefault)
-		case '3':
-			sb.WriteString(wsReverseDefault)
-		case '4':
-			sb.WriteString(pprofDefault)
-		case '5':
-			sb.WriteString(lambdaDefault)
+		r -= '0'
+		if r >= 0 && r < rune(rmax) {
+			sb.WriteString(serverconfs[r].Default)
 		}
 	}
 	_ = os.WriteFile("config.yml", []byte(sb.String()), 0o644)
@@ -274,69 +131,18 @@ func generateConfig() {
 	_, _ = input.ReadString('\n')
 }
 
-const httpDefault = `  # HTTP 通信设置
-  - http:
-      # 服务端监听地址
-      host: 127.0.0.1
-      # 服务端监听端口
-      port: 5700
-      # 反向HTTP超时时间, 单位秒
-      # 最小值为5，小于5将会忽略本项设置
-      timeout: 5
-      # 长轮询拓展
-      long-polling:
-        # 是否开启
-        enabled: false
-        # 消息队列大小，0 表示不限制队列大小，谨慎使用
-        max-queue-size: 2000
-      middlewares:
-        <<: *default # 引用默认中间件
-      # 反向HTTP POST地址列表
-      post:
-      #- url: '' # 地址
-      #  secret: ''           # 密钥
-      #- url: 127.0.0.1:5701 # 地址
-      #  secret: ''          # 密钥
-`
-
-const lambdaDefault = `  # LambdaServer 配置
-  - lambda:
-      type: scf # scf: 腾讯云函数 aws: aws Lambda
-      middlewares:
-        <<: *default # 引用默认中间件
-`
-
-const wsDefault = `  # 正向WS设置
-  - ws:
-      # 正向WS服务器监听地址
-      host: 127.0.0.1
-      # 正向WS服务器监听端口
-      port: 6700
-      middlewares:
-        <<: *default # 引用默认中间件
-`
-
-const wsReverseDefault = `  # 反向WS设置
-  - ws-reverse:
-      # 反向WS Universal 地址
-      # 注意 设置了此项地址后下面两项将会被忽略
-      universal: ws://your_websocket_universal.server
-      # 反向WS API 地址
-      api: ws://your_websocket_api.server
-      # 反向WS Event 地址
-      event: ws://your_websocket_event.server
-      # 重连间隔 单位毫秒
-      reconnect-interval: 3000
-      middlewares:
-        <<: *default # 引用默认中间件
-`
-
-const pprofDefault = `  # pprof 性能分析服务器, 一般情况下不需要启用.
-  # 如果遇到性能问题请上传报告给开发者处理
-  # 注意: pprof服务不支持中间件、不支持鉴权. 请不要开放到公网
-  - pprof:
-      # pprof服务器监听地址
-      host: 127.0.0.1
-      # pprof服务器监听端口
-      port: 7700
-`
+// expand 使用正则进行环境变量展开
+// os.ExpandEnv 字符 $ 无法逃逸
+// https://github.com/golang/go/issues/43482
+func expand(s string, mapping func(string) string) string {
+	r := regexp.MustCompile(`\${([a-zA-Z_]+[a-zA-Z0-9_:/.]*)}`)
+	return r.ReplaceAllStringFunc(s, func(s string) string {
+		s = strings.Trim(s, "${}")
+		before, after, ok := strings.Cut(s, ":")
+		m := mapping(before)
+		if ok && m == "" {
+			return after
+		}
+		return m
+	})
+}

modules/config/config_test.go

@@ -0,0 +1,48 @@
+package config
+
+import (
+	"strings"
+	"testing"
+)
+
+func Test_expand(t *testing.T) {
+	nullStringMapping := func(_ string) string {
+		return ""
+	}
+	tests := []struct {
+		src      string
+		mapping  func(string) string
+		expected string
+	}{
+		{
+			src:      "foo: ${bar}",
+			mapping:  strings.ToUpper,
+			expected: "foo: BAR",
+		},
+		{
+			src:      "$123",
+			mapping:  strings.ToUpper,
+			expected: "$123",
+		},
+		{
+			src:      "foo: ${bar:123456}",
+			mapping:  nullStringMapping,
+			expected: "foo: 123456",
+		},
+		{
+			src:      "foo: ${bar:127.0.0.1:5700}",
+			mapping:  nullStringMapping,
+			expected: "foo: 127.0.0.1:5700",
+		},
+		{
+			src:      "foo: ${bar:ws//localhost:9999/ws}",
+			mapping:  nullStringMapping,
+			expected: "foo: ws//localhost:9999/ws",
+		},
+	}
+	for i, tt := range tests {
+		if got := expand(tt.src, tt.mapping); got != tt.expected {
+			t.Errorf("testcase %d failed, expected %v but got %v", i, tt.expected, got)
+		}
+	}
+}

modules/config/default_config.yml

@@ -13,6 +13,8 @@ account: # 账号相关
   # 是否使用服务器下发的新地址进行重连
   # 注意, 此设置可能导致在海外服务器上连接情况更差
   use-sso-address: true
+  # 是否允许发送临时会话消息
+  allow-temp-session: false
 
 heartbeat:
   # 心跳频率, 单位秒
@@ -49,6 +51,8 @@ output:
   log-aging: 15
   # 是否在每次启动时强制创建全新的文件储存日志. 为 false 的情况下将会在上次启动时创建的日志文件续写
   log-force-new: true
+  # 是否启用日志颜色
+  log-colorful: true
   # 是否启用 DEBUG
   debug: false # 开启调试模式
 
@@ -74,11 +78,12 @@ database: # 数据库相关设置
     # 启用将会增加10-20MB的内存占用和一定的磁盘空间
     # 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能
     enable: true
-
-  # 媒体文件缓存， 删除此项则使用缓存文件(旧版行为)
-  cache:
-    image: data/image.db
-    video: data/video.db
+  sqlite3:
+    # 是否启用内置sqlite3数据库
+    # 启用将会增加一定的内存占用和一定的磁盘空间
+    # 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能
+    enable: false
+    cachettl: 3600000000000 # 1h
 
 # 连接服务列表
 servers:

modules/filter/filter.go

@@ -1,4 +1,5 @@
-package global
+// Package filter implements an event filter for go-cqhttp
+package filter
 
 import (
 	"regexp"
@@ -54,14 +55,14 @@ func newAndOp(argument gjson.Result) Filter {
 			opKey := key.Str[1:]
 			op.operands = append(op.operands, operationNode{"", Generate(opKey, value)})
 		case value.IsObject():
-			// is an normal key with an object as the value
+			// is a normal key with an object as the value
 			//   "foo": {
 			//       ".bar": "baz"
 			//   }
 			opKey := key.String()
 			op.operands = append(op.operands, operationNode{opKey, Generate("and", value)})
 		default:
-			// is an normal key with a non-object as the value
+			// is a normal key with a non-object as the value
 			//   "foo": "bar"
 			opKey := key.String()
 			op.operands = append(op.operands, operationNode{opKey, Generate("eq", value)})
@@ -79,7 +80,7 @@ func (op *andOperator) Eval(payload gjson.Result) bool {
 			// is an operator
 			res = res && operand.filter.Eval(payload)
 		} else {
-			// is an normal key
+			// is a normal key
 			val := payload.Get(operand.key)
 			res = res && operand.filter.Eval(val)
 		}

modules/filter/middlewares.go

@@ -0,0 +1,45 @@
+package filter
+
+import (
+	"os"
+	"sync"
+
+	"github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
+)
+
+var (
+	filters     = make(map[string]Filter)
+	filterMutex sync.RWMutex
+)
+
+// Add adds a filter to the list of filters
+func Add(file string) {
+	if file == "" {
+		return
+	}
+	bs, err := os.ReadFile(file)
+	if err != nil {
+		logrus.Error("init filter error: ", err)
+		return
+	}
+	defer func() {
+		if err := recover(); err != nil {
+			logrus.Error("init filter error: ", err)
+		}
+	}()
+	filter := Generate("and", gjson.ParseBytes(bs))
+	filterMutex.Lock()
+	filters[file] = filter
+	filterMutex.Unlock()
+}
+
+// Find returns the filter for the given file
+func Find(file string) Filter {
+	if file == "" {
+		return nil
+	}
+	filterMutex.RLock()
+	defer filterMutex.RUnlock()
+	return filters[file]
+}

modules/mime/mime.go

@@ -1,70 +0,0 @@
-// Package mime 提供MIME检查功能
-package mime
-
-import (
-	"io"
-
-	"github.com/gabriel-vasile/mimetype"
-	"github.com/sirupsen/logrus"
-
-	"github.com/Mrs4s/go-cqhttp/internal/base"
-)
-
-func init() {
-	base.IsLawfulAudio = checkImage
-	base.IsLawfulAudio = checkAudio
-}
-
-// keep sync with /docs/file.md#MINE
-var lawfulImage = [...]string{
-	"image/bmp",
-	"image/gif",
-	"image/jpeg",
-	"image/png",
-	"image/webp",
-}
-
-var lawfulAudio = [...]string{
-	"audio/aac",
-	"audio/aiff",
-	"audio/amr",
-	"audio/ape",
-	"audio/flac",
-	"audio/midi",
-	"audio/mp4",
-	"audio/mpeg",
-	"audio/ogg",
-	"audio/wav",
-	"audio/x-m4a",
-}
-
-func check(r io.ReadSeeker, list []string) (bool, string) {
-	if base.SkipMimeScan {
-		return true, ""
-	}
-	_, _ = r.Seek(0, io.SeekStart)
-	defer r.Seek(0, io.SeekStart)
-	t, err := mimetype.DetectReader(r)
-	if err != nil {
-		logrus.Debugf("扫描 Mime 时出现问题: %v", err)
-		return false, ""
-	}
-	for _, lt := range list {
-		if t.Is(lt) {
-			return true, t.String()
-		}
-	}
-	return false, t.String()
-}
-
-// checkImage 判断给定流是否为合法图片
-// 返回 是否合法, 实际Mime
-// 判断后会自动将 Stream Seek 至 0
-func checkImage(r io.ReadSeeker) (bool, string) {
-	return check(r, lawfulImage[:])
-}
-
-// checkImage 判断给定流是否为合法音频
-func checkAudio(r io.ReadSeeker) (bool, string) {
-	return check(r, lawfulAudio[:])
-}

modules/pprof/pprof.go

@@ -0,0 +1,75 @@
+// Package pprof provide pprof server of go-cqhttp
+package pprof
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/pprof"
+	"os"
+	"time"
+
+	log "github.com/sirupsen/logrus"
+	"gopkg.in/yaml.v3"
+
+	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/modules/config"
+	"github.com/Mrs4s/go-cqhttp/modules/servers"
+)
+
+const pprofDefault = `  # pprof 性能分析服务器, 一般情况下不需要启用.
+  # 如果遇到性能问题请上传报告给开发者处理
+  # 注意: pprof服务不支持中间件、不支持鉴权. 请不要开放到公网
+  - pprof:
+      # pprof服务器监听地址
+      host: 127.0.0.1
+      # pprof服务器监听端口
+      port: 7700
+`
+
+// pprofServer pprof性能分析服务器相关配置
+type pprofServer struct {
+	Disabled bool   `yaml:"disabled"`
+	Host     string `yaml:"host"`
+	Port     int    `yaml:"port"`
+}
+
+func init() {
+	config.AddServer(&config.Server{
+		Brief:   "pprof 性能分析服务器",
+		Default: pprofDefault,
+	})
+}
+
+// runPprof 启动 pprof 性能分析服务器
+func runPprof(_ *coolq.CQBot, node yaml.Node) {
+	var conf pprofServer
+	switch err := node.Decode(&conf); {
+	case err != nil:
+		log.Warn("读取pprof配置失败 :", err)
+		fallthrough
+	case conf.Disabled:
+		return
+	}
+
+	addr := fmt.Sprintf("%s:%d", conf.Host, conf.Port)
+	mux := http.NewServeMux()
+	mux.HandleFunc("/debug/pprof/", pprof.Index)
+	mux.HandleFunc("/debug/pprof/cmdline", pprof.Cmdline)
+	mux.HandleFunc("/debug/pprof/profile", pprof.Profile)
+	mux.HandleFunc("/debug/pprof/symbol", pprof.Symbol)
+	mux.HandleFunc("/debug/pprof/trace", pprof.Trace)
+	server := http.Server{Addr: addr, Handler: mux}
+	log.Infof("pprof debug 服务器已启动: %v/debug/pprof", addr)
+	log.Warnf("警告: pprof 服务不支持鉴权, 请不要运行在公网.")
+	if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+		log.Error(err)
+		log.Infof("pprof 服务启动失败, 请检查端口是否被占用.")
+		log.Warnf("将在五秒后退出.")
+		time.Sleep(time.Second * 5)
+		os.Exit(1)
+	}
+}
+
+func init() {
+	servers.Register("pprof", runPprof)
+}

modules/servers/servers.go

@@ -8,7 +8,10 @@ import (
 	"github.com/Mrs4s/go-cqhttp/internal/base"
 )
 
-var svr = make(map[string]func(*coolq.CQBot, yaml.Node))
+var (
+	svr      = make(map[string]func(*coolq.CQBot, yaml.Node))
+	nocfgsvr = make(map[string]func(*coolq.CQBot))
+)
 
 // Register 注册 Server
 func Register(name string, proc func(*coolq.CQBot, yaml.Node)) {
@@ -19,6 +22,15 @@ func Register(name string, proc func(*coolq.CQBot, yaml.Node)) {
 	svr[name] = proc
 }
 
+// RegisterCustom 注册无需 config 的自定义 Server
+func RegisterCustom(name string, proc func(*coolq.CQBot)) {
+	_, ok := nocfgsvr[name]
+	if ok {
+		panic(name + " server has existed")
+	}
+	nocfgsvr[name] = proc
+}
+
 // Run 运行所有svr
 func Run(bot *coolq.CQBot) {
 	for _, l := range base.Servers {
@@ -28,4 +40,8 @@ func Run(bot *coolq.CQBot) {
 			}
 		}
 	}
+	for _, fn := range nocfgsvr {
+		go fn(bot)
+	}
+	base.Servers = nil
 }

server/api.go

@@ -1,455 +0,0 @@
-package server
-
-import (
-	"strings"
-
-	"github.com/Mrs4s/go-cqhttp/coolq"
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/internal/param"
-
-	"github.com/tidwall/gjson"
-)
-
-type resultGetter interface {
-	Get(string) gjson.Result
-}
-
-type handler func(action string, p resultGetter) global.MSG
-
-type apiCaller struct {
-	bot      *coolq.CQBot
-	handlers []handler
-}
-
-func getLoginInfo(bot *coolq.CQBot, _ resultGetter) global.MSG {
-	return bot.CQGetLoginInfo()
-}
-
-func getQiDianAccountInfo(bot *coolq.CQBot, _ resultGetter) global.MSG {
-	return bot.CQGetQiDianAccountInfo()
-}
-
-func getFriendList(bot *coolq.CQBot, _ resultGetter) global.MSG {
-	return bot.CQGetFriendList()
-}
-
-func getUnidirectionalFriendList(bot *coolq.CQBot, _ resultGetter) global.MSG {
-	return bot.CQGetUnidirectionalFriendList()
-}
-
-func deleteFriend(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQDeleteFriend(p.Get("[user_id,id].0").Int())
-}
-
-func deleteUnidirectionalFriend(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQDeleteUnidirectionalFriend(p.Get("user_id").Int())
-}
-
-func getGroupList(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetGroupList(p.Get("no_cache").Bool())
-}
-
-func getGroupInfo(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetGroupInfo(p.Get("group_id").Int(), p.Get("no_cache").Bool())
-}
-
-func getGroupMemberList(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetGroupMemberList(p.Get("group_id").Int(), p.Get("no_cache").Bool())
-}
-
-func getGroupMemberInfo(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetGroupMemberInfo(
-		p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("no_cache").Bool(),
-	)
-}
-
-func sendMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
-	autoEscape := param.EnsureBool(p.Get("auto_escape"), false)
-	if p.Get("message_type").Str == "private" {
-		return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("group_id").Int(), p.Get("message"), autoEscape)
-	}
-	if p.Get("message_type").Str == "group" {
-		return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), autoEscape)
-	}
-	if p.Get("user_id").Int() != 0 {
-		return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("group_id").Int(), p.Get("message"), autoEscape)
-	}
-	if p.Get("group_id").Int() != 0 {
-		return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"), autoEscape)
-	}
-	return global.MSG{}
-}
-
-func sendGroupMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"),
-		param.EnsureBool(p.Get("auto_escape"), false))
-}
-
-func sendGroupForwardMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQSendGroupForwardMessage(p.Get("group_id").Int(), p.Get("messages"))
-}
-
-func sendPrivateMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("group_id").Int(), p.Get("message"),
-		param.EnsureBool(p.Get("auto_escape"), false))
-}
-
-func deleteMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQDeleteMessage(int32(p.Get("message_id").Int()))
-}
-
-func setFriendAddRequest(bot *coolq.CQBot, p resultGetter) global.MSG {
-	apr := true
-	if p.Get("approve").Exists() {
-		apr = p.Get("approve").Bool()
-	}
-	return bot.CQProcessFriendRequest(p.Get("flag").Str, apr)
-}
-
-func setGroupAddRequest(bot *coolq.CQBot, p resultGetter) global.MSG {
-	subType := p.Get("sub_type").Str
-	apr := true
-	if subType == "" {
-		subType = p.Get("type").Str
-	}
-	if p.Get("approve").Exists() {
-		apr = p.Get("approve").Bool()
-	}
-	return bot.CQProcessGroupRequest(p.Get("flag").Str, subType, p.Get("reason").Str, apr)
-}
-
-func setGroupCard(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQSetGroupCard(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("card").Str)
-}
-
-func setGroupSpecialTitle(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQSetGroupSpecialTitle(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("special_title").Str)
-}
-
-func setGroupKick(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQSetGroupKick(p.Get("group_id").Int(), p.Get("user_id").Int(), p.Get("message").Str, p.Get("reject_add_request").Bool())
-}
-
-func setGroupBan(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQSetGroupBan(p.Get("group_id").Int(), p.Get("user_id").Int(), func() uint32 {
-		if p.Get("duration").Exists() {
-			return uint32(p.Get("duration").Int())
-		}
-		return 1800
-	}())
-}
-
-func setGroupWholeBan(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQSetGroupWholeBan(p.Get("group_id").Int(), func() bool {
-		if p.Get("enable").Exists() {
-			return p.Get("enable").Bool()
-		}
-		return true
-	}())
-}
-
-func setGroupName(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQSetGroupName(p.Get("group_id").Int(), p.Get("group_name").Str)
-}
-
-func setGroupAdmin(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQSetGroupAdmin(p.Get("group_id").Int(), p.Get("user_id").Int(), func() bool {
-		if p.Get("enable").Exists() {
-			return p.Get("enable").Bool()
-		}
-		return true
-	}())
-}
-
-func sendGroupNotice(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQSetGroupMemo(p.Get("group_id").Int(), p.Get("content").Str, p.Get("image").String())
-}
-
-func setGroupLeave(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQSetGroupLeave(p.Get("group_id").Int())
-}
-
-func getImage(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetImage(p.Get("file").Str)
-}
-
-func getForwardMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
-	id := p.Get("message_id").Str
-	if id == "" {
-		id = p.Get("id").Str
-	}
-	return bot.CQGetForwardMessage(id)
-}
-
-func getMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetMessage(int32(p.Get("message_id").Int()))
-}
-
-func downloadFile(bot *coolq.CQBot, p resultGetter) global.MSG {
-	headers := map[string]string{}
-	headersToken := p.Get("headers")
-	if headersToken.IsArray() {
-		for _, sub := range headersToken.Array() {
-			str := strings.SplitN(sub.String(), "=", 2)
-			if len(str) == 2 {
-				headers[str[0]] = str[1]
-			}
-		}
-	}
-	if headersToken.Type == gjson.String {
-		lines := strings.Split(headersToken.String(), "\r\n")
-		for _, sub := range lines {
-			str := strings.SplitN(sub, "=", 2)
-			if len(str) == 2 {
-				headers[str[0]] = str[1]
-			}
-		}
-	}
-	return bot.CQDownloadFile(p.Get("url").Str, headers, int(p.Get("thread_count").Int()))
-}
-
-func getGroupHonorInfo(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetGroupHonorInfo(p.Get("group_id").Int(), p.Get("type").Str)
-}
-
-func setRestart(_ *coolq.CQBot, _ resultGetter) global.MSG {
-	/*
-		var delay int64
-		delay = p.Get("delay").Int()
-		if delay < 0 {
-			delay = 0
-		}
-		defer func(delay int64) {
-			time.Sleep(time.Duration(delay) * time.Millisecond)
-			Restart <- struct{}{}
-		}(delay)
-	*/
-	return global.MSG{"data": nil, "retcode": 99, "msg": "restart un-supported now", "wording": "restart函数暂不兼容", "status": "failed"}
-}
-
-func canSendImage(bot *coolq.CQBot, _ resultGetter) global.MSG {
-	return bot.CQCanSendImage()
-}
-
-func canSendRecord(bot *coolq.CQBot, _ resultGetter) global.MSG {
-	return bot.CQCanSendRecord()
-}
-
-func getStrangerInfo(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetStrangerInfo(p.Get("user_id").Int())
-}
-
-func getStatus(bot *coolq.CQBot, _ resultGetter) global.MSG {
-	return bot.CQGetStatus()
-}
-
-func getVersionInfo(bot *coolq.CQBot, _ resultGetter) global.MSG {
-	return bot.CQGetVersionInfo()
-}
-
-func getGroupSystemMSG(bot *coolq.CQBot, _ resultGetter) global.MSG {
-	return bot.CQGetGroupSystemMessages()
-}
-
-func getGroupFileSystemInfo(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetGroupFileSystemInfo(p.Get("group_id").Int())
-}
-
-func getGroupRootFiles(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetGroupRootFiles(p.Get("group_id").Int())
-}
-
-func getGroupFilesByFolder(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetGroupFilesByFolderID(p.Get("group_id").Int(), p.Get("folder_id").Str)
-}
-
-func getGroupFileURL(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetGroupFileURL(p.Get("group_id").Int(), p.Get("file_id").Str, int32(p.Get("busid").Int()))
-}
-
-func uploadGroupFile(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQUploadGroupFile(p.Get("group_id").Int(), p.Get("file").Str, p.Get("name").Str, p.Get("folder").Str)
-}
-
-func groupFileCreateFolder(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGroupFileCreateFolder(p.Get("group_id").Int(), p.Get("folder_id").Str, p.Get("name").Str)
-}
-
-func deleteGroupFolder(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGroupFileDeleteFolder(p.Get("group_id").Int(), p.Get("folder_id").Str)
-}
-
-func deleteGroupFile(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGroupFileDeleteFile(p.Get("group_id").Int(), p.Get("file_id").Str, int32(p.Get("bus_id").Int()))
-}
-
-func getGroupMsgHistory(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetGroupMessageHistory(p.Get("group_id").Int(), p.Get("message_seq").Int())
-}
-
-func getVipInfo(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetVipInfo(p.Get("user_id").Int())
-}
-
-func reloadEventFilter(_ *coolq.CQBot, p resultGetter) global.MSG {
-	addFilter(p.Get("file").String())
-	return coolq.OK(nil)
-}
-
-func getGroupAtAllRemain(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetAtAllRemain(p.Get("group_id").Int())
-}
-
-func ocrImage(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQOcrImage(p.Get("image").Str)
-}
-
-func getOnlineClients(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetOnlineClients(p.Get("no_cache").Bool())
-}
-
-func getWordSlices(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetWordSlices(p.Get("content").Str)
-}
-
-func setGroupPortrait(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQSetGroupPortrait(p.Get("group_id").Int(), p.Get("file").String(), p.Get("cache").String())
-}
-
-func setEssenceMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQSetEssenceMessage(int32(p.Get("message_id").Int()))
-}
-
-func deleteEssenceMSG(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQDeleteEssenceMessage(int32(p.Get("message_id").Int()))
-}
-
-func getEssenceMsgList(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetEssenceMessageList(p.Get("group_id").Int())
-}
-
-func checkURLSafely(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQCheckURLSafely(p.Get("url").String())
-}
-
-func setGroupAnonymousBan(bot *coolq.CQBot, p resultGetter) global.MSG {
-	obj := p.Get("anonymous")
-	flag := p.Get("anonymous_flag")
-	if !flag.Exists() {
-		flag = p.Get("flag")
-	}
-	if !flag.Exists() && !obj.Exists() {
-		return coolq.Failed(100, "FLAG_NOT_FOUND", "flag未找到")
-	}
-	if !flag.Exists() {
-		flag = obj.Get("flag")
-	}
-	return bot.CQSetGroupAnonymousBan(p.Get("group_id").Int(), flag.String(), int32(p.Get("duration").Int()))
-}
-
-func handleQuickOperation(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQHandleQuickOperation(p.Get("context"), p.Get("operation"))
-}
-
-func getModelShow(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQGetModelShow(p.Get("model").String())
-}
-
-func setModelShow(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQSetModelShow(p.Get("model").String(), p.Get("model_show").String())
-}
-
-func markMSGAsRead(bot *coolq.CQBot, p resultGetter) global.MSG {
-	return bot.CQMarkMessageAsRead(int32(p.Get("message_id").Int()))
-}
-
-// API 是go-cqhttp当前支持的所有api的映射表
-var API = map[string]func(*coolq.CQBot, resultGetter) global.MSG{
-	"get_login_info":                 getLoginInfo,
-	"get_friend_list":                getFriendList,
-	"get_unidirectional_friend_list": getUnidirectionalFriendList,
-	"delete_friend":                  deleteFriend,
-	"delete_unidirectional_friend":   deleteUnidirectionalFriend,
-	"get_group_list":                 getGroupList,
-	"get_group_info":                 getGroupInfo,
-	"get_group_member_list":          getGroupMemberList,
-	"get_group_member_info":          getGroupMemberInfo,
-	"send_msg":                       sendMSG,
-	"send_group_msg":                 sendGroupMSG,
-	"send_group_forward_msg":         sendGroupForwardMSG,
-	"send_private_msg":               sendPrivateMSG,
-	"delete_msg":                     deleteMSG,
-	"set_friend_add_request":         setFriendAddRequest,
-	"set_group_add_request":          setGroupAddRequest,
-	"set_group_card":                 setGroupCard,
-	"set_group_special_title":        setGroupSpecialTitle,
-	"set_group_kick":                 setGroupKick,
-	"set_group_ban":                  setGroupBan,
-	"set_group_whole_ban":            setGroupWholeBan,
-	"set_group_name":                 setGroupName,
-	"set_group_admin":                setGroupAdmin,
-	"_send_group_notice":             sendGroupNotice,
-	"set_group_leave":                setGroupLeave,
-	"get_image":                      getImage,
-	"get_forward_msg":                getForwardMSG,
-	"get_msg":                        getMSG,
-	"download_file":                  downloadFile,
-	"get_group_honor_info":           getGroupHonorInfo,
-	"set_restart":                    setRestart,
-	"can_send_image":                 canSendImage,
-	"can_send_record":                canSendRecord,
-	"get_stranger_info":              getStrangerInfo,
-	"get_status":                     getStatus,
-	"get_version_info":               getVersionInfo,
-	"get_group_system_msg":           getGroupSystemMSG,
-	"get_group_file_system_info":     getGroupFileSystemInfo,
-	"get_group_root_files":           getGroupRootFiles,
-	"get_group_files_by_folder":      getGroupFilesByFolder,
-	"get_group_file_url":             getGroupFileURL,
-	"create_group_file_folder":       groupFileCreateFolder,
-	"delete_group_folder":            deleteGroupFolder,
-	"delete_group_file":              deleteGroupFile,
-	"upload_group_file":              uploadGroupFile,
-	"get_group_msg_history":          getGroupMsgHistory,
-	"_get_vip_info":                  getVipInfo,
-	"reload_event_filter":            reloadEventFilter,
-	".ocr_image":                     ocrImage,
-	"ocr_image":                      ocrImage,
-	"get_group_at_all_remain":        getGroupAtAllRemain,
-	"get_online_clients":             getOnlineClients,
-	".get_word_slices":               getWordSlices,
-	"set_group_portrait":             setGroupPortrait,
-	"set_essence_msg":                setEssenceMSG,
-	"delete_essence_msg":             deleteEssenceMSG,
-	"get_essence_msg_list":           getEssenceMsgList,
-	"check_url_safely":               checkURLSafely,
-	"set_group_anonymous_ban":        setGroupAnonymousBan,
-	".handle_quick_operation":        handleQuickOperation,
-	"qidian_get_account_info":        getQiDianAccountInfo,
-	"_get_model_show":                getModelShow,
-	"_set_model_show":                setModelShow,
-	"mark_msg_as_read":               markMSGAsRead,
-}
-
-func (api *apiCaller) callAPI(action string, p resultGetter) global.MSG {
-	for _, fn := range api.handlers {
-		if ret := fn(action, p); ret != nil {
-			return ret
-		}
-	}
-	if f, ok := API[action]; ok {
-		return f(api.bot, p)
-	}
-	return coolq.Failed(404, "API_NOT_FOUND", "API不存在")
-}
-
-func (api *apiCaller) use(middlewares ...handler) {
-	api.handlers = append(api.handlers, middlewares...)
-}
-
-func newAPICaller(bot *coolq.CQBot) *apiCaller {
-	return &apiCaller{
-		bot:      bot,
-		handlers: []handler{},
-	}
-}

server/daemon.go

@@ -3,9 +3,10 @@ package server
 // daemon 功能写在这，目前仅支持了-d 作为后台运行参数，stop，start，restart这些功能目前看起来并不需要，可以通过api控制，后续需要的话再补全。
 
 import (
-	"fmt"
 	"os"
 	"os/exec"
+	"path/filepath"
+	"strconv"
 	"strings"
 
 	"github.com/Mrs4s/go-cqhttp/global"
@@ -28,7 +29,9 @@ func Daemon() {
 		execArgs = append(execArgs, args[i])
 	}
 
-	proc := exec.Command(os.Args[0], execArgs...)
+	ex, _ := os.Executable()
+	p, _ := filepath.Abs(ex)
+	proc := exec.Command(p, execArgs...)
 	err := proc.Start()
 	if err != nil {
 		panic(err)
@@ -36,7 +39,7 @@ func Daemon() {
 
 	log.Info("[PID] ", proc.Process.Pid)
 	// pid写入到pid文件中，方便后续stop的时候kill
-	pidErr := savePid("go-cqhttp.pid", fmt.Sprintf("%d", proc.Process.Pid))
+	pidErr := savePid("go-cqhttp.pid", strconv.FormatInt(int64(proc.Process.Pid), 10))
 	if pidErr != nil {
 		log.Errorf("save pid file error: %v", pidErr)
 	}

server/doc.go

@@ -8,6 +8,5 @@ func init() {
 	servers.Register("http", runHTTP)
 	servers.Register("ws", runWSServer)
 	servers.Register("ws-reverse", runWSClient)
-	servers.Register("pprof", runPprof)
 	servers.Register("lambda", runLambda)
 }

server/http.go

@@ -1,17 +1,20 @@
 package server
 
 import (
+	"bytes"
 	"context"
 	"crypto/hmac"
 	"crypto/sha1"
+	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
-	"math/rand"
+	"net"
 	"net/http"
 	"net/url"
 	"os"
+	"regexp"
 	"strconv"
 	"strings"
 	"time"
@@ -23,24 +26,50 @@ import (
 
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/modules/api"
 	"github.com/Mrs4s/go-cqhttp/modules/config"
+	"github.com/Mrs4s/go-cqhttp/modules/filter"
 )
 
+// HTTPServer HTTP通信相关配置
+type HTTPServer struct {
+	Disabled    bool   `yaml:"disabled"`
+	Address     string `yaml:"address"`
+	Host        string `yaml:"host"`
+	Port        int    `yaml:"port"`
+	Timeout     int32  `yaml:"timeout"`
+	LongPolling struct {
+		Enabled      bool `yaml:"enabled"`
+		MaxQueueSize int  `yaml:"max-queue-size"`
+	} `yaml:"long-polling"`
+	Post []httpServerPost `yaml:"post"`
+
+	MiddleWares `yaml:"middlewares"`
+}
+
+type httpServerPost struct {
+	URL             string  `yaml:"url"`
+	Secret          string  `yaml:"secret"`
+	MaxRetries      *uint64 `yaml:"max-retries"`
+	RetriesInterval *uint64 `yaml:"retries-interval"`
+}
+
 type httpServer struct {
-	HTTP        *http.Server
-	api         *apiCaller
+	api         *api.Caller
 	accessToken string
 }
 
 // HTTPClient 反向HTTP上报客户端
 type HTTPClient struct {
-	bot     *coolq.CQBot
-	secret  string
-	addr    string
-	filter  string
-	apiPort int
-	timeout int32
+	bot             *coolq.CQBot
+	secret          string
+	addr            string
+	filter          string
+	apiPort         int
+	timeout         int32
+	client          *http.Client
+	MaxRetries      uint64
+	RetriesInterval uint64
 }
 
 type httpCtx struct {
@@ -49,11 +78,43 @@ type httpCtx struct {
 	postForm url.Values
 }
 
-func (h *httpCtx) Get(s string) gjson.Result {
-	j := h.json.Get(s)
-	if j.Exists() {
-		return j
+const httpDefault = `
+  - http: # HTTP 通信设置
+      address: 0.0.0.0:5700 # HTTP监听地址
+      timeout: 5      # 反向 HTTP 超时时间, 单位秒，<5 时将被忽略
+      long-polling:   # 长轮询拓展
+        enabled: false       # 是否开启
+        max-queue-size: 2000 # 消息队列大小，0 表示不限制队列大小，谨慎使用
+      middlewares:
+        <<: *default # 引用默认中间件
+      post:           # 反向HTTP POST地址列表
+      #- url: ''                # 地址
+      #  secret: ''             # 密钥
+      #  max-retries: 3         # 最大重试，0 时禁用
+      #  retries-interval: 1500 # 重试时间，单位毫秒，0 时立即
+      #- url: http://127.0.0.1:5701/ # 地址
+      #  secret: ''                  # 密钥
+      #  max-retries: 10             # 最大重试，0 时禁用
+      #  retries-interval: 1000      # 重试时间，单位毫秒，0 时立即
+`
+
+func init() {
+	config.AddServer(&config.Server{Brief: "HTTP通信", Default: httpDefault})
+}
+
+var joinQuery = regexp.MustCompile(`\[(.+?),(.+?)]\.0`)
+
+func (h *httpCtx) get(s string, join bool) gjson.Result {
+	// support gjson advanced syntax:
+	// h.Get("[a,b].0") see usage in http_test.go
+	if join && joinQuery.MatchString(s) {
+		matched := joinQuery.FindStringSubmatch(s)
+		if r := h.get(matched[1], false); r.Exists() {
+			return r
+		}
+		return h.get(matched[2], false)
 	}
+
 	validJSONParam := func(p string) bool {
 		return (strings.HasPrefix(p, "{") || strings.HasPrefix(p, "[")) && gjson.Valid(p)
 	}
@@ -76,6 +137,14 @@ func (h *httpCtx) Get(s string) gjson.Result {
 	return gjson.Result{}
 }
 
+func (h *httpCtx) Get(s string) gjson.Result {
+	j := h.json.Get(s)
+	if j.Exists() {
+		return j
+	}
+	return h.get(s, true)
+}
+
 func (s *httpServer) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
 	var ctx httpCtx
 	contentType := request.Header.Get("Content-Type")
@@ -118,15 +187,15 @@ func (s *httpServer) ServeHTTP(writer http.ResponseWriter, request *http.Request
 	}
 
 	var response global.MSG
-	if base.AcceptOneBotV12HTTPEndPoint && request.URL.Path == "/" {
+	if request.URL.Path == "/" {
 		action := strings.TrimSuffix(ctx.Get("action").Str, "_async")
 		log.Debugf("HTTPServer接收到API调用: %v", action)
-		response = s.api.callAPI(action, ctx.Get("params"))
+		response = s.api.Call(action, ctx.Get("params"))
 	} else {
 		action := strings.TrimPrefix(request.URL.Path, "/")
 		action = strings.TrimSuffix(action, "_async")
 		log.Debugf("HTTPServer接收到API调用: %v", action)
-		response = s.api.callAPI(action, &ctx)
+		response = s.api.Call(action, &ctx)
 	}
 
 	writer.Header().Set("Content-Type", "application/json; charset=utf-8")
@@ -143,9 +212,9 @@ func checkAuth(req *http.Request, token string) int {
 	if auth == "" {
 		auth = req.URL.Query().Get("access_token")
 	} else {
-		authN := strings.SplitN(auth, " ", 2)
-		if len(authN) == 2 {
-			auth = authN[1]
+		_, after, ok := strings.Cut(auth, " ")
+		if ok {
+			auth = after
 		}
 	}
 
@@ -159,9 +228,16 @@ func checkAuth(req *http.Request, token string) int {
 	}
 }
 
+func puint64Operator(p *uint64, def uint64) uint64 {
+	if p == nil {
+		return def
+	}
+	return *p
+}
+
 // runHTTP 启动HTTP服务器与HTTP上报客户端
 func runHTTP(bot *coolq.CQBot, node yaml.Node) {
-	var conf config.HTTPServer
+	var conf HTTPServer
 	switch err := node.Decode(&conf); {
 	case err != nil:
 		log.Warn("读取http配置失败 :", err)
@@ -170,44 +246,51 @@ func runHTTP(bot *coolq.CQBot, node yaml.Node) {
 		return
 	}
 
-	var addr string
+	network, addr := "tcp", conf.Address
 	s := &httpServer{accessToken: conf.AccessToken}
-	if conf.Host == "" || conf.Port == 0 {
+	switch {
+	case conf.Address != "":
+		uri, err := url.Parse(conf.Address)
+		if err == nil && uri.Scheme != "" {
+			network = uri.Scheme
+			addr = uri.Host + uri.Path
+		}
+	case conf.Host != "" || conf.Port != 0:
+		addr = fmt.Sprintf("%s:%d", conf.Host, conf.Port)
+		log.Warnln("HTTP 服务器使用了过时的配置格式，请更新配置文件！")
+	default:
 		goto client
 	}
-	addr = fmt.Sprintf("%s:%d", conf.Host, conf.Port)
-	s.api = newAPICaller(bot)
+	s.api = api.NewCaller(bot)
 	if conf.RateLimit.Enabled {
-		s.api.use(rateLimit(conf.RateLimit.Frequency, conf.RateLimit.Bucket))
+		s.api.Use(rateLimit(conf.RateLimit.Frequency, conf.RateLimit.Bucket))
 	}
 	if conf.LongPolling.Enabled {
-		s.api.use(longPolling(bot, conf.LongPolling.MaxQueueSize))
+		s.api.Use(longPolling(bot, conf.LongPolling.MaxQueueSize))
 	}
-
 	go func() {
-		log.Infof("CQ HTTP 服务器已启动: %v", addr)
-		s.HTTP = &http.Server{
-			Addr:    addr,
-			Handler: s,
-		}
-		if err := s.HTTP.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-			log.Error(err)
-			log.Infof("HTTP 服务启动失败, 请检查端口是否被占用.")
+		listener, err := net.Listen(network, addr)
+		if err != nil {
+			log.Infof("HTTP 服务启动失败, 请检查端口是否被占用: %v", err)
 			log.Warnf("将在五秒后退出.")
 			time.Sleep(time.Second * 5)
 			os.Exit(1)
 		}
+		log.Infof("CQ HTTP 服务器已启动: %v", listener.Addr())
+		log.Fatal(http.Serve(listener, s))
 	}()
 client:
 	for _, c := range conf.Post {
 		if c.URL != "" {
 			go HTTPClient{
-				bot:     bot,
-				secret:  c.Secret,
-				addr:    c.URL,
-				apiPort: conf.Port,
-				filter:  conf.Filter,
-				timeout: conf.Timeout,
+				bot:             bot,
+				secret:          c.Secret,
+				addr:            c.URL,
+				apiPort:         conf.Port,
+				filter:          conf.Filter,
+				timeout:         conf.Timeout,
+				MaxRetries:      puint64Operator(c.MaxRetries, 3),
+				RetriesInterval: puint64Operator(c.RetriesInterval, 1500),
 			}.Run()
 		}
 	}
@@ -215,62 +298,85 @@ client:
 
 // Run 运行反向HTTP服务
 func (c HTTPClient) Run() {
-	addFilter(c.filter)
+	filter.Add(c.filter)
 	if c.timeout < 5 {
 		c.timeout = 5
 	}
+	rawAddress := c.addr
+	network, address := resolveURI(c.addr)
+	client := &http.Client{
+		Timeout: time.Second * time.Duration(c.timeout),
+		Transport: &http.Transport{
+			DialContext: func(_ context.Context, _, addr string) (net.Conn, error) {
+				if network == "unix" {
+					host, _, err := net.SplitHostPort(addr)
+					if err != nil {
+						host = addr
+					}
+					filepath, err := base64.RawURLEncoding.DecodeString(host)
+					if err == nil {
+						addr = string(filepath)
+					}
+				}
+				return net.Dial(network, addr)
+			},
+		},
+	}
+	c.addr = address // clean path
+	c.client = client
+	log.Infof("HTTP POST上报器已启动: %v", rawAddress)
 	c.bot.OnEventPush(c.onBotPushEvent)
-	log.Infof("HTTP POST上报器已启动: %v", c.addr)
 }
 
 func (c *HTTPClient) onBotPushEvent(e *coolq.Event) {
 	if c.filter != "" {
-		filter := findFilter(c.filter)
-		if filter != nil && !filter.Eval(gjson.Parse(e.JSONString())) {
+		flt := filter.Find(c.filter)
+		if flt != nil && !flt.Eval(gjson.Parse(e.JSONString())) {
 			log.Debugf("上报Event %v 到 HTTP 服务器 %s 时被过滤.", c.addr, e.JSONBytes())
 			return
 		}
 	}
 
-	client := http.Client{Timeout: time.Second * time.Duration(c.timeout)}
-	req, _ := http.NewRequest("POST", c.addr, nil)
-	req.Header.Set("X-Self-ID", strconv.FormatInt(c.bot.Client.Uin, 10))
-	req.Header.Set("User-Agent", "CQHttp/4.15.0")
+	header := make(http.Header)
+	header.Set("X-Self-ID", strconv.FormatInt(c.bot.Client.Uin, 10))
+	header.Set("User-Agent", "CQHttp/4.15.0")
+	header.Set("Content-Type", "application/json")
 	if c.secret != "" {
 		mac := hmac.New(sha1.New, []byte(c.secret))
 		_, _ = mac.Write(e.JSONBytes())
-		req.Header.Set("X-Signature", "sha1="+hex.EncodeToString(mac.Sum(nil)))
+		header.Set("X-Signature", "sha1="+hex.EncodeToString(mac.Sum(nil)))
 	}
 	if c.apiPort != 0 {
-		req.Header.Set("X-API-Port", strconv.FormatInt(int64(c.apiPort), 10))
+		header.Set("X-API-Port", strconv.FormatInt(int64(c.apiPort), 10))
 	}
 
+	var req *http.Request
 	var res *http.Response
 	var err error
-	const maxAttemptTimes = 5
-
-	for i := 0; i <= maxAttemptTimes; i++ {
-		res, err = client.Do(req)
+	for i := uint64(0); i <= c.MaxRetries; i++ {
+		// see https://stackoverflow.com/questions/31337891/net-http-http-contentlength-222-with-body-length-0
+		// we should create a new request for every single post trial
+		req, err = http.NewRequest(http.MethodPost, c.addr, bytes.NewReader(e.JSONBytes()))
+		if err != nil {
+			log.Warnf("上报 Event 数据到 %v 时创建请求失败: %v", c.addr, err)
+			return
+		}
+		req.Header = header
+		res, err = c.client.Do(req) // nolint:bodyclose
 		if err == nil {
-			//goland:noinspection GoDeferInLoop
-			defer res.Body.Close()
 			break
 		}
-		if i != maxAttemptTimes {
+		if i < c.MaxRetries {
 			log.Warnf("上报 Event 数据到 %v 失败: %v 将进行第 %d 次重试", c.addr, err, i+1)
+		} else {
+			log.Warnf("上报 Event 数据 %s 到 %v 失败: %v 停止上报：已达重试上限", e.JSONBytes(), c.addr, err)
+			return
 		}
-		const maxWait = int64(time.Second * 3)
-		const minWait = int64(time.Millisecond * 500)
-		wait := rand.Int63n(maxWait-minWait) + minWait
-		time.Sleep(time.Duration(wait))
+		time.Sleep(time.Millisecond * time.Duration(c.RetriesInterval))
 	}
+	defer res.Body.Close()
 
-	if err != nil {
-		log.Warnf("上报Event数据 %s 到 %v 失败: %v", e.JSONBytes(), c.addr, err)
-		return
-	}
 	log.Debugf("上报Event数据 %s 到 %v", e.JSONBytes(), c.addr)
-
 	r, err := io.ReadAll(res.Body)
 	if err != nil {
 		return
@@ -279,14 +385,3 @@ func (c *HTTPClient) onBotPushEvent(e *coolq.Event) {
 		c.bot.CQHandleQuickOperation(gjson.Parse(e.JSONString()), gjson.ParseBytes(r))
 	}
 }
-
-func (s *httpServer) ShutDown() {
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-	if err := s.HTTP.Shutdown(ctx); err != nil {
-		log.Fatal("http Server Shutdown:", err)
-	}
-	<-ctx.Done()
-	log.Println("timeout of 5 seconds.")
-	log.Println("http Server exiting")
-}

server/http_test.go

@@ -0,0 +1,42 @@
+package server
+
+import (
+	"net/url"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/tidwall/gjson"
+)
+
+func TestHttpCtx_Get(t *testing.T) {
+	cases := []struct {
+		ctx      *httpCtx
+		key      string
+		expected string
+	}{
+		{
+			ctx: &httpCtx{
+				json: gjson.Result{},
+				query: url.Values{
+					"sub_type": []string{"hello"},
+					"type":     []string{"world"},
+				},
+			},
+			key:      "[sub_type,type].0",
+			expected: "hello",
+		},
+		{
+			ctx: &httpCtx{
+				json: gjson.Result{},
+				query: url.Values{
+					"type": []string{"114514"},
+				},
+			},
+			key:      "[sub_type,type].0",
+			expected: "114514",
+		},
+	}
+	for _, c := range cases {
+		assert.Equal(t, c.expected, c.ctx.Get(c.key).String())
+	}
+}

server/middlewares.go

@@ -3,105 +3,84 @@ package server
 import (
 	"container/list"
 	"context"
-	"os"
 	"sync"
 	"time"
 
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/modules/api"
 
-	log "github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
 	"golang.org/x/time/rate"
 )
 
-var (
-	filters     = make(map[string]global.Filter)
-	filterMutex sync.RWMutex
-)
+// MiddleWares 通信中间件
+type MiddleWares struct {
+	AccessToken string `yaml:"access-token"`
+	Filter      string `yaml:"filter"`
+	RateLimit   struct {
+		Enabled   bool    `yaml:"enabled"`
+		Frequency float64 `yaml:"frequency"`
+		Bucket    int     `yaml:"bucket"`
+	} `yaml:"rate-limit"`
+}
 
-func rateLimit(frequency float64, bucketSize int) handler {
+func rateLimit(frequency float64, bucketSize int) api.Handler {
 	limiter := rate.NewLimiter(rate.Limit(frequency), bucketSize)
-	return func(_ string, _ resultGetter) global.MSG {
+	return func(_ string, _ api.Getter) global.MSG {
 		_ = limiter.Wait(context.Background())
 		return nil
 	}
 }
 
-func addFilter(file string) {
-	if file == "" {
-		return
-	}
-	bs, err := os.ReadFile(file)
-	if err != nil {
-		log.Error("init filter error: ", err)
-		return
-	}
-	defer func() {
-		if err := recover(); err != nil {
-			log.Error("init filter error: ", err)
-		}
-	}()
-	filter := global.Generate("and", gjson.ParseBytes(bs))
-	filterMutex.Lock()
-	filters[file] = filter
-	filterMutex.Unlock()
-}
-
-func findFilter(file string) global.Filter {
-	if file == "" {
-		return nil
-	}
-	filterMutex.RLock()
-	defer filterMutex.RUnlock()
-	return filters[file]
-}
-
-func longPolling(bot *coolq.CQBot, maxSize int) handler {
+func longPolling(bot *coolq.CQBot, maxSize int) api.Handler {
 	var mutex sync.Mutex
 	cond := sync.NewCond(&mutex)
 	queue := list.New()
 	bot.OnEventPush(func(event *coolq.Event) {
 		mutex.Lock()
 		defer mutex.Unlock()
-		queue.PushBack(event.RawMsg)
+		queue.PushBack(event.Raw)
 		for maxSize != 0 && queue.Len() > maxSize {
 			queue.Remove(queue.Front())
 		}
 		cond.Signal()
 	})
-	return func(action string, p resultGetter) global.MSG {
+	return func(action string, p api.Getter) global.MSG {
 		if action != "get_updates" {
 			return nil
 		}
 		var (
-			once    sync.Once
-			ch      = make(chan []interface{}, 1)
+			ch      = make(chan []interface{})
 			timeout = time.Duration(p.Get("timeout").Int()) * time.Second
 		)
-		defer close(ch)
 		go func() {
 			mutex.Lock()
 			defer mutex.Unlock()
-			if queue.Len() == 0 {
+			for queue.Len() == 0 {
 				cond.Wait()
 			}
-			once.Do(func() {
-				limit := int(p.Get("limit").Int())
-				if limit <= 0 || queue.Len() < limit {
-					limit = queue.Len()
+			limit := int(p.Get("limit").Int())
+			if limit <= 0 || queue.Len() < limit {
+				limit = queue.Len()
+			}
+			ret := make([]interface{}, limit)
+			elem := queue.Front()
+			for i := 0; i < limit; i++ {
+				ret[i] = elem.Value
+				elem = elem.Next()
+			}
+			select {
+			case ch <- ret:
+				for i := 0; i < limit; i++ { // remove sent msg
+					queue.Remove(queue.Front())
 				}
-				ret := make([]interface{}, limit)
-				for i := 0; i < limit; i++ {
-					ret[i] = queue.Remove(queue.Front())
-				}
-				ch <- ret
-			})
+			default:
+				// don't block if parent already return due to timeout
+			}
 		}()
 		if timeout != 0 {
 			select {
 			case <-time.After(timeout):
-				once.Do(func() {})
 				return coolq.OK([]interface{}{})
 			case ret := <-ch:
 				return coolq.OK(ret)

server/pprof.go

@@ -1,47 +0,0 @@
-package server
-
-import (
-	"fmt"
-	"net/http"
-	"net/http/pprof"
-	"os"
-	"time"
-
-	log "github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v3"
-
-	"github.com/Mrs4s/go-cqhttp/coolq"
-	"github.com/Mrs4s/go-cqhttp/modules/config"
-)
-
-// runPprof 启动 pprof 性能分析服务器
-func runPprof(_ *coolq.CQBot, node yaml.Node) {
-	var conf config.PprofServer
-	switch err := node.Decode(&conf); {
-	case err != nil:
-		log.Warn("读取pprof配置失败 :", err)
-		fallthrough
-	case conf.Disabled:
-		return
-	}
-
-	addr := fmt.Sprintf("%s:%d", conf.Host, conf.Port)
-	mux := http.NewServeMux()
-	mux.HandleFunc("/debug/pprof/", pprof.Index)
-	mux.HandleFunc("/debug/pprof/cmdline", pprof.Cmdline)
-	mux.HandleFunc("/debug/pprof/profile", pprof.Profile)
-	mux.HandleFunc("/debug/pprof/symbol", pprof.Symbol)
-	mux.HandleFunc("/debug/pprof/trace", pprof.Trace)
-	server := http.Server{Addr: addr, Handler: mux}
-	go func() {
-		log.Infof("pprof debug 服务器已启动: %v/debug/pprof", addr)
-		log.Warnf("警告: pprof 服务不支持鉴权, 请不要运行在公网.")
-		if err := server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-			log.Error(err)
-			log.Infof("pprof 服务启动失败, 请检查端口是否被占用.")
-			log.Warnf("将在五秒后退出.")
-			time.Sleep(time.Second * 5)
-			os.Exit(1)
-		}
-	}()
-}

server/scf.go

@@ -17,6 +17,7 @@ import (
 
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
+	api2 "github.com/Mrs4s/go-cqhttp/modules/api"
 	"github.com/Mrs4s/go-cqhttp/modules/config"
 )
 
@@ -53,7 +54,7 @@ func (l *lambdaResponseWriter) flush() error {
 	buffer := global.NewBuffer()
 	defer global.PutBuffer(buffer)
 	body := utils.B2S(l.buf.Bytes())
-	header := make(map[string]string)
+	header := make(map[string]string, len(l.header))
 	for k, v := range l.header {
 		header[k] = v[0]
 	}
@@ -64,7 +65,7 @@ func (l *lambdaResponseWriter) flush() error {
 		Body:            body,
 	})
 
-	r, _ := http.NewRequest("POST", cli.responseURL, buffer)
+	r, _ := http.NewRequest(http.MethodPost, cli.responseURL, buffer)
 	do, err := cli.client.Do(r)
 	if err != nil {
 		return err
@@ -80,7 +81,7 @@ var cli *lambdaClient
 
 // runLambda  type: [scf,aws]
 func runLambda(bot *coolq.CQBot, node yaml.Node) {
-	var conf config.LambdaServer
+	var conf LambdaServer
 	switch err := node.Decode(&conf); {
 	case err != nil:
 		log.Warn("读取lambda配置失败 :", err)
@@ -115,9 +116,9 @@ func runLambda(bot *coolq.CQBot, node yaml.Node) {
 		log.Fatal("unknown lambda type:", conf.Type)
 	}
 
-	api := newAPICaller(bot)
+	api := api2.NewCaller(bot)
 	if conf.RateLimit.Enabled {
-		api.use(rateLimit(conf.RateLimit.Frequency, conf.RateLimit.Bucket))
+		api.Use(rateLimit(conf.RateLimit.Frequency, conf.RateLimit.Bucket))
 	}
 	server := &httpServer{
 		api:         api,
@@ -154,6 +155,28 @@ type lambdaInvoke struct {
 	} `json:"requestContext"`
 }
 
+const lambdaDefault = `  # LambdaServer 配置
+  - lambda:
+      type: scf # scf: 腾讯云函数 aws: aws Lambda
+      middlewares:
+        <<: *default # 引用默认中间件
+`
+
+// LambdaServer 云函数配置
+type LambdaServer struct {
+	Disabled bool   `yaml:"disabled"`
+	Type     string `yaml:"type"`
+
+	MiddleWares `yaml:"middlewares"`
+}
+
+func init() {
+	config.AddServer(&config.Server{
+		Brief:   "云函数服务",
+		Default: lambdaDefault,
+	})
+}
+
 func (c *lambdaClient) next() *http.Request {
 	r, err := http.NewRequest(http.MethodGet, c.nextURL, nil)
 	if err != nil {
@@ -167,9 +190,9 @@ func (c *lambdaClient) next() *http.Request {
 	if resp.StatusCode != http.StatusOK {
 		return nil
 	}
-	req := new(http.Request)
-	invoke := new(lambdaInvoke)
-	_ = json.NewDecoder(resp.Body).Decode(invoke)
+	var req http.Request
+	var invoke lambdaInvoke
+	_ = json.NewDecoder(resp.Body).Decode(&invoke)
 	if invoke.HTTPMethod == "" { // 不是 api 网关
 		return nil
 	}
@@ -188,5 +211,5 @@ func (c *lambdaClient) next() *http.Request {
 		query[k] = []string{v}
 	}
 	req.URL.RawQuery = query.Encode()
-	return req
+	return &req
 }

server/websocket.go

@@ -2,52 +2,71 @@ package server
 
 import (
 	"bytes"
+	"encoding/base64"
+	"encoding/json"
 	"fmt"
+	"net"
 	"net/http"
+	"net/url"
 	"runtime/debug"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 
+	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/RomiChan/websocket"
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
 	"gopkg.in/yaml.v3"
 
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/modules/api"
 	"github.com/Mrs4s/go-cqhttp/modules/config"
-
-	"github.com/Mrs4s/MiraiGo/utils"
-	"github.com/gorilla/websocket"
-	log "github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
+	"github.com/Mrs4s/go-cqhttp/modules/filter"
 )
 
 type webSocketServer struct {
 	bot  *coolq.CQBot
-	conf *config.WebsocketServer
+	conf *WebsocketServer
 
-	eventConn      []*webSocketConn
-	eventConnMutex sync.Mutex
-	token          string
-	handshake      string
-	filter         string
+	mu        sync.Mutex
+	eventConn []*wsConn
+
+	token     string
+	handshake string
+	filter    string
 }
 
 // websocketClient WebSocket客户端实例
 type websocketClient struct {
-	bot  *coolq.CQBot
-	conf *config.WebsocketReverse
+	bot       *coolq.CQBot
+	mu        sync.Mutex
+	universal *wsConn
+	event     *wsConn
 
-	universalConn *webSocketConn
-	eventConn     *webSocketConn
-	token         string
-	filter        string
+	token             string
+	filter            string
+	reconnectInterval time.Duration
+	limiter           api.Handler
 }
 
-type webSocketConn struct {
-	*websocket.Conn
-	sync.Mutex
-	apiCaller *apiCaller
+type wsConn struct {
+	mu        sync.Mutex
+	conn      *websocket.Conn
+	apiCaller *api.Caller
+}
+
+func (c *wsConn) WriteText(b []byte) error {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	_ = c.conn.SetWriteDeadline(time.Now().Add(time.Second * 15))
+	return c.conn.WriteMessage(websocket.TextMessage, b)
+}
+
+func (c *wsConn) Close() error {
+	return c.conn.Close()
 }
 
 var upgrader = websocket.Upgrader{
@@ -56,9 +75,64 @@ var upgrader = websocket.Upgrader{
 	},
 }
 
+const wsDefault = `  # 正向WS设置
+  - ws:
+      # 正向WS服务器监听地址
+      address: 0.0.0.0:8080
+      middlewares:
+        <<: *default # 引用默认中间件
+`
+
+const wsReverseDefault = `  # 反向WS设置
+  - ws-reverse:
+      # 反向WS Universal 地址
+      # 注意 设置了此项地址后下面两项将会被忽略
+      universal: ws://your_websocket_universal.server
+      # 反向WS API 地址
+      api: ws://your_websocket_api.server
+      # 反向WS Event 地址
+      event: ws://your_websocket_event.server
+      # 重连间隔 单位毫秒
+      reconnect-interval: 3000
+      middlewares:
+        <<: *default # 引用默认中间件
+`
+
+// WebsocketServer 正向WS相关配置
+type WebsocketServer struct {
+	Disabled bool   `yaml:"disabled"`
+	Address  string `yaml:"address"`
+	Host     string `yaml:"host"`
+	Port     int    `yaml:"port"`
+
+	MiddleWares `yaml:"middlewares"`
+}
+
+// WebsocketReverse 反向WS相关配置
+type WebsocketReverse struct {
+	Disabled          bool   `yaml:"disabled"`
+	Universal         string `yaml:"universal"`
+	API               string `yaml:"api"`
+	Event             string `yaml:"event"`
+	ReconnectInterval int    `yaml:"reconnect-interval"`
+
+	MiddleWares `yaml:"middlewares"`
+}
+
+func init() {
+	config.AddServer(&config.Server{
+		Brief:   "正向 Websocket 通信",
+		Default: wsDefault,
+	})
+	config.AddServer(&config.Server{
+		Brief:   "反向 Websocket 通信",
+		Default: wsReverseDefault,
+	})
+}
+
 // runWSServer 运行一个正向WS server
 func runWSServer(b *coolq.CQBot, node yaml.Node) {
-	var conf config.WebsocketServer
+	var conf WebsocketServer
 	switch err := node.Decode(&conf); {
 	case err != nil:
 		log.Warn("读取正向Websocket配置失败 :", err)
@@ -67,14 +141,24 @@ func runWSServer(b *coolq.CQBot, node yaml.Node) {
 		return
 	}
 
+	network, address := "tcp", conf.Address
+	if conf.Address == "" && (conf.Host != "" || conf.Port != 0) {
+		log.Warn("正向 Websocket 使用了过时的配置格式，请更新配置文件")
+		address = fmt.Sprintf("%s:%d", conf.Host, conf.Port)
+	} else {
+		uri, err := url.Parse(conf.Address)
+		if err == nil && uri.Scheme != "" {
+			network = uri.Scheme
+			address = uri.Host + uri.Path
+		}
+	}
 	s := &webSocketServer{
 		bot:    b,
 		conf:   &conf,
 		token:  conf.AccessToken,
 		filter: conf.Filter,
 	}
-	addFilter(s.filter)
-	addr := fmt.Sprintf("%s:%d", conf.Host, conf.Port)
+	filter.Add(s.filter)
 	s.handshake = fmt.Sprintf(`{"_post_method":2,"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
 		b.Client.Uin, time.Now().Unix())
 	b.OnEventPush(s.onBotPushEvent)
@@ -82,15 +166,17 @@ func runWSServer(b *coolq.CQBot, node yaml.Node) {
 	mux.HandleFunc("/event", s.event)
 	mux.HandleFunc("/api", s.api)
 	mux.HandleFunc("/", s.any)
-	go func() {
-		log.Infof("CQ WebSocket 服务器已启动: %v", addr)
-		log.Fatal(http.ListenAndServe(addr, &mux))
-	}()
+	listener, err := net.Listen(network, address)
+	if err != nil {
+		log.Fatal(err)
+	}
+	log.Infof("CQ WebSocket 服务器已启动: %v", listener.Addr())
+	log.Fatal(http.Serve(listener, &mux))
 }
 
 // runWSClient 运行一个反向向WS client
 func runWSClient(b *coolq.CQBot, node yaml.Node) {
-	var conf config.WebsocketReverse
+	var conf WebsocketReverse
 	switch err := node.Decode(&conf); {
 	case err != nil:
 		log.Warn("读取反向Websocket配置失败 :", err)
@@ -101,137 +187,131 @@ func runWSClient(b *coolq.CQBot, node yaml.Node) {
 
 	c := &websocketClient{
 		bot:    b,
-		conf:   &conf,
 		token:  conf.AccessToken,
 		filter: conf.Filter,
 	}
-	addFilter(c.filter)
-	if c.conf.Universal != "" {
-		c.connectUniversal()
-	} else {
-		if c.conf.API != "" {
-			c.connectAPI()
-		}
-		if c.conf.Event != "" {
-			c.connectEvent()
-		}
+	filter.Add(c.filter)
+	if conf.ReconnectInterval != 0 {
+		c.reconnectInterval = time.Duration(conf.ReconnectInterval) * time.Millisecond
+	}
+	if conf.RateLimit.Enabled {
+		c.limiter = rateLimit(conf.RateLimit.Frequency, conf.RateLimit.Bucket)
+	}
+
+	if conf.Universal != "" {
+		c.connect("Universal", conf.Universal, &c.universal)
+		c.bot.OnEventPush(c.onBotPushEvent("Universal", conf.Universal, &c.universal))
+		return // 连接到 Universal 后， 不再连接其他
+	}
+	if conf.API != "" {
+		c.connect("API", conf.API, nil)
+	}
+	if conf.Event != "" {
+		c.connect("Event", conf.Event, &c.event)
+		c.bot.OnEventPush(c.onBotPushEvent("Event", conf.Event, &c.event))
 	}
-	c.bot.OnEventPush(c.onBotPushEvent)
 }
 
-func (c *websocketClient) connectAPI() {
-	log.Infof("开始尝试连接到反向WebSocket API服务器: %v", c.conf.API)
+func resolveURI(addr string) (network, address string) {
+	network, address = "tcp", addr
+	uri, err := url.Parse(addr)
+	if err == nil && uri.Scheme != "" {
+		scheme, ext, _ := strings.Cut(uri.Scheme, "+")
+		if ext != "" {
+			network = ext
+			uri.Scheme = scheme // remove `+unix`/`+tcp4`
+			if ext == "unix" {
+				uri.Host, uri.Path, _ = strings.Cut(uri.Path, ":")
+				uri.Host = base64.StdEncoding.EncodeToString([]byte(uri.Host))
+			}
+			address = uri.String()
+		}
+	}
+	return
+}
+
+func (c *websocketClient) connect(typ, addr string, conptr **wsConn) {
+	log.Infof("开始尝试连接到反向WebSocket %s服务器: %v", typ, addr)
 	header := http.Header{
-		"X-Client-Role": []string{"API"},
+		"X-Client-Role": []string{typ},
 		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
 		"User-Agent":    []string{"CQHttp/4.15.0"},
 	}
 	if c.token != "" {
 		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.API, header) // nolint
-	if err != nil {
-		log.Warnf("连接到反向WebSocket API服务器 %v 时出现错误: %v", c.conf.API, err)
-		if c.conf.ReconnectInterval != 0 {
-			time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
-			c.connectAPI()
-		}
-		return
-	}
-	log.Infof("已连接到反向WebSocket API服务器 %v", c.conf.API)
-	wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
-	if c.conf.RateLimit.Enabled {
-		wrappedConn.apiCaller.use(rateLimit(c.conf.RateLimit.Frequency, c.conf.RateLimit.Bucket))
-	}
-	go c.listenAPI(wrappedConn, false)
-}
 
-func (c *websocketClient) connectEvent() {
-	log.Infof("开始尝试连接到反向WebSocket Event服务器: %v", c.conf.Event)
-	header := http.Header{
-		"X-Client-Role": []string{"Event"},
-		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
-		"User-Agent":    []string{"CQHttp/4.15.0"},
+	network, address := resolveURI(addr)
+	dialer := websocket.Dialer{
+		NetDial: func(_, addr string) (net.Conn, error) {
+			if network == "unix" {
+				host, _, err := net.SplitHostPort(addr)
+				if err != nil {
+					host = addr
+				}
+				filepath, err := base64.RawURLEncoding.DecodeString(host)
+				if err == nil {
+					addr = string(filepath)
+				}
+			}
+			return net.Dial(network, addr) // support unix socket transport
+		},
 	}
-	if c.token != "" {
-		header["Authorization"] = []string{"Token " + c.token}
-	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.Event, header) // nolint
+
+	conn, _, err := dialer.Dial(address, header) // nolint
 	if err != nil {
-		log.Warnf("连接到反向WebSocket Event服务器 %v 时出现错误: %v", c.conf.Event, err)
-		if c.conf.ReconnectInterval != 0 {
-			time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
-			c.connectEvent()
+		log.Warnf("连接到反向WebSocket %s服务器 %v 时出现错误: %v", typ, addr, err)
+		if c.reconnectInterval != 0 {
+			time.Sleep(c.reconnectInterval)
+			c.connect(typ, addr, conptr)
 		}
 		return
 	}
 
-	handshake := fmt.Sprintf(`{"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
-		c.bot.Client.Uin, time.Now().Unix())
-	err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
-	if err != nil {
-		log.Warnf("反向WebSocket 握手时出现错误: %v", err)
+	switch typ {
+	case "Event", "Universal":
+		handshake := fmt.Sprintf(`{"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`, c.bot.Client.Uin, time.Now().Unix())
+		err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
+		if err != nil {
+			log.Warnf("反向WebSocket 握手时出现错误: %v", err)
+		}
 	}
 
-	log.Infof("已连接到反向WebSocket Event服务器 %v", c.conf.Event)
-	if c.eventConn == nil {
-		wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
-		c.eventConn = wrappedConn
+	log.Infof("已连接到反向WebSocket %s服务器 %v", typ, addr)
+
+	var wrappedConn *wsConn
+	if conptr != nil && *conptr != nil {
+		wrappedConn = *conptr
 	} else {
-		c.eventConn.Conn = conn
+		wrappedConn = new(wsConn)
+		if conptr != nil {
+			*conptr = wrappedConn
+		}
+	}
+
+	wrappedConn.conn = conn
+	wrappedConn.apiCaller = api.NewCaller(c.bot)
+	if c.limiter != nil {
+		wrappedConn.apiCaller.Use(c.limiter)
+	}
+
+	if typ != "Event" {
+		go c.listenAPI(typ, addr, wrappedConn)
 	}
 }
 
-func (c *websocketClient) connectUniversal() {
-	log.Infof("开始尝试连接到反向WebSocket Universal服务器: %v", c.conf.Universal)
-	header := http.Header{
-		"X-Client-Role": []string{"Universal"},
-		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
-		"User-Agent":    []string{"CQHttp/4.15.0"},
-	}
-	if c.token != "" {
-		header["Authorization"] = []string{"Token " + c.token}
-	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.Universal, header) // nolint
-	if err != nil {
-		log.Warnf("连接到反向WebSocket Universal服务器 %v 时出现错误: %v", c.conf.Universal, err)
-		if c.conf.ReconnectInterval != 0 {
-			time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
-			c.connectUniversal()
-		}
-		return
-	}
-	handshake := fmt.Sprintf(`{"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
-		c.bot.Client.Uin, time.Now().Unix())
-	err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
-	if err != nil {
-		log.Warnf("反向WebSocket 握手时出现错误: %v", err)
-	}
-
-	if c.universalConn == nil {
-		wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
-		if c.conf.RateLimit.Enabled {
-			wrappedConn.apiCaller.use(rateLimit(c.conf.RateLimit.Frequency, c.conf.RateLimit.Bucket))
-		}
-		c.universalConn = wrappedConn
-	} else {
-		c.universalConn.Conn = conn
-	}
-	go c.listenAPI(c.universalConn, true)
-}
-
-func (c *websocketClient) listenAPI(conn *webSocketConn, u bool) {
+func (c *websocketClient) listenAPI(typ, url string, conn *wsConn) {
 	defer func() { _ = conn.Close() }()
 	for {
 		buffer := global.NewBuffer()
-		t, reader, err := conn.NextReader()
+		t, reader, err := conn.conn.NextReader()
 		if err != nil {
-			log.Warnf("监听反向WS API时出现错误: %v", err)
+			log.Warnf("监听反向WS %s时出现错误: %v", typ, err)
 			break
 		}
 		_, err = buffer.ReadFrom(reader)
 		if err != nil {
-			log.Warnf("监听反向WS API时出现错误: %v", err)
+			log.Warnf("监听反向WS %s时出现错误: %v", typ, err)
 			break
 		}
 		if t == websocket.TextMessage {
@@ -243,40 +323,35 @@ func (c *websocketClient) listenAPI(conn *webSocketConn, u bool) {
 			global.PutBuffer(buffer)
 		}
 	}
-	if c.conf.ReconnectInterval != 0 {
-		time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
-		if !u {
-			go c.connectAPI()
+	if c.reconnectInterval != 0 {
+		time.Sleep(c.reconnectInterval)
+		if typ == "API" { // Universal 不重连，避免多次重连
+			go c.connect(typ, url, nil)
 		}
 	}
 }
 
-func (c *websocketClient) onBotPushEvent(e *coolq.Event) {
-	filter := findFilter(c.filter)
-	if filter != nil && !filter.Eval(gjson.Parse(e.JSONString())) {
-		log.Debugf("上报Event %s 到 WS服务器 时被过滤.", e.JSONBytes())
-		return
-	}
-	push := func(conn *webSocketConn, reconnect func()) {
-		log.Debugf("向WS服务器 %v 推送Event: %s", conn.RemoteAddr().String(), e.JSONBytes())
-		conn.Lock()
-		defer conn.Unlock()
-		_ = conn.SetWriteDeadline(time.Now().Add(time.Second * 15))
-		if err := conn.WriteMessage(websocket.TextMessage, e.JSONBytes()); err != nil {
-			log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", conn.RemoteAddr().String(), err)
-			_ = conn.Close()
-			if c.conf.ReconnectInterval != 0 {
-				time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
-				reconnect()
+func (c *websocketClient) onBotPushEvent(typ, url string, conn **wsConn) func(e *coolq.Event) {
+	return func(e *coolq.Event) {
+		c.mu.Lock()
+		defer c.mu.Unlock()
+
+		flt := filter.Find(c.filter)
+		if flt != nil && !flt.Eval(gjson.Parse(e.JSONString())) {
+			log.Debugf("上报Event %s 到 WS服务器 时被过滤.", e.JSONBytes())
+			return
+		}
+
+		log.Debugf("向反向WS %s服务器推送Event: %s", typ, e.JSONBytes())
+		if err := (*conn).WriteText(e.JSONBytes()); err != nil {
+			log.Warnf("向反向WS %s服务器推送 Event 时出现错误: %v", typ, err)
+			_ = (*conn).Close()
+			if c.reconnectInterval != 0 {
+				time.Sleep(c.reconnectInterval)
+				c.connect(typ, url, conn)
 			}
 		}
 	}
-	if c.eventConn != nil {
-		push(c.eventConn, c.connectEvent)
-	}
-	if c.universalConn != nil {
-		push(c.universalConn, c.connectUniversal)
-	}
 }
 
 func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
@@ -286,11 +361,13 @@ func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(status)
 		return
 	}
+
 	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
 		return
 	}
+
 	err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
 	if err != nil {
 		log.Warnf("WebSocket 握手时出现错误: %v", err)
@@ -299,12 +376,10 @@ func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
 	}
 
 	log.Infof("接受 WebSocket 连接: %v (/event)", r.RemoteAddr)
-
-	conn := &webSocketConn{Conn: c, apiCaller: newAPICaller(s.bot)}
-
-	s.eventConnMutex.Lock()
+	conn := &wsConn{conn: c, apiCaller: api.NewCaller(s.bot)}
+	s.mu.Lock()
 	s.eventConn = append(s.eventConn, conn)
-	s.eventConnMutex.Unlock()
+	s.mu.Unlock()
 }
 
 func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
@@ -314,17 +389,19 @@ func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(status)
 		return
 	}
+
 	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
 		return
 	}
+
 	log.Infof("接受 WebSocket 连接: %v (/api)", r.RemoteAddr)
-	conn := &webSocketConn{Conn: c, apiCaller: newAPICaller(s.bot)}
+	conn := &wsConn{conn: c, apiCaller: api.NewCaller(s.bot)}
 	if s.conf.RateLimit.Enabled {
-		conn.apiCaller.use(rateLimit(s.conf.RateLimit.Frequency, s.conf.RateLimit.Bucket))
+		conn.apiCaller.Use(rateLimit(s.conf.RateLimit.Frequency, s.conf.RateLimit.Bucket))
 	}
-	go s.listenAPI(conn)
+	s.listenAPI(conn)
 }
 
 func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
@@ -334,33 +411,36 @@ func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(status)
 		return
 	}
+
 	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
 		return
 	}
+
 	err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
 	if err != nil {
 		log.Warnf("WebSocket 握手时出现错误: %v", err)
 		_ = c.Close()
 		return
 	}
+
 	log.Infof("接受 WebSocket 连接: %v (/)", r.RemoteAddr)
-	conn := &webSocketConn{Conn: c, apiCaller: newAPICaller(s.bot)}
+	conn := &wsConn{conn: c, apiCaller: api.NewCaller(s.bot)}
 	if s.conf.RateLimit.Enabled {
-		conn.apiCaller.use(rateLimit(s.conf.RateLimit.Frequency, s.conf.RateLimit.Bucket))
+		conn.apiCaller.Use(rateLimit(s.conf.RateLimit.Frequency, s.conf.RateLimit.Bucket))
 	}
-	s.eventConnMutex.Lock()
+	s.mu.Lock()
 	s.eventConn = append(s.eventConn, conn)
-	s.eventConnMutex.Unlock()
+	s.mu.Unlock()
 	s.listenAPI(conn)
 }
 
-func (s *webSocketServer) listenAPI(c *webSocketConn) {
+func (s *webSocketServer) listenAPI(c *wsConn) {
 	defer func() { _ = c.Close() }()
 	for {
 		buffer := global.NewBuffer()
-		t, reader, err := c.NextReader()
+		t, reader, err := c.conn.NextReader()
 		if err != nil {
 			break
 		}
@@ -380,7 +460,7 @@ func (s *webSocketServer) listenAPI(c *webSocketConn) {
 	}
 }
 
-func (c *webSocketConn) handleRequest(_ *coolq.CQBot, payload []byte) {
+func (c *wsConn) handleRequest(_ *coolq.CQBot, payload []byte) {
 	defer func() {
 		if err := recover(); err != nil {
 			log.Printf("处置WS命令时发生无法恢复的异常：%v\n%s", err, debug.Stack())
@@ -390,40 +470,43 @@ func (c *webSocketConn) handleRequest(_ *coolq.CQBot, payload []byte) {
 	j := gjson.Parse(utils.B2S(payload))
 	t := strings.TrimSuffix(j.Get("action").Str, "_async")
 	log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
-	ret := c.apiCaller.callAPI(t, j.Get("params"))
+	ret := c.apiCaller.Call(t, j.Get("params"))
 	if j.Get("echo").Exists() {
 		ret["echo"] = j.Get("echo").Value()
 	}
-	c.Lock()
-	defer c.Unlock()
-	_ = c.WriteJSON(ret)
+
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	_ = c.conn.SetWriteDeadline(time.Now().Add(time.Second * 15))
+	writer, _ := c.conn.NextWriter(websocket.TextMessage)
+	_ = json.NewEncoder(writer).Encode(ret)
+	_ = writer.Close()
 }
 
 func (s *webSocketServer) onBotPushEvent(e *coolq.Event) {
-	s.eventConnMutex.Lock()
-	defer s.eventConnMutex.Unlock()
-
-	filter := findFilter(s.filter)
-	if filter != nil && !filter.Eval(gjson.Parse(e.JSONString())) {
+	flt := filter.Find(s.filter)
+	if flt != nil && !flt.Eval(gjson.Parse(e.JSONString())) {
 		log.Debugf("上报Event %s 到 WS客户端 时被过滤.", e.JSONBytes())
 		return
 	}
+
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
 	j := 0
 	for i := 0; i < len(s.eventConn); i++ {
 		conn := s.eventConn[i]
-		log.Debugf("向WS客户端 %v 推送Event: %s", conn.RemoteAddr().String(), e.JSONBytes())
-		conn.Lock()
-		if err := conn.WriteMessage(websocket.TextMessage, e.JSONBytes()); err != nil {
+		log.Debugf("向WS客户端推送Event: %s", e.JSONBytes())
+		if err := conn.WriteText(e.JSONBytes()); err != nil {
 			_ = conn.Close()
 			conn = nil
 			continue
 		}
 		if i != j {
 			// i != j means that some connection has been closed.
-			// use a in-place removal to avoid copying.
+			// use an in-place removal to avoid copying.
 			s.eventConn[j] = conn
 		}
-		conn.Unlock()
 		j++
 	}
 	s.eventConn = s.eventConn[:j]