tag

.github/ISSUE_TEMPLATE/bug--.md

@@ -37,8 +37,6 @@ go-cqhttp版本:
 连接方式: 
 使用协议: 
 
-**在最新的release版本中能否复现**
-
 **bug内容**
 <!-- 请在这里详细描述bug的内容 -->
 

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on: [push, pull_request,workflow_dispatch]
+on: [push, pull_request]
 
 env:
   BINARY_PREFIX: "go-cqhttp_"
@@ -22,20 +22,15 @@ jobs:
             goarch: arm
           - goos: darwin
             goarch: "386"
+          - goos: windows
+            goarch: arm64
       fail-fast: true
     steps:
       - uses: actions/checkout@v2
       - name: Setup Go environment
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.17
-      - name: Cache downloaded module
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ matrix.goos }}-${{ matrix.goarch }}-${{ hashFiles('**/go.sum') }}
+          go-version: 1.16
       - name: Build binary file
         env:
           GOOS: ${{ matrix.goos }}

.github/workflows/golint.yml

@@ -1,6 +1,6 @@
 name: Lint
 
-on: [push,pull_request,workflow_dispatch]
+on: [push]
 
 jobs:
   golangci:
@@ -9,32 +9,16 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Setup Go environment
-        uses: actions/setup-go@v2.1.3
-        with:
-          go-version: 1.17
-
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
           version: latest
 
-      - name: Tests
-        run: |
-          go test $(go list ./...)
-
       - name: Commit back
-        if: ${{ github.repository_owner == 'Mrs4s' && !github.event.pull_request }}
         continue-on-error: true
         run: |
-          git config --local user.name 'github-actions[bot]'
-          git config --local user.email '41898282+github-actions[bot]@users.noreply.github.com'
+          git config --local user.name 'Github Actions'
+          git config --local user.email 'github-actions@users.noreply.github.com'
           git add --all
           git commit -m "ci(chore): Fix stylings"
           git push
-
-      - name: Suggester
-        if: ${{ github.event.pull_request }}
-        uses: reviewdog/action-suggester@v1
-        with:
-          tool_name: golangci-lint

.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.16.2'
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
@@ -27,15 +27,15 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      #- name: Checkout Dist
-      #  uses: actions/checkout@v2
-      #  with:
-      #    repository: 'gocq/dist'
-      #    ref: master
-      #    ssh-key: ${{ secrets.SSH_KEY }}
-      #    path: upstream/dist
+      - name: Checkout Dist
+        uses: actions/checkout@v2
+        with:
+          repository: 'wdvxdr1123/dist'
+          ref: master
+          ssh-key: ${{ secrets.SSH_KEY }}
+          path: upstream/dist
 
-      #- name: Update Dist
-      #  run: |
-      #    chmod +x scripts/upload_dist.sh
-      #    ./scripts/upload_dist.sh
+      - name: Update Dist
+        run: |
+          chmod +x scripts/upload_dist.sh
+          ./scripts/upload_dist.sh

.github/workflows/suggester.yml

@@ -0,0 +1,20 @@
+name: Lint
+
+on: [pull_request]
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: latest
+
+      - name: Suggester
+        uses: reviewdog/action-suggester@v1
+        with:
+          tool_name: golangci-lint

.gitignore

@@ -1,9 +1,7 @@
 vendor/
 .idea
-.vscode
 config.hjson
-config.yml
-session.token
 device.json
+codec/
 data/
-logs/
+logs/

.golangci.yml

@@ -40,7 +40,7 @@ linters:
     - gosimple
     - govet
     - ineffassign
-    #- misspell
+    - misspell
     - nolintlint
     - rowserrcheck
     - staticcheck
@@ -58,20 +58,31 @@ 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.
   # concurrency: 4 # explicitly omit this value to fully utilize available resources.
   deadline: 5m
   issues-exit-code: 1
-  skip-dirs:
-    - db
-    - cmd/api-generator
-  tests: true
+  tests: false
 
 # output configuration options
 output:
-  format: "colored-line-number"
+  format: 'colored-line-number'
   print-issued-lines: true
   print-linter-name: true
   uniq-by-line: true
@@ -79,6 +90,3 @@ output:
 issues:
   # Fix found issues (if it's supported by the linter)
   fix: true
-  exclude-use-default: false
-  exclude:
-    - "Error return value of .((os.)?std(out|err)..*|.*Close|.*Seek|.*Flush|os.Remove(All)?|.*print(f|ln)?|os.(Un)?Setenv). is not check"

.goreleaser.yml

@@ -4,13 +4,13 @@ before:
   hooks:
     - go mod tidy
 builds:
-  - id: nowin
-    env:
+  - env:
       - CGO_ENABLED=0
       - GO111MODULE=on
     goos:
       - linux
       - darwin
+      - windows
     goarch:
       - 386
       - amd64
@@ -23,38 +23,22 @@ builds:
         goarch: arm
       - goos: darwin
         goarch: 386
-    mod_timestamp: "{{ .CommitTimestamp }}"
-    flags:
-      - -trimpath
-    ldflags:
-      - -s -w -X github.com/Mrs4s/go-cqhttp/internal/base.Version=v{{.Version}}
-  - id: win
-    env:
-      - CGO_ENABLED=0
-      - GO111MODULE=on
-    goos:
-      - windows
-    goarch:
-      - 386
-      - amd64
-      - arm
-      - arm64
-    goarm:
-      - 7
-    mod_timestamp: "{{ .CommitTimestamp }}"
+      - goos: windows
+        goarch: arm64
+    mod_timestamp: '{{ .CommitTimestamp }}'
     flags:
       - -trimpath
     ldflags:
       - -s -w -X github.com/Mrs4s/go-cqhttp/coolq.Version=v{{.Version}}
 
 checksum:
-  name_template: "{{ .ProjectName }}_checksums.txt"
+  name_template: '{{ .ProjectName }}_checksums.txt'
 changelog:
   sort: asc
   filters:
     exclude:
-      - "^docs:"
-      - "^test:"
+      - '^docs:'
+      - '^test:'
       - fix typo
       - Merge pull request
       - Merge branch
@@ -62,18 +46,7 @@ changelog:
       - go mod tidy
 
 archives:
-  - id: binary
-    builds:
-      - win
-    name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
-    format_overrides:
-      - goos: windows
-        format: binary
-  - id: nowin
-    builds:
-      - nowin
-      - win
-    name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
+  - name_template: '{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
     format_overrides:
       - goos: windows
         format: zip
@@ -81,8 +54,7 @@ archives:
 nfpms:
   - license: AGPL 3.0
     homepage: https://go-cqhttp.org
-    file_name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
+    file_name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
     formats:
       - deb
-      - rpm
-    maintainer: Mrs4s
+      - rpm

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.17-alpine AS builder
+FROM golang:1.15.5-alpine AS builder
 
 RUN go env -w GO111MODULE=auto \
   && go env -w CGO_ENABLED=0 \
@@ -14,8 +14,6 @@ RUN set -ex \
 
 FROM alpine:latest
 
-RUN apk add --no-cache ffmpeg
-
 COPY --from=builder /build/cqhttp /usr/bin/cqhttp
 RUN chmod +x /usr/bin/cqhttp
 

README.md

@@ -1,7 +1,5 @@
 <p align="center">
-  <a href="https://ishkong.github.io/go-cqhttp-docs/">
-    <img src="https://user-images.githubusercontent.com/25968335/120111974-8abef880-c139-11eb-99cd-fa928348b198.png" width="200" height="200" alt="go-cqhttp">
-  </a>
+  <a href="https://ishkong.github.io/go-cqhttp-docs/"><img src="https://i.loli.net/2020/12/20/qSLMDWxiocRQgu6.jpg" width="200" height="200" alt="go-cqhttp"></a>
 </p>
 
 <div align="center">
@@ -44,14 +42,14 @@ _✨ 基于 [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/howmanybots/onebot/tree/master/v11/specs)绝大多数内容，并在其基础上做了一些扩展，详情请看go-cqhttp的文档
 
 ### 接口
 
 - [x] HTTP API
 - [x] 反向 HTTP POST
-- [x] 正向 WebSocket
-- [x] 反向 WebSocket
+- [x] 正向 Websocket
+- [x] 反向 Websocket
 
 ### 拓展支持
 
