api: temporary delete get_guild_members api

* feat(server): add RegisterCustom

* feat(config): seprate config & server

* fix: make lint happy

* fix: make lint happy

* fix: ParseEnv nil pointer error

* typo(config): generateConfig hint

* fix(config): panic on range overflow

.github/ISSUE_TEMPLATE/bug--.md

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

.github/ISSUE_TEMPLATE/bug-report.yaml

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

.github/workflows/build_docker_image.yml

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

.github/workflows/issuebot.yml

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

.golangci.yml

@@ -25,7 +25,6 @@ linters:
     - deadcode
     - depguard
     - dogsled
-    - dupl
     - errcheck
     - exportloopref
     - exhaustive
@@ -58,20 +57,6 @@ linters:
     - revive
     - forbidigo
     - makezero
-    #- interfacer
-
-  # don't enable:
-  # - scopelint
-  # - gochecknoglobals
-  # - gocognit
-  # - godot
-  # - godox
-  # - goerr113
-  # - interfacer
-  # - maligned
-  # - nestif
-  # - testpackage
-  # - wsl
 
 run:
   # default concurrency is a available CPU number.
@@ -80,6 +65,7 @@ run:
   issues-exit-code: 1
   skip-dirs:
     - db
+    - cmd/api-generator
   tests: true
 
 # output configuration options

.goreleaser.yml

@@ -12,17 +12,17 @@ builds:
       - linux
       - darwin
     goarch:
-      - 386
+      - '386'
       - amd64
       - arm
       - arm64
     goarm:
-      - 7
+      - '7'
     ignore:
       - goos: darwin
         goarch: arm
       - goos: darwin
-        goarch: 386
+        goarch: '386'
     mod_timestamp: "{{ .CommitTimestamp }}"
     flags:
       - -trimpath
@@ -35,17 +35,17 @@ builds:
     goos:
       - windows
     goarch:
-      - 386
+      - '386'
       - amd64
       - arm
       - arm64
     goarm:
-      - 7
+      - '7'
     mod_timestamp: "{{ .CommitTimestamp }}"
     flags:
       - -trimpath
     ldflags:
-      - -s -w -X github.com/Mrs4s/go-cqhttp/coolq.Version=v{{.Version}}
+      - -s -w -X github.com/Mrs4s/go-cqhttp/internal/base.Version=v{{.Version}}
 
 checksum:
   name_template: "{{ .ProjectName }}_checksums.txt"

README.md

@@ -44,7 +44,7 @@ _✨ 基于 [Mirai](https://github.com/mamoe/mirai) 以及 [MiraiGo](https://git
 
 
 ## 兼容性
-go-cqhttp 兼容 [OneBot-v11](https://github.com/howmanybots/onebot/tree/master/v11/specs) 绝大多数内容，并在其基础上做了一些扩展，详情请看 go-cqhttp 的文档。
+go-cqhttp 兼容 [OneBot-v11](https://github.com/botuniverse/onebot-11) 绝大多数内容，并在其基础上做了一些扩展，详情请看 go-cqhttp 的文档。
 
 ### 接口
 
@@ -106,7 +106,6 @@ go-cqhttp 兼容 [OneBot-v11](https://github.com/howmanybots/onebot/tree/master/
 | [CQ:image]     | [图片]                            |
 | [CQ:redbag]    | [红包]                            |
 | [CQ:poke]      | [戳一戳]                          |
-| [CQ:gift]      | [礼物]                            |
 | [CQ:node]      | [合并转发消息节点]                |
 | [CQ:cardimage] | [一种 xml 的图片消息（装逼大图）] |
 | [CQ:tts]       | [文本转语音]                      |
@@ -114,7 +113,6 @@ go-cqhttp 兼容 [OneBot-v11](https://github.com/howmanybots/onebot/tree/master/
 [图片]: https://docs.go-cqhttp.org/cqcode/#%E5%9B%BE%E7%89%87
 [红包]: https://docs.go-cqhttp.org/cqcode/#%E7%BA%A2%E5%8C%85
 [戳一戳]: https://docs.go-cqhttp.org/cqcode/#%E6%88%B3%E4%B8%80%E6%88%B3
-[礼物]: https://docs.go-cqhttp.org/cqcode/#%E7%A4%BC%E7%89%A9
 [合并转发消息节点]: https://docs.go-cqhttp.org/cqcode/#%E5%90%88%E5%B9%B6%E8%BD%AC%E5%8F%91%E6%B6%88%E6%81%AF%E8%8A%82%E7%82%B9
 [一种 xml 的图片消息（装逼大图）]: https://docs.go-cqhttp.org/cqcode/#cardimage
 [文本转语音]: https://docs.go-cqhttp.org/cqcode/#%E6%96%87%E6%9C%AC%E8%BD%AC%E8%AF%AD%E9%9F%B3

cmd/api-generator/main.go

@@ -0,0 +1,266 @@
+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
+}
+
+// some abbreviations need translation before transforming ro snake case
+var replacer = strings.NewReplacer("ID", "Id")
+
+func snakecase(s string) string {
+	s = replacer.Replace(s)
+	t := make([]byte, 0, 32)
+	for i := 0; i < len(s); i++ {
+		c := s[i]
+		if ('a' <= c && c <= 'z') || ('0' <= c && c <= '9') {
+			t = append(t, c)
+		} else {
+			t = append(t, '_')
+			t = append(t, c^0x20)
+		}
+	}
+	return string(t)
+}
+
+func convDefault(s string, t string) string {
+	switch t {
+	case "bool":
+		if s == "true" {
+			return s
+		}
+	case "uint32":
+		if s != "0" {
+			return t + "(" + s + ")"
+		}
+	default:
+		panic("unhandled default value type:" + t)
+	}
+	return ""
+}

cmd/gocq/login.go

@@ -1,4 +1,4 @@
-package main
+package gocq
 
 import (
 	"bufio"
@@ -9,9 +9,9 @@ import (
 
 	qrcodeTerminal "github.com/Baozisoftware/qrcode-terminal-go"
 	"github.com/Mrs4s/MiraiGo/client"
+	"github.com/gocq/qrcode"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
-	"github.com/tuotoo/qrcode"
 
 	"github.com/Mrs4s/go-cqhttp/global"
 )
@@ -70,7 +70,7 @@ func qrcodeLogin() error {
 		log.Infof("请使用手机QQ扫描二维码 (qrcode.png) : ")
 	}
 	time.Sleep(time.Second)
-	qrcodeTerminal.New().Get(fi.Content).Print()
+	qrcodeTerminal.New2(qrcodeTerminal.ConsoleColors.BrightBlack, qrcodeTerminal.ConsoleColors.BrightWhite, qrcodeTerminal.QRCodeRecoveryLevels.Low).Get(fi.Content).Print()
 	s, err := cli.QueryQRCodeStatus(rsp.Sig)
 	if err != nil {
 		return err

cmd/gocq/main.go

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

coolq/api.go

@@ -14,9 +14,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Mrs4s/go-cqhttp/db"
-	"github.com/Mrs4s/go-cqhttp/internal/cache"
-
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
@@ -24,19 +21,24 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 
+	"github.com/Mrs4s/go-cqhttp/db"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/internal/cache"
 	"github.com/Mrs4s/go-cqhttp/internal/param"
+	"github.com/Mrs4s/go-cqhttp/modules/filter"
 )
 
 // CQGetLoginInfo 获取登录号信息
 //
 // https://git.io/Jtz1I
+// @route(get_login_info)
 func (bot *CQBot) CQGetLoginInfo() global.MSG {
 	return OK(global.MSG{"user_id": bot.Client.Uin, "nickname": bot.Client.Nickname})
 }
 
 // CQGetQiDianAccountInfo 获取企点账号信息
+// @route(qidian_get_account_info)
 func (bot *CQBot) CQGetQiDianAccountInfo() global.MSG {
 	if bot.Client.QiDian == nil {
 		return Failed(100, "QIDIAN_PROTOCOL_REQUEST", "请使用企点协议")
@@ -48,9 +50,208 @@ func (bot *CQBot) CQGetQiDianAccountInfo() global.MSG {
 	})
 }
 
+// CQGetGuildServiceProfile 获取频道系统个人资料
+// @route(get_guild_service_profile)
+func (bot *CQBot) CQGetGuildServiceProfile() global.MSG {
+	return OK(global.MSG{
+		"nickname":   bot.Client.GuildService.Nickname,
+		"tiny_id":    fU64(bot.Client.GuildService.TinyId),
+		"avatar_url": bot.Client.GuildService.AvatarUrl,
+	})
+}
+
+// CQGetGuildList 获取已加入的频道列表
+// @route(get_guild_list)
+func (bot *CQBot) CQGetGuildList() global.MSG {
+	fs := make([]global.MSG, 0, len(bot.Client.GuildService.Guilds))
+	for _, info := range bot.Client.GuildService.Guilds {
+		/* 做成单独的 api 可能会好些?
+		channels := make([]global.MSG, 0, len(info.Channels))
+		for _, channel := range info.Channels {
+			channels = append(channels, global.MSG{
+				"channel_id":   channel.ChannelId,
+				"channel_name": channel.ChannelName,
+				"channel_type": channel.ChannelType,
+			})
+		}
+		*/
+		fs = append(fs, global.MSG{
+			"guild_id":         fU64(info.GuildId),
+			"guild_name":       info.GuildName,
+			"guild_display_id": fU64(info.GuildCode),
+			// "channels":         channels,
+		})
+	}
+	return OK(fs)
+}
+
+// CQGetGuildMetaByGuest 通过访客权限获取频道元数据
+// @route(get_guild_meta_by_guest)
+func (bot *CQBot) CQGetGuildMetaByGuest(guildID uint64) global.MSG {
+	meta, err := bot.Client.GuildService.FetchGuestGuild(guildID)
+	if err != nil {
+		log.Errorf("获取频道元数据时出现错误: %v", err)
+		return Failed(100, "API_ERROR", err.Error())
+	}
+	return OK(global.MSG{
+		"guild_id":         fU64(meta.GuildId),
+		"guild_name":       meta.GuildName,
+		"guild_profile":    meta.GuildProfile,
+		"create_time":      meta.CreateTime,
+		"max_member_count": meta.MaxMemberCount,
+		"max_robot_count":  meta.MaxRobotCount,
+		"max_admin_count":  meta.MaxAdminCount,
+		"member_count":     meta.MemberCount,
+		"owner_id":         fU64(meta.OwnerId),
+	})
+}
+
+// CQGetGuildChannelList 获取频道列表
+// @route(get_guild_channel_list)
+func (bot *CQBot) CQGetGuildChannelList(guildID uint64, noCache bool) global.MSG {
+	guild := bot.Client.GuildService.FindGuild(guildID)
+	if guild == nil {
+		return Failed(100, "GUILD_NOT_FOUND")
+	}
+	if noCache {
+		channels, err := bot.Client.GuildService.FetchChannelList(guildID)
+		if err != nil {
+			log.Errorf("获取频道 %v 子频道列表时出现错误: %v", guildID, err)
+			return Failed(100, "API_ERROR", err.Error())
+		}
+		guild.Channels = channels
+	}
+	channels := make([]global.MSG, 0, len(guild.Channels))
+	for _, c := range guild.Channels {
+		channels = append(channels, convertChannelInfo(c))
+	}
+	return OK(channels)
+}
+
+/*
+// CQGetGuildMembers 获取频道成员列表
+// @route(get_guild_members)
+func (bot *CQBot) CQGetGuildMembers(guildID uint64) global.MSG {
+	guild := bot.Client.GuildService.FindGuild(guildID)
+	if guild == nil {
+		return Failed(100, "GUILD_NOT_FOUND")
+	}
+	return OK(nil) // todo
+}
+*/
+
+// CQGetGuildRoles 获取频道角色列表
+// @route(get_guild_roles)
+func (bot *CQBot) CQGetGuildRoles(guildID uint64) global.MSG {
+	r, err := bot.Client.GuildService.GetGuildRoles(guildID)
+	if err != nil {
+		log.Errorf("获取频道 %v 角色列表时出现错误: %v", guildID, err)
+		return Failed(100, "API_ERROR", err.Error())
+	}
+	roles := make([]global.MSG, len(r))
+	for i, role := range r {
+		roles[i] = global.MSG{
+			"role_id":      fU64(role.RoleId),
+			"role_name":    role.RoleName,
+			"argb_color":   role.ArgbColor,
+			"independent":  role.Independent,
+			"member_count": role.Num,
+			"max_count":    role.MaxNum,
+			"owned":        role.Owned,
+			"disabled":     role.Disabled,
+		}
+	}
+	return OK(roles)
+}
+
+// CQCreateGuildRole 创建频道角色
+// @route(create_guild_role)
+func (bot *CQBot) CQCreateGuildRole(guildID uint64, name string, color uint32, independent bool, initialUsers gjson.Result) global.MSG {
+	userSlice := []uint64{}
+	if initialUsers.IsArray() {
+		for _, user := range initialUsers.Array() {
+			userSlice = append(userSlice, user.Uint())
+		}
+	}
+	role, err := bot.Client.GuildService.CreateGuildRole(guildID, name, color, independent, userSlice)
+	if err != nil {
+		log.Errorf("创建频道 %v 角色时出现错误: %v", guildID, err)
+		return Failed(100, "API_ERROR", err.Error())
+	}
+	return OK(global.MSG{
+		"role_id": fU64(role),
+	})
+}
+
+// CQDeleteGuildRole 删除频道角色
+// @route(delete_guild_role)
+func (bot *CQBot) CQDeleteGuildRole(guildID uint64, roleID uint64) global.MSG {
+	err := bot.Client.GuildService.DeleteGuildRole(guildID, roleID)
+	if err != nil {
+		log.Errorf("删除频道 %v 角色时出现错误: %v", guildID, err)
+		return Failed(100, "API_ERROR", err.Error())
+	}
+	return OK(nil)
+}
+
+// CQSetGuildMemberRole 设置用户在频道中的角色
+// @route(set_guild_member_role)
+func (bot *CQBot) CQSetGuildMemberRole(guildID uint64, set bool, roleID uint64, users gjson.Result) global.MSG {
+	userSlice := []uint64{}
+	if users.IsArray() {
+		for _, user := range users.Array() {
+			userSlice = append(userSlice, user.Uint())
+		}
+	}
+	err := bot.Client.GuildService.SetUserRoleInGuild(guildID, set, roleID, userSlice)
+	if err != nil {
+		log.Errorf("设置用户在频道 %v 中的角色时出现错误: %v", guildID, err)
+		return Failed(100, "API_ERROR", err.Error())
+	}
+	return OK(nil)
+}
+
+// CQModifyRoleInGuild 修改频道角色
+// @route(update_guild_role)
+func (bot *CQBot) CQModifyRoleInGuild(guildID uint64, roleID uint64, name string, color uint32, indepedent bool) global.MSG {
+	err := bot.Client.GuildService.ModifyRoleInGuild(guildID, roleID, name, color, indepedent)
+	if err != nil {
+		log.Errorf("修改频道 %v 角色时出现错误: %v", guildID, err)
+		return Failed(100, "API_ERROR", err.Error())
+	}
+	return OK(nil)
+}
+
+// CQGetTopicChannelFeeds 获取话题频道帖子列表
+// @route(get_topic_channel_feeds)
+func (bot *CQBot) CQGetTopicChannelFeeds(guildID, channelID uint64) global.MSG {
+	guild := bot.Client.GuildService.FindGuild(guildID)
+	if guild == nil {
+		return Failed(100, "GUILD_NOT_FOUND")
+	}
+	channel := guild.FindChannel(channelID)
+	if channel == nil {
+		return Failed(100, "CHANNEL_NOT_FOUND")
+	}
+	if channel.ChannelType != client.ChannelTypeTopic {
+		return Failed(100, "CHANNEL_TYPE_ERROR")
+	}
+	feeds, err := bot.Client.GuildService.GetTopicChannelFeeds(guildID, channelID)
+	if err != nil {
+		log.Errorf("获取频道 %v 帖子时出现错误: %v", channelID, err)
+		return Failed(100, "API_ERROR", err.Error())
+	}
+	c := make([]global.MSG, 0, len(feeds))
+	for _, feed := range feeds {
+		c = append(c, convertChannelFeedInfo(feed))
+	}
+	return OK(c)
+}
+
 // CQGetFriendList 获取好友列表
 //
 // https://git.io/Jtz1L
+// @route(get_friend_list)
 func (bot *CQBot) CQGetFriendList() global.MSG {
 	fs := make([]global.MSG, 0, len(bot.Client.FriendList))
 	for _, f := range bot.Client.FriendList {
@@ -65,7 +266,7 @@ func (bot *CQBot) CQGetFriendList() global.MSG {
 
 // CQGetUnidirectionalFriendList 获取单向好友列表
 //
-//
+// @route(get_unidirectional_friend_list)
 func (bot *CQBot) CQGetUnidirectionalFriendList() global.MSG {
 	list, err := bot.Client.GetUnidirectionalFriendList()
 	if err != nil {
@@ -85,7 +286,8 @@ func (bot *CQBot) CQGetUnidirectionalFriendList() global.MSG {
 
 // CQDeleteUnidirectionalFriend 删除单向好友
 //
-//
+// @route(delete_unidirectional_friend)
+// @rename(uin->user_id)
 func (bot *CQBot) CQDeleteUnidirectionalFriend(uin int64) global.MSG {
 	list, err := bot.Client.GetUnidirectionalFriendList()
 	if err != nil {
@@ -105,8 +307,8 @@ func (bot *CQBot) CQDeleteUnidirectionalFriend(uin int64) global.MSG {
 }
 
 // CQDeleteFriend 删除好友
-//
-//
+// @route(delete_friend)
+// @rename(uin->"[user_id\x2Cid].0")
 func (bot *CQBot) CQDeleteFriend(uin int64) global.MSG {
 	if bot.Client.FindFriend(uin) == nil {
 		return Failed(100, "FRIEND_NOT_FOUND", "好友不存在")
@@ -121,6 +323,7 @@ func (bot *CQBot) CQDeleteFriend(uin int64) global.MSG {
 // CQGetGroupList 获取群列表
 //
 // https://git.io/Jtz1t
+// @route(get_group_list)
 func (bot *CQBot) CQGetGroupList(noCache bool) global.MSG {
 	gs := make([]global.MSG, 0, len(bot.Client.GroupList))
 	if noCache {
@@ -143,6 +346,7 @@ func (bot *CQBot) CQGetGroupList(noCache bool) global.MSG {
 // CQGetGroupInfo 获取群信息
 //
 // https://git.io/Jtz1O
+// @route(get_group_info)
 func (bot *CQBot) CQGetGroupInfo(groupID int64, noCache bool) global.MSG {
 	group := bot.Client.FindGroup(groupID)
 	if group == nil || noCache {
@@ -184,6 +388,7 @@ func (bot *CQBot) CQGetGroupInfo(groupID int64, noCache bool) global.MSG {
 // CQGetGroupMemberList 获取群成员列表
 //
 // https://git.io/Jtz13
+// @route(get_group_member_list)
 func (bot *CQBot) CQGetGroupMemberList(groupID int64, noCache bool) global.MSG {
 	group := bot.Client.FindGroup(groupID)
 	if group == nil {
@@ -207,6 +412,7 @@ func (bot *CQBot) CQGetGroupMemberList(groupID int64, noCache bool) global.MSG {
 // CQGetGroupMemberInfo 获取群成员信息
 //
 // https://git.io/Jtz1s
+// @route(get_group_member_info)
 func (bot *CQBot) CQGetGroupMemberInfo(groupID, userID int64, noCache bool) global.MSG {
 	group := bot.Client.FindGroup(groupID)
 	if group == nil {
@@ -232,6 +438,7 @@ func (bot *CQBot) CQGetGroupMemberInfo(groupID, userID int64, noCache bool) glob
 // CQGetGroupFileSystemInfo 扩展API-获取群文件系统信息
 //
 // 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
+// @route(get_group_file_system_info)
 func (bot *CQBot) CQGetGroupFileSystemInfo(groupID int64) global.MSG {
 	fs, err := bot.Client.GetGroupFileSystem(groupID)
 	if err != nil {
@@ -244,6 +451,7 @@ func (bot *CQBot) CQGetGroupFileSystemInfo(groupID int64) global.MSG {
 // CQGetGroupRootFiles 扩展API-获取群根目录文件列表
 //
 // 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
+// @route(get_group_root_files)
 func (bot *CQBot) CQGetGroupRootFiles(groupID int64) global.MSG {
 	fs, err := bot.Client.GetGroupFileSystem(groupID)
 	if err != nil {
@@ -264,6 +472,7 @@ func (bot *CQBot) CQGetGroupRootFiles(groupID int64) global.MSG {
 // CQGetGroupFilesByFolderID 扩展API-获取群子目录文件列表
 //
 // 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
+// @route(get_group_files_by_folder)
 func (bot *CQBot) CQGetGroupFilesByFolderID(groupID int64, folderID string) global.MSG {
 	fs, err := bot.Client.GetGroupFileSystem(groupID)
 	if err != nil {
@@ -284,6 +493,7 @@ func (bot *CQBot) CQGetGroupFilesByFolderID(groupID int64, folderID string) glob
 // CQGetGroupFileURL 扩展API-获取群文件资源链接
 //
 // 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
+// @route(get_group_file_url)
 func (bot *CQBot) CQGetGroupFileURL(groupID int64, fileID string, busID int32) global.MSG {
 	url := bot.Client.GetGroupFileUrl(groupID, fileID, busID)
 	if url == "" {
@@ -297,6 +507,7 @@ func (bot *CQBot) CQGetGroupFileURL(groupID int64, fileID string, busID int32) g
 // CQUploadGroupFile 扩展API-上传群文件
 //
 // https://docs.go-cqhttp.org/api/#%E4%B8%8A%E4%BC%A0%E7%BE%A4%E6%96%87%E4%BB%B6
+// @route(upload_group_file)
 func (bot *CQBot) CQUploadGroupFile(groupID int64, file, name, folder string) global.MSG {
 	if !global.PathExists(file) {
 		log.Errorf("上传群文件 %v 失败: 文件不存在", file)
@@ -319,7 +530,7 @@ func (bot *CQBot) CQUploadGroupFile(groupID int64, file, name, folder string) gl
 
 // CQGroupFileCreateFolder 拓展API-创建群文件文件夹
 //
-//
+// @route(create_group_file_folder)
 func (bot *CQBot) CQGroupFileCreateFolder(groupID int64, parentID, name string) global.MSG {
 	fs, err := bot.Client.GetGroupFileSystem(groupID)
 	if err != nil {
@@ -335,7 +546,8 @@ func (bot *CQBot) CQGroupFileCreateFolder(groupID int64, parentID, name string)
 
 // CQGroupFileDeleteFolder 拓展API-删除群文件文件夹
 //
-//
+// @route(delete_group_folder)
+// @rename(id->folder_id)
 func (bot *CQBot) CQGroupFileDeleteFolder(groupID int64, id string) global.MSG {
 	fs, err := bot.Client.GetGroupFileSystem(groupID)
 	if err != nil {
@@ -351,7 +563,8 @@ func (bot *CQBot) CQGroupFileDeleteFolder(groupID int64, id string) global.MSG {
 
 // CQGroupFileDeleteFile 拓展API-删除群文件
 //
-//
+// @route(delete_group_file)
+// @rename(id->file_id)
 func (bot *CQBot) CQGroupFileDeleteFile(groupID int64, id string, busID int32) global.MSG {
 	fs, err := bot.Client.GetGroupFileSystem(groupID)
 	if err != nil {
@@ -368,6 +581,7 @@ func (bot *CQBot) CQGroupFileDeleteFile(groupID int64, id string, busID int32) g
 // CQGetWordSlices 隐藏API-获取中文分词
 //
 // 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
+// @route(.get_word_slices)
 func (bot *CQBot) CQGetWordSlices(content string) global.MSG {
 	slices, err := bot.Client.GetWordSegmentation(content)
 	if err != nil {
@@ -379,9 +593,29 @@ func (bot *CQBot) CQGetWordSlices(content string) global.MSG {
 	return OK(global.MSG{"slices": slices})
 }
 
+// CQSendMessage 发送消息
+//
+// @route(send_msg)
+// @rename(m->message)
+func (bot *CQBot) CQSendMessage(groupID, userID int64, m gjson.Result, messageType string, autoEscape bool) global.MSG {
+	switch {
+	case messageType == "group":
+		return bot.CQSendGroupMessage(groupID, m, autoEscape)
+	case messageType == "private":
+		fallthrough
+	case userID != 0:
+		return bot.CQSendPrivateMessage(userID, groupID, m, autoEscape)
+	case groupID != 0:
+		return bot.CQSendGroupMessage(groupID, m, autoEscape)
+	}
+	return global.MSG{}
+}
+
 // CQSendGroupMessage 发送群消息
 //
 // https://git.io/Jtz1c
+// @route(send_group_msg)
+// @rename(m->message)
 func (bot *CQBot) CQSendGroupMessage(groupID int64, m gjson.Result, autoEscape bool) global.MSG {
 	group := bot.Client.FindGroup(groupID)
 	if group == nil {
@@ -402,7 +636,7 @@ func (bot *CQBot) CQSendGroupMessage(groupID int64, m gjson.Result, autoEscape b
 
 	var elem []message.IMessageElement
 	if m.Type == gjson.JSON {
-		elem = bot.ConvertObjectMessage(m, true)
+		elem = bot.ConvertObjectMessage(m, MessageSourceGroup)
 	} else {
 		str := m.String()
 		if str == "" {
@@ -412,7 +646,7 @@ func (bot *CQBot) CQSendGroupMessage(groupID int64, m gjson.Result, autoEscape b
 		if autoEscape {
 			elem = []message.IMessageElement{message.NewText(str)}
 		} else {
-			elem = bot.ConvertStringMessage(str, true)
+			elem = bot.ConvertStringMessage(str, MessageSourceGroup)
 		}
 	}
 	fixAt(elem)
@@ -424,9 +658,65 @@ func (bot *CQBot) CQSendGroupMessage(groupID int64, m gjson.Result, autoEscape b
 	return OK(global.MSG{"message_id": mid})
 }
 
+// CQSendGuildChannelMessage 发送频道消息
+//
+// @route(send_guild_channel_msg)
+// @rename(m->message)
+func (bot *CQBot) CQSendGuildChannelMessage(guildID, channelID uint64, m gjson.Result, autoEscape bool) global.MSG {
+	guild := bot.Client.GuildService.FindGuild(guildID)
+	if guild == nil {
+		return Failed(100, "GUILD_NOT_FOUND", "频道不存在")
+	}
+	channel := guild.FindChannel(channelID)
+	if channel == nil {
+		return Failed(100, "CHANNEL_NOT_FOUND", "子频道不存在")
+	}
+	if channel.ChannelType != client.ChannelTypeText {
+		log.Warnf("无法发送频道信息: 频道类型错误, 不接受文本信息")
+		return Failed(100, "CHANNEL_NOT_SUPPORTED_TEXT_MSG", "子频道类型错误, 无法发送文本信息")
+	}
+	fixAt := func(elem []message.IMessageElement) {
+		for _, e := range elem {
+			if at, ok := e.(*message.AtElement); ok && at.Target != 0 && at.Display == "" {
+				mem, _ := bot.Client.GuildService.GetGuildMemberProfileInfo(guildID, uint64(at.Target))
+				if mem != nil {
+					at.Display = "@" + mem.Nickname
+				} else {
+					at.Display = "@" + strconv.FormatInt(at.Target, 10)
+				}
+			}
+		}
+	}
+
+	var elem []message.IMessageElement
+	if m.Type == gjson.JSON {
+		elem = bot.ConvertObjectMessage(m, MessageSourceGuildChannel)
+	} else {
+		str := m.String()
+		if str == "" {
+			log.Warn("频道发送失败: 信息为空.")
+			return Failed(100, "EMPTY_MSG_ERROR", "消息为空")
+		}
+		if autoEscape {
+			elem = []message.IMessageElement{message.NewText(str)}
+		} else {
+			elem = bot.ConvertStringMessage(str, MessageSourceGuildChannel)
+		}
+	}
+	fixAt(elem)
+	mid := bot.SendGuildChannelMessage(guildID, channelID, &message.SendingMessage{Elements: elem})
+	if mid == "" {
+		return Failed(100, "SEND_MSG_API_ERROR", "请参考 go-cqhttp 端输出")
+	}
+	log.Infof("发送频道 %v(%v) 子频道 %v(%v) 的消息: %v (%v)", guild.GuildName, guild.GuildId, channel.ChannelName, channel.ChannelId, limitedString(m.String()), mid)
+	return OK(global.MSG{"message_id": mid})
+}
+
 // CQSendGroupForwardMessage 扩展API-发送合并转发(群)
 //
 // 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
+// @route(send_group_forward_msg)
+// @rename(m->messages)
 func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) global.MSG {
 	if m.Type != gjson.JSON {
 		return Failed(100)
@@ -465,7 +755,7 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) globa
 		ts.Add(time.Second)
 		if e.Get("data.id").Exists() {
 			i := e.Get("data.id").Int()
-			m, _ := bot.db.GetGroupMessageByGlobalID(int32(i))
+			m, _ := db.GetGroupMessageByGlobalID(int32(i))
 			if m != nil {
 				return &message.ForwardNode{
 					SenderId:   m.Attribute.SenderUin,
@@ -477,7 +767,7 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) globa
 						}
 						return int32(msgTime)
 					}(),
-					Message: resolveElement(bot.ConvertContentMessage(m.Content, true)),
+					Message: resolveElement(bot.ConvertContentMessage(m.Content, MessageSourceGroup)),
 				}
 			}
 			log.Warnf("警告: 引用消息 %v 错误或数据库未开启.", e.Get("data.id").Str)
@@ -516,7 +806,7 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) globa
 				}
 			}
 		}
-		content := bot.ConvertObjectMessage(e.Get("data.content"), true)
+		content := bot.ConvertObjectMessage(e.Get("data.content"), MessageSourceGroup)
 		if uin != 0 && name != "" && len(content) > 0 {
 			return &message.ForwardNode{
 				SenderId:   uin,
@@ -558,10 +848,12 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) globa
 // CQSendPrivateMessage 发送私聊消息
 //
 // https://git.io/Jtz1l
+// @route(send_private_msg)
+// @rename(m->message)
 func (bot *CQBot) CQSendPrivateMessage(userID int64, groupID int64, m gjson.Result, autoEscape bool) global.MSG {
 	var elem []message.IMessageElement
 	if m.Type == gjson.JSON {
-		elem = bot.ConvertObjectMessage(m, false)
+		elem = bot.ConvertObjectMessage(m, MessageSourcePrivate)
 	} else {
 		str := m.String()
 		if str == "" {
@@ -570,7 +862,7 @@ func (bot *CQBot) CQSendPrivateMessage(userID int64, groupID int64, m gjson.Resu
 		if autoEscape {
 			elem = []message.IMessageElement{message.NewText(str)}
 		} else {
-			elem = bot.ConvertStringMessage(str, false)
+			elem = bot.ConvertStringMessage(str, MessageSourcePrivate)
 		}
 	}
 	mid := bot.SendPrivateMessage(userID, groupID, &message.SendingMessage{Elements: elem})
@@ -584,6 +876,7 @@ func (bot *CQBot) CQSendPrivateMessage(userID int64, groupID int64, m gjson.Resu
 // CQSetGroupCard 设置群名片(群备注)
 //
 // https://git.io/Jtz1B
+// @route(set_group_card)
 func (bot *CQBot) CQSetGroupCard(groupID, userID int64, card string) global.MSG {
 	if g := bot.Client.FindGroup(groupID); g != nil {
 		if m := g.FindMember(userID); m != nil {
@@ -597,6 +890,8 @@ func (bot *CQBot) CQSetGroupCard(groupID, userID int64, card string) global.MSG
 // CQSetGroupSpecialTitle 设置群组专属头衔
 //
 // https://git.io/Jtz10
+// @route(set_group_special_title)
+// @rename(title->special_title)
 func (bot *CQBot) CQSetGroupSpecialTitle(groupID, userID int64, title string) global.MSG {
 	if g := bot.Client.FindGroup(groupID); g != nil {
 		if m := g.FindMember(userID); m != nil {
@@ -610,6 +905,8 @@ func (bot *CQBot) CQSetGroupSpecialTitle(groupID, userID int64, title string) gl
 // CQSetGroupName 设置群名
 //
 // https://git.io/Jtz12
+// @route(set_group_name)
+// @rename(name->group_name)
 func (bot *CQBot) CQSetGroupName(groupID int64, name string) global.MSG {
 	if g := bot.Client.FindGroup(groupID); g != nil {
 		g.UpdateName(name)
@@ -621,7 +918,9 @@ func (bot *CQBot) CQSetGroupName(groupID int64, name string) global.MSG {
 // CQSetGroupMemo 扩展API-发送群公告
 //
 // https://docs.go-cqhttp.org/api/#%E5%8F%91%E9%80%81%E7%BE%A4%E5%85%AC%E5%91%8A
-func (bot *CQBot) CQSetGroupMemo(groupID int64, msg string, img string) global.MSG {
+// @route(_send_group_notice)
+// @rename(msg->content, img->image)
+func (bot *CQBot) CQSetGroupMemo(groupID int64, msg, img string) global.MSG {
 	if g := bot.Client.FindGroup(groupID); g != nil {
 		if g.SelfPermission() == client.Member {
 			return Failed(100, "PERMISSION_DENIED", "权限不足")
@@ -649,7 +948,9 @@ func (bot *CQBot) CQSetGroupMemo(groupID int64, msg string, img string) global.M
 // CQSetGroupKick 群组踢人
 //
 // https://git.io/Jtz1V
-func (bot *CQBot) CQSetGroupKick(groupID, userID int64, msg string, block bool) global.MSG {
+// @route(set_group_kick)
+// @rename(msg->message, block->reject_add_request)
+func (bot *CQBot) CQSetGroupKick(groupID int64, userID int64, msg string, block bool) global.MSG {
 	if g := bot.Client.FindGroup(groupID); g != nil {
 		if m := g.FindMember(userID); m != nil {
 			err := m.Kick(msg, block)
@@ -665,6 +966,8 @@ func (bot *CQBot) CQSetGroupKick(groupID, userID int64, msg string, block bool)
 // CQSetGroupBan 群组单人禁言
 //
 // https://git.io/Jtz1w
+// @route(set_group_ban)
+// @default(duration=1800)
 func (bot *CQBot) CQSetGroupBan(groupID, userID int64, duration uint32) global.MSG {
 	if g := bot.Client.FindGroup(groupID); g != nil {
 		if m := g.FindMember(userID); m != nil {
@@ -684,6 +987,8 @@ func (bot *CQBot) CQSetGroupBan(groupID, userID int64, duration uint32) global.M
 // CQSetGroupWholeBan 群组全员禁言
 //
 // https://git.io/Jtz1o
+// @route(set_group_whole_ban)
+// @default(enable=true)
 func (bot *CQBot) CQSetGroupWholeBan(groupID int64, enable bool) global.MSG {
 	if g := bot.Client.FindGroup(groupID); g != nil {
 		g.MuteAll(enable)
@@ -695,6 +1000,7 @@ func (bot *CQBot) CQSetGroupWholeBan(groupID int64, enable bool) global.MSG {
 // CQSetGroupLeave 退出群组
 //
 // https://git.io/Jtz1K
+// @route(set_group_leave)
 func (bot *CQBot) CQSetGroupLeave(groupID int64) global.MSG {
 	if g := bot.Client.FindGroup(groupID); g != nil {
 		g.Quit()
@@ -706,6 +1012,7 @@ func (bot *CQBot) CQSetGroupLeave(groupID int64) global.MSG {
 // CQGetAtAllRemain 扩展API-获取群 @全体成员 剩余次数
 //
 // https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4-%E5%85%A8%E4%BD%93%E6%88%90%E5%91%98-%E5%89%A9%E4%BD%99%E6%AC%A1%E6%95%B0
+// @route(get_group_at_all_remain)
 func (bot *CQBot) CQGetAtAllRemain(groupID int64) global.MSG {
 	if g := bot.Client.FindGroup(groupID); g != nil {
 		i, err := bot.Client.GetAtAllRemain(groupID)
@@ -720,6 +1027,8 @@ func (bot *CQBot) CQGetAtAllRemain(groupID int64) global.MSG {
 // CQProcessFriendRequest 处理加好友请求
 //
 // https://git.io/Jtz11
+// @route(set_friend_add_request)
+// @default(approve=true)
 func (bot *CQBot) CQProcessFriendRequest(flag string, approve bool) global.MSG {
 	req, ok := bot.friendReqCache.Load(flag)
 	if !ok {
@@ -736,6 +1045,9 @@ func (bot *CQBot) CQProcessFriendRequest(flag string, approve bool) global.MSG {
 // CQProcessGroupRequest 处理加群请求／邀请
 //
 // https://git.io/Jtz1D
+// @route(set_group_add_request)
+// @rename(sub_type->"[sub_type\x2Ctype].0")
+// @default(approve=true)
 func (bot *CQBot) CQProcessGroupRequest(flag, subType, reason string, approve bool) global.MSG {
 	msgs, err := bot.Client.GetGroupSystemMessages()
 	if err != nil {
@@ -780,8 +1092,9 @@ func (bot *CQBot) CQProcessGroupRequest(flag, subType, reason string, approve bo
 // CQDeleteMessage 撤回消息
 //
 // https:// git.io/Jtz1y
+// @route(delete_msg)
 func (bot *CQBot) CQDeleteMessage(messageID int32) global.MSG {
-	msg, err := bot.db.GetMessageByGlobalID(messageID)
+	msg, err := db.GetMessageByGlobalID(messageID)
 	if err != nil {
 		log.Warnf("撤回消息时出现错误: %v", err)
 		return Failed(100, "MESSAGE_NOT_FOUND", "消息不存在")
@@ -810,6 +1123,8 @@ func (bot *CQBot) CQDeleteMessage(messageID int32) global.MSG {
 // CQSetGroupAdmin 群组设置管理员
 //
 // https://git.io/Jtz1S
+// @route(set_group_admin)
+// @default(enable=true)
 func (bot *CQBot) CQSetGroupAdmin(groupID, userID int64, enable bool) global.MSG {
 	group := bot.Client.FindGroup(groupID)
 	if group == nil || group.OwnerUin != bot.Client.Uin {
@@ -832,6 +1147,7 @@ func (bot *CQBot) CQSetGroupAdmin(groupID, userID int64, enable bool) global.MSG
 // CQGetVipInfo 扩展API-获取VIP信息
 //
 // https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96vip%E4%BF%A1%E6%81%AF
+// @route(_get_vip_info)
 func (bot *CQBot) CQGetVipInfo(userID int64) global.MSG {
 	vip, err := bot.Client.GetVipInfo(userID)
 	if err != nil {
@@ -852,6 +1168,8 @@ func (bot *CQBot) CQGetVipInfo(userID int64) global.MSG {
 // CQGetGroupHonorInfo 获取群荣誉信息
 //
 // https://git.io/Jtz1H
+// @route(get_group_honor_info)
+// @rename(t->type)
 func (bot *CQBot) CQGetGroupHonorInfo(groupID int64, t string) global.MSG {
 	msg := global.MSG{"group_id": groupID}
 	convertMem := func(memList []client.HonorMemberInfo) (ret []global.MSG) {
@@ -909,6 +1227,7 @@ func (bot *CQBot) CQGetGroupHonorInfo(groupID int64, t string) global.MSG {
 // CQGetStrangerInfo 获取陌生人信息
 //
 // https://git.io/Jtz17
+// @route(get_stranger_info)
 func (bot *CQBot) CQGetStrangerInfo(userID int64) global.MSG {
 	info, err := bot.Client.GetSummaryInfo(userID)
 	if err != nil {
@@ -936,6 +1255,7 @@ func (bot *CQBot) CQGetStrangerInfo(userID int64) global.MSG {
 // CQHandleQuickOperation 隐藏API-对事件执行快速操作
 //
 // https://git.io/Jtz15
+// @route(".handle_quick_operation")
 func (bot *CQBot) CQHandleQuickOperation(context, operation gjson.Result) global.MSG {
 	postType := context.Get("post_type").Str
 
@@ -1025,6 +1345,7 @@ func (bot *CQBot) CQHandleQuickOperation(context, operation gjson.Result) global
 // CQGetImage 获取图片(修改自OneBot)
 //
 // https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E5%9B%BE%E7%89%87%E4%BF%A1%E6%81%AF
+// @route(get_image)
 func (bot *CQBot) CQGetImage(file string) global.MSG {
 	var b []byte
 	var err error
@@ -1049,14 +1370,17 @@ func (bot *CQBot) CQGetImage(file string) global.MSG {
 			"filename": r.ReadString(),
 			"url":      r.ReadString(),
 		}
-		local := path.Join(global.CachePath, file+"."+path.Ext(msg["filename"].(string)))
+		local := path.Join(global.CachePath, file+path.Ext(msg["filename"].(string)))
 		if !global.PathExists(local) {
-			f, _ := os.OpenFile(local, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o0644)
 			if body, err := global.HTTPGetReadCloser(msg["url"].(string)); err == nil {
+				f, _ := os.OpenFile(local, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o0644)
 				_, _ = f.ReadFrom(body)
 				_ = body.Close()
+				_ = f.Close()
+			} else {
+				log.Warnf("下载图片 %v 时出现错误: %v", msg["url"], err)
+				return Failed(100, "DOWNLOAD_IMAGE_ERROR", err.Error())
 			}
-			f.Close()
 		}
 		msg["file"] = local
 		return OK(msg)
@@ -1067,7 +1391,27 @@ func (bot *CQBot) CQGetImage(file string) global.MSG {
 // CQDownloadFile 扩展API-下载文件到缓存目录
 //
 // https://docs.go-cqhttp.org/api/#%E4%B8%8B%E8%BD%BD%E6%96%87%E4%BB%B6%E5%88%B0%E7%BC%93%E5%AD%98%E7%9B%AE%E5%BD%95
-func (bot *CQBot) CQDownloadFile(url string, headers map[string]string, threadCount int) global.MSG {
+// @route(download_file)
+func (bot *CQBot) CQDownloadFile(url string, headers gjson.Result, threadCount int) global.MSG {
+	h := map[string]string{}
+	if headers.IsArray() {
+		for _, sub := range headers.Array() {
+			str := strings.SplitN(sub.String(), "=", 2)
+			if len(str) == 2 {
+				h[str[0]] = str[1]
+			}
+		}
+	}
+	if headers.Type == gjson.String {
+		lines := strings.Split(headers.String(), "\r\n")
+		for _, sub := range lines {
+			str := strings.SplitN(sub, "=", 2)
+			if len(str) == 2 {
+				h[str[0]] = str[1]
+			}
+		}
+	}
+
 	hash := md5.Sum([]byte(url))
 	file := path.Join(global.CachePath, hex.EncodeToString(hash[:])+".cache")
 	if global.PathExists(file) {
@@ -1076,7 +1420,7 @@ func (bot *CQBot) CQDownloadFile(url string, headers map[string]string, threadCo
 			return Failed(100, "DELETE_FILE_ERROR", err.Error())
 		}
 	}
-	if err := global.DownloadFileMultiThreading(url, file, 0, threadCount, headers); err != nil {
+	if err := global.DownloadFileMultiThreading(url, file, 0, threadCount, h); err != nil {
 		log.Warnf("下载链接 %v 时出现错误: %v", url, err)
 		return Failed(100, "DOWNLOAD_FILE_ERROR", err.Error())
 	}
@@ -1089,6 +1433,8 @@ func (bot *CQBot) CQDownloadFile(url string, headers map[string]string, threadCo
 // CQGetForwardMessage 获取合并转发消息
 //
 // https://git.io/Jtz1F
+// @route(get_forward_msg)
+// @rename(res_id->"[message_id\x2Cid].0")
 func (bot *CQBot) CQGetForwardMessage(resID string) global.MSG {
 	m := bot.Client.GetForwardMessage(resID)
 	if m == nil {
@@ -1096,14 +1442,14 @@ func (bot *CQBot) CQGetForwardMessage(resID string) global.MSG {
 	}
 	r := make([]global.MSG, 0, len(m.Nodes))
 	for _, n := range m.Nodes {
-		bot.checkMedia(n.Message)
+		bot.checkMedia(n.Message, 0)
 		r = append(r, global.MSG{
 			"sender": global.MSG{
 				"user_id":  n.SenderId,
 				"nickname": n.SenderName,
 			},
 			"time":    n.Time,
-			"content": ToFormattedMessage(n.Message, 0, false),
+			"content": ToFormattedMessage(n.Message, MessageSource{SourceType: MessageSourceGroup}, false),
 		})
 	}
 	return OK(global.MSG{
@@ -1114,8 +1460,9 @@ func (bot *CQBot) CQGetForwardMessage(resID string) global.MSG {
 // CQGetMessage 获取消息
 //
 // https://git.io/Jtz1b
+// @route(get_msg)
 func (bot *CQBot) CQGetMessage(messageID int32) global.MSG {
-	msg, err := bot.db.GetMessageByGlobalID(messageID)
+	msg, err := db.GetMessageByGlobalID(messageID)
 	if err != nil {
 		log.Warnf("获取消息时出现错误: %v", err)
 		return Failed(100, "MSG_NOT_FOUND", "消息不存在")
@@ -1136,9 +1483,9 @@ func (bot *CQBot) CQGetMessage(messageID int32) global.MSG {
 	switch o := msg.(type) {
 	case *db.StoredGroupMessage:
 		m["group_id"] = o.GroupCode
-		m["message"] = ToFormattedMessage(bot.ConvertContentMessage(o.Content, true), o.GroupCode, false)
+		m["message"] = ToFormattedMessage(bot.ConvertContentMessage(o.Content, MessageSourceGroup), MessageSource{SourceType: MessageSourceGroup, PrimaryID: uint64(o.GroupCode)}, false)
 	case *db.StoredPrivateMessage:
-		m["message"] = ToFormattedMessage(bot.ConvertContentMessage(o.Content, false), 0, false)
+		m["message"] = ToFormattedMessage(bot.ConvertContentMessage(o.Content, MessageSourcePrivate), MessageSource{SourceType: MessageSourcePrivate}, false)
 	}
 	return OK(m)
 }
@@ -1146,6 +1493,7 @@ func (bot *CQBot) CQGetMessage(messageID int32) global.MSG {
 // CQGetGroupSystemMessages 扩展API-获取群文件系统消息
 //
 // 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
+// @route(get_group_system_msg)
 func (bot *CQBot) CQGetGroupSystemMessages() global.MSG {
 	msg, err := bot.Client.GetGroupSystemMessages()
 	if err != nil {
@@ -1158,6 +1506,8 @@ func (bot *CQBot) CQGetGroupSystemMessages() global.MSG {
 // CQGetGroupMessageHistory 获取群消息历史记录
 //
 // https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%BE%A4%E6%B6%88%E6%81%AF%E5%8E%86%E5%8F%B2%E8%AE%B0%E5%BD%95
+// @route(get_group_msg_history)
+// @rename(seq->message_seq)
 func (bot *CQBot) CQGetGroupMessageHistory(groupID int64, seq int64) global.MSG {
 	if g := bot.Client.FindGroup(groupID); g == nil {
 		return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
@@ -1176,11 +1526,8 @@ func (bot *CQBot) CQGetGroupMessageHistory(groupID int64, seq int64) global.MSG
 	}
 	ms := make([]global.MSG, 0, len(msg))
 	for _, m := range msg {
-		id := m.Id
-		bot.checkMedia(m.Elements)
-		if bot.db != nil {
-			id = bot.InsertGroupMessage(m)
-		}
+		bot.checkMedia(m.Elements, groupID)
+		id := bot.InsertGroupMessage(m)
 		t := bot.formatGroupMessage(m)
 		t["message_id"] = id
 		ms = append(ms, t)
@@ -1193,6 +1540,7 @@ func (bot *CQBot) CQGetGroupMessageHistory(groupID int64, seq int64) global.MSG
 // CQGetOnlineClients 扩展API-获取当前账号在线客户端列表
 //
 // https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E5%BD%93%E5%89%8D%E8%B4%A6%E5%8F%B7%E5%9C%A8%E7%BA%BF%E5%AE%A2%E6%88%B7%E7%AB%AF%E5%88%97%E8%A1%A8
+// @route(get_online_clients)
 func (bot *CQBot) CQGetOnlineClients(noCache bool) global.MSG {
 	if noCache {
 		if err := bot.Client.RefreshStatus(); err != nil {
@@ -1216,6 +1564,7 @@ func (bot *CQBot) CQGetOnlineClients(noCache bool) global.MSG {
 // CQCanSendImage 检查是否可以发送图片(此处永远返回true)
 //
 // https://git.io/Jtz1N
+// @route(can_send_image)
 func (bot *CQBot) CQCanSendImage() global.MSG {
 	return OK(global.MSG{"yes": true})
 }
@@ -1223,6 +1572,7 @@ func (bot *CQBot) CQCanSendImage() global.MSG {
 // CQCanSendRecord 检查是否可以发送语音(此处永远返回true)
 //
 // https://git.io/Jtz1x
+// @route(can_send_record)
 func (bot *CQBot) CQCanSendRecord() global.MSG {
 	return OK(global.MSG{"yes": true})
 }
@@ -1230,8 +1580,11 @@ func (bot *CQBot) CQCanSendRecord() global.MSG {
 // CQOcrImage 扩展API-图片OCR
 //
 // https://docs.go-cqhttp.org/api/#%E5%9B%BE%E7%89%87-ocr
+// @route(ocr_image)
+// @alias(.ocr_image)
+// @rename(image_id->image)
 func (bot *CQBot) CQOcrImage(imageID string) global.MSG {
-	img, err := bot.makeImageOrVideoElem(map[string]string{"file": imageID}, false, true)
+	img, err := bot.makeImageOrVideoElem(map[string]string{"file": imageID}, false, MessageSourceGroup)
 	if err != nil {
 		log.Warnf("load image error: %v", err)
 		return Failed(100, "LOAD_FILE_ERROR", err.Error())
@@ -1247,6 +1600,7 @@ func (bot *CQBot) CQOcrImage(imageID string) global.MSG {
 // CQSetGroupPortrait 扩展API-设置群头像
 //
 // https://docs.go-cqhttp.org/api/#%E8%AE%BE%E7%BD%AE%E7%BE%A4%E5%A4%B4%E5%83%8F
+// @route(set_group_portrait)
 func (bot *CQBot) CQSetGroupPortrait(groupID int64, file, cache string) global.MSG {
 	if g := bot.Client.FindGroup(groupID); g != nil {
 		img, err := global.FindFile(file, cache, global.ImagePath)
@@ -1263,6 +1617,8 @@ func (bot *CQBot) CQSetGroupPortrait(groupID int64, file, cache string) global.M
 // CQSetGroupAnonymousBan 群组匿名用户禁言
 //
 // https://git.io/Jtz1p
+// @route(set_group_anonymous_ban)
+// @rename(flag->"[anonymous_flag\x2Canonymous.flag].0")
 func (bot *CQBot) CQSetGroupAnonymousBan(groupID int64, flag string, duration int32) global.MSG {
 	if flag == "" {
 		return Failed(100, "INVALID_FLAG", "无效的flag")
@@ -1286,6 +1642,7 @@ func (bot *CQBot) CQSetGroupAnonymousBan(groupID int64, flag string, duration in
 // CQGetStatus 获取运行状态
 //
 // https://git.io/JtzMe
+// @route(get_status)
 func (bot *CQBot) CQGetStatus() global.MSG {
 	return OK(global.MSG{
 		"app_initialized": true,
@@ -1301,8 +1658,9 @@ func (bot *CQBot) CQGetStatus() global.MSG {
 // CQSetEssenceMessage 扩展API-设置精华消息
 //
 // https://docs.go-cqhttp.org/api/#%E8%AE%BE%E7%BD%AE%E7%B2%BE%E5%8D%8E%E6%B6%88%E6%81%AF
+// @route(set_essence_msg)
 func (bot *CQBot) CQSetEssenceMessage(messageID int32) global.MSG {
-	msg, err := bot.db.GetGroupMessageByGlobalID(messageID)
+	msg, err := db.GetGroupMessageByGlobalID(messageID)
 	if err != nil {
 		return Failed(100, "MESSAGE_NOT_FOUND", "消息不存在")
 	}
@@ -1316,8 +1674,9 @@ func (bot *CQBot) CQSetEssenceMessage(messageID int32) global.MSG {
 // CQDeleteEssenceMessage 扩展API-移出精华消息
 //
 // https://docs.go-cqhttp.org/api/#%E7%A7%BB%E5%87%BA%E7%B2%BE%E5%8D%8E%E6%B6%88%E6%81%AF
+// @route(delete_essence_msg)
 func (bot *CQBot) CQDeleteEssenceMessage(messageID int32) global.MSG {
-	msg, err := bot.db.GetGroupMessageByGlobalID(messageID)
+	msg, err := db.GetGroupMessageByGlobalID(messageID)
 	if err != nil {
 		return Failed(100, "MESSAGE_NOT_FOUND", "消息不存在")
 	}
@@ -1331,12 +1690,13 @@ func (bot *CQBot) CQDeleteEssenceMessage(messageID int32) global.MSG {
 // CQGetEssenceMessageList 扩展API-获取精华消息列表
 //
 // https://docs.go-cqhttp.org/api/#%E8%8E%B7%E5%8F%96%E7%B2%BE%E5%8D%8E%E6%B6%88%E6%81%AF%E5%88%97%E8%A1%A8
-func (bot *CQBot) CQGetEssenceMessageList(groupCode int64) global.MSG {
-	g := bot.Client.FindGroup(groupCode)
+// @route(get_essence_msg_list)
+func (bot *CQBot) CQGetEssenceMessageList(groupID int64) global.MSG {
+	g := bot.Client.FindGroup(groupID)
 	if g == nil {
 		return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 	}
-	msgList, err := bot.Client.GetGroupEssenceMsgList(groupCode)
+	msgList, err := bot.Client.GetGroupEssenceMsgList(groupID)
 	if err != nil {
 		return Failed(100, "GET_ESSENCE_LIST_FOUND", err.Error())
 	}
@@ -1350,7 +1710,7 @@ func (bot *CQBot) CQGetEssenceMessageList(groupCode int64) global.MSG {
 			"sender_id":     m.SenderUin,
 			"operator_id":   m.AddDigestUin,
 		}
-		msg["message_id"] = db.ToGlobalID(groupCode, int32(m.MessageID))
+		msg["message_id"] = db.ToGlobalID(groupID, int32(m.MessageID))
 		list = append(list, msg)
 	}
 	return OK(list)
@@ -1359,6 +1719,7 @@ func (bot *CQBot) CQGetEssenceMessageList(groupCode int64) global.MSG {
 // CQCheckURLSafely 扩展API-检查链接安全性
 //
 // https://docs.go-cqhttp.org/api/#%E6%A3%80%E6%9F%A5%E9%93%BE%E6%8E%A5%E5%AE%89%E5%85%A8%E6%80%A7
+// @route(check_url_safely)
 func (bot *CQBot) CQCheckURLSafely(url string) global.MSG {
 	return OK(global.MSG{
 		"level": bot.Client.CheckUrlSafely(url),
@@ -1368,6 +1729,7 @@ func (bot *CQBot) CQCheckURLSafely(url string) global.MSG {
 // CQGetVersionInfo 获取版本信息
 //
 // https://git.io/JtwUs
+// @route(get_version_info)
 func (bot *CQBot) CQGetVersionInfo() global.MSG {
 	wd, _ := os.Getwd()
 	return OK(global.MSG{
@@ -1406,8 +1768,9 @@ func (bot *CQBot) CQGetVersionInfo() global.MSG {
 // CQGetModelShow 获取在线机型
 //
 // https://club.vip.qq.com/onlinestatus/set
-func (bot *CQBot) CQGetModelShow(modelName string) global.MSG {
-	variants, err := bot.Client.GetModelShow(modelName)
+// @route(_get_model_show)
+func (bot *CQBot) CQGetModelShow(model string) global.MSG {
+	variants, err := bot.Client.GetModelShow(model)
 	if err != nil {
 		return Failed(100, "GET_MODEL_SHOW_API_ERROR", "无法获取在线机型")
 	}
@@ -1426,8 +1789,9 @@ func (bot *CQBot) CQGetModelShow(modelName string) global.MSG {
 // CQSetModelShow 设置在线机型
 //
 // https://club.vip.qq.com/onlinestatus/set
-func (bot *CQBot) CQSetModelShow(modelName string, modelShow string) global.MSG {
-	err := bot.Client.SetModelShow(modelName, modelShow)
+// @route(_set_model_show)
+func (bot *CQBot) CQSetModelShow(model, modelShow string) global.MSG {
+	err := bot.Client.SetModelShow(model, modelShow)
 	if err != nil {
 		return Failed(100, "SET_MODEL_SHOW_API_ERROR", "无法设置在线机型")
 	}
@@ -1435,8 +1799,10 @@ func (bot *CQBot) CQSetModelShow(modelName string, modelShow string) global.MSG
 }
 
 // CQMarkMessageAsRead 标记消息已读
+// @route(mark_msg_as_read)
+// @rename(msg_id->message_id)
 func (bot *CQBot) CQMarkMessageAsRead(msgID int32) global.MSG {
-	m, err := bot.db.GetMessageByGlobalID(msgID)
+	m, err := db.GetMessageByGlobalID(msgID)
 	if err != nil {
 		return Failed(100, "MSG_NOT_FOUND", "消息不存在")
 	}
@@ -1450,6 +1816,14 @@ func (bot *CQBot) CQMarkMessageAsRead(msgID int32) global.MSG {
 	return OK(nil)
 }
 
+// CQReloadEventFilter 重载事件过滤器
+//
+// @route(reload_event_filter)
+func (bot *CQBot) CQReloadEventFilter(file string) global.MSG {
+	filter.Add(file)
+	return OK(nil)
+}
+
 // OK 生成成功返回值
 func OK(data interface{}) global.MSG {
 	return global.MSG{"data": data, "retcode": 0, "status": "ok"}
@@ -1468,46 +1842,6 @@ func Failed(code int, msg ...string) global.MSG {
 	return global.MSG{"data": nil, "retcode": code, "msg": m, "wording": w, "status": "failed"}
 }
 
-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 limitedString(str string) string {
 	limited := [14]rune{10: ' ', 11: '.', 12: '.', 13: '.'}
 	i := 0

coolq/bot.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/go-cqhttp/internal/base"
-	"github.com/Mrs4s/go-cqhttp/modules/config"
 )
 
 // CQBot CQBot结构体,存储Bot实例相关配置
@@ -33,7 +32,6 @@ type CQBot struct {
 	lock   sync.RWMutex
 	events []func(*Event)
 
-	db               db.IDatabase
 	friendReqCache   sync.Map
 	tempSessionCache sync.Map
 }
@@ -71,30 +69,6 @@ func NewQQBot(cli *client.QQClient) *CQBot {
 	bot := &CQBot{
 		Client: cli,
 	}
-	levelNode, levelDB := base.Database["leveldb"]
-	mongoNode, mongoDB := base.Database["mongodb"]
-	multiDB := db.NewMultiDatabase()
-	if levelDB {
-		lconf := new(config.LevelDBConfig)
-		_ = levelNode.Decode(lconf)
-		if lconf.Enable {
-			multiDB.UseDB(db.UseLevelDB())
-		}
-	}
-	if mongoDB {
-		lconf := new(config.MongoDBConfig)
-		_ = mongoNode.Decode(lconf)
-		if lconf.Database == "" {
-			lconf.Database = "gocq-database"
-		}
-		if lconf.Enable {
-			multiDB.UseDB(db.UseMongoDB(lconf.URI, lconf.Database))
-		}
-	}
-	if err := multiDB.Open(); err != nil {
-		log.Fatalf("打开数据库失败: %v", err)
-	}
-	bot.db = multiDB
 	bot.Client.OnPrivateMessage(bot.privateMessageEvent)
 	bot.Client.OnGroupMessage(bot.groupMessageEvent)
 	if base.ReportSelfMessage {
@@ -102,6 +76,11 @@ func NewQQBot(cli *client.QQClient) *CQBot {
 		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.GuildService.OnGuildChannelCreated(bot.guildChannelCreatedEvent)
+	bot.Client.GuildService.OnGuildChannelDestroyed(bot.guildChannelDestroyedEvent)
 	bot.Client.OnGroupMuted(bot.groupMutedEvent)
 	bot.Client.OnGroupMessageRecalled(bot.groupRecallEvent)
 	bot.Client.OnGroupNotify(bot.groupNotifyEvent)
@@ -176,7 +155,7 @@ func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message
 	if err != nil {
 		return nil, err
 	}
-	defer video.Close()
+	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)
@@ -204,6 +183,34 @@ func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement
 	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)
+}
+
+func (bot *CQBot) uploadGuildVideo(i *LocalVideoElement, guildID, channelID uint64) (*message.ShortVideoElement, error) {
+	video, err := os.Open(i.File)
+	if err != nil {
+		return nil, err
+	}
+	defer func() { _ = video.Close() }()
+	_, _ = video.Seek(0, io.SeekStart)
+	_, _ = i.thumb.Seek(0, io.SeekStart)
+	n, err := bot.Client.UploadGuildShortVideo(guildID, channelID, video, i.thumb)
+	return n, err
+}
+
 // SendGroupMessage 发送群消息
 func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int32 {
 	newElem := make([]message.IMessageElement, 0, len(m.Elements))
@@ -224,9 +231,6 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int
 				}
 			}
 			return 0
-		case *GiftElement:
-			bot.Client.SendGroupGift(uint64(groupID), uint64(i.Target), i.GiftID)
-			return 0
 		case *message.MusicShareElement:
 			ret, err := bot.Client.SendGroupMusicShare(groupID, i)
 			if err != nil {
@@ -246,7 +250,7 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int
 		return -1
 	}
 	m.Elements = newElem
-	bot.checkMedia(newElem)
+	bot.checkMedia(newElem, groupID)
 	ret := bot.Client.SendGroupMessage(groupID, m, base.ForceFragmented)
 	if ret == nil || ret.Id == -1 {
 		log.Warnf("群消息发送失败: 账号可能被风控.")
@@ -281,7 +285,7 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 		return -1
 	}
 	m.Elements = newElem
-	bot.checkMedia(newElem)
+	bot.checkMedia(newElem, bot.Client.Uin)
 
 	// 单向好友是否存在
 	unidirectionalFriendExists := func() bool {
@@ -348,6 +352,48 @@ func (bot *CQBot) SendPrivateMessage(target int64, groupID int64, m *message.Sen
 	return id
 }
 
+// SendGuildChannelMessage 发送频道消息
+func (bot *CQBot) SendGuildChannelMessage(guildID, channelID uint64, m *message.SendingMessage) string {
+	newElem := make([]message.IMessageElement, 0, len(m.Elements))
+	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:
+			n, err := bot.uploadGuildVideo(i, guildID, channelID)
+			if err != nil {
+				log.Warnf("警告: 频道 %d 消息%s上传失败: %v", channelID, e.Type().String(), err)
+				continue
+			}
+			e = n
+
+		case *LocalVoiceElement, *PokeElement, *message.MusicShareElement:
+			log.Warnf("警告: 频道暂不支持发送 %v 消息", i.Type().String())
+			continue
+		}
+		newElem = append(newElem, e)
+	}
+	if len(newElem) == 0 {
+		log.Warnf("频道消息发送失败: 消息为空.")
+		return ""
+	}
+	m.Elements = newElem
+	bot.checkMedia(newElem, bot.Client.Uin)
+	ret, err := bot.Client.GuildService.SendGuildChannelMessage(guildID, channelID, m)
+	if err != nil {
+		log.Warnf("频道消息发送失败: %v", err)
+		return ""
+	}
+	// todo: insert db
+	return fmt.Sprintf("%v-%v", ret.Id, ret.InternalId)
+}
+
 // InsertGroupMessage 群聊消息入数据库
 func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
 	t := &message.SendingMessage{Elements: m.Elements}
@@ -384,7 +430,7 @@ func (bot *CQBot) InsertGroupMessage(m *message.GroupMessage) int32 {
 			QuotedContent: ToMessageContent(reply.Elements),
 		}
 	}
-	if err := bot.db.InsertGroupMessage(msg); err != nil {
+	if err := db.InsertGroupMessage(msg); err != nil {
 		log.Warnf("记录聊天数据时出现错误: %v", err)
 		return -1
 	}
@@ -424,10 +470,10 @@ func (bot *CQBot) InsertPrivateMessage(m *message.PrivateMessage) int32 {
 		msg.QuotedInfo = &db.QuotedInfo{
 			PrevID:        encodeMessageID(reply.Sender, reply.ReplySeq),
 			PrevGlobalID:  db.ToGlobalID(reply.Sender, reply.ReplySeq),
-			QuotedContent: ToMessageContent(m.Elements),
+			QuotedContent: ToMessageContent(reply.Elements),
 		}
 	}
-	if err := bot.db.InsertPrivateMessage(msg); err != nil {
+	if err := db.InsertPrivateMessage(msg); err != nil {
 		log.Warnf("记录聊天数据时出现错误: %v", err)
 		return -1
 	}
@@ -497,76 +543,6 @@ func (bot *CQBot) dispatchEventMessage(m global.MSG) {
 	global.PutBuffer(event.buffer)
 }
 
-func (bot *CQBot) formatGroupMessage(m *message.GroupMessage) global.MSG {
-	cqm := ToStringMessage(m.Elements, m.GroupCode, true)
-	gm := global.MSG{
-		"anonymous":    nil,
-		"font":         0,
-		"group_id":     m.GroupCode,
-		"message":      ToFormattedMessage(m.Elements, m.GroupCode, false),
-		"message_type": "group",
-		"message_seq":  m.Id,
-		"post_type": func() string {
-			if m.Sender.Uin == bot.Client.Uin {
-				return "message_sent"
-			}
-			return "message"
-		}(),
-		"raw_message": cqm,
-		"self_id":     bot.Client.Uin,
-		"sender": global.MSG{
-			"age":     0,
-			"area":    "",
-			"level":   "",
-			"sex":     "unknown",
-			"user_id": m.Sender.Uin,
-		},
-		"sub_type": "normal",
-		"time":     m.Time,
-		"user_id":  m.Sender.Uin,
-	}
-	if m.Sender.IsAnonymous() {
-		gm["anonymous"] = global.MSG{
-			"flag": m.Sender.AnonymousInfo.AnonymousId + "|" + m.Sender.AnonymousInfo.AnonymousNick,
-			"id":   m.Sender.Uin,
-			"name": m.Sender.AnonymousInfo.AnonymousNick,
-		}
-		gm["sender"].(global.MSG)["nickname"] = "匿名消息"
-		gm["sub_type"] = "anonymous"
-	} else {
-		group := bot.Client.FindGroup(m.GroupCode)
-		mem := group.FindMember(m.Sender.Uin)
-		if mem == nil {
-			log.Warnf("获取 %v 成员信息失败，尝试刷新成员列表", m.Sender.Uin)
-			t, err := bot.Client.GetGroupMembers(group)
-			if err != nil {
-				log.Warnf("刷新群 %v 成员列表失败: %v", group.Uin, err)
-				return nil
-			}
-			group.Members = t
-			mem = group.FindMember(m.Sender.Uin)
-			if mem == nil {
-				return nil
-			}
-		}
-		ms := gm["sender"].(global.MSG)
-		switch mem.Permission {
-		case client.Owner:
-			ms["role"] = "owner"
-		case client.Administrator:
-			ms["role"] = "admin"
-		case client.Member:
-			ms["role"] = "member"
-		default:
-			ms["role"] = "member"
-		}
-		ms["nickname"] = mem.Nickname
-		ms["card"] = mem.CardName
-		ms["title"] = mem.SpecialTitle
-	}
-	return gm
-}
-
 func formatGroupName(group *client.GroupInfo) string {
 	return fmt.Sprintf("%s(%d)", group.Name, group.Code)
 }

coolq/converter.go

@@ -0,0 +1,207 @@
+package coolq
+
+import (
+	"strconv"
+
+	"github.com/Mrs4s/MiraiGo/topic"
+
+	"github.com/Mrs4s/MiraiGo/client"
+	"github.com/Mrs4s/MiraiGo/message"
+	log "github.com/sirupsen/logrus"
+
+	"github.com/Mrs4s/go-cqhttp/global"
+)
+
+func convertGroupMemberInfo(groupID int64, m *client.GroupMemberInfo) global.MSG {
+	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":  fU64(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":        fU64(c.ChannelId),
+		"channel_type":      c.ChannelType,
+		"channel_name":      c.ChannelName,
+		"owner_guild_id":    fU64(c.Meta.GuildId),
+		"creator_id":        c.Meta.CreatorUin,
+		"creator_tiny_id":   fU64(c.Meta.CreatorTinyId),
+		"create_time":       c.Meta.CreateTime,
+		"current_slow_mode": c.Meta.CurrentSlowMode,
+		"talk_permission":   c.Meta.TalkPermission,
+		"visible_type":      c.Meta.VisibleType,
+		"slow_modes":        slowModes,
+	}
+}
+
+func convertChannelFeedInfo(f *topic.Feed) global.MSG {
+	m := global.MSG{
+		"id":          f.Id,
+		"title":       f.Title,
+		"sub_title":   f.SubTitle,
+		"create_time": f.CreateTime,
+		"guild_id":    fU64(f.GuildId),
+		"channel_id":  fU64(f.ChannelId),
+		"poster_info": global.MSG{
+			"tiny_id":  f.Poster.TinyIdStr,
+			"nickname": f.Poster.Nickname,
+			"icon_url": f.Poster.IconUrl,
+		},
+		"contents": FeedContentsToArrayMessage(f.Contents),
+	}
+	images := make([]global.MSG, 0, len(f.Images))
+	videos := make([]global.MSG, 0, len(f.Videos))
+	for _, image := range f.Images {
+		images = append(images, global.MSG{
+			"file_id":    image.FileId,
+			"pattern_id": image.PatternId,
+			"url":        image.Url,
+			"width":      image.Width,
+			"height":     image.Height,
+		})
+	}
+	for _, video := range f.Videos {
+		videos = append(videos, global.MSG{
+			"file_id":    video.FileId,
+			"pattern_id": video.PatternId,
+			"url":        video.Url,
+			"width":      video.Width,
+			"height":     video.Height,
+		})
+	}
+	m["resource"] = global.MSG{
+		"images": images,
+		"videos": videos,
+	}
+	return m
+}
+
+func fU64(v uint64) string {
+	return strconv.FormatUint(v, 10)
+}

coolq/cqcode.go

@@ -36,22 +36,11 @@ var typeReg = regexp.MustCompile(`\[CQ:(\w+)`)
 var paramReg = regexp.MustCompile(`,([\w\-.]+?)=([^,\]]+)`)
 */
 
-const (
-	maxImageSize = 1024 * 1024 * 30  // 30MB
-	maxVideoSize = 1024 * 1024 * 100 // 100MB
-)
-
 // PokeElement 拍一拍
 type PokeElement struct {
 	Target int64
 }
 
-// GiftElement 礼物
-type GiftElement struct {
-	Target int64
-	GiftID message.GroupGift
-}
-
 // LocalImageElement 本地图片
 type LocalImageElement struct {
 	Stream io.ReadSeeker
@@ -73,40 +62,40 @@ type LocalVideoElement struct {
 	thumb io.ReadSeeker
 }
 
+// MessageSource 消息来源
+// 如果为私聊或者群聊, PrimaryID 将代表群号/QQ号
+// 如果为频道, PrimaryID 为 GuildID, SubID 为 ChannelID
+type MessageSource struct {
+	SourceType MessageSourceType
+	PrimaryID  uint64
+	SubID      uint64
+}
+
+// MessageSourceType 消息来源类型
+type MessageSourceType int32
+
+// MessageSourceType 常量
+const (
+	MessageSourcePrivate      MessageSourceType = 0
+	MessageSourceGroup        MessageSourceType = 1
+	MessageSourceGuildChannel MessageSourceType = 2
+)
+
+const (
+	maxImageSize = 1024 * 1024 * 30  // 30MB
+	maxVideoSize = 1024 * 1024 * 100 // 100MB
+)
+
 // Type implements the message.IMessageElement.
 func (e *LocalImageElement) Type() message.ElementType {
 	return message.Image
 }
 
-// Type 获取元素类型ID
-func (e *GiftElement) Type() message.ElementType {
-	// Make message.IMessageElement Happy
-	return message.At
-}
-
 // Type impl message.IMessageElement
 func (e *LocalVideoElement) Type() message.ElementType {
 	return message.Video
 }
 
-// GiftID 礼物ID数组
-var GiftID = [...]message.GroupGift{
-	message.SweetWink,
-	message.HappyCola,
-	message.LuckyBracelet,
-	message.Cappuccino,
-	message.CatWatch,
-	message.FleeceGloves,
-	message.RainbowCandy,
-	message.Stronger,
-	message.LoveMicrophone,
-	message.HoldingYourHand,
-	message.CuteCat,
-	message.MysteryMask,
-	message.ImBusy,
-	message.LoveMask,
-}
-
 // Type 获取元素类型ID
 func (e *PokeElement) Type() message.ElementType {
 	// Make message.IMessageElement Happy
@@ -114,19 +103,22 @@ func (e *PokeElement) Type() message.ElementType {
 }
 
 // ToArrayMessage 将消息元素数组转为MSG数组以用于消息上报
-func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []global.MSG) {
+func ToArrayMessage(e []message.IMessageElement, source MessageSource) (r []global.MSG) {
 	r = make([]global.MSG, 0, len(e))
 	m := &message.SendingMessage{Elements: e}
 	reply := m.FirstOrNil(func(e message.IMessageElement) bool {
 		_, ok := e.(*message.ReplyElement)
 		return ok
 	})
-	if reply != nil {
+	if reply != nil && source.SourceType == MessageSourceGroup {
 		replyElem := reply.(*message.ReplyElement)
-		rid := groupID
+		rid := int64(source.PrimaryID)
 		if rid == 0 {
 			rid = replyElem.Sender
 		}
+		if replyElem.GroupID != 0 {
+			rid = replyElem.GroupID
+		}
 		if base.ExtraReplyData {
 			r = append(r, global.MSG{
 				"type": "reply",
@@ -135,7 +127,7 @@ func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []global.MSG)
 					"seq":  strconv.FormatInt(int64(replyElem.ReplySeq), 10),
 					"qq":   strconv.FormatInt(replyElem.Sender, 10),
 					"time": strconv.FormatInt(int64(replyElem.Time), 10),
-					"text": ToStringMessage(replyElem.Elements, groupID),
+					"text": ToStringMessage(replyElem.Elements, source),
 				},
 			})
 		} else {
@@ -174,7 +166,7 @@ func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []global.MSG)
 			} else {
 				m = global.MSG{
 					"type": "at",
-					"data": map[string]string{"qq": strconv.FormatInt(o.Target, 10)},
+					"data": map[string]string{"qq": strconv.FormatUint(uint64(o.Target), 10)},
 				}
 			}
 		case *message.RedBagElement:
@@ -215,6 +207,12 @@ func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []global.MSG)
 				"type": "image",
 				"data": data,
 			}
+		case *message.GuildImageElement:
+			data := map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url}
+			m = global.MSG{
+				"type": "image",
+				"data": data,
+			}
 		case *message.FriendImageElement:
 			data := map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url}
 			if o.Flash {
@@ -224,6 +222,16 @@ func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []global.MSG)
 				"type": "image",
 				"data": data,
 			}
+		case *message.DiceElement:
+			m = global.MSG{
+				"type": "dice",
+				"data": map[string]string{"value": fmt.Sprint(o.Value)},
+			}
+		case *message.MarketFaceElement:
+			m = global.MSG{
+				"type": "text",
+				"data": map[string]string{"text": o.Name},
+			}
 		case *message.ServiceElement:
 			if isOk := strings.Contains(o.Content, "<?xml"); isOk {
 				m = global.MSG{
@@ -236,6 +244,11 @@ func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []global.MSG)
 					"data": map[string]string{"data": o.Content, "resid": strconv.FormatInt(int64(o.Id), 10)},
 				}
 			}
+		case *message.AnimatedSticker:
+			m = global.MSG{
+				"type": "face",
+				"data": map[string]string{"id": strconv.FormatInt(int64(o.ID), 10), "type": "sticker"},
+			}
 		default:
 			continue
 		}
@@ -247,7 +260,7 @@ func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []global.MSG)
 }
 
 // ToStringMessage 将消息元素数组转为字符串以用于消息上报
-func ToStringMessage(e []message.IMessageElement, groupID int64, isRaw ...bool) (r string) {
+func ToStringMessage(e []message.IMessageElement, source MessageSource, isRaw ...bool) (r string) {
 	sb := global.NewBuffer()
 	sb.Reset()
 	write := func(format string, a ...interface{}) {
@@ -263,17 +276,20 @@ func ToStringMessage(e []message.IMessageElement, groupID int64, isRaw ...bool)
 		_, ok := e.(*message.ReplyElement)
 		return ok
 	})
-	if reply != nil {
+	if reply != nil && source.SourceType == MessageSourceGroup {
 		replyElem := reply.(*message.ReplyElement)
-		rid := groupID
+		rid := int64(source.PrimaryID)
 		if rid == 0 {
 			rid = replyElem.Sender
 		}
+		if replyElem.GroupID != 0 {
+			rid = replyElem.GroupID
+		}
 		if base.ExtraReplyData {
 			write("[CQ:reply,id=%d,seq=%d,qq=%d,time=%d,text=%s]",
 				db.ToGlobalID(rid, replyElem.ReplySeq),
 				replyElem.ReplySeq, replyElem.Sender, replyElem.Time,
-				CQCodeEscapeValue(ToStringMessage(replyElem.Elements, groupID)))
+				CQCodeEscapeValue(ToStringMessage(replyElem.Elements, source)))
 		} else {
 			write("[CQ:reply,id=%d]", db.ToGlobalID(rid, replyElem.ReplySeq))
 		}
@@ -294,7 +310,7 @@ func ToStringMessage(e []message.IMessageElement, groupID int64, isRaw ...bool)
 				write("[CQ:at,qq=all]")
 				continue
 			}
-			write("[CQ:at,qq=%d]", o.Target)
+			write("[CQ:at,qq=%d]", uint64(o.Target))
 		case *message.RedBagElement:
 			write("[CQ:redbag,title=%s]", o.Title)
 		case *message.ForwardElement:
@@ -336,6 +352,12 @@ func ToStringMessage(e []message.IMessageElement, groupID int64, isRaw ...bool)
 			} else {
 				write("[CQ:image,file=%s,url=%s%s]", hex.EncodeToString(o.Md5)+".image", CQCodeEscapeValue(o.Url), arg)
 			}
+		case *message.GuildImageElement:
+			write("[CQ:image,file=%s,url=%s]", hex.EncodeToString(o.Md5)+".image", CQCodeEscapeValue(o.Url))
+		case *message.DiceElement:
+			write("[CQ:dice,value=%v]", o.Value)
+		case *message.MarketFaceElement:
+			sb.WriteString(o.Name)
 		case *message.ServiceElement:
 			if isOk := strings.Contains(o.Content, "<?xml"); isOk {
 				write(`[CQ:xml,data=%s,resid=%d]`, CQCodeEscapeValue(o.Content), o.Id)
@@ -344,6 +366,8 @@ func ToStringMessage(e []message.IMessageElement, groupID int64, isRaw ...bool)
 			}
 		case *message.LightAppElement:
 			write(`[CQ:json,data=%s]`, CQCodeEscapeValue(o.Content))
+		case *message.AnimatedSticker:
+			write(`[CQ:face,id=%d,type=sticker]`, o.ID)
 		}
 	}
 	r = sb.String() // 内部已拷贝
@@ -433,6 +457,10 @@ func ToMessageContent(e []message.IMessageElement) (r []global.MSG) {
 				"type": "image",
 				"data": data,
 			}
+		case *message.DiceElement:
+			m = global.MSG{"type": "dice", "data": global.MSG{"value": o.Value}}
+		case *message.MarketFaceElement:
+			m = global.MSG{"type": "text", "data": global.MSG{"text": o.Name}}
 		case *message.ServiceElement:
 			if isOk := strings.Contains(o.Content, "<?xml"); isOk {
 				m = global.MSG{
@@ -445,6 +473,11 @@ func ToMessageContent(e []message.IMessageElement) (r []global.MSG) {
 					"data": global.MSG{"data": o.Content, "resid": o.Id},
 				}
 			}
+		case *message.AnimatedSticker:
+			m = global.MSG{
+				"type": "face",
+				"data": global.MSG{"id": o.ID, "type": "sticker"},
+			}
 		default:
 			continue
 		}
@@ -456,7 +489,7 @@ func ToMessageContent(e []message.IMessageElement) (r []global.MSG) {
 }
 
 // ConvertStringMessage 将消息字符串转为消息元素数组
-func (bot *CQBot) ConvertStringMessage(raw string, isGroup bool) (r []message.IMessageElement) {
+func (bot *CQBot) ConvertStringMessage(raw string, sourceType MessageSourceType) (r []message.IMessageElement) {
 	var t, key string
 	d := map[string]string{}
 
@@ -473,7 +506,7 @@ func (bot *CQBot) ConvertStringMessage(raw string, isGroup bool) (r []message.IM
 			switch {
 			case customText != "":
 				var elem *message.ReplyElement
-				var org db.IStoredMessage
+				var org db.StoredMessage
 				sender, senderErr := strconv.ParseInt(d["qq"], 10, 64)
 				if senderErr != nil && err != nil {
 					log.Warnf("警告: 自定义 Reply 元素中必须包含 Uin 或 id")
@@ -485,14 +518,14 @@ func (bot *CQBot) ConvertStringMessage(raw string, isGroup bool) (r []message.IM
 				}
 				messageSeq, seqErr := strconv.ParseInt(d["seq"], 10, 64)
 				if err == nil {
-					org, _ = bot.db.GetMessageByGlobalID(int32(mid))
+					org, _ = db.GetMessageByGlobalID(int32(mid))
 				}
 				if org != nil {
 					elem = &message.ReplyElement{
 						ReplySeq: org.GetAttribute().MessageSeq,
 						Sender:   org.GetAttribute().SenderUin,
 						Time:     int32(org.GetAttribute().Timestamp),
-						Elements: bot.ConvertStringMessage(customText, isGroup),
+						Elements: bot.ConvertStringMessage(customText, sourceType),
 					}
 					if senderErr != nil {
 						elem.Sender = sender
@@ -508,19 +541,19 @@ func (bot *CQBot) ConvertStringMessage(raw string, isGroup bool) (r []message.IM
 						ReplySeq: int32(messageSeq),
 						Sender:   sender,
 						Time:     int32(msgTime),
-						Elements: bot.ConvertStringMessage(customText, isGroup),
+						Elements: bot.ConvertStringMessage(customText, sourceType),
 					}
 				}
 				r = append([]message.IMessageElement{elem}, r...)
 			case err == nil:
-				org, err := bot.db.GetMessageByGlobalID(int32(mid))
+				org, err := db.GetMessageByGlobalID(int32(mid))
 				if err == nil {
 					r = append([]message.IMessageElement{
 						&message.ReplyElement{
 							ReplySeq: org.GetAttribute().MessageSeq,
 							Sender:   org.GetAttribute().SenderUin,
 							Time:     int32(org.GetAttribute().Timestamp),
-							Elements: bot.ConvertContentMessage(org.GetContent(), isGroup),
+							Elements: bot.ConvertContentMessage(org.GetContent(), sourceType),
 						},
 					}, r...)
 				}
@@ -541,7 +574,7 @@ func (bot *CQBot) ConvertStringMessage(raw string, isGroup bool) (r []message.IM
 			}
 			return
 		}
-		elem, err := bot.ToElement(t, d, isGroup)
+		elem, err := bot.ToElement(t, d, sourceType)
 		if err != nil {
 			org := "[CQ:" + t
 			for k, v := range d {
@@ -629,11 +662,11 @@ func (bot *CQBot) ConvertStringMessage(raw string, isGroup bool) (r []message.IM
 }
 
 // ConvertObjectMessage 将消息JSON对象转为消息元素数组
-func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []message.IMessageElement) {
+func (bot *CQBot) ConvertObjectMessage(m gjson.Result, sourceType MessageSourceType) (r []message.IMessageElement) {
 	d := make(map[string]string)
 	convertElem := func(e gjson.Result) {
 		t := e.Get("type").Str
-		if t == "reply" && isGroup {
+		if t == "reply" && sourceType == MessageSourceGroup {
 			if len(r) > 0 {
 				if _, ok := r[0].(*message.ReplyElement); ok {
 					log.Warnf("警告: 一条信息只能包含一个 Reply 元素.")
@@ -645,7 +678,7 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []messag
 			switch {
 			case customText != "":
 				var elem *message.ReplyElement
-				var org db.IStoredMessage
+				var org db.StoredMessage
 				sender, senderErr := strconv.ParseInt(e.Get("data.[user_id,qq]").String(), 10, 64)
 				if senderErr != nil && err != nil {
 					log.Warnf("警告: 自定义 Reply 元素中必须包含 user_id 或 id")
@@ -657,14 +690,14 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []messag
 				}
 				messageSeq, seqErr := strconv.ParseInt(e.Get("data.seq").String(), 10, 64)
 				if err == nil {
-					org, _ = bot.db.GetMessageByGlobalID(int32(mid))
+					org, _ = db.GetMessageByGlobalID(int32(mid))
 				}
 				if org != nil {
 					elem = &message.ReplyElement{
 						ReplySeq: org.GetAttribute().MessageSeq,
 						Sender:   org.GetAttribute().SenderUin,
 						Time:     int32(org.GetAttribute().Timestamp),
-						Elements: bot.ConvertStringMessage(customText, isGroup),
+						Elements: bot.ConvertStringMessage(customText, sourceType),
 					}
 					if senderErr != nil {
 						elem.Sender = sender
@@ -680,19 +713,19 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []messag
 						ReplySeq: int32(messageSeq),
 						Sender:   sender,
 						Time:     int32(msgTime),
-						Elements: bot.ConvertStringMessage(customText, isGroup),
+						Elements: bot.ConvertStringMessage(customText, sourceType),
 					}
 				}
 				r = append([]message.IMessageElement{elem}, r...)
 			case err == nil:
-				org, err := bot.db.GetMessageByGlobalID(int32(mid))
+				org, err := db.GetMessageByGlobalID(int32(mid))
 				if err == nil {
 					r = append([]message.IMessageElement{
 						&message.ReplyElement{
 							ReplySeq: org.GetAttribute().MessageSeq,
 							Sender:   org.GetAttribute().SenderUin,
 							Time:     int32(org.GetAttribute().Timestamp),
-							Elements: bot.ConvertContentMessage(org.GetContent(), isGroup),
+							Elements: bot.ConvertContentMessage(org.GetContent(), sourceType),
 						},
 					}, r...)
 				}
@@ -721,7 +754,7 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []messag
 			d[key.Str] = value.String()
 			return true
 		})
-		elem, err := bot.ToElement(t, d, isGroup)
+		elem, err := bot.ToElement(t, d, sourceType)
 		if err != nil {
 			log.Warnf("转换CQ码 (%v) 到MiraiGo Element时出现错误: %v 将忽略本段CQ码.", e.Raw, err)
 			return
@@ -734,7 +767,7 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []messag
 		}
 	}
 	if m.Type == gjson.String {
-		return bot.ConvertStringMessage(m.Str, isGroup)
+		return bot.ConvertStringMessage(m.Str, sourceType)
 	}
 	if m.IsArray() {
 		m.ForEach(func(_, e gjson.Result) bool {
@@ -749,14 +782,14 @@ func (bot *CQBot) ConvertObjectMessage(m gjson.Result, isGroup bool) (r []messag
 }
 
 // ConvertContentMessage 将数据库用的 content 转换为消息元素数组
-func (bot *CQBot) ConvertContentMessage(content []global.MSG, group bool) (r []message.IMessageElement) {
+func (bot *CQBot) ConvertContentMessage(content []global.MSG, sourceType MessageSourceType) (r []message.IMessageElement) {
 	for _, c := range content {
 		data := c["data"].(global.MSG)
 		switch c["type"] {
 		case "text":
 			r = append(r, message.NewText(data["text"].(string)))
 		case "image":
-			e, err := bot.makeImageOrVideoElem(map[string]string{"file": data["file"].(string)}, false, group)
+			e, err := bot.makeImageOrVideoElem(map[string]string{"file": data["file"].(string)}, false, sourceType)
 			if err != nil {
 				log.Warnf("make image elem error: %v", err)
 				continue
@@ -806,7 +839,7 @@ func (bot *CQBot) ConvertContentMessage(content []global.MSG, group bool) (r []m
 		case "face":
 			r = append(r, message.NewFace(data["id"].(int32)))
 		case "video":
-			e, err := bot.makeImageOrVideoElem(map[string]string{"file": data["file"].(string)}, true, group)
+			e, err := bot.makeImageOrVideoElem(map[string]string{"file": data["file"].(string)}, true, sourceType)
 			if err != nil {
 				log.Warnf("make image elem error: %v", err)
 				continue
@@ -822,7 +855,7 @@ func (bot *CQBot) ConvertContentMessage(content []global.MSG, group bool) (r []m
 // 返回 interface{} 存在三种类型
 //
 // message.IMessageElement []message.IMessageElement nil
-func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m interface{}, err error) {
+func (bot *CQBot) ToElement(t string, d map[string]string, sourceType MessageSourceType) (m interface{}, err error) {
 	switch t {
 	case "text":
 		if base.SplitURL {
@@ -834,7 +867,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 		}
 		return message.NewText(d["text"]), nil
 	case "image":
-		img, err := bot.makeImageOrVideoElem(d, false, isGroup)
+		img, err := bot.makeImageOrVideoElem(d, false, sourceType)
 		if err != nil {
 			return nil, err
 		}
@@ -867,16 +900,6 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 	case "poke":
 		t, _ := strconv.ParseInt(d["qq"], 10, 64)
 		return &PokeElement{Target: t}, nil
-	case "gift":
-		if !isGroup {
-			return nil, errors.New("private gift unsupported") // no free private gift
-		}
-		t, _ := strconv.ParseInt(d["qq"], 10, 64)
-		id, _ := strconv.Atoi(d["id"])
-		if id < 0 || id >= 14 {
-			return nil, errors.New("invalid gift id")
-		}
-		return &GiftElement{Target: t, GiftID: GiftID[id]}, nil
 	case "tts":
 		defer func() {
 			if r := recover(); r != nil {
@@ -916,6 +939,9 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 		if err != nil {
 			return nil, err
 		}
+		if d["type"] == "sticker" {
+			return &message.AnimatedSticker{ID: int32(id)}, nil
+		}
 		return message.NewFace(int32(id)), nil
 	case "at":
 		qq := d["qq"]
@@ -1017,6 +1043,13 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 			}, nil
 		}
 		return nil, errors.New("unsupported music type: " + d["type"])
+	case "dice":
+		value := d["value"]
+		i, _ := strconv.ParseInt(value, 10, 64)
+		if i < 0 || i > 6 {
+			return nil, errors.New("invalid dice value " + value)
+		}
+		return message.NewDice(int32(i)), nil
 	case "xml":
 		resID := d["resid"]
 		template := CQCodeEscapeValue(d["data"])
@@ -1049,17 +1082,13 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 		maxWidth := parseIntWithDefault("maxwidth", 500)
 		minHeight := parseIntWithDefault("minheight", 200)
 		maxHeight := parseIntWithDefault("maxheight", 1000)
-		img, err := bot.makeImageOrVideoElem(d, false, isGroup)
+		img, err := bot.makeImageOrVideoElem(d, false, sourceType)
 		if err != nil {
 			return nil, errors.New("send cardimage faild")
 		}
-		return bot.makeShowPic(img, source, brief, icon, minWidth, minHeight, maxWidth, maxHeight, isGroup)
+		return bot.makeShowPic(img, source, brief, icon, minWidth, minHeight, maxWidth, maxHeight, sourceType == MessageSourceGroup)
 	case "video":
-		cache := d["cache"]
-		if cache == "" {
-			cache = "1"
-		}
-		file, err := bot.makeImageOrVideoElem(d, true, isGroup)
+		file, err := bot.makeImageOrVideoElem(d, true, sourceType)
 		if err != nil {
 			return nil, err
 		}
@@ -1072,7 +1101,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 		}
 		var data []byte
 		if cover, ok := d["cover"]; ok {
-			data, _ = global.FindFile(cover, cache, global.ImagePath)
+			data, _ = global.FindFile(cover, d["cache"], global.ImagePath)
 		} else {
 			_ = global.ExtractCover(v.File, v.File+".jpg")
 			data, _ = os.ReadFile(v.File + ".jpg")
@@ -1093,7 +1122,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
 			_, _ = video.Seek(0, io.SeekStart)
 			hash, _ := utils.ComputeMd5AndLength(video)
 			cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash)+".mp4")
-			if global.PathExists(cacheFile) && cache == "1" {
+			if global.PathExists(cacheFile) && (d["cache"] == "" || d["cache"] == "1") {
 				goto ok
 			}
 			err = global.EncodeMP4(v.File, cacheFile)
@@ -1213,26 +1242,19 @@ func CQCodeUnescapeValue(content string) string {
 }
 
 // makeImageOrVideoElem 图片 elem 生成器，单独拎出来，用于公用
-func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (message.IMessageElement, error) {
+func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video bool, sourceType MessageSourceType) (message.IMessageElement, error) {
 	f := d["file"]
 	if strings.HasPrefix(f, "http") {
-		cache := d["cache"]
-		c := d["c"]
-		if cache == "" {
-			cache = "1"
-		}
 		hash := md5.Sum([]byte(f))
 		cacheFile := path.Join(global.CachePath, hex.EncodeToString(hash[:])+".cache")
-		maxSize := func() int64 {
-			if video {
-				return maxVideoSize
-			}
-			return maxImageSize
-		}()
-		thread, _ := strconv.Atoi(c)
+		maxSize := int64(maxImageSize)
+		if video {
+			maxSize = maxVideoSize
+		}
+		thread, _ := strconv.Atoi(d["c"])
 		exist := global.PathExists(cacheFile)
-		if exist && cache == "1" {
-			goto hasCacheFile
+		if exist && (d["cache"] == "" || d["cache"] == "1") {
+			goto useCacheFile
 		}
 		if exist {
 			_ = os.Remove(cacheFile)
@@ -1240,7 +1262,7 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
 		if err := global.DownloadFileMultiThreading(f, cacheFile, maxSize, thread, nil); err != nil {
 			return nil, err
 		}
-	hasCacheFile:
+	useCacheFile:
 		if video {
 			return &LocalVideoElement{File: cacheFile}, nil
 		}
@@ -1299,11 +1321,18 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
 		b, _ := os.ReadFile(rawPath)
 		return bot.readVideoCache(b), nil
 	}
+	// 目前频道内上传的图片均无法被查询到, 需要单独处理
+	if sourceType == MessageSourceGuildChannel {
+		cacheFile := path.Join(global.ImagePath, "guild-images", f)
+		if global.PathExists(cacheFile) {
+			return &LocalImageElement{File: cacheFile}, nil
+		}
+	}
 	if strings.HasSuffix(f, ".image") && cache.EnableCacheDB {
 		hash, err := hex.DecodeString(strings.TrimSuffix(f, ".image"))
 		if err == nil {
 			if b := cache.Image.Get(hash); b != nil {
-				return bot.readImageCache(b, group)
+				return bot.readImageCache(b, sourceType)
 			}
 		}
 	}
@@ -1314,7 +1343,7 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
 	}
 	if !exist {
 		if d["url"] != "" {
-			return bot.makeImageOrVideoElem(map[string]string{"file": d["url"]}, false, group)
+			return bot.makeImageOrVideoElem(map[string]string{"file": d["url"]}, false, sourceType)
 		}
 		return nil, errors.New("invalid image")
 	}
@@ -1325,10 +1354,10 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (
 	if err != nil {
 		return nil, err
 	}
-	return bot.readImageCache(b, group)
+	return bot.readImageCache(b, sourceType)
 }
 
-func (bot *CQBot) readImageCache(b []byte, group bool) (message.IMessageElement, error) {
+func (bot *CQBot) readImageCache(b []byte, sourceType MessageSourceType) (message.IMessageElement, error) {
 	var err error
 	if len(b) < 20 {
 		return nil, errors.New("invalid cache")
@@ -1340,7 +1369,7 @@ func (bot *CQBot) readImageCache(b []byte, group bool) (message.IMessageElement,
 	imageURL := r.ReadString()
 	if size == 0 {
 		if imageURL != "" {
-			return bot.makeImageOrVideoElem(map[string]string{"file": imageURL}, false, group)
+			return bot.makeImageOrVideoElem(map[string]string{"file": imageURL}, false, sourceType)
 		}
 		return nil, errors.New("img size is 0")
 	}
@@ -1348,15 +1377,24 @@ func (bot *CQBot) readImageCache(b []byte, group bool) (message.IMessageElement,
 		return nil, errors.New("invalid hash")
 	}
 	var rsp message.IMessageElement
-	if group {
+	if sourceType == MessageSourceGroup {
 		rsp, err = bot.Client.QueryGroupImage(int64(rand.Uint32()), hash, size)
 		goto ok
 	}
+	if sourceType == MessageSourceGuildChannel {
+		if len(bot.Client.GuildService.Guilds) == 0 {
+			err = errors.New("cannot query guild image: not any joined guild")
+			goto ok
+		}
+		guild := bot.Client.GuildService.Guilds[0]
+		rsp, err = bot.Client.GuildService.QueryImage(guild.GuildId, guild.Channels[0].ChannelId, hash, uint64(size))
+		goto ok
+	}
 	rsp, err = bot.Client.QueryFriendImage(int64(rand.Uint32()), hash, size)
 ok:
 	if err != nil {
 		if imageURL != "" {
-			return bot.makeImageOrVideoElem(map[string]string{"file": imageURL}, false, group)
+			return bot.makeImageOrVideoElem(map[string]string{"file": imageURL}, false, sourceType)
 		}
 		return nil, err
 	}

coolq/cqcode_test.go

@@ -13,7 +13,7 @@ import (
 var bot = CQBot{}
 
 func TestCQBot_ConvertStringMessage(t *testing.T) {
-	for _, v := range bot.ConvertStringMessage(`[CQ:face,id=115,text=111][CQ:face,id=217]] [CQ:text,text=123] [`, false) {
+	for _, v := range bot.ConvertStringMessage(`[CQ:face,id=115,text=111][CQ:face,id=217]] [CQ:text,text=123] [`, MessageSourcePrivate) {
 		fmt.Println(v)
 	}
 }
@@ -25,14 +25,14 @@ var (
 
 func BenchmarkCQBot_ConvertStringMessage(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		bot.ConvertStringMessage(bench, false)
+		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, false)
+		bot.ConvertObjectMessage(benchArray, MessageSourcePrivate)
 	}
 }
 

coolq/event.go

@@ -2,41 +2,42 @@ package coolq
 
 import (
 	"encoding/hex"
+	"fmt"
 	"os"
 	"path"
 	"strconv"
 	"strings"
 	"time"
 
-	"github.com/Mrs4s/go-cqhttp/db"
-	"github.com/Mrs4s/go-cqhttp/internal/cache"
-
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/internal/base"
-
 	"github.com/Mrs4s/MiraiGo/binary"
 	"github.com/Mrs4s/MiraiGo/client"
 	"github.com/Mrs4s/MiraiGo/message"
 	log "github.com/sirupsen/logrus"
+
+	"github.com/Mrs4s/go-cqhttp/db"
+	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/internal/cache"
 )
 
 // ToFormattedMessage 将给定[]message.IMessageElement转换为通过coolq.SetMessageFormat所定义的消息上报格式
-func ToFormattedMessage(e []message.IMessageElement, groupID int64, isRaw ...bool) (r interface{}) {
+func ToFormattedMessage(e []message.IMessageElement, source MessageSource, isRaw ...bool) (r interface{}) {
 	if base.PostFormat == "string" {
-		r = ToStringMessage(e, groupID, isRaw...)
+		r = ToStringMessage(e, source, isRaw...)
 	} else if base.PostFormat == "array" {
-		r = ToArrayMessage(e, groupID)
+		r = ToArrayMessage(e, source)
 	}
 	return
 }
 
 func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMessage) {
-	bot.checkMedia(m.Elements)
-	cqm := ToStringMessage(m.Elements, 0, true)
-	id := m.Id
-	if bot.db != nil {
-		id = bot.InsertPrivateMessage(m)
+	bot.checkMedia(m.Elements, m.Sender.Uin)
+	source := MessageSource{
+		SourceType: MessageSourcePrivate,
+		PrimaryID:  uint64(m.Sender.Uin),
 	}
+	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 {
@@ -50,7 +51,7 @@ func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMess
 		"message_id":   id,
 		"user_id":      m.Sender.Uin,
 		"target_id":    m.Target,
-		"message":      ToFormattedMessage(m.Elements, 0, false),
+		"message":      ToFormattedMessage(m.Elements, source, false),
 		"raw_message":  cqm,
 		"font":         0,
 		"self_id":      c.Uin,
@@ -66,7 +67,7 @@ func (bot *CQBot) privateMessageEvent(c *client.QQClient, m *message.PrivateMess
 }
 
 func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage) {
-	bot.checkMedia(m.Elements)
+	bot.checkMedia(m.Elements, m.GroupCode)
 	for _, elem := range m.Elements {
 		if file, ok := elem.(*message.GroupFileElement); ok {
 			log.Infof("群 %v(%v) 内 %v(%v) 上传了文件: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, file.Name)
@@ -88,11 +89,12 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 			return
 		}
 	}
-	cqm := ToStringMessage(m.Elements, m.GroupCode, true)
-	id := m.Id
-	if bot.db != nil {
-		id = bot.InsertGroupMessage(m)
+	source := MessageSource{
+		SourceType: MessageSourceGroup,
+		PrimaryID:  uint64(m.GroupCode),
 	}
+	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 {
@@ -104,14 +106,18 @@ func (bot *CQBot) groupMessageEvent(c *client.QQClient, m *message.GroupMessage)
 
 func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEvent) {
 	m := e.Message
-	bot.checkMedia(m.Elements)
-	cqm := ToStringMessage(m.Elements, 0, true)
+	bot.checkMedia(m.Elements, m.Sender.Uin)
+	source := MessageSource{
+		SourceType: MessageSourcePrivate,
+		PrimaryID:  uint64(e.Session.Sender),
+	}
+	cqm := ToStringMessage(m.Elements, source, true)
 	bot.tempSessionCache.Store(m.Sender.Uin, e.Session)
 	id := m.Id
-	if bot.db != nil { // nolint
-		// todo(Mrs4s)
-		// id = bot.InsertTempMessage(m.Sender.Uin, m)
-	}
+	// todo(Mrs4s)
+	// if bot.db != nil { // nolint
+	// 		id = bot.InsertTempMessage(m.Sender.Uin, m)
+	// }
 	log.Infof("收到来自群 %v(%v) 内 %v(%v) 的临时会话消息: %v", m.GroupName, m.GroupCode, m.Sender.DisplayName(), m.Sender.Uin, cqm)
 	tm := global.MSG{
 		"post_type":    "message",
@@ -120,7 +126,7 @@ func (bot *CQBot) tempMessageEvent(c *client.QQClient, e *client.TempMessageEven
 		"temp_source":  e.Session.Source,
 		"message_id":   id,
 		"user_id":      m.Sender.Uin,
-		"message":      ToFormattedMessage(m.Elements, 0, false),
+		"message":      ToFormattedMessage(m.Elements, source, false),
 		"raw_message":  cqm,
 		"font":         0,
 		"self_id":      c.Uin,
@@ -136,6 +142,146 @@ 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
+	}
+	channel := guild.FindChannel(m.ChannelId)
+	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":     fU64(m.GuildId),
+		"channel_id":   fU64(m.ChannelId),
+		"message_id":   fmt.Sprintf("%v-%v", m.Id, m.InternalId),
+		"user_id":      fU64(m.Sender.TinyId),
+		"message":      ToFormattedMessage(m.Elements, source, false), // todo: 增加对频道消息 Reply 的支持
+		"self_id":      bot.Client.Uin,
+		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
+		"time":         m.Time,
+		"sender": global.MSG{
+			"user_id":  fU64(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)
+	currentReactions := make([]global.MSG, len(e.CurrentReactions))
+	for i, r := range e.CurrentReactions {
+		str += fmt.Sprintf("%v*%v ", r.Face.Name, r.Count)
+		currentReactions[i] = global.MSG{
+			"emoji_id":    r.EmojiId,
+			"emoji_index": r.Face.Index,
+			"emoji_type":  r.EmojiType,
+			"emoji_name":  r.Face.Name,
+			"count":       r.Count,
+			"clicked":     r.Clicked,
+		}
+	}
+	if len(e.CurrentReactions) == 0 {
+		str += "无任何表情"
+	}
+	log.Infof(str)
+	bot.dispatchEventMessage(global.MSG{
+		"post_type":          "notice",
+		"notice_type":        "message_reactions_updated",
+		"message_sender_uin": e.MessageSenderUin,
+		"guild_id":           fU64(e.GuildId),
+		"channel_id":         fU64(e.ChannelId),
+		"message_id":         fmt.Sprint(e.MessageId), // todo: 支持数据库后转换为数据库id
+		"operator_id":        fU64(e.OperatorId),
+		"current_reactions":  currentReactions,
+		"time":               time.Now().Unix(),
+		"self_id":            bot.Client.Uin,
+		"self_tiny_id":       fU64(bot.Client.GuildService.TinyId),
+		"user_id":            e.OperatorId,
+	})
+}
+
+func (bot *CQBot) guildChannelUpdatedEvent(c *client.QQClient, e *client.GuildChannelUpdatedEvent) {
+	guild := c.GuildService.FindGuild(e.GuildId)
+	if guild == nil {
+		return
+	}
+	log.Infof("频道 %v(%v) 子频道 %v(%v) 信息已更新", guild.GuildName, guild.GuildId, e.NewChannelInfo.ChannelName, e.NewChannelInfo.ChannelId)
+	bot.dispatchEventMessage(global.MSG{
+		"post_type":    "notice",
+		"notice_type":  "channel_updated",
+		"guild_id":     fU64(e.GuildId),
+		"channel_id":   fU64(e.ChannelId),
+		"operator_id":  fU64(e.OperatorId),
+		"time":         time.Now().Unix(),
+		"self_id":      bot.Client.Uin,
+		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
+		"user_id":      e.OperatorId,
+		"old_info":     convertChannelInfo(e.OldChannelInfo),
+		"new_info":     convertChannelInfo(e.NewChannelInfo),
+	})
+}
+
+func (bot *CQBot) guildChannelCreatedEvent(c *client.QQClient, e *client.GuildChannelOperationEvent) {
+	guild := c.GuildService.FindGuild(e.GuildId)
+	if guild == nil {
+		return
+	}
+	member, _ := c.GuildService.GetGuildMemberProfileInfo(e.GuildId, e.OperatorId)
+	if member == nil {
+		member = &client.GuildUserProfile{Nickname: "未知"}
+	}
+	log.Infof("频道 %v(%v) 内用户 %v(%v) 创建了子频道 %v(%v)", guild.GuildName, guild.GuildId, member.Nickname, member.TinyId, e.ChannelInfo.ChannelName, e.ChannelInfo.ChannelId)
+	bot.dispatchEventMessage(global.MSG{
+		"post_type":    "notice",
+		"notice_type":  "channel_created",
+		"guild_id":     fU64(e.GuildId),
+		"channel_id":   fU64(e.ChannelInfo.ChannelId),
+		"operator_id":  fU64(e.OperatorId),
+		"self_id":      bot.Client.Uin,
+		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
+		"user_id":      e.OperatorId,
+		"time":         time.Now().Unix(),
+		"channel_info": convertChannelInfo(e.ChannelInfo),
+	})
+}
+
+func (bot *CQBot) guildChannelDestroyedEvent(c *client.QQClient, e *client.GuildChannelOperationEvent) {
+	guild := c.GuildService.FindGuild(e.GuildId)
+	if guild == nil {
+		return
+	}
+	member, _ := c.GuildService.GetGuildMemberProfileInfo(e.GuildId, e.OperatorId)
+	if member == nil {
+		member = &client.GuildUserProfile{Nickname: "未知"}
+	}
+	log.Infof("频道 %v(%v) 内用户 %v(%v) 删除了子频道 %v(%v)", guild.GuildName, guild.GuildId, member.Nickname, member.TinyId, e.ChannelInfo.ChannelName, e.ChannelInfo.ChannelId)
+	bot.dispatchEventMessage(global.MSG{
+		"post_type":    "notice",
+		"notice_type":  "channel_destroyed",
+		"guild_id":     fU64(e.GuildId),
+		"channel_id":   fU64(e.ChannelInfo.ChannelId),
+		"operator_id":  fU64(e.OperatorId),
+		"self_id":      bot.Client.Uin,
+		"self_tiny_id": fU64(bot.Client.GuildService.TinyId),
+		"user_id":      e.OperatorId,
+		"time":         time.Now().Unix(),
+		"channel_info": convertChannelInfo(e.ChannelInfo),
+	})
+}
+
 func (bot *CQBot) groupMutedEvent(c *client.QQClient, e *client.GroupMuteEvent) {
 	g := c.FindGroup(e.GroupCode)
 	if e.TargetUin == 0 {
@@ -548,11 +694,19 @@ func (bot *CQBot) groupDecrease(groupCode, userUin int64, operator *client.Group
 	}
 }
 
-func (bot *CQBot) checkMedia(e []message.IMessageElement) {
+func (bot *CQBot) checkMedia(e []message.IMessageElement, sourceID int64) {
 	// TODO(wdvxdr): remove these old cache file in v1.0.0
 	for _, elem := range e {
 		switch i := elem.(type) {
 		case *message.GroupImageElement:
+			if i.Flash && sourceID != 0 {
+				u, err := bot.Client.GetGroupImageDownloadUrl(i.FileId, sourceID, i.Md5)
+				if err != nil {
+					log.Warnf("获取闪照地址时出现错误: %v", err)
+				} else {
+					i.Url = u
+				}
+			}
 			data := binary.NewWriterF(func(w *binary.Writer) {
 				w.Write(i.Md5)
 				w.WriteUInt32(uint32(i.Size))
@@ -565,6 +719,25 @@ func (bot *CQBot) checkMedia(e []message.IMessageElement) {
 			} 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)
+				}
+			}
 		case *message.FriendImageElement:
 			data := binary.NewWriterF(func(w *binary.Writer) {
 				w.Write(i.Md5)

coolq/feed.go

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

db/database.go

@@ -8,13 +8,13 @@ import (
 )
 
 type (
-	// IDatabase 数据库操作接口定义
-	IDatabase interface {
+	// Database 数据库操作接口定义
+	Database interface {
 		// Open 初始化数据库
 		Open() error
 
 		// GetMessageByGlobalID 通过 GlobalID 来获取消息
-		GetMessageByGlobalID(int32) (IStoredMessage, error)
+		GetMessageByGlobalID(int32) (StoredMessage, error)
 		// GetGroupMessageByGlobalID 通过 GlobalID 来获取群消息
 		GetGroupMessageByGlobalID(int32) (*StoredGroupMessage, error)
 		// GetPrivateMessageByGlobalID 通过 GlobalID 来获取私聊消息
@@ -26,7 +26,7 @@ type (
 		InsertPrivateMessage(*StoredPrivateMessage) error
 	}
 
-	IStoredMessage interface {
+	StoredMessage interface {
 		GetID() string
 		GetType() string
 		GetGlobalID() int32

db/leveldb/leveldb.go

@@ -1,4 +1,4 @@
-package db
+package leveldb
 
 import (
 	"bytes"
@@ -9,8 +9,11 @@ import (
 	"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 {
@@ -22,42 +25,50 @@ const (
 	private byte = 0x1
 )
 
-func UseLevelDB() *LevelDBImpl {
-	gob.Register(StoredMessageAttribute{})
-	gob.Register(QuotedInfo{})
+func init() {
+	gob.Register(db.StoredMessageAttribute{})
+	gob.Register(db.QuotedInfo{})
 	gob.Register(global.MSG{})
-	gob.Register(StoredGroupMessage{})
-	gob.Register(StoredPrivateMessage{})
-	return &LevelDBImpl{}
+	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 (db *LevelDBImpl) Open() error {
+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 db error")
+		return errors.Wrap(err, "open level ldb error")
 	}
-	db.db = d
+	ldb.db = d
 	return nil
 }
 
-func (db *LevelDBImpl) GetMessageByGlobalID(id int32) (IStoredMessage, error) {
-	v, err := db.db.Get(binary.ToBytes(id), 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 := &StoredGroupMessage{}
+		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 := &StoredPrivateMessage{}
+		p := &db.StoredPrivateMessage{}
 		if err = gob.NewDecoder(bytes.NewReader(r.ReadAvailable())).Decode(p); err != nil {
 			return nil, errors.Wrap(err, "decode message error")
 		}
@@ -67,50 +78,50 @@ func (db *LevelDBImpl) GetMessageByGlobalID(id int32) (IStoredMessage, error) {
 	}
 }
 
-func (db *LevelDBImpl) GetGroupMessageByGlobalID(id int32) (*StoredGroupMessage, error) {
-	i, err := db.GetMessageByGlobalID(id)
+func (ldb *LevelDBImpl) GetGroupMessageByGlobalID(id int32) (*db.StoredGroupMessage, error) {
+	i, err := ldb.GetMessageByGlobalID(id)
 	if err != nil {
 		return nil, err
 	}
-	g, ok := i.(*StoredGroupMessage)
+	g, ok := i.(*db.StoredGroupMessage)
 	if !ok {
 		return nil, errors.New("message type error")
 	}
 	return g, nil
 }
 
-func (db *LevelDBImpl) GetPrivateMessageByGlobalID(id int32) (*StoredPrivateMessage, error) {
-	i, err := db.GetMessageByGlobalID(id)
+func (ldb *LevelDBImpl) GetPrivateMessageByGlobalID(id int32) (*db.StoredPrivateMessage, error) {
+	i, err := ldb.GetMessageByGlobalID(id)
 	if err != nil {
 		return nil, err
 	}
-	p, ok := i.(*StoredPrivateMessage)
+	p, ok := i.(*db.StoredPrivateMessage)
 	if !ok {
 		return nil, errors.New("message type error")
 	}
 	return p, nil
 }
 
-func (db *LevelDBImpl) InsertGroupMessage(msg *StoredGroupMessage) error {
+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 := db.db.Put(binary.ToBytes(msg.GlobalID), binary.NewWriterF(func(w *binary.Writer) {
+	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 (db *LevelDBImpl) InsertPrivateMessage(msg *StoredPrivateMessage) 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 := db.db.Put(binary.ToBytes(msg.GlobalID), binary.NewWriterF(func(w *binary.Writer) {
+	err := ldb.db.Put(binary.ToBytes(msg.GlobalID), binary.NewWriterF(func(w *binary.Writer) {
 		w.WriteByte(private)
 		w.Write(buf.Bytes())
 	}), nil)

db/mongodb.go

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

db/mongodb/mongodb.go

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

docs/config.md

@@ -15,11 +15,10 @@ account: # 账号相关
   uin: 1233456 # QQ账号
   password: '' # 密码为空时使用扫码登录
   encrypt: false  # 是否开启密码加密
-  status: 0      # 在线状态,详情请查看下方的在线状态表
+  status: 0      # 在线状态 请参考 https://docs.go-cqhttp.org/guide/config.html#在线状态
   relogin: # 重连设置
-    # disabled: false
-    delay: 3      # 重连延迟, 单位秒
-    interval: 0   # 重连间隔
+    delay: 3   # 首次重连延迟, 单位秒
+    interval: 3   # 重连间隔
     max-times: 0  # 最大重连次数, 0为无限制
 
   # 是否使用服务器下发的新地址进行重连
@@ -27,11 +26,11 @@ account: # 账号相关
   use-sso-address: true
 
 heartbeat:
-  # disabled: false # 是否开启心跳事件上报
   # 心跳频率, 单位秒
   # -1 为关闭心跳
   interval: 5
 
+message:
   # 上报数据类型
   # 可选: string,array
   post-format: string
@@ -57,6 +56,10 @@ heartbeat:
 output:
   # 日志等级 trace,debug,info,warn,error
   log-level: warn
+  # 日志时效 单位天. 超过这个时间之前的日志将会被自动删除. 设置为 0 表示永久保留.
+  log-aging: 15
+  # 是否在每次启动时强制创建全新的文件储存日志. 为 false 的情况下将会在上次启动时创建的日志文件续写
+  log-force-new: true
   # 是否启用 DEBUG
   debug: false # 开启调试模式
 
@@ -76,6 +79,14 @@ default-middlewares: &default
     frequency: 1  # 令牌回复频率, 单位秒
     bucket: 1     # 令牌桶大小
 
+database: # 数据库相关设置
+  leveldb:
+    # 是否启用内置leveldb数据库
+    # 启用将会增加10-20MB的内存占用和一定的磁盘空间
+    # 关闭将无法使用 撤回 回复 get_msg 等上下文相关功能
+    enable: true
+
+# 连接服务列表
 servers:
   # HTTP 通信设置
   - http:

docs/cqhttp.md

@@ -12,7 +12,6 @@
 - [回复](#回复)
 - [红包](#红包)
 - [戳一戳](#戳一戳)
-- [礼物](#礼物)
 - [合并转发](#合并转发)
 - [合并转发消息节点](#合并转发消息节点)
 - [XML 消息](#xml-消息)
@@ -214,42 +213,6 @@ Type: `poke`
 
 示例: `[CQ:poke,qq=123456]`
 
-### 礼物
-
-> 注意：仅支持免费礼物,发送群礼物消息无法撤回,返回的 `message id`  恒定为 `0`
-
-Type: `gift`
-
-范围: **发送(仅群聊,接收的时候不是CQ码)**
-
-参数:
-
-| 参数名 | 类型  | 说明           |
-| ------ | ----- | -------------- |
-| `qq`   | int64 | 接收礼物的成员 |
-| `id`   | int   | 礼物的类型     |
-
-目前支持的礼物ID:
-
-| id  | 类型       |
-| --- | ---------- |
-| 0   | 甜Wink     |
-| 1   | 快乐肥宅水 |
-| 2   | 幸运手链   |
-| 3   | 卡布奇诺   |
-| 4   | 猫咪手表   |
-| 5   | 绒绒手套   |
-| 6   | 彩虹糖果   |
-| 7   | 坚强       |
-| 8   | 告白话筒   |
-| 9   | 牵你的手   |
-| 10  | 可爱猫咪   |
-| 11  | 神秘面具   |
-| 12  | 我超忙的   |
-| 13  | 爱心口罩   |
-
-示例: `[CQ:gift,qq=123456,id=8]`
-
 ### 合并转发
 
 Type: `forward`

docs/guild.md

@@ -0,0 +1,266 @@
+# 频道相关API
+
+> 注意: QQ频道功能目前还在测试阶段, go-cqhttp 也在适配的初期阶段, 以下 `API` `Event` 的字段名可能存在错误并均有可能在后续版本修改/添加/删除.
+> 目前仅供开发者测试以及适配使用
+
+QQ频道相关功能的事件以及API
+
+## 命名说明
+
+API以及字段相关命名均为参考QQ官方命名或相似产品命名规则, 由于QQ频道的账号系统独立于QQ本体, 所以各个 `ID` 并不能和QQ通用.也无法通过 `tiny_id` 获取到 `QQ号`
+
+下表为常见字段命名说明
+
+| 命名         | 说明                 |
+| ------------ | -------------------- |
+| `tiny_id`    | 在频道系统中代表用户ID, 与QQ号并不通用 |
+| `guild_id`   | 频道ID               |
+| `channel_id` | 子频道ID             |
+
+> 所有频道相关事件的 `user_id` 均为 `tiny_id`
+
+## 特殊说明
+
+- 由于频道的限制, 目前无法通过图片摘要查询到频道图片消息的详细信息, 所以通过频道消息收到的图片均会下载完整文件到 `images/guild-images`. (群图片转发不受此限制)
+- 由于无法通过 `GlobalID` 放下频道消息的ID, 所以所有频道消息的 `message_id` 均为 `string` 类型
+- `send_msg` API将无法发送频道消息
+- `get_msg` API暂时无法获取频道消息
+- `reply` 等消息类型暂不支持解析
+- `at` 消息的 `target` 依然使用 `qq` 字段, 以保证一致性. 但内容为 `tiny_id`
+- 所有事件的 `self_id` 均为 BOT 的QQ号. `tiny_id` 将放在 `self_tiny_id` 字段
+- 遵循我们一贯的原则, 将不会支持主动加频道/主动拉人/红包相关消息类型
+
+## API
+
+### 获取频道系统内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是否点击 |
+
+### 子频道信息更新
+
+**上报数据**
+
+| 字段          | 类型   | 可能的值       | 说明           |
+| ------------- | ------ | -------------- | -------------- |
+| `post_type`   | string | `notice`       | 上报类型       |
+| `notice_type` | string | `channel_updated` | 消息类型       |
+| `guild_id`    | uint64  |                | 频道ID           |
+| `channel_id`    | uint64  |                | 子频道ID           |
+| `user_id`     | uint64  |                | 操作者ID  |
+| `operator_id`     | uint64  |                | 操作者ID  |
+| `old_info`     | ChannelInfo  |        | 更新前的频道信息  |
+| `new_info`     | ChannelInfo  |        | 更新后的频道信息  |
+
+### 子频道创建
+
+**上报数据**
+
+| 字段          | 类型   | 可能的值       | 说明           |
+| ------------- | ------ | -------------- | -------------- |
+| `post_type`   | string | `notice`       | 上报类型       |
+| `notice_type` | string | `channel_created` | 消息类型       |
+| `guild_id`    | uint64  |                | 频道ID           |
+| `channel_id`    | uint64  |                | 子频道ID           |
+| `user_id`     | uint64  |                | 操作者ID  |
+| `operator_id`     | uint64  |                | 操作者ID  |
+| `channel_info`     | ChannelInfo  |        | 频道信息  |
+
+### 子频道删除
+
+**上报数据**
+
+| 字段          | 类型   | 可能的值       | 说明           |
+| ------------- | ------ | -------------- | -------------- |
+| `post_type`   | string | `notice`       | 上报类型       |
+| `notice_type` | string | `channel_destroyed` | 消息类型       |
+| `guild_id`    | uint64  |                | 频道ID           |
+| `channel_id`    | uint64  |                | 子频道ID           |
+| `user_id`     | uint64  |                | 操作者ID  |
+| `operator_id`     | uint64  |                | 操作者ID  |
+| `channel_info`     | ChannelInfo  |        | 频道信息  |

global/fs.go

@@ -85,12 +85,9 @@ 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
-		if cache == "" {
-			cache = "1"
-		}
 		hash := md5.Sum([]byte(file))
 		cacheFile := path.Join(CachePath, hex.EncodeToString(hash[:])+".cache")
-		if PathExists(cacheFile) && cache == "1" {
+		if (cache == "" || cache == "1") && PathExists(cacheFile) {
 			return os.ReadFile(cacheFile)
 		}
 		data, err = GetBytes(file)

global/log_hook.go

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

go.mod

@@ -2,61 +2,60 @@ 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
-
 require (
 	github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f
-	github.com/Microsoft/go-winio v0.5.0
-	github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82
+	github.com/Microsoft/go-winio v0.5.1
+	github.com/Mrs4s/MiraiGo v0.0.0-20211208080234-25c67a3ee1c1
 	github.com/dustin/go-humanize v1.0.0
 	github.com/fumiama/go-hide-param v0.1.4
-	github.com/gabriel-vasile/mimetype v1.3.1
+	github.com/gabriel-vasile/mimetype v1.4.0
+	github.com/gocq/qrcode v0.0.0-20211114040510-366b953fcd98
 	github.com/gorilla/websocket v1.4.2
 	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.11
 	github.com/pkg/errors v0.9.1
-	github.com/segmentio/asm v1.0.0
+	github.com/segmentio/asm v1.1.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/stretchr/testify v1.7.0
 	github.com/syndtr/goleveldb v1.0.0
-	github.com/tidwall/gjson v1.8.1
-	github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2
+	github.com/tidwall/gjson v1.11.0
 	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
+	go.mongodb.org/mongo-driver v1.7.4
+	golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )
 
 require (
+	github.com/RomiChan/protobuf v0.0.0-20211204042931-ff4f35848737 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-stack/stack v1.8.0 // indirect
-	github.com/golang/snappy v0.0.1 // indirect
-	github.com/google/uuid v1.1.1 // indirect
+	github.com/go-stack/stack v1.8.1 // indirect
+	github.com/gocq/rs v1.0.1 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/go-cmp v0.5.5 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/jonboulle/clockwork v0.2.2 // indirect
-	github.com/klauspost/compress v1.9.5 // indirect
-	github.com/klauspost/cpuid/v2 v2.0.6 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
 	github.com/lestrrat-go/strftime v1.0.5 // indirect
-	github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4 // indirect
-	github.com/mattn/go-colorable v0.1.8 // indirect
-	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/pierrec/lz4/v4 v4.1.11 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect
-	github.com/tidwall/match v1.0.3 // indirect
-	github.com/tidwall/pretty v1.1.0 // indirect
-	github.com/willf/bitset v1.2.0 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.0.2 // indirect
 	github.com/xdg-go/stringprep v1.0.2 // indirect
-	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	golang.org/x/net v0.0.0-20210505024714-0287a6fb4125 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
+	golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
-	golang.org/x/text v0.3.6 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
-	modernc.org/libc v1.8.1 // indirect
-	modernc.org/mathutil v1.2.2 // indirect
-	modernc.org/memory v1.0.4 // indirect
+	golang.org/x/sys v0.0.0-20211113001501-0c823b97ae02 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	modernc.org/libc v1.11.70 // indirect
+	modernc.org/mathutil v1.4.1 // indirect
+	modernc.org/memory v1.0.5 // indirect
 )

go.sum

@@ -1,29 +1,27 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f h1:2dk3eOnYllh+wUOuDhOoC2vUVoJF/5z478ryJ+wzEII=
 github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/go.mod h1:4a58ifQTEe2uwwsaqbh3i2un5/CBPg+At/qHpt18Tmk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXGjwU=
-github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
-github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82 h1:VAav2Z5n41cp2bjskooPXAg9W39qQeEEj3FmYlnS3+E=
-github.com/Mrs4s/MiraiGo v0.0.0-20210916113136-0238b2382b82/go.mod h1:EpB6wQ+iaIqLRxVrs6si2J3XGv6wHXMrRXNUnJFaoww=
-github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjLyS07ChA=
-github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/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-20211208080234-25c67a3ee1c1 h1:UipCzEST10GzJnvlhHsY4g39xzwVzSHE+5Go9d0dTPY=
+github.com/Mrs4s/MiraiGo v0.0.0-20211208080234-25c67a3ee1c1/go.mod h1:YD9gBKkxC9lPPtx3doYXRG26VBkK6YXjrS76cv01C5w=
+github.com/RomiChan/protobuf v0.0.0-20211204042931-ff4f35848737 h1:p4o7/eSoP39jwnGZz08N1IpH/mNzg9SdCn7kPM9A9BE=
+github.com/RomiChan/protobuf v0.0.0-20211204042931-ff4f35848737/go.mod h1:CKKOWC7mBxd36zxsCB1V8DTrwlTNRQvkSVbYqyUiGEE=
+github.com/bits-and-blooms/bitset v1.2.1 h1:M+/hrU9xlMp7t4TyTDQW97d3tRPVuKFC6zBEK16QnXY=
+github.com/bits-and-blooms/bitset v1.2.1/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
 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.3.1 h1:qevA6c2MtE1RorlScnixeG0VA1H4xrXyhyX3oWBynNQ=
-github.com/gabriel-vasile/mimetype v1.3.1/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+github.com/gabriel-vasile/mimetype v1.4.0 h1:Cn9dkdYsMIu56tGho+fqzh7XmvY2YyGU0FnbhiOsEro=
+github.com/gabriel-vasile/mimetype v1.4.0/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
+github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
 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=
@@ -48,31 +46,23 @@ github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWe
 github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
 github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
 github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/gocq/qrcode v0.0.0-20211114040510-366b953fcd98 h1:NJDZEa7gibUa0w4tie8qKeQFKdeKFUbecWyQDPdRx40=
+github.com/gocq/qrcode v0.0.0-20211114040510-366b953fcd98/go.mod h1:E5TBHc60dsWtOL7sbXCb3P9i4xrj2J7Zm5sEJftIc1w=
+github.com/gocq/rs v1.0.1 h1:ng7nhXmnx3SnfM0DOqmbP6GmQp1xGwRG9XmBiLFDWuM=
+github.com/gocq/rs v1.0.1/go.mod h1:8oaQnRvqn1fMh8i5zsetgQo03OUXksJV1k+dpmExxcY=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/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/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
@@ -85,10 +75,12 @@ github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uia
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
 github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
-github.com/klauspost/compress v1.9.5 h1:U+CaK85mrNNb4k8BNOfgJtJ/gr6kswUCFj6miSzVC6M=
-github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/cpuid/v2 v2.0.6 h1:dQ5ueTiftKxp0gyjKSx5+8BtPWkyQbd95m8Gys/RarI=
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
+github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
+github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/cpuid/v2 v2.0.6/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4=
+github.com/klauspost/cpuid/v2 v2.0.9/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=
@@ -104,12 +96,11 @@ github.com/lestrrat-go/strftime v1.0.5 h1:A7H3tT8DhTz8u65w+JRpiBxM4dINQhUXAZnhBa
 github.com/lestrrat-go/strftime v1.0.5/go.mod h1:E1nN3pCbtMSu1yjSVeyuRFVm/U0xoR76fd03sz+Qz4g=
 github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
 github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
-github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4 h1:u9jwvcKbQpghIXgNl/EOL8hzhAFXh4ePrEP493W3tNA=
-github.com/maruel/rs v0.0.0-20150922171536-2c81c4312fe4/go.mod h1:kcRFpEzolcEklV6rD7W95mG49/sbdX/PlFmd7ni3RvA=
-github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
-github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
+github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs=
+github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 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=
@@ -117,20 +108,21 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
 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/pierrec/lz4/v4 v4.1.11 h1:LVs17FAZJFOjgmJXl9Tf13WfLUvZq7/RjfEJrnwZ9OE=
+github.com/pierrec/lz4/v4 v4.1.11/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 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.0.0 h1:GMF7/2eLkte13LERSOmPI766AJXJDRlsqqiN8T7Mfmk=
-github.com/segmentio/asm v1.0.0/go.mod h1:4EUJGaKsB8ImLUwOGORVsNd9vTRDeh44JGsY4aKp5I4=
+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=
@@ -150,15 +142,13 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
-github.com/tidwall/gjson v1.8.1 h1:8j5EE9Hrh3l9Od1OIEDAb7IpezNA20UdRngNAj5N0WU=
-github.com/tidwall/gjson v1.8.1/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
-github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
-github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/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.1.0 h1:K3hMW5epkdAVwibsQEfR/7Zj0Qgt4DxtNumTq/VloO8=
-github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2 h1:BWVtt2VBY+lmVDu9MGKqLGKl04B+iRHcrW1Ptyi/8tg=
-github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2/go.mod h1:lPnW9HVS0vJdeYyQtOvIvlXgZPNhUAhwz+z5r8AJk0Y=
+github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
+github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60 h1:lRKf10iIOW0VsH5WDF621ihzR+R2wEBZVtNRHuLLCb4=
 github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60/go.mod h1:ecFKZPX81BaB70I6ruUgEwYcDOtuNgJGnjdK+MIl5ko=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=
@@ -167,39 +157,38 @@ 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=
+github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a h1:fZHgsYlfvtyqToslyjUt3VOPF4J7aK/3MPcK7xp3PDk=
+github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/R083muKhosV54bj5niojjWZvU8xrevuH4=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+go.mongodb.org/mongo-driver v1.7.4 h1:sllcioag8Mec0LYkftYWq+cKNPIR4Kqq3iv9ZXY0g/E=
+go.mongodb.org/mongo-driver v1.7.4/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 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-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa h1:idItI2DDfCokpg0N51B2VtiLdJ4vAuXC9fnCb2gACo4=
+golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 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-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210505024714-0287a6fb4125 h1:Ugb8sMTWuWRC3+sz5WeN/4kejDx9BvIwnPUiJBjJE+8=
 golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9 h1:0qxwC5n+ttVOINCBeRHO0nq9X7uy8SDsPoi5OaCdIEI=
+golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/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=
@@ -210,52 +199,42 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
 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-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211113001501-0c823b97ae02 h1:7NCfEGl0sfUojmX78nK9pBJuUlSZWEJA/TwASvfiPLo=
+golang.org/x/sys v0.0.0-20211113001501-0c823b97ae02/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-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 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/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 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/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 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=
@@ -271,12 +250,89 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-modernc.org/libc v1.8.1 h1:y9oPIhwcaFXxX7kMp6Qb2ZLKzr0mDkikWN3CV5GS63o=
+lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
+modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.33.11/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.34.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.4/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.5/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.7/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.8/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.10/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.15/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.16/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.17/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/ccgo/v3 v3.9.5/go.mod h1:umuo2EP2oDSBnD3ckjaVUXMrmeAw8C8OSICVa0iFf60=
+modernc.org/ccgo/v3 v3.10.0/go.mod h1:c0yBmkRFi7uW4J7fwx/JiijwOjeAeR2NoSaRVFPmjMw=
+modernc.org/ccgo/v3 v3.11.0/go.mod h1:dGNposbDp9TOZ/1KBxghxtUp/bzErD0/0QW4hhSaBMI=
+modernc.org/ccgo/v3 v3.11.1/go.mod h1:lWHxfsn13L3f7hgGsGlU28D9eUOf6y3ZYHKoPaKU0ag=
+modernc.org/ccgo/v3 v3.11.3/go.mod h1:0oHunRBMBiXOKdaglfMlRPBALQqsfrCKXgw9okQ3GEw=
+modernc.org/ccgo/v3 v3.12.4/go.mod h1:Bk+m6m2tsooJchP/Yk5ji56cClmN6R1cqc9o/YtbgBQ=
+modernc.org/ccgo/v3 v3.12.6/go.mod h1:0Ji3ruvpFPpz+yu+1m0wk68pdr/LENABhTrDkMDWH6c=
+modernc.org/ccgo/v3 v3.12.8/go.mod h1:Hq9keM4ZfjCDuDXxaHptpv9N24JhgBZmUG5q60iLgUo=
+modernc.org/ccgo/v3 v3.12.11/go.mod h1:0jVcmyDwDKDGWbcrzQ+xwJjbhZruHtouiBEvDfoIsdg=
+modernc.org/ccgo/v3 v3.12.14/go.mod h1:GhTu1k0YCpJSuWwtRAEHAol5W7g1/RRfS4/9hc9vF5I=
+modernc.org/ccgo/v3 v3.12.18/go.mod h1:jvg/xVdWWmZACSgOiAhpWpwHWylbJaSzayCqNOJKIhs=
+modernc.org/ccgo/v3 v3.12.20/go.mod h1:aKEdssiu7gVgSy/jjMastnv/q6wWGRbszbheXgWRHc8=
+modernc.org/ccgo/v3 v3.12.21/go.mod h1:ydgg2tEprnyMn159ZO/N4pLBqpL7NOkJ88GT5zNU2dE=
+modernc.org/ccgo/v3 v3.12.22/go.mod h1:nyDVFMmMWhMsgQw+5JH6B6o4MnZ+UQNw1pp52XYFPRk=
+modernc.org/ccgo/v3 v3.12.25/go.mod h1:UaLyWI26TwyIT4+ZFNjkyTbsPsY3plAEB6E7L/vZV3w=
+modernc.org/ccgo/v3 v3.12.29/go.mod h1:FXVjG7YLf9FetsS2OOYcwNhcdOLGt8S9bQ48+OP75cE=
+modernc.org/ccgo/v3 v3.12.36/go.mod h1:uP3/Fiezp/Ga8onfvMLpREq+KUjUmYMxXPO8tETHtA8=
+modernc.org/ccgo/v3 v3.12.38/go.mod h1:93O0G7baRST1vNj4wnZ49b1kLxt0xCW5Hsa2qRaZPqc=
+modernc.org/ccgo/v3 v3.12.43/go.mod h1:k+DqGXd3o7W+inNujK15S5ZYuPoWYLpF5PYougCmthU=
+modernc.org/ccgo/v3 v3.12.46/go.mod h1:UZe6EvMSqOxaJ4sznY7b23/k13R8XNlyWsO5bAmSgOE=
+modernc.org/ccgo/v3 v3.12.47/go.mod h1:m8d6p0zNps187fhBwzY/ii6gxfjob1VxWb919Nk1HUk=
+modernc.org/ccgo/v3 v3.12.50/go.mod h1:bu9YIwtg+HXQxBhsRDE+cJjQRuINuT9PUK4orOco/JI=
+modernc.org/ccgo/v3 v3.12.51/go.mod h1:gaIIlx4YpmGO2bLye04/yeblmvWEmE4BBBls4aJXFiE=
+modernc.org/ccgo/v3 v3.12.53/go.mod h1:8xWGGTFkdFEWBEsUmi+DBjwu/WLy3SSOrqEmKUjMeEg=
+modernc.org/ccgo/v3 v3.12.54/go.mod h1:yANKFTm9llTFVX1FqNKHE0aMcQb1fuPJx6p8AcUx+74=
+modernc.org/ccgo/v3 v3.12.55/go.mod h1:rsXiIyJi9psOwiBkplOaHye5L4MOOaCjHg1Fxkj7IeU=
+modernc.org/ccgo/v3 v3.12.56/go.mod h1:ljeFks3faDseCkr60JMpeDb2GSO3TKAmrzm7q9YOcMU=
+modernc.org/ccgo/v3 v3.12.57/go.mod h1:hNSF4DNVgBl8wYHpMvPqQWDQx8luqxDnNGCMM4NFNMc=
+modernc.org/ccgo/v3 v3.12.60/go.mod h1:k/Nn0zdO1xHVWjPYVshDeWKqbRWIfif5dtsIOCUVMqM=
 modernc.org/libc v1.8.1/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
+modernc.org/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
+modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q=
+modernc.org/libc v1.11.0/go.mod h1:2lOfPmj7cz+g1MrPNmX65QCzVxgNq2C5o0jdLY2gAYg=
+modernc.org/libc v1.11.2/go.mod h1:ioIyrl3ETkugDO3SGZ+6EOKvlP3zSOycUETe4XM4n8M=
+modernc.org/libc v1.11.5/go.mod h1:k3HDCP95A6U111Q5TmG3nAyUcp3kR5YFZTeDS9v8vSU=
+modernc.org/libc v1.11.6/go.mod h1:ddqmzR6p5i4jIGK1d/EiSw97LBcE3dK24QEwCFvgNgE=
+modernc.org/libc v1.11.11/go.mod h1:lXEp9QOOk4qAYOtL3BmMve99S5Owz7Qyowzvg6LiZso=
+modernc.org/libc v1.11.13/go.mod h1:ZYawJWlXIzXy2Pzghaf7YfM8OKacP3eZQI81PDLFdY8=
+modernc.org/libc v1.11.16/go.mod h1:+DJquzYi+DMRUtWI1YNxrlQO6TcA5+dRRiq8HWBWRC8=
+modernc.org/libc v1.11.19/go.mod h1:e0dgEame6mkydy19KKaVPBeEnyJB4LGNb0bBH1EtQ3I=
+modernc.org/libc v1.11.24/go.mod h1:FOSzE0UwookyT1TtCJrRkvsOrX2k38HoInhw+cSCUGk=
+modernc.org/libc v1.11.26/go.mod h1:SFjnYi9OSd2W7f4ct622o/PAYqk7KHv6GS8NZULIjKY=
+modernc.org/libc v1.11.27/go.mod h1:zmWm6kcFXt/jpzeCgfvUNswM0qke8qVwxqZrnddlDiE=
+modernc.org/libc v1.11.28/go.mod h1:Ii4V0fTFcbq3qrv3CNn+OGHAvzqMBvC7dBNyC4vHZlg=
+modernc.org/libc v1.11.31/go.mod h1:FpBncUkEAtopRNJj8aRo29qUiyx5AvAlAxzlx9GNaVM=
+modernc.org/libc v1.11.34/go.mod h1:+Tzc4hnb1iaX/SKAutJmfzES6awxfU1BPvrrJO0pYLg=
+modernc.org/libc v1.11.37/go.mod h1:dCQebOwoO1046yTrfUE5nX1f3YpGZQKNcITUYWlrAWo=
+modernc.org/libc v1.11.39/go.mod h1:mV8lJMo2S5A31uD0k1cMu7vrJbSA3J3waQJxpV4iqx8=
+modernc.org/libc v1.11.42/go.mod h1:yzrLDU+sSjLE+D4bIhS7q1L5UwXDOw99PLSX0BlZvSQ=
+modernc.org/libc v1.11.44/go.mod h1:KFq33jsma7F5WXiYelU8quMJasCCTnHK0mkri4yPHgA=
+modernc.org/libc v1.11.45/go.mod h1:Y192orvfVQQYFzCNsn+Xt0Hxt4DiO4USpLNXBlXg/tM=
+modernc.org/libc v1.11.47/go.mod h1:tPkE4PzCTW27E6AIKIR5IwHAQKCAtudEIeAV1/SiyBg=
+modernc.org/libc v1.11.49/go.mod h1:9JrJuK5WTtoTWIFQ7QjX2Mb/bagYdZdscI3xrvHbXjE=
+modernc.org/libc v1.11.51/go.mod h1:R9I8u9TS+meaWLdbfQhq2kFknTW0O3aw3kEMqDDxMaM=
+modernc.org/libc v1.11.53/go.mod h1:5ip5vWYPAoMulkQ5XlSJTy12Sz5U6blOQiYasilVPsU=
+modernc.org/libc v1.11.54/go.mod h1:S/FVnskbzVUrjfBqlGFIPA5m7UwB3n9fojHhCNfSsnw=
+modernc.org/libc v1.11.55/go.mod h1:j2A5YBRm6HjNkoSs/fzZrSxCuwWqcMYTDPLNx0URn3M=
+modernc.org/libc v1.11.56/go.mod h1:pakHkg5JdMLt2OgRadpPOTnyRXm/uzu+Yyg/LSLdi18=
+modernc.org/libc v1.11.58/go.mod h1:ns94Rxv0OWyoQrDqMFfWwka2BcaF6/61CqJRK9LP7S8=
+modernc.org/libc v1.11.70 h1:OHnBZYEJF8CuLOH++G4XYL2lZ4yLH/kkKTRf6gqV5UE=
+modernc.org/libc v1.11.70/go.mod h1:DUOmMYe+IvKi9n6Mycyx3DbjfzSKrdr/0Vgt3j7P5gw=
 modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/mathutil v1.2.2 h1:+yFk8hBprV+4c0U9GjFtL+dV3N8hOJ8JCituQcMShFY=
 modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/memory v1.0.4 h1:utMBrFcpnQDdNsmM6asmyH/FM9TqLPS7XF7otpJmrwM=
+modernc.org/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8=
+modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
+modernc.org/memory v1.0.5 h1:XRch8trV7GgvTec2i7jc33YlUI0RKVDBvZ5eZ5m8y14=
+modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM=
+modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
+modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
+modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=

internal/base/feature.go

@@ -29,9 +29,3 @@ var (
 func nocheck(_ io.ReadSeeker) (bool, string) {
 	return true, ""
 }
-
-// todo: enable in v1.1.0
-// onebot v12 feature
-const (
-	AcceptOneBotV12HTTPEndPoint = false
-)

internal/base/flag.go

@@ -37,6 +37,7 @@ var (
 	ReportSelfMessage   bool // 是否上报自身消息
 	UseSSOAddress       bool // 是否使用服务器下发的新地址进行重连
 	LogForceNew         bool // 是否在每次启动时强制创建全新的文件储存日志
+	LogColorful         bool // 是否启用日志颜色
 	FastStart           bool // 是否为快速启动
 
 	PostFormat        string                 // 上报格式 string or array
@@ -92,6 +93,7 @@ func Init() {
 		Servers = conf.Servers
 		Database = conf.Database
 		LogLevel = conf.Output.LogLevel
+		LogColorful = conf.Output.LogColorful == nil || *conf.Output.LogColorful
 		if conf.Message.PostFormat != "string" && conf.Message.PostFormat != "array" {
 			log.Warnf("post-format 配置错误, 将自动使用 string")
 			PostFormat = "string"

internal/selfdiagnosis/diagnoses.go

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

internal/selfupdate/update_others.go

@@ -6,12 +6,12 @@ package selfupdate
 import (
 	"archive/tar"
 	"bytes"
-	"compress/gzip"
 	"crypto/sha256"
 	"errors"
-	"fmt"
 	"io"
 	"net/http"
+
+	"github.com/klauspost/compress/gzip"
 )
 
 // update go-cqhttp自我更新
@@ -43,7 +43,6 @@ func update(url string, sum []byte) error {
 		}
 		if header.Name == "go-cqhttp" {
 			err, _ := fromStream(tr)
-			fmt.Println()
 			if err != nil {
 				return err
 			}

internal/selfupdate/update_windows.go

@@ -1,13 +1,13 @@
 package selfupdate
 
 import (
-	"archive/zip"
 	"bytes"
 	"crypto/sha256"
 	"errors"
-	"fmt"
 	"io"
 	"net/http"
+
+	"github.com/klauspost/compress/zip"
 )
 
 // update go-cqhttp自我更新
@@ -33,7 +33,6 @@ func update(url string, sum []byte) error {
 		return err
 	}
 	err, _ = fromStream(file)
-	fmt.Println()
 	if err != nil {
 		return err
 	}

main.go

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

modules/api/api.go

@@ -0,0 +1,309 @@
+// 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 "create_guild_role":
+		p0 := p.Get("guild_id").Uint()
+		p1 := p.Get("name").String()
+		p2 := uint32(p.Get("color").Int())
+		p3 := p.Get("independent").Bool()
+		p4 := p.Get("initial_users")
+		return c.bot.CQCreateGuildRole(p0, p1, p2, p3, p4)
+	case "delete_essence_msg":
+		p0 := int32(p.Get("message_id").Int())
+		return c.bot.CQDeleteEssenceMessage(p0)
+	case "delete_friend":
+		p0 := p.Get("[user_id,id].0").Int()
+		return c.bot.CQDeleteFriend(p0)
+	case "delete_group_file":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("file_id").String()
+		p2 := int32(p.Get("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_guild_role":
+		p0 := p.Get("guild_id").Uint()
+		p1 := p.Get("role_id").Uint()
+		return c.bot.CQDeleteGuildRole(p0, p1)
+	case "delete_msg":
+		p0 := int32(p.Get("message_id").Int())
+		return c.bot.CQDeleteMessage(p0)
+	case "delete_unidirectional_friend":
+		p0 := p.Get("user_id").Int()
+		return c.bot.CQDeleteUnidirectionalFriend(p0)
+	case "download_file":
+		p0 := p.Get("url").String()
+		p1 := p.Get("headers")
+		p2 := int(p.Get("thread_count").Int())
+		return c.bot.CQDownloadFile(p0, p1, p2)
+	case "get_essence_msg_list":
+		p0 := p.Get("group_id").Int()
+		return c.bot.CQGetEssenceMessageList(p0)
+	case "get_forward_msg":
+		p0 := p.Get("[message_id,id].0").String()
+		return c.bot.CQGetForwardMessage(p0)
+	case "get_friend_list":
+		return c.bot.CQGetFriendList()
+	case "get_group_at_all_remain":
+		p0 := p.Get("group_id").Int()
+		return c.bot.CQGetAtAllRemain(p0)
+	case "get_group_file_system_info":
+		p0 := p.Get("group_id").Int()
+		return c.bot.CQGetGroupFileSystemInfo(p0)
+	case "get_group_file_url":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("file_id").String()
+		p2 := int32(p.Get("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_meta_by_guest":
+		p0 := p.Get("guild_id").Uint()
+		return c.bot.CQGetGuildMetaByGuest(p0)
+	case "get_guild_roles":
+		p0 := p.Get("guild_id").Uint()
+		return c.bot.CQGetGuildRoles(p0)
+	case "get_guild_service_profile":
+		return c.bot.CQGetGuildServiceProfile()
+	case "get_image":
+		p0 := p.Get("file").String()
+		return c.bot.CQGetImage(p0)
+	case "get_login_info":
+		return c.bot.CQGetLoginInfo()
+	case "get_msg":
+		p0 := int32(p.Get("message_id").Int())
+		return c.bot.CQGetMessage(p0)
+	case "get_online_clients":
+		p0 := p.Get("no_cache").Bool()
+		return c.bot.CQGetOnlineClients(p0)
+	case "get_status":
+		return c.bot.CQGetStatus()
+	case "get_stranger_info":
+		p0 := p.Get("user_id").Int()
+		return c.bot.CQGetStrangerInfo(p0)
+	case "get_topic_channel_feeds":
+		p0 := p.Get("guild_id").Uint()
+		p1 := p.Get("channel_id").Uint()
+		return c.bot.CQGetTopicChannelFeeds(p0, p1)
+	case "get_unidirectional_friend_list":
+		return c.bot.CQGetUnidirectionalFriendList()
+	case "get_version_info":
+		return c.bot.CQGetVersionInfo()
+	case "mark_msg_as_read":
+		p0 := int32(p.Get("message_id").Int())
+		return c.bot.CQMarkMessageAsRead(p0)
+	case "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("special_title").String()
+		return c.bot.CQSetGroupSpecialTitle(p0, p1, p2)
+	case "set_group_whole_ban":
+		p0 := p.Get("group_id").Int()
+		p1 := true
+		if pt := p.Get("enable"); pt.Exists() {
+			p1 = pt.Bool()
+		}
+		return c.bot.CQSetGroupWholeBan(p0, p1)
+	case "set_guild_member_role":
+		p0 := p.Get("guild_id").Uint()
+		p1 := p.Get("set").Bool()
+		p2 := p.Get("role_id").Uint()
+		p3 := p.Get("users")
+		return c.bot.CQSetGuildMemberRole(p0, p1, p2, p3)
+	case "update_guild_role":
+		p0 := p.Get("guild_id").Uint()
+		p1 := p.Get("role_id").Uint()
+		p2 := p.Get("name").String()
+		p3 := uint32(p.Get("color").Int())
+		p4 := p.Get("indepedent").Bool()
+		return c.bot.CQModifyRoleInGuild(p0, p1, p2, p3, p4)
+	case "upload_group_file":
+		p0 := p.Get("group_id").Int()
+		p1 := p.Get("file").String()
+		p2 := p.Get("name").String()
+		p3 := p.Get("folder").String()
+		return c.bot.CQUploadGroupFile(p0, p1, p2, p3)
+	}
+}

modules/api/caller.go

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

modules/config/config.go

@@ -8,11 +8,12 @@ import (
 	"os"
 	"strconv"
 	"strings"
-
-	"github.com/Mrs4s/go-cqhttp/internal/param"
+	"sync"
 
 	log "github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v3"
+
+	"github.com/Mrs4s/go-cqhttp/internal/param"
 )
 
 // defaultConfig 默认配置文件
@@ -61,6 +62,7 @@ type Config struct {
 		LogLevel    string `yaml:"log-level"`
 		LogAging    int    `yaml:"log-aging"`
 		LogForceNew bool   `yaml:"log-force-new"`
+		LogColorful *bool  `yaml:"log-colorful"`
 		Debug       bool   `yaml:"debug"`
 	} `yaml:"output"`
 
@@ -68,68 +70,11 @@ type Config struct {
 	Database map[string]yaml.Node   `yaml:"database"`
 }
 
-// MiddleWares 通信中间件
-type MiddleWares struct {
-	AccessToken string `yaml:"access-token"`
-	Filter      string `yaml:"filter"`
-	RateLimit   struct {
-		Enabled   bool    `yaml:"enabled"`
-		Frequency float64 `yaml:"frequency"`
-		Bucket    int     `yaml:"bucket"`
-	} `yaml:"rate-limit"`
-}
-
-// HTTPServer HTTP通信相关配置
-type HTTPServer struct {
-	Disabled    bool   `yaml:"disabled"`
-	Host        string `yaml:"host"`
-	Port        int    `yaml:"port"`
-	Timeout     int32  `yaml:"timeout"`
-	LongPolling struct {
-		Enabled      bool `yaml:"enabled"`
-		MaxQueueSize int  `yaml:"max-queue-size"`
-	} `yaml:"long-polling"`
-	Post []struct {
-		URL    string `yaml:"url"`
-		Secret string `yaml:"secret"`
-	}
-
-	MiddleWares `yaml:"middlewares"`
-}
-
-// PprofServer pprof性能分析服务器相关配置
-type PprofServer struct {
-	Disabled bool   `yaml:"disabled"`
-	Host     string `yaml:"host"`
-	Port     int    `yaml:"port"`
-}
-
-// WebsocketServer 正向WS相关配置
-type WebsocketServer struct {
-	Disabled bool   `yaml:"disabled"`
-	Host     string `yaml:"host"`
-	Port     int    `yaml:"port"`
-
-	MiddleWares `yaml:"middlewares"`
-}
-
-// WebsocketReverse 反向WS相关配置
-type WebsocketReverse struct {
-	Disabled          bool   `yaml:"disabled"`
-	Universal         string `yaml:"universal"`
-	API               string `yaml:"api"`
-	Event             string `yaml:"event"`
-	ReconnectInterval int    `yaml:"reconnect-interval"`
-
-	MiddleWares `yaml:"middlewares"`
-}
-
-// LambdaServer 云函数配置
-type LambdaServer struct {
-	Disabled bool   `yaml:"disabled"`
-	Type     string `yaml:"type"`
-
-	MiddleWares `yaml:"middlewares"`
+// Server 的简介和初始配置
+type Server struct {
+	Brief    string
+	Default  string
+	ParseEnv func() (string, *yaml.Node)
 }
 
 // LevelDBConfig leveldb 相关配置
@@ -148,11 +93,11 @@ type MongoDBConfig struct {
 func Parse(path string) *Config {
 	fromEnv := os.Getenv("GCQ_UIN") != ""
 
-	file, err := os.Open(path)
+	file, err := os.ReadFile(path)
 	config := &Config{}
 	if err == nil {
-		defer func() { _ = file.Close() }()
-		if err = yaml.NewDecoder(file).Decode(config); err != nil && !fromEnv {
+		err = yaml.NewDecoder(strings.NewReader(os.ExpandEnv(string(file)))).Decode(config)
+		if err != nil && !fromEnv {
 			log.Fatal("配置文件不合法!", err)
 		}
 	} else if !fromEnv {
@@ -182,161 +127,58 @@ func Parse(path string) *Config {
 			_ = 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,
-				},
+
+		for _, s := range serverconfs {
+			if s.ParseEnv != nil {
+				name, node := s.ParseEnv()
+				if node != nil {
+					config.Servers = append(config.Servers, map[string]yaml.Node{name: *node})
+				}
 			}
-			param.SetExcludeDefault(&httpConf.Disabled, param.EnsureBool(os.Getenv("GCQ_HTTP_DISABLE"), false), false)
-			param.SetExcludeDefault(&httpConf.Host, os.Getenv("GCQ_HTTP_HOST"), "")
-			param.SetExcludeDefault(&httpConf.Port, int(toInt64(os.Getenv("GCQ_HTTP_PORT"))), 0)
-			if os.Getenv("GCQ_HTTP_POST_URL") != "" {
-				httpConf.Post = append(httpConf.Post, struct {
-					URL    string `yaml:"url"`
-					Secret string `yaml:"secret"`
-				}{os.Getenv("GCQ_HTTP_POST_URL"), os.Getenv("GCQ_HTTP_POST_SECRET")})
-			}
-			_ = node.Encode(httpConf)
-			config.Servers = append(config.Servers, map[string]yaml.Node{"http": *node})
-		}
-		if os.Getenv("GCQ_WS_PORT") != "" {
-			node := &yaml.Node{}
-			wsServerConf := &WebsocketServer{
-				Host: "0.0.0.0",
-				Port: 6700,
-				MiddleWares: MiddleWares{
-					AccessToken: accessTokenEnv,
-				},
-			}
-			param.SetExcludeDefault(&wsServerConf.Disabled, param.EnsureBool(os.Getenv("GCQ_WS_DISABLE"), false), false)
-			param.SetExcludeDefault(&wsServerConf.Host, os.Getenv("GCQ_WS_HOST"), "")
-			param.SetExcludeDefault(&wsServerConf.Port, int(toInt64(os.Getenv("GCQ_WS_PORT"))), 0)
-			_ = node.Encode(wsServerConf)
-			config.Servers = append(config.Servers, map[string]yaml.Node{"ws": *node})
-		}
-		if os.Getenv("GCQ_RWS_API") != "" || os.Getenv("GCQ_RWS_EVENT") != "" || os.Getenv("GCQ_RWS_UNIVERSAL") != "" {
-			node := &yaml.Node{}
-			rwsConf := &WebsocketReverse{
-				MiddleWares: MiddleWares{
-					AccessToken: accessTokenEnv,
-				},
-			}
-			param.SetExcludeDefault(&rwsConf.Disabled, param.EnsureBool(os.Getenv("GCQ_RWS_DISABLE"), false), false)
-			param.SetExcludeDefault(&rwsConf.API, os.Getenv("GCQ_RWS_API"), "")
-			param.SetExcludeDefault(&rwsConf.Event, os.Getenv("GCQ_RWS_EVENT"), "")
-			param.SetExcludeDefault(&rwsConf.Universal, os.Getenv("GCQ_RWS_UNIVERSAL"), "")
-			_ = node.Encode(rwsConf)
-			config.Servers = append(config.Servers, map[string]yaml.Node{"ws-reverse": *node})
 		}
 	}
 	return config
 }
 
+var serverconfs []*Server
+var mu sync.Mutex
+
+// AddServer 添加该服务的简介和默认配置
+func AddServer(s *Server) {
+	mu.Lock()
+	serverconfs = append(serverconfs, s)
+	mu.Unlock()
+}
+
 // generateConfig 生成配置文件
 func generateConfig() {
 	fmt.Println("未找到配置文件，正在为您生成配置文件中！")
 	sb := strings.Builder{}
 	sb.WriteString(defaultConfig)
-	fmt.Print(`请选择你需要的通信方式:
-> 1: HTTP通信
-> 2: 正向 Websocket 通信
-> 3: 反向 Websocket 通信
-> 4: pprof 性能分析服务器
-> 5: 云函数服务
-请输入你需要的编号，可输入多个，同一编号也可输入多个(如: 233)
-您的选择是:`)
+	hint := "请选择你需要的通信方式:"
+	for i, s := range serverconfs {
+		hint += fmt.Sprintf("\n> %d: %s", i, s.Brief)
+	}
+	hint += `
+请输入你需要的编号(0-9)，可输入多个，同一编号也可输入多个(如: 233)
+您的选择是:`
+	fmt.Print(hint)
 	input := bufio.NewReader(os.Stdin)
 	readString, err := input.ReadString('\n')
 	if err != nil {
 		log.Fatal("输入不合法: ", err)
 	}
+	rmax := len(serverconfs)
+	if rmax > 10 {
+		rmax = 10
+	}
 	for _, r := range readString {
-		switch r {
-		case '1':
-			sb.WriteString(httpDefault)
-		case '2':
-			sb.WriteString(wsDefault)
-		case '3':
-			sb.WriteString(wsReverseDefault)
-		case '4':
-			sb.WriteString(pprofDefault)
-		case '5':
-			sb.WriteString(lambdaDefault)
+		r -= '0'
+		if r >= 0 && r < rune(rmax) {
+			sb.WriteString(serverconfs[r].Default)
 		}
 	}
 	_ = os.WriteFile("config.yml", []byte(sb.String()), 0o644)
 	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

@@ -49,6 +49,8 @@ output:
   log-aging: 15
   # 是否在每次启动时强制创建全新的文件储存日志. 为 false 的情况下将会在上次启动时创建的日志文件续写
   log-force-new: true
+  # 是否启用日志颜色
+  log-colorful: true
   # 是否启用 DEBUG
   debug: false # 开启调试模式
 

modules/filter/filter.go

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

modules/filter/middlewares.go

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

modules/pprof/pprof.go

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

modules/servers/servers.go

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

server/api.go

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

server/doc.go

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

server/http.go

@@ -1,6 +1,7 @@
 package server
 
 import (
+	"bytes"
 	"context"
 	"crypto/hmac"
 	"crypto/sha1"
@@ -23,13 +24,33 @@ import (
 
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/internal/param"
+	"github.com/Mrs4s/go-cqhttp/modules/api"
 	"github.com/Mrs4s/go-cqhttp/modules/config"
+	"github.com/Mrs4s/go-cqhttp/modules/filter"
 )
 
+// HTTPServer HTTP通信相关配置
+type HTTPServer struct {
+	Disabled    bool   `yaml:"disabled"`
+	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"`
+}
+
 type httpServer struct {
 	HTTP        *http.Server
-	api         *apiCaller
+	api         *api.Caller
 	accessToken string
 }
 
@@ -49,6 +70,68 @@ type httpCtx struct {
 	postForm url.Values
 }
 
+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: http://127.0.0.1:5701/ # 地址
+      #  secret: ''          # 密钥
+`
+
+func init() {
+	config.AddServer(&config.Server{
+		Brief:   "HTTP通信",
+		Default: httpDefault,
+		ParseEnv: func() (string, *yaml.Node) {
+			if os.Getenv("GCQ_HTTP_PORT") != "" {
+				// type convert tools
+				toInt64 := func(str string) int64 {
+					i, _ := strconv.ParseInt(str, 10, 64)
+					return i
+				}
+				accessTokenEnv := os.Getenv("GCQ_ACCESS_TOKEN")
+				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)
+				return "http", node
+			}
+			return "", nil
+		},
+	})
+}
+
 func (h *httpCtx) Get(s string) gjson.Result {
 	j := h.json.Get(s)
 	if j.Exists() {
@@ -118,15 +201,15 @@ func (s *httpServer) ServeHTTP(writer http.ResponseWriter, request *http.Request
 	}
 
 	var response global.MSG
-	if base.AcceptOneBotV12HTTPEndPoint && request.URL.Path == "/" {
+	if request.URL.Path == "/" {
 		action := strings.TrimSuffix(ctx.Get("action").Str, "_async")
 		log.Debugf("HTTPServer接收到API调用: %v", action)
-		response = s.api.callAPI(action, ctx.Get("params"))
+		response = s.api.Call(action, ctx.Get("params"))
 	} else {
 		action := strings.TrimPrefix(request.URL.Path, "/")
 		action = strings.TrimSuffix(action, "_async")
 		log.Debugf("HTTPServer接收到API调用: %v", action)
-		response = s.api.callAPI(action, &ctx)
+		response = s.api.Call(action, &ctx)
 	}
 
 	writer.Header().Set("Content-Type", "application/json; charset=utf-8")
@@ -161,7 +244,7 @@ func checkAuth(req *http.Request, token string) int {
 
 // runHTTP 启动HTTP服务器与HTTP上报客户端
 func runHTTP(bot *coolq.CQBot, node yaml.Node) {
-	var conf config.HTTPServer
+	var conf HTTPServer
 	switch err := node.Decode(&conf); {
 	case err != nil:
 		log.Warn("读取http配置失败 :", err)
@@ -176,12 +259,12 @@ func runHTTP(bot *coolq.CQBot, node yaml.Node) {
 		goto client
 	}
 	addr = fmt.Sprintf("%s:%d", conf.Host, conf.Port)
-	s.api = newAPICaller(bot)
+	s.api = api.NewCaller(bot)
 	if conf.RateLimit.Enabled {
-		s.api.use(rateLimit(conf.RateLimit.Frequency, conf.RateLimit.Bucket))
+		s.api.Use(rateLimit(conf.RateLimit.Frequency, conf.RateLimit.Bucket))
 	}
 	if conf.LongPolling.Enabled {
-		s.api.use(longPolling(bot, conf.LongPolling.MaxQueueSize))
+		s.api.Use(longPolling(bot, conf.LongPolling.MaxQueueSize))
 	}
 
 	go func() {
@@ -215,7 +298,7 @@ client:
 
 // Run 运行反向HTTP服务
 func (c HTTPClient) Run() {
-	addFilter(c.filter)
+	filter.Add(c.filter)
 	if c.timeout < 5 {
 		c.timeout = 5
 	}
@@ -225,24 +308,25 @@ func (c HTTPClient) Run() {
 
 func (c *HTTPClient) onBotPushEvent(e *coolq.Event) {
 	if c.filter != "" {
-		filter := findFilter(c.filter)
-		if filter != nil && !filter.Eval(gjson.Parse(e.JSONString())) {
+		flt := filter.Find(c.filter)
+		if flt != nil && !flt.Eval(gjson.Parse(e.JSONString())) {
 			log.Debugf("上报Event %v 到 HTTP 服务器 %s 时被过滤.", c.addr, e.JSONBytes())
 			return
 		}
 	}
 
 	client := http.Client{Timeout: time.Second * time.Duration(c.timeout)}
-	req, _ := http.NewRequest("POST", c.addr, nil)
-	req.Header.Set("X-Self-ID", strconv.FormatInt(c.bot.Client.Uin, 10))
-	req.Header.Set("User-Agent", "CQHttp/4.15.0")
+	header := make(http.Header)
+	header.Set("X-Self-ID", strconv.FormatInt(c.bot.Client.Uin, 10))
+	header.Set("User-Agent", "CQHttp/4.15.0")
+	header.Set("Content-Type", "application/json")
 	if c.secret != "" {
 		mac := hmac.New(sha1.New, []byte(c.secret))
 		_, _ = mac.Write(e.JSONBytes())
-		req.Header.Set("X-Signature", "sha1="+hex.EncodeToString(mac.Sum(nil)))
+		header.Set("X-Signature", "sha1="+hex.EncodeToString(mac.Sum(nil)))
 	}
 	if c.apiPort != 0 {
-		req.Header.Set("X-API-Port", strconv.FormatInt(int64(c.apiPort), 10))
+		header.Set("X-API-Port", strconv.FormatInt(int64(c.apiPort), 10))
 	}
 
 	var res *http.Response
@@ -250,6 +334,15 @@ func (c *HTTPClient) onBotPushEvent(e *coolq.Event) {
 	const maxAttemptTimes = 5
 
 	for i := 0; i <= maxAttemptTimes; i++ {
+		// see https://stackoverflow.com/questions/31337891/net-http-http-contentlength-222-with-body-length-0
+		// we should create a new request for every single post trial
+		req, err := http.NewRequest("POST", c.addr, bytes.NewReader(e.JSONBytes()))
+		if err != nil {
+			log.Warnf("上报 Event 数据到 %v 时创建请求失败: %v", c.addr, err)
+			return
+		}
+		req.Header = header
+
 		res, err = client.Do(req)
 		if err == nil {
 			//goland:noinspection GoDeferInLoop

server/middlewares.go

@@ -3,61 +3,36 @@ package server
 import (
 	"container/list"
 	"context"
-	"os"
 	"sync"
 	"time"
 
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/modules/api"
 
-	log "github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
 	"golang.org/x/time/rate"
 )
 
-var (
-	filters     = make(map[string]global.Filter)
-	filterMutex sync.RWMutex
-)
+// MiddleWares 通信中间件
+type MiddleWares struct {
+	AccessToken string `yaml:"access-token"`
+	Filter      string `yaml:"filter"`
+	RateLimit   struct {
+		Enabled   bool    `yaml:"enabled"`
+		Frequency float64 `yaml:"frequency"`
+		Bucket    int     `yaml:"bucket"`
+	} `yaml:"rate-limit"`
+}
 
-func rateLimit(frequency float64, bucketSize int) handler {
+func rateLimit(frequency float64, bucketSize int) api.Handler {
 	limiter := rate.NewLimiter(rate.Limit(frequency), bucketSize)
-	return func(_ string, _ resultGetter) global.MSG {
+	return func(_ string, _ api.Getter) global.MSG {
 		_ = limiter.Wait(context.Background())
 		return nil
 	}
 }
 
-func addFilter(file string) {
-	if file == "" {
-		return
-	}
-	bs, err := os.ReadFile(file)
-	if err != nil {
-		log.Error("init filter error: ", err)
-		return
-	}
-	defer func() {
-		if err := recover(); err != nil {
-			log.Error("init filter error: ", err)
-		}
-	}()
-	filter := global.Generate("and", gjson.ParseBytes(bs))
-	filterMutex.Lock()
-	filters[file] = filter
-	filterMutex.Unlock()
-}
-
-func findFilter(file string) global.Filter {
-	if file == "" {
-		return nil
-	}
-	filterMutex.RLock()
-	defer filterMutex.RUnlock()
-	return filters[file]
-}
-
-func longPolling(bot *coolq.CQBot, maxSize int) handler {
+func longPolling(bot *coolq.CQBot, maxSize int) api.Handler {
 	var mutex sync.Mutex
 	cond := sync.NewCond(&mutex)
 	queue := list.New()
@@ -70,7 +45,7 @@ func longPolling(bot *coolq.CQBot, maxSize int) handler {
 		}
 		cond.Signal()
 	})
-	return func(action string, p resultGetter) global.MSG {
+	return func(action string, p api.Getter) global.MSG {
 		if action != "get_updates" {
 			return nil
 		}

server/pprof.go

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

server/scf.go

@@ -17,6 +17,7 @@ import (
 
 	"github.com/Mrs4s/go-cqhttp/coolq"
 	"github.com/Mrs4s/go-cqhttp/global"
+	api2 "github.com/Mrs4s/go-cqhttp/modules/api"
 	"github.com/Mrs4s/go-cqhttp/modules/config"
 )
 
@@ -80,7 +81,7 @@ var cli *lambdaClient
 
 // runLambda  type: [scf,aws]
 func runLambda(bot *coolq.CQBot, node yaml.Node) {
-	var conf config.LambdaServer
+	var conf LambdaServer
 	switch err := node.Decode(&conf); {
 	case err != nil:
 		log.Warn("读取lambda配置失败 :", err)
@@ -115,9 +116,9 @@ func runLambda(bot *coolq.CQBot, node yaml.Node) {
 		log.Fatal("unknown lambda type:", conf.Type)
 	}
 
-	api := newAPICaller(bot)
+	api := api2.NewCaller(bot)
 	if conf.RateLimit.Enabled {
-		api.use(rateLimit(conf.RateLimit.Frequency, conf.RateLimit.Bucket))
+		api.Use(rateLimit(conf.RateLimit.Frequency, conf.RateLimit.Bucket))
 	}
 	server := &httpServer{
 		api:         api,
@@ -154,6 +155,28 @@ type lambdaInvoke struct {
 	} `json:"requestContext"`
 }
 
+const lambdaDefault = `  # LambdaServer 配置
+  - lambda:
+      type: scf # scf: 腾讯云函数 aws: aws Lambda
+      middlewares:
+        <<: *default # 引用默认中间件
+`
+
+// LambdaServer 云函数配置
+type LambdaServer struct {
+	Disabled bool   `yaml:"disabled"`
+	Type     string `yaml:"type"`
+
+	MiddleWares `yaml:"middlewares"`
+}
+
+func init() {
+	config.AddServer(&config.Server{
+		Brief:   "云函数服务",
+		Default: lambdaDefault,
+	})
+}
+
 func (c *lambdaClient) next() *http.Request {
 	r, err := http.NewRequest(http.MethodGet, c.nextURL, nil)
 	if err != nil {

server/websocket.go

@@ -2,52 +2,69 @@ package server
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"net/http"
+	"os"
 	"runtime/debug"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 
-	"gopkg.in/yaml.v3"
-
-	"github.com/Mrs4s/go-cqhttp/coolq"
-	"github.com/Mrs4s/go-cqhttp/global"
-	"github.com/Mrs4s/go-cqhttp/modules/config"
-
 	"github.com/Mrs4s/MiraiGo/utils"
 	"github.com/gorilla/websocket"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
+	"gopkg.in/yaml.v3"
+
+	"github.com/Mrs4s/go-cqhttp/coolq"
+	"github.com/Mrs4s/go-cqhttp/global"
+	"github.com/Mrs4s/go-cqhttp/internal/param"
+	"github.com/Mrs4s/go-cqhttp/modules/api"
+	"github.com/Mrs4s/go-cqhttp/modules/config"
+	"github.com/Mrs4s/go-cqhttp/modules/filter"
 )
 
 type webSocketServer struct {
 	bot  *coolq.CQBot
-	conf *config.WebsocketServer
+	conf *WebsocketServer
 
-	eventConn      []*webSocketConn
-	eventConnMutex sync.Mutex
-	token          string
-	handshake      string
-	filter         string
+	mu        sync.Mutex
+	eventConn []*wsConn
+
+	token     string
+	handshake string
+	filter    string
 }
 
 // websocketClient WebSocket客户端实例
 type websocketClient struct {
-	bot  *coolq.CQBot
-	conf *config.WebsocketReverse
+	bot       *coolq.CQBot
+	mu        sync.Mutex
+	universal *wsConn
+	event     *wsConn
 
-	universalConn *webSocketConn
-	eventConn     *webSocketConn
-	token         string
-	filter        string
+	token             string
+	filter            string
+	reconnectInterval time.Duration
+	limiter           api.Handler
 }
 
-type webSocketConn struct {
-	*websocket.Conn
-	sync.Mutex
-	apiCaller *apiCaller
+type wsConn struct {
+	mu        sync.Mutex
+	conn      *websocket.Conn
+	apiCaller *api.Caller
+}
+
+func (c *wsConn) WriteText(b []byte) error {
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	return c.conn.WriteMessage(websocket.TextMessage, b)
+}
+
+func (c *wsConn) Close() error {
+	return c.conn.Close()
 }
 
 var upgrader = websocket.Upgrader{
@@ -56,9 +73,107 @@ var upgrader = websocket.Upgrader{
 	},
 }
 
+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 # 引用默认中间件
+`
+
+// 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"`
+}
+
+func init() {
+	config.AddServer(&config.Server{
+		Brief:   "正向 Websocket 通信",
+		Default: wsDefault,
+		ParseEnv: func() (string, *yaml.Node) {
+			if os.Getenv("GCQ_WS_PORT") != "" {
+				// type convert tools
+				toInt64 := func(str string) int64 {
+					i, _ := strconv.ParseInt(str, 10, 64)
+					return i
+				}
+				accessTokenEnv := os.Getenv("GCQ_ACCESS_TOKEN")
+				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)
+				return "ws", node
+			}
+			return "", nil
+		},
+	})
+	config.AddServer(&config.Server{
+		Brief:   "反向 Websocket 通信",
+		Default: wsReverseDefault,
+		ParseEnv: func() (string, *yaml.Node) {
+			if os.Getenv("GCQ_RWS_API") != "" || os.Getenv("GCQ_RWS_EVENT") != "" || os.Getenv("GCQ_RWS_UNIVERSAL") != "" {
+				accessTokenEnv := os.Getenv("GCQ_ACCESS_TOKEN")
+				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)
+				return "ws-reverse", node
+			}
+			return "", nil
+		},
+	})
+}
+
 // runWSServer 运行一个正向WS server
 func runWSServer(b *coolq.CQBot, node yaml.Node) {
-	var conf config.WebsocketServer
+	var conf WebsocketServer
 	switch err := node.Decode(&conf); {
 	case err != nil:
 		log.Warn("读取正向Websocket配置失败 :", err)
@@ -73,7 +188,7 @@ func runWSServer(b *coolq.CQBot, node yaml.Node) {
 		token:  conf.AccessToken,
 		filter: conf.Filter,
 	}
-	addFilter(s.filter)
+	filter.Add(s.filter)
 	addr := fmt.Sprintf("%s:%d", conf.Host, conf.Port)
 	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())
@@ -82,15 +197,13 @@ func runWSServer(b *coolq.CQBot, node yaml.Node) {
 	mux.HandleFunc("/event", s.event)
 	mux.HandleFunc("/api", s.api)
 	mux.HandleFunc("/", s.any)
-	go func() {
-		log.Infof("CQ WebSocket 服务器已启动: %v", addr)
-		log.Fatal(http.ListenAndServe(addr, &mux))
-	}()
+	log.Infof("CQ WebSocket 服务器已启动: %v", addr)
+	log.Fatal(http.ListenAndServe(addr, &mux))
 }
 
 // runWSClient 运行一个反向向WS client
 func runWSClient(b *coolq.CQBot, node yaml.Node) {
-	var conf config.WebsocketReverse
+	var conf WebsocketReverse
 	switch err := node.Decode(&conf); {
 	case err != nil:
 		log.Warn("读取反向Websocket配置失败 :", err)
@@ -101,137 +214,87 @@ func runWSClient(b *coolq.CQBot, node yaml.Node) {
 
 	c := &websocketClient{
 		bot:    b,
-		conf:   &conf,
 		token:  conf.AccessToken,
 		filter: conf.Filter,
 	}
-	addFilter(c.filter)
-	if c.conf.Universal != "" {
-		c.connectUniversal()
-	} else {
-		if c.conf.API != "" {
-			c.connectAPI()
-		}
-		if c.conf.Event != "" {
-			c.connectEvent()
-		}
+	filter.Add(c.filter)
+	if conf.ReconnectInterval != 0 {
+		c.reconnectInterval = time.Duration(conf.ReconnectInterval) * time.Millisecond
+	}
+	if conf.RateLimit.Enabled {
+		c.limiter = rateLimit(conf.RateLimit.Frequency, conf.RateLimit.Bucket)
+	}
+
+	if conf.Universal != "" {
+		c.connect("Universal", conf.Universal, &c.universal)
+		c.bot.OnEventPush(c.onBotPushEvent("Universal", conf.Universal, &c.universal))
+		return // 连接到 Universal 后， 不再连接其他
+	}
+	if conf.API != "" {
+		c.connect("API", conf.API, nil)
+	}
+	if conf.Event != "" {
+		c.connect("Event", conf.Event, &c.event)
+		c.bot.OnEventPush(c.onBotPushEvent("Event", conf.Event, &c.event))
 	}
-	c.bot.OnEventPush(c.onBotPushEvent)
 }
 
-func (c *websocketClient) connectAPI() {
-	log.Infof("开始尝试连接到反向WebSocket API服务器: %v", c.conf.API)
+func (c *websocketClient) connect(typ, url string, conptr **wsConn) {
+	log.Infof("开始尝试连接到反向WebSocket %s服务器: %v", typ, url)
 	header := http.Header{
-		"X-Client-Role": []string{"API"},
+		"X-Client-Role": []string{typ},
 		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
 		"User-Agent":    []string{"CQHttp/4.15.0"},
 	}
 	if c.token != "" {
 		header["Authorization"] = []string{"Token " + c.token}
 	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.API, header) // nolint
+	conn, _, err := websocket.DefaultDialer.Dial(url, header) // nolint
 	if err != nil {
-		log.Warnf("连接到反向WebSocket API服务器 %v 时出现错误: %v", c.conf.API, err)
-		if c.conf.ReconnectInterval != 0 {
-			time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
-			c.connectAPI()
-		}
-		return
-	}
-	log.Infof("已连接到反向WebSocket API服务器 %v", c.conf.API)
-	wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
-	if c.conf.RateLimit.Enabled {
-		wrappedConn.apiCaller.use(rateLimit(c.conf.RateLimit.Frequency, c.conf.RateLimit.Bucket))
-	}
-	go c.listenAPI(wrappedConn, false)
-}
-
-func (c *websocketClient) connectEvent() {
-	log.Infof("开始尝试连接到反向WebSocket Event服务器: %v", c.conf.Event)
-	header := http.Header{
-		"X-Client-Role": []string{"Event"},
-		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
-		"User-Agent":    []string{"CQHttp/4.15.0"},
-	}
-	if c.token != "" {
-		header["Authorization"] = []string{"Token " + c.token}
-	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.Event, header) // nolint
-	if err != nil {
-		log.Warnf("连接到反向WebSocket Event服务器 %v 时出现错误: %v", c.conf.Event, err)
-		if c.conf.ReconnectInterval != 0 {
-			time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
-			c.connectEvent()
+		log.Warnf("连接到反向WebSocket %s服务器 %v 时出现错误: %v", typ, url, err)
+		if c.reconnectInterval != 0 {
+			time.Sleep(c.reconnectInterval)
+			c.connect(typ, url, conptr)
 		}
 		return
 	}
 
-	handshake := fmt.Sprintf(`{"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
-		c.bot.Client.Uin, time.Now().Unix())
-	err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
-	if err != nil {
-		log.Warnf("反向WebSocket 握手时出现错误: %v", err)
+	switch typ {
+	case "Event", "Universal":
+		handshake := fmt.Sprintf(`{"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`, c.bot.Client.Uin, time.Now().Unix())
+		err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
+		if err != nil {
+			log.Warnf("反向WebSocket 握手时出现错误: %v", err)
+		}
 	}
 
-	log.Infof("已连接到反向WebSocket Event服务器 %v", c.conf.Event)
-	if c.eventConn == nil {
-		wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
-		c.eventConn = wrappedConn
-	} else {
-		c.eventConn.Conn = conn
+	log.Infof("已连接到反向WebSocket %s服务器 %v", typ, url)
+	wrappedConn := &wsConn{conn: conn, apiCaller: api.NewCaller(c.bot)}
+	if c.limiter != nil {
+		wrappedConn.apiCaller.Use(c.limiter)
+	}
+
+	if conptr != nil {
+		*conptr = wrappedConn
+	}
+
+	if typ != "Event" {
+		go c.listenAPI(typ, url, wrappedConn)
 	}
 }
 
-func (c *websocketClient) connectUniversal() {
-	log.Infof("开始尝试连接到反向WebSocket Universal服务器: %v", c.conf.Universal)
-	header := http.Header{
-		"X-Client-Role": []string{"Universal"},
-		"X-Self-ID":     []string{strconv.FormatInt(c.bot.Client.Uin, 10)},
-		"User-Agent":    []string{"CQHttp/4.15.0"},
-	}
-	if c.token != "" {
-		header["Authorization"] = []string{"Token " + c.token}
-	}
-	conn, _, err := websocket.DefaultDialer.Dial(c.conf.Universal, header) // nolint
-	if err != nil {
-		log.Warnf("连接到反向WebSocket Universal服务器 %v 时出现错误: %v", c.conf.Universal, err)
-		if c.conf.ReconnectInterval != 0 {
-			time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
-			c.connectUniversal()
-		}
-		return
-	}
-	handshake := fmt.Sprintf(`{"meta_event_type":"lifecycle","post_type":"meta_event","self_id":%d,"sub_type":"connect","time":%d}`,
-		c.bot.Client.Uin, time.Now().Unix())
-	err = conn.WriteMessage(websocket.TextMessage, []byte(handshake))
-	if err != nil {
-		log.Warnf("反向WebSocket 握手时出现错误: %v", err)
-	}
-
-	if c.universalConn == nil {
-		wrappedConn := &webSocketConn{Conn: conn, apiCaller: newAPICaller(c.bot)}
-		if c.conf.RateLimit.Enabled {
-			wrappedConn.apiCaller.use(rateLimit(c.conf.RateLimit.Frequency, c.conf.RateLimit.Bucket))
-		}
-		c.universalConn = wrappedConn
-	} else {
-		c.universalConn.Conn = conn
-	}
-	go c.listenAPI(c.universalConn, true)
-}
-
-func (c *websocketClient) listenAPI(conn *webSocketConn, u bool) {
+func (c *websocketClient) listenAPI(typ, url string, conn *wsConn) {
 	defer func() { _ = conn.Close() }()
 	for {
 		buffer := global.NewBuffer()
-		t, reader, err := conn.NextReader()
+		t, reader, err := conn.conn.NextReader()
 		if err != nil {
-			log.Warnf("监听反向WS API时出现错误: %v", err)
+			log.Warnf("监听反向WS %s时出现错误: %v", typ, err)
 			break
 		}
 		_, err = buffer.ReadFrom(reader)
 		if err != nil {
-			log.Warnf("监听反向WS API时出现错误: %v", err)
+			log.Warnf("监听反向WS %s时出现错误: %v", typ, err)
 			break
 		}
 		if t == websocket.TextMessage {
@@ -243,40 +306,35 @@ func (c *websocketClient) listenAPI(conn *webSocketConn, u bool) {
 			global.PutBuffer(buffer)
 		}
 	}
-	if c.conf.ReconnectInterval != 0 {
-		time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
-		if !u {
-			go c.connectAPI()
+	if c.reconnectInterval != 0 {
+		time.Sleep(c.reconnectInterval)
+		if typ == "API" { // Universal 不重连，避免多次重连
+			go c.connect(typ, url, nil)
 		}
 	}
 }
 
-func (c *websocketClient) onBotPushEvent(e *coolq.Event) {
-	filter := findFilter(c.filter)
-	if filter != nil && !filter.Eval(gjson.Parse(e.JSONString())) {
-		log.Debugf("上报Event %s 到 WS服务器 时被过滤.", e.JSONBytes())
-		return
-	}
-	push := func(conn *webSocketConn, reconnect func()) {
-		log.Debugf("向WS服务器 %v 推送Event: %s", conn.RemoteAddr().String(), e.JSONBytes())
-		conn.Lock()
-		defer conn.Unlock()
-		_ = conn.SetWriteDeadline(time.Now().Add(time.Second * 15))
-		if err := conn.WriteMessage(websocket.TextMessage, e.JSONBytes()); err != nil {
-			log.Warnf("向WS服务器 %v 推送Event时出现错误: %v", conn.RemoteAddr().String(), err)
-			_ = conn.Close()
-			if c.conf.ReconnectInterval != 0 {
-				time.Sleep(time.Millisecond * time.Duration(c.conf.ReconnectInterval))
-				reconnect()
+func (c *websocketClient) onBotPushEvent(typ, url string, conn **wsConn) func(e *coolq.Event) {
+	return func(e *coolq.Event) {
+		c.mu.Lock()
+		defer c.mu.Unlock()
+
+		flt := filter.Find(c.filter)
+		if flt != nil && !flt.Eval(gjson.Parse(e.JSONString())) {
+			log.Debugf("上报Event %s 到 WS服务器 时被过滤.", e.JSONBytes())
+			return
+		}
+
+		log.Debugf("向反向WS %s服务器推送Event: %s", typ, e.JSONBytes())
+		if err := (*conn).WriteText(e.JSONBytes()); err != nil {
+			log.Warnf("向反向WS %s服务器推送 Event 时出现错误: %v", typ, err)
+			_ = (*conn).Close()
+			if c.reconnectInterval != 0 {
+				time.Sleep(c.reconnectInterval)
+				c.connect(typ, url, conn)
 			}
 		}
 	}
-	if c.eventConn != nil {
-		push(c.eventConn, c.connectEvent)
-	}
-	if c.universalConn != nil {
-		push(c.universalConn, c.connectUniversal)
-	}
 }
 
 func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
@@ -286,11 +344,13 @@ func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(status)
 		return
 	}
+
 	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
 		return
 	}
+
 	err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
 	if err != nil {
 		log.Warnf("WebSocket 握手时出现错误: %v", err)
@@ -299,12 +359,10 @@ func (s *webSocketServer) event(w http.ResponseWriter, r *http.Request) {
 	}
 
 	log.Infof("接受 WebSocket 连接: %v (/event)", r.RemoteAddr)
-
-	conn := &webSocketConn{Conn: c, apiCaller: newAPICaller(s.bot)}
-
-	s.eventConnMutex.Lock()
+	conn := &wsConn{conn: c, apiCaller: api.NewCaller(s.bot)}
+	s.mu.Lock()
 	s.eventConn = append(s.eventConn, conn)
-	s.eventConnMutex.Unlock()
+	s.mu.Unlock()
 }
 
 func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
@@ -314,17 +372,19 @@ func (s *webSocketServer) api(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(status)
 		return
 	}
+
 	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
 		return
 	}
+
 	log.Infof("接受 WebSocket 连接: %v (/api)", r.RemoteAddr)
-	conn := &webSocketConn{Conn: c, apiCaller: newAPICaller(s.bot)}
+	conn := &wsConn{conn: c, apiCaller: api.NewCaller(s.bot)}
 	if s.conf.RateLimit.Enabled {
-		conn.apiCaller.use(rateLimit(s.conf.RateLimit.Frequency, s.conf.RateLimit.Bucket))
+		conn.apiCaller.Use(rateLimit(s.conf.RateLimit.Frequency, s.conf.RateLimit.Bucket))
 	}
-	go s.listenAPI(conn)
+	s.listenAPI(conn)
 }
 
 func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
@@ -334,33 +394,36 @@ func (s *webSocketServer) any(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(status)
 		return
 	}
+
 	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		log.Warnf("处理 WebSocket 请求时出现错误: %v", err)
 		return
 	}
+
 	err = c.WriteMessage(websocket.TextMessage, []byte(s.handshake))
 	if err != nil {
 		log.Warnf("WebSocket 握手时出现错误: %v", err)
 		_ = c.Close()
 		return
 	}
+
 	log.Infof("接受 WebSocket 连接: %v (/)", r.RemoteAddr)
-	conn := &webSocketConn{Conn: c, apiCaller: newAPICaller(s.bot)}
+	conn := &wsConn{conn: c, apiCaller: api.NewCaller(s.bot)}
 	if s.conf.RateLimit.Enabled {
-		conn.apiCaller.use(rateLimit(s.conf.RateLimit.Frequency, s.conf.RateLimit.Bucket))
+		conn.apiCaller.Use(rateLimit(s.conf.RateLimit.Frequency, s.conf.RateLimit.Bucket))
 	}
-	s.eventConnMutex.Lock()
+	s.mu.Lock()
 	s.eventConn = append(s.eventConn, conn)
-	s.eventConnMutex.Unlock()
+	s.mu.Unlock()
 	s.listenAPI(conn)
 }
 
-func (s *webSocketServer) listenAPI(c *webSocketConn) {
+func (s *webSocketServer) listenAPI(c *wsConn) {
 	defer func() { _ = c.Close() }()
 	for {
 		buffer := global.NewBuffer()
-		t, reader, err := c.NextReader()
+		t, reader, err := c.conn.NextReader()
 		if err != nil {
 			break
 		}
@@ -380,7 +443,7 @@ func (s *webSocketServer) listenAPI(c *webSocketConn) {
 	}
 }
 
-func (c *webSocketConn) handleRequest(_ *coolq.CQBot, payload []byte) {
+func (c *wsConn) handleRequest(_ *coolq.CQBot, payload []byte) {
 	defer func() {
 		if err := recover(); err != nil {
 			log.Printf("处置WS命令时发生无法恢复的异常：%v\n%s", err, debug.Stack())
@@ -390,40 +453,42 @@ func (c *webSocketConn) handleRequest(_ *coolq.CQBot, payload []byte) {
 	j := gjson.Parse(utils.B2S(payload))
 	t := strings.TrimSuffix(j.Get("action").Str, "_async")
 	log.Debugf("WS接收到API调用: %v 参数: %v", t, j.Get("params").Raw)
-	ret := c.apiCaller.callAPI(t, j.Get("params"))
+	ret := c.apiCaller.Call(t, j.Get("params"))
 	if j.Get("echo").Exists() {
 		ret["echo"] = j.Get("echo").Value()
 	}
-	c.Lock()
-	defer c.Unlock()
-	_ = c.WriteJSON(ret)
+
+	c.mu.Lock()
+	defer c.mu.Unlock()
+	writer, _ := c.conn.NextWriter(websocket.TextMessage)
+	_ = json.NewEncoder(writer).Encode(ret)
+	_ = writer.Close()
 }
 
 func (s *webSocketServer) onBotPushEvent(e *coolq.Event) {
-	s.eventConnMutex.Lock()
-	defer s.eventConnMutex.Unlock()
-
-	filter := findFilter(s.filter)
-	if filter != nil && !filter.Eval(gjson.Parse(e.JSONString())) {
+	flt := filter.Find(s.filter)
+	if flt != nil && !flt.Eval(gjson.Parse(e.JSONString())) {
 		log.Debugf("上报Event %s 到 WS客户端 时被过滤.", e.JSONBytes())
 		return
 	}
+
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
 	j := 0
 	for i := 0; i < len(s.eventConn); i++ {
 		conn := s.eventConn[i]
-		log.Debugf("向WS客户端 %v 推送Event: %s", conn.RemoteAddr().String(), e.JSONBytes())
-		conn.Lock()
-		if err := conn.WriteMessage(websocket.TextMessage, e.JSONBytes()); err != nil {
+		log.Debugf("向WS客户端推送Event: %s", e.JSONBytes())
+		if err := conn.WriteText(e.JSONBytes()); err != nil {
 			_ = conn.Close()
 			conn = nil
 			continue
 		}
 		if i != j {
 			// i != j means that some connection has been closed.
-			// use a in-place removal to avoid copying.
+			// use an in-place removal to avoid copying.
 			s.eventConn[j] = conn
 		}
-		conn.Unlock()
 		j++
 	}
 	s.eventConn = s.eventConn[:j]