@@ -68,9 +66,9 @@ go-cqhttp 兼容 [OneBot-v11](https://github.com/howmanybots/onebot/tree/master/
 ### 实现
 
 <details>
-<summary>已实现 CQ 码</summary>
+<summary>已实现CQ码</summary>
 
-#### 符合 OneBot 标准的 CQ 码
+#### 符合 Onebot 标准的 CQ 码
 
 | CQ 码        | 功能                        |
 | ------------ | --------------------------- |
@@ -99,7 +97,7 @@ go-cqhttp 兼容 [OneBot-v11](https://github.com/howmanybots/onebot/tree/master/
 [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
 
-#### 拓展 CQ 码及与 OneBot 标准有略微差异的 CQ 码
+#### 拓展 CQ 码及与 Onebot 标准有略微差异的 CQ 码
 
 | 拓展 CQ 码     | 功能                              |
 | -------------- | --------------------------------- |
@@ -111,20 +109,20 @@ go-cqhttp 兼容 [OneBot-v11](https://github.com/howmanybots/onebot/tree/master/
 | [CQ:cardimage] | [一种 xml 的图片消息（装逼大图）] |
 | [CQ:tts]       | [文本转语音]                      |
 
-[图片]: 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
+[图片]: docs/cqhttp.md#%E5%9B%BE%E7%89%87
+[红包]: docs/cqhttp.md#%E7%BA%A2%E5%8C%85
+[戳一戳]: docs/cqhttp.md#%E6%88%B3%E4%B8%80%E6%88%B3
+[礼物]: docs/cqhttp.md#%E7%A4%BC%E7%89%A9
+[合并转发消息节点]: 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
+[一种 xml 的图片消息（装逼大图）]: docs/cqhttp.md#cardimage-%E4%B8%80%E7%A7%8Dxml%E7%9A%84%E5%9B%BE%E7%89%87%E6%B6%88%E6%81%AF%E8%A3%85%E9%80%BC%E5%A4%A7%E5%9B%BE
+[文本转语音]: docs/cqhttp.md#%E6%96%87%E6%9C%AC%E8%BD%AC%E8%AF%AD%E9%9F%B3
 
 </details>
 
 <details>
-<summary>已实现 API</summary>
+<summary>已实现API</summary>
 
-#### 符合 OneBot 标准的 API
+#### 符合 Onebot 标准的 API
 
 | API                      | 功能                   |
 | ------------------------ | ---------------------- |
@@ -184,7 +182,7 @@ go-cqhttp 兼容 [OneBot-v11](https://github.com/howmanybots/onebot/tree/master/
 [重启 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
 
-#### 拓展 API 及与 OneBot 标准有略微差异的 API
+#### 拓展 API 及与 Onebot 标准有略微差异的 API
 
 | 拓展 API                    | 功能                   |
 | --------------------------- | ---------------------- |
@@ -202,26 +200,26 @@ go-cqhttp 兼容 [OneBot-v11](https://github.com/howmanybots/onebot/tree/master/
 | /get_group_file_url         | [获取群文件资源链接]   |
 | /get_status                 | [获取状态]             |
 
-[设置群头像]: https://docs.go-cqhttp.org/api/#%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%A4%B4%E5%83%8F
-[获取图片信息]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E5%9B%BE%E7%89%87%E4%BF%A1%E6%81%AF
-[获取消息]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E6%B6%88%E6%81%AF
-[获取合并转发内容]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E5%86%85%E5%AE%B9
-[发送合并转发(群)]: https://docs.go-cqhttp.org/api/#%E5%8F%91%E9%80%81%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91-%E7%BE%A4
-[获取中文分词]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E4%B8%AD%E6%96%87%E5%88%86%E8%AF%8D-%E9%9A%90%E8%97%8F-api
-[图片 ocr]: https://docs.go-cqhttp.org/api/#%E5%9B%BE%E7%89%87-ocr
-[获取群系统消息]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4%E7%B3%BB%E7%BB%9F%E6%B6%88%E6%81%AF
-[获取群文件系统信息]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%96%87%E4%BB%B6%E7%B3%BB%E7%BB%9F%E4%BF%A1%E6%81%AF
-[获取群根目录文件列表]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%A0%B9%E7%9B%AE%E5%BD%95%E6%96%87%E4%BB%B6%E5%88%97%E8%A1%A8
-[获取群子目录文件列表]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%AD%90%E7%9B%AE%E5%BD%95%E6%96%87%E4%BB%B6%E5%88%97%E8%A1%A8
-[获取群文件资源链接]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%96%87%E4%BB%B6%E8%B5%84%E6%BA%90%E9%93%BE%E6%8E%A5
-[获取状态]: https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%8A%B6%E6%80%81
+[设置群头像]: docs/cqhttp.md#%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%A4%B4%E5%83%8F
+[获取图片信息]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E5%9B%BE%E7%89%87%E4%BF%A1%E6%81%AF
+[获取消息]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E6%B6%88%E6%81%AF
+[获取合并转发内容]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E5%86%85%E5%AE%B9
+[发送合并转发(群)]: docs/cqhttp.md#%E5%8F%91%E9%80%81%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E7%BE%A4
+[获取中文分词]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E4%B8%AD%E6%96%87%E5%88%86%E8%AF%8D
+[图片 ocr]: docs/cqhttp.md#%E5%9B%BE%E7%89%87ocr
+[获取群系统消息]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%BE%A4%E7%B3%BB%E7%BB%9F%E6%B6%88%E6%81%AF
+[获取群文件系统信息]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%96%87%E4%BB%B6%E7%B3%BB%E7%BB%9F%E4%BF%A1%E6%81%AF
+[获取群根目录文件列表]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%A0%B9%E7%9B%AE%E5%BD%95%E6%96%87%E4%BB%B6%E5%88%97%E8%A1%A8
+[获取群子目录文件列表]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%BE%A4%E5%AD%90%E7%9B%AE%E5%BD%95%E6%96%87%E4%BB%B6%E5%88%97%E8%A1%A8
+[获取群文件资源链接]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%96%87%E4%BB%B6%E8%B5%84%E6%BA%90%E9%93%BE%E6%8E%A5
+[获取状态]: docs/cqhttp.md#%E8%8E%B7%E5%8F%96%E7%8A%B6%E6%80%81
 
 </details>
 
 <details>
-<summary>已实现 Event</summary>
+<summary>已实现Event</summary>
 
-#### 符合 OneBot 标准的 Event（部分 Event 比 OneBot 标准多上报几个字段，不影响使用）
+#### 符合 Onebot 标准的 Event（部分 Event 比 Onebot 标准多上报几个字段，不影响使用）
 
 | 事件类型 | Event            |
 | -------- | ---------------- |
@@ -262,14 +260,12 @@ go-cqhttp 兼容 [OneBot-v11](https://github.com/howmanybots/onebot/tree/master/
 | 事件类型 | 拓展 Event       |
 | -------- | ---------------- |
 | 通知事件 | [好友戳一戳]     |
-| 通知事件 | [群内戳一戳]     |
 | 通知事件 | [群成员名片更新] |
 | 通知事件 | [接收到离线文件] |
 
-[好友戳一戳]: https://docs.go-cqhttp.org/event/#%E5%A5%BD%E5%8F%8B%E6%88%B3%E4%B8%80%E6%88%B3
-[群内戳一戳]: https://docs.go-cqhttp.org/event/#%E7%BE%A4%E5%86%85%E6%88%B3%E4%B8%80%E6%88%B3
-[群成员名片更新]: https://docs.go-cqhttp.org/event/#%E7%BE%A4%E6%88%90%E5%91%98%E5%90%8D%E7%89%87%E6%9B%B4%E6%96%B0
-[接收到离线文件]: https://docs.go-cqhttp.org/event/#%E6%8E%A5%E6%94%B6%E5%88%B0%E7%A6%BB%E7%BA%BF%E6%96%87%E4%BB%B6
+[好友戳一戳]: docs/cqhttp.md#%E5%A5%BD%E5%8F%8B%E6%88%B3%E4%B8%80%E6%88%B3
+[群成员名片更新]: docs/cqhttp.md#%E7%BE%A4%E6%88%90%E5%91%98%E5%90%8D%E7%89%87%E6%9B%B4%E6%96%B0
+[接收到离线文件]: docs/cqhttp.md#%E6%8E%A5%E6%94%B6%E5%88%B0%E7%A6%BB%E7%BA%BF%E6%96%87%E4%BB%B6
 
 </details>
 
@@ -287,4 +283,4 @@ go-cqhttp 兼容 [OneBot-v11](https://github.com/howmanybots/onebot/tree/master/
 
 ## 性能
 
-在关闭数据库的情况下, 加载 25 个好友 128 个群运行 24 小时后内存使用为 15MB 左右. 开启数据库后内存使用将根据消息量增加 10-20MB, 如果系统内存小于 128M 建议关闭数据库使用.
+在关闭数据库的情况下, 加载 25 个好友 128 个群运行 24 小时后内存使用为 15MB 左右. 开启数据库后内存使用将根据消息量增加 10-20MB, 如果系统内存小于 128M 建议关闭数据库使用.

cmd/api-generator/main.go

@@ -1,268 +0,0 @@
-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
-	Aliases []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 ` + strconv.Quote(router.Path))
-	for _, alias := range router.Aliases {
-		g.WriteString(`, ` + strconv.Quote(alias))
-	}
-	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", "uint32", "int":
-		return t + "(" + v + ".Int())"
-	case "uint64":
-		return 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.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 "":
-					continue
-				case "route":
-					router.Path = args
-				case "alias":
-					router.Aliases = append(router.Aliases, args)
-				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
-							}
-						}
-					}
-				}
-			}
-			if router.Path != "" {
-				routers = append(routers, router)
-			} else {
-				println(decl.Name.Name)
-			}
-		}
-	}
-
-	sort.Slice(routers, func(i, j int) bool {
-		return routers[i].Path < routers[j].Path
-	})
-
-	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
-}
-
-func isASCIIDigit(c byte) bool { return '0' <= c && c <= '9' }
-func isASCIILower(c byte) bool { return 'a' <= c && c <= 'z' }
-
-// 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++ {
-		if isASCIILower(s[i]) || isASCIIDigit(s[i]) {
-			t = append(t, s[i])
-		} else {
-			t = append(t, '_')
-			t = append(t, s[i]^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 ""
-}

coolq/bot.go

@@ -2,9 +2,10 @@ package coolq
 
 import (
 	"bytes"
+	"encoding/gob"
 	"encoding/hex"
-	"encoding/json"
 	"fmt"
+	"hash/crc32"
 	"io"
 	"os"
 	"path"
@@ -12,78 +13,64 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Mrs4s/go-cqhttp/db"
+	"github.com/Mrs4s/go-cqhttp/global"
 
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Mrs4s/MiraiGo/utils"
-	"github.com/pkg/errors"
+	jsoniter "github.com/json-iterator/go"
 	log "github.com/sirupsen/logrus"
-
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/syndtr/goleveldb/leveldb"
 )
 
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
 // CQBot CQBot结构体,存储Bot实例相关配置
 type CQBot struct {
 	Client *client.QQClient
 
-	lock   sync.RWMutex
-	events []func(*Event)
-
-	friendReqCache   sync.Map
-	tempSessionCache sync.Map
+	events         []func(*bytes.Buffer)
+	db             *leveldb.DB
+	friendReqCache sync.Map
+	tempMsgCache   sync.Map
+	oneWayMsgCache sync.Map
 }
 
-// Event 事件
-type Event struct {
-	RawMsg global.MSG
+// MSG 消息Map
+type MSG map[string]interface{}
 
-	once   sync.Once
-	buffer *bytes.Buffer
-}
-
-func (e *Event) marshal() {
-	if e.buffer == nil {
-		e.buffer = global.NewBuffer()
-	}
-	_ = json.NewEncoder(e.buffer).Encode(e.RawMsg)
-}
-
-// JSONBytes return byes of json by lazy marshalling.
-func (e *Event) JSONBytes() []byte {
-	e.once.Do(e.marshal)
-	return e.buffer.Bytes()
-}
-
-// JSONString return string of json without extra allocation
-// by lazy marshalling.
-func (e *Event) JSONString() string {
-	e.once.Do(e.marshal)
-	return utils.B2S(e.buffer.Bytes())
-}
+// ForceFragmented 是否启用强制分片
+var ForceFragmented = false
 
 // NewQQBot 初始化一个QQBot实例
-func NewQQBot(cli *client.QQClient) *CQBot {
+func NewQQBot(cli *client.QQClient, conf *global.JSONConfig) *CQBot {
 	bot := &CQBot{
 		Client: cli,
 	}
+	if conf.EnableDB {
+		p := path.Join("data", "leveldb")
+		db, err := leveldb.OpenFile(p, nil)
+		if err != nil {
+			log.Fatalf("打开数据库失败, 如果频繁遇到此问题请清理 data/leveldb 文件夹或关闭数据库功能。")
+		}
+		bot.db = db
+		gob.Register(message.Sender{})
+		log.Info("信息数据库初始化完成.")
+	} else {
+		log.Warn("警告: 信息数据库已关闭，将无法使用 [回复/撤回] 等功能。")
+	}
 	bot.Client.OnPrivateMessage(bot.privateMessageEvent)
 	bot.Client.OnGroupMessage(bot.groupMessageEvent)
-	if base.ReportSelfMessage {
+	if conf.EnableSelfMessage {
 		bot.Client.OnSelfPrivateMessage(bot.privateMessageEvent)
 		bot.Client.OnSelfGroupMessage(bot.groupMessageEvent)
 	}
 	bot.Client.OnTempMessage(bot.tempMessageEvent)
-	bot.Client.GuildService.OnGuildChannelMessage(bot.guildChannelMessageEvent)
-	bot.Client.GuildService.OnGuildMessageReactionsUpdated(bot.guildMessageReactionsUpdatedEvent)
-	bot.Client.GuildService.OnGuildChannelUpdated(bot.guildChannelUpdatedEvent)
 	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)
@@ -99,20 +86,23 @@ func NewQQBot(cli *client.QQClient) *CQBot {
 	bot.Client.OnOtherClientStatusChanged(bot.otherClientStatusChangedEvent)
 	bot.Client.OnGroupDigest(bot.groupEssenceMsg)
 	go func() {
-		if base.HeartbeatInterval == 0 {
+		i := conf.HeartbeatInterval
+		if i < 0 {
 			log.Warn("警告: 心跳功能已关闭，若非预期，请检查配置文件。")
 			return
 		}
-		t := time.NewTicker(base.HeartbeatInterval)
+		if i == 0 {
+			i = 5
+		}
 		for {
-			<-t.C
-			bot.dispatchEventMessage(global.MSG{
+			time.Sleep(time.Second * i)
+			bot.dispatchEventMessage(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(),
+				"interval":        1000 * i,
 			})
 		}
 	}()
@@ -120,127 +110,133 @@ func NewQQBot(cli *client.QQClient) *CQBot {
 }
 
 // OnEventPush 注册事件上报函数
-func (bot *CQBot) OnEventPush(f func(e *Event)) {
-	bot.lock.Lock()
+func (bot *CQBot) OnEventPush(f func(buf *bytes.Buffer)) {
 	bot.events = append(bot.events, f)
-	bot.lock.Unlock()
+}
+
+// GetMessage 获取给定消息id对应的消息
+func (bot *CQBot) GetMessage(mid int32) MSG {
+	if bot.db != nil {
+		m := MSG{}
+		data, err := bot.db.Get(binary.ToBytes(mid), nil)
+		if err == nil {
+			buff := global.NewBuffer()
+			defer global.PutBuffer(buff)
+			buff.Write(binary.GZipUncompress(data))
+			err = gob.NewDecoder(buff).Decode(&m)
+			if err == nil {
+				return m
+			}
+		}
+		log.Warnf("获取信息时出现错误: %v id: %v", err, mid)
+	}
+	return nil
 }
 
 // UploadLocalImageAsGroup 上传本地图片至群聊
-func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElement) (i *message.GroupImageElement, err error) {
-	if img.File != "" {
-		f, err := os.Open(img.File)
-		if err != nil {
-			return nil, errors.Wrap(err, "open image error")
-		}
-		defer func() { _ = f.Close() }()
-		img.Stream = f
+func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElement) (*message.GroupImageElement, error) {
+	if img.Stream != nil {
+		return bot.Client.UploadGroupImage(groupCode, img.Stream)
 	}
-	if lawful, mime := base.IsLawfulImage(img.Stream); !lawful {
-		return nil, errors.New("image type error: " + mime)
-	}
-	i, err = bot.Client.UploadGroupImage(groupCode, img.Stream)
-	if i != nil {
-		i.Flash = img.Flash
-		i.EffectID = img.EffectID
-	}
-	return
+	return bot.Client.UploadGroupImageByFile(groupCode, img.File)
 }
 
 // UploadLocalVideo 上传本地短视频至群聊
 func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message.ShortVideoElement, error) {
-	video, err := os.Open(v.File)
-	if err != nil {
-		return nil, err
+	if v.File != "" {
+		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() }()
-	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)
+	return &v.ShortVideoElement, nil
 }
 
 // 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")
-		}
-		defer func() { _ = f.Close() }()
-		img.Stream = f
+func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement) (*message.FriendImageElement, error) {
+	if img.Stream != nil {
+		return bot.Client.UploadPrivateImage(userID, img.Stream)
 	}
-	if lawful, mime := base.IsLawfulImage(img.Stream); !lawful {
-		return nil, errors.New("image type error: " + mime)
+	// need update.
+	f, err := os.Open(img.File)
+	if err != nil {
+		return nil, err
 	}
-	i, err = bot.Client.UploadPrivateImage(userID, img.Stream)
-	if i != nil {
-		i.Flash = img.Flash
-	}
-	return
-}
-
-// UploadLocalImageAsGuildChannel 上传本地图片至频道
-func (bot *CQBot) UploadLocalImageAsGuildChannel(guildId, channelId uint64, img *LocalImageElement) (*message.GuildImageElement, error) {
-	if img.File != "" {
-		f, err := os.Open(img.File)
-		if err != nil {
-			return nil, errors.Wrap(err, "open image error")
-		}
-		defer func() { _ = f.Close() }()
-		img.Stream = f
-	}
-	if lawful, mime := base.IsLawfulImage(img.Stream); !lawful {
-		return nil, errors.New("image type error: " + mime)
-	}
-	return bot.Client.GuildService.UploadGuildImage(guildId, channelId, img.Stream)
+	defer f.Close()
+	return bot.Client.UploadPrivateImage(userID, f)
 }
 
 // SendGroupMessage 发送群消息
 func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int32 {
-	newElem := make([]message.IMessageElement, 0, len(m.Elements))
+	var newElem = make([]message.IMessageElement, 0, len(m.Elements))
 	group := bot.Client.FindGroup(groupID)
-	for _, e := range m.Elements {
-		switch i := e.(type) {
-		case *LocalImageElement, *message.VoiceElement, *LocalVideoElement:
-			i, err := bot.uploadMedia(i, groupID, true)
+	for _, elem := range m.Elements {
+		if i, ok := elem.(*LocalImageElement); ok {
+			gm, err := bot.UploadLocalImageAsGroup(groupID, i)
 			if err != nil {
-				log.Warnf("警告: 群 %d 消息%s上传失败: %v", groupID, e.Type().String(), err)
+				log.Warnf("警告: 群 %v 消息图片上传失败: %v", groupID, err)
 				continue
 			}
-			e = i
-		case *PokeElement:
-			if group != nil {
+			newElem = append(newElem, gm)
+			continue
+		}
+		if i, ok := elem.(*message.VoiceElement); ok {
+			gv, err := bot.Client.UploadGroupPtt(groupID, bytes.NewReader(i.Data))
+			if err != nil {
+				log.Warnf("警告: 群 %v 消息语音上传失败: %v", groupID, err)
+				continue
+			}
+			newElem = append(newElem, gv)
+			continue
+		}
+		if i, ok := elem.(*LocalVideoElement); ok {
+			gv, err := bot.UploadLocalVideo(groupID, i)
+			if err != nil {
+				log.Warnf("警告: 群 %v 消息短视频上传失败: %v", groupID, err)
+				continue
+			}
+			newElem = append(newElem, gv)
+			continue
+		}
+		if i, ok := elem.(*PokeElement); ok {
+			if group := bot.Client.FindGroup(groupID); group != nil {
 				if mem := group.FindMember(i.Target); mem != nil {
 					mem.Poke()
+					return 0
 				}
 			}
-			return 0
-		case *GiftElement:
+		}
+		if i, ok := elem.(*GiftElement); ok {
 			bot.Client.SendGroupGift(uint64(groupID), uint64(i.Target), i.GiftID)
 			return 0
-		case *message.MusicShareElement:
+		}
+		if i, ok := elem.(*message.MusicShareElement); ok {
 			ret, err := bot.Client.SendGroupMusicShare(groupID, i)
 			if err != nil {
 				log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupID, err)
 				return -1
 			}
 			return bot.InsertGroupMessage(ret)
-		case *message.AtElement:
-			if i.Target == 0 && group.SelfPermission() == client.Member {
-				e = message.NewText("@全体成员")
-			}
 		}
-		newElem = append(newElem, e)
+		if i, ok := elem.(*message.AtElement); ok && i.Target == 0 && group.SelfPermission() == client.Member {
+			newElem = append(newElem, message.NewText("@全体成员"))
+			continue
+		}
+		newElem = append(newElem, elem)
 	}
 	if len(newElem) == 0 {
 		log.Warnf("群消息发送失败: 消息为空.")
 		return -1
 	}
 	m.Elements = newElem
-	bot.checkMedia(newElem, groupID)
-	ret := bot.Client.SendGroupMessage(groupID, m, base.ForceFragmented)
+	bot.checkMedia(newElem)
+	ret := bot.Client.SendGroupMessage(groupID, m, ForceFragmented)
 	if ret == nil || ret.Id == -1 {
 		log.Warnf("群消息发送失败: 账号可能被风控.")
 		return -1
@@ -250,230 +246,107 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int
 
 // SendPrivateMessage 发送私聊消息
 func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.SendingMessage) int32 {
-	newElem := make([]message.IMessageElement, 0, len(m.Elements))
-	for _, e := range m.Elements {
-		switch i := e.(type) {
-		case *LocalImageElement, *message.VoiceElement, *LocalVideoElement:
-			i, err := bot.uploadMedia(i, target, false)
+	var newElem = make([]message.IMessageElement, 0, len(m.Elements))
+	for _, elem := range m.Elements {
+		if i, ok := elem.(*LocalImageElement); ok {
+			fm, err := bot.UploadLocalImageAsPrivate(target, i)
 			if err != nil {
-				log.Warnf("警告: 私聊 %d 消息%s上传失败: %v", target, e.Type().String(), err)
+				log.Warnf("警告: 私聊 %v 消息图片上传失败.", target)
 				continue
 			}
-			e = i
-		case *PokeElement:
+			newElem = append(newElem, fm)
+			continue
+		}
+		if i, ok := elem.(*PokeElement); ok {
 			bot.Client.SendFriendPoke(i.Target)
 			return 0
-		case *message.MusicShareElement:
+		}
+		if i, ok := elem.(*message.VoiceElement); ok {
+			fv, err := bot.Client.UploadPrivatePtt(target, i.Data)
+			if err != nil {
+				log.Warnf("警告: 私聊 %v 消息语音上传失败: %v", target, err)
+				continue
+			}
+			newElem = append(newElem, fv)
+			continue
+		}
+		if i, ok := elem.(*LocalVideoElement); ok {
+			gv, err := bot.UploadLocalVideo(target, i)
+			if err != nil {
+				log.Warnf("警告: 私聊 %v 消息短视频上传失败: %v", target, err)
+				continue
+			}
+			newElem = append(newElem, gv)
+			continue
+		}
+		if i, ok := elem.(*message.MusicShareElement); ok {
 			bot.Client.SendFriendMusicShare(target, i)
 			return 0
 		}
-		newElem = append(newElem, e)
+		newElem = append(newElem, elem)
 	}
 	if len(newElem) == 0 {
 		log.Warnf("好友消息发送失败: 消息为空.")
 		return -1
 	}
 	m.Elements = newElem
-	bot.checkMedia(newElem, bot.Client.Uin)
-
-	// 单向好友是否存在
-	unidirectionalFriendExists := func() bool {
-		list, err := bot.Client.GetUnidirectionalFriendList()
-		if err != nil {
-			return false
-		}
-		for _, f := range list {
-			if f.Uin == target {
-				return true
-			}
-		}
-		return false
-	}
-
-	session, ok := bot.tempSessionCache.Load(target)
+	bot.checkMedia(newElem)
 	var id int32 = -1
-
-	switch {
-	case bot.Client.FindFriend(target) != nil: // 双向好友
+	if bot.Client.FindFriend(target) != nil { // 双向好友
 		msg := bot.Client.SendPrivateMessage(target, m)
 		if msg != nil {
 			id = bot.InsertPrivateMessage(msg)
 		}
-	case ok || groupID != 0: // 临时会话
+	} else if code, ok := bot.tempMsgCache.Load(target); ok || groupID != 0 { // 临时会话
 		switch {
-		case groupID != 0 && bot.Client.FindGroup(groupID) == nil:
+		case bot.Client.FindGroup(groupID) == nil:
 			log.Errorf("错误: 找不到群(%v)", groupID)
+			id = -1
 		case groupID != 0 && !bot.Client.FindGroup(groupID).AdministratorOrOwner():
 			log.Errorf("错误: 机器人在群(%v) 为非管理员或群主, 无法主动发起临时会话", groupID)
+			id = -1
 		case groupID != 0 && bot.Client.FindGroup(groupID).FindMember(target) == nil:
 			log.Errorf("错误: 群员(%v) 不在 群(%v), 无法发起临时会话", target, groupID)
+			id = -1
 		default:
-			if session == nil && groupID != 0 {
-				msg := bot.Client.SendGroupTempMessage(groupID, target, m)
-				if msg != nil { // nolint
-					// todo(Mrs4s)
-					// id = bot.InsertTempMessage(target, msg)
-				}
-				break
+			if code != nil {
+				groupID = code.(int64)
 			}
-			msg, err := session.(*client.TempSessionInfo).SendMessage(m)
-			if err != nil {
-				log.Errorf("发送临时会话消息失败: %v", err)
-				break
-			}
-			if msg != nil { // nolint
-				// todo(Mrs4s)
-				// id = bot.InsertTempMessage(target, msg)
+			msg := bot.Client.SendTempMessage(groupID, target, m)
+			if msg != nil {
+				id = bot.InsertTempMessage(target, msg)
 			}
 		}
-	case unidirectionalFriendExists(): // 单向好友
+	} else if _, ok := bot.oneWayMsgCache.Load(target); ok { // 单向好友
 		msg := bot.Client.SendPrivateMessage(target, m)
 		if msg != nil {
 			id = bot.InsertPrivateMessage(msg)
 		}
-	default:
+	} else {
 		nickname := "Unknown"
 		if summaryInfo, _ := bot.Client.GetSummaryInfo(target); summaryInfo != nil {
 			nickname = summaryInfo.Nickname
 		}
 		log.Errorf("错误: 请先添加 %v(%v) 为好友", nickname, target)
 	}
+	if id == -1 {
+		return -1
+	}
 	return id
 }
 
-// SendGuildChannelMessage 发送频道消息
-func (bot *CQBot) SendGuildChannelMessage(guildID, channelID uint64, m *message.SendingMessage) string {
-	newElem := make([]message.IMessageElement, 0, len(m.Elements))
-	for _, e := range m.Elements {
-		switch i := e.(type) {
-		case *LocalImageElement:
-			n, err := bot.UploadLocalImageAsGuildChannel(guildID, channelID, i)
-			if err != nil {
-				log.Warnf("警告: 频道 %d 消息%s上传失败: %v", channelID, e.Type().String(), err)
-				continue
-			}
-			e = n
-		case *LocalVideoElement, *LocalVoiceElement, *PokeElement, *message.MusicShareElement, *GiftElement:
-			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}
-	replyElem := t.FirstOrNil(func(e message.IMessageElement) bool {
-		_, ok := e.(*message.ReplyElement)
-		return ok
-	})
-	msg := &db.StoredGroupMessage{
-		ID:       encodeMessageID(m.GroupCode, m.Id),
-		GlobalID: db.ToGlobalID(m.GroupCode, m.Id),
-		SubType:  "normal",
-		Attribute: &db.StoredMessageAttribute{
-			MessageSeq: m.Id,
-			InternalID: m.InternalId,
-			SenderUin:  m.Sender.Uin,
-			SenderName: m.Sender.DisplayName(),
-			Timestamp:  int64(m.Time),
-		},
-		GroupCode: m.GroupCode,
-		AnonymousID: func() string {
-			if m.Sender.IsAnonymous() {
-				return m.Sender.AnonymousInfo.AnonymousId
-			}
-			return ""
-		}(),
-		Content: ToMessageContent(m.Elements),
+	val := MSG{
+		"message-id":  m.Id,
+		"internal-id": m.InternalId,
+		"group":       m.GroupCode,
+		"group-name":  m.GroupName,
+		"sender":      m.Sender,
+		"time":        m.Time,
+		"message":     ToStringMessage(m.Elements, m.GroupCode, true),
 	}
-	if replyElem != nil {
-		reply := replyElem.(*message.ReplyElement)
-		msg.SubType = "quote"
-		msg.QuotedInfo = &db.QuotedInfo{
-			PrevID:        encodeMessageID(m.GroupCode, reply.ReplySeq),
-			PrevGlobalID:  db.ToGlobalID(m.GroupCode, reply.ReplySeq),
-			QuotedContent: ToMessageContent(reply.Elements),
-		}
-	}
-	if err := db.InsertGroupMessage(msg); err != nil {
-		log.Warnf("记录聊天数据时出现错误: %v", err)
-		return -1
-	}
-	return msg.GlobalID
-}
-
-// InsertPrivateMessage 私聊消息入数据库
-func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
-	t := &message.SendingMessage{Elements: m.Elements}
-	replyElem := t.FirstOrNil(func(e message.IMessageElement) bool {
-		_, ok := e.(*message.ReplyElement)
-		return ok
-	})
-	msg := &db.StoredPrivateMessage{
-		ID:       encodeMessageID(m.Sender.Uin, m.Id),
-		GlobalID: db.ToGlobalID(m.Sender.Uin, m.Id),
-		SubType:  "normal",
-		Attribute: &db.StoredMessageAttribute{
-			MessageSeq: m.Id,
-			InternalID: m.InternalId,
-			SenderUin:  m.Sender.Uin,
-			SenderName: m.Sender.DisplayName(),
-			Timestamp:  int64(m.Time),
-		},
-		SessionUin: func() int64 {
-			if m.Sender.Uin == m.Self {
-				return m.Target
-			}
-			return m.Sender.Uin
-		}(),
-		TargetUin: m.Target,
-		Content:   ToMessageContent(m.Elements),
-	}
-	if replyElem != nil {
-		reply := replyElem.(*message.ReplyElement)
-		msg.SubType = "quote"
-		msg.QuotedInfo = &db.QuotedInfo{
-			PrevID:        encodeMessageID(reply.Sender, reply.ReplySeq),
-			PrevGlobalID:  db.ToGlobalID(reply.Sender, reply.ReplySeq),
-			QuotedContent: ToMessageContent(m.Elements),
-		}
-	}
-	if err := db.InsertPrivateMessage(msg); err != nil {
-		log.Warnf("记录聊天数据时出现错误: %v", err)
-		return -1
-	}
-	return msg.GlobalID
-}
-
-/*
-// InsertTempMessage 临时消息入数据库
-func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32 {
-	val := global.MSG{
-		"message-id": m.Id,
-		// FIXME(InsertTempMessage) InternalId missing
-		"from-group": m.GroupCode,
-		"group-name": m.GroupName,
-		"target":     target,
-		"sender":     m.Sender,
-		"time":       int32(time.Now().Unix()),
-		"message":    ToStringMessage(m.Elements, 0, true),
-	}
-	id := db.ToGlobalID(m.Sender.Uin, m.Id)
+	id := toGlobalID(m.GroupCode, m.Id)
 	if bot.db != nil {
 		buf := global.NewBuffer()
 		defer global.PutBuffer(buf)
@@ -481,38 +354,99 @@ func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32
 			log.Warnf("记录聊天数据时出现错误: %v", err)
 			return -1
 		}
-		if err := bot.db.Put(binary.ToBytes(id), buf.Bytes(), nil); err != nil {
+		if err := bot.db.Put(binary.ToBytes(id), binary.GZipCompress(buf.Bytes()), nil); err != nil {
 			log.Warnf("记录聊天数据时出现错误: %v", err)
 			return -1
 		}
 	}
 	return id
 }
-*/
+
+// InsertPrivateMessage 私聊消息入数据库
+func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
+	val := MSG{
+		"message-id":  m.Id,
+		"internal-id": m.InternalId,
+		"target":      m.Target,
+		"sender":      m.Sender,
+		"time":        m.Time,
+		"message":     ToStringMessage(m.Elements, m.Sender.Uin, true),
+	}
+	id := toGlobalID(m.Sender.Uin, m.Id)
+	if bot.db != nil {
+		buf := global.NewBuffer()
+		defer global.PutBuffer(buf)
+		if err := gob.NewEncoder(buf).Encode(val); err != nil {
+			log.Warnf("记录聊天数据时出现错误: %v", err)
+			return -1
+		}
+		if err := bot.db.Put(binary.ToBytes(id), binary.GZipCompress(buf.Bytes()), nil); err != nil {
+			log.Warnf("记录聊天数据时出现错误: %v", err)
+			return -1
+		}
+	}
+	return id
+}
+
+// InsertTempMessage 临时消息入数据库
+func (bot *CQBot) InsertTempMessage(target int64, m *message.TempMessage) int32 {
+	val := MSG{
+		"message-id": m.Id,
+		// FIXME(InsertTempMessage) InternalId missing
+		"group":      m.GroupCode,
+		"group-name": m.GroupName,
+		"target":     target,
+		"sender":     m.Sender,
+		"time":       time.Now().Unix(),
+		"message":    ToStringMessage(m.Elements, m.Sender.Uin, true),
+	}
+	id := toGlobalID(m.Sender.Uin, m.Id)
+	if bot.db != nil {
+		buf := global.NewBuffer()
+		defer global.PutBuffer(buf)
+		if err := gob.NewEncoder(buf).Encode(val); err != nil {
+			log.Warnf("记录聊天数据时出现错误: %v", err)
+			return -1
+		}
+		if err := bot.db.Put(binary.ToBytes(id), binary.GZipCompress(buf.Bytes()), nil); err != nil {
+			log.Warnf("记录聊天数据时出现错误: %v", err)
+			return -1
+		}
+	}
+	return id
+}
+
+// toGlobalID 构建`code`-`msgID`的字符串并返回其CRC32 Checksum的值
+func toGlobalID(code int64, msgID int32) int32 {
+	return int32(crc32.ChecksumIEEE([]byte(fmt.Sprintf("%d-%d", code, msgID))))
+}
 
 // Release 释放Bot实例
 func (bot *CQBot) Release() {
-
+	if bot.db != nil {
+		_ = bot.db.Close()
+	}
 }
 
-func (bot *CQBot) dispatchEventMessage(m global.MSG) {
-	bot.lock.RLock()
-	defer bot.lock.RUnlock()
-
-	event := &Event{RawMsg: m}
+func (bot *CQBot) dispatchEventMessage(m MSG) {
+	if global.EventFilter != nil && !global.EventFilter.Eval(global.MSG(m)) {
+		log.Debug("Event filtered!")
+		return
+	}
+	buf := global.NewBuffer()
 	wg := sync.WaitGroup{}
 	wg.Add(len(bot.events))
+	_ = json.NewEncoder(buf).Encode(m)
 	for _, f := range bot.events {
-		go func(fn func(*Event)) {
+		go func(fn func(*bytes.Buffer)) {
 			defer func() {
 				wg.Done()
 				if pan := recover(); pan != nil {
 					log.Warnf("处理事件 %v 时出现错误: %v \n%s", m, pan, debug.Stack())
 				}
 			}()
-
 			start := time.Now()
-			fn(event)
+			fn(buf)
 			end := time.Now()
 			if end.Sub(start) > time.Second*5 {
 				log.Debugf("警告: 事件处理耗时超过 5 秒 (%v), 请检查应用是否有堵塞.", end.Sub(start))
@@ -520,7 +454,79 @@ func (bot *CQBot) dispatchEventMessage(m global.MSG) {
 		}(f)
 	}
 	wg.Wait()
-	global.PutBuffer(event.buffer)
+	global.PutBuffer(buf)
+}
+
+func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) MSG {
+	cqm := ToStringMessage(m.Elements, m.GroupCode, true)
+	gm := 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": MSG{
+			"age":     0,
+			"area":    "",
+			"level":   "",
+			"sex":     "unknown",
+			"user_id": m.Sender.Uin,
+		},
+		"sub_type": "normal",
+		"time":     time.Now().Unix(),
+		"user_id":  m.Sender.Uin,
+	}
+	if m.Sender.IsAnonymous() {
+		gm["anonymous"] = MSG{
+			"flag": m.Sender.AnonymousInfo.AnonymousId + "|" + m.Sender.AnonymousInfo.AnonymousNick,
+			"id":   m.Sender.Uin,
+			"name": m.Sender.AnonymousInfo.AnonymousNick,
+		}
+		gm["sender"].(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"].(MSG)
+		ms["role"] = func() string {
+			switch mem.Permission {
+			case client.Owner:
+				return "owner"
+			case client.Administrator:
+				return "admin"
+			case client.Member:
+				return "member"
+			default:
+				return "member"
+			}
+		}()
+		ms["nickname"] = mem.Nickname
+		ms["card"] = mem.CardName
+		ms["title"] = mem.SpecialTitle
+	}
+	return gm
 }
 
 func formatGroupName(group *client.GroupInfo) string {
@@ -534,28 +540,8 @@ 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) {
-		w.WriteUInt64(uint64(target))
-		w.WriteUInt32(uint32(seq))
-	}))
+// ToJSON 生成JSON字符串
+func (m MSG) ToJSON() string {
+	b, _ := json.Marshal(m)
+	return string(b)
 }

coolq/converter.go

@@ -1,157 +0,0 @@
-package coolq
-
-import (
-	"github.com/Mrs4s/MiraiGo/client"
-	"github.com/Mrs4s/MiraiGo/message"
-	"github.com/Mrs4s/go-cqhttp/global"
-	log "github.com/sirupsen/logrus"
-	"strconv"
-)
-
-func convertGroupMemberInfo(groupID int64, m *client.GroupMemberInfo) global.MSG {
-	return global.MSG{
-		"group_id": groupID,
-		"user_id":  m.Uin,
-		"nickname": m.Nickname,
-		"card":     m.CardName,
-		"sex": func() string {
-			if m.Gender == 1 {
-				return "female"
-			} else if m.Gender == 0 {
-				return "male"
-			}
-			// unknown = 0xff
-			return "unknown"
-		}(),
-		"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": func() string {
-			switch m.Permission {
-			case client.Owner:
-				return "owner"
-			case client.Administrator:
-				return "admin"
-			case client.Member:
-				return "member"
-			default:
-				return "member"
-			}
-		}(),
-		"unfriendly":        false,
-		"title":             m.SpecialTitle,
-		"title_expire_time": m.SpecialTitleExpireTime,
-		"card_changeable":   false,
-	}
-}
-
-func convertGuildMemberInfo(m *client.GuildMemberInfo) global.MSG {
-	return global.MSG{
-		"tiny_id":  m.TinyId,
-		"title":    m.Title,
-		"nickname": m.Nickname,
-		"role":     m.Role,
-	}
-}
-
-func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) global.MSG {
-	source := MessageSource{
-		SourceType: MessageSourceGroup,
-		PrimaryID:  uint64(m.GroupCode),
-	}
-	cqm := ToStringMessage(m.Elements, source, true)
-	gm := global.MSG{
-		"anonymous":    nil,
-		"font":         0,
-		"group_id":     m.GroupCode,
-		"message":      ToFormattedMessage(m.Elements, source, 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 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 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":        c.ChannelId,
-		"channel_type":      c.ChannelType,
-		"channel_name":      c.ChannelName,
-		"owner_guild_id":    c.Meta.GuildId,
-		"creator_id":        c.Meta.CreatorUin,
-		"creator_tiny_id":   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,
-	}
-}

coolq/cqcode_test.go

@@ -2,65 +2,24 @@ package coolq
 
 import (
 	"fmt"
-	"strings"
 	"testing"
 
-	"github.com/Mrs4s/MiraiGo/utils"
-	"github.com/stretchr/testify/assert"
-	"github.com/tidwall/gjson"
+	"github.com/Mrs4s/MiraiGo/client"
+	"github.com/Mrs4s/go-cqhttp/global"
 )
 
-var bot = CQBot{}
+var bot = NewQQBot(client.NewClient(1, ""), global.DefaultConfig())
 
 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] [`, MessageSourcePrivate) {
+	for _, v := range bot.ConvertStringMessage(`[CQ:face,id=115,text=111][CQ:face,id=217]] [CQ:text,text=123] [`, false) {
 		fmt.Println(v)
 	}
 }
 
-var (
-	bench      = `asdfqwerqwerqwer[CQ:face,id=115,text=111]asdfasdfasdfasdfasdfasdfasd[CQ:face,id=217]] 123 [`
-	benchArray = gjson.Parse(`[{"type":"text","data":{"text":"asdfqwerqwerqwer"}},{"type":"face","data":{"id":"115","text":"111"}},{"type":"text","data":{"text":"asdfasdfasdfasdfasdfasdfasd"}},{"type":"face","data":{"id":"217"}},{"type":"text","data":{"text":"] "}},{"type":"text","data":{"text":"123"}},{"type":"text","data":{"text":" ["}}]`)
-)
+var bench = `asdfqwerqwerqwer[CQ:face,id=115,text=111]asdfasdfasdfasdfasdfasdfasd[CQ:face,id=217]] [CQ:text,text=123] [`
 
 func BenchmarkCQBot_ConvertStringMessage(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		bot.ConvertStringMessage(bench, MessageSourcePrivate)
-	}
-	b.SetBytes(int64(len(bench)))
-}
-
-func BenchmarkCQBot_ConvertObjectMessage(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		bot.ConvertObjectMessage(benchArray, MessageSourcePrivate)
-	}
-}
-
-const bText = `123456789[]&987654321[]&987654321[]&987654321[]&987654321[]&987654321[]&`
-
-func BenchmarkCQCodeEscapeText(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ret := bText
-		CQCodeEscapeText(ret)
-	}
-}
-
-func BenchmarkCQCodeEscapeTextBefore(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ret := bText
-		ret = strings.ReplaceAll(ret, "&", "&amp;")
-		ret = strings.ReplaceAll(ret, "[", "&#91;")
-		strings.ReplaceAll(ret, "]", "&#93;")
-	}
-}
-
-func TestCQCodeEscapeText(t *testing.T) {
-	for i := 0; i < 200; i++ {
-		rs := utils.RandomStringRange(3000, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890[]&")
-		ret := rs
-		ret = strings.ReplaceAll(ret, "&", "&amp;")
-		ret = strings.ReplaceAll(ret, "[", "&#91;")
-		ret = strings.ReplaceAll(ret, "]", "&#93;")
-		assert.Equal(t, ret, CQCodeEscapeText(rs))
+		bot.ConvertStringMessage(bench, false)
 	}
 }

coolq/event.go

@@ -2,18 +2,13 @@ package coolq
 
 import (
 	"encoding/hex"
-	"fmt"
-	"os"
+	"io/ioutil"
 	"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"
@@ -21,43 +16,47 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
+var format = "string"
+
+// SetMessageFormat 设置消息上报格式，默认为string
+func SetMessageFormat(f string) {
+	format = f
+}
+
 // ToFormattedMessage 将给定[]message.IMessageElement转换为通过coolq.SetMessageFormat所定义的消息上报格式
-func ToFormattedMessage(e []message.IMessageElement, source MessageSource, isRaw ...bool) (r interface{}) {
-	if base.PostFormat == "string" {
-		r = ToStringMessage(e, source, isRaw...)
-	} else if base.PostFormat == "array" {
-		r = ToArrayMessage(e, source)
+func ToFormattedMessage(e []message.IMessageElement, id int64, isRaw ...bool) (r interface{}) {
+	if format == "string" {
+		r = ToStringMessage(e, id, isRaw...)
+	} else if format == "array" {
+		r = ToArrayMessage(e, id, isRaw...)
 	}
 	return
 }
 
 func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMessage) {
-	bot.checkMedia(m.Elements, m.Sender.Uin)
-	source := MessageSource{
-		SourceType: MessageSourcePrivate,
-		PrimaryID:  uint64(m.Sender.Uin),
+	bot.checkMedia(m.Elements)
+	cqm := ToStringMessage(m.Elements, m.Sender.Uin, true)
+	if !m.Sender.IsFriend {
+		bot.oneWayMsgCache.Store(m.Sender.Uin, "")
+	}
+	id := m.Id
+	if bot.db != nil {
+		id = bot.InsertPrivateMessage(m)
 	}
-	cqm := ToStringMessage(m.Elements, source, true)
-	id := bot.InsertPrivateMessage(m)
 	log.Infof("收到好友 %v(%v) 的消息: %v (%v)", m.Sender.DisplayName(), m.Sender.Uin, cqm, id)
-	fm := global.MSG{
-		"post_type": func() string {
-			if m.Sender.Uin == bot.Client.Uin {
-				return "message_sent"
-			}
-			return "message"
-		}(),
+	fm := MSG{
+		"post_type":    "message",
 		"message_type": "private",
 		"sub_type":     "friend",
 		"message_id":   id,
 		"user_id":      m.Sender.Uin,
 		"target_id":    m.Target,
-		"message":      ToFormattedMessage(m.Elements, source, false),
+		"message":      ToFormattedMessage(m.Elements, m.Sender.Uin, false),
 		"raw_message":  cqm,
 		"font":         0,
 		"self_id":      c.Uin,
 		"time":         time.Now().Unix(),
-		"sender": global.MSG{
+		"sender": MSG{
 			"user_id":  m.Sender.Uin,
 			"nickname": m.Sender.Nickname,
 			"sex":      "unknown",
@@ -68,16 +67,16 @@ func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMess
 }
 
 func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage) {
-	bot.checkMedia(m.Elements, m.GroupCode)
+	bot.checkMedia(m.Elements)
 	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{
+			bot.dispatchEventMessage(MSG{
 				"post_type":   "notice",
 				"notice_type": "group_upload",
 				"group_id":    m.GroupCode,
 				"user_id":     m.Sender.Uin,
-				"file": global.MSG{
+				"file": MSG{
 					"id":    file.Path,
 					"name":  file.Name,
 					"size":  file.Size,
@@ -90,12 +89,11 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 			return
 		}
 	}
-	source := MessageSource{
-		SourceType: MessageSourceGroup,
-		PrimaryID:  uint64(m.GroupCode),
+	cqm := ToStringMessage(m.Elements, m.GroupCode, true)
+	id := m.Id
+	if bot.db != nil {
+		id = bot.InsertGroupMessage(m)
 	}
-	cqm := ToStringMessage(m.Elements, source, true)
-	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 {
@@ -105,34 +103,27 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 	bot.dispatchEventMessage(gm)
 }
 
-func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEvent) {
-	m := e.Message
-	bot.checkMedia(m.Elements, m.Sender.Uin)
-	source := MessageSource{
-		SourceType: MessageSourcePrivate,
-		PrimaryID:  uint64(e.Session.Sender),
-	}
-	cqm := ToStringMessage(m.Elements, source, true)
-	bot.tempSessionCache.Store(m.Sender.Uin, e.Session)
+func (bot *CQBot) tempMessageEvent(c *client.QQClient, m *message.TempMessage) {
+	bot.checkMedia(m.Elements)
+	cqm := ToStringMessage(m.Elements, m.Sender.Uin, true)
+	bot.tempMsgCache.Store(m.Sender.Uin, m.GroupCode)
 	id := m.Id
-	// todo(Mrs4s)
-	// if bot.db != nil { // nolint
-	// 		id = bot.InsertTempMessage(m.Sender.Uin, m)
-	// }
+	if bot.db != nil {
+		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{
+	tm := 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, source, false),
+		"message":      ToFormattedMessage(m.Elements, m.Sender.Uin, false),
 		"raw_message":  cqm,
 		"font":         0,
 		"self_id":      c.Uin,
 		"time":         time.Now().Unix(),
-		"sender": global.MSG{
+		"sender": MSG{
 			"user_id":  m.Sender.Uin,
 			"group_id": m.GroupCode,
 			"nickname": m.Sender.Nickname,
@@ -143,101 +134,6 @@ func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEven
 	bot.dispatchEventMessage(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
-	}
-	var channel *client.ChannelInfo
-	for _, c := range guild.Channels {
-		if c.ChannelId == m.ChannelId {
-			channel = c
-		}
-	}
-	source := MessageSource{
-		SourceType: MessageSourceGuildChannel,
-		PrimaryID:  m.GuildId,
-		SubID:      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, true))
-	// todo: 数据库支持
-	bot.dispatchEventMessage(global.MSG{
-		"post_type":    "message",
-		"message_type": "guild",
-		"sub_type":     "channel",
-		"guild_id":     m.GuildId,
-		"channel_id":   m.ChannelId,
-		"message_id":   fmt.Sprintf("%v-%v", m.Id, m.InternalId),
-		"user_id":      m.Sender.TinyId,
-		"message":      ToFormattedMessage(m.Elements, source, false), // todo: 增加对频道消息 Reply 的支持
-		"self_id":      bot.Client.Uin,
-		"self_tiny_id": bot.Client.GuildService.TinyId,
-		"time":         m.Time,
-		"sender": global.MSG{
-			"user_id":  m.Sender.TinyId,
-			"nickname": m.Sender.Nickname,
-		},
-	})
-}
-
-func (bot *CQBot) guildMessageReactionsUpdatedEvent(c *client.QQClient, e *client.GuildMessageReactionsUpdatedEvent) {
-	guild := c.GuildService.FindGuild(e.GuildId)
-	if guild == nil {
-		return
-	}
-	str := fmt.Sprintf("频道 %v(%v) 消息 %v 表情贴片已更新: ", guild.GuildName, guild.GuildId, e.MessageId)
-	var currentReactions []global.MSG
-	for _, r := range e.CurrentReactions {
-		str += fmt.Sprintf("%v*%v ", r.Face.Name, r.Count)
-		currentReactions = append(currentReactions, 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.dispatchEventMessage(global.MSG{
-		"post_type":          "notice",
-		"notice_type":        "message_reactions_updated",
-		"message_sender_uin": e.MessageSenderUin,
-		"guild_id":           e.GuildId,
-		"channel_id":         e.ChannelId,
-		"message_id":         fmt.Sprint(e.MessageId), // todo: 支持数据库后转换为数据库id
-		"operator_id":        e.OperatorId,
-		"current_reactions":  currentReactions,
-		"time":               time.Now().Unix(),
-		"self_id":            c.Uin,
-		"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.dispatchEventMessage(global.MSG{
-		"post_type":   "notice",
-		"notice_type": "channel_updated",
-		"guild_id":    e.GuildId,
-		"channel_id":  e.ChannelId,
-		"operator_id": e.OperatorId,
-		"time":        time.Now().Unix(),
-		"self_id":     c.Uin,
-		"user_id":     e.OperatorId,
-		"old_info":    convertChannelInfo(e.OldChannelInfo),
-		"new_info":    convertChannelInfo(e.NewChannelInfo),
-	})
-}
-
 func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent) {
 	g := c.FindGroup(e.GroupCode)
 	if e.TargetUin == 0 {
@@ -258,7 +154,7 @@ func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent)
 		}
 	}
 
-	bot.dispatchEventMessage(global.MSG{
+	bot.dispatchEventMessage(MSG{
 		"post_type":   "notice",
 		"duration":    e.Time,
 		"group_id":    e.GroupCode,
@@ -278,10 +174,10 @@ func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent)
 
 func (bot *CQBot) groupRecallEvent(c *client.QQClient, e *client.GroupMessageRecalledEvent) {
 	g := c.FindGroup(e.GroupCode)
-	gid := db.ToGlobalID(e.GroupCode, e.MessageId)
+	gid := 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{
+	bot.dispatchEventMessage(MSG{
 		"post_type":   "notice",
 		"group_id":    e.GroupCode,
 		"notice_type": "group_recall",
@@ -300,7 +196,7 @@ 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{
+		bot.dispatchEventMessage(MSG{
 			"post_type":   "notice",
 			"group_id":    group.Code,
 			"notice_type": "notify",
@@ -315,7 +211,7 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 		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{
+		bot.dispatchEventMessage(MSG{
 			"post_type":   "notice",
 			"group_id":    group.Code,
 			"notice_type": "notify",
@@ -328,7 +224,7 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 		})
 	case *client.MemberHonorChangedNotifyEvent:
 		log.Info(notify.Content())
-		bot.dispatchEventMessage(global.MSG{
+		bot.dispatchEventMessage(MSG{
 			"post_type":   "notice",
 			"group_id":    group.Code,
 			"notice_type": "notify",
@@ -359,12 +255,8 @@ func (bot *CQBot) groupNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 	friend := c.FindFriend(e.From())
 	if notify, ok := e.(*client.FriendPokeNotifyEvent); ok {
-		if notify.Receiver == notify.Sender {
-			log.Infof("好友 %v 戳了戳自己.", friend.Nickname)
-		} else {
-			log.Infof("好友 %v 戳了戳你.", friend.Nickname)
-		}
-		bot.dispatchEventMessage(global.MSG{
+		log.Infof("好友 %v 戳了戳你.", friend.Nickname)
+		bot.dispatchEventMessage(MSG{
 			"post_type":   "notice",
 			"notice_type": "notify",
 			"sub_type":    "poke",
@@ -377,31 +269,15 @@ func (bot *CQBot) friendNotifyEvent(c *client.QQClient, e client.INotifyEvent) {
 	}
 }
 
-func (bot *CQBot) memberTitleUpdatedEvent(c *client.QQClient, e *client.MemberSpecialTitleUpdatedEvent) {
-	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,
-	})
-}
-
 func (bot *CQBot) friendRecallEvent(c *client.QQClient, e *client.FriendMessageRecalledEvent) {
 	f := c.FindFriend(e.FriendUin)
-	gid := db.ToGlobalID(e.FriendUin, e.MessageId)
+	gid := toGlobalID(e.FriendUin, e.MessageId)
 	if f != nil {
 		log.Infof("好友 %v(%v) 撤回了消息: %v", f.Nickname, f.Uin, gid)
 	} else {
 		log.Infof("好友 %v 撤回了消息: %v", e.FriendUin, gid)
 	}
-	bot.dispatchEventMessage(global.MSG{
+	bot.dispatchEventMessage(MSG{
 		"post_type":   "notice",
 		"notice_type": "friend_recall",
 		"self_id":     c.Uin,
@@ -417,11 +293,11 @@ 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{
+	bot.dispatchEventMessage(MSG{
 		"post_type":   "notice",
 		"notice_type": "offline_file",
 		"user_id":     e.Sender,
-		"file": global.MSG{
+		"file": MSG{
 			"name": e.FileName,
 			"size": e.FileSize,
 			"url":  e.DownloadUrl,
@@ -452,7 +328,7 @@ func (bot *CQBot) memberPermissionChangedEvent(c *client.QQClient, e *client.Mem
 		}
 		return "unset"
 	}()
-	bot.dispatchEventMessage(global.MSG{
+	bot.dispatchEventMessage(MSG{
 		"post_type":   "notice",
 		"notice_type": "group_admin",
 		"sub_type":    st,
@@ -465,7 +341,7 @@ func (bot *CQBot) memberPermissionChangedEvent(c *client.QQClient, e *client.Mem
 
 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{
+	bot.dispatchEventMessage(MSG{
 		"post_type":   "notice",
 		"notice_type": "group_card",
 		"group_id":    e.Group.Code,
@@ -477,12 +353,12 @@ func (bot *CQBot) memberCardUpdatedEvent(c *client.QQClient, e *client.MemberCar
 	})
 }
 
-func (bot *CQBot) memberJoinEvent(_ *client.QQClient, e *client.MemberJoinGroupEvent) {
+func (bot *CQBot) memberJoinEvent(c *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))
 }
 
-func (bot *CQBot) memberLeaveEvent(_ *client.QQClient, e *client.MemberLeaveGroupEvent) {
+func (bot *CQBot) memberLeaveEvent(c *client.QQClient, e *client.MemberLeaveGroupEvent) {
 	if e.Operator != nil {
 		log.Infof("成员 %v 被 %v T出了群 %v.", formatMemberName(e.Member), formatMemberName(e.Operator), formatGroupName(e.Group))
 	} else {
@@ -495,7 +371,7 @@ func (bot *CQBot) friendRequestEvent(c *client.QQClient, e *client.NewFriendRequ
 	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{
+	bot.dispatchEventMessage(MSG{
 		"post_type":    "request",
 		"request_type": "friend",
 		"user_id":      e.RequesterUin,
@@ -508,8 +384,8 @@ func (bot *CQBot) friendRequestEvent(c *client.QQClient, e *client.NewFriendRequ
 
 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{
+	bot.tempMsgCache.Delete(e.Friend.Uin)
+	bot.dispatchEventMessage(MSG{
 		"post_type":   "notice",
 		"notice_type": "friend_add",
 		"self_id":     c.Uin,
@@ -521,7 +397,7 @@ func (bot *CQBot) friendAddedEvent(c *client.QQClient, e *client.NewFriendEvent)
 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{
+	bot.dispatchEventMessage(MSG{
 		"post_type":    "request",
 		"request_type": "group",
 		"sub_type":     "invite",
@@ -537,7 +413,7 @@ func (bot *CQBot) groupInvitedEvent(c *client.QQClient, e *client.GroupInvitedRe
 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{
+	bot.dispatchEventMessage(MSG{
 		"post_type":    "request",
 		"request_type": "group",
 		"sub_type":     "add",
@@ -556,11 +432,11 @@ 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{
+	bot.dispatchEventMessage(MSG{
 		"post_type":   "notice",
 		"notice_type": "client_status",
 		"online":      e.Online,
-		"client": global.MSG{
+		"client": MSG{
 			"app_id":      e.Client.AppId,
 			"device_name": e.Client.DeviceName,
 			"device_kind": e.Client.DeviceKind,
@@ -572,7 +448,7 @@ func (bot *CQBot) otherClientStatusChangedEvent(c *client.QQClient, e *client.Ot
 
 func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *client.GroupDigestEvent) {
 	g := c.FindGroup(e.GroupCode)
-	gid := db.ToGlobalID(e.GroupCode, e.MessageID)
+	gid := toGlobalID(e.GroupCode, e.MessageID)
 	if e.OperationType == 1 {
 		log.Infof(
 			"群 %v 内 %v 将 %v 的消息(%v)设为了精华消息.",
@@ -593,7 +469,7 @@ func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *client.GroupDigestEvent
 	if e.OperatorUin == bot.Client.Uin {
 		return
 	}
-	bot.dispatchEventMessage(global.MSG{
+	bot.dispatchEventMessage(MSG{
 		"post_type":   "notice",
 		"group_id":    e.GroupCode,
 		"notice_type": "essence",
@@ -611,8 +487,8 @@ func (bot *CQBot) groupEssenceMsg(c *client.QQClient, e *client.GroupDigestEvent
 	})
 }
 
-func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) global.MSG {
-	return global.MSG{
+func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) MSG {
+	return MSG{
 		"post_type":   "notice",
 		"notice_type": "group_increase",
 		"group_id":    groupCode,
@@ -624,8 +500,8 @@ func (bot *CQBot) groupIncrease(groupCode, operatorUin, userUin int64) global.MS
 	}
 }
 
-func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.GroupMemberInfo) global.MSG {
-	return global.MSG{
+func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.GroupMemberInfo) MSG {
+	return MSG{
 		"post_type":   "notice",
 		"notice_type": "group_decrease",
 		"group_id":    groupCode,
@@ -650,65 +526,63 @@ func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.Group
 	}
 }
 
-func (bot *CQBot) checkMedia(e []message.IMessageElement, sourceID int64) {
-	// TODO(wdvxdr): remove these old cache file in v1.0.0
+func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 	for _, elem := range e {
 		switch i := elem.(type) {
+		case *message.ImageElement:
+			filename := hex.EncodeToString(i.Md5) + ".image"
+			if !global.PathExists(path.Join(global.ImagePath, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
+					w.Write(i.Md5)
+					w.WriteUInt32(uint32(i.Size))
+					w.WriteString(i.Filename)
+					w.WriteString(i.Url)
+				}), 0644)
+			}
+			i.Filename = filename
 		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)
-			})
 			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)
-			}
-		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)
-			}
-
-			if i.Url != "" && !global.PathExists(path.Join(global.ImagePath, "guild-images", filename)) {
-				if err := global.DownloadFile(i.Url, path.Join(global.ImagePath, "guild-images", filename), -1, map[string]string{}); err != nil {
-					log.Warnf("下载频道图片时出现错误: %v", err)
-				}
+			if !global.PathExists(path.Join(global.ImagePath, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
+					w.Write(i.Md5)
+					w.WriteUInt32(uint32(i.Size))
+					w.WriteString(filename)
+					w.WriteString(i.Url)
+				}), 0644)
 			}
 		case *message.FriendImageElement:
-			data := binary.NewWriterF(func(w *binary.Writer) {
-				w.Write(i.Md5)
-				w.WriteUInt32(uint32(i.Size))
-				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)
+			if !global.PathExists(path.Join(global.ImagePath, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
+					w.Write(i.Md5)
+					w.WriteUInt32(uint32(0)) // 发送时会调用url, 大概没事
+					w.WriteString(filename)
+					w.WriteString(i.Url)
+				}), 0644)
 			}
+		case *message.GroupFlashImgElement:
+			filename := hex.EncodeToString(i.Md5) + ".image"
+			if !global.PathExists(path.Join(global.ImagePath, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
+					w.Write(i.Md5)
+					w.WriteUInt32(uint32(i.Size))
+					w.WriteString(i.Filename)
+					w.WriteString("")
+				}), 0644)
+			}
+			i.Filename = filename
+		case *message.FriendFlashImgElement:
+			filename := hex.EncodeToString(i.Md5) + ".image"
+			if !global.PathExists(path.Join(global.ImagePath, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.ImagePath, filename), binary.NewWriterF(func(w *binary.Writer) {
+					w.Write(i.Md5)
+					w.WriteUInt32(uint32(i.Size))
+					w.WriteString(i.Filename)
+					w.WriteString("")
+				}), 0644)
+			}
+			i.Filename = filename
 		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)) {
@@ -717,22 +591,19 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement, sourceID int64) {
 					log.Warnf("语音文件 %v 下载失败: %v", i.Name, err)
 					continue
 				}
-				_ = os.WriteFile(path.Join(global.VoicePath, i.Name), b, 0o644)
+				_ = ioutil.WriteFile(path.Join(global.VoicePath, i.Name), b, 0644)
 			}
 		case *message.ShortVideoElement:
-			data := binary.NewWriterF(func(w *binary.Writer) {
-				w.Write(i.Md5)
-				w.Write(i.ThumbMd5)
-				w.WriteUInt32(uint32(i.Size))
-				w.WriteUInt32(uint32(i.ThumbSize))
-				w.WriteString(i.Name)
-				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)
+			if !global.PathExists(path.Join(global.VideoPath, filename)) {
+				_ = ioutil.WriteFile(path.Join(global.VideoPath, filename), binary.NewWriterF(func(w *binary.Writer) {
+					w.Write(i.Md5)
+					w.Write(i.ThumbMd5)
+					w.WriteUInt32(uint32(i.Size))
+					w.WriteUInt32(uint32(i.ThumbSize))
+					w.WriteString(i.Name)
+					w.Write(i.Uuid)
+				}), 0644)
 			}
 			i.Name = filename
 			i.Url = bot.Client.GetShortVideoUrl(i.Uuid, i.Md5)

db/database.go

@@ -1,101 +0,0 @@
-package db
-
-import (
-	"fmt"
-	"hash/crc32"
-
-	"github.com/Mrs4s/go-cqhttp/global"
-)
-
-type (
-	// Database 数据库操作接口定义
-	Database interface {
-		// Open 初始化数据库
-		Open() error
-
-		// GetMessageByGlobalID 通过 GlobalID 来获取消息
-		GetMessageByGlobalID(int32) (StoredMessage, error)
-		// GetGroupMessageByGlobalID 通过 GlobalID 来获取群消息
-		GetGroupMessageByGlobalID(int32) (*StoredGroupMessage, error)
-		// GetPrivateMessageByGlobalID 通过 GlobalID 来获取私聊消息
-		GetPrivateMessageByGlobalID(int32) (*StoredPrivateMessage, error)
-
-		// InsertGroupMessage 向数据库写入新的群消息
-		InsertGroupMessage(*StoredGroupMessage) error
-		// InsertPrivateMessage 向数据库写入新的私聊消息
-		InsertPrivateMessage(*StoredPrivateMessage) error
-	}
-
-	StoredMessage interface {
-		GetID() string
-		GetType() string
-		GetGlobalID() int32
-		GetAttribute() *StoredMessageAttribute
-		GetContent() []global.MSG
-	}
-
-	// 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"`
-	}
-
-	// 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"`
-	}
-
-	// StoredMessageAttribute 持久化消息属性
-	StoredMessageAttribute struct {
-		MessageSeq int32  `bson:"messageSeq"`
-		InternalID int32  `bson:"internalId"`
-		SenderUin  int64  `bson:"senderUin"`
-		SenderName string `bson:"senderName"`
-		Timestamp  int64  `bson:"timestamp"`
-	}
-
-	// QuotedInfo 引用回复
-	QuotedInfo struct {
-		PrevID        string       `bson:"prevId"`
-		PrevGlobalID  int32        `bson:"prevGlobalId"`
-		QuotedContent []global.MSG `bson:"quotedContent"`
-	}
-)
-
-// ToGlobalID 构建`code`-`msgID`的字符串并返回其CRC32 Checksum的值
-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) GetAttribute() *StoredMessageAttribute { return m.Attribute }
-
-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) GetAttribute() *StoredMessageAttribute { return m.Attribute }
-
-func (m *StoredPrivateMessage) GetContent() []global.MSG { return m.Content }

db/leveldb/leveldb.go

@@ -1,129 +0,0 @@
-package leveldb
-
-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"
-	"gopkg.in/yaml.v3"
-
-	"github.com/Mrs4s/go-cqhttp/db"
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/modules/config"
-)
-
-type LevelDBImpl struct {
-	db *leveldb.DB
-}
-
-const (
-	group   byte = 0x0
-	private byte = 0x1
-)
-
-func init() {
-	gob.Register(db.StoredMessageAttribute{})
-	gob.Register(db.QuotedInfo{})
-	gob.Register(global.MSG{})
-	gob.Register(db.StoredGroupMessage{})
-	gob.Register(db.StoredPrivateMessage{})
-
-	db.Register("leveldb", func(node yaml.Node) db.Database {
-		conf := new(config.LevelDBConfig)
-		_ = node.Decode(conf)
-		if !conf.Enable {
-			return nil
-		}
-		return &LevelDBImpl{}
-	})
-}
-
-func (ldb *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 ldb error")
-	}
-	ldb.db = d
-	return nil
-}
-
-func (ldb *LevelDBImpl) GetMessageByGlobalID(id int32) (db.StoredMessage, error) {
-	v, err := ldb.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 := &db.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 := &db.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 (ldb *LevelDBImpl) 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 *LevelDBImpl) 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 *LevelDBImpl) InsertGroupMessage(msg *db.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 := ldb.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 (ldb *LevelDBImpl) InsertPrivateMessage(msg *db.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 := ldb.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/mongodb/mongodb.go

@@ -1,85 +0,0 @@
-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"
-	"github.com/Mrs4s/go-cqhttp/modules/config"
-)
-
-type MongoDBImpl struct {
-	uri   string
-	db    string
-	mongo *mongo.Database
-}
-
-const (
-	MongoGroupMessageCollection   = "group-messages"
-	MongoPrivateMessageCollection = "private-messages"
-)
-
-func init() {
-	db.Register("mongodb", func(node yaml.Node) db.Database {
-		conf := new(config.MongoDBConfig)
-		_ = node.Decode(conf)
-		if conf.Database == "" {
-			conf.Database = "gocq-database"
-		}
-		if !conf.Enable {
-			return nil
-		}
-		return &MongoDBImpl{uri: conf.URI, db: conf.Database}
-	})
-}
-
-func (m *MongoDBImpl) 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 *MongoDBImpl) GetMessageByGlobalID(id int32) (db.StoredMessage, error) {
-	if r, err := m.GetGroupMessageByGlobalID(id); err == nil {
-		return r, nil
-	}
-	return m.GetPrivateMessageByGlobalID(id)
-}
-
-func (m *MongoDBImpl) 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 *MongoDBImpl) 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 *MongoDBImpl) InsertGroupMessage(msg *db.StoredGroupMessage) error {
-	coll := m.mongo.Collection(MongoGroupMessageCollection)
-	_, err := coll.InsertOne(context.Background(), msg)
-	return errors.Wrap(err, "insert error")
-}
-
-func (m *MongoDBImpl) InsertPrivateMessage(msg *db.StoredPrivateMessage) error {
-	coll := m.mongo.Collection(MongoPrivateMessageCollection)
-	_, err := coll.InsertOne(context.Background(), msg)
-	return errors.Wrap(err, "insert error")
-}

db/multidb.go

@@ -1,88 +0,0 @@
-package db
-
-import (
-	"github.com/pkg/errors"
-	"gopkg.in/yaml.v3"
-
-	"github.com/Mrs4s/go-cqhttp/internal/base"
-)
-
-// backends 多数据库支持， 后端支持
-// 写入会对所有 Backend 进行写入
-// 读取只会读取第一个库
-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
-}
-
-// 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 Open() error {
-	for _, b := range backends {
-		if err := b.Open(); err != nil {
-			return errors.Wrap(err, "open backend error")
-		}
-	}
-	return nil
-}
-
-func GetMessageByGlobalID(id int32) (StoredMessage, error) {
-	if len(backends) == 0 {
-		return nil, DatabaseDisabledError
-	}
-	return backends[0].GetMessageByGlobalID(id)
-}
-
-func GetGroupMessageByGlobalID(id int32) (*StoredGroupMessage, error) {
-	if len(backends) == 0 {
-		return nil, DatabaseDisabledError
-	}
-	return backends[0].GetGroupMessageByGlobalID(id)
-}
-
-func GetPrivateMessageByGlobalID(id int32) (*StoredPrivateMessage, error) {
-	if len(backends) == 0 {
-		return nil, DatabaseDisabledError
-	}
-	return backends[0].GetPrivateMessageByGlobalID(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")
-		}
-	}
-	return nil
-}
-
-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
-}

docs/EventFilter.md

@@ -1,6 +1,6 @@
 # 事件过滤器
 
-在配置文件填写对应通信方式的 `middlewares.filter` 即可开启事件过滤器，启动时会读取该文件中定义的过滤规则（使用 JSON 编写），若文件不存在，或过滤规则语法错误，则不会启用事件过滤器。
+在go-cqhttp同级目录下新建`filter.json`文件即可开启事件过滤器，启动时会读取该文件中定义的过滤规则（使用 JSON 编写），若文件不存在，或过滤规则语法错误，则不会启用事件过滤器。
 事件过滤器会处理所有事件(包括心跳事件在内的元事件),请谨慎使用！！
 
 注意: 与客户端建立连接的握手事件**不会**经过事件过滤器
@@ -114,35 +114,6 @@
 }
 ```
 
-## 进阶指南
-
-1. 对于嵌套的值，可以使用 `.` 进行简化，如
-
-```json
-{
-    "sender": {
-        "sex": "male"
-    }
-}
-```
-
-与下面的配置文件作用相同
-
-```json
-{
-  "sender.sex": "male"
-}
-```
-
-2. 对于数组，可以使用数字索引，如
-```json
-{
-  "message.0.type": "text"
-}
-```
-
-更多进阶语法请参考[GJSON语法](https://github.com/tidwall/gjson/blob/master/SYNTAX.md)
-
 ## 语法说明
 
 过滤规则最外层是一个 JSON 对象，其中的键，如果以 `.`（点号）开头，则表示运算符，其值为运算符的参数，如果不以 `.` 开头，则表示对事件数据对象中相应键的过滤。过滤规则中任何一个对象，只有在它的所有项都匹配的情况下，才会让事件通过（等价于一个 `and` 运算）；其中，不以 `.` 开头的键，若其值不是对象，则只有在这个值和事件数据相应值相等的情况下，才会通过（等价于一个 `eq` 运算符）。

docs/README.md

@@ -1,12 +0,0 @@
-# 文档
-
-> 文档目前依旧保留以便往前兼容
-\
-下面的文档更易读以及人性化, 强烈建议您查看下面提供的文档
-
-目前文档已移动到位于 [go-cqhttp-docs](https://github.com/ishkong/go-cqhttp-docs) 的仓库
-
-您可以在以下其中任意一个链接查看:
-
-- <https://docs.go-cqhttp.org>
-- <https://ishkong.github.io/go-cqhttp-docs>

docs/config.md

@@ -1,187 +1,102 @@
 # 配置
 
-go-cqhttp 包含 `config.yml` 和 `device.json` 两个配置文件, 其中 `config.yml` 为运行配置 `device.json` 为虚拟设备信息.
+go-cqhttp 包含 `config.hjson` 和 `device.json` 两个配置文件, 其中 `config.json` 为运行配置 `device.json` 为虚拟设备信息.
+
+## 从原CQHTTP导入配置
+
+go-cqhttp 支持导入CQHTTP的配置文件, 具体步骤为:
+
+1. 找到CQHTTP原配置文件 `{CQ工作目录}/app/io.github.richardchien.coolqhttpapi/config/{qq号}.json`
+2. 将文件复制到go-cqhttp根目录并重命名为 `cqhttp.json`
+3. 重启go-cqhttp后将自动导入配置
 
 ## 配置信息
 
-go-cqhttp 的配置文件采用 YAML , 在使用之前希望你能了解 YAML 的语法([教程](https://www.runoob.com/w3cnote/yaml-intro.html))
-
 默认生成的配置文件如下所示:
 
-````yaml
-# go-cqhttp 默认配置文件
-
-account: # 账号相关
-  uin: 1233456 # QQ账号
-  password: '' # 密码为空时使用扫码登录
-  encrypt: false  # 是否开启密码加密
-  status: 0      # 在线状态,详情请查看下方的在线状态表
-  relogin: # 重连设置
-    # disabled: false
-    delay: 3      # 重连延迟, 单位秒
-    interval: 0   # 重连间隔
-    max-times: 0  # 最大重连次数, 0为无限制
-
-  # 是否使用服务器下发的新地址进行重连
-  # 注意, 此设置可能导致在海外服务器上连接情况更差
-  use-sso-address: true
-
-heartbeat:
-  # disabled: false # 是否开启心跳事件上报
-  # 心跳频率, 单位秒
-  # -1 为关闭心跳
-  interval: 5
-
-  # 上报数据类型
-  # 可选: string,array
-  post-format: string
-  # 是否忽略无效的CQ码, 如果为假将原样发送
-  ignore-invalid-cqcode: false
-  # 是否强制分片发送消息
-  # 分片发送将会带来更快的速度
-  # 但是兼容性会有些问题
-  force-fragment: false
-  # 是否将url分片发送
-  fix-url: false
-  # 下载图片等请求网络代理
-  proxy-rewrite: ''
-  # 是否上报自身消息
-  report-self-message: false
-  # 移除服务端的Reply附带的At
-  remove-reply-at: false
-  # 为Reply附加更多信息
-  extra-reply-data: false
-  # 跳过 Mime 扫描, 忽略错误数据
-  skip-mime-scan: false
-
-output:
-  # 日志等级 trace,debug,info,warn,error
-  log-level: warn
-  # 是否启用 DEBUG
-  debug: false # 开启调试模式
-
-# 默认中间件锚点
-default-middlewares: &default
-  # 访问密钥, 强烈推荐在公网的服务器设置
-  access-token: ''
-  # 事件过滤器文件目录
-  filter: ''
-  # API限速设置
-  # 该设置为全局生效
-  # 原 cqhttp 虽然启用了 rate_limit 后缀, 但是基本没插件适配
-  # 目前该限速设置为令牌桶算法, 请参考:
-  # https://baike.baidu.com/item/%E4%BB%A4%E7%89%8C%E6%A1%B6%E7%AE%97%E6%B3%95/6597000?fr=aladdin
-  rate-limit:
-    enabled: false # 是否启用限速
-    frequency: 1  # 令牌回复频率, 单位秒
-    bucket: 1     # 令牌桶大小
-
-servers:
-  # HTTP 通信设置
-  - http:
-      # 服务端监听地址
-      host: 127.0.0.1
-      # 服务端监听端口
-      port: 5700
-      # 反向HTTP超时时间, 单位秒
-      # 最小值为5，小于5将会忽略本项设置
-      timeout: 5
-      middlewares:
-        <<: *default # 引用默认中间件
-      # 反向HTTP POST地址列表
-      post:
-      #- url: '' # 地址
-      #  secret: ''           # 密钥
-      #- url: 127.0.0.1:5701 # 地址
-      #  secret: ''          # 密钥
-
-  # 正向WS设置
-  - ws:
-      # 正向WS服务器监听地址
-      host: 127.0.0.1
-      # 正向WS服务器监听端口
-      port: 6700
-      middlewares:
-        <<: *default # 引用默认中间件
-
-  - 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 # 引用默认中间件
-  # pprof 性能分析服务器, 一般情况下不需要启用.
-  # 如果遇到性能问题请上传报告给开发者处理
-  # 注意: pprof服务不支持中间件、不支持鉴权. 请不要开放到公网
-  - pprof:
-      # pprof服务器监听地址
-      host: 127.0.0.1
-      # pprof服务器监听端口
-      port: 7700
-      
-  # LambdaServer 配置
-  - lambda:
-      type: scf # 可用 scf,aws (aws未经过测试)
-      middlewares:
-        <<: *default # 引用默认中间件
-
-  # 可添加更多
-  #- ws-reverse:
-  #- ws:
-  #- http:
-
-database: # 数据库相关设置
-  leveldb:
-    # 是否启用内置leveldb数据库
-    # 启用将会增加10-20MB的内存占用和一定的磁盘空间
-    # 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能
-    enable: true
+````json
+{
+  "uin": 0,
+  "password": "",
+  "encrypt_password": false,
+  "password_encrypted": "",
+  "enable_db": true,
+  "enable_self_message": false,
+  "access_token": "",
+  "relogin": {
+    "enabled": true,
+    "relogin_delay": 3,
+    "max_relogin_times": 0
+  },
+  "_rate_limit": {
+    "enabled": false,
+    "frequency": 1,
+    "bucket_size": 1
+  },
+  "post_message_format": "string",
+  "ignore_invalid_cqcode": false,
+  "force_fragmented": true,
+  "heartbeat_interval": 5,
+  "use_sso_address": false,
+  "http_config": {
+    "enabled": true,
+    "host": "0.0.0.0",
+    "port": 5700,
+    "timeout": 5,
+    "post_urls": {
+      "url:port": "secret"
+    }
+  },
+  "ws_config": {
+    "enabled": true,
+    "host": "0.0.0.0",
+    "port": 6700
+  },
+  "ws_reverse_servers": [
+    {
+      "enabled": false,
+      "reverse_url": "ws://you_websocket_universal.server",
+      "reverse_api_url": "ws://you_websocket_api.server",
+      "reverse_event_url": "ws://you_websocket_event.server",
+      "reverse_reconnect_interval": 3000
+    }
+  ]
+}
 ````
 
-> 注1: 开启密码加密后程序将在每次启动时要求输入解密密钥, 密钥错误会导致登录时提示密码错误.
-> 解密后密码的哈希将储存在内存中，用于自动重连等功能. 所以此加密并不能防止内存读取.
+| 字段                  | 类型     | 说明                                                                                     |
+| --------------------- | -------- | ---------------------------------------------------------------------------------------- |
+| uin                   | int64    | 登录用QQ号                                                                               |
+| password              | string   | 登录用密码                                                                               |
+| encrypt_password      | bool     | 是否对密码进行加密.                                                                      |
+| password_encrypted    | string   | 加密后的密码(请勿修改)                                                                   |
+| enable_db             | bool     | 是否开启内置数据库, 关闭后将无法使用 **回复/撤回** 等上下文相关接口                      |
+| enable_self_message   | bool     | 是否启用 `message_sent` 事件                                                       |
+| access_token          | string   | 同CQHTTP的 `access_token`  用于身份验证                                                  |
+| relogin               | bool     | 是否自动重新登录                                                                         |
+| relogin_delay         | int      | 重登录延时（秒）                                                                         |
+| max_relogin_times     | uint     | 最大重登录次数，若0则不设置上限                                                          |
+| _rate_limit           | bool     | 是否启用API调用限速                                                                      |
+| frequency             | float64  | 1s内能调用API的次数                                                                      |
+| bucket_size           | int      | 令牌桶的大小，默认为1，修改此值可允许一定程度内连续调用api                               |
+| post_message_format   | string   | 上报信息类型                                                                             |
+| ignore_invalid_cqcode | bool     | 是否忽略错误的CQ码                                                                       |
+| force_fragmented      | bool     | 是否强制分片发送群长消息                                                                 |
+| fix_url               | bool     | 是否对链接的发送进行预处理, 可缓解链接信息被风控导致无法发送的情况, 但可能影响客户端着色(不影响内容)|
+| use_sso_address       | bool     | 是否使用服务器下发的地址                                                                 |
+| heartbeat_interval    | int64    | 心跳间隔时间，单位秒。小于0则关闭心跳，等于0使用默认值(5秒)                              |
+| http_config           | object   | HTTP API配置                                                                             |
+| ws_config             | object   | Websocket API 配置                                                                       |
+| ws_reverse_servers    | object[] | 反向 Websocket API 配置                                                                  |
+| log_level             | string   | 指定日志收集级别，将收集的日志单独存放到固定文件中，便于查看日志线索 当前支持 warn,error |
+
+> 注: 开启密码加密后程序将在每次启动时要求输入解密密钥, 密钥错误会导致登录时提示密码错误.
+> 解密后密码将储存在内存中，用于自动重连等功能. 所以此加密并不能防止内存读取.
 > 解密密钥在使用完成后并不会留存在内存中, 所以可用相对简单的字符串作为密钥
 
-> 注2: 对于不需要的通信方式，你可以使用注释将其停用(推荐)，或者添加配置 `disabled: true` 将其关闭
+> 注2: 分片发送为原酷Q发送长消息的老方案, 发送速度更优/兼容性更好，但在有发言频率限制的群里，可能无法发送。关闭后将优先使用新方案, 能发送更长的消息, 但发送速度更慢，在部分老客户端将无法解析.
 
-> 注3: 分片发送为原酷Q发送长消息的老方案, 发送速度更优/兼容性更好，但在有发言频率限制的群里，可能无法发送。关闭后将优先使用新方案, 能发送更长的消息, 但发送速度更慢，在部分老客户端将无法解析.
-
-> 注4：关闭心跳服务可能引起断线，请谨慎关闭
-
-> 注5：关于MIME扫描， 详见[MIME](file.md#MIME)
-
-## 在线状态
-
-| 状态 | 值 |
-| -----|----|
-| 在线  |  0 |
-| 离开 | 1 |
-| 隐身 | 2 |
-| 忙 | 3 |
-| 听歌中 | 4 |
-| 星座运势 | 5 |
-| 今日天气 | 6 |
-| 遇见春天 | 7 |
-| Timi中 | 8 |
-| 吃鸡中 | 9 |
-| 恋爱中 | 10 |
-| 汪汪汪 | 11 |
-| 干饭中 | 12 |
-| 学习中 | 13 |
-| 熬夜中 | 14 |
-| 打球中 | 15 |
-| 信号弱 | 16 |
-| 在线学习 | 17 |
-| 游戏中 | 18 |
-| 度假中 | 19 |
-| 追剧中 | 20 |
-| 健身中 | 21 |
+> 注3：关闭心跳服务可能引起断线，请谨慎关闭
 
 ## 设备信息
 
@@ -206,7 +121,6 @@ database: # 数据库相关设置
 | 1   | Android Phone | 无                                                               |
 | 2   | Android Watch | 无法接收 `notify` 事件、无法接收口令红包、无法接收撤回消息            |
 | 3   | MacOS         | 无                                                               |
-| 4   | 企点           | 只能登录企点账号或企点子账号                                        |
 
 > 注意, 根据协议的不同, 各类消息有所限制
 
@@ -221,15 +135,4 @@ database: # 数据库相关设置
 ````
 1.1.1.1:53
 1.1.2.2:8899
-````
-
-## 云函数部署
-
-使用CustomRuntime进行部署， bootstrap 文件在 `scripts/bootstrap` 中已给出。
-在部署前，请在本地完成登录，并将 `config.yml` ， `device.json` ，`bootstrap` 和 `go-cqhttp`
-一起打包。
-
-在触发器中创建一个API网关触发器，并启用集成响应，创建完成后即可通过api网关访问go-cqhttp(建议配置 AccessToken)。
-
-> scripts/bootstrap 中使用的工作路径为 /tmp, 这个目录最大能容下500M文件, 如需长期使用，
-> 请挂载文件存储(CFS).
+````

docs/cqhttp.md

@@ -7,7 +7,6 @@
 <p>
 
 ##### CQCode
-
 - [图片](#图片)
 - [回复](#回复)
 - [红包](#红包)
@@ -22,7 +21,6 @@
 - [图片](#图片)
 
 ##### API
-
 - [设置群名](#设置群名)
 - [设置群头像](#设置群头像)
 - [获取图片信息](#获取图片信息)
@@ -49,7 +47,6 @@
 - [重载事件过滤器](#重载事件过滤器)
 
 ##### 事件
-
 - [群消息撤回](#群消息撤回)
 - [好友消息撤回](#好友消息撤回)
 - [好友戳一戳](#好友戳一戳)
@@ -75,13 +72,12 @@ Type : `image`
 
 | 参数名  | 可能的值        | 说明                                                                   |
 | ------- | --------------- | ---------------------------------------------------------------------- |
-| `file`   | -               | 图片文件名                                                             |
-| `type`   | `flash`，`show` | 图片类型，`flash` 表示闪照，`show` 表示秀图，默认普通图片              |
-| `subType`| -               | 图片子类型, 只出现在群聊.                                             |
-| `url`    | -               | 图片 URL                                                               |
-| `cache`  | `0` `1`         | 只在通过网络 URL 发送时有效，表示是否使用已缓存的文件，默认 `1`        |
-| `id`     | -               | 发送秀图时的特效id，默认为40000                                        |
-| `c`      | `2` `3`         | 通过网络下载图片时的线程数, 默认单线程. (在资源不支持并发时会自动处理) |
+| `file`  | -               | 图片文件名                                                             |
+| `type`  | `flash`，`show` | 图片类型，`flash` 表示闪照，`show` 表示秀图，默认普通图片              |
+| `url`   | -               | 图片 URL                                                               |
+| `cache` | `0` `1`         | 只在通过网络 URL 发送时有效，表示是否使用已缓存的文件，默认 `1`        |
+| `id`    | -               | 发送秀图时的特效id，默认为40000                                        |
+| `c`     | `2` `3`         | 通过网络下载图片时的线程数, 默认单线程. (在资源不支持并发时会自动处理) |
 
 可用的特效ID:
 
@@ -94,21 +90,6 @@ Type : `image`
 | 40004 | 爱你 |
 | 40005 | 征友 |
 
-子类型列表:
-
-| value | 说明 |
-| ----- | ---- |
-| 0     | 正常图片                                  |
-| 1     | 表情包, 在客户端会被分类到表情包图片并缩放显示 |
-| 2     | 热图                                      |
-| 3     | 斗图                                      |
-| 4     | 智图?                                     |
-| 7     | 贴图                                      |
-| 8     | 自拍                                      |
-| 9     | 贴图广告?                                  |
-| 10    | 有待测试                                   |
-| 13    | 热搜图                                    |
-
 示例: `[CQ:image,file=http://baidu.com/1.jpg,type=show,id=40004]`
 
 > 注意：图片总大小不能超过30MB，gif总帧数不能超过300帧
@@ -131,7 +112,9 @@ Type : `reply`
 | `time` | int64  | 可选. 自定义回复时的时间, 格式为Unix时间 |
 | `seq` | int64  | 起始消息序号, 可通过 `get_msg` 获得 |
 
-示例: `[CQ:reply,id=123456]`
+
+
+示例: `[CQ:reply,id=123456]` 
 \
 自定义回复示例: `[CQ:reply,text=Hello World,qq=10086,time=3376656000,seq=5123]`
 
@@ -139,11 +122,11 @@ Type : `reply`
 
 ```json
 {
-  "type": "music",
-  "data": {
-    "type": "163",
-    "id": "28949129"
-  }
+    "type": "music",
+    "data": {
+        "type": "163",
+        "id": "28949129"
+    }
 }
 ```
 
@@ -160,13 +143,13 @@ Type : `reply`
 
 ```json
 {
-  "type": "music",
-  "data": {
-    "type": "custom",
-    "url": "http://baidu.com",
-    "audio": "http://baidu.com/1.mp3",
-    "title": "音乐标题"
-  }
+    "type": "music",
+    "data": {
+        "type": "custom",
+        "url": "http://baidu.com",
+        "audio": "http://baidu.com/1.mp3",
+        "title": "音乐标题"
+    }
 }
 ```
 
@@ -248,9 +231,11 @@ Type: `gift`
 | 12  | 我超忙的   |
 | 13  | 爱心口罩   |
 
+
+
 示例: `[CQ:gift,qq=123456,id=8]`
 
-### 合并转发
+ ### 合并转发
 
 Type: `forward`
 
@@ -274,33 +259,32 @@ Type: `node`
 
 | 参数名    | 类型    | 说明           | 特殊说明                                                                               |
 | --------- | ------- | -------------- | -------------------------------------------------------------------------------------- |
-| `id`      | int32   | 转发消息id     | 直接引用他人的消息合并转发, 实际查看顺序为原消息发送顺序 **与下面的自定义消息二选一** |
+| `id`      | int32   | 转发消息id     | 直接引用他人的消息合并转发,  实际查看顺序为原消息发送顺序 **与下面的自定义消息二选一** |
 | `name`    | string  | 发送者显示名字 | 用于自定义消息 (自定义消息并合并转发，实际查看顺序为自定义消息段顺序)                  |
 | `uin`     | int64   | 发送者QQ号     | 用于自定义消息                                                                         |
 | `content` | message | 具体消息       | 用于自定义消息                                                                         |
 | `seq`     | message | 具体消息       | 用于自定义消息                                                                         |
 
-特殊说明: **需要使用单独的API `/send_group_forward_msg` 发送，并且由于消息段较为复杂，仅支持Array形式入参。 如果引用消息和自定义消息同时出现，实际查看顺序将取消息段顺序.
-另外按 [CQHTTP](https://git.io/JtxtN) 文档说明, `data` 应全为字符串, 但由于需要接收`message` 类型的消息, 所以 *仅限此Type的content字段* 支持Array套娃**
+特殊说明: **需要使用单独的API `/send_group_forward_msg` 发送，并且由于消息段较为复杂，仅支持Array形式入参。 如果引用消息和自定义消息同时出现，实际查看顺序将取消息段顺序.  另外按 [CQHTTP](https://git.io/JtxtN) 文档说明, `data` 应全为字符串, 但由于需要接收`message` 类型的消息, 所以 *仅限此Type的content字段* 支持Array套娃**
 
-示例:
+示例: 
 
 直接引用消息合并转发:
 
 ````json
 [
-  {
-    "type": "node",
-    "data": {
-      "id": "123"
+    {
+        "type": "node",
+        "data": {
+            "id": "123"
+        }
+    },
+    {
+        "type": "node",
+        "data": {
+            "id": "456"
+        }
     }
-  },
-  {
-    "type": "node",
-    "data": {
-      "id": "456"
-    }
-  }
 ]
 ````
 
@@ -308,29 +292,27 @@ Type: `node`
 
 ````json
 [
-  {
-    "type": "node",
-    "data": {
-      "name": "消息发送者A",
-      "uin": "10086",
-      "content": [
-        {
-          "type": "text",
-          "data": {
-            "text": "测试消息1"
-          }
+    {
+        "type": "node",
+        "data": {
+            "name": "消息发送者A",
+            "uin": "10086",
+            "content": [
+                {
+                    "type": "text",
+                    "data": {"text": "测试消息1"}
+                }
+            ]
+        }
+    },
+    {
+        "type": "node",
+        "data": {
+            "name": "消息发送者B",
+            "uin": "10087",
+            "content": "[CQ:image,file=xxxxx]测试消息2"
         }
-      ]
     }
-  },
-  {
-    "type": "node",
-    "data": {
-      "name": "消息发送者B",
-      "uin": "10087",
-      "content": "[CQ:image,file=xxxxx]测试消息2"
-    }
-  }
 ]
 ````
 
@@ -338,25 +320,24 @@ Type: `node`
 
 ````json
 [
-  {
-    "type": "node",
-    "data": {
-      "name": "自定义发送者",
-      "uin": "10086",
-      "content": "我是自定义消息",
-      "seq": "5123",
-      "time": "3376656000"
+    {
+        "type": "node",
+        "data": {
+            "name": "自定义发送者",
+            "uin": "10086",
+            "content": "我是自定义消息",
+            "seq": "5123",
+            "time": "3376656000"
+        }
+    },
+    {
+        "type": "node",
+        "data": {
+            "id": "123"
+        }
     }
-  },
-  {
-    "type": "node",
-    "data": {
-      "id": "123"
-    }
-  }
 ]
 ````
-
 ### 短视频消息
 
 Type: `video`
@@ -370,8 +351,7 @@ Type: `video`
 | `file`  | string  | 支持http和file发送                                                     |
 | `cover` | string  | 视频封面，支持http，file和base64发送，格式必须为jpg                    |
 | `c`     | `2` `3` | 通过网络下载视频时的线程数, 默认单线程. (在资源不支持并发时会自动处理) |
-
-示例: `[CQ:video,file=file:///C:\\Users\Richard\Videos\1.mp4]`
+示例: `[CQ:image,file=file:///C:\\Users\Richard\Pictures\1.mp4]`
 
 ### XML 消息
 
@@ -395,61 +375,30 @@ Type: `xml`
 #### qq音乐
 
 ```xml
-<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>
-<msg serviceID="2" templateID="1" action="web" brief="&#91;分享&#93; 十年" sourceMsgId="0"
-     url="https://i.y.qq.com/v8/playsong.html?_wv=1&amp;songid=4830342&amp;souce=qqshare&amp;source=qqshare&amp;ADTAG=qqshare"
-     flag="0" adverSign="0" multiMsgFlag="0">
-    <item layout="2">
-        <audio cover="http://imgcache.qq.com/music/photo/album_500/26/500_albumpic_89526_0.jpg"
-               src="http://ws.stream.qqmusic.qq.com/C400003mAan70zUy5O.m4a?guid=1535153710&amp;vkey=D5315B8C0603653592AD4879A8A3742177F59D582A7A86546E24DD7F282C3ACF81526C76E293E57EA1E42CF19881C561275D919233333ADE&amp;uin=&amp;fromtag=3"/>
-        <title>十年</title>
-        <summary>陈奕迅</summary>
-    </item>
-    <source name="QQ音乐" icon="https://i.gtimg.cn/open/app_icon/01/07/98/56/1101079856_100_m.png"
-            url="http://web.p.qq.com/qqmpmobile/aio/app.html?id=1101079856" action="app"
-            a_actionData="com.tencent.qqmusic" i_actionData="tencent1101079856://" appid="1101079856"/>
-</msg>
+<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="2" templateID="1" action="web" brief="&#91;分享&#93; 十年" sourceMsgId="0" url="https://i.y.qq.com/v8/playsong.html?_wv=1&amp;songid=4830342&amp;souce=qqshare&amp;source=qqshare&amp;ADTAG=qqshare" flag="0" adverSign="0" multiMsgFlag="0" ><item layout="2"><audio cover="http://imgcache.qq.com/music/photo/album_500/26/500_albumpic_89526_0.jpg" src="http://ws.stream.qqmusic.qq.com/C400003mAan70zUy5O.m4a?guid=1535153710&amp;vkey=D5315B8C0603653592AD4879A8A3742177F59D582A7A86546E24DD7F282C3ACF81526C76E293E57EA1E42CF19881C561275D919233333ADE&amp;uin=&amp;fromtag=3" /><title>十年</title><summary>陈奕迅</summary></item><source name="QQ音乐" icon="https://i.gtimg.cn/open/app_icon/01/07/98/56/1101079856_100_m.png" url="http://web.p.qq.com/qqmpmobile/aio/app.html?id=1101079856" action="app"  a_actionData="com.tencent.qqmusic" i_actionData="tencent1101079856://" appid="1101079856" /></msg>
 ```
-
 #### 网易音乐
-
 ```xml
-<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>
-<msg serviceID="2" templateID="1" action="web" brief="&#91;分享&#93; 十年" sourceMsgId="0"
-     url="http://music.163.com/m/song/409650368" flag="0" adverSign="0" multiMsgFlag="0">
-    <item layout="2">
-        <audio cover="http://p2.music.126.net/g-Qgb9ibk9Wp_0HWra0xQQ==/16636710440565853.jpg?param=90y90"
-               src="https://music.163.com/song/media/outer/url?id=409650368.mp3"/>
-        <title>十年</title>
-        <summary>黄梦之</summary>
-    </item>
-    <source name="网易云音乐" icon="https://pic.rmb.bdstatic.com/911423bee2bef937975b29b265d737b3.png"
-            url="http://web.p.qq.com/qqmpmobile/aio/app.html?id=1101079856" action="app"
-            a_actionData="com.netease.cloudmusic" i_actionData="tencent100495085://" appid="100495085"/>
-</msg>
+<?xml version='1.0' encoding='UTF-8' standalone='yes' ?><msg serviceID="2" templateID="1" action="web" brief="&#91;分享&#93; 十年" sourceMsgId="0" url="http://music.163.com/m/song/409650368" flag="0" adverSign="0" multiMsgFlag="0" ><item layout="2"><audio cover="http://p2.music.126.net/g-Qgb9ibk9Wp_0HWra0xQQ==/16636710440565853.jpg?param=90y90" src="https://music.163.com/song/media/outer/url?id=409650368.mp3" /><title>十年</title><summary>黄梦之</summary></item><source name="网易云音乐" icon="https://pic.rmb.bdstatic.com/911423bee2bef937975b29b265d737b3.png" url="http://web.p.qq.com/qqmpmobile/aio/app.html?id=1101079856" action="app" a_actionData="com.netease.cloudmusic" i_actionData="tencent100495085://" appid="100495085" /></msg>
 ```
 
 #### 卡片消息1
-
 ```xml
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msg serviceID="1">
-    <item>
-        <title>生死8秒！女司机高速急刹，他一个操作救下一车性命</title>
-    </item>
-    <source name="官方认证消息" icon="https://qzs.qq.com/ac/qzone_v5/client/auth_icon.png" action="" appid="-1"/>
+<item><title>生死8秒！女司机高速急刹，他一个操作救下一车性命</title></item>
+<source name="官方认证消息" icon="https://qzs.qq.com/ac/qzone_v5/client/auth_icon.png" action="" appid="-1" />
 </msg>
 ```
 
 #### 卡片消息2
-
 ```xml
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <msg serviceID="1">
-    <item layout="4">
-        <title>test title</title>
-        <picture cover="http://url.cn/5CEwIUy"/>
-    </item>
+<item layout="4">
+<title>test title</title>
+<picture cover="http://url.cn/5CEwIUy"/>
+</item>
 </msg>
 ```
 
@@ -468,24 +417,23 @@ Type: `json`
 
 json中的字符串需要进行转义：
 
-> ","=> `&#44;`
+>","=> `&#44;`
 
-> "&"=> `&amp;`
+>"&"=> `&amp;`
 
-> "["=> `&#91;`
+>"["=> `&#91;`
 
-> "]"=> `&#93;`
+>"]"=> `&#93;`
 
 否则无法正确得到解析
 
 示例json 的cq码：
-
 ```test
 [CQ:json,data={"app":"com.tencent.miniapp"&#44;"desc":""&#44;"view":"notification"&#44;"ver":"0.0.0.1"&#44;"prompt":"&#91;应用&#93;"&#44;"appID":""&#44;"sourceName":""&#44;"actionData":""&#44;"actionData_A":""&#44;"sourceUrl":""&#44;"meta":{"notification":{"appInfo":{"appName":"全国疫情数据统计"&#44;"appType":4&#44;"appid":1109659848&#44;"iconUrl":"http:\/\/gchat.qpic.cn\/gchatpic_new\/719328335\/-2010394141-6383A777BEB79B70B31CE250142D740F\/0"}&#44;"data":&#91;{"title":"确诊"&#44;"value":"80932"}&#44;{"title":"今日确诊"&#44;"value":"28"}&#44;{"title":"疑似"&#44;"value":"72"}&#44;{"title":"今日疑似"&#44;"value":"5"}&#44;{"title":"治愈"&#44;"value":"60197"}&#44;{"title":"今日治愈"&#44;"value":"1513"}&#44;{"title":"死亡"&#44;"value":"3140"}&#44;{"title":"今**亡"&#44;"value":"17"}&#93;&#44;"title":"中国加油，武汉加油"&#44;"button":&#91;{"name":"病毒：SARS-CoV-2，其导致疾病命名 COVID-19"&#44;"action":""}&#44;{"name":"传染源：新冠肺炎的患者。无症状感染者也可能成为传染源。"&#44;"action":""}&#93;&#44;"emphasis_keyword":""}}&#44;"text":""&#44;"sourceAd":""}]
 ```
 
-### cardimage
 
+### cardimage
 一种xml的图片消息（装逼大图）
 
 ps: xml 接口的消息都存在风控风险，请自行兼容发送失败后的处理（可以失败后走普通图片模式）
@@ -506,8 +454,8 @@ Type: `cardimage`
 | `source`    | string | 分享来源的名称，可以留空              |
 | `icon`      | string | 分享来源的icon图标url，可以留空       |
 
-示例cardimage 的cq码：
 
+示例cardimage 的cq码：
 ```test
 [CQ:cardimage,file=https://i.pixiv.cat/img-master/img/2020/03/25/00/00/08/80334602_p0_master1200.jpg]
 ```
@@ -532,9 +480,9 @@ Type: `tts`
 
 ### 设置群名
 
-终结点: `/set_group_name`
+终结点: `/set_group_name`  
 
-**参数**
+**参数** 
 
 | 字段         | 类型   | 说明 |
 | ------------ | ------ | ---- |
@@ -543,9 +491,9 @@ Type: `tts`
 
 ### 设置群头像
 
-终结点: `/set_group_portrait`
+终结点: `/set_group_portrait`  
 
-**参数**
+**参数** 
 
 | 字段       | 类型   | 说明                     |
 | ---------- | ------ | ------------------------ |
@@ -557,8 +505,7 @@ Type: `tts`
 
 - 绝对路径，例如 `file:///C:\\Users\Richard\Pictures\1.png`，格式使用 [`file` URI](https://tools.ietf.org/html/rfc8089)
 - 网络 URL，例如 `http://i1.piimg.com/567571/fdd6e7b6d93f1ef0.jpg`
-- Base64
-  编码，例如 `base64://iVBORw0KGgoAAAANSUhEUgAAABQAAAAVCAIAAADJt1n/AAAAKElEQVQ4EWPk5+RmIBcwkasRpG9UM4mhNxpgowFGMARGEwnBIEJVAAAdBgBNAZf+QAAAAABJRU5ErkJggg==`
+- Base64 编码，例如 `base64://iVBORw0KGgoAAAANSUhEUgAAABQAAAAVCAIAAADJt1n/AAAAKElEQVQ4EWPk5+RmIBcwkasRpG9UM4mhNxpgowFGMARGEwnBIEJVAAAdBgBNAZf+QAAAAABJRU5ErkJggg==`
 
 [2]`cache`参数: 通过网络 URL 发送时有效，`1`表示使用缓存，`0`关闭关闭缓存，默认 为`1`
 
@@ -566,7 +513,7 @@ Type: `tts`
 
 ### 获取图片信息
 
-终结点: `/get_image`
+终结点: `/get_image`  
 
 > 该接口为 CQHTTP 接口修改
 
@@ -586,7 +533,7 @@ Type: `tts`
 
 ### 获取消息
 
-终结点: `/get_msg`
+终结点: `/get_msg` 
 
 参数
 
@@ -624,29 +571,28 @@ Type: `tts`
 
 ````json5
 {
-  "data": {
-    "messages": [
-      {
-        "content": "合并转发1",
-        "sender": {
-          "nickname": "发送者A",
-          "user_id": 10086
-        },
-        "time": 1595694374
-      },
-      {
-        "content": "合并转发2[CQ:image,file=xxxx,url=xxxx]",
-        "sender": {
-          "nickname": "发送者B",
-          "user_id": 10087
-        },
-        "time": 1595694393
-        //  可选
-      }
-    ]
-  },
-  "retcode": 0,
-  "status": "ok"
+    "data": {
+        "messages": [
+            {
+                "content": "合并转发1",
+                "sender": {
+                    "nickname": "发送者A",
+                    "user_id": 10086
+                },
+                "time": 1595694374
+            },
+            {
+                "content": "合并转发2[CQ:image,file=xxxx,url=xxxx]",
+                "sender": {
+                    "nickname": "发送者B",
+                    "user_id": 10087
+                },
+                "time": 1595694393 //  可选
+            }
+        ]
+    },
+    "retcode": 0,
+    "status": "ok"
 }
 ````
 
@@ -654,7 +600,7 @@ Type: `tts`
 
 终结点: `/send_group_forward_msg`
 
-**参数**
+**参数** 
 
 | 字段       | 类型           | 说明                         |
 | ---------- | -------------- | ---------------------------- |
@@ -662,16 +608,16 @@ Type: `tts`
 | `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) |
 
 响应数据
-
+    
 | 字段         | 类型   | 说明   |
 | ------------ | ------ | ------ |
 | `message_id` | string | 消息id |
 
 ### 获取中文分词
 
-终结点: `/.get_word_slices`
+终结点: `/.get_word_slices`  
 
-**参数**
+**参数** 
 
 | 字段      | 类型   | 说明 |
 | --------- | ------ | ---- |
@@ -739,9 +685,9 @@ Type: `tts`
 
 > 注意: 目前图片OCR接口仅支持接受的图片
 
-终结点: `/ocr_image`
+终结点: `/ocr_image` 
 
-**参数**
+**参数** 
 
 | 字段    | 类型   | 说明   |
 | ------- | ------ | ------ |
@@ -762,6 +708,7 @@ Type: `tts`
 | `confidence`  | int32   | 置信度 |
 | `coordinates` | vector2 | 坐标   |
 
+
 ### 获取群系统消息
 
 终结点: `/get_group_system_msg`
@@ -773,9 +720,9 @@ Type: `tts`
 | `invited_requests` | InvitedRequest[] | 邀请消息列表 |
 | `join_requests`    | JoinRequest[]    | 进群消息列表 |
 
-> 注意: 如果列表不存在任何消息, 将返回 `null`
+ > 注意: 如果列表不存在任何消息, 将返回 `null`
 
-**InvitedRequest**
+ **InvitedRequest**
 
 | 字段           | 类型   | 说明              |
 | -------------- | ------ | ----------------- |
@@ -787,7 +734,7 @@ Type: `tts`
 | `checked`      | bool   | 是否已被处理      |
 | `actor`        | int64  | 处理者, 未处理为0 |
 
-**JoinRequest**
+  **JoinRequest**
 
 | 字段             | 类型   | 说明              |
 | ---------------- | ------ | ----------------- |
@@ -804,7 +751,7 @@ Type: `tts`
 
 终结点: `/get_group_file_system_info`
 
-**参数**
+**参数** 
 
 | 字段       | 类型  | 说明 |
 | ---------- | ----- | ---- |
@@ -825,7 +772,7 @@ Type: `tts`
 
 终结点: `/get_group_root_files`
 
-**参数**
+**参数** 
 
 | 字段       | 类型  | 说明 |
 | ---------- | ----- | ---- |
@@ -844,7 +791,7 @@ Type: `tts`
 
 终结点: `/get_group_files_by_folder`
 
-**参数**
+**参数** 
 
 | 字段        | 类型   | 说明                        |
 | ----------- | ------ | --------------------------- |
@@ -864,7 +811,7 @@ Type: `tts`
 
 终结点: `/get_group_file_url`
 
-**参数**
+**参数** 
 
 | 字段       | 类型   | 说明                      |
 | ---------- | ------ | ------------------------- |
@@ -878,7 +825,7 @@ Type: `tts`
 | ----- | ------ | ------------ |
 | `url` | string | 文件下载链接 |
 
-**File**
+ **File**
 
 | 字段             | 类型   | 说明                   |
 | ---------------- | ------ | ---------------------- |
@@ -893,7 +840,7 @@ Type: `tts`
 | `uploader`       | int64  | 上传者ID               |
 | `uploader_name`  | string | 上传者名字             |
 
-**Folder**
+ **Folder**
 
 | 字段               | 类型   | 说明       |
 | ------------------ | ------ | ---------- |
@@ -908,7 +855,7 @@ Type: `tts`
 
 终结点: `/upload_group_file`
 
-**参数**
+**参数** 
 
 | 字段       | 类型   | 说明                      |
 | ---------- | ------ | ------------------------- |
@@ -938,6 +885,7 @@ Type: `tts`
 
 **Statistics**
 
+
 | 字段               | 类型   | 说明             |
 | ------------------ | ------ | ---------------- |
 | `packet_received`  | uint64 | 收到的数据包总数 |
@@ -954,7 +902,7 @@ Type: `tts`
 
 终结点: `/get_group_at_all_remain`
 
-**参数**
+**参数** 
 
 | 字段       | 类型  | 说明 |
 | ---------- | ----- | ---- |
@@ -972,7 +920,7 @@ Type: `tts`
 
 终结点: `/download_file`
 
-**参数**
+**参数** 
 
 | 字段           | 类型            | 说明         |
 | -------------- | --------------- | ------------ |
@@ -1012,7 +960,7 @@ JSON数组:
 
 终结点：`/get_group_msg_history`
 
-**参数**
+**参数** 
 
 | 字段          | 类型  | 说明                                |
 | ------------- | ----- | ----------------------------------- |
@@ -1031,7 +979,7 @@ JSON数组:
 
 终结点：`/get_online_clients`
 
-**参数**
+**参数** 
 
 | 字段       | 类型 | 说明         |
 | ---------- | ---- | ------------ |
@@ -1055,7 +1003,7 @@ JSON数组:
 
 终结点：`/check_url_safely`
 
-**参数**
+**参数** 
 
 | 字段       | 类型   | 说明                      |
 | ---------- | ------ | ------------------------- |
@@ -1102,76 +1050,13 @@ JSON数组:
 
 `该 API 没有响应数据`
 
-### 获取单向好友列表
-
-终结点: `/get_unidirectional_friend_list`
-
-**响应数据**
-
-数组信息: 
-
-| 字段          | 类型   | 说明     |
-| ------------- | ------ | -------- |
-| `nickname`    | string  | 昵称 |
-| `user_id`     | int64   | 用户QQ号 |
-| `source`      | string | 添加途径 |
-
-> 添加途径为用户显示内容, 如 `精确查找` `QQ群 - xxxx`
-
-### 删除单向好友
-
-终结点: `/delete_unidirectional_friend`
-
-**参数**
-
-| 字段名     | 数据类型 | 默认值 | 说明     |
-| ---------- | -------- | ------ | -------- |
-| `user_id`       | int64    |        | 好友ID   |
-
-`该 API 没有响应数据`
-
-### 删除好友
-
-终结点: `/delete_friend`
-
-**参数**
-
-| 字段名     | 数据类型 | 默认值 | 说明     |
-| ---------- | -------- | ------ | -------- |
-| `user_id`       | int64    |        | 好友ID   |
-
-`该 API 没有响应数据`
-
-### 获取企点账号信息
-
-> 该API只有企点协议可用
-
-终结点: `/qidian_get_account_info`
-
-**响应数据**
-
-| 字段               | 类型    | 说明         |
-| ------------------ | ------- | ------------ |
-| `master_id`        | int64   | 父账号ID      |
-| `ext_name`         | string  | 用户昵称     |
-| `create_time`      | int64   | 账号创建时间  |
-
-### 标记消息已读
-
-终结点: `/mark_msg_as_read`
-
-**参数**
-
-| 字段名     | 数据类型 | 默认值 | 说明     |
-| ---------- | -------- | ------ | -------- |
-| `message_id`       | int32    |        | 消息ID   |
-
 ### 重载事件过滤器
 
 终结点：`/reload_event_filter`
 
 `该 API 无需参数也没有响应数据`
 
+
 ## 事件
 
 ### 群消息撤回
@@ -1270,23 +1155,11 @@ JSON数组:
 | `notice_type` | string | `group_card` | 消息类型 |
 | `group_id`    | int64  |              | 群号     |
 | `user_id`     | int64  |              | 成员id   |
-| `card_new`    | string |              | 新名片   |
-| `card_old`    | string |              | 旧名片   |
+| `card_new`    | int64  |              | 新名片   |
+| `card_old`    | int64  |              | 旧名片   |
 
 > PS: 当名片为空时 `card_xx` 字段为空字符串, 并不是昵称
 
-### 群成员头衔更新事件
-
-**上报数据**
-
-| 字段          | 类型   | 可能的值     | 说明     |
-| ------------- | ------ | ------------ | -------- |
-| `post_type`   | string | `notice`     | 上报类型 |
-| `notice_type` | string | `notify`     | 消息类型 |
-| `group_id`    | int64  |              | 群号     |
-| `user_id`     | int64  |              | 成员id   |
-| `title`       | string |              | 新头衔   |
-
 ### 接收到离线文件
 
 **上报数据**

docs/file.md

@@ -1,68 +1,38 @@
 # 文件
 
-go-cqhttp 默认生成的文件树如下所示:
+go-cqhttp 默认生成的文件树如下所示: 
 
-```
+````
 .
 ├── go-cqhttp
-├── config.yml
+├── config.hjson
 ├── device.json
 ├── logs
 │   └── xx-xx-xx.log
 └── data
     ├── images
     │   └── xxxx.image
-    └── levleldb
-```
+    └── db
+````
 
-| 文件         | 用途                 |
-| ------------ | -------------------- |
-| go-cqhttp    | go-cqhttp 可执行文件 |
-| config.yml | 运行配置文件         |
-| device.json  | 虚拟设备配置文件     |
-| logs         | 日志存放目录         |
-| data         | 数据目录             |
-| data/leveldb | 数据库目录           |
-| data/images  | 图片缓存目录         |
-| data/voices  | 语音缓存目录         |
-| data/videos  | 视频缓存目录         |
-| data/cache   | 发送图片缓存目录     |
+| 文件        | 用途                |
+| ----------- | ------------------- |
+| go-cqhttp   | go-cqhttp可执行文件 |
+| config.hjson | 运行配置文件        |
+| device.json | 虚拟设备配置文件    |
+| logs        | 日志存放目录        |
+| data        | 数据目录            |
+| data/images | 图片缓存目录        |
+| data/db     | 数据库目录          |
 
 ## 图片缓存文件
 
-出于性能考虑，go-cqhttp 并不会将图片源文件下载到本地，而是生成一个可以和 QQ 服务器对应的缓存文件 (.image)，该缓存文件结构如下:
+出于性能考虑，go-cqhttp 并不会将图片源文件下载到本地，而是生成一个可以和QQ服务器对应的缓存文件 (.image)，该缓存文件结构如下:
 
-| 偏移            | 类型     | 说明                 |
-| --------------- | -------- | -------------------- |
-| 0x00            | [16]byte | 图片源文件 MD5 HASH  |
-| 0x10            | uint32   | 图片源文件大小       |
+| 偏移            | 类型     | 说明               |
+| --------------- | -------- | ------------------ |
+| 0x00            | [16]byte | 图片源文件MD5 HASH |
+| 0x10            | uint32   | 图片源文件大小     |
 | 0x14            | string   | 图片原名(QQ内部ID) |
-| 0x14 + 原名长度 | string   | 图片下载链接         |
-
-# MIME
-
-启用MINE检查可以及时发现媒体资源格式错误引起的上传失败(通常表现为，请求网页图片，但服务端返回404.html)
-
-在配置文件中设置 `skip-mine-scan: false`后 ，go-cqhttp 会在上传媒体资源(视频暂不支持)前对MIME进行检查，
-详细允许类型如下所示:
-
-图片：
-> image/bmp  
-> image/gif  
-> image/jpeg  
-> image/png  
-> image/webp  
-
-语音:
-> audio/aac  
-> audio/aiff  
-> audio/amr  
-> audio/ape  
-> audio/flac  
-> audio/midi  
-> audio/mp4  
-> audio/mpeg  
-> audio/ogg  
-> audio/wav  
-> audio/x-m4a  
+| 0x14 + 原名长度 | string   | 图片下载链接       |
 

docs/guild.md

@@ -1,221 +0,0 @@
-# 频道相关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暂时无法获取频道消息
-- `at` `reply` 等消息暂不支持解析
-- 所有事件的 `self_id` 均为 BOT 的QQ号. `tiny_id` 将放在 `self_tiny_id` 字段
-
-## API
-
-### 获取频道系统内BOT的资料
-
-终结点: `/get_guild_service_profile`
-
-**响应数据**
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `nickname`    | string | 昵称      |
-| `tiny_id`     | uint64 | 自身的ID   |
-| `avatar_url`  | string | 头像链接   |
-
-### 获取频道列表
-
-终结点: `/get_guild_list`
-
-**响应数据**
-
-正常情况下响应 `GuildInfo` 数组, 未加入任何频道响应 `null`
-
-GuildInfo:
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `guild_id`    | uint64 | 频道ID      |
-| `guild_name`     | string | 频道名称   |
-| `guild_display_id`  | int64 | 频道显示ID, 公测后可能作为搜索ID使用  |
-
-### 通过访客获取频道元数据
-
-终结点: `/get_guild_meta_by_guest`
-
-**参数**
-
-| 字段       | 类型  | 说明 |
-| ---------- | ----- | ---- |
-| `guild_id` | uint64 | 频道ID |
-
-**响应数据**
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `guild_id`    | uint64 | 频道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`  | uint64 | 创建者ID  |
-
-### 获取子频道列表
-
-终结点: `/get_guild_channel_list`
-
-**参数**
-
-| 字段       | 类型  | 说明 |
-| ---------- | ----- | ---- |
-| `guild_id` | uint64 | 频道ID |
-| `no_cache` | bool  | 是否无视缓存 |
-
-**响应数据**
-
-正常情况下响应 `ChannelInfo` 数组, 未找到任何子频道响应 `null`
-
-ChannelInfo:
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `owner_guild_id`    | uint64 | 所属频道ID      |
-| `channel_id`     | uint64 | 子频道ID   |
-| `channel_type`     | int32 | 子频道类型   |
-| `channel_name`  | string | 之频道名称  |
-| `create_time`  | int64 | 创建时间  |
-| `creator_id`  | int64 | 创建者QQ号  |
-| `creator_tiny_id`  | uint64 | 创建者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  |  直播频道  |
-
-### 获取频道成员列表
-
-终结点: `/get_guild_members`
-
-**参数**
-
-| 字段       | 类型  | 说明 |
-| ---------- | ----- | ---- |
-| `guild_id` | uint64 | 频道ID |
-
-**响应数据**
-
-> 注意: 类型内无任何成员将返回 `null`
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `members`    | []GuildMemberInfo | 普通成员列表      |
-| `bots`     | []GuildMemberInfo | 机器人列表  |
-| `admins`  | []GuildMemberInfo | 管理员列表  |
-
-GuildMemberInfo:
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `tiny_id`    | uint64 | 成员ID      |
-| `title`     | string | 成员头衔 |
-| `nickname`  | string | 成员昵称  |
-| `role`  | int32 | 成员权限  |
-
-### 发送信息到子频道
-
-终结点: `/send_guild_channel_msg`
-
-**参数**
-
-| 字段       | 类型  | 说明 |
-| ---------- | ----- | ---- |
-| `guild_id` | uint64 | 频道ID |
-| `channel_id` | uint64 | 子频道ID |
-| `message` | Message | 消息, 与原有消息类型相同 |
-
-**响应数据**
-
-| 字段          | 类型  | 说明       |
-| ------------- | ----- | ---------- |
-| `message_id`    | string | 消息ID     |
-
-## 事件
-
-### 收到频道消息
-
-**上报数据**
-
-| 字段          | 类型   | 可能的值       | 说明           |
-| ------------- | ------ | -------------- | -------------- |
-| `post_type`   | string | `message`       | 上报类型       |
-| `message_type` | string | `guild` | 消息类型       |
-| `sub_type` | string | `channel` | 消息子类型       |
-| `guild_id`    | uint64  |                | 频道ID           |
-| `channel_id`    | uint64  |                | 子频道ID           |
-| `user_id`     | uint64  |                | 消息发送者ID   |
-| `message_id`     | string  |                | 消息ID  |
-| `sender`     | Sender  |                | 发送者  |
-| `message`     | Message  |                | 消息内容  |
-
-### 频道消息表情贴更新
-
-**上报数据**
-
-| 字段          | 类型   | 可能的值       | 说明           |
-| ------------- | ------ | -------------- | -------------- |
-| `post_type`   | string | `notice`       | 上报类型       |
-| `notice_type` | string | `message_reactions_updated` | 消息类型       |
-| `guild_id`    | uint64  |                | 频道ID           |
-| `channel_id`    | uint64  |                | 子频道ID           |
-| `user_id`     | uint64  |                | 操作者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是否点击 |

docs/slider.md

@@ -1,7 +1,5 @@
 # 滑块验证码
 
-> 该文档已过期, 最新版本下可直接使用手机扫描二维码通过验证.
-
 由于TX最新的限制, 所有协议在陌生设备/IP登录时都有可能被要求通过滑块验证码, 否则将会出现 `当前上网环境异常` 的错误. 目前我们准备了两个临时方案应对该验证码.
 
 > 如果您有一台运行Windows的PC/Server 并且不会抓包操作, 我们建议直接使用方案B

global/all_test.go

@@ -1,36 +0,0 @@
-package global
-
-import (
-	"strconv"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestVersionNameCompare(t *testing.T) {
-	tests := [...]struct {
-		current  string
-		remote   string
-		expected bool
-	}{
-		// Normal Tests:
-		{"v0.9.29-fix2", "v0.9.29-fix2", false},
-		{"v0.9.29-fix1", "v0.9.29-fix2", true},
-		{"v0.9.29-fix2", "v0.9.29-fix1", false},
-		{"v0.9.29-fix2", "v0.9.30", true},
-		{"v1.0.0-alpha", "v1.0.0-alpha2", true},
-		{"v1.0.0-alpha2", "v1.0.0-beta1", true},
-		{"v1.0.0", "v1.0.0-beta1", false},
-		{"v1.0.0-alpha", "v1.0.0", true},
-		{"v1.0.0", "v1.0.0", false},
-		{"v1.0.0-alpha", "v1.0.0-rc1", true},
-
-		// Issue Fixes:
-		{"v1.0.0-beta1", "v0.9.40-fix5", false}, // issue #877
-	}
-	for i := 0; i < len(tests); i++ {
-		t.Run("test case "+strconv.Itoa(i), func(t *testing.T) {
-			assert.Equal(t, tests[i].expected, VersionNameCompare(tests[i].current, tests[i].remote))
-		})
-	}
-}

global/buffer.go

@@ -11,7 +11,7 @@ var bufferPool = sync.Pool{
 	},
 }
 
-// NewBuffer 从池中获取新 bytes.Buffer
+// NewBuffer 从池钟获取新 bytes.Buffer
 func NewBuffer() *bytes.Buffer {
 	return bufferPool.Get().(*bytes.Buffer)
 }
@@ -20,7 +20,7 @@ func NewBuffer() *bytes.Buffer {
 func PutBuffer(buf *bytes.Buffer) {
 	// See https://golang.org/issue/23199
 	const maxSize = 1 << 16
-	if buf != nil && buf.Cap() < maxSize { // 对于大Buffer直接丢弃
+	if buf.Cap() < maxSize { // 对于大Buffer直接丢弃
 		buf.Reset()
 		bufferPool.Put(buf)
 	}

global/codec.go

@@ -2,14 +2,14 @@ package global
 
 import (
 	"crypto/md5"
-	"encoding/hex"
-	"os"
+	"fmt"
+	"io/ioutil"
 	"os/exec"
 	"path"
 
-	"github.com/pkg/errors"
+	"github.com/Mrs4s/go-cqhttp/global/codec"
 
-	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/pkg/errors"
 )
 
 // EncoderSilk 将音频编码为Silk
@@ -19,11 +19,11 @@ func EncoderSilk(data []byte) ([]byte, error) {
 	if err != nil {
 		return nil, errors.Wrap(err, "calc md5 failed")
 	}
-	tempName := hex.EncodeToString(h.Sum(nil))
+	tempName := fmt.Sprintf("%x", h.Sum(nil))
 	if silkPath := path.Join("data/cache", tempName+".silk"); PathExists(silkPath) {
-		return os.ReadFile(silkPath)
+		return ioutil.ReadFile(silkPath)
 	}
-	slk, err := base.EncodeSilk(data, tempName)
+	slk, err := codec.EncodeToSilk(data, tempName, true)
 	if err != nil {
 		return nil, errors.Wrap(err, "encode silk failed")
 	}

global/codec/codec.go

@@ -0,0 +1,53 @@
+// +build linux windows,!arm darwin
+// +build 386 amd64 arm arm64
+
+// Package codec Slik编码核心模块
+package codec
+
+import (
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path"
+
+	"github.com/pkg/errors"
+	"github.com/wdvxdr1123/go-silk"
+)
+
+const (
+	silkCachePath = "data/cache"
+)
+
+// EncodeToSilk 将音频编码为Silk
+func EncodeToSilk(record []byte, tempName string, useCache bool) (silkWav []byte, err error) {
+	// 1. 写入缓存文件
+	rawPath := path.Join(silkCachePath, tempName+".wav")
+	err = ioutil.WriteFile(rawPath, record, os.ModePerm)
+	if err != nil {
+		return nil, errors.Wrap(err, "write temp file error")
+	}
+	defer os.Remove(rawPath)
+
+	// 2.转换pcm
+	pcmPath := path.Join(silkCachePath, tempName+".pcm")
+	cmd := exec.Command("ffmpeg", "-i", rawPath, "-f", "s16le", "-ar", "24000", "-ac", "1", pcmPath)
+	if err = cmd.Run(); err != nil {
+		return nil, errors.Wrap(err, "convert pcm file error")
+	}
+	defer os.Remove(pcmPath)
+
+	// 3. 转silk
+	pcm, err := ioutil.ReadFile(pcmPath)
+	if err != nil {
+		return nil, errors.Wrap(err, "read pcm file err")
+	}
+	silkWav, err = silk.EncodePcmBuffToSilk(pcm, 24000, 24000, true)
+	if err != nil {
+		return nil, errors.Wrap(err, "silk encode error")
+	}
+	if useCache {
+		silkPath := path.Join(silkCachePath, tempName+".silk")
+		err = ioutil.WriteFile(silkPath, silkWav, 0666)
+	}
+	return
+}

global/codec/codec_unsupportedarch.go

@@ -0,0 +1,10 @@
+// +build !arm,!arm64,!amd64,!386
+
+package codec
+
+import "errors"
+
+//EncodeToSilk 将音频编码为Silk
+func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
+	return nil, errors.New("not supported now")
+}

global/codec/codec_unsupportedos.go

@@ -0,0 +1,10 @@
+// +build !windows,!linux,!darwin
+
+package codec
+
+import "errors"
+
+//EncodeToSilk 将音频编码为Silk
+func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
+	return nil, errors.New("not supported now")
+}

global/codec/codec_windows_arm.go

@@ -0,0 +1,8 @@
+package codec
+
+import "errors"
+
+//EncodeToSilk 将音频编码为Silk
+func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
+	return nil, errors.New("not supported now")
+}

global/config.go

@@ -0,0 +1,346 @@
+package global
+
+import (
+	"os"
+	"path"
+	"strconv"
+	"time"
+
+	"github.com/hjson/hjson-go"
+	jsoniter "github.com/json-iterator/go"
+	log "github.com/sirupsen/logrus"
+)
+
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+
+var currentPath = getCurrentPath()
+var DefaultConfFile = path.Join(currentPath, "config.hjson")
+
+// DefaultConfigWithComments 为go-cqhttp的默认配置文件
+var DefaultConfigWithComments = `
+/*
+    go-cqhttp 默认配置文件
+*/
+
+{
+    // QQ号
+    uin: 0
+    // QQ密码
+    password: ""
+    // 是否启用密码加密
+    encrypt_password: false
+    // 加密后的密码, 如未启用密码加密将为空, 请勿随意修改.
+    password_encrypted: ""
+    // 是否启用内置数据库
+    // 启用将会增加10-20MB的内存占用和一定的磁盘空间
+    // 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能
+    enable_db: true
+    // 访问密钥, 强烈推荐在公网的服务器设置
+    access_token: ""
+    // 重连设置
+    relogin: {
+        // 是否启用自动重连
+        // 如不启用掉线后将不会自动重连
+        enabled: true
+        // 重连延迟, 单位秒
+        relogin_delay: 3
+        // 最大重连次数, 0为无限制
+        max_relogin_times: 0
+    }
+    // API限速设置
+    // 该设置为全局生效
+    // 原 cqhttp 虽然启用了 rate_limit 后缀, 但是基本没插件适配
+    // 目前该限速设置为令牌桶算法, 请参考: 
+    // https://baike.baidu.com/item/%E4%BB%A4%E7%89%8C%E6%A1%B6%E7%AE%97%E6%B3%95/6597000?fr=aladdin
+    _rate_limit: {
+        // 是否启用限速
+        enabled: false
+        // 令牌回复频率, 单位秒
+        frequency: 1
+        // 令牌桶大小
+        bucket_size: 1
+    }
+    // 是否忽略无效的CQ码
+    // 如果为假将原样发送
+    ignore_invalid_cqcode: false
+    // 是否强制分片发送消息
+    // 分片发送将会带来更快的速度
+    // 但是兼容性会有些问题
+    force_fragmented: false
+    // 心跳频率, 单位秒
+    // -1 为关闭心跳
+    heartbeat_interval: 0
+    // HTTP设置
+    http_config: {
+        // 是否启用正向HTTP服务器
+        enabled: true
+        // 服务端监听地址
+        host: 0.0.0.0
+        // 服务端监听端口
+        port: 5700
+        // 反向HTTP超时时间, 单位秒
+        // 最小值为5，小于5将会忽略本项设置
+        timeout: 0
+        // 反向HTTP POST地址列表
+        // 格式: 
+        // {
+        //    地址: secret
+        // }
+        post_urls: {}
+    }
+    // 正向WS设置
+    ws_config: {
+        // 是否启用正向WS服务器
+        enabled: true
+        // 正向WS服务器监听地址
+        host: 0.0.0.0
+        // 正向WS服务器监听端口
+        port: 6700
+    }
+    // 反向WS设置
+    ws_reverse_servers: [
+        // 可以添加多个反向WS推送
+        {
+            // 是否启用该推送
+            enabled: false
+            // 反向WS Universal 地址
+            // 注意 设置了此项地址后下面两项将会被忽略
+            // 留空请使用 ""
+            reverse_url: ws://you_websocket_universal.server
+            // 反向WS API 地址
+            reverse_api_url: ws://you_websocket_api.server
+            // 反向WS Event 地址
+            reverse_event_url: ws://you_websocket_event.server
+            // 重连间隔 单位毫秒
+            reverse_reconnect_interval: 3000
+        }
+    ]
+    // 上报数据类型
+    // 可选: string array
+    post_message_format: string
+    // 是否使用服务器下发的新地址进行重连
+    // 注意, 此设置可能导致在海外服务器上连接情况更差
+    use_sso_address: false
+    // 是否启用 DEBUG
+    debug: false
+    // 日志等级 trace,debug,info,warn,error
+    log_level: "info"
+    // WebUi 设置
+    web_ui: {
+        // 是否启用 WebUi
+        enabled: true
+        // 监听地址
+        host: 127.0.0.1
+        // 监听端口
+        web_ui_port: 9999
+        // 是否接收来自web的输入
+        web_input: false
+    }
+}
+`
+
+// PasswordHash 存储QQ密码哈希供登录使用
+var PasswordHash [16]byte
+
+// JSONConfig Config对应的结构体
+type JSONConfig struct {
+	Uin               int64  `json:"uin"`
+	Password          string `json:"password"`
+	EncryptPassword   bool   `json:"encrypt_password"`
+	PasswordEncrypted string `json:"password_encrypted"`
+	EnableDB          bool   `json:"enable_db"`
+	EnableSelfMessage bool   `json:"enable_self_message"`
+	AccessToken       string `json:"access_token"`
+	ReLogin           struct {
+		Enabled         bool `json:"enabled"`
+		ReLoginDelay    int  `json:"relogin_delay"`
+		MaxReloginTimes uint `json:"max_relogin_times"`
+	} `json:"relogin"`
+	RateLimit struct {
+		Enabled    bool    `json:"enabled"`
+		Frequency  float64 `json:"frequency"`
+		BucketSize int     `json:"bucket_size"`
+	} `json:"_rate_limit"`
+	IgnoreInvalidCQCode bool                          `json:"ignore_invalid_cqcode"`
+	ForceFragmented     bool                          `json:"force_fragmented"`
+	FixURL              bool                          `json:"fix_url"`
+	ProxyRewrite        string                        `json:"proxy_rewrite"`
+	HeartbeatInterval   time.Duration                 `json:"heartbeat_interval"`
+	HTTPConfig          *GoCQHTTPConfig               `json:"http_config"`
+	WSConfig            *GoCQWebSocketConfig          `json:"ws_config"`
+	ReverseServers      []*GoCQReverseWebSocketConfig `json:"ws_reverse_servers"`
+	PostMessageFormat   string                        `json:"post_message_format"`
+	UseSSOAddress       bool                          `json:"use_sso_address"`
+	Debug               bool                          `json:"debug"`
+	LogLevel            string                        `json:"log_level"`
+	// WebUI               *GoCQWebUI                    `json:"web_ui"`
+}
+
+// CQHTTPAPIConfig HTTPAPI对应的Config结构体
+type CQHTTPAPIConfig struct {
+	Host                         string `json:"host"`
+	Port                         uint16 `json:"port"`
+	UseHTTP                      bool   `json:"use_http"`
+	WSHost                       string `json:"ws_host"`
+	WSPort                       uint16 `json:"ws_port"`
+	UseWS                        bool   `json:"use_ws"`
+	WSReverseURL                 string `json:"ws_reverse_url"`
+	WSReverseAPIURL              string `json:"ws_reverse_api_url"`
+	WSReverseEventURL            string `json:"ws_reverse_event_url"`
+	WSReverseReconnectInterval   uint16 `json:"ws_reverse_reconnect_interval"`
+	WSReverseReconnectOnCode1000 bool   `json:"ws_reverse_reconnect_on_code_1000"`
+	UseWsReverse                 bool   `json:"use_ws_reverse"`
+	PostURL                      string `json:"post_url"`
+	AccessToken                  string `json:"access_token"`
+	Secret                       string `json:"secret"`
+	PostMessageFormat            string `json:"post_message_format"`
+}
+
+// GoCQHTTPConfig 正向HTTP对应config结构体
+type GoCQHTTPConfig struct {
+	Enabled  bool              `json:"enabled"`
+	Host     string            `json:"host"`
+	Port     uint16            `json:"port"`
+	Timeout  int32             `json:"timeout"`
+	PostUrls map[string]string `json:"post_urls"`
+}
+
+// GoCQWebSocketConfig 正向WebSocket对应Config结构体
+type GoCQWebSocketConfig struct {
+	Enabled bool   `json:"enabled"`
+	Host    string `json:"host"`
+	Port    uint16 `json:"port"`
+}
+
+// GoCQReverseWebSocketConfig 反向WebSocket对应Config结构体
+type GoCQReverseWebSocketConfig struct {
+	Enabled                  bool   `json:"enabled"`
+	ReverseURL               string `json:"reverse_url"`
+	ReverseAPIURL            string `json:"reverse_api_url"`
+	ReverseEventURL          string `json:"reverse_event_url"`
+	ReverseReconnectInterval uint16 `json:"reverse_reconnect_interval"`
+}
+
+/*
+// GoCQWebUI WebUI对应Config结构体
+type GoCQWebUI struct {
+	Enabled   bool   `json:"enabled"`
+	Host      string `json:"host"`
+	WebUIPort uint64 `json:"web_ui_port"`
+	WebInput  bool   `json:"web_input"`
+}
+*/
+
+// DefaultConfig 返回一份默认配置对应结构体
+func DefaultConfig() *JSONConfig {
+	return &JSONConfig{
+		EnableDB: true,
+		ReLogin: struct {
+			Enabled         bool `json:"enabled"`
+			ReLoginDelay    int  `json:"relogin_delay"`
+			MaxReloginTimes uint `json:"max_relogin_times"`
+		}{
+			Enabled:         true,
+			ReLoginDelay:    3,
+			MaxReloginTimes: 0,
+		},
+		RateLimit: struct {
+			Enabled    bool    `json:"enabled"`
+			Frequency  float64 `json:"frequency"`
+			BucketSize int     `json:"bucket_size"`
+		}{
+			Enabled:    false,
+			Frequency:  1,
+			BucketSize: 1,
+		},
+		PostMessageFormat: "string",
+		ForceFragmented:   false,
+		HTTPConfig: &GoCQHTTPConfig{
+			Enabled:  true,
+			Host:     "0.0.0.0",
+			Port:     5700,
+			PostUrls: map[string]string{},
+		},
+		WSConfig: &GoCQWebSocketConfig{
+			Enabled: true,
+			Host:    "0.0.0.0",
+			Port:    6700,
+		},
+		ReverseServers: []*GoCQReverseWebSocketConfig{
+			{
+				Enabled:                  false,
+				ReverseURL:               "ws://you_websocket_universal.server",
+				ReverseAPIURL:            "ws://you_websocket_api.server",
+				ReverseEventURL:          "ws://you_websocket_event.server",
+				ReverseReconnectInterval: 3000,
+			},
+		},
+	}
+}
+
+// LoadConfig 加载配置文件
+func LoadConfig(p string) *JSONConfig {
+	if !PathExists(p) {
+		log.Warnf("尝试加载配置文件 %v 失败: 文件不存在", p)
+		return nil
+	}
+	var dat map[string]interface{}
+	var c = JSONConfig{}
+	err := hjson.Unmarshal([]byte(ReadAllText(p)), &dat)
+	if err == nil {
+		b, _ := json.Marshal(dat)
+		err = json.Unmarshal(b, &c)
+	}
+	if err != nil {
+		log.Warnf("尝试加载配置文件 %v 时出现错误: %v", p, err)
+		log.Infoln("原文件已备份")
+		_ = os.Rename(p, p+".backup"+strconv.FormatInt(time.Now().Unix(), 10))
+		return nil
+	}
+	return &c
+}
+
+// Save 写入配置文件至path
+func (c *JSONConfig) Save(path string) error {
+	data, err := hjson.MarshalWithOptions(c, hjson.EncoderOptions{
+		Eol:            "\n",
+		BracesSameLine: true,
+		IndentBy:       "    ",
+	})
+	if err != nil {
+		return err
+	}
+	return WriteAllText(path, string(data))
+}
+
+// getCurrentPath 获取当前文件的路径，直接返回string
+func getCurrentPath() string {
+	cwd, e := os.Getwd()
+	if e != nil {
+		panic(e)
+	}
+	return cwd
+}
+
+/*
+// GetCurrentPath 预留,获取当前目录地址
+func GetCurrentPath() (string, error) {
+	file, err := exec.LookPath(os.Args[0])
+	if err != nil {
+		return "", err
+	}
+	fpath, err := filepath.Abs(file)
+	if err != nil {
+		return "", err
+	}
+	if runtime.GOOS == "windows" {
+		// fpath = strings.Replace(fpath, "\\", "/", -1)
+		fpath = strings.ReplaceAll(fpath, "\\", "/")
+	}
+	i := strings.LastIndex(fpath, "/")
+	if i < 0 {
+		return "", errors.New("system/path_error,Can't find '/' or '\\'")
+	}
+	return fpath[0 : i+1], nil
+}
+*/

global/filter.go

@@ -0,0 +1,312 @@
+package global
+
+import (
+	"fmt"
+	"io/ioutil"
+	"regexp"
+	"strings"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
+)
+
+// MSG 消息Map
+type MSG map[string]interface{}
+
+// Get 尝试从消息Map中取出key为s的值,若不存在则返回MSG{}
+//
+// 若所给key对应的值的类型是global.MSG,则返回此值
+//
+// 若所给key对应值的类型不是global.MSG,则返回MSG{"__str__": Val}
+func (m MSG) Get(s string) MSG {
+	if v, ok := m[s]; ok {
+		if msg, ok := v.(MSG); ok {
+			return msg
+		}
+		return MSG{"__str__": v} // 用这个名字应该没问题吧
+	}
+	return nil // 不存在为空
+}
+
+// String 将消息Map转化为String。若Map存在key "__str__",则返回此key对应的值,否则将输出整张消息Map对应的JSON字符串
+func (m MSG) String() string {
+	if m == nil {
+		return "" // 空 JSON
+	}
+	if str, ok := m["__str__"]; ok {
+		if str == nil {
+			return "" // 空 JSON
+		}
+		return fmt.Sprint(str)
+	}
+	str, _ := json.MarshalToString(m)
+	return str
+}
+
+// Filter 定义了一个消息上报过滤接口
+type Filter interface {
+	Eval(payload MSG) bool
+}
+
+type operationNode struct {
+	key    string
+	filter Filter
+}
+
+// NotOperator 定义了过滤器中Not操作符
+type NotOperator struct {
+	operand Filter
+}
+
+func notOperatorConstruct(argument gjson.Result) *NotOperator {
+	if !argument.IsObject() {
+		panic("the argument of 'not' operator must be an object")
+	}
+	op := new(NotOperator)
+	op.operand = Generate("and", argument)
+	return op
+}
+
+// Eval 对payload执行Not过滤
+func (op *NotOperator) Eval(payload MSG) bool {
+	return !op.operand.Eval(payload)
+}
+
+// AndOperator 定义了过滤器中And操作符
+type AndOperator struct {
+	operands []operationNode
+}
+
+func andOperatorConstruct(argument gjson.Result) *AndOperator {
+	if !argument.IsObject() {
+		panic("the argument of 'and' operator must be an object")
+	}
+	op := new(AndOperator)
+	argument.ForEach(func(key, value gjson.Result) bool {
+		switch {
+		case key.Str[0] == '.':
+			// is an operator
+			//   ".foo": {
+			//       "bar": "baz"
+			//   }
+			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
+			//   "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
+			//   "foo": "bar"
+			opKey := key.String()
+			op.operands = append(op.operands, operationNode{opKey, Generate("eq", value)})
+		}
+		return true
+	})
+	return op
+}
+
+// Eval 对payload执行And过滤
+func (op *AndOperator) Eval(payload MSG) bool {
+	res := true
+	for _, operand := range op.operands {
+		if len(operand.key) == 0 {
+			// is an operator
+			res = res && operand.filter.Eval(payload)
+		} else {
+			// is an normal key
+			val := payload.Get(operand.key)
+			res = res && operand.filter.Eval(val)
+		}
+
+		if !res {
+			break
+		}
+	}
+	return res
+}
+
+// OrOperator 定义了过滤器中Or操作符
+type OrOperator struct {
+	operands []Filter
+}
+
+func orOperatorConstruct(argument gjson.Result) *OrOperator {
+	if !argument.IsArray() {
+		panic("the argument of 'or' operator must be an array")
+	}
+	op := new(OrOperator)
+	argument.ForEach(func(_, value gjson.Result) bool {
+		op.operands = append(op.operands, Generate("and", value))
+		return true
+	})
+	return op
+}
+
+// Eval 对payload执行Or过滤
+func (op *OrOperator) Eval(payload MSG) bool {
+	res := false
+	for _, operand := range op.operands {
+		res = res || operand.Eval(payload)
+		if res {
+			break
+		}
+	}
+	return res
+}
+
+// EqualOperator 定义了过滤器中Equal操作符
+type EqualOperator struct {
+	operand string
+}
+
+func equalOperatorConstruct(argument gjson.Result) *EqualOperator {
+	op := new(EqualOperator)
+	op.operand = argument.String()
+	return op
+}
+
+// Eval 对payload执行Equal过滤
+func (op *EqualOperator) Eval(payload MSG) bool {
+	return payload.String() == op.operand
+}
+
+// NotEqualOperator 定义了过滤器中NotEqual操作符
+type NotEqualOperator struct {
+	operand string
+}
+
+func notEqualOperatorConstruct(argument gjson.Result) *NotEqualOperator {
+	op := new(NotEqualOperator)
+	op.operand = argument.String()
+	return op
+}
+
+// Eval 对payload执行NotEqual过滤
+func (op *NotEqualOperator) Eval(payload MSG) bool {
+	return !(payload.String() == op.operand)
+}
+
+// InOperator 定义了过滤器中In操作符
+type InOperator struct {
+	operandString string
+	operandArray  []string
+}
+
+func inOperatorConstruct(argument gjson.Result) *InOperator {
+	if argument.IsObject() {
+		panic("the argument of 'in' operator must be an array or a string")
+	}
+	op := new(InOperator)
+	if argument.IsArray() {
+		op.operandArray = []string{}
+		argument.ForEach(func(_, value gjson.Result) bool {
+			op.operandArray = append(op.operandArray, value.String())
+			return true
+		})
+	} else {
+		op.operandString = argument.String()
+	}
+	return op
+}
+
+// Eval 对payload执行In过滤
+func (op *InOperator) Eval(payload MSG) bool {
+	payloadStr := payload.String()
+	if op.operandArray != nil {
+		for _, value := range op.operandArray {
+			if value == payloadStr {
+				return true
+			}
+		}
+		return false
+	}
+	return strings.Contains(op.operandString, payloadStr)
+}
+
+// ContainsOperator 定义了过滤器中Contains操作符
+type ContainsOperator struct {
+	operand string
+}
+
+func containsOperatorConstruct(argument gjson.Result) *ContainsOperator {
+	if argument.IsArray() || argument.IsObject() {
+		panic("the argument of 'contains' operator must be a string")
+	}
+	op := new(ContainsOperator)
+	op.operand = argument.String()
+	return op
+}
+
+// Eval 对payload执行Contains过滤
+func (op *ContainsOperator) Eval(payload MSG) bool {
+	return strings.Contains(payload.String(), op.operand)
+}
+
+// RegexOperator 定义了过滤器中Regex操作符
+type RegexOperator struct {
+	regex *regexp.Regexp
+}
+
+func regexOperatorConstruct(argument gjson.Result) *RegexOperator {
+	if argument.IsArray() || argument.IsObject() {
+		panic("the argument of 'regex' operator must be a string")
+	}
+	op := new(RegexOperator)
+	op.regex = regexp.MustCompile(argument.String())
+	return op
+}
+
+// Eval 对payload执行RegexO过滤
+func (op *RegexOperator) Eval(payload MSG) bool {
+	matched := op.regex.MatchString(payload.String())
+	return matched
+}
+
+// Generate 根据给定操作符名opName及操作符参数argument创建一个过滤器实例
+func Generate(opName string, argument gjson.Result) Filter {
+	switch opName {
+	case "not":
+		return notOperatorConstruct(argument)
+	case "and":
+		return andOperatorConstruct(argument)
+	case "or":
+		return orOperatorConstruct(argument)
+	case "neq":
+		return notEqualOperatorConstruct(argument)
+	case "eq":
+		return equalOperatorConstruct(argument)
+	case "in":
+		return inOperatorConstruct(argument)
+	case "contains":
+		return containsOperatorConstruct(argument)
+	case "regex":
+		return regexOperatorConstruct(argument)
+	default:
+		panic("the operator " + opName + " is not supported")
+	}
+}
+
+// EventFilter 初始化一个nil过滤器
+var EventFilter Filter
+
+// BootFilter 启动事件过滤器
+func BootFilter() {
+	defer func() {
+		if e := recover(); e != nil {
+			log.Warnf("事件过滤器启动失败: %v", e)
+			EventFilter = nil
+		} else {
+			log.Info("事件过滤器启动成功.")
+		}
+	}()
+	f, err := ioutil.ReadFile("filter.json")
+	if err != nil {
+		panic(err)
+	} else {
+		EventFilter = Generate("and", gjson.ParseBytes(f))
+	}
+}

global/fs.go

@@ -1,22 +1,29 @@
 package global
 
 import (
+	"bufio"
 	"bytes"
+	"compress/bzip2"
 	"crypto/md5"
+	"encoding/base64"
 	"encoding/hex"
 	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
 	"net"
 	"net/url"
 	"os"
 	"path"
+	"path/filepath"
 	"runtime"
 	"strconv"
 	"strings"
 
-	"github.com/Mrs4s/MiraiGo/utils"
-	log "github.com/sirupsen/logrus"
+	"github.com/kardianos/osext"
 
-	"github.com/Mrs4s/go-cqhttp/internal/param"
+	"github.com/dustin/go-humanize"
+	log "github.com/sirupsen/logrus"
 )
 
 const (
@@ -46,12 +53,12 @@ var (
 // PathExists 判断给定path是否存在
 func PathExists(path string) bool {
 	_, err := os.Stat(path)
-	return err == nil || errors.Is(err, os.ErrExist)
+	return err == nil || os.IsExist(err)
 }
 
 // ReadAllText 读取给定path对应文件，无法读取时返回空值
 func ReadAllText(path string) string {
-	b, err := os.ReadFile(path)
+	b, err := ioutil.ReadFile(path)
 	if err != nil {
 		log.Error(err)
 		return ""
@@ -61,15 +68,12 @@ func ReadAllText(path string) string {
 
 // WriteAllText 将给定text写入给定path
 func WriteAllText(path, text string) error {
-	return os.WriteFile(path, utils.S2B(text), 0o644)
+	return ioutil.WriteFile(path, []byte(text), 0644)
 }
 
 // Check 检测err是否为nil
-func Check(err error, deleteSession bool) {
+func Check(err error) {
 	if err != nil {
-		if deleteSession && PathExists("session.token") {
-			_ = os.Remove("session.token")
-		}
 		log.Fatalf("遇到错误: %v", err)
 	}
 }
@@ -84,19 +88,22 @@ func IsAMRorSILK(b []byte) bool {
 func FindFile(file, cache, p string) (data []byte, err error) {
 	data, err = nil, ErrSyntax
 	switch {
-	case strings.HasPrefix(file, "http"): // https also has prefix http
+	case strings.HasPrefix(file, "http") || strings.HasPrefix(file, "https"):
+		if cache == "" {
+			cache = "1"
+		}
 		hash := md5.Sum([]byte(file))
 		cacheFile := path.Join(CachePath, hex.EncodeToString(hash[:])+".cache")
-		if (cache == "" || cache == "1") && PathExists(cacheFile) {
-			return os.ReadFile(cacheFile)
+		if PathExists(cacheFile) && cache == "1" {
+			return ioutil.ReadFile(cacheFile)
 		}
 		data, err = GetBytes(file)
-		_ = os.WriteFile(cacheFile, data, 0o644)
+		_ = ioutil.WriteFile(cacheFile, data, 0644)
 		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.ReplaceAll(file, "base64://", ""))
 		if err != nil {
 			return nil, err
 		}
@@ -109,12 +116,12 @@ func FindFile(file, cache, p string) (data []byte, err error) {
 		if strings.HasPrefix(fu.Path, "/") && runtime.GOOS == `windows` {
 			fu.Path = fu.Path[1:]
 		}
-		data, err = os.ReadFile(fu.Path)
+		data, err = ioutil.ReadFile(fu.Path)
 		if err != nil {
 			return nil, err
 		}
 	case PathExists(path.Join(p, file)):
-		data, err = os.ReadFile(path.Join(p, file))
+		data, err = ioutil.ReadFile(path.Join(p, file))
 		if err != nil {
 			return nil, err
 		}
@@ -137,7 +144,7 @@ func DelFile(path string) bool {
 
 // ReadAddrFile 从给定path中读取合法的IP地址与端口,每个IP地址以换行符"\n"作为分隔
 func ReadAddrFile(path string) []*net.TCPAddr {
-	d, err := os.ReadFile(path)
+	d, err := ioutil.ReadFile(path)
 	if err != nil {
 		return nil
 	}
@@ -153,3 +160,95 @@ func ReadAddrFile(path string) []*net.TCPAddr {
 	}
 	return ret
 }
+
+// WriteCounter 写入量计算实例
+type WriteCounter struct {
+	Total uint64
+}
+
+// Write 方法将写入的byte长度追加至写入的总长度Total中
+func (wc *WriteCounter) Write(p []byte) (int, error) {
+	n := len(p)
+	wc.Total += uint64(n)
+	wc.PrintProgress()
+	return n, nil
+}
+
+// PrintProgress 方法将打印当前的总写入量
+func (wc *WriteCounter) PrintProgress() {
+	fmt.Printf("\r%s", strings.Repeat(" ", 35))
+	fmt.Printf("\rDownloading... %s complete", humanize.Bytes(wc.Total))
+}
+
+// UpdateFromStream copy form getlantern/go-update
+func UpdateFromStream(updateWith io.Reader) (err error, errRecover error) {
+	updatePath, err := osext.Executable()
+	if err != nil {
+		return
+	}
+	var newBytes []byte
+	// no patch to apply, go on through
+	var fileHeader []byte
+	bufBytes := bufio.NewReader(updateWith)
+	fileHeader, err = bufBytes.Peek(2)
+	if err != nil {
+		return
+	}
+	// The content is always bzip2 compressed except when running test, in
+	// which case is not prefixed with the magic byte sequence for sure.
+	if bytes.Equal([]byte{0x42, 0x5a}, fileHeader) {
+		// Identifying bzip2 files.
+		updateWith = bzip2.NewReader(bufBytes)
+	} else {
+		updateWith = io.Reader(bufBytes)
+	}
+	newBytes, err = ioutil.ReadAll(updateWith)
+	if err != nil {
+		return
+	}
+	// get the directory the executable exists in
+	updateDir := filepath.Dir(updatePath)
+	filename := filepath.Base(updatePath)
+	// Copy the contents of of newbinary to a the new executable file
+	newPath := filepath.Join(updateDir, fmt.Sprintf(".%s.new", filename))
+	fp, err := os.OpenFile(newPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0755)
+	if err != nil {
+		return
+	}
+	// We won't log this error, because it's always going to happen.
+	defer func() { _ = fp.Close() }()
+	if _, err = io.Copy(fp, bytes.NewReader(newBytes)); err != nil {
+		log.Errorf("Unable to copy data: %v\n", err)
+	}
+
+	// if we don't call fp.Close(), windows won't let us move the new executable
+	// because the file will still be "in use"
+	if err := fp.Close(); err != nil {
+		log.Errorf("Unable to close file: %v\n", err)
+	}
+	// this is where we'll move the executable to so that we can swap in the updated replacement
+	oldPath := filepath.Join(updateDir, fmt.Sprintf(".%s.old", filename))
+
+	// delete any existing old exec file - this is necessary on Windows for two reasons:
+	// 1. after a successful update, Windows can't remove the .old file because the process is still running
+	// 2. windows rename operations fail if the destination file already exists
+	_ = os.Remove(oldPath)
+
+	// move the existing executable to a new file in the same directory
+	err = os.Rename(updatePath, oldPath)
+	if err != nil {
+		return
+	}
+
+	// move the new executable in to become the new program
+	err = os.Rename(newPath, updatePath)
+
+	if err != nil {
+		// copy unsuccessful
+		errRecover = os.Rename(oldPath, updatePath)
+	} else {
+		// copy successful, remove the old binary
+		_ = os.Remove(oldPath)
+	}
+	return
+}

global/log_hook.go

@@ -6,10 +6,8 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
-	"strings"
 	"sync"
 
-	"github.com/mattn/go-colorable"
 	"github.com/sirupsen/logrus"
 )
 
@@ -49,13 +47,14 @@ func (hook *LocalHook) pathWrite(entry *logrus.Entry) error {
 		return err
 	}
 
-	fd, err := os.OpenFile(hook.path, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0o666)
+	fd, err := os.OpenFile(hook.path, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0666)
 	if err != nil {
 		return err
 	}
 	defer fd.Close()
 
 	log, err := hook.formatter.Format(entry)
+
 	if err != nil {
 		return err
 	}
@@ -81,16 +80,24 @@ func (hook *LocalHook) Fire(entry *logrus.Entry) error {
 }
 
 // SetFormatter 设置日志格式
-func (hook *LocalHook) SetFormatter(consoleFormatter, fileFormatter logrus.Formatter) {
+func (hook *LocalHook) SetFormatter(formatter logrus.Formatter) {
 	hook.lock.Lock()
 	defer hook.lock.Unlock()
 
-	// 支持处理windows平台的console色彩
-	logrus.SetOutput(colorable.NewColorableStdout())
-	// 用于在console写出
-	logrus.SetFormatter(consoleFormatter)
-	// 用于写入文件
-	hook.formatter = fileFormatter
+	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
 }
 
 // SetWriter 设置Writer
@@ -108,11 +115,11 @@ func (hook *LocalHook) SetPath(path string) {
 }
 
 // NewLocalHook 初始化本地日志钩子实现
-func NewLocalHook(args interface{}, consoleFormatter, fileFormatter logrus.Formatter, levels ...logrus.Level) *LocalHook {
+func NewLocalHook(args interface{}, formatter logrus.Formatter, levels ...logrus.Level) *LocalHook {
 	hook := &LocalHook{
 		lock: new(sync.Mutex),
 	}
-	hook.SetFormatter(consoleFormatter, fileFormatter)
+	hook.SetFormatter(formatter)
 	hook.levels = append(hook.levels, levels...)
 
 	switch arg := args.(type) {
@@ -135,100 +142,24 @@ func NewLocalHook(args interface{}, consoleFormatter, fileFormatter logrus.Forma
 func GetLogLevel(level string) []logrus.Level {
 	switch level {
 	case "trace":
-		return []logrus.Level{
-			logrus.TraceLevel, logrus.DebugLevel,
+		return []logrus.Level{logrus.TraceLevel, logrus.DebugLevel,
 			logrus.InfoLevel, logrus.WarnLevel, logrus.ErrorLevel,
-			logrus.FatalLevel, logrus.PanicLevel,
-		}
+			logrus.FatalLevel, logrus.PanicLevel}
 	case "debug":
-		return []logrus.Level{
-			logrus.DebugLevel, logrus.InfoLevel,
+		return []logrus.Level{logrus.DebugLevel, logrus.InfoLevel,
 			logrus.WarnLevel, logrus.ErrorLevel,
-			logrus.FatalLevel, logrus.PanicLevel,
-		}
+			logrus.FatalLevel, logrus.PanicLevel}
 	case "info":
-		return []logrus.Level{
-			logrus.InfoLevel, logrus.WarnLevel,
-			logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel,
-		}
+		return []logrus.Level{logrus.InfoLevel, logrus.WarnLevel,
+			logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel}
 	case "warn":
-		return []logrus.Level{
-			logrus.WarnLevel, logrus.ErrorLevel,
-			logrus.FatalLevel, logrus.PanicLevel,
-		}
+		return []logrus.Level{logrus.WarnLevel, logrus.ErrorLevel,
+			logrus.FatalLevel, logrus.PanicLevel}
 	case "error":
-		return []logrus.Level{
-			logrus.ErrorLevel, logrus.FatalLevel,
-			logrus.PanicLevel,
-		}
+		return []logrus.Level{logrus.ErrorLevel, logrus.FatalLevel,
+			logrus.PanicLevel}
 	default:
-		return []logrus.Level{
-			logrus.InfoLevel, logrus.WarnLevel,
-			logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel,
-		}
-	}
-}
-
-// LogFormat specialize for go-cqhttp
-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("] [")
-	buf.WriteString(strings.ToUpper(entry.Level.String()))
-	buf.WriteString("]: ")
-	buf.WriteString(entry.Message)
-	buf.WriteString(" \n")
-
-	if f.EnableColor {
-		buf.WriteString(colorReset)
-	}
-
-	ret := append([]byte(nil), 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[32m"   // color.Style{color.Green}.String()
-	colorCodeDebug = "\x1b[37m"   // color.Style{color.White}.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
+		return []logrus.Level{logrus.InfoLevel, logrus.WarnLevel,
+			logrus.ErrorLevel, logrus.FatalLevel, logrus.PanicLevel}
 	}
 }

global/net.go

@@ -2,6 +2,7 @@ package global
 
 import (
 	"bufio"
+	"bytes"
 	"compress/gzip"
 	"fmt"
 	"io"
@@ -12,22 +13,22 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"time"
 
+	"github.com/guonaihong/gout"
 	"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 == "" {
+				if Proxy == "" {
 					return http.ProxyFromEnvironment(request)
 				}
-				return url.Parse(base.Proxy)
+				return url.Parse(Proxy)
 			},
 			ForceAttemptHTTP2:   true,
 			MaxConnsPerHost:     0,
@@ -36,6 +37,9 @@ var (
 		},
 	}
 
+	// Proxy 存储Config.proxy_rewrite,用于设置代理
+	Proxy string
+
 	// ErrOverSize 响应主体过大时返回此错误
 	ErrOverSize = errors.New("oversize")
 
@@ -45,19 +49,33 @@ var (
 
 // GetBytes 对给定URL发送Get请求，返回响应主体
 func GetBytes(url string) ([]byte, error) {
-	reader, err := HTTPGetReadCloser(url)
+	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, err
 	}
-	defer func() {
-		_ = reader.Close()
-	}()
-	return ioutil.ReadAll(reader)
+	req.Header["User-Agent"] = []string{UserAgent}
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+	if strings.Contains(resp.Header.Get("Content-Encoding"), "gzip") {
+		buffer := bytes.NewBuffer(body)
+		r, _ := gzip.NewReader(buffer)
+		defer r.Close()
+		unCom, err := ioutil.ReadAll(r)
+		return unCom, err
+	}
+	return body, nil
 }
 
 // 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)
+	file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0666)
 	if err != nil {
 		return err
 	}
@@ -105,7 +123,7 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 	// 初始化分块或直接下载
 	initOrDownload := func() error {
 		copyStream := func(s io.ReadCloser) error {
-			file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0o666)
+			file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0666)
 			if err != nil {
 				return err
 			}
@@ -174,7 +192,7 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 	// 下载分块
 	downloadBlock := func(block *BlockMetaData) error {
 		req, _ := http.NewRequest("GET", url, nil)
-		file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0o666)
+		file, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0666)
 		if err != nil {
 			return err
 		}
@@ -199,7 +217,7 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 		if resp.StatusCode < 200 || resp.StatusCode >= 300 {
 			return errors.New("response status unsuccessful: " + strconv.FormatInt(int64(resp.StatusCode), 10))
 		}
-		buffer := make([]byte, 1024)
+		var buffer = make([]byte, 1024)
 		i, err := resp.Body.Read(buffer)
 		for {
 			if err != nil && err != io.EOF {
@@ -246,6 +264,22 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
 	return lastErr
 }
 
+// GetSliderTicket 通过给定的验证链接raw和id,获取验证结果Ticket
+func GetSliderTicket(raw, id string) (string, error) {
+	var rsp string
+	if err := gout.POST("https://api.shkong.com/gocqhttpapi/task").SetJSON(gout.H{
+		"id":  id,
+		"url": raw,
+	}).SetTimeout(time.Second * 35).BindBody(&rsp).Do(); err != nil {
+		return "", err
+	}
+	g := gjson.Parse(rsp)
+	if g.Get("error").Str != "" {
+		return "", errors.New(g.Get("error").Str)
+	}
+	return g.Get("ticket").Str, nil
+}
+
 // 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}}`)
@@ -263,48 +297,3 @@ func NeteaseMusicSongInfo(id string) (gjson.Result, error) {
 	}
 	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
-}

global/param.go

@@ -1,14 +1,66 @@
 package global
 
 import (
+	"math"
 	"regexp"
 	"strconv"
+	"strings"
 
-	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
 )
 
-// MSG 消息Map
-type MSG map[string]interface{}
+var trueSet = map[string]struct{}{
+	"true": {},
+	"yes":  {},
+	"1":    {},
+}
+
+var falseSet = map[string]struct{}{
+	"false": {},
+	"no":    {},
+	"0":     {},
+}
+
+// EnsureBool 判断给定的p是否可表示为合法Bool类型,否则返回defaultVal
+//
+// 支持的合法类型有
+//
+// type bool
+//
+// type gjson.True or gjson.False
+//
+// type string "true","yes","1" or "false","no","0" (case insensitive)
+func EnsureBool(p interface{}, defaultVal bool) bool {
+	var str string
+	if b, ok := p.(bool); ok {
+		return b
+	}
+	if j, ok := p.(gjson.Result); ok {
+		if !j.Exists() {
+			return defaultVal
+		}
+		if j.Type == gjson.True {
+			return true
+		}
+		if j.Type == gjson.False {
+			return false
+		}
+		if j.Type != gjson.String {
+			return defaultVal
+		}
+		str = j.Str
+	} else if s, ok := p.(string); ok {
+		str = s
+	}
+	str = strings.ToLower(str)
+	if _, ok := trueSet[str]; ok {
+		return true
+	}
+	if _, ok := falseSet[str]; ok {
+		return false
+	}
+	return defaultVal
+}
 
 // VersionNameCompare 检查版本名是否需要更新, 仅适用于 go-cqhttp 的版本命名规则
 //
@@ -19,28 +71,37 @@ type MSG map[string]interface{}
 // v0.9.29-fix2 > v0.9.29-fix1 -> false
 //
 // v0.9.29-fix2 < v0.9.30 -> true
-//
-// v1.0.0-alpha2 < v1.0.0-beta1 -> true
-//
-// v1.0.0 > v1.0.0-beta1 -> false
 func VersionNameCompare(current, remote string) bool {
-	defer func() { // 应该不会panic， 为了保险还是加个
-		if err := recover(); err != nil {
-			log.Warn("检查更新失败！")
-		}
-	}()
-	sp := regexp.MustCompile(`v(\d+)\.(\d+)\.(\d+)-?(.+)?`)
-	cur := sp.FindStringSubmatch(current)
-	re := sp.FindStringSubmatch(remote)
-	for i := 1; i <= 3; i++ {
-		curSub, _ := strconv.Atoi(cur[i])
-		reSub, _ := strconv.Atoi(re[i])
-		if curSub != reSub {
-			return curSub < reSub
+	sp := regexp.MustCompile(`[0-9]\d*`)
+	cur := sp.FindAllStringSubmatch(current, -1)
+	re := sp.FindAllStringSubmatch(remote, -1)
+	for i := 0; i < int(math.Min(float64(len(cur)), float64(len(re)))); i++ {
+		curSub, _ := strconv.Atoi(cur[i][0])
+		reSub, _ := strconv.Atoi(re[i][0])
+		if curSub < reSub {
+			return true
 		}
 	}
-	if cur[4] == "" || re[4] == "" {
-		return re[4] == "" && cur[4] != re[4]
-	}
-	return cur[4] < re[4]
+	return len(cur) < len(re)
+}
+
+// SplitURL 将给定URL字符串分割为两部分，用于URL预处理防止风控
+func SplitURL(s string) []string {
+	reg := regexp.MustCompile(`(?i)[a-z\d][-a-z\d]{0,62}(\.[a-z\d][-a-z\d]{0,62})+\.?`)
+	idx := reg.FindAllStringIndex(s, -1)
+	if len(idx) == 0 {
+		return []string{s}
+	}
+	var result []string
+	last := 0
+	for i := 0; i < len(idx); i++ {
+		if len(idx[i]) != 2 {
+			continue
+		}
+		m := int(math.Abs(float64(idx[i][0]-idx[i][1]))/1.5) + idx[i][0]
+		result = append(result, s[last:m])
+		last = m
+	}
+	result = append(result, s[last:])
+	return result
 }

global/ratelimit.go

@@ -0,0 +1,23 @@
+package global
+
+import (
+	"context"
+
+	"golang.org/x/time/rate"
+)
+
+var limiter *rate.Limiter
+var limitEnable = false
+
+// RateLimit 执行API调用速率限制
+func RateLimit(ctx context.Context) {
+	if limitEnable {
+		_ = limiter.Wait(ctx)
+	}
+}
+
+// InitLimiter 初始化速率限制器
+func InitLimiter(frequency float64, bucketSize int) {
+	limitEnable = true
+	limiter = rate.NewLimiter(rate.Limit(frequency), bucketSize)
+}

global/signal.go

@@ -1,52 +0,0 @@
-package global
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"runtime"
-	"sync"
-	"time"
-
-	log "github.com/sirupsen/logrus"
-)
-
-var (
-	mainStopCh chan struct{}
-	mainOnce   sync.Once
-
-	dumpMutex sync.Mutex
-)
-
-func dumpStack() {
-	dumpMutex.Lock()
-	defer dumpMutex.Unlock()
-
-	log.Info("开始 dump 当前 goroutine stack 信息")
-
-	buf := make([]byte, 1024)
-	for {
-		n := runtime.Stack(buf, true)
-		if n < len(buf) {
-			buf = buf[:n]
-			break
-		}
-		buf = make([]byte, 2*len(buf))
-	}
-
-	fileName := fmt.Sprintf("%s.%d.stacks.%d.log", filepath.Base(os.Args[0]), os.Getpid(), time.Now().Unix())
-	fd, err := os.Create(fileName)
-	if err != nil {
-		log.Errorf("保存 stackdump 到文件时出现错误: %v", err)
-		log.Warnf("无法保存 stackdump. 将直接打印\n %s", buf)
-		return
-	}
-	defer fd.Close()
-	_, err = fd.Write(buf)
-	if err != nil {
-		log.Errorf("写入 stackdump 失败: %v", err)
-		log.Warnf("无法保存 stackdump. 将直接打印\n %s", buf)
-		return
-	}
-	log.Infof("stackdump 已保存至 %s", fileName)
-}

global/signal_unix.go

@@ -1,34 +0,0 @@
-//go:build !windows
-// +build !windows
-
-package global
-
-import (
-	"os"
-	"os/signal"
-	"sync"
-	"syscall"
-)
-
-// SetupMainSignalHandler is for main to use at last
-func SetupMainSignalHandler() <-chan struct{} {
-	mainOnce.Do(func() {
-		mainStopCh = make(chan struct{})
-		mc := make(chan os.Signal, 3)
-		closeOnce := sync.Once{}
-		signal.Notify(mc, os.Interrupt, syscall.SIGTERM, syscall.SIGUSR1)
-		go func() {
-			for {
-				switch <-mc {
-				case os.Interrupt, syscall.SIGTERM:
-					closeOnce.Do(func() {
-						close(mainStopCh)
-					})
-				case syscall.SIGUSR1:
-					dumpStack()
-				}
-			}
-		}()
-	})
-	return mainStopCh
-}

global/signal_windows.go

@@ -1,89 +0,0 @@
-//go:build windows
-// +build windows
-
-package global
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"os"
-	"os/signal"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-
-	"github.com/Microsoft/go-winio"
-	log "github.com/sirupsen/logrus"
-)
-
-var validTasks = map[string]func(){
-	"dumpstack": dumpStack,
-}
-
-// SetupMainSignalHandler is for main to use at last
-func SetupMainSignalHandler() <-chan struct{} {
-	mainOnce.Do(func() {
-		// for stack trace collecting on windows
-		pipeName := fmt.Sprintf(`\\.\pipe\go-cqhttp-%d`, os.Getpid())
-		pipe, err := winio.ListenPipe(pipeName, &winio.PipeConfig{})
-		if err != nil {
-			log.Errorf("创建 named pipe 失败. 将无法使用 dumpstack 功能: %v", err)
-		} else {
-			maxTaskLen := 0
-			for t := range validTasks {
-				if l := len(t); l > maxTaskLen {
-					maxTaskLen = l
-				}
-			}
-			go func() {
-				for {
-					c, err := pipe.Accept()
-					if err != nil {
-						if errors.Is(err, net.ErrClosed) || strings.Contains(err.Error(), "closed") {
-							return
-						}
-						log.Errorf("accept named pipe 失败: %v", err)
-						continue
-					}
-					go func() {
-						defer c.Close()
-						_ = c.SetReadDeadline(time.Now().Add(5 * time.Second))
-						buf := make([]byte, maxTaskLen)
-						n, err := c.Read(buf)
-						if err != nil {
-							log.Errorf("读取 named pipe 失败: %v", err)
-							return
-						}
-						cmd := string(buf[:n])
-						if task, ok := validTasks[cmd]; ok {
-							task()
-							return
-						}
-						log.Warnf("named pipe 读取到未知指令: %q", cmd)
-					}()
-				}
-			}()
-		}
-		// setup the main stop channel
-		mainStopCh = make(chan struct{})
-		mc := make(chan os.Signal, 2)
-		closeOnce := sync.Once{}
-		signal.Notify(mc, os.Interrupt, syscall.SIGTERM)
-		go func() {
-			for {
-				switch <-mc {
-				case os.Interrupt, syscall.SIGTERM:
-					closeOnce.Do(func() {
-						close(mainStopCh)
-						if pipe != nil {
-							_ = pipe.Close()
-						}
-					})
-				}
-			}
-		}()
-	})
-	return mainStopCh
-}

global/terminal/doc.go

@@ -1,2 +0,0 @@
-// Package terminal 包含用于检测在windows下是否通过双击运行go-cqhttp的函数
-package terminal

global/terminal/double_click.go

@@ -1,14 +1,7 @@
-//go:build !windows
 // +build !windows
 
 package terminal
 
-// RunningByDoubleClick 检查是否通过双击直接运行,非Windows系统永远返回false
 func RunningByDoubleClick() bool {
 	return false
 }
-
-// NoMoreDoubleClick 提示用户不要双击运行，非Windows系统永远返回nil
-func NoMoreDoubleClick() error {
-	return nil
-}

global/terminal/double_click_windows.go

@@ -1,14 +1,10 @@
-//go:build windows
 // +build windows
 
 package terminal
 
 import (
-	"os"
 	"syscall"
 	"unsafe"
-
-	"github.com/pkg/errors"
 )
 
 // RunningByDoubleClick 检查是否通过双击直接运行
@@ -25,43 +21,3 @@ func RunningByDoubleClick() bool {
 	}
 	return true
 }
-
-// NoMoreDoubleClick 提示用户不要双击运行，并生成安全启动脚本
-func NoMoreDoubleClick() error {
-	r := boxW(0, "请勿通过双击直接运行本程序, 这将导致一些非预料的后果.\n请在shell中运行./go-cqhttp.exe\n点击确认将释出安全启动脚本，点击取消则关闭程序", "警告", 0x00000030|0x00000001)
-	if r == 2 {
-		return nil
-	}
-	r = boxW(0, "点击确认将覆盖go-cqhttp.bat，点击取消则关闭程序", "警告", 0x00000030|0x00000001)
-	if r == 2 {
-		return nil
-	}
-	f, err := os.OpenFile("go-cqhttp.bat", os.O_CREATE|os.O_RDWR, 0o666)
-	if err != nil {
-		return err
-	}
-	if err != nil {
-		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")
-	if err != nil {
-		return errors.Errorf("写入go-cqhttp.bat失败: %v", err)
-	}
-	f.Close()
-	boxW(0, "安全启动脚本已生成，请双击go-cqhttp.bat启动", "提示", 0x00000040|0x00000000)
-	return nil
-}
-
-// 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(
-		hwnd,
-		uintptr(unsafe.Pointer(captionPtr)),
-		uintptr(unsafe.Pointer(titlePtr)),
-		uintptr(flags))
-
-	return int(ret)
-}

go.mod

@@ -1,64 +1,31 @@
 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.16
 
 require (
 	github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f
-	github.com/Microsoft/go-winio v0.5.1
-	github.com/Mrs4s/MiraiGo v0.0.0-20211112183036-d3a21e577b02
+	github.com/Mrs4s/MiraiGo v0.0.0-20210323143736-d233c90d5083
 	github.com/dustin/go-humanize v1.0.0
-	github.com/fumiama/go-hide-param v0.1.4
-	github.com/gabriel-vasile/mimetype v1.4.0
+	github.com/gin-gonic/gin v1.6.3
+	github.com/gorilla/websocket v1.4.2
+	github.com/guonaihong/gout v0.1.5
+	github.com/hjson/hjson-go v3.1.0+incompatible
+	github.com/jonboulle/clockwork v0.2.2 // indirect
+	github.com/json-iterator/go v1.1.10
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
-	github.com/klauspost/compress v1.13.6
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
-	github.com/mattn/go-colorable v0.1.8
+	github.com/lestrrat-go/strftime v1.0.4 // indirect
+	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/segmentio/asm v1.1.0
 	github.com/sirupsen/logrus v1.8.1
-	github.com/stretchr/testify v1.7.0
+	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
 	github.com/syndtr/goleveldb v1.0.0
-	github.com/tidwall/gjson v1.11.0
+	github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
+	github.com/tidwall/gjson v1.6.8
 	github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2
 	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
-	nhooyr.io/websocket v1.8.7
-)
-
-require (
-	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/gorilla/websocket v1.4.2 // indirect
-	github.com/jonboulle/clockwork v0.2.2 // 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-isatty v0.0.12 // 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.1.1 // indirect
-	github.com/tidwall/pretty v1.2.0 // indirect
-	github.com/willf/bitset 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/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d // indirect
-	golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // 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
+	github.com/willf/bitset v1.1.11 // indirect
+	golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b
+	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
+	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
 )

go.sum

@@ -1,26 +1,25 @@
+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.1 h1:aPJp2QD7OOrhO5tQXqQoGSJc+DjDtWTGLOmNyAm6FgY=
-github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
-github.com/Mrs4s/MiraiGo v0.0.0-20211112183036-d3a21e577b02 h1:D2a93R7eugdAfuZtVXYznjqGrKlfvtWQ0YTHnwJYq8U=
-github.com/Mrs4s/MiraiGo v0.0.0-20211112183036-d3a21e577b02/go.mod h1:UOO08UBb5mVisfwrjduINu5GF9+gmsn33f2tnr83xnE=
-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/Mrs4s/MiraiGo v0.0.0-20210323143736-d233c90d5083 h1:ELaNvv80OTwHTYhKwoQpgV4dneKPM1qE5Geu3A1kM/8=
+github.com/Mrs4s/MiraiGo v0.0.0-20210323143736-d233c90d5083/go.mod h1:NjiWhlvGxwv1ftOWIoiFa/OzklnAYI4YqNexFOKSZKw=
+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/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/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.4.0 h1:Cn9dkdYsMIu56tGho+fqzh7XmvY2YyGU0FnbhiOsEro=
-github.com/gabriel-vasile/mimetype v1.4.0/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gin-gonic/gin v1.6.0/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
+github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
@@ -28,92 +27,55 @@ github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD87
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
-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/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0=
-github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
-github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
-github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
-github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
-github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
+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/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.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+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.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w=
 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/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+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/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 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.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 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/guonaihong/gout v0.1.5 h1:1FeFFJWWdWYApBW9d6vzMDB4eR4Zr8T/gaVrjDVcl5U=
+github.com/guonaihong/gout v0.1.5/go.mod h1:0rFYAYyzbcxEg11eY2qUbffJs7hHRPeugAnlVYSp8Ic=
+github.com/hjson/hjson-go v3.1.0+incompatible h1:DY/9yE8ey8Zv22bY+mHV1uk2yRy0h8tKhZ77hEdi0Aw=
+github.com/hjson/hjson-go v3.1.0+incompatible/go.mod h1:qsetwF8NlsTsOTwZTApNlTCerV+b2GjYRRcIk4JMFio=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 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/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
+github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 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/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
-github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-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/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-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=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8=
 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/lestrrat-go/strftime v1.0.4 h1:T1Rb9EPkAhgxKqbcMIPguPq8glqXTA1koF8n9BHElA8=
+github.com/lestrrat-go/strftime v1.0.4/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
 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=
@@ -122,55 +84,44 @@ github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHX
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
+github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 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/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.1.0 h1:fkVr8k5J4sKoFjTGVD6r1yKvDKqmvrEh3K7iyVxgBs8=
-github.com/segmentio/asm v1.1.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/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/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-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.11.0 h1:C16pk7tQNiH6VlCrtIXL1w8GaOsi1X3W8KDkE1BuYd4=
-github.com/tidwall/gjson v1.11.0/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.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
-github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
+github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 h1:J6v8awz+me+xeb/cUTotKgceAYouhIB3pjzgRd6IlGk=
+github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
+github.com/tidwall/gjson v1.6.8 h1:CTmXMClGYPAmln7652e69B7OLXfTi5ABcPPwjIWUv7w=
+github.com/tidwall/gjson v1.6.8/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI=
+github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
+github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
+github.com/tidwall/pretty v1.0.2/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/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
@@ -179,81 +130,73 @@ github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 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/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=
+github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE=
+github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
 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/image v0.0.0-20210628002857-a66eb6448b8d h1:RNPAfi2nHY7C2srAV8A49jpsYr0ADedCk1wq6fTMTvs=
-golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
+golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b h1:wSOdpTq0/eI46Ez/LkDwIsAKA71YP2SRKBODiRWM0as=
+golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+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/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-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/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-20181108010431-42b317875d0f/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-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 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-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-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201126233918-771906719818 h1:f1CIuDlJhwANEC2MM87MBEVMr3jl5bifgsfj90XAF9c=
 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/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.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=
+golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 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 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 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-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-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/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
+golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/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-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-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+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-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-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/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=
+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.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.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 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/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
@@ -262,9 +205,10 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/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.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 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=
 modernc.org/libc v1.8.1/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
 modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
@@ -272,5 +216,3 @@ 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/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
-nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
-nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=

internal/base/feature.go

@@ -1,39 +0,0 @@
-package base
-
-import (
-	"io"
-
-	"github.com/pkg/errors"
-)
-
-// silk encode features
-var (
-	EncodeSilk   = encodeSilk   // 编码 SilkV3 音频
-	ResampleSilk = resampleSilk // 将silk重新编码为 24000 bit rate
-)
-
-func encodeSilk(_ []byte, _ string) ([]byte, error) {
-	return nil, errors.New("not supported now")
-}
-
-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 all in v1.1.0
-
-// onebot 12 feature
-const (
-	AcceptOneBot12HTTPEndPoint = false
-	AcceptOneBot12Message      = false
-)

internal/base/flag.go

@@ -1,148 +0,0 @@
-// Package base provides base config for go-cqhttp
-package base
-
-import (
-	"flag"
-	"fmt"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"strings"
-	"time"
-
-	log "github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v3"
-
-	"github.com/Mrs4s/go-cqhttp/modules/config"
-)
-
-// command flags
-var (
-	LittleC  string // config file
-	LittleD  bool   // daemon
-	LittleH  bool   // Help
-	LittleWD string // working directory
-)
-
-// config file flags
-var (
-	Debug               bool // 是否开启 debug 模式
-	RemoveReplyAt       bool // 是否删除reply后的at
-	ExtraReplyData      bool // 是否上报额外reply信息
-	IgnoreInvalidCQCode bool // 是否忽略无效CQ码
-	SplitURL            bool // 是否分割URL
-	ForceFragmented     bool // 是否启用强制分片
-	SkipMimeScan        bool // 是否跳过Mime扫描
-	ReportSelfMessage   bool // 是否上报自身消息
-	UseSSOAddress       bool // 是否使用服务器下发的新地址进行重连
-	LogForceNew         bool // 是否在每次启动时强制创建全新的文件储存日志
-	FastStart           bool // 是否为快速启动
-
-	PostFormat        string                 // 上报格式 string or array
-	Proxy             string                 // 存储 proxy_rewrite,用于设置代理
-	PasswordHash      [16]byte               // 存储QQ密码哈希供登录使用
-	AccountToken      []byte                 // 存储 AccountToken 供登录使用
-	Account           *config.Account        // 账户配置
-	Reconnect         *config.Reconnect      // 重连配置
-	LogLevel          string                 // 日志等级
-	LogAging          = time.Hour * 24 * 365 // 日志时效
-	HeartbeatInterval = time.Second * 5      // 心跳间隔
-
-	Servers  []map[string]yaml.Node // 连接服务列表
-	Database map[string]yaml.Node   // 数据库列表
-)
-
-// Parse parse flags
-func Parse() {
-	wd, _ := os.Getwd()
-	dc := path.Join(wd, "config.yml")
-	flag.StringVar(&LittleC, "c", dc, "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.Parse()
-
-	if *d {
-		Debug = true
-	}
-}
-
-// Init read config from yml file
-func Init() {
-	conf := config.Parse(LittleC)
-	{ // bool config
-		if conf.Output.Debug {
-			Debug = true
-		}
-		IgnoreInvalidCQCode = conf.Message.IgnoreInvalidCQCode
-		SplitURL = conf.Message.FixURL
-		RemoveReplyAt = conf.Message.RemoveReplyAt
-		ExtraReplyData = conf.Message.ExtraReplyData
-		ForceFragmented = conf.Message.ForceFragment
-		SkipMimeScan = conf.Message.SkipMimeScan
-		ReportSelfMessage = conf.Message.ReportSelfMessage
-		UseSSOAddress = conf.Account.UseSSOAddress
-	}
-	{ // others
-		Proxy = conf.Message.ProxyRewrite
-		Account = conf.Account
-		Reconnect = conf.Account.ReLogin
-		Servers = conf.Servers
-		Database = conf.Database
-		LogLevel = conf.Output.LogLevel
-		if conf.Message.PostFormat != "string" && conf.Message.PostFormat != "array" {
-			log.Warnf("post-format 配置错误, 将自动使用 string")
-			PostFormat = "string"
-		} else {
-			PostFormat = conf.Message.PostFormat
-		}
-		if conf.Output.LogAging > 0 {
-			LogAging = time.Hour * 24 * time.Duration(conf.Output.LogAging)
-		}
-		if conf.Heartbeat.Interval > 0 {
-			HeartbeatInterval = time.Second * time.Duration(conf.Heartbeat.Interval)
-		}
-		if conf.Heartbeat.Disabled || conf.Heartbeat.Interval < 0 {
-			HeartbeatInterval = 0
-		}
-	}
-}
-
-// Help cli命令行-h的帮助提示
-func Help() {
-	fmt.Printf(`go-cqhttp service
-version: %s
-Usage:
-server [OPTIONS]
-Options:
-`, Version)
-
-	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/base/version.go

@@ -1,16 +0,0 @@
-package base
-
-import "runtime/debug"
-
-// Version go-cqhttp的版本信息，在编译时使用ldflags进行覆盖
-var Version = "unknown"
-
-func init() {
-	if Version != "unknown" {
-		return
-	}
-	info, ok := debug.ReadBuildInfo()
-	if ok {
-		Version = info.Main.Version
-	}
-}

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

@@ -1,97 +0,0 @@
-// Package cache impl the cache for gocq
-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"
-)
-
-// todo(wdvxdr): always enable db-cache in v1.0.0
-
-// EnableCacheDB 是否启用 btree db缓存图片等
-var EnableCacheDB bool
-
-// Media Cache DBs
-var (
-	Image Cache
-	Video Cache
-	// todo: Voice?
-)
-
-// Cache wraps the btree.DB for concurrent safe
-type Cache struct {
-	lock sync.RWMutex
-	db   *btree.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)
-}
-
-// 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])
-}
-
-// 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])
-}
-
-// 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("image", &Image)
-	open("video", &Video)
-}

internal/param/param.go

@@ -1,130 +0,0 @@
-// Package param provide some util for param parse
-package param
-
-import (
-	"math"
-	"reflect"
-	"regexp"
-	"strings"
-	"sync"
-
-	"github.com/Mrs4s/MiraiGo/utils"
-	"github.com/segmentio/asm/base64"
-	"github.com/tidwall/gjson"
-)
-
-// EnsureBool 判断给定的p是否可表示为合法Bool类型,否则返回defaultVal
-//
-// 支持的合法类型有
-//
-// type bool
-//
-// type gjson.True or gjson.False
-//
-// type string "true","yes","1" or "false","no","0" (case insensitive)
-func EnsureBool(p interface{}, defaultVal bool) bool {
-	var str string
-	if b, ok := p.(bool); ok {
-		return b
-	}
-	if j, ok := p.(gjson.Result); ok {
-		if !j.Exists() {
-			return defaultVal
-		}
-		switch j.Type { // nolint
-		case gjson.True:
-			return true
-		case gjson.False:
-			return false
-		case gjson.String:
-			str = j.Str
-		default:
-			return defaultVal
-		}
-	} else if s, ok := p.(string); ok {
-		str = s
-	}
-	str = strings.ToLower(str)
-	switch str {
-	case "true", "yes", "1":
-		return true
-	case "false", "no", "0":
-		return false
-	default:
-		return defaultVal
-	}
-}
-
-var (
-	// once lazy compile the reg
-	once sync.Once
-	// reg is splitURL regex pattern.
-	reg *regexp.Regexp
-)
-
-// SplitURL 将给定URL字符串分割为两部分，用于URL预处理防止风控
-func SplitURL(s string) []string {
-	once.Do(func() { // lazy init.
-		reg = regexp.MustCompile(`(?i)[a-z\d][-a-z\d]{0,62}(\.[a-z\d][-a-z\d]{0,62})+\.?`)
-	})
-	idx := reg.FindAllStringIndex(s, -1)
-	if len(idx) == 0 {
-		return []string{s}
-	}
-	var result []string
-	last := 0
-	for i := 0; i < len(idx); i++ {
-		if len(idx[i]) != 2 {
-			continue
-		}
-		m := int(math.Abs(float64(idx[i][0]-idx[i][1]))/1.5) + idx[i][0]
-		result = append(result, s[last:m])
-		last = m
-	}
-	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

@@ -1,73 +0,0 @@
-// 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", longMessageServerErrorMessage)
-		} else {
-			log.Warnf("警告: 长消息延迟为 %vms, 大于 1000ms, %v", qualityInfo.LongMessageServerLatency, 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

@@ -1,206 +0,0 @@
-// Package selfupdate 版本升级检查和自更新
-package selfupdate
-
-import (
-	"bufio"
-	"encoding/hex"
-	"fmt"
-	"hash"
-	"io"
-	"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"
-)
-
-func readLine() (str string) {
-	console := bufio.NewReader(os.Stdin)
-	str, _ = console.ReadString('\n')
-	str = strings.TrimSpace(str)
-	return
-}
-
-func lastVersion() (string, error) {
-	r, err := global.GetBytes("https://api.github.com/repos/Mrs4s/go-cqhttp/releases/latest")
-	if err != nil {
-		return "", err
-	}
-	return gjson.GetBytes(r, "tag_name").Str, nil
-}
-
-// CheckUpdate 检查更新
-func CheckUpdate() {
-	logrus.Infof("正在检查更新.")
-	if base.Version == "(devel)" {
-		logrus.Warnf("检查更新失败: 使用的 Actions 测试版或自编译版本.")
-		return
-	}
-	latest, err := lastVersion()
-	if err != nil {
-		logrus.Warnf("检查更新失败: %v", err)
-		return
-	}
-	if global.VersionNameCompare(base.Version, latest) {
-		logrus.Infof("当前有更新的 go-cqhttp 可供更新, 请前往 https://github.com/Mrs4s/go-cqhttp/releases 下载.")
-		logrus.Infof("当前版本: %v 最新版本: %v", base.Version, latest)
-		return
-	}
-	logrus.Infof("检查更新完成. 当前已运行最新版本.")
-}
-
-func binaryName() string {
-	goarch := runtime.GOARCH
-	if goarch == "arm" {
-		goarch += "v7"
-	}
-	ext := "tar.gz"
-	if runtime.GOOS == "windows" {
-		ext = "zip"
-	}
-	return fmt.Sprintf("go-cqhttp_%v_%v.%v", runtime.GOOS, goarch, ext)
-}
-
-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)
-	if err != nil {
-		return nil
-	}
-
-	rd := bufio.NewReader(closer)
-	for {
-		str, err := rd.ReadString('\n')
-		if err != nil {
-			break
-		}
-		str = strings.TrimSpace(str)
-		if strings.HasSuffix(str, binaryName()) {
-			sum, _ := hex.DecodeString(strings.TrimSuffix(str, "  "+binaryName()))
-			return sum
-		}
-	}
-	return nil
-}
-
-func wait() {
-	logrus.Info("按 Enter 继续....")
-	readLine()
-	os.Exit(0)
-}
-
-// SelfUpdate 自更新
-func SelfUpdate(github string) {
-	if github == "" {
-		github = "https://github.com"
-	}
-
-	logrus.Infof("正在检查更新.")
-	latest, err := lastVersion()
-	if err != nil {
-		logrus.Warnf("获取最新版本失败: %v", err)
-		wait()
-	}
-	url := fmt.Sprintf("%v/Mrs4s/go-cqhttp/releases/download/%v/%v", github, latest, binaryName())
-	if base.Version == latest {
-		logrus.Info("当前版本已经是最新版本!")
-		wait()
-	}
-	logrus.Info("当前最新版本为 ", latest)
-	logrus.Warn("是否更新(y/N): ")
-	r := strings.TrimSpace(readLine())
-	if r != "y" && r != "Y" {
-		logrus.Warn("已取消更新！")
-		wait()
-	}
-	logrus.Info("正在更新,请稍等...")
-	sum := checksum(github, latest)
-	if sum != nil {
-		err = update(url, sum)
-		if err != nil {
-			logrus.Error("更新失败: ", err)
-		} else {
-			logrus.Info("更新成功!")
-		}
-	} else {
-		logrus.Error("checksum 失败!")
-	}
-	wait()
-}
-
-// writeSumCounter 写入量计算实例
-type writeSumCounter struct {
-	total uint64
-	hash  hash.Hash
-}
-
-// Write 方法将写入的byte长度追加至写入的总长度Total中
-func (wc *writeSumCounter) Write(p []byte) (int, error) {
-	n := len(p)
-	wc.total += uint64(n)
-	wc.hash.Write(p)
-	fmt.Printf("\r                                    ")
-	fmt.Printf("\rDownloading... %s complete", humanize.Bytes(wc.total))
-	return n, nil
-}
-
-// FromStream copy form getlantern/go-update
-func fromStream(updateWith io.Reader) (err error, errRecover error) {
-	updatePath, err := osext.Executable()
-	if err != nil {
-		return
-	}
-
-	// get the directory the executable exists in
-	updateDir := filepath.Dir(updatePath)
-	filename := filepath.Base(updatePath)
-	// Copy the contents of of newbinary to a the new executable file
-	newPath := filepath.Join(updateDir, fmt.Sprintf(".%s.new", filename))
-	fp, err := os.OpenFile(newPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o755)
-	if err != nil {
-		return
-	}
-	// 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 {
-		logrus.Errorf("Unable to copy data: %v\n", err)
-	}
-
-	// if we don't call fp.Close(), windows won't let us move the new executable
-	// because the file will still be "in use"
-	if err := fp.Close(); err != nil {
-		logrus.Errorf("Unable to close file: %v\n", err)
-	}
-	// this is where we'll move the executable to so that we can swap in the updated replacement
-	oldPath := filepath.Join(updateDir, fmt.Sprintf(".%s.old", filename))
-
-	// delete any existing old exec file - this is necessary on Windows for two reasons:
-	// 1. after a successful update, Windows can't remove the .old file because the process is still running
-	// 2. windows rename operations fail if the destination file already exists
-	_ = os.Remove(oldPath)
-
-	// move the existing executable to a new file in the same directory
-	err = os.Rename(updatePath, oldPath)
-	if err != nil {
-		return
-	}
-
-	// move the new executable in to become the new program
-	err = os.Rename(newPath, updatePath)
-
-	if err != nil {
-		// copy unsuccessful
-		errRecover = os.Rename(oldPath, updatePath)
-	} else {
-		// copy successful, remove the old binary
-		_ = os.Remove(oldPath)
-	}
-	return
-}

internal/selfupdate/update_others.go

@@ -1,52 +0,0 @@
-//go:build !windows
-// +build !windows
-
-package selfupdate
-
-import (
-	"archive/tar"
-	"bytes"
-	"crypto/sha256"
-	"errors"
-	"io"
-	"net/http"
-
-	"github.com/klauspost/compress/gzip"
-)
-
-// update go-cqhttp自我更新
-func update(url string, sum []byte) error {
-	resp, err := http.Get(url)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-	wc := writeSumCounter{
-		hash: sha256.New(),
-	}
-	rsp, err := io.ReadAll(io.TeeReader(resp.Body, &wc))
-	if err != nil {
-		return err
-	}
-	if !bytes.Equal(wc.hash.Sum(nil), sum) {
-		return errors.New("文件已损坏")
-	}
-	gr, err := gzip.NewReader(bytes.NewReader(rsp))
-	if err != nil {
-		return err
-	}
-	tr := tar.NewReader(gr)
-	for {
-		header, err := tr.Next()
-		if err != nil {
-			return err
-		}
-		if header.Name == "go-cqhttp" {
-			err, _ := fromStream(tr)
-			if err != nil {
-				return err
-			}
-			return nil
-		}
-	}
-}

internal/selfupdate/update_windows.go

@@ -1,40 +0,0 @@
-package selfupdate
-
-import (
-	"bytes"
-	"crypto/sha256"
-	"errors"
-	"io"
-	"net/http"
-
-	"github.com/klauspost/compress/zip"
-)
-
-// update go-cqhttp自我更新
-func update(url string, sum []byte) error {
-	resp, err := http.Get(url)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-	wc := writeSumCounter{
-		hash: sha256.New(),
-	}
-	rsp, err := io.ReadAll(io.TeeReader(resp.Body, &wc))
-	if err != nil {
-		return err
-	}
-	if !bytes.Equal(wc.hash.Sum(nil), sum) {
-		return errors.New("文件已损坏")
-	}
-	reader, _ := zip.NewReader(bytes.NewReader(rsp), resp.ContentLength)
-	file, err := reader.Open("go-cqhttp.exe")
-	if err != nil {
-		return err
-	}
-	err, _ = fromStream(file)
-	if err != nil {
-		return err
-	}
-	return nil
-}

login.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bufio"
 	"bytes"
+	"io/ioutil"
 	"os"
 	"strings"
 	"time"
@@ -18,28 +19,12 @@ import (
 
 var console = bufio.NewReader(os.Stdin)
 
-func readLine() (str string) {
+var readLine = func() (str string) {
 	str, _ = console.ReadString('\n')
 	str = strings.TrimSpace(str)
 	return
 }
 
-func readLineTimeout(t time.Duration, de string) (str string) {
-	r := make(chan string)
-	go func() {
-		select {
-		case r <- readLine():
-		case <-time.After(t):
-		}
-	}()
-	str = de
-	select {
-	case str = <-r:
-	case <-time.After(t):
-	}
-	return
-}
-
 var cli *client.QQClient
 
 // ErrSMSRequestError SMS请求出错
@@ -62,15 +47,10 @@ func qrcodeLogin() error {
 	if err != nil {
 		return err
 	}
-	_ = os.WriteFile("qrcode.png", rsp.ImageData, 0o644)
-	defer func() { _ = os.Remove("qrcode.png") }()
-	if cli.Uin != 0 {
-		log.Infof("请使用账号 %v 登录手机QQ扫描二维码 (qrcode.png) : ", cli.Uin)
-	} else {
-		log.Infof("请使用手机QQ扫描二维码 (qrcode.png) : ")
-	}
+	_ = ioutil.WriteFile("qrcode.png", rsp.ImageData, 0644)
+	log.Infof("请使用手机QQ扫描二维码 (qrcode.png) : ")
 	time.Sleep(time.Second)
-	qrcodeTerminal.New2(qrcodeTerminal.ConsoleColors.BrightBlack, qrcodeTerminal.ConsoleColors.BrightWhite, qrcodeTerminal.QRCodeRecoveryLevels.Low).Get(fi.Content).Print()
+	qrcodeTerminal.New().Get(fi.Content).Print()
 	s, err := cli.QueryQRCodeStatus(rsp.Sig)
 	if err != nil {
 		return err
@@ -86,21 +66,21 @@ func qrcodeLogin() error {
 			continue
 		}
 		prevState = s.State
-		switch s.State {
-		case client.QRCodeCanceled:
+		if s.State == client.QRCodeCanceled {
 			log.Fatalf("扫码被用户取消.")
-		case client.QRCodeTimeout:
+		}
+		if s.State == client.QRCodeTimeout {
 			log.Fatalf("二维码过期")
-		case client.QRCodeWaitingForConfirm:
+		}
+		if s.State == client.QRCodeWaitingForConfirm {
 			log.Infof("扫码成功, 请在手机端确认登录.")
-		case client.QRCodeConfirmed:
+		}
+		if s.State == client.QRCodeConfirmed {
 			res, err := cli.QRCodeLogin(s.LoginInfo)
 			if err != nil {
-				return err
+				return nil
 			}
 			return loginResponseProcessor(res)
-		case client.QRCodeImageFetch, client.QRCodeWaitingForScan:
-			// ignore
 		}
 	}
 }
@@ -117,14 +97,18 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 		var text string
 		switch res.Error {
 		case client.SliderNeededError:
-			log.Warnf("登录需要滑条验证码, 请使用手机QQ扫描二维码以继续登录.")
-			cli.Disconnect()
-			cli.Release()
-			cli = client.NewClientEmpty()
-			return qrcodeLogin()
+			log.Warnf("登录需要滑条验证码. ")
+			log.Warnf("请参考文档 -> https://github.com/Mrs4s/go-cqhttp/blob/master/docs/slider.md <- 抓包获取 Ticket")
+			println()
+			log.Warnf("请用浏览器打开 -> %v <- 并获取Ticket.", res.VerifyUrl)
+			println()
+			log.Warn("请输入Ticket： (Enter 提交)")
+			text = readLine()
+			res, err = cli.SubmitTicket(text)
+			continue
 		case client.NeedCaptcha:
-			log.Warnf("登录需要验证码.")
-			_ = os.WriteFile("captcha.jpg", res.CaptchaImage, 0o644)
+			log.Warnf("登录需要滑条验证码.")
+			_ = ioutil.WriteFile("captcha.jpg", res.CaptchaImage, 0644)
 			log.Warnf("请输入验证码 (captcha.jpg)： (Enter 提交)")
 			text = readLine()
 			global.DelFile("captcha.jpg")
@@ -145,8 +129,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 = readLine()
 			if strings.Contains(text, "1") {
 				if !cli.RequestSMS() {
 					log.Warnf("发送验证码失败，可能是请求过于频繁.")
@@ -160,8 +144,8 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 			fallthrough
 		case client.UnsafeDeviceError:
 			log.Warnf("账号已开启设备锁，请前往 -> %v <- 验证后重启Bot.", res.VerifyUrl)
-			log.Infof("按 Enter 或等待 5s 后继续....")
-			readLineTimeout(time.Second*5, "")
+			log.Infof("按 Enter 继续....")
+			readLine()
 			os.Exit(0)
 		case client.OtherLoginError, client.UnknownLoginError, client.TooManySMSRequestError:
 			msg := res.ErrorMessage
@@ -172,8 +156,8 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 				log.Fatalf("账号被冻结")
 			}
 			log.Warnf("登录失败: %v", msg)
-			log.Infof("按 Enter 或等待 5s 后继续....")
-			readLineTimeout(time.Second*5, "")
+			log.Infof("按 Enter 继续....")
+			readLine()
 			os.Exit(0)
 		}
 	}

main.go

@@ -1,97 +1,145 @@
 package main
 
 import (
+	"bufio"
 	"crypto/aes"
 	"crypto/md5"
 	"crypto/sha1"
+	"encoding/base64"
 	"encoding/hex"
+	"flag"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"net/http"
 	"os"
+	"os/signal"
 	"path"
+	"runtime"
+	"strconv"
+	"strings"
 	"sync"
+	"syscall"
 	"time"
 
+	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/global/terminal"
+	"github.com/Mrs4s/go-cqhttp/server"
+
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
-	para "github.com/fumiama/go-hide-param"
+	"github.com/guonaihong/gout"
+	jsoniter "github.com/json-iterator/go"
 	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
 	log "github.com/sirupsen/logrus"
+	easy "github.com/t-tomalak/logrus-easy-formatter"
+	"github.com/tidwall/gjson"
 	"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"
-
-	_ "github.com/Mrs4s/go-cqhttp/db/leveldb"    // leveldb
-	_ "github.com/Mrs4s/go-cqhttp/modules/mime"  // mime检查模块
-	_ "github.com/Mrs4s/go-cqhttp/modules/pprof" // pprof 性能分析
-	_ "github.com/Mrs4s/go-cqhttp/modules/silk"  // silk编码模块
 )
 
-// 允许通过配置文件设置的状态列表
-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,
-}
+var json = jsoniter.ConfigCompatibleWithStandardLibrary
+var conf *global.JSONConfig
+var isFastStart = false
+var c string
+var d bool
+var h bool
 
-func main() {
-	base.Parse()
-	switch {
-	case base.LittleH:
-		base.Help()
-	case base.LittleD:
-		server.Daemon()
-	case base.LittleWD != "":
-		base.ResetWorkingDir()
-	}
-	base.Init()
+func init() {
+	var debug bool
+	flag.StringVar(&c, "c", global.DefaultConfFile, "configuration filename default is config.hjson")
+	flag.BoolVar(&d, "d", false, "running as a daemon")
+	flag.BoolVar(&debug, "D", false, "debug mode")
+	flag.BoolVar(&h, "h", false, "this help")
+	flag.Parse()
 
-	rotateOptions := []rotatelogs.Option{
-		rotatelogs.WithRotationTime(time.Hour * 24),
+	// 通过-c 参数替换 配置文件路径
+	global.DefaultConfFile = c
+	logFormatter := &easy.Formatter{
+		TimestampFormat: "2006-01-02 15:04:05",
+		LogFormat:       "[%time%] [%lvl%]: %msg% \n",
 	}
-	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...)
+	w, err := rotatelogs.New(path.Join("logs", "%Y-%m-%d.log"), rotatelogs.WithRotationTime(time.Hour*24))
 	if err != nil {
 		log.Errorf("rotatelogs init err: %v", err)
 		panic(err)
 	}
 
-	consoleFormatter := global.LogFormat{EnableColor: true}
-	fileFormatter := global.LogFormat{EnableColor: false}
-	log.AddHook(global.NewLocalHook(w, consoleFormatter, fileFormatter, global.GetLogLevel(base.LogLevel)...))
+	conf = getConfig()
+	if conf == nil {
+		os.Exit(1)
+	}
 
-	mkCacheDir := func(path string, _type string) {
-		if !global.PathExists(path) {
-			if err := os.MkdirAll(path, 0o755); err != nil {
-				log.Fatalf("创建%s缓存文件夹失败: %v", _type, err)
-			}
+	if debug {
+		conf.Debug = true
+	}
+	// 在debug模式下,将在标准输出中打印当前执行行数
+	if conf.Debug {
+		log.SetReportCaller(true)
+	}
+
+	log.AddHook(global.NewLocalHook(w, logFormatter, global.GetLogLevel(conf.LogLevel)...))
+
+	if global.PathExists("cqhttp.json") {
+		log.Info("发现 cqhttp.json 将在五秒后尝试导入配置，按 Ctrl+C 取消.")
+		log.Warn("警告: 该操作会删除 cqhttp.json 并覆盖 config.hjson 文件.")
+		time.Sleep(time.Second * 5)
+		conf := global.CQHTTPAPIConfig{}
+		if err := json.Unmarshal([]byte(global.ReadAllText("cqhttp.json")), &conf); err != nil {
+			log.Fatalf("读取文件 cqhttp.json 失败: %v", err)
+		}
+		goConf := global.DefaultConfig()
+		goConf.AccessToken = conf.AccessToken
+		goConf.HTTPConfig.Host = conf.Host
+		goConf.HTTPConfig.Port = conf.Port
+		goConf.WSConfig.Host = conf.WSHost
+		goConf.WSConfig.Port = conf.WSPort
+		if conf.PostURL != "" {
+			goConf.HTTPConfig.PostUrls[conf.PostURL] = conf.Secret
+		}
+		if conf.UseWsReverse {
+			goConf.ReverseServers[0].Enabled = true
+			goConf.ReverseServers[0].ReverseURL = conf.WSReverseURL
+			goConf.ReverseServers[0].ReverseAPIURL = conf.WSReverseAPIURL
+			goConf.ReverseServers[0].ReverseEventURL = conf.WSReverseEventURL
+			goConf.ReverseServers[0].ReverseReconnectInterval = conf.WSReverseReconnectInterval
+		}
+		if err := goConf.Save(global.DefaultConfFile); err != nil {
+			log.Fatalf("保存 %s 时出现错误: %v", global.DefaultConfFile, err)
+		}
+		_ = os.Remove("cqhttp.json")
+	}
+
+	if !global.PathExists(global.ImagePath) {
+		if err := os.MkdirAll(global.ImagePath, 0755); err != nil {
+			log.Fatalf("创建图片缓存文件夹失败: %v", 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)
+	if !global.PathExists(global.VoicePath) {
+		if err := os.MkdirAll(global.VoicePath, 0755); err != nil {
+			log.Fatalf("创建语音缓存文件夹失败: %v", err)
+		}
 	}
+	if !global.PathExists(global.VideoPath) {
+		if err := os.MkdirAll(global.VideoPath, 0755); err != nil {
+			log.Fatalf("创建视频缓存文件夹失败: %v", err)
+		}
+	}
+	if !global.PathExists(global.CachePath) {
+		if err := os.MkdirAll(global.CachePath, 0755); err != nil {
+			log.Fatalf("创建发送图片缓存文件夹失败: %v", err)
+		}
+	}
+}
 
+func main() {
+	if h {
+		help()
+	}
+	if d {
+		server.Daemon()
+	}
 	var byteKey []byte
 	arg := os.Args
 	if len(arg) > 1 {
@@ -99,51 +147,50 @@ func main() {
 			switch arg[i] {
 			case "update":
 				if len(arg) > i+1 {
-					selfupdate.SelfUpdate(arg[i+1])
+					selfUpdate(arg[i+1])
 				} else {
-					selfupdate.SelfUpdate("")
+					selfUpdate("")
 				}
 			case "key":
-				p := i + 1
-				if len(arg) > p {
-					byteKey = []byte(arg[p])
-					para.Hide(p)
+				if len(arg) > i+1 {
+					b := []byte(arg[i+1])
+					byteKey = b
 				}
 			case "faststart":
-				base.FastStart = true
+				isFastStart = true
 			}
 		}
 	}
-
-	if !base.FastStart && terminal.RunningByDoubleClick() {
-		err := terminal.NoMoreDoubleClick()
-		if err != nil {
-			log.Errorf("遇到错误: %v", err)
-			time.Sleep(time.Second * 5)
-		}
-		return
+	if terminal.RunningByDoubleClick() && !isFastStart {
+		log.Warning("警告: 强烈不推荐通过双击直接运行本程序, 这将导致一些非预料的后果.")
+		log.Warning("将等待10s后启动")
+		time.Sleep(time.Second * 10)
 	}
-
-	if (base.Account.Uin == 0 || (base.Account.Password == "" && !base.Account.Encrypt)) && !global.PathExists("session.token") {
+	if conf.Uin == 0 || (conf.Password == "" && conf.PasswordEncrypted == "") {
 		log.Warn("账号密码未配置, 将使用二维码登录.")
-		if !base.FastStart {
+		if !isFastStart {
 			log.Warn("将在 5秒 后继续.")
 			time.Sleep(time.Second * 5)
 		}
 	}
 
-	log.Info("当前版本:", base.Version)
-	if base.Debug {
+	log.Info("当前版本:", coolq.Version)
+	if conf.Debug {
 		log.SetLevel(log.DebugLevel)
-		log.SetReportCaller(true)
 		log.Warnf("已开启Debug模式.")
 		log.Debugf("开发交流群: 192548878")
+		server.Debug = true
+		/*
+			if conf.WebUI == nil || !conf.WebUI.Enabled {
+				log.Warnf("警告: 在Debug模式下未启用WebUi服务, 将无法进行性能分析.")
+			}
+		*/
 	}
 	log.Info("用户交流群: 721829413")
 	if !global.PathExists("device.json") {
 		log.Warn("虚拟设备信息不存在, 将自动生成随机设备.")
 		client.GenRandomDevice()
-		_ = os.WriteFile("device.json", client.SystemDeviceInfo.ToJson(), 0o644)
+		_ = ioutil.WriteFile("device.json", client.SystemDeviceInfo.ToJson(), 0644)
 		log.Info("已生成设备信息并保存到 device.json 文件.")
 	} else {
 		log.Info("将使用 device.json 内的设备信息运行Bot.")
@@ -151,60 +198,54 @@ func main() {
 			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 conf.EncryptPassword && conf.PasswordEncrypted == "" {
+		log.Infof("密码加密已启用, 请输入Key对密码进行加密: (Enter 提交)")
+		byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
+		global.PasswordHash = md5.Sum([]byte(conf.Password))
+		conf.Password = ""
+		conf.PasswordEncrypted = "AES:" + PasswordHashEncrypt(global.PasswordHash[:], byteKey)
+		_ = conf.Save(global.DefaultConfFile)
 	}
-	if !base.FastStart {
+	if conf.PasswordEncrypted != "" {
+		if len(byteKey) == 0 {
+			log.Infof("密码加密已启用, 请输入Key对密码进行解密以继续: (Enter 提交)")
+			cancel := make(chan struct{}, 1)
+			go func() {
+				select {
+				case <-cancel:
+					return
+				case <-time.After(time.Second * 45):
+					log.Infof("解密key输入超时")
+					time.Sleep(3 * time.Second)
+					os.Exit(0)
+				}
+			}()
+			byteKey, _ = term.ReadPassword(int(os.Stdin.Fd()))
+			cancel <- struct{}{}
+		} else {
+			log.Infof("密码加密已启用, 使用运行时传递的参数进行解密，按 Ctrl+C 取消.")
+		}
+
+		// 升级客户端密码加密方案，MD5+TEA 加密密码 -> PBKDF2+AES 加密 MD5
+		// 升级后的 PasswordEncrypted 字符串以"AES:"开始，其后为 Hex 编码的16字节加密 MD5
+		if !strings.HasPrefix(conf.PasswordEncrypted, "AES:") {
+			password := OldPasswordDecrypt(conf.PasswordEncrypted, byteKey)
+			passwordHash := md5.Sum([]byte(password))
+			newPasswordHash := PasswordHashEncrypt(passwordHash[:], byteKey)
+			conf.PasswordEncrypted = "AES:" + newPasswordHash
+			_ = conf.Save(global.DefaultConfFile)
+			log.Debug("密码加密方案升级完成")
+		}
+
+		ph, err := PasswordHashDecrypt(conf.PasswordEncrypted[4:], byteKey)
+		if err != nil {
+			log.Fatalf("加密存储的密码损坏，请尝试重新配置密码")
+		}
+		copy(global.PasswordHash[:], ph)
+	} else if conf.Password != "" {
+		global.PasswordHash = md5.Sum([]byte(conf.Password))
+	}
+	if !isFastStart {
 		log.Info("Bot将在5秒后登录并开始信息处理, 按 Ctrl+C 取消.")
 		time.Sleep(time.Second * 5)
 	}
@@ -219,62 +260,67 @@ func main() {
 			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)
+	cli = client.NewClientEmpty()
+	if conf.Uin != 0 && global.PasswordHash != [16]byte{} {
+		cli.Uin = conf.Uin
+		cli.PasswordMd5 = global.PasswordHash
 	}
-	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
+	cli.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)
+		}
+	})
+	if global.PathExists("address.txt") {
+		log.Infof("检测到 address.txt 文件. 将覆盖目标IP.")
+		addr := global.ReadAddrFile("address.txt")
+		if len(addr) > 0 {
+			cli.SetCustomServer(addr)
+		}
+		log.Infof("读取到 %v 个自定义地址.", len(addr))
+	}
+	cli.OnServerUpdated(func(bot *client.QQClient, e *client.ServerUpdatedEvent) bool {
+		if !conf.UseSSOAddress {
+			log.Infof("收到服务器地址更新通知, 根据配置文件已忽略.")
+			return false
+		}
+		log.Infof("收到服务器地址更新通知, 将在下一次重连时应用. ")
+		return true
+	})
+	/*
+		if conf.WebUI == nil {
+			conf.WebUI = &global.GoCQWebUI{
+				Enabled:   true,
+				WebInput:  false,
+				Host:      "0.0.0.0",
+				WebUIPort: 9999,
 			}
 		}
-	}
-	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)
-			}
+		if conf.WebUI.WebUIPort <= 0 {
+			conf.WebUI.WebUIPort = 9999
+		}
+		if conf.WebUI.Host == "" {
+			conf.WebUI.Host = "127.0.0.1"
+		}
+	*/
+	global.Proxy = conf.ProxyRewrite
+	// b := server.WebServer.Run(fmt.Sprintf("%s:%d", conf.WebUI.Host, conf.WebUI.WebUIPort), cli)
+	// c := server.Console
+	isQRCodeLogin := (conf.Uin == 0 || len(conf.Password) == 0) && len(conf.PasswordEncrypted) == 0
+	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 // 重试次数
@@ -282,76 +328,68 @@ func main() {
 	cli.OnDisconnected(func(q *client.QQClient, e *client.ClientDisconnectedEvent) {
 		reLoginLock.Lock()
 		defer reLoginLock.Unlock()
-		times = 1
+		log.Warnf("Bot已离线: %v", e.Message)
+		if !conf.ReLogin.Enabled {
+			os.Exit(1)
+		}
+		if isQRCodeLogin {
+			log.Fatalf("二维码登录暂不支持重连.")
+		}
+		if times > conf.ReLogin.MaxReloginTimes && conf.ReLogin.MaxReloginTimes != 0 {
+			log.Fatalf("Bot重连次数超过限制, 停止")
+		}
+		if conf.ReLogin.ReLoginDelay > 0 {
+			log.Warnf("将在 %v 秒后尝试重连. 重连次数：%v/%v", conf.ReLogin.ReLoginDelay, times, conf.ReLogin.MaxReloginTimes)
+		}
+		log.Warnf("尝试重连...")
 		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
-			}
+		if err := commonLogin(); err != nil {
+			log.Fatalf("登录时发生致命错误: %v", err)
 		}
 	})
-	saveToken()
 	cli.AllowSlider = true
 	log.Infof("登录成功 欢迎使用: %v", cli.Nickname)
 	log.Info("开始加载好友列表...")
-	global.Check(cli.ReloadFriendList(), true)
+	global.Check(cli.ReloadFriendList())
 	log.Infof("共加载 %v 个好友.", len(cli.FriendList))
 	log.Infof("开始加载群列表...")
-	global.Check(cli.ReloadGroupList(), true)
+	global.Check(cli.ReloadGroupList())
 	log.Infof("共加载 %v 个群.", len(cli.GroupList))
-	if uint(base.Account.Status) >= uint(len(allowStatus)) {
-		base.Account.Status = 0
+	bot := coolq.NewQQBot(cli, conf)
+	if conf.PostMessageFormat != "string" && conf.PostMessageFormat != "array" {
+		log.Warnf("post_message_format 配置错误, 将自动使用 string")
+		coolq.SetMessageFormat("string")
+	} else {
+		coolq.SetMessageFormat(conf.PostMessageFormat)
+	}
+	if conf.RateLimit.Enabled {
+		global.InitLimiter(conf.RateLimit.Frequency, conf.RateLimit.BucketSize)
+	}
+	log.Info("正在加载事件过滤器.")
+	global.BootFilter()
+	coolq.IgnoreInvalidCQCode = conf.IgnoreInvalidCQCode
+	coolq.SplitURL = conf.FixURL
+	coolq.ForceFragmented = conf.ForceFragmented
+	if conf.HTTPConfig != nil && conf.HTTPConfig.Enabled {
+		go server.CQHTTPApiServer.Run(fmt.Sprintf("%s:%d", conf.HTTPConfig.Host, conf.HTTPConfig.Port), conf.AccessToken, bot)
+		for k, v := range conf.HTTPConfig.PostUrls {
+			server.NewHTTPClient().Run(k, v, conf.HTTPConfig.Timeout, bot)
+		}
+	}
+	if conf.WSConfig != nil && conf.WSConfig.Enabled {
+		go server.WebSocketServer.Run(fmt.Sprintf("%s:%d", conf.WSConfig.Host, conf.WSConfig.Port), conf.AccessToken, bot)
+	}
+	for _, rc := range conf.ReverseServers {
+		go server.NewWebSocketClient(rc, conf.AccessToken, bot).Run()
 	}
-	cli.SetOnlineStatus(allowStatus[base.Account.Status])
-
-	servers.Run(coolq.NewQQBot(cli))
 	log.Info("资源初始化完成, 开始处理信息.")
 	log.Info("アトリは、高性能ですから!")
-
-	go selfupdate.CheckUpdate()
-	go func() {
-		time.Sleep(5 * time.Second)
-		go selfdiagnosis.NetworkDiagnosis(cli)
-	}()
-
-	<-global.SetupMainSignalHandler()
+	c := make(chan os.Signal, 1)
+	go checkUpdate()
+	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
+	<-c
 }
 
 // PasswordHashEncrypt 使用key加密给定passwordHash
@@ -385,33 +423,214 @@ func PasswordHashDecrypt(encryptedPasswordHash string, key []byte) ([]byte, erro
 	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
+// OldPasswordDecrypt 使用key解密老password，仅供兼容使用
+func OldPasswordDecrypt(encryptedPassword string, key []byte) string {
+	defer func() {
+		if pan := recover(); pan != nil {
+			log.Fatalf("密码解密失败: %v", pan)
 		}
-		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))
+	}()
+	encKey := md5.Sum(key)
+	encrypted, err := base64.StdEncoding.DecodeString(encryptedPassword)
+	if err != nil {
+		panic(err)
 	}
-	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
+	tea := binary.NewTeaCipher(encKey[:])
+	if tea == nil {
+		panic("密钥错误")
+	}
+	return string(tea.Decrypt(encrypted))
+}
+
+func checkUpdate() {
+	log.Infof("正在检查更新.")
+	if coolq.Version == "(devel)" {
+		log.Warnf("检查更新失败: 使用的 Actions 测试版或自编译版本.")
+		return
+	}
+	var res string
+	if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases").BindBody(&res).Do(); err != nil {
+		log.Warnf("检查更新失败: %v", err)
+		return
+	}
+	detail := gjson.Parse(res)
+	if len(detail.Array()) < 1 {
+		return
+	}
+	info := detail.Array()[0]
+	if global.VersionNameCompare(coolq.Version, info.Get("tag_name").Str) {
+		log.Infof("当前有更新的 go-cqhttp 可供更新, 请前往 https://github.com/Mrs4s/go-cqhttp/releases 下载.")
+		log.Infof("当前版本: %v 最新版本: %v", coolq.Version, info.Get("tag_name").Str)
+		return
+	}
+	log.Infof("检查更新完成. 当前已运行最新版本.")
+}
+
+func selfUpdate(imageURL string) {
+	console := bufio.NewReader(os.Stdin)
+	readLine := func() (str string) {
+		str, _ = console.ReadString('\n')
+		return
+	}
+	log.Infof("正在检查更新.")
+	var res string
+	if err := gout.GET("https://api.github.com/repos/Mrs4s/go-cqhttp/releases").BindBody(&res).Do(); err != nil {
+		log.Warnf("检查更新失败: %v", err)
+		return
+	}
+	detail := gjson.Parse(res)
+	if len(detail.Array()) < 1 {
+		return
+	}
+	info := detail.Array()[0]
+	version := info.Get("tag_name").Str
+	if coolq.Version != version {
+		log.Info("当前最新版本为 ", version)
+		log.Warn("是否更新(y/N): ")
+		r := strings.TrimSpace(readLine())
+
+		doUpdate := func() {
+			log.Info("正在更新,请稍等...")
+			url := fmt.Sprintf(
+				"%v/Mrs4s/go-cqhttp/releases/download/%v/go-cqhttp-%v-%v-%v",
+				func() string {
+					if imageURL != "" {
+						return imageURL
+					}
+					return "https://github.com"
+				}(),
+				version,
+				version,
+				runtime.GOOS,
+				runtime.GOARCH,
+			)
+			if runtime.GOOS == "windows" {
+				url += ".exe"
+			}
+			resp, err := http.Get(url)
+			if err != nil {
+				log.Error("更新失败: ", err)
+				return
+			}
+			defer func() { _ = resp.Body.Close() }()
+			wc := global.WriteCounter{}
+			err, _ = global.UpdateFromStream(io.TeeReader(resp.Body, &wc))
+			fmt.Println()
+			if err != nil {
+				log.Error("更新失败!")
+				return
+			}
+			log.Info("更新完成！")
+		}
+
+		if r == "y" || r == "Y" {
+			doUpdate()
+		} else {
+			log.Warn("已取消更新！")
+		}
+	} else {
+		log.Info("当前版本已经是最新版本!")
+	}
+	log.Info("按 Enter 继续....")
+	readLine()
+	os.Exit(0)
+}
+
+/*
+func restart(args []string) {
+	var cmd *exec.Cmd
+	if runtime.GOOS == "windows" {
+		file, err := exec.LookPath(args[0])
+		if err != nil {
+			log.Errorf("重启失败:%s", err.Error())
+			return
+		}
+		path, err := filepath.Abs(file)
+		if err != nil {
+			log.Errorf("重启失败:%s", err.Error())
+		}
+		args = append([]string{"/c", "start ", path, "faststart"}, args[1:]...)
+		cmd = &exec.Cmd{
+			Path:   "cmd.exe",
+			Args:   args,
+			Stderr: os.Stderr,
+			Stdout: os.Stdout,
+		}
+	} else {
+		args = append(args, "faststart")
+		cmd = &exec.Cmd{
+			Path:   args[0],
+			Args:   args,
+			Stderr: os.Stderr,
+			Stdout: os.Stdout,
+		}
+	}
+	_ = cmd.Start()
+}
+*/
+
+func getConfig() *global.JSONConfig {
+	var conf *global.JSONConfig
+	switch {
+	case global.PathExists("config.json"):
+		conf = global.LoadConfig("config.json")
+		_ = conf.Save("config.hjson")
+		_ = os.Remove("config.json")
+	case os.Getenv("UIN") != "":
+		log.Infof("将从环境变量加载配置.")
+		uin, _ := strconv.ParseInt(os.Getenv("UIN"), 10, 64)
+		pwd := os.Getenv("PASS")
+		post := os.Getenv("HTTP_POST")
+		conf = &global.JSONConfig{
+			Uin:      uin,
+			Password: pwd,
+			HTTPConfig: &global.GoCQHTTPConfig{
+				Enabled:  true,
+				Host:     "0.0.0.0",
+				Port:     5700,
+				PostUrls: map[string]string{},
+			},
+			WSConfig: &global.GoCQWebSocketConfig{
+				Enabled: true,
+				Host:    "0.0.0.0",
+				Port:    6700,
+			},
+			PostMessageFormat: "string",
+			Debug:             os.Getenv("DEBUG") == "true",
+		}
+		if post != "" {
+			conf.HTTPConfig.PostUrls[post] = os.Getenv("HTTP_SECRET")
+		}
+	default:
+		conf = global.LoadConfig(global.DefaultConfFile)
+	}
+	if conf == nil {
+		err := global.WriteAllText(global.DefaultConfFile, global.DefaultConfigWithComments)
+		if err != nil {
+			log.Fatalf("创建默认配置文件时出现错误: %v", err)
+			return nil
+		}
+		log.Infof("默认配置文件已生成, 请编辑 %s 后重启程序.", global.DefaultConfFile)
+		if !isFastStart {
+			time.Sleep(time.Second * 5)
+		}
+		return nil
+	}
+	return conf
+}
+
+// help cli命令行-h的帮助提示
+func help() {
+	fmt.Printf(`go-cqhttp service
+version: %s
+
+Usage:
+
+server [OPTIONS]
+
+Options:
+`, coolq.Version)
+
+	flag.PrintDefaults()
+	os.Exit(0)
 }

modules/api/api.go

@@ -1,281 +0,0 @@
-// 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 "_get_model_show":
-		p0 := p.Get("model").String()
-		return c.bot.CQGetModelShow(p0)
-	case "_get_vip_info":
-		p0 := p.Get("user_id").Int()
-		return c.bot.CQGetVipInfo(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 "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("bus_id").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_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("bus_id").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_members":
-		p0 := p.Get("guild_id").Uint()
-		return c.bot.CQGetGuildMembers(p0)
-	case "get_guild_meta_by_guest":
-		p0 := p.Get("guild_id").Uint()
-		return c.bot.CQGetGuildMetaByGuest(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_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 "ocr_image", ".ocr_image":
-		p0 := p.Get("image").String()
-		return c.bot.CQOcrImage(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_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_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_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.Int())
-		}
-		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("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 "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)
-	}
-}

modules/api/caller.go

@@ -1,48 +0,0 @@
-// 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

@@ -1,342 +0,0 @@
-// Package config 包含go-cqhttp操作配置文件的相关函数
-package config
-
-import (
-	"bufio"
-	_ "embed" // embed the default config file
-	"fmt"
-	"os"
-	"strconv"
-	"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
-
-// Reconnect 重连配置
-type Reconnect struct {
-	Disabled bool `yaml:"disabled"`
-	Delay    uint `yaml:"delay"`
-	MaxTimes uint `yaml:"max-times"`
-	Interval int  `yaml:"interval"`
-}
-
-// 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"`
-}
-
-// Config 总配置文件
-type Config struct {
-	Account   *Account `yaml:"account"`
-	Heartbeat struct {
-		Disabled bool `yaml:"disabled"`
-		Interval int  `yaml:"interval"`
-	} `yaml:"heartbeat"`
-
-	Message struct {
-		PostFormat          string `yaml:"post-format"`
-		ProxyRewrite        string `yaml:"proxy-rewrite"`
-		IgnoreInvalidCQCode bool   `yaml:"ignore-invalid-cqcode"`
-		ForceFragment       bool   `yaml:"force-fragment"`
-		FixURL              bool   `yaml:"fix-url"`
-		ReportSelfMessage   bool   `yaml:"report-self-message"`
-		RemoveReplyAt       bool   `yaml:"remove-reply-at"`
-		ExtraReplyData      bool   `yaml:"extra-reply-data"`
-		SkipMimeScan        bool   `yaml:"skip-mime-scan"`
-	} `yaml:"message"`
-
-	Output struct {
-		LogLevel    string `yaml:"log-level"`
-		LogAging    int    `yaml:"log-aging"`
-		LogForceNew bool   `yaml:"log-force-new"`
-		Debug       bool   `yaml:"debug"`
-	} `yaml:"output"`
-
-	Servers  []map[string]yaml.Node `yaml:"servers"`
-	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"`
-}
-
-// Parse 从默认配置文件路径中获取
-func Parse(path string) *Config {
-	fromEnv := os.Getenv("GCQ_UIN") != ""
-
-	file, err := os.Open(path)
-	config := &Config{}
-	if err == nil {
-		defer func() { _ = file.Close() }()
-		if err = yaml.NewDecoder(file).Decode(config); err != nil && !fromEnv {
-			log.Fatal("配置文件不合法!", err)
-		}
-	} else if !fromEnv {
-		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
-}
-
-// generateConfig 生成配置文件
-func generateConfig() {
-	fmt.Println("未找到配置文件，正在为您生成配置文件中！")
-	sb := strings.Builder{}
-	sb.WriteString(defaultConfig)
-	fmt.Print(`请选择你需要的通信方式:
-> 1: HTTP通信
-> 2: 正向 Websocket 通信
-> 3: 反向 Websocket 通信
-> 4: pprof 性能分析服务器
-> 5: 云函数服务
-请输入你需要的编号，可输入多个，同一编号也可输入多个(如: 233)
-您的选择是:`)
-	input := bufio.NewReader(os.Stdin)
-	readString, err := input.ReadString('\n')
-	if err != nil {
-		log.Fatal("输入不合法: ", err)
-	}
-	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)
-		}
-	}
-	_ = os.WriteFile("config.yml", []byte(sb.String()), 0o644)
-	fmt.Println("默认配置文件已生成，请修改 config.yml 后重新启动!")
-	_, _ = 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
-`

modules/config/default_config.yml

@@ -1,89 +0,0 @@
-# go-cqhttp 默认配置文件
-
-account: # 账号相关
-  uin: 1233456 # QQ账号
-  password: '' # 密码为空时使用扫码登录
-  encrypt: false  # 是否开启密码加密
-  status: 0      # 在线状态 请参考 https://docs.go-cqhttp.org/guide/config.html#在线状态
-  relogin: # 重连设置
-    delay: 3   # 首次重连延迟, 单位秒
-    interval: 3   # 重连间隔
-    max-times: 0  # 最大重连次数, 0为无限制
-
-  # 是否使用服务器下发的新地址进行重连
-  # 注意, 此设置可能导致在海外服务器上连接情况更差
-  use-sso-address: true
-
-heartbeat:
-  # 心跳频率, 单位秒
-  # -1 为关闭心跳
-  interval: 5
-
-message:
-  # 上报数据类型
-  # 可选: string,array
-  post-format: string
-  # 是否忽略无效的CQ码, 如果为假将原样发送
-  ignore-invalid-cqcode: false
-  # 是否强制分片发送消息
-  # 分片发送将会带来更快的速度
-  # 但是兼容性会有些问题
-  force-fragment: false
-  # 是否将url分片发送
-  fix-url: false
-  # 下载图片等请求网络代理
-  proxy-rewrite: ''
-  # 是否上报自身消息
-  report-self-message: false
-  # 移除服务端的Reply附带的At
-  remove-reply-at: false
-  # 为Reply附加更多信息
-  extra-reply-data: false
-  # 跳过 Mime 扫描, 忽略错误数据
-  skip-mime-scan: false
-
-output:
-  # 日志等级 trace,debug,info,warn,error
-  log-level: warn
-  # 日志时效 单位天. 超过这个时间之前的日志将会被自动删除. 设置为 0 表示永久保留.
-  log-aging: 15
-  # 是否在每次启动时强制创建全新的文件储存日志. 为 false 的情况下将会在上次启动时创建的日志文件续写
-  log-force-new: true
-  # 是否启用 DEBUG
-  debug: false # 开启调试模式
-
-# 默认中间件锚点
-default-middlewares: &default
-  # 访问密钥, 强烈推荐在公网的服务器设置
-  access-token: ''
-  # 事件过滤器文件目录
-  filter: ''
-  # API限速设置
-  # 该设置为全局生效
-  # 原 cqhttp 虽然启用了 rate_limit 后缀, 但是基本没插件适配
-  # 目前该限速设置为令牌桶算法, 请参考:
-  # https://baike.baidu.com/item/%E4%BB%A4%E7%89%8C%E6%A1%B6%E7%AE%97%E6%B3%95/6597000?fr=aladdin
-  rate-limit:
-    enabled: false # 是否启用限速
-    frequency: 1  # 令牌回复频率, 单位秒
-    bucket: 1     # 令牌桶大小
-
-database: # 数据库相关设置
-  leveldb:
-    # 是否启用内置leveldb数据库
-    # 启用将会增加10-20MB的内存占用和一定的磁盘空间
-    # 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能
-    enable: true
-
-  # 媒体文件缓存， 删除此项则使用缓存文件(旧版行为)
-  cache:
-    image: data/image.db
-    video: data/video.db
-
-# 连接服务列表
-servers:
-  # 添加方式，同一连接方式可添加多个，具体配置说明请查看文档
-  #- http: # http 通信
-  #- ws:   # 正向 Websocket
-  #- ws-reverse: # 反向 Websocket
-  #- pprof: #性能分析服务器

modules/filter/filter.go

@@ -1,245 +0,0 @@
-// Package filter implements an event filter for go-cqhttp
-package filter
-
-import (
-	"regexp"
-	"strings"
-
-	"github.com/tidwall/gjson"
-)
-
-// Filter 定义了一个消息上报过滤接口
-type Filter interface {
-	Eval(payload gjson.Result) bool
-}
-
-type operationNode struct {
-	key    string
-	filter Filter
-}
-
-// notOperator 定义了过滤器中Not操作符
-type notOperator struct {
-	operand Filter
-}
-
-func newNotOp(argument gjson.Result) Filter {
-	if !argument.IsObject() {
-		panic("the argument of 'not' operator must be an object")
-	}
-	return &notOperator{operand: Generate("and", argument)}
-}
-
-// Eval 对payload执行Not过滤
-func (op *notOperator) Eval(payload gjson.Result) bool {
-	return !op.operand.Eval(payload)
-}
-
-// andOperator 定义了过滤器中And操作符
-type andOperator struct {
-	operands []operationNode
-}
-
-func newAndOp(argument gjson.Result) Filter {
-	if !argument.IsObject() {
-		panic("the argument of 'and' operator must be an object")
-	}
-	op := new(andOperator)
-	argument.ForEach(func(key, value gjson.Result) bool {
-		switch {
-		case key.Str[0] == '.':
-			// is an operator
-			//   ".foo": {
-			//       "bar": "baz"
-			//   }
-			opKey := key.Str[1:]
-			op.operands = append(op.operands, operationNode{"", Generate(opKey, value)})
-		case value.IsObject():
-			// 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 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)})
-		}
-		return true
-	})
-	return op
-}
-
-// Eval 对payload执行And过滤
-func (op *andOperator) Eval(payload gjson.Result) bool {
-	res := true
-	for _, operand := range op.operands {
-		if len(operand.key) == 0 {
-			// is an operator
-			res = res && operand.filter.Eval(payload)
-		} else {
-			// is a normal key
-			val := payload.Get(operand.key)
-			res = res && operand.filter.Eval(val)
-		}
-
-		if !res {
-			break
-		}
-	}
-	return res
-}
-
-// orOperator 定义了过滤器中Or操作符
-type orOperator struct {
-	operands []Filter
-}
-
-func newOrOp(argument gjson.Result) Filter {
-	if !argument.IsArray() {
-		panic("the argument of 'or' operator must be an array")
-	}
-	op := new(orOperator)
-	argument.ForEach(func(_, value gjson.Result) bool {
-		op.operands = append(op.operands, Generate("and", value))
-		return true
-	})
-	return op
-}
-
-// Eval 对payload执行Or过滤
-func (op *orOperator) Eval(payload gjson.Result) bool {
-	res := false
-	for _, operand := range op.operands {
-		res = res || operand.Eval(payload)
-		if res {
-			break
-		}
-	}
-	return res
-}
-
-// eqOperator 定义了过滤器中Equal操作符
-type eqOperator struct {
-	operand string
-}
-
-func newEqOp(argument gjson.Result) Filter {
-	return &eqOperator{operand: argument.String()}
-}
-
-// Eval 对payload执行Equal过滤
-func (op *eqOperator) Eval(payload gjson.Result) bool {
-	return payload.String() == op.operand
-}
-
-// neqOperator 定义了过滤器中NotEqual操作符
-type neqOperator struct {
-	operand string
-}
-
-func newNeqOp(argument gjson.Result) Filter {
-	return &neqOperator{operand: argument.String()}
-}
-
-// Eval 对payload执行NotEqual过滤
-func (op *neqOperator) Eval(payload gjson.Result) bool {
-	return !(payload.String() == op.operand)
-}
-
-// inOperator 定义了过滤器中In操作符
-type inOperator struct {
-	operandString string
-	operandArray  []string
-}
-
-func newInOp(argument gjson.Result) Filter {
-	if argument.IsObject() {
-		panic("the argument of 'in' operator must be an array or a string")
-	}
-	op := new(inOperator)
-	if argument.IsArray() {
-		op.operandArray = []string{}
-		argument.ForEach(func(_, value gjson.Result) bool {
-			op.operandArray = append(op.operandArray, value.String())
-			return true
-		})
-	} else {
-		op.operandString = argument.String()
-	}
-	return op
-}
-
-// Eval 对payload执行In过滤
-func (op *inOperator) Eval(payload gjson.Result) bool {
-	payloadStr := payload.String()
-	if op.operandArray != nil {
-		for _, value := range op.operandArray {
-			if value == payloadStr {
-				return true
-			}
-		}
-		return false
-	}
-	return strings.Contains(op.operandString, payloadStr)
-}
-
-// containsOperator 定义了过滤器中Contains操作符
-type containsOperator struct {
-	operand string
-}
-
-func newContainOp(argument gjson.Result) Filter {
-	if argument.IsArray() || argument.IsObject() {
-		panic("the argument of 'contains' operator must be a string")
-	}
-	return &containsOperator{operand: argument.String()}
-}
-
-// Eval 对payload执行Contains过滤
-func (op *containsOperator) Eval(payload gjson.Result) bool {
-	return strings.Contains(payload.String(), op.operand)
-}
-
-// regexOperator 定义了过滤器中Regex操作符
-type regexOperator struct {
-	regex *regexp.Regexp
-}
-
-func newRegexOp(argument gjson.Result) Filter {
-	if argument.IsArray() || argument.IsObject() {
-		panic("the argument of 'regex' operator must be a string")
-	}
-	return &regexOperator{regex: regexp.MustCompile(argument.String())}
-}
-
-// Eval 对payload执行RegexO过滤
-func (op *regexOperator) Eval(payload gjson.Result) bool {
-	return op.regex.MatchString(payload.String())
-}
-
-// Generate 根据给定操作符名opName及操作符参数argument创建一个过滤器实例
-func Generate(opName string, argument gjson.Result) Filter {
-	switch opName {
-	case "not":
-		return newNotOp(argument)
-	case "and":
-		return newAndOp(argument)
-	case "or":
-		return newOrOp(argument)
-	case "eq":
-		return newEqOp(argument)
-	case "neq":
-		return newNeqOp(argument)
-	case "in":
-		return newInOp(argument)
-	case "contains":
-		return newContainOp(argument)
-	case "regex":
-		return newRegexOp(argument)
-	default:
-		panic("the operator " + opName + " is not supported")
-	}
-}

modules/filter/middlewares.go

@@ -1,45 +0,0 @@
-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

@@ -1,51 +0,0 @@
-// 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"
-)
-
-// 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}
-	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

@@ -1,31 +0,0 @@
-// Package servers provide servers register
-package servers
-
-import (
-	"gopkg.in/yaml.v3"
-
-	"github.com/Mrs4s/go-cqhttp/coolq"
-	"github.com/Mrs4s/go-cqhttp/internal/base"
-)
-
-var svr = make(map[string]func(*coolq.CQBot, yaml.Node))
-
-// Register 注册 Server
-func Register(name string, proc func(*coolq.CQBot, yaml.Node)) {
-	_, ok := svr[name]
-	if ok {
-		panic(name + " server has existed")
-	}
-	svr[name] = proc
-}
-
-// Run 运行所有svr
-func Run(bot *coolq.CQBot) {
-	for _, l := range base.Servers {
-		for name, conf := range l {
-			if fn, ok := svr[name]; ok {
-				go fn(bot, conf)
-			}
-		}
-	}
-}

modules/silk/codec.go

@@ -1,69 +0,0 @@
-//go:build (linux || (windows && !arm && !arm64) || darwin) && (386 || amd64 || arm || arm64) && !race && !nosilk
-// +build linux windows,!arm,!arm64 darwin
-// +build 386 amd64 arm arm64
-// +build !race
-// +build !nosilk
-
-package silk
-
-import (
-	"os"
-	"os/exec"
-	"path"
-
-	"github.com/pkg/errors"
-	"github.com/wdvxdr1123/go-silk"
-
-	"github.com/Mrs4s/go-cqhttp/internal/base"
-)
-
-const silkCachePath = "data/cache"
-
-// encode 将音频编码为Silk
-func encode(record []byte, tempName string) (silkWav []byte, err error) {
-	// 1. 写入缓存文件
-	rawPath := path.Join(silkCachePath, tempName+".wav")
-	err = os.WriteFile(rawPath, record, os.ModePerm)
-	if err != nil {
-		return nil, errors.Wrap(err, "write temp file error")
-	}
-	defer os.Remove(rawPath)
-
-	// 2.转换pcm
-	pcmPath := path.Join(silkCachePath, tempName+".pcm")
-	cmd := exec.Command("ffmpeg", "-i", rawPath, "-f", "s16le", "-ar", "24000", "-ac", "1", pcmPath)
-	if base.Debug {
-		cmd.Stdout = os.Stdout
-		cmd.Stderr = os.Stderr
-	}
-	if err = cmd.Run(); err != nil {
-		return nil, errors.Wrap(err, "convert pcm file error")
-	}
-	defer os.Remove(pcmPath)
-
-	// 3. 转silk
-	pcm, err := os.ReadFile(pcmPath)
-	if err != nil {
-		return nil, errors.Wrap(err, "read pcm file err")
-	}
-	silkWav, err = silk.EncodePcmBuffToSilk(pcm, 24000, 24000, true)
-	if err != nil {
-		return nil, errors.Wrap(err, "silk encode error")
-	}
-	silkPath := path.Join(silkCachePath, tempName+".silk")
-	err = os.WriteFile(silkPath, silkWav, 0o666)
-	return
-}
-
-// resample 将silk重新编码为 24000 bit rate
-func resample(data []byte) []byte {
-	pcm, err := silk.DecodeSilkBuffToPcm(data, 24000)
-	if err != nil {
-		panic(err)
-	}
-	data, err = silk.EncodePcmBuffToSilk(pcm, 24000, 24000, true)
-	if err != nil {
-		panic(err)
-	}
-	return data
-}

modules/silk/codec_unsupported.go

@@ -1,16 +0,0 @@
-//go:build (!arm && !arm64 && !amd64 && !386) || (!windows && !linux && !darwin) || (windows && arm) || (windows && arm64) || race || nosilk
-// +build !arm,!arm64,!amd64,!386 !windows,!linux,!darwin windows,arm windows,arm64 race nosilk
-
-package silk
-
-import "errors"
-
-// encode 将音频编码为Silk
-func encode(record []byte, tempName string) ([]byte, error) {
-	return nil, errors.New("not supported now")
-}
-
-// resample 将silk重新编码为 24000 bit rate
-func resample(data []byte) []byte {
-	return data
-}

modules/silk/stubs.go

@@ -1,11 +0,0 @@
-// Package silk Silk编码核心模块
-package silk
-
-import (
-	"github.com/Mrs4s/go-cqhttp/internal/base"
-)
-
-func init() {
-	base.EncodeSilk = encode
-	base.ResampleSilk = resample
-}

scripts/bootstrap

@@ -1,6 +0,0 @@
-#!/bin/sh
-echo "Start GOCQHTTP~~~"
-
-cp -f config.yml /tmp/config.yml
-cp -f device.json /tmp/device.json
-./go-cqhttp -w="/tmp/" faststart

scripts/upload_dist.sh

@@ -5,15 +5,15 @@ if [ "$GITHUB_ACTIONS" != "true" ]; then
     exit 1
 fi
 
-cp -f dist/*.tar.gz upstream/dist/downloads
-cp -f dist/*.zip upstream/dist/downloads
-cd upstream/dist || exit
+cp -f dist/*.tar.gz upstream/dist/
+cp -f dist/*.zip upstream/dist/
+cd upstream/dist
 LATEST_VERSION="${GITHUB_REF#"refs/tags/"}"
 git config --local user.name 'Github Actions'
 git config --local user.email 'github-actions@users.noreply.github.com'
 git add --all
 git commit -m "update to $LATEST_VERSION"
-git tag -d "$LATEST_VERSION"
-git tag "$LATEST_VERSION"
+git tag -d "${GITHUB_REF#"refs/tags/"}"
+git tag "${GITHUB_REF#"refs/tags/"}"
 git push
 git push --tags

server/api.go

@@ -0,0 +1,382 @@
+package server
+
+import (
+	"strings"
+
+	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/global"
+
+	"github.com/tidwall/gjson"
+)
+
+type resultGetter interface {
+	Get(string) gjson.Result
+}
+
+type apiCaller struct {
+	bot *coolq.CQBot
+}
+
+func getLoginInfo(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQGetLoginInfo()
+}
+
+func getFriendList(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQGetFriendList()
+}
+
+func getGroupList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupList(p.Get("no_cache").Bool())
+}
+
+func getGroupInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupInfo(p.Get("group_id").Int(), p.Get("no_cache").Bool())
+}
+
+func getGroupMemberList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupMemberList(p.Get("group_id").Int(), p.Get("no_cache").Bool())
+}
+
+func getGroupMemberInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupMemberInfo(
+		p.Get("group_id").Int(), p.Get("user_id").Int(),
+	)
+}
+func sendMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	autoEscape := global.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 coolq.MSG{}
+}
+
+func sendGroupMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSendGroupMessage(p.Get("group_id").Int(), p.Get("message"),
+		global.EnsureBool(p.Get("auto_escape"), false))
+}
+
+func sendGroupForwardMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSendGroupForwardMessage(p.Get("group_id").Int(), p.Get("messages"))
+}
+
+func sendPrivateMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSendPrivateMessage(p.Get("user_id").Int(), p.Get("group_id").Int(), p.Get("message"),
+		global.EnsureBool(p.Get("auto_escape"), false))
+}
+
+func deleteMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQDeleteMessage(int32(p.Get("message_id").Int()))
+}
+
+func setFriendAddRequest(bot *coolq.CQBot, p resultGetter) coolq.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) coolq.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) coolq.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) coolq.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) coolq.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) coolq.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) coolq.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) coolq.MSG {
+	return bot.CQSetGroupName(p.Get("group_id").Int(), p.Get("group_name").Str)
+}
+
+func setGroupAdmin(bot *coolq.CQBot, p resultGetter) coolq.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) coolq.MSG {
+	return bot.CQSetGroupMemo(p.Get("group_id").Int(), p.Get("content").Str)
+}
+
+func setGroupLeave(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupLeave(p.Get("group_id").Int())
+}
+
+func getImage(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetImage(p.Get("file").Str)
+}
+
+func getForwardMSG(bot *coolq.CQBot, p resultGetter) coolq.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) coolq.MSG {
+	return bot.CQGetMessage(int32(p.Get("message_id").Int()))
+}
+
+func downloadFile(bot *coolq.CQBot, p resultGetter) coolq.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) coolq.MSG {
+	return bot.CQGetGroupHonorInfo(p.Get("group_id").Int(), p.Get("type").Str)
+}
+
+func setRestart(_ *coolq.CQBot, _ resultGetter) coolq.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 coolq.MSG{"data": nil, "retcode": 99, "msg": "restart un-supported now", "wording": "restart函数暂不兼容", "status": "failed"}
+}
+
+func canSendImage(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQCanSendImage()
+}
+
+func canSendRecord(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQCanSendRecord()
+}
+
+func getStrangerInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetStrangerInfo(p.Get("user_id").Int())
+}
+
+func getStatus(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQGetStatus()
+}
+
+func getVersionInfo(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQGetVersionInfo()
+}
+
+func getGroupSystemMSG(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQGetGroupSystemMessages()
+}
+
+func getGroupFileSystemInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupFileSystemInfo(p.Get("group_id").Int())
+}
+
+func getGroupRootFiles(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupRootFiles(p.Get("group_id").Int())
+}
+
+func getGroupFilesByFolder(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupFilesByFolderID(p.Get("group_id").Int(), p.Get("folder_id").Str)
+}
+
+func getGroupFileURL(bot *coolq.CQBot, p resultGetter) coolq.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) coolq.MSG {
+	return bot.CQUploadGroupFile(p.Get("group_id").Int(), p.Get("file").Str, p.Get("name").Str, p.Get("folder").Str)
+}
+
+func getGroupMsgHistory(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetGroupMessageHistory(p.Get("group_id").Int(), p.Get("message_seq").Int())
+}
+
+func getVipInfo(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetVipInfo(p.Get("user_id").Int())
+}
+
+func reloadEventFilter(bot *coolq.CQBot, _ resultGetter) coolq.MSG {
+	return bot.CQReloadEventFilter()
+}
+
+func getGroupAtAllRemain(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetAtAllRemain(p.Get("group_id").Int())
+}
+
+func ocrImage(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQOcrImage(p.Get("image").Str)
+}
+
+func getOnlineClients(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetOnlineClients(p.Get("no_cache").Bool())
+}
+
+func getWordSlices(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetWordSlices(p.Get("content").Str)
+}
+
+func setGroupPortrait(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetGroupPortrait(p.Get("group_id").Int(), p.Get("file").String(), p.Get("cache").String())
+}
+
+func setEssenceMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQSetEssenceMessage(int32(p.Get("message_id").Int()))
+}
+
+func deleteEssenceMSG(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQDeleteEssenceMessage(int32(p.Get("message_id").Int()))
+}
+
+func getEssenceMsgList(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQGetEssenceMessageList(p.Get("group_id").Int())
+}
+
+func checkURLSafely(bot *coolq.CQBot, p resultGetter) coolq.MSG {
+	return bot.CQCheckURLSafely(p.Get("url").String())
+}
+
+func setGroupAnonymousBan(bot *coolq.CQBot, p resultGetter) coolq.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) coolq.MSG {
+	return bot.CQHandleQuickOperation(p.Get("context"), p.Get("operation"))
+}
+
+var API = map[string]func(*coolq.CQBot, resultGetter) coolq.MSG{
+	"get_login_info":             getLoginInfo,
+	"get_friend_list":            getFriendList,
+	"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,
+	"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,
+}
+
+func (api *apiCaller) callAPI(action string, p resultGetter) coolq.MSG {
+	if f, ok := API[action]; ok {
+		return f(api.bot, p)
+	}
+	return coolq.Failed(404, "API_NOT_FOUND", "API不存在")
+}

server/daemon.go

@@ -30,6 +30,7 @@ func Daemon() {
 
 	proc := exec.Command(os.Args[0], execArgs...)
 	err := proc.Start()
+
 	if err != nil {
 		panic(err)
 	}

server/doc.go

@@ -1,12 +1,2 @@
-// Package server 包含HTTP,WebSocket,反向WebSocket请求处理的相关函数与结构体
+// Package server 包含Admin子站,HTTP,WebSocket,反向WebSocket请求处理的相关函数与结构体
 package server
-
-import "github.com/Mrs4s/go-cqhttp/modules/servers"
-
-// 注册
-func init() {
-	servers.Register("http", runHTTP)
-	servers.Register("ws", runWSServer)
-	servers.Register("ws-reverse", runWSClient)
-	servers.Register("lambda", runLambda)
-}

server/http.go

@@ -1,38 +1,32 @@
 package server
 
 import (
+	"bytes"
 	"context"
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"io"
-	"math/rand"
 	"net/http"
-	"net/url"
 	"os"
-	"strconv"
 	"strings"
 	"time"
 
-	"github.com/Mrs4s/MiraiGo/utils"
-	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/internal/base"
-	"github.com/Mrs4s/go-cqhttp/modules/api"
-	"github.com/Mrs4s/go-cqhttp/modules/config"
-	"github.com/Mrs4s/go-cqhttp/modules/filter"
+
+	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/gin-gonic/gin"
+	"github.com/guonaihong/gout"
+	"github.com/guonaihong/gout/dataflow"
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
 )
 
 type httpServer struct {
-	HTTP        *http.Server
-	api         *api.Caller
-	accessToken string
+	engine *gin.Engine
+	bot    *coolq.CQBot
+	HTTP   *http.Server
+	api    apiCaller
 }
 
 // HTTPClient 反向HTTP上报客户端
@@ -40,157 +34,70 @@ type HTTPClient struct {
 	bot     *coolq.CQBot
 	secret  string
 	addr    string
-	filter  string
-	apiPort int
 	timeout int32
 }
 
-type httpCtx struct {
-	json     gjson.Result
-	query    url.Values
-	postForm url.Values
+type httpContext struct {
+	ctx *gin.Context
 }
 
-func (h *httpCtx) Get(s string) gjson.Result {
-	j := h.json.Get(s)
-	if j.Exists() {
-		return j
-	}
-	validJSONParam := func(p string) bool {
-		return (strings.HasPrefix(p, "{") || strings.HasPrefix(p, "[")) && gjson.Valid(p)
-	}
-	if h.postForm != nil {
-		if form := h.postForm.Get(s); form != "" {
-			if validJSONParam(form) {
-				return gjson.Result{Type: gjson.JSON, Raw: form}
-			}
-			return gjson.Result{Type: gjson.String, Str: form}
-		}
-	}
-	if h.query != nil {
-		if query := h.query.Get(s); query != "" {
-			if validJSONParam(query) {
-				return gjson.Result{Type: gjson.JSON, Raw: query}
-			}
-			return gjson.Result{Type: gjson.String, Str: query}
-		}
-	}
-	return gjson.Result{}
-}
+// CQHTTPApiServer CQHTTPApiServer实例
+var CQHTTPApiServer = &httpServer{}
 
-func (s *httpServer) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
-	var ctx httpCtx
-	contentType := request.Header.Get("Content-Type")
-	switch request.Method {
-	case http.MethodPost:
-		if strings.Contains(contentType, "application/json") {
-			body, err := io.ReadAll(request.Body)
+// Debug 是否启用Debug模式
+var Debug = false
+
+func (s *httpServer) Run(addr, authToken string, bot *coolq.CQBot) {
+	gin.SetMode(gin.ReleaseMode)
+	s.engine = gin.New()
+	s.bot = bot
+	s.api = apiCaller{s.bot}
+	s.engine.Use(func(c *gin.Context) {
+		if c.Request.Method != "GET" && c.Request.Method != "POST" {
+			log.Warnf("已拒绝客户端 %v 的请求: 方法错误", c.Request.RemoteAddr)
+			c.Status(404)
+			return
+		}
+		if c.Request.Method == "POST" && strings.Contains(c.Request.Header.Get("Content-Type"), "application/json") {
+			d, err := c.GetRawData()
 			if err != nil {
-				log.Warnf("获取请求 %v 的Body时出现错误: %v", request.RequestURI, err)
-				writer.WriteHeader(http.StatusBadRequest)
+				log.Warnf("获取请求 %v 的Body时出现错误: %v", c.Request.RequestURI, err)
+				c.Status(400)
 				return
 			}
-			if !gjson.ValidBytes(body) {
-				log.Warnf("已拒绝客户端 %v 的请求: 非法Json", request.RemoteAddr)
-				writer.WriteHeader(http.StatusBadRequest)
+			if !gjson.ValidBytes(d) {
+				log.Warnf("已拒绝客户端 %v 的请求: 非法Json", c.Request.RemoteAddr)
+				c.Status(400)
 				return
 			}
-			ctx.json = gjson.Parse(utils.B2S(body))
+			c.Set("json_body", gjson.ParseBytes(d))
 		}
-		if strings.Contains(contentType, "application/x-www-form-urlencoded") {
-			err := request.ParseForm()
-			if err != nil {
-				log.Warnf("已拒绝客户端 %v 的请求: %v", request.RemoteAddr, err)
-				writer.WriteHeader(http.StatusBadRequest)
+		c.Next()
+	})
+
+	if authToken != "" {
+		s.engine.Use(func(c *gin.Context) {
+			auth := c.Request.Header.Get("Authorization")
+			switch {
+			case auth != "" && strings.SplitN(auth, " ", 2)[1] != authToken:
+				c.AbortWithStatus(401)
+				return
+			case c.Query("access_token") != authToken:
+				c.AbortWithStatus(401)
+				return
+			default:
+				c.Next()
 			}
-			ctx.postForm = request.PostForm
-		}
-		fallthrough
-	case http.MethodGet:
-		ctx.query = request.URL.Query()
-
-	default:
-		log.Warnf("已拒绝客户端 %v 的请求: 方法错误", request.RemoteAddr)
-		writer.WriteHeader(http.StatusNotFound)
-		return
-	}
-	if status := checkAuth(request, s.accessToken); status != http.StatusOK {
-		writer.WriteHeader(status)
-		return
+		})
 	}
 
-	var response global.MSG
-	if base.AcceptOneBot12HTTPEndPoint && request.URL.Path == "/" {
-		action := strings.TrimSuffix(ctx.Get("action").Str, "_async")
-		log.Debugf("HTTPServer接收到API调用: %v", action)
-		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.Call(action, &ctx)
-	}
-
-	writer.Header().Set("Content-Type", "application/json; charset=utf-8")
-	writer.WriteHeader(http.StatusOK)
-	_ = json.NewEncoder(writer).Encode(response)
-}
-
-func checkAuth(req *http.Request, token string) int {
-	if token == "" { // quick path
-		return http.StatusOK
-	}
-
-	auth := req.Header.Get("Authorization")
-	if auth == "" {
-		auth = req.URL.Query().Get("access_token")
-	} else {
-		authN := strings.SplitN(auth, " ", 2)
-		if len(authN) == 2 {
-			auth = authN[1]
-		}
-	}
-
-	switch auth {
-	case token:
-		return http.StatusOK
-	case "":
-		return http.StatusUnauthorized
-	default:
-		return http.StatusForbidden
-	}
-}
-
-// runHTTP 启动HTTP服务器与HTTP上报客户端
-func runHTTP(bot *coolq.CQBot, node yaml.Node) {
-	var conf config.HTTPServer
-	switch err := node.Decode(&conf); {
-	case err != nil:
-		log.Warn("读取http配置失败 :", err)
-		fallthrough
-	case conf.Disabled:
-		return
-	}
-
-	var addr string
-	s := &httpServer{accessToken: conf.AccessToken}
-	if conf.Host == "" || conf.Port == 0 {
-		goto client
-	}
-	addr = fmt.Sprintf("%s:%d", conf.Host, conf.Port)
-	s.api = api.NewCaller(bot)
-	if conf.RateLimit.Enabled {
-		s.api.Use(rateLimit(conf.RateLimit.Frequency, conf.RateLimit.Bucket))
-	}
-	if conf.LongPolling.Enabled {
-		s.api.Use(longPolling(bot, conf.LongPolling.MaxQueueSize))
-	}
+	s.engine.Any("/:action", s.HandleActions)
 
 	go func() {
 		log.Infof("CQ HTTP 服务器已启动: %v", addr)
 		s.HTTP = &http.Server{
 			Addr:    addr,
-			Handler: s,
+			Handler: s.engine,
 		}
 		if err := s.HTTP.ListenAndServe(); err != nil && err != http.ErrServerClosed {
 			log.Error(err)
@@ -200,86 +107,89 @@ func runHTTP(bot *coolq.CQBot, node yaml.Node) {
 			os.Exit(1)
 		}
 	}()
-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,
-			}.Run()
-		}
-	}
+}
+
+// NewHTTPClient 返回反向HTTP客户端
+func NewHTTPClient() *HTTPClient {
+	return &HTTPClient{}
 }
 
 // Run 运行反向HTTP服务
-func (c HTTPClient) Run() {
-	filter.Add(c.filter)
+func (c *HTTPClient) Run(addr, secret string, timeout int32, bot *coolq.CQBot) {
+	c.bot = bot
+	c.secret = secret
+	c.addr = addr
+	c.timeout = timeout
 	if c.timeout < 5 {
 		c.timeout = 5
 	}
-	c.bot.OnEventPush(c.onBotPushEvent)
-	log.Infof("HTTP POST上报器已启动: %v", c.addr)
+	bot.OnEventPush(c.onBotPushEvent)
+	log.Infof("HTTP POST上报器已启动: %v", addr)
 }
 
-func (c *HTTPClient) onBotPushEvent(e *coolq.Event) {
-	if c.filter != "" {
-		filter := filter.Find(c.filter)
-		if filter != nil && !filter.Eval(gjson.Parse(e.JSONString())) {
-			log.Debugf("上报Event %v 到 HTTP 服务器 %s 时被过滤.", c.addr, e.JSONBytes())
-			return
+func (c *HTTPClient) onBotPushEvent(m *bytes.Buffer) {
+	var res string
+	err := gout.POST(c.addr).SetJSON(m.Bytes()).BindBody(&res).SetHeader(func() gout.H {
+		h := gout.H{
+			"X-Self-ID":  c.bot.Client.Uin,
+			"User-Agent": "CQHttp/4.15.0",
 		}
-	}
-
-	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")
-	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)))
-	}
-	if c.apiPort != 0 {
-		req.Header.Set("X-API-Port", strconv.FormatInt(int64(c.apiPort), 10))
-	}
-
-	var res *http.Response
-	var err error
-	const maxAttemptTimes = 5
-
-	for i := 0; i <= maxAttemptTimes; i++ {
-		res, err = client.Do(req)
-		if err == nil {
-			//goland:noinspection GoDeferInLoop
-			defer res.Body.Close()
-			break
+		if c.secret != "" {
+			mac := hmac.New(sha1.New, []byte(c.secret))
+			_, err := mac.Write(m.Bytes())
+			if err != nil {
+				log.Error(err)
+				return nil
+			}
+			h["X-Signature"] = "sha1=" + hex.EncodeToString(mac.Sum(nil))
 		}
-		if i != maxAttemptTimes {
-			log.Warnf("上报 Event 数据到 %v 失败: %v 将进行第 %d 次重试", c.addr, err, i+1)
-		}
-		const maxWait = int64(time.Second * 3)
-		const minWait = int64(time.Millisecond * 500)
-		wait := rand.Int63n(maxWait-minWait) + minWait
-		time.Sleep(time.Duration(wait))
-	}
-
+		return h
+	}()).SetTimeout(time.Second * time.Duration(c.timeout)).F().Retry().Attempt(5).
+		WaitTime(time.Millisecond * 500).MaxWaitTime(time.Second * 5).
+		Func(func(con *dataflow.Context) error {
+			if con.Error != nil {
+				log.Warnf("上报Event到 HTTP 服务器 %v 时出现错误: %v 将重试.", c.addr, con.Error)
+				return con.Error
+			}
+			return nil
+		}).Do()
 	if err != nil {
-		log.Warnf("上报Event数据 %s 到 %v 失败: %v", e.JSONBytes(), c.addr, err)
+		log.Warnf("上报Event数据 %v 到 %v 失败: %v", utils.B2S(m.Bytes()), c.addr, err)
 		return
 	}
-	log.Debugf("上报Event数据 %s 到 %v", e.JSONBytes(), c.addr)
+	log.Debugf("上报Event数据 %v 到 %v", utils.B2S(m.Bytes()), c.addr)
+	if gjson.Valid(res) {
+		c.bot.CQHandleQuickOperation(gjson.Parse(utils.B2S(m.Bytes())), gjson.Parse(res))
+	}
+}
 
-	r, err := io.ReadAll(res.Body)
-	if err != nil {
-		return
+func (s *httpServer) HandleActions(c *gin.Context) {
+	global.RateLimit(context.Background())
+	action := strings.ReplaceAll(c.Param("action"), "_async", "")
+	log.Debugf("HTTPServer接收到API调用: %v", action)
+	c.JSON(200, s.api.callAPI(action, httpContext{ctx: c}))
+}
+
+func (h httpContext) Get(k string) gjson.Result {
+	c := h.ctx
+	if q := c.Query(k); q != "" {
+		return gjson.Result{Type: gjson.String, Str: q}
 	}
-	if gjson.ValidBytes(r) {
-		c.bot.CQHandleQuickOperation(gjson.Parse(e.JSONString()), gjson.ParseBytes(r))
+	if c.Request.Method == "POST" {
+		if h := c.Request.Header.Get("Content-Type"); h != "" {
+			if strings.Contains(h, "application/x-www-form-urlencoded") {
+				if p, ok := c.GetPostForm(k); ok {
+					return gjson.Result{Type: gjson.String, Str: p}
+				}
+			}
+			if strings.Contains(h, "application/json") {
+				if obj, ok := c.Get("json_body"); ok {
+					return obj.(gjson.Result).Get(k)
+				}
+			}
+		}
 	}
+	return gjson.Result{Type: gjson.Null, Str: ""}
 }
 
 func (s *httpServer) ShutDown() {

server/middlewares.go

@@ -1,76 +0,0 @@
-package server
-
-import (
-	"container/list"
-	"context"
-	"sync"
-	"time"
-
-	"github.com/Mrs4s/go-cqhttp/coolq"
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/modules/api"
-
-	"golang.org/x/time/rate"
-)
-
-func rateLimit(frequency float64, bucketSize int) api.Handler {
-	limiter := rate.NewLimiter(rate.Limit(frequency), bucketSize)
-	return func(_ string, _ api.Getter) global.MSG {
-		_ = limiter.Wait(context.Background())
-		return nil
-	}
-}
-
-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)
-		for maxSize != 0 && queue.Len() > maxSize {
-			queue.Remove(queue.Front())
-		}
-		cond.Signal()
-	})
-	return func(action string, p api.Getter) global.MSG {
-		if action != "get_updates" {
-			return nil
-		}
-		var (
-			once    sync.Once
-			ch      = make(chan []interface{}, 1)
-			timeout = time.Duration(p.Get("timeout").Int()) * time.Second
-		)
-		defer close(ch)
-		go func() {
-			mutex.Lock()
-			defer mutex.Unlock()
-			if queue.Len() == 0 {
-				cond.Wait()
-			}
-			once.Do(func() {
-				limit := int(p.Get("limit").Int())
-				if limit <= 0 || queue.Len() < limit {
-					limit = queue.Len()
-				}
-				ret := make([]interface{}, limit)
-				for i := 0; i < limit; i++ {
-					ret[i] = queue.Remove(queue.Front())
-				}
-				ch <- ret
-			})
-		}()
-		if timeout != 0 {
-			select {
-			case <-time.After(timeout):
-				once.Do(func() {})
-				return coolq.OK([]interface{}{})
-			case ret := <-ch:
-				return coolq.OK(ret)
-			}
-		}
-		return coolq.OK(<-ch)
-	}
-}

server/scf.go

@@ -1,193 +0,0 @@
-package server
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"os"
-	"runtime/debug"
-	"strings"
-
-	"github.com/Mrs4s/MiraiGo/utils"
-	log "github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v3"
-
-	"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"
-)
-
-type lambdaClient struct {
-	nextURL     string
-	responseURL string
-	lambdaType  string
-
-	client http.Client
-}
-
-type lambdaResponse struct {
-	IsBase64Encoded bool              `json:"isBase64Encoded"`
-	StatusCode      int               `json:"statusCode"`
-	Headers         map[string]string `json:"headers"`
-	Body            string            `json:"body"`
-}
-
-type lambdaResponseWriter struct {
-	statusCode int
-	buf        bytes.Buffer
-	header     http.Header
-}
-
-func (l *lambdaResponseWriter) Write(p []byte) (n int, err error) {
-	return l.buf.Write(p)
-}
-
-func (l *lambdaResponseWriter) Header() http.Header {
-	return l.header
-}
-
-func (l *lambdaResponseWriter) flush() error {
-	buffer := global.NewBuffer()
-	defer global.PutBuffer(buffer)
-	body := utils.B2S(l.buf.Bytes())
-	header := make(map[string]string)
-	for k, v := range l.header {
-		header[k] = v[0]
-	}
-	_ = json.NewEncoder(buffer).Encode(&lambdaResponse{
-		IsBase64Encoded: false,
-		StatusCode:      l.statusCode,
-		Headers:         header,
-		Body:            body,
-	})
-
-	r, _ := http.NewRequest("POST", cli.responseURL, buffer)
-	do, err := cli.client.Do(r)
-	if err != nil {
-		return err
-	}
-	return do.Body.Close()
-}
-
-func (l *lambdaResponseWriter) WriteHeader(statusCode int) {
-	l.statusCode = statusCode
-}
-
-var cli *lambdaClient
-
-// runLambda  type: [scf,aws]
-func runLambda(bot *coolq.CQBot, node yaml.Node) {
-	var conf config.LambdaServer
-	switch err := node.Decode(&conf); {
-	case err != nil:
-		log.Warn("读取lambda配置失败 :", err)
-		fallthrough
-	case conf.Disabled:
-		return
-	}
-
-	cli = &lambdaClient{
-		lambdaType: conf.Type,
-		client:     http.Client{Timeout: 0},
-	}
-	switch cli.lambdaType { // todo: aws
-	case "scf": // tencent serverless function
-		base := fmt.Sprintf("http://%s:%s/runtime/",
-			os.Getenv("SCF_RUNTIME_API"),
-			os.Getenv("SCF_RUNTIME_API_PORT"))
-		cli.nextURL = base + "invocation/next"
-		cli.responseURL = base + "invocation/response"
-		post, err := http.Post(base+"init/ready", "", nil)
-		if err != nil {
-			log.Warnf("lambda 初始化失败: %v", err)
-			return
-		}
-		_ = post.Body.Close()
-	case "aws": // aws lambda
-		const apiVersion = "2018-06-01"
-		base := fmt.Sprintf("http://%s/%s/runtime/", os.Getenv("AWS_LAMBDA_RUNTIME_API"), apiVersion)
-		cli.nextURL = base + "invocation/next"
-		cli.responseURL = base + "invocation/response"
-	default:
-		log.Fatal("unknown lambda type:", conf.Type)
-	}
-
-	api := api2.NewCaller(bot)
-	if conf.RateLimit.Enabled {
-		api.Use(rateLimit(conf.RateLimit.Frequency, conf.RateLimit.Bucket))
-	}
-	server := &httpServer{
-		api:         api,
-		accessToken: conf.AccessToken,
-	}
-
-	for {
-		req := cli.next()
-		writer := lambdaResponseWriter{statusCode: 200, header: make(http.Header)}
-		func() {
-			defer func() {
-				if e := recover(); e != nil {
-					log.Warnf("Lambda 出现不可恢复错误: %v\n%s", e, debug.Stack())
-				}
-			}()
-			if req != nil {
-				server.ServeHTTP(&writer, req)
-			}
-		}()
-		if err := writer.flush(); err != nil {
-			log.Warnf("Lambda 发送响应失败: %v", err)
-		}
-	}
-}
-
-type lambdaInvoke struct {
-	Headers        map[string]string
-	HTTPMethod     string `json:"httpMethod"`
-	Body           string `json:"body"`
-	Path           string `json:"path"`
-	QueryString    map[string]string
-	RequestContext struct {
-		Path string `json:"path"`
-	} `json:"requestContext"`
-}
-
-func (c *lambdaClient) next() *http.Request {
-	r, err := http.NewRequest(http.MethodGet, c.nextURL, nil)
-	if err != nil {
-		return nil
-	}
-	resp, err := c.client.Do(r)
-	if err != nil {
-		return nil
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != http.StatusOK {
-		return nil
-	}
-	req := new(http.Request)
-	invoke := new(lambdaInvoke)
-	_ = json.NewDecoder(resp.Body).Decode(invoke)
-	if invoke.HTTPMethod == "" { // 不是 api 网关
-		return nil
-	}
-
-	req.Method = invoke.HTTPMethod
-	req.Body = io.NopCloser(strings.NewReader(invoke.Body))
-	req.Header = make(map[string][]string)
-	for k, v := range invoke.Headers {
-		req.Header.Set(k, v)
-	}
-	req.URL = new(url.URL)
-	req.URL.Path = strings.TrimPrefix(invoke.Path, invoke.RequestContext.Path)
-	// todo: avoid encoding
-	query := make(url.Values)
-	for k, v := range invoke.QueryString {
-		query[k] = []string{v}
-	}
-	req.URL.RawQuery = query.Encode()
-	return req
-}

server/websocket.go

@@ -3,7 +3,6 @@ package server
 import (
 	"bytes"
 	"context"
-	"encoding/json"
 	"fmt"
 	"net/http"
 	"runtime/debug"
@@ -12,164 +11,176 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Mrs4s/MiraiGo/utils"
-	log "github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
-	"gopkg.in/yaml.v3"
-	"nhooyr.io/websocket"
-
 	"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/go-cqhttp/modules/filter"
+
+	"github.com/Mrs4s/MiraiGo/utils"
+	"github.com/gorilla/websocket"
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
 )
 
 type webSocketServer struct {
-	bot  *coolq.CQBot
-	conf *config.WebsocketServer
-
-	mu        sync.Mutex
-	eventConn []*wsConn
-
-	token     string
-	handshake string
-	filter    string
+	bot            *coolq.CQBot
+	token          string
+	eventConn      []*webSocketConn
+	eventConnMutex sync.Mutex
+	handshake      string
 }
 
-// websocketClient WebSocket客户端实例
-type websocketClient struct {
-	bot  *coolq.CQBot
-	conf *config.WebsocketReverse
+// WebSocketClient WebSocket客户端实例
+type WebSocketClient struct {
+	conf  *global.GoCQReverseWebSocketConfig
+	token string
+	bot   *coolq.CQBot
 
-	mu sync.Mutex
-
-	universal *wsConn
-	event     *wsConn
-	token     string
-	filter    string
+	universalConn *webSocketConn
+	eventConn     *webSocketConn
 }
 
-type wsConn struct {
+type webSocketConn struct {
 	*websocket.Conn
-	apiCaller *api.Caller
+	sync.Mutex
+	apiCaller apiCaller
 }
 
-// runWSServer 运行一个正向WS server
-func runWSServer(b *coolq.CQBot, node yaml.Node) {
-	var conf config.WebsocketServer
-	switch err := node.Decode(&conf); {
-	case err != nil:
-		log.Warn("读取正向Websocket配置失败 :", err)
-		fallthrough
-	case conf.Disabled:
-		return
-	}
+// WebSocketServer 初始化一个WebSocketServer实例
+var WebSocketServer = &webSocketServer{}
+var upgrader = websocket.Upgrader{
+	CheckOrigin: func(r *http.Request) bool {
+		return true
+	},
+}
 
-	s := &webSocketServer{
-		bot:    b,
-		conf:   &conf,
-		token:  conf.AccessToken,
-		filter: conf.Filter,
-	}
-	filter.Add(s.filter)
-	addr := fmt.Sprintf("%s:%d", conf.Host, conf.Port)
+func (s *webSocketServer) Run(addr, authToken string, b *coolq.CQBot) {
+	s.token = authToken
+	s.bot = b
 	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())
+		s.bot.Client.Uin, time.Now().Unix())
 	b.OnEventPush(s.onBotPushEvent)
-	mux := http.ServeMux{}
-	mux.HandleFunc("/event", s.event)
-	mux.HandleFunc("/api", s.api)
-	mux.HandleFunc("/", s.any)
+	http.HandleFunc("/event", s.event)
+	http.HandleFunc("/api", s.api)
+	http.HandleFunc("/", s.any)
 	go func() {
 		log.Infof("CQ WebSocket 服务器已启动: %v", addr)
-		log.Fatal(http.ListenAndServe(addr, &mux))
+		log.Fatal(http.ListenAndServe(addr, nil))
 	}()
 }
 
-// runWSClient 运行一个反向向WS client
-func runWSClient(b *coolq.CQBot, node yaml.Node) {
-	var conf config.WebsocketReverse
-	switch err := node.Decode(&conf); {
-	case err != nil:
-		log.Warn("读取反向Websocket配置失败 :", err)
-		fallthrough
-	case conf.Disabled:
+// NewWebSocketClient 初始化一个NWebSocket客户端
+func NewWebSocketClient(conf *global.GoCQReverseWebSocketConfig, authToken string, b *coolq.CQBot) *WebSocketClient {
+	return &WebSocketClient{conf: conf, token: authToken, bot: b}
+}
+
+// Run 运行实例
+func (c *WebSocketClient) Run() {
+	if !c.conf.Enabled {
 		return
 	}
-
-	c := &websocketClient{
-		bot:    b,
-		conf:   &conf,
-		token:  conf.AccessToken,
-		filter: conf.Filter,
-	}
-	filter.Add(c.filter)
-	if c.conf.Universal != "" {
-		c.connect("Universal", conf.Universal, &c.universal)
+	if c.conf.ReverseURL != "" {
+		c.connectUniversal()
 	} else {
-		if c.conf.API != "" {
-			c.connect("API", conf.API, nil)
+		if c.conf.ReverseAPIURL != "" {
+			c.connectAPI()
 		}
-		if c.conf.Event != "" {
-			c.connect("Event", conf.Event, &c.event)
+		if c.conf.ReverseEventURL != "" {
+			c.connectEvent()
 		}
 	}
 	c.bot.OnEventPush(c.onBotPushEvent)
 }
 
-func (c *websocketClient) connect(typ, url string, conptr **wsConn) {
-	log.Infof("开始尝试连接到反向WebSocket %s服务器: %v", typ, c.conf.API)
+func (c *WebSocketClient) connectAPI() {
+	log.Infof("开始尝试连接到反向WebSocket API服务器: %v", c.conf.ReverseAPIURL)
 	header := http.Header{
-		"X-Client-Role": []string{typ},
+		"X-Client-Role": []string{"API"},
 		"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.Dial(context.Background(), url, &websocket.DialOptions{HTTPHeader: header}) // nolint
+	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseAPIURL, header) // nolint
 	if err != nil {
-		log.Warnf("连接到反向WebSocket %s服务器 %v 时出现错误: %v", typ, c.conf.API, err)
-		if c.conf.ReconnectInterval != 0 {
-			time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
-			c.connect(typ, url, conptr)
+		log.Warnf("连接到反向WebSocket API服务器 %v 时出现错误: %v", c.conf.ReverseAPIURL, err)
+		if c.conf.ReverseReconnectInterval != 0 {
+			time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
+			c.connectAPI()
+		}
+		return
+	}
+	log.Infof("已连接到反向WebSocket API服务器 %v", c.conf.ReverseAPIURL)
+	wrappedConn := &webSocketConn{Conn: conn, apiCaller: apiCaller{c.bot}}
+	go c.listenAPI(wrappedConn, false)
+}
+
+func (c *WebSocketClient) connectEvent() {
+	log.Infof("开始尝试连接到反向WebSocket Event服务器: %v", c.conf.ReverseEventURL)
+	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"},
+	}
+	if c.token != "" {
+		header["Authorization"] = []string{"Token " + c.token}
+	}
+	conn, _, err := websocket.DefaultDialer.Dial(c.conf.ReverseEventURL, header) // nolint
+	if err != nil {
+		log.Warnf("连接到反向WebSocket Event服务器 %v 时出现错误: %v", c.conf.ReverseEventURL, err)
+		if c.conf.ReverseReconnectInterval != 0 {
+			time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
+			c.connectEvent()
 		}
 		return
 	}
 
-	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.Write(context.Background(), websocket.MessageText, []byte(handshake))
-		if err != nil {
-			log.Warnf("反向WebSocket 握手时出现错误: %v", err)
-		}
+	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 %s服务器 %v", typ, c.conf.API)
-	wrappedConn := &wsConn{Conn: conn, apiCaller: api.NewCaller(c.bot)}
-	if c.conf.RateLimit.Enabled {
-		wrappedConn.apiCaller.Use(rateLimit(c.conf.RateLimit.Frequency, c.conf.RateLimit.Bucket))
-	}
-
-	if conptr != nil {
-		*conptr = wrappedConn
-	}
-
-	switch typ {
-	case "API":
-		go c.listenAPI(wrappedConn, false)
-	case "Universal":
-		go c.listenAPI(wrappedConn, true)
-	}
+	log.Infof("已连接到反向WebSocket Event服务器 %v", c.conf.ReverseEventURL)
+	c.eventConn = &webSocketConn{Conn: conn, apiCaller: apiCaller{c.bot}}
 }
 
-func (c *websocketClient) listenAPI(conn *wsConn, u bool) {
-	defer func() { _ = conn.Close(websocket.StatusNormalClosure, "") }()
+func (c *WebSocketClient) connectUniversal() {
+	log.Infof("开始尝试连接到反向WebSocket Universal服务器: %v", c.conf.ReverseURL)
+	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.ReverseURL, header) // nolint
+	if err != nil {
+		log.Warnf("连接到反向WebSocket Universal服务器 %v 时出现错误: %v", c.conf.ReverseURL, err)
+		if c.conf.ReverseReconnectInterval != 0 {
+			time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
+			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)
+	}
+
+	wrappedConn := &webSocketConn{Conn: conn, apiCaller: apiCaller{c.bot}}
+	go c.listenAPI(wrappedConn, true)
+	c.universalConn = wrappedConn
+}
+
+func (c *WebSocketClient) listenAPI(conn *webSocketConn, u bool) {
+	defer func() { _ = conn.Close() }()
 	for {
 		buffer := global.NewBuffer()
-		t, reader, err := conn.Conn.Reader(context.Background())
+		t, reader, err := conn.NextReader()
 		if err != nil {
 			log.Warnf("监听反向WS API时出现错误: %v", err)
 			break
@@ -179,7 +190,7 @@ func (c *websocketClient) listenAPI(conn *wsConn, u bool) {
 			log.Warnf("监听反向WS API时出现错误: %v", err)
 			break
 		}
-		if t == websocket.MessageText {
+		if t == websocket.TextMessage {
 			go func(buffer *bytes.Buffer) {
 				defer global.PutBuffer(buffer)
 				conn.handleRequest(c.bot, buffer.Bytes())
@@ -188,133 +199,132 @@ func (c *websocketClient) listenAPI(conn *wsConn, u bool) {
 			global.PutBuffer(buffer)
 		}
 	}
-	if c.conf.ReconnectInterval != 0 {
-		time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
+	if c.conf.ReverseReconnectInterval != 0 {
+		time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
 		if !u {
-			go c.connect("API", c.conf.API, nil)
+			go c.connectAPI()
 		}
 	}
 }
 
-func (c *websocketClient) onBotPushEvent(e *coolq.Event) {
-	filter := filter.Find(c.filter)
-	if filter != nil && !filter.Eval(gjson.Parse(e.JSONString())) {
-		log.Debugf("上报Event %s 到 WS服务器 时被过滤.", e.JSONBytes())
-		return
-	}
-	push := func(conn *wsConn, reconnect func()) {
-		log.Debugf("向WS服务器推送Event: %s", e.JSONBytes())
-		ctx, cancel := context.WithTimeout(context.Background(), time.Second*15)
-		defer cancel()
-		if err := conn.Write(ctx, websocket.MessageText, e.JSONBytes()); err != nil {
-			log.Warnf("向WS服务器推送 Event 时出现错误: %v", err)
-			_ = conn.Close(websocket.StatusNormalClosure, "")
-			if c.conf.ReconnectInterval != 0 {
-				time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
-				reconnect()
+func (c *WebSocketClient) onBotPushEvent(m *bytes.Buffer) {
+	if c.eventConn != nil {
+		log.Debugf("向WS服务器 %v 推送Event: %v", c.eventConn.RemoteAddr().String(), utils.B2S(m.Bytes()))
+		conn := c.eventConn
+		conn.Lock()
+		defer conn.Unlock()
+		_ = c.eventConn.SetWriteDeadline(time.Now().Add(time.Second * 15))
+		if err := c.eventConn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
+			log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", c.eventConn.RemoteAddr().String(), err)
+			_ = c.eventConn.Close()
+			if c.conf.ReverseReconnectInterval != 0 {
+				time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
+				c.connectEvent()
 			}
 		}
 	}
-
-	connect := func(typ, url string, conptr **wsConn) func() {
-		return func() {
-			c.connect(typ, url, conptr)
+	if c.universalConn != nil {
+		log.Debugf("向WS服务器 %v 推送Event: %v", c.universalConn.RemoteAddr().String(), utils.B2S(m.Bytes()))
+		conn := c.universalConn
+		conn.Lock()
+		defer conn.Unlock()
+		_ = c.universalConn.SetWriteDeadline(time.Now().Add(time.Second * 15))
+		if err := c.universalConn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
+			log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", c.universalConn.RemoteAddr().String(), err)
+			_ = c.universalConn.Close()
+			if c.conf.ReverseReconnectInterval != 0 {
+				time.Sleep(time.Millisecond * time.Duration(c.conf.ReverseReconnectInterval))
+				c.connectUniversal()
+			}
 		}
 	}
-
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	if c.event != nil {
-		push(c.event, connect("Event", c.conf.Event, &c.event))
-	}
-	if c.universal != nil {
-		push(c.universal, connect("Universal", c.conf.Universal, &c.universal))
-	}
 }
 
 func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
-	status := checkAuth(r, s.token)
-	if status != http.StatusOK {
-		log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败(code:%d)", r.RemoteAddr, status)
-		w.WriteHeader(status)
-		return
+	if s.token != "" {
+		if auth := r.URL.Query().Get("access_token"); auth != s.token {
+			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
+				log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败", r.RemoteAddr)
+				w.WriteHeader(401)
+				return
+			}
+		}
 	}
-	c, err := websocket.Accept(w, r, nil)
+	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
 		return
 	}
-	err = c.Write(context.Background(), websocket.MessageText, []byte(s.handshake))
+	err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
 	if err != nil {
 		log.Warnf("WebSocket 握手时出现错误: %v", err)
-		_ = c.Close(websocket.StatusNormalClosure, "")
+		_ = c.Close()
 		return
 	}
 
 	log.Infof("接受 WebSocket 连接: %v (/event)", r.RemoteAddr)
 
-	conn := &wsConn{Conn: c, apiCaller: api.NewCaller(s.bot)}
+	conn := &webSocketConn{Conn: c, apiCaller: apiCaller{s.bot}}
 
-	s.mu.Lock()
+	s.eventConnMutex.Lock()
 	s.eventConn = append(s.eventConn, conn)
-	s.mu.Unlock()
+	s.eventConnMutex.Unlock()
 }
 
 func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
-	status := checkAuth(r, s.token)
-	if status != http.StatusOK {
-		log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败(code:%d)", r.RemoteAddr, status)
-		w.WriteHeader(status)
-		return
+	if s.token != "" {
+		if auth := r.URL.Query().Get("access_token"); auth != s.token {
+			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
+				log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败", r.RemoteAddr)
+				w.WriteHeader(401)
+				return
+			}
+		}
 	}
-	c, err := websocket.Accept(w, r, nil)
+	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
 		return
 	}
 	log.Infof("接受 WebSocket 连接: %v (/api)", r.RemoteAddr)
-	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 := &webSocketConn{Conn: c, apiCaller: apiCaller{s.bot}}
 	go s.listenAPI(conn)
 }
 
 func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
-	status := checkAuth(r, s.token)
-	if status != http.StatusOK {
-		log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败(code:%d)", r.RemoteAddr, status)
-		w.WriteHeader(status)
-		return
+	if s.token != "" {
+		if auth := r.URL.Query().Get("access_token"); auth != s.token {
+			if auth := strings.SplitN(r.Header.Get("Authorization"), " ", 2); len(auth) != 2 || auth[1] != s.token {
+				log.Warnf("已拒绝 %v 的 WebSocket 请求: Token鉴权失败", r.RemoteAddr)
+				w.WriteHeader(401)
+				return
+			}
+		}
 	}
-	c, err := websocket.Accept(w, r, nil)
+	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
 		return
 	}
-	err = c.Write(context.Background(), websocket.MessageText, []byte(s.handshake))
+	err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
 	if err != nil {
 		log.Warnf("WebSocket 握手时出现错误: %v", err)
-		_ = c.Close(websocket.StatusNormalClosure, "")
+		_ = c.Close()
 		return
 	}
 	log.Infof("接受 WebSocket 连接: %v (/)", r.RemoteAddr)
-	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))
-	}
-	s.mu.Lock()
+	conn := &webSocketConn{Conn: c, apiCaller: apiCaller{s.bot}}
+	s.eventConnMutex.Lock()
 	s.eventConn = append(s.eventConn, conn)
-	s.mu.Unlock()
+	s.eventConnMutex.Unlock()
 	s.listenAPI(conn)
 }
 
-func (s *webSocketServer) listenAPI(c *wsConn) {
-	defer func() { _ = c.Close(websocket.StatusNormalClosure, "") }()
+func (s *webSocketServer) listenAPI(c *webSocketConn) {
+	defer func() { _ = c.Close() }()
 	for {
 		buffer := global.NewBuffer()
-		t, reader, err := c.Reader(context.Background())
+		t, reader, err := c.NextReader()
 		if err != nil {
 			break
 		}
@@ -323,7 +333,7 @@ func (s *webSocketServer) listenAPI(c *wsConn) {
 			break
 		}
 
-		if t == websocket.MessageText {
+		if t == websocket.TextMessage {
 			go func(buffer *bytes.Buffer) {
 				defer global.PutBuffer(buffer)
 				c.handleRequest(s.bot, buffer.Bytes())
@@ -334,50 +344,46 @@ func (s *webSocketServer) listenAPI(c *wsConn) {
 	}
 }
 
-func (c *wsConn) handleRequest(_ *coolq.CQBot, payload []byte) {
+func (c *webSocketConn) handleRequest(_ *coolq.CQBot, payload []byte) {
 	defer func() {
 		if err := recover(); err != nil {
 			log.Printf("处置WS命令时发生无法恢复的异常：%v\n%s", err, debug.Stack())
-			_ = c.Close(websocket.StatusInternalError, fmt.Sprint(err))
+			_ = c.Close()
 		}
 	}()
-	j := gjson.Parse(utils.B2S(payload))
-	t := strings.TrimSuffix(j.Get("action").Str, "_async")
+	global.RateLimit(context.Background())
+	j := gjson.ParseBytes(payload)
+	t := strings.ReplaceAll(j.Get("action").Str, "_async", "")
 	log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
-	ret := c.apiCaller.Call(t, j.Get("params"))
+	ret := c.apiCaller.callAPI(t, j.Get("params"))
 	if j.Get("echo").Exists() {
 		ret["echo"] = j.Get("echo").Value()
 	}
-	writer, _ := c.Writer(context.Background(), websocket.MessageText)
-	_ = json.NewEncoder(writer).Encode(ret)
-	_ = writer.Close()
+	c.Lock()
+	defer c.Unlock()
+	_ = c.WriteJSON(ret)
 }
 
-func (s *webSocketServer) onBotPushEvent(e *coolq.Event) {
-	filter := filter.Find(s.filter)
-	if filter != nil && !filter.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++ {
+func (s *webSocketServer) onBotPushEvent(m *bytes.Buffer) {
+	s.eventConnMutex.Lock()
+	defer s.eventConnMutex.Unlock()
+	for i, l := 0, len(s.eventConn); i < l; i++ {
 		conn := s.eventConn[i]
-		log.Debugf("向WS客户端推送Event: %s", e.JSONBytes())
-		if err := conn.Write(context.Background(), websocket.MessageText, e.JSONBytes()); err != nil {
-			_ = conn.Close(websocket.StatusNormalClosure, "")
+		log.Debugf("向WS客户端 %v 推送Event: %v", conn.RemoteAddr().String(), utils.B2S(m.Bytes()))
+		conn.Lock()
+		if err := conn.WriteMessage(websocket.TextMessage, m.Bytes()); err != nil {
+			_ = conn.Close()
+			next := i + 1
+			if next >= l {
+				next = l - 1
+			}
+			s.eventConn[i], s.eventConn[next] = s.eventConn[next], s.eventConn[i]
+			s.eventConn = append(s.eventConn[:next], s.eventConn[next+1:]...)
+			i--
+			l--
 			conn = nil
 			continue
 		}
-		if i != j {
-			// i != j means that some connection has been closed.
-			// use an in-place removal to avoid copying.
-			s.eventConn[j] = conn
-		}
-		j++
+		conn.Unlock()
 	}
-	s.eventConn = s.eventConn[:j]
 